Fix import paths after nhs frontend toolkit upgrade

Themitchell · Themitchell · commit ebd7524d5b1e · 2025-09-09T15:44:14.000+01:00
diff --git a/lung_cancer_screening/assets/sass/main.scss b/lung_cancer_screening/assets/sass/main.scss
@@ -1,5 +1,5 @@
 // Import NHS.UK frontend library
-@import "nhsuk-frontend/packages/nhsuk";
+@forward "nhsuk-frontend/dist/nhsuk";
 
 // Components that are not in the NHS.UK frontend library
 // @import "components/button";
diff --git a/lung_cancer_screening/core/jinja2/forms/date-input.jinja b/lung_cancer_screening/core/jinja2/forms/date-input.jinja
@@ -1,4 +1,5 @@
-{% from 'components/date-input/macro.jinja' import dateInput as dateInput %}
+{% from 'nhsuk/components/date-input/macro.jinja' import dateInput as dateInput %}
+
 {% if field.errors %}
   {% set error_message = {"text": field.errors | first} %}
 {% endif %}
diff --git a/lung_cancer_screening/core/jinja2/forms/radios.jinja b/lung_cancer_screening/core/jinja2/forms/radios.jinja
@@ -1,4 +1,4 @@
-{% from 'components/radios/macro.jinja' import radios %}
+{% from 'nhsuk/components/radios/macro.jinja' import radios %}
 {% set unbound_field = field.field %}
 {% if field.errors %}
   {% set error_message = {"text": field.errors | first} %}
diff --git a/lung_cancer_screening/core/jinja2/layout.jinja b/lung_cancer_screening/core/jinja2/layout.jinja
@@ -1,6 +1,6 @@
 {% set assetPath = STATIC_URL ~ "/assets" %}
 
-{% extends 'template.jinja' %}
+{% extends 'nhsuk/template.jinja' %}
 
 {% block head %}
   <link rel="stylesheet" href="{{ static('css/main.css' )}}">
diff --git a/lung_cancer_screening/jinja2_env.py b/lung_cancer_screening/jinja2_env.py
@@ -13,11 +13,11 @@ def environment(**options):
                 env.loader,
                 PackageLoader(
                     "nhsuk_frontend_jinja",
-                    package_path="templates/components"
+                    package_path="templates/nhsuk/components"
                 ),
                 PackageLoader(
                     "nhsuk_frontend_jinja",
-                    package_path="templates/macros"
+                    package_path="templates/nhsuk/macros"
                 ),
                 PackageLoader("nhsuk_frontend_jinja"),
             ]
diff --git a/lung_cancer_screening/questions/jinja2/age_range_exit.jinja b/lung_cancer_screening/questions/jinja2/age_range_exit.jinja
@@ -1,6 +1,6 @@
 {% extends 'layout.jinja' %}
-{% from 'button/macro.jinja' import button %}
-{% from 'input/macro.jinja' import input %}
+{% from 'nhsuk/components/button/macro.jinja' import button %}
+{% from 'nhsuk/components/input/macro.jinja' import input %}
 
 {% block content %}
   <div class="nhsuk-grid-row">
diff --git a/lung_cancer_screening/questions/jinja2/date_of_birth.jinja b/lung_cancer_screening/questions/jinja2/date_of_birth.jinja
@@ -1,7 +1,7 @@
 {% extends 'layout.jinja' %}
 
-{% from 'date-input/macro.jinja' import dateInput %}
-{% from 'button/macro.jinja' import button %}
+{% from 'nhsuk/components/date-input/macro.jinja' import dateInput %}
+{% from 'nhsuk/components/button/macro.jinja' import button %}
 
 {% if error %}
   {% set error_message = { "text": error } %}
diff --git a/lung_cancer_screening/questions/jinja2/have_you_ever_smoked.jinja b/lung_cancer_screening/questions/jinja2/have_you_ever_smoked.jinja
@@ -1,6 +1,6 @@
 {% extends 'layout.jinja' %}
-{% from 'button/macro.jinja' import button %}
-{% from 'radios/macro.jinja' import radios %}
+{% from 'nhsuk/components/button/macro.jinja' import button %}
+{% from 'nhsuk/components/radios/macro.jinja' import radios %}
 
 {% block content %}
   <div class="nhsuk-grid-row">
diff --git a/lung_cancer_screening/questions/jinja2/non_smoker_exit.jinja b/lung_cancer_screening/questions/jinja2/non_smoker_exit.jinja
@@ -1,6 +1,6 @@
 {% extends 'layout.jinja' %}
-{% from 'button/macro.jinja' import button %}
-{% from 'input/macro.jinja' import input %}
+{% from 'nhsuk/components/button/macro.jinja' import button %}
+{% from 'nhsuk/components/input/macro.jinja' import input %}
 
 {% block content %}
   <div class="nhsuk-grid-row">
diff --git a/lung_cancer_screening/questions/jinja2/responses.jinja b/lung_cancer_screening/questions/jinja2/responses.jinja
@@ -1,5 +1,5 @@
 {% extends 'layout.jinja' %}
-{% from 'button/macro.jinja' import button %}
+{% from 'nhsuk/components/button/macro.jinja' import button %}
 
 {% block content %}
   <div class="nhsuk-grid-row">
diff --git a/lung_cancer_screening/questions/jinja2/start.jinja b/lung_cancer_screening/questions/jinja2/start.jinja
@@ -1,7 +1,7 @@
 {% extends 'layout.jinja' %}
-{% from 'error-summary/macro.jinja' import errorSummary %}
-{% from 'button/macro.jinja' import button %}
-{% from 'input/macro.jinja' import input %}
+{% from 'nhsuk/components/error-summary/macro.jinja' import errorSummary %}
+{% from 'nhsuk/components/button/macro.jinja' import button %}
+{% from 'nhsuk/components/input/macro.jinja' import input %}
 
 {% block content %}
 
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -9,7 +9,7 @@ requires-python = ">=3.13"
 dependencies = [
     "django (>=5.2.4,<6.0.0)",
     "psycopg2-binary (>=2.9.10,<3.0.0)",
-    "nhsuk-frontend-jinja (>=0.3.1,<0.4.0)",
+    "nhsuk-frontend-jinja (>=0.4.1,<0.5.0)",
     "gunicorn (>=23.0.0,<24.0.0)",
     "python-dateutil (>=2.9.0.post0,<3.0.0)",
 ]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% from 'components/radios/macro.jinja' import radios %}`
	`1`	`+{% from 'nhsuk/components/radios/macro.jinja' import radios %}`
`2`	`2`	`{% set unbound_field = field.field %}`
`3`	`3`	`{% if field.errors %}`
`4`	`4`	`{% set error_message = {"text": field.errors \| first} %}`