Merge branch 'main' into frontend-v5-compatibility-colin-preview

.github/workflows/test-heroku.yaml

@@ -18,11 +18,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Use Node v16
+    - name: Use Node v18
       uses: actions/setup-node@v3
       with:
         cache: 'npm'
-        node-version: '16'
+        node-version: '18'
     - name: Cache Cypress binary
       uses: actions/cache@v3
       with:

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 13.13.6
+
 ### Fixes
 
 - [#2364: Fix plugin update detection](https://github.com/alphagov/govuk-prototype-kit/pull/2364)

__tests__/utils/index.js

@@ -1,4 +1,3 @@
-
 // core dependencies
 const os = require('os')
 const path = require('path')

bin/utils/index.js

@@ -1,4 +1,3 @@
-
 // local dependencies
 const { spawn } = require('../../lib/exec')
 const fse = require('fs-extra')

cypress/e2e/dev/1-watch-files/watch-config.cypress.js

@@ -1,4 +1,3 @@
-
 // core dependencies
 const path = require('path')
 

cypress/e2e/dev/1-watch-files/watch-images.cypress.js

@@ -1,4 +1,3 @@
-
 // core dependencies
 const path = require('path')
 

cypress/e2e/dev/1-watch-files/watch-routes.cypress.js

@@ -1,4 +1,3 @@
-
 // core dependencies
 const path = require('path')
 

cypress/e2e/dev/1-watch-files/watch-views.cypress.js

@@ -1,4 +1,3 @@
-
 // core dependencies
 const path = require('path')
 

cypress/e2e/dev/2-page-component-tests/checkboxes.cypress.js

@@ -1,4 +1,3 @@
-
 // core dependencies
 const path = require('path')
 

cypress/e2e/dev/3-link-page-tests/branching-journey.cypress.js

@@ -1,4 +1,3 @@
-
 // local dependencies
 const { waitForApplication, restoreStarterFiles } = require('../../utils')
 const { setUpPages, setUpBranchingPages } = require('./link-page-utils')

cypress/e2e/dev/3-link-page-tests/change-answers.cypress.js

@@ -1,4 +1,3 @@
-
 // local dependencies
 const { waitForApplication, restoreStarterFiles } = require('../../utils')
 const { setUpPages, setUpData } = require('./link-page-utils')

cypress/e2e/dev/3-link-page-tests/link-index-to-start.cypress.js

@@ -1,4 +1,3 @@
-
 // core dependencies
 const path = require('path')
 

cypress/e2e/dev/3-link-page-tests/link-page-utils.js

@@ -1,4 +1,3 @@
-
 // core dependencies
 const path = require('path')
 

cypress/e2e/dev/3-link-page-tests/simple-journey.cypress.js

@@ -1,4 +1,3 @@
-
 // local dependencies
 const { waitForApplication, restoreStarterFiles } = require('../../utils')
 const { setUpPages } = require('./link-page-utils')

cypress/e2e/dev/4-step-by-step-tests/step-by-step-journey.cypress.js

@@ -1,4 +1,3 @@
-
 // core dependencies
 const path = require('path')
 

cypress/e2e/dev/5-management-tests/change-service-name.cypress.js

@@ -1,4 +1,3 @@
-
 // core dependencies
 const path = require('path')
 

cypress/e2e/dev/5-management-tests/clear-data-page.cypress.js

@@ -1,4 +1,3 @@
-
 // core dependencies
 const path = require('path')
 

cypress/e2e/dev/5-management-tests/edit-home-page.cypress.js

@@ -1,4 +1,3 @@
-
 // core dependencies
 const path = require('path')
 

cypress/e2e/dev/5-management-tests/management-available.cypress.js

@@ -1,4 +1,3 @@
-
 // local dependencies
 const { waitForApplication } = require('../../utils')
 

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

@@ -1,4 +1,3 @@
-
 // core dependencies
 const path = require('path')
 

cypress/e2e/dev/6-layout-tests/default-layout.cypress.js

@@ -1,4 +1,3 @@
-
 // core dependencies
 const path = require('path')
 

cypress/e2e/plugins/0-mock-plugin-tests/install-plugin-via-cli-test.cypress.js

@@ -1,4 +1,3 @@
-
 // core dependencies
 const path = require('path')
 

cypress/e2e/plugins/0-mock-plugin-tests/multi-combined-plugin-test.cypress.js

@@ -1,4 +1,3 @@
-
 // core dependencies
 const path = require('path')
 

cypress/e2e/prod/1-home-page-tests/home-page-in-production.cypress.js

@@ -1,4 +1,3 @@
-
 // local dependencies
 const { authenticate, restoreStarterFiles } = require('../../utils')
 

cypress/e2e/prod/2-management-tests/management-not-available.cypress.js

@@ -1,4 +1,3 @@
-
 // local dependencies
 const { authenticate, restoreStarterFiles } = require('../../utils')
 

cypress/e2e/step-by-step-utils.js

@@ -1,4 +1,3 @@
-
 const showHideAllLinkQuery = '.app-step-nav__controls button'
 const toggleButtonQuery = (step) => `[data-position="${step}"]`
 const showHideLinkQuery = (step) => `[data-position="${step}"]`

cypress/e2e/styles/1-watch-styles/watch-custom-styles.cypress.js

@@ -1,4 +1,3 @@
-
 // core dependencies
 const path = require('path')
 

cypress/e2e/styles/1-watch-styles/watch-styles.cypress.js

@@ -1,4 +1,3 @@
-
 // core dependencies
 const path = require('path')
 

cypress/fixtures/plugins/plugin-bar/filters.js

@@ -1,4 +1,3 @@
-
 // local dependencies
 const { addFilter } = require('govuk-prototype-kit').views
 

cypress/fixtures/plugins/plugin-bar/scripts/bar.js

@@ -1,4 +1,3 @@
-
 window.BAR = window.BAR || {}
 window.BAR.Modules = window.BAR.Modules || {};
 

cypress/fixtures/plugins/plugin-baz/filters.js

@@ -1,4 +1,3 @@
-
 // local dependencies
 const { addFilter } = require('govuk-prototype-kit').views
 

cypress/fixtures/plugins/plugin-baz/scripts/baz.js

@@ -1,4 +1,3 @@
-
 window.BAZ = window.BAZ || {}
 window.BAZ.Modules = window.BAZ.Modules || {};
 

cypress/fixtures/plugins/plugin-foo/scripts/foo.js

@@ -1,4 +1,3 @@
-
 window.FOO = window.FOO || {}
 window.FOO.Modules = window.FOO.Modules || {};
 

cypress/scripts/run-starter-prototype.js

@@ -1,4 +1,3 @@
-
 // core dependencies
 const os = require('os')
 const path = require('path')

index.js

@@ -1,4 +1,3 @@
-
 // local dependencies
 const filtersApi = require('./lib/filters/api').external
 const functionsApi = require('./lib/functions/api').external

lib/build.js

@@ -1,4 +1,3 @@
-
 // node dependencies
 const path = require('path')
 

lib/exec.js

@@ -1,4 +1,3 @@
-
 // npm dependencies
 const { spawn: crossSpawn } = require('cross-spawn')
 

lib/filters/api.js

@@ -1,4 +1,3 @@
-
 let environment
 const whenEnvIsAvailable = []
 

lib/filters/core-filters.js

@@ -1,4 +1,3 @@
-
 // local dependencies
 const { addFilter, getFilter } = require('../../').views
 

lib/routes/api.js

@@ -1,4 +1,3 @@
-
 // npm dependencies
 const express = require('express')
 

lib/usage-data.js

@@ -1,4 +1,3 @@
-
 // core dependencies
 const fs = require('fs')
 const os = require('os')

lib/utils/index.js

@@ -1,4 +1,3 @@
-
 // core dependencies
 const crypto = require('crypto')
 const fs = require('fs')

listen-on-port.js

@@ -1,4 +1,3 @@
-
 // npm dependencies
 const { runErrorServer } = require('./lib/errorServer')
 const { verboseLog } = require('./lib/utils/verboseLogger')

migrator/logger.js

@@ -1,4 +1,3 @@
-
 // core dependencies
 const fsp = require('fs').promises
 const os = require('os')

migrator/migration-steps.js

@@ -1,4 +1,3 @@
-
 // core dependencies
 const path = require('path')
 
@@ -228,7 +227,7 @@ async function updateLayoutIfUnchanged (filePath, starterFilePath) {
 }
 
 async function updateIfUnchanged (filePaths, additionalStep) {
-  const results = await Promise.all(filePaths.map(async filePath => {
+  return Promise.all(filePaths.map(async filePath => {
     const matchFound = await matchAgainstOldVersions(filePath)
 
     const reporter = await addReporter(`Overwrite ${filePath}`)
@@ -251,7 +250,6 @@ async function updateIfUnchanged (filePaths, additionalStep) {
     await reporter(result)
     return result
   }))
-  return results
 }
 
 async function updateUnbrandedLayouts (dir) {

migrator/reporter.js

@@ -1,4 +1,3 @@
-
 // npm dependencies
 const c = require('ansi-colors')