Move to nhsuk namespace

Author: colinrotherham

.github/workflows/sass.yml

@@ -41,14 +41,14 @@ jobs:
       - name: Check compilation
         run: |
           mkdir -p .tmp
-          time sass packages/nhsuk-frontend/src/nhsuk.scss > .tmp/check.css
+          time sass packages/nhsuk-frontend/src/nhsuk/all.scss > .tmp/check.css
 
       - name: Check load paths
         run: |
           mkdir -p .tmp
-          time sh -c 'echo "@import "\""nhsuk"\"";" | sass --stdin --load-path packages/nhsuk-frontend/src > .tmp/check1.css'
-          time sh -c 'echo "@forward "\""nhsuk"\"";" | sass --stdin --load-path packages/nhsuk-frontend/src > .tmp/check2.css'
-          time sh -c 'echo "@use "\""nhsuk"\"" as *;" | sass --stdin --load-path packages/nhsuk-frontend/src > .tmp/check3.css'
+          time sh -c 'echo "@import "\""nhsuk/all"\"";" | sass --stdin --load-path packages/nhsuk-frontend/src > .tmp/check1.css'
+          time sh -c 'echo "@forward "\""nhsuk/all"\"";" | sass --stdin --load-path packages/nhsuk-frontend/src > .tmp/check2.css'
+          time sh -c 'echo "@use "\""nhsuk/all"\"" as *;" | sass --stdin --load-path packages/nhsuk-frontend/src > .tmp/check3.css'
 
       # Check output for uncompiled Sass
       - name: Check output

CHANGELOG.md

@@ -1050,7 +1050,7 @@ The list panel component can be recreated by adding `nhsuk-list--border` to the
 
   You need to:
 
-  - replace `{% from 'components/panel/macro.njk' import panel %}` with `{% from 'components/card/macro.njk' import card %}`
+  - replace `{% from 'nhsuk/components/panel/macro.njk' import panel %}` with `{% from 'nhsuk/components/card/macro.njk' import card %}`
   - replace `{{ panel({` with `{{ card({`
   - replace `"html"` with the relevant arguments - for example: `"heading"` and `"descriptionHtml"`
   - declare the heading level size and heading sizes (with helper classes) because the default heading level is now 2 instead of 3
@@ -1060,7 +1060,7 @@ The list panel component can be recreated by adding `nhsuk-list--border` to the
   #### Old Nunjucks macro (Panel)
 
   ```
-  {% from 'components/panel/macro.njk' import panel %}
+  {% from 'nhsuk/components/panel/macro.njk' import panel %}
 
   {{ panel({
     "html": "<h3>If you need help now, but it’s not an emergency</h3> <p>Go to <a href=\"#\">111.nhs.uk</a> or <a href=\"#\">call 111</a>.</p>"
@@ -1072,7 +1072,7 @@ The list panel component can be recreated by adding `nhsuk-list--border` to the
   ##### Changing the heading level
 
   ```
-  {% from 'components/card/macro.njk' import card %}
+  {% from 'nhsuk/components/card/macro.njk' import card %}
 
   {{ card({
     "heading": "If you need help now, but it’s not an emergency",
@@ -1084,7 +1084,7 @@ The list panel component can be recreated by adding `nhsuk-list--border` to the
   ##### Changing the heading size
 
   ```
-  {% from 'components/card/macro.njk' import card %}
+  {% from 'nhsuk/components/card/macro.njk' import card %}
 
   {{ card({
     "heading": "If you need help now, but it’s not an emergency",
@@ -1132,7 +1132,7 @@ The list panel component can be recreated by adding `nhsuk-list--border` to the
 
   You need to:
 
-  - replace `{% from 'components/promo/macro.njk' import promo %}` with `{% from 'components/card/macro.njk' import card %}`
+  - replace `{% from 'nhsuk/components/promo/macro.njk' import promo %}` with `{% from 'nhsuk/components/card/macro.njk' import card %}`
   - replace `{{ promo({` with `{{ card({`
   - declare the heading level size and heading sizes (with helper classes) because the default heading level is now 2 instead of 3
 
@@ -1141,7 +1141,7 @@ The list panel component can be recreated by adding `nhsuk-list--border` to the
   #### Old Nunjucks macro (Promo)
 
   ```
-  {% from 'components/promo/macro.njk' import promo %}
+  {% from 'nhsuk/components/promo/macro.njk' import promo %}
 
   {{ promo({
     "href": "https://www.nhs.uk",
@@ -1155,7 +1155,7 @@ The list panel component can be recreated by adding `nhsuk-list--border` to the
   ##### Changing the heading level
 
   ```
-  {% from 'components/card/macro.njk' import card %}
+  {% from 'nhsuk/components/card/macro.njk' import card %}
 
   {{ card({
     "href": "https://www.nhs.uk",
@@ -1168,7 +1168,7 @@ The list panel component can be recreated by adding `nhsuk-list--border` to the
   ##### Changing the heading size
 
   ```
-  {% from 'components/card/macro.njk' import card %}
+  {% from 'nhsuk/components/card/macro.njk' import card %}
 
   {{ card({
     "href": "https://www.nhs.uk",

gulpfile.mjs

@@ -54,10 +54,13 @@ gulp.task(
 gulp.task('watch', () =>
   Promise.all([
     gulp.watch(
-      [join(config.paths.pkg, 'src/**/*.scss')],
+      [join(config.paths.pkg, 'src/nhsuk/**/*.scss')],
       gulp.series(['style'])
     ),
-    gulp.watch([join(config.paths.pkg, 'src/**/*.js')], gulp.series(['script']))
+    gulp.watch(
+      [join(config.paths.pkg, 'src/nhsuk/**/*.js')],
+      gulp.series(['script'])
+    )
   ])
 )
 
@@ -75,7 +78,7 @@ gulp.task('docs:watch', () =>
     gulp.watch(
       [
         join(config.paths.app, 'src/**/*.njk'),
-        join(config.paths.pkg, 'src/**/*.njk')
+        join(config.paths.pkg, 'src/nhsuk/**/*.njk')
       ],
       buildHTML
     ),
@@ -84,7 +87,10 @@ gulp.task('docs:watch', () =>
       .on('change', browserSync.reload),
     gulp.watch([join(config.paths.root, 'dist/*.min.{css,css.map}')], copyCSS),
     gulp.watch([join(config.paths.root, 'dist/*.min.{js,js.map}')], copyJS),
-    gulp.watch([join(config.paths.pkg, 'src/assets/**/*')], copyBinaryAssets)
+    gulp.watch(
+      [join(config.paths.pkg, 'src/nhsuk/assets/**/*')],
+      copyBinaryAssets
+    )
   ])
 )
 

packages/nhsuk-frontend-review/src/_templates/layout.njk

@@ -1,4 +1,4 @@
-{% extends 'template.njk' %}
+{% extends 'nhsuk/template.njk' %}
 {% block pageTitle %}{{ title }} - NHS.UK Frontend{% endblock %}
 
 {% set assetPath = "/nhsuk-frontend/assets" %}

packages/nhsuk-frontend-review/src/_templates/page.njk

@@ -1,33 +1,33 @@
-{% from 'components/header/macro.njk' import header %}
-{% from 'components/footer/macro.njk' import footer %}
-{% from 'components/skip-link/macro.njk' import skipLink %}
-{% from 'components/action-link/macro.njk' import actionLink %}
-{% from 'components/breadcrumb/macro.njk' import breadcrumb %}
-{% from 'components/card/macro.njk' import card %}
-{% from 'components/contents-list/macro.njk' import contentsList %}
-{% from 'components/details/macro.njk' import details %}
-{% from 'components/hero/macro.njk' import hero %}
-{% from 'components/do-dont-list/macro.njk' import list %}
-{% from 'components/images/macro.njk' import image %}
-{% from 'components/inset-text/macro.njk' import insetText %}
-{% from 'components/pagination/macro.njk' import pagination %}
-{% from 'components/skip-link/macro.njk' import skipLink %}
-{% from 'components/tables/macro.njk' import table %}
-{% from 'components/warning-callout/macro.njk' import warningCallout %}
-{% from 'components/back-link/macro.njk' import backLink %}
-{% from 'components/button/macro.njk' import button %}
-{% from 'components/checkboxes/macro.njk' import checkboxes %}
-{% from 'components/date-input/macro.njk' import dateInput %}
-{% from 'components/error-message/macro.njk' import errorMessage %}
-{% from 'components/error-summary/macro.njk' import errorSummary %}
-{% from 'components/fieldset/macro.njk' import fieldset %}
-{% from 'components/hint/macro.njk' import hint %}
-{% from 'components/input/macro.njk' import input %}
-{% from 'components/label/macro.njk' import label %}
-{% from 'components/radios/macro.njk' import radios %}
-{% from 'components/select/macro.njk' import select %}
-{% from 'components/summary-list/macro.njk' import summaryList %}
-{% from 'components/textarea/macro.njk' import textarea %}
+{% from 'nhsuk/components/header/macro.njk' import header %}
+{% from 'nhsuk/components/footer/macro.njk' import footer %}
+{% from 'nhsuk/components/skip-link/macro.njk' import skipLink %}
+{% from 'nhsuk/components/action-link/macro.njk' import actionLink %}
+{% from 'nhsuk/components/breadcrumb/macro.njk' import breadcrumb %}
+{% from 'nhsuk/components/card/macro.njk' import card %}
+{% from 'nhsuk/components/contents-list/macro.njk' import contentsList %}
+{% from 'nhsuk/components/details/macro.njk' import details %}
+{% from 'nhsuk/components/hero/macro.njk' import hero %}
+{% from 'nhsuk/components/do-dont-list/macro.njk' import list %}
+{% from 'nhsuk/components/images/macro.njk' import image %}
+{% from 'nhsuk/components/inset-text/macro.njk' import insetText %}
+{% from 'nhsuk/components/pagination/macro.njk' import pagination %}
+{% from 'nhsuk/components/skip-link/macro.njk' import skipLink %}
+{% from 'nhsuk/components/tables/macro.njk' import table %}
+{% from 'nhsuk/components/warning-callout/macro.njk' import warningCallout %}
+{% from 'nhsuk/components/back-link/macro.njk' import backLink %}
+{% from 'nhsuk/components/button/macro.njk' import button %}
+{% from 'nhsuk/components/checkboxes/macro.njk' import checkboxes %}
+{% from 'nhsuk/components/date-input/macro.njk' import dateInput %}
+{% from 'nhsuk/components/error-message/macro.njk' import errorMessage %}
+{% from 'nhsuk/components/error-summary/macro.njk' import errorSummary %}
+{% from 'nhsuk/components/fieldset/macro.njk' import fieldset %}
+{% from 'nhsuk/components/hint/macro.njk' import hint %}
+{% from 'nhsuk/components/input/macro.njk' import input %}
+{% from 'nhsuk/components/label/macro.njk' import label %}
+{% from 'nhsuk/components/radios/macro.njk' import radios %}
+{% from 'nhsuk/components/select/macro.njk' import select %}
+{% from 'nhsuk/components/summary-list/macro.njk' import summaryList %}
+{% from 'nhsuk/components/textarea/macro.njk' import textarea %}
 
 {% extends 'layout.njk' %}
 

packages/nhsuk-frontend-review/src/components/action-link/index.njk

@@ -1,5 +1,5 @@
 {% set title = 'Action link' %}
-{% from 'components/action-link/macro.njk' import actionLink %}
+{% from 'nhsuk/components/action-link/macro.njk' import actionLink %}
 {% extends 'example.njk' %}
 
 {% block content %}

packages/nhsuk-frontend-review/src/components/all.njk

@@ -1,30 +1,30 @@
 {% set title = 'Components' %}
-{% from 'components/action-link/macro.njk' import actionLink %}
-{% from 'components/breadcrumb/macro.njk' import breadcrumb %}
-{% from 'components/card/macro.njk' import card %}
-{% from 'components/character-count/macro.njk' import characterCount %}
-{% from 'components/contents-list/macro.njk' import contentsList %}
-{% from 'components/details/macro.njk' import details %}
-{% from 'components/header/macro.njk' import header %}
-{% from 'components/footer/macro.njk' import footer %}
-{% from 'components/do-dont-list/macro.njk' import list %}
-{% from 'components/images/macro.njk' import image %}
-{% from 'components/inset-text/macro.njk' import insetText %}
-{% from 'components/pagination/macro.njk' import pagination %}
-{% from 'components/skip-link/macro.njk' import skipLink %}
-{% from "components/summary-list/macro.njk" import summaryList %}
-{% from 'components/tables/macro.njk' import table %}
-{% from 'components/tag/macro.njk' import tag %}
-{% from 'components/warning-callout/macro.njk' import warningCallout %}
-{% from 'components/back-link/macro.njk' import backLink %}
-{% from 'components/button/macro.njk' import button %}
-{% from 'components/checkboxes/macro.njk' import checkboxes %}
-{% from 'components/date-input/macro.njk' import dateInput %}
-{% from 'components/input/macro.njk' import input %}
-{% from 'components/radios/macro.njk' import radios %}
-{% from 'components/select/macro.njk' import select %}
-{% from 'components/textarea/macro.njk' import textarea %}
-{% from 'components/tabs/macro.njk' import tabs %}
+{% from 'nhsuk/components/action-link/macro.njk' import actionLink %}
+{% from 'nhsuk/components/breadcrumb/macro.njk' import breadcrumb %}
+{% from 'nhsuk/components/card/macro.njk' import card %}
+{% from 'nhsuk/components/character-count/macro.njk' import characterCount %}
+{% from 'nhsuk/components/contents-list/macro.njk' import contentsList %}
+{% from 'nhsuk/components/details/macro.njk' import details %}
+{% from 'nhsuk/components/header/macro.njk' import header %}
+{% from 'nhsuk/components/footer/macro.njk' import footer %}
+{% from 'nhsuk/components/do-dont-list/macro.njk' import list %}
+{% from 'nhsuk/components/images/macro.njk' import image %}
+{% from 'nhsuk/components/inset-text/macro.njk' import insetText %}
+{% from 'nhsuk/components/pagination/macro.njk' import pagination %}
+{% from 'nhsuk/components/skip-link/macro.njk' import skipLink %}
+{% from "nhsuk/components/summary-list/macro.njk" import summaryList %}
+{% from 'nhsuk/components/tables/macro.njk' import table %}
+{% from 'nhsuk/components/tag/macro.njk' import tag %}
+{% from 'nhsuk/components/warning-callout/macro.njk' import warningCallout %}
+{% from 'nhsuk/components/back-link/macro.njk' import backLink %}
+{% from 'nhsuk/components/button/macro.njk' import button %}
+{% from 'nhsuk/components/checkboxes/macro.njk' import checkboxes %}
+{% from 'nhsuk/components/date-input/macro.njk' import dateInput %}
+{% from 'nhsuk/components/input/macro.njk' import input %}
+{% from 'nhsuk/components/radios/macro.njk' import radios %}
+{% from 'nhsuk/components/select/macro.njk' import select %}
+{% from 'nhsuk/components/textarea/macro.njk' import textarea %}
+{% from 'nhsuk/components/tabs/macro.njk' import tabs %}
 
 {% extends 'page.njk' %}
 

packages/nhsuk-frontend-review/src/components/back-link/button.njk

@@ -1,5 +1,5 @@
 {% set title = 'Back link as a button' %}
-{% from 'components/back-link/macro.njk' import backLink %}
+{% from 'nhsuk/components/back-link/macro.njk' import backLink %}
 {% extends 'example.njk' %}
 
 {% block content %}

packages/nhsuk-frontend-review/src/components/back-link/index.njk

@@ -1,5 +1,5 @@
 {% set title = 'Back link' %}
-{% from 'components/back-link/macro.njk' import backLink %}
+{% from 'nhsuk/components/back-link/macro.njk' import backLink %}
 {% extends 'example.njk' %}
 
 {% block content %}

packages/nhsuk-frontend-review/src/components/breadcrumb/index.njk

@@ -1,5 +1,5 @@
 {% set title = 'Breadcrumb' %}
-{% from 'components/breadcrumb/macro.njk' import breadcrumb %}
+{% from 'nhsuk/components/breadcrumb/macro.njk' import breadcrumb %}
 {% extends 'example.njk' %}
 
 {% block content %}

packages/nhsuk-frontend-review/src/components/button/disabled.njk

@@ -1,5 +1,5 @@
 {% set title = 'Button disabled' %}
-{% from 'components/button/macro.njk' import button %}
+{% from 'nhsuk/components/button/macro.njk' import button %}
 {% extends 'example.njk' %}
 
 {% block content %}

packages/nhsuk-frontend-review/src/components/button/index.njk

@@ -1,5 +1,5 @@
 {% set title = 'Button' %}
-{% from 'components/button/macro.njk' import button %}
+{% from 'nhsuk/components/button/macro.njk' import button %}
 {% extends 'example.njk' %}
 
 {% block content %}

packages/nhsuk-frontend-review/src/components/button/link.njk

@@ -1,5 +1,5 @@
 {% set title = 'Button as a link' %}
-{% from 'components/button/macro.njk' import button %}
+{% from 'nhsuk/components/button/macro.njk' import button %}
 {% extends 'example.njk' %}
 
 {% block content %}

packages/nhsuk-frontend-review/src/components/button/prevent-double-click.njk

@@ -1,5 +1,5 @@
 {% set title = 'Button - double click prevented ' %}
-{% from 'components/button/macro.njk' import button %}
+{% from 'nhsuk/components/button/macro.njk' import button %}
 {% extends 'example.njk' %}
 
 {% block content %}

packages/nhsuk-frontend-review/src/components/button/reverse.njk

@@ -1,5 +1,5 @@
 {% set title = 'Button reverse' %}
-{% from 'components/button/macro.njk' import button %}
+{% from 'nhsuk/components/button/macro.njk' import button %}
 {% extends 'example.njk' %}
 
 {% block main %}

packages/nhsuk-frontend-review/src/components/button/secondary.njk

@@ -1,5 +1,5 @@
 {% set title = 'Button secondary' %}
-{% from 'components/button/macro.njk' import button %}
+{% from 'nhsuk/components/button/macro.njk' import button %}
 {% extends 'example.njk' %}
 
 {% block content %}

packages/nhsuk-frontend-review/src/components/button/warning.njk

@@ -1,5 +1,5 @@
 {% set title = 'Button warning' %}
-{% from 'components/button/macro.njk' import button %}
+{% from 'nhsuk/components/button/macro.njk' import button %}
 {% extends 'example.njk' %}
 
 {% block content %}

packages/nhsuk-frontend-review/src/components/card/basic-card.njk

@@ -1,5 +1,5 @@
 {% set title = 'Card - Basic card' %}
-{% from 'components/card/macro.njk' import card %}
+{% from 'nhsuk/components/card/macro.njk' import card %}
 {% extends 'example.njk' %}
 
 {% block content %}

packages/nhsuk-frontend-review/src/components/card/card-group.njk

@@ -1,5 +1,5 @@
 {% set title = 'Card - Card group' %}
-{% from 'components/card/macro.njk' import card %}
+{% from 'nhsuk/components/card/macro.njk' import card %}
 {% extends 'example.njk' %}
 
 {% block content %}

packages/nhsuk-frontend-review/src/components/card/card-primary.njk

@@ -1,5 +1,5 @@
 {% set title = 'Card - primary card (with chevron)' %}
-{% from 'components/card/macro.njk' import card %}
+{% from 'nhsuk/components/card/macro.njk' import card %}
 {% extends 'example.njk' %}
 
 {% block content %}

packages/nhsuk-frontend-review/src/components/card/card-secondary.njk

@@ -1,5 +1,5 @@
 {% set title = 'Card - secondary' %}
-{% from 'components/card/macro.njk' import card %}
+{% from 'nhsuk/components/card/macro.njk' import card %}
 {% extends 'example.njk' %}
 
 {% block content %}

packages/nhsuk-frontend-review/src/components/card/card-with-image.njk

@@ -1,5 +1,5 @@
 {% set title = 'Card - Card with an image' %}
-{% from 'components/card/macro.njk' import card %}
+{% from 'nhsuk/components/card/macro.njk' import card %}
 {% extends 'example.njk' %}
 
 {% block content %}

packages/nhsuk-frontend-review/src/components/card/care-card-emergency.njk

@@ -1,5 +1,5 @@
 {% set title = 'Card - Care card emergency (red and black)' %}
-{% from 'components/card/macro.njk' import card %}
+{% from 'nhsuk/components/card/macro.njk' import card %}
 {% extends 'example.njk' %}
 
 {% block content %}

packages/nhsuk-frontend-review/src/components/card/care-card-non-urgent.njk

@@ -1,5 +1,5 @@
 {% set title = 'Card - Care card non-urgent (blue)' %}
-{% from 'components/card/macro.njk' import card %}
+{% from 'nhsuk/components/card/macro.njk' import card %}
 {% extends 'example.njk' %}
 
 {% block content %}

packages/nhsuk-frontend-review/src/components/card/care-card-urgent.njk

@@ -1,5 +1,5 @@
 {% set title = 'Card - Care card urgent (red)' %}
-{% from 'components/card/macro.njk' import card %}
+{% from 'nhsuk/components/card/macro.njk' import card %}
 {% extends 'example.njk' %}
 
 {% block content %}

packages/nhsuk-frontend-review/src/components/card/clickable-card.njk

@@ -1,5 +1,5 @@
 {% set title = 'Card - Clickable card' %}
-{% from 'components/card/macro.njk' import card %}
+{% from 'nhsuk/components/card/macro.njk' import card %}
 {% extends 'example.njk' %}
 
 {% block content %}