From 82fc0092e79250370f7e8d202e280c429ec36497 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jun 2025 12:07:25 +0000 Subject: [PATCH 1/4] Bump @hapi/yar from 11.0.2 to 11.0.3 Bumps [@hapi/yar](https://github.com/hapijs/yar) from 11.0.2 to 11.0.3. - [Release notes](https://github.com/hapijs/yar/releases) - [Commits](https://github.com/hapijs/yar/compare/v11.0.2...v11.0.3) --- updated-dependencies: - dependency-name: "@hapi/yar" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- designer/package.json | 2 +- package-lock.json | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/designer/package.json b/designer/package.json index 570d88812a..7e5b82a80f 100644 --- a/designer/package.json +++ b/designer/package.json @@ -51,7 +51,7 @@ "@hapi/jwt": "^3.2.0", "@hapi/vision": "^7.0.3", "@hapi/wreck": "^18.1.0", - "@hapi/yar": "^11.0.2", + "@hapi/yar": "^11.0.3", "@types/dagre": "^0.7.52", "@types/govuk-frontend": "^5.9.0", "@types/hapi__cookie": "^12.0.5", diff --git a/package-lock.json b/package-lock.json index 83c2c6c79f..6bfb9e96ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -79,7 +79,7 @@ "@hapi/jwt": "^3.2.0", "@hapi/vision": "^7.0.3", "@hapi/wreck": "^18.1.0", - "@hapi/yar": "^11.0.2", + "@hapi/yar": "^11.0.3", "@types/dagre": "^0.7.52", "@types/govuk-frontend": "^5.9.0", "@types/hapi__cookie": "^12.0.5", @@ -3584,9 +3584,10 @@ "integrity": "sha512-PnsP5d4q7289pS2T2EgGz147BFJ2Jpb4yrEdkpz2IhgEUzos1S7HTl7ezWh1yfYzYlj89KzLdCRkqsP6SIryeQ==" }, "node_modules/@hapi/yar": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/@hapi/yar/-/yar-11.0.2.tgz", - "integrity": "sha512-YRi0MKepRuddc6qRBRZ9jIc4I2Ikb7UB/4IlMa+wR8CUXI/7oOKeQVDx4ZCxXLI42vssCv/j65ZI84c7m8d2WA==", + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/@hapi/yar/-/yar-11.0.3.tgz", + "integrity": "sha512-8ScE8V+3biKO6oRy9hLGdoZwHXTL5URDxqbDeJIgNPvd5/GAed4RLAUJPWbtCT5ouWlaLuLppHjcm5nDLrJQqw==", + "license": "BSD-3-Clause", "dependencies": { "@hapi/hoek": "^11.0.2", "@hapi/statehood": "^8.0.1" From 38f8fdd73cd181c002bca8234174ae95fe6d9560 Mon Sep 17 00:00:00 2001 From: Chris Cole Date: Mon, 2 Jun 2025 14:40:01 +0100 Subject: [PATCH 2/4] Revert "Bump govuk-frontend and @types/govuk-frontend (#894)" This reverts commit 4c0e4b3f0ea707a95796d9981ab721faceae98d8. --- designer/package.json | 4 ++-- package-lock.json | 36 +++++++++++++++++++++++++++--------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/designer/package.json b/designer/package.json index 7e5b82a80f..ef4593b54e 100644 --- a/designer/package.json +++ b/designer/package.json @@ -53,7 +53,7 @@ "@hapi/wreck": "^18.1.0", "@hapi/yar": "^11.0.3", "@types/dagre": "^0.7.52", - "@types/govuk-frontend": "^5.9.0", + "@types/govuk-frontend": "^5.7.0", "@types/hapi__cookie": "^12.0.5", "@types/hapi__crumb": "^7.3.7", "@types/hapi__inert": "^5.2.10", @@ -75,7 +75,7 @@ "date-fns": "^4.1.0", "depth-first": "^4.0.0", "focus-trap-react": "^11.0.3", - "govuk-frontend": "^5.10.2", + "govuk-frontend": "^5.7.1", "hapi-pino": "^12.1.0", "http-status-codes": "^2.3.0", "i18next": "^24.2.3", diff --git a/package-lock.json b/package-lock.json index 6bfb9e96ee..0bc95b412d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -81,7 +81,7 @@ "@hapi/wreck": "^18.1.0", "@hapi/yar": "^11.0.3", "@types/dagre": "^0.7.52", - "@types/govuk-frontend": "^5.9.0", + "@types/govuk-frontend": "^5.7.0", "@types/hapi__cookie": "^12.0.5", "@types/hapi__crumb": "^7.3.7", "@types/hapi__inert": "^5.2.10", @@ -103,7 +103,7 @@ "date-fns": "^4.1.0", "depth-first": "^4.0.0", "focus-trap-react": "^11.0.3", - "govuk-frontend": "^5.10.2", + "govuk-frontend": "^5.7.1", "hapi-pino": "^12.1.0", "http-status-codes": "^2.3.0", "i18next": "^24.2.3", @@ -187,6 +187,15 @@ } } }, + "designer/node_modules/govuk-frontend": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-5.7.1.tgz", + "integrity": "sha512-jF1cq5rn57kxZmJRprUZhTQ31zaBBK4b5AyeJaPX3Yhg22lk90Mx/dQLvOk/ycV3wM7e0y+s4IPvb2fFaPlCGg==", + "license": "MIT", + "engines": { + "node": ">= 4.2.0" + } + }, "designer/node_modules/react": { "version": "18.3.1", "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", @@ -2331,6 +2340,15 @@ "integrity": "sha512-HV5undWkKzcB4RZUusqOpcgxOaq6VOAH7zhhIr2g3G8NF/MlFO75SjOr2NfuSx0Mh40+1FqCkagKLJRykUWoFQ==", "license": "BSD-3-Clause" }, + "node_modules/@defra/forms-engine-plugin/node_modules/govuk-frontend": { + "version": "5.10.1", + "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-5.10.1.tgz", + "integrity": "sha512-VmzKE+pkuOqEXhit0cGqic4i2mOQwflfXDiEcsa6Lrqs//rxV5AYf+C71jbREPwQLH4wYSJAlz/GlGoO5nik7Q==", + "license": "MIT", + "engines": { + "node": ">= 4.2.0" + } + }, "node_modules/@defra/forms-model": { "resolved": "model", "link": true @@ -4744,9 +4762,9 @@ } }, "node_modules/@types/govuk-frontend": { - "version": "5.9.0", - "resolved": "https://registry.npmjs.org/@types/govuk-frontend/-/govuk-frontend-5.9.0.tgz", - "integrity": "sha512-oaTZA/QJ7cGEMoO5Mu29qZkiIewL2fxRxTI+iXHgNjjBW1SeJCSMmU6rh1Fv7AWhQzaXQO+fJW/WQLXzdNkSVQ==", + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@types/govuk-frontend/-/govuk-frontend-5.7.0.tgz", + "integrity": "sha512-TcYJYKpr+uP6aCLlQhyIL5zU24v42XL3nqzPSoHBGmUC3DxjiH/5xFgAsL704KzW1fQwHathV8XoQN/p4srfDQ==", "license": "MIT" }, "node_modules/@types/graceful-fs": { @@ -10300,10 +10318,10 @@ } }, "node_modules/govuk-frontend": { - "version": "5.10.2", - "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-5.10.2.tgz", - "integrity": "sha512-eVYB2rfUCihehZFHQyylt12/OuXq2JLs+70igcrB1FmbepcDqs1XwKiq96hsPbPF9Vn2f6QXO1OatyD3bq5c9Q==", - "license": "MIT", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-4.0.1.tgz", + "integrity": "sha512-X+B88mqYHoxAz0ID87Uxo3oHqdKBRnNHd3Cz8+u8nvQUAsrEzROFLK+t7sAu7e+fKqCCrJyIgx6Cmr6dIGnohQ==", + "peer": true, "engines": { "node": ">= 4.2.0" } From cd54b88e833a281733491f4a49bf5366c40ccc79 Mon Sep 17 00:00:00 2001 From: Chris Cole Date: Mon, 2 Jun 2025 14:50:50 +0100 Subject: [PATCH 3/4] fix conflict --- designer/precompile-govuk-components.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/designer/precompile-govuk-components.js b/designer/precompile-govuk-components.js index ce6821e4b0..ee853f64b1 100755 --- a/designer/precompile-govuk-components.js +++ b/designer/precompile-govuk-components.js @@ -1,11 +1,8 @@ import { join } from 'node:path' import { precompileFn } from './bin/precompile.js' -const inputPath = join( - import.meta.dirname, - '../node_modules/govuk-frontend/dist' -) - +const inputPath = join(import.meta.dirname, 'node_modules/govuk-frontend/dist') +console.log('~~~~~~ Chris Debug ~~~~~~ ', 'InputPath', inputPath) const outputPath = join( import.meta.dirname, 'client/src/assets/nunjucks/govuk-components.js' From 17cc977bff852a4ccf07346ca64fc7e8ff162467 Mon Sep 17 00:00:00 2001 From: Chris Cole Date: Mon, 2 Jun 2025 14:55:00 +0100 Subject: [PATCH 4/4] chore: remove console log --- designer/precompile-govuk-components.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/designer/precompile-govuk-components.js b/designer/precompile-govuk-components.js index 866d8f6bc0..69f8e3396a 100755 --- a/designer/precompile-govuk-components.js +++ b/designer/precompile-govuk-components.js @@ -2,8 +2,6 @@ import { join } from 'node:path' import { precompileFn } from './bin/precompile.js' const inputPath = join(import.meta.dirname, 'node_modules/govuk-frontend/dist') -console.log('~~~~~~ Chris Debug ~~~~~~ ', 'InputPath', inputPath) - const outputPath = join( import.meta.dirname, 'client/src/assets/nunjucks/govuk-components.js'