Merge pull request #6531 from uktrade/chore/update-govuk-frontend

Update govuk-frontend to v5
uktrade · Feb 20, 2024 · 8af8e67 · 8af8e67
2 parents 434ee91 + cf61376
commit 8af8e67
Show file tree

Hide file tree

Showing 9 changed files with 1,783 additions and 4,905 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,21 +10,12 @@ updates:
   open-pull-requests-limit: 10
   ignore:
 # When updating this list please ensure that a ticket for unblocking the update has been added to the TechEx backlog.
-  - dependency-name: govuk-frontend # TET-219
-    versions:
-    - ">= 0"
   - dependency-name: react-redux # TET-154
     versions:
     - "> 7.2.8"
   - dependency-name: react-router-dom # TET-34
     versions:
     - "> 5.3.0"
-  - dependency-name: axios # TET-354
-    versions:
-    - "> 0.27.2"
-  - dependency-name: cypress # TET-372
-    versions:
-    - "> 11.2.0"
   - dependency-name: jsdom # TET-371
     versions:
       - "> 20.0.3"

diff --git a/assets/images/favicon.ico b/assets/images/favicon.ico
diff --git a/assets/stylesheets/application.scss b/assets/stylesheets/application.scss
@@ -2,7 +2,7 @@ $images-dir: '/images/';
 
 $govuk-canvas-background-colour: #f3f2f1;
 $govuk-font-family: Arial, sans-serif;
-@import '../../node_modules/govuk-frontend/all';
+@import '../../node_modules/govuk-frontend/dist/govuk/all';
 
 $toolkit-font-stack: $govuk-font-family;
 @import '_deprecated/trade-elements';

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -107,7 +107,7 @@
     "get-form-data": "^3.0.0",
     "govuk_frontend_toolkit": "^9.0.1",
     "govuk-elements-sass": "^3.1.3",
-    "govuk-frontend": "^2.11.0",
+    "govuk-frontend": "^5.1.0",
     "govuk-react": "^0.10.6",
     "hawk": "^9.0.1",
     "history": "^4.10.1",

diff --git a/public/images/favicon.ico b/public/images/favicon.ico
diff --git a/src/config/nunjucks/index.js b/src/config/nunjucks/index.js
@@ -79,8 +79,7 @@ module.exports = (app, config) => {
     [
       `${config.root}/src/apps`,
       `${config.root}/src/templates`,
-      `${config.root}/node_modules/govuk-frontend`,
-      `${config.root}/node_modules/govuk-frontend/components`,
+      `${config.root}/node_modules/govuk-frontend/dist`,
     ],
     {
       autoescape: true,

diff --git a/src/server.js b/src/server.js
@@ -109,7 +109,9 @@ app.use('/images', express.static(path.join(config.buildDir, 'images')))
 app.use('/fonts', express.static(path.join(config.buildDir, 'fonts')))
 app.use(
   '/assets',
-  express.static(path.join(config.root, 'node_modules/govuk-frontend/assets'))
+  express.static(
+    path.join(config.root, 'node_modules/govuk-frontend/dist/govuk/assets')
+  )
 )
 
 app.use(title())

diff --git a/src/templates/_layouts/template.njk b/src/templates/_layouts/template.njk
@@ -1,6 +1,6 @@
-{% from "breadcrumbs/macro.njk" import govukBreadcrumbs %}
-{% from "button/macro.njk" import govukButton %}
-{% from "details/macro.njk" import govukDetails %}
+{% from "govuk/components/breadcrumbs/macro.njk" import govukBreadcrumbs %}
+{% from "govuk/components/button/macro.njk" import govukButton %}
+{% from "govuk/components/details/macro.njk" import govukDetails %}
 {% from "_macros/form.njk" import FormGroup, Fieldset, TextField, AddAnother, Link, FormSubHeading, MultipleChoiceField, PreviouslySelected, HiddenField, DateFieldset, DateField, UneditableField %}
 {% from "_macros/form.njk" import EntitySearchForm, Form, MultiStepForm with context %}
 {% from "_macros/common.njk" import LocalHeader with context %}
@@ -12,7 +12,7 @@
   {% extends "./xhr.njk" %}
 {% else %}
   {# This one: https://github.com/alphagov/govuk-frontend/blob/master/src/govuk/template.njk #}
-  {% extends "template.njk" %}
+  {% extends "govuk/template.njk" %}
 {% endif %}
 
 {# Remove the skipLink from the base template #}