Merge pull request #2327 from alphagov/frontend-v5-compatibility-coli…

…n-preview

Use GOV.UK Frontend v5 on management pages and tests

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Fixes
+
+- [#2327: Use GOV.UK Frontend v5 on management pages and tests](https://github.com/alphagov/govuk-prototype-kit/pull/2327)
+
 ## 13.16.0
 
 ### New features

cypress/e2e/dev/5-management-tests/no-autodatastore-on-management-pages.cypress.js

@@ -55,9 +55,9 @@ describe('clear data page', () => {
 
     cy.task('log', 'Add some data')
     cy.visit(`/question-check?most-impressive-trick=${encodeURIComponent(answer)}`)
-    cy.get('.govuk-header__logotype-text')
+    cy.get('.govuk-header__logotype')
     cy.visit('/manage-prototype/plugins?abc=def')
-    cy.get('.govuk-header__logotype-text')
+    cy.get('.govuk-header__logotype')
 
     cy.task('log', 'Check data has been saved')
     cy.visit('/question-check')

cypress/e2e/smoke/0-smoke-tests/index-page.cypress.js

@@ -9,9 +9,9 @@ describe('smoke test', () => {
   })
 
   it('GOV.UK Frontend fonts loaded', () => {
-    waitForApplication('/')
+    waitForApplication('/manage-prototype')
 
-    const fontUrl = '/plugin-assets/govuk-frontend/govuk/assets/fonts/bold-b542beb274-v2.woff2'
+    const fontUrl = '/manage-prototype/dependencies/govuk-frontend/dist/govuk/assets/fonts/bold-b542beb274-v2.woff2'
 
     cy.task('log', 'Requesting govuk-frontend font')
     cy.request(`/${fontUrl}`, { retryOnStatusCodeFailure: true })

cypress/e2e/utils.js

@@ -15,7 +15,7 @@ const waitForApplication = async (path = '/index') => {
   log(`Waiting for app to restart and load ${path} page`)
   cy.task('waitUntilAppRestarts')
   cy.visit(path)
-  cy.get('.govuk-header__logotype-text')
+  cy.get('.govuk-header__logotype')
     .contains('GOV.UK')
 }
 

lib/nunjucks/views/manage-prototype/scripts.njk

@@ -1,3 +1,3 @@
 <script src="/plugin-assets/govuk-prototype-kit/lib/assets/javascripts/kit.js"></script>
-<script src="/manage-prototype/dependencies/govuk-frontend/govuk/all.js"></script>
-<script src="/manage-prototype/dependencies/govuk-frontend/govuk-prototype-kit/init.js"></script>
+<script src="/manage-prototype/dependencies/govuk-frontend/dist/govuk/govuk-frontend.min.js" type="module"></script>
+<script src="/manage-prototype/dependencies/govuk-frontend/dist/govuk-prototype-kit/init.js" type="module"></script>

package.json

@@ -72,7 +72,7 @@
     "express": "^4.18.2",
     "express-session": "^1.17.3",
     "fs-extra": "^11.1.1",
-    "govuk-frontend": "4.7.0",
+    "govuk-frontend": "5.0.0",
     "inquirer": "^8.2.6",
     "lodash": "^4.17.21",
     "marked": "^4.3.0",