From 10f67254c13c0d59f6be8099f4329104916e4536 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Jan 2025 09:46:55 +0000 Subject: [PATCH 1/4] npm: bump @x-govuk/govuk-eleventy-plugin from 6.6.2 to 6.7.2 Bumps [@x-govuk/govuk-eleventy-plugin](https://github.com/x-govuk/govuk-eleventy-plugin) from 6.6.2 to 6.7.2. - [Release notes](https://github.com/x-govuk/govuk-eleventy-plugin/releases) - [Commits](https://github.com/x-govuk/govuk-eleventy-plugin/compare/v6.6.2...v6.7.2) --- updated-dependencies: - dependency-name: "@x-govuk/govuk-eleventy-plugin" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 52 +++++++++-------------------------------------- package.json | 2 +- 2 files changed, 11 insertions(+), 43 deletions(-) diff --git a/package-lock.json b/package-lock.json index aa741d93..5354e044 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "MIT", "dependencies": { "@11ty/eleventy": "^3.0.0", - "@x-govuk/govuk-eleventy-plugin": "^6.6.2", + "@x-govuk/govuk-eleventy-plugin": "^6.7.2", "luxon": "^3.5.0", "parse5": "^7.2.1" }, @@ -596,15 +596,13 @@ } }, "node_modules/@rollup/plugin-node-resolve": { - "version": "15.2.3", - "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz", - "integrity": "sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==", - "license": "MIT", + "version": "16.0.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.0.tgz", + "integrity": "sha512-0FPvAeVUT/zdWoO0jnb/V5BlBsUSNfkIOtFHzMO4H9MOklrmQFY6FduVHKucNb/aTFxvnGhj4MNj/T1oNdDfNg==", "dependencies": { "@rollup/pluginutils": "^5.0.1", "@types/resolve": "1.20.2", "deepmerge": "^4.2.2", - "is-builtin-module": "^3.2.1", "is-module": "^1.0.0", "resolve": "^1.22.1" }, @@ -979,8 +977,7 @@ "node_modules/@types/resolve": { "version": "1.20.2", "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz", - "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==", - "license": "MIT" + "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==" }, "node_modules/@types/sinonjs__fake-timers": { "version": "8.1.1", @@ -1008,15 +1005,15 @@ } }, "node_modules/@x-govuk/govuk-eleventy-plugin": { - "version": "6.6.2", - "resolved": "https://registry.npmjs.org/@x-govuk/govuk-eleventy-plugin/-/govuk-eleventy-plugin-6.6.2.tgz", - "integrity": "sha512-waGoVz4Z8eAaLoYS14zILCTWtJPMEcdTMICwbIDYlO/dm9yUOcukQxNv6Zb4ibSbll3NZZD/zUY9m6lwiMQ6sA==", + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/@x-govuk/govuk-eleventy-plugin/-/govuk-eleventy-plugin-6.7.2.tgz", + "integrity": "sha512-xDHg6JNucWlc9F1rCNVNHaSWnTyyYCEDoC7MgKY4BPm7sz8RE+PS55lM4co+Y5omg8FAbQvCD/Qz/a7w++3QZA==", "dependencies": { "@11ty/eleventy": "^2.0.0", "@11ty/eleventy-navigation": "^0.3.2", "@11ty/eleventy-plugin-rss": "^1.0.0", "@rollup/plugin-commonjs": "^28.0.0", - "@rollup/plugin-node-resolve": "^15.0.0", + "@rollup/plugin-node-resolve": "^16.0.0", "@x-govuk/govuk-prototype-components": "^3.0.0", "deepmerge": "^4.2.2", "govuk-frontend": "^5.6.0", @@ -2007,18 +2004,6 @@ "license": "MIT", "optional": true }, - "node_modules/builtin-modules": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz", - "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==", - "license": "MIT", - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -2712,7 +2697,6 @@ "version": "4.3.1", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", - "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -4491,21 +4475,6 @@ "node": ">=8" } }, - "node_modules/is-builtin-module": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz", - "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==", - "license": "MIT", - "dependencies": { - "builtin-modules": "^3.3.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/is-core-module": { "version": "2.15.1", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", @@ -4625,8 +4594,7 @@ "node_modules/is-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", - "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==", - "license": "MIT" + "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==" }, "node_modules/is-number": { "version": "7.0.0", diff --git a/package.json b/package.json index afe7425d..ba8ea17a 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ }, "dependencies": { "@11ty/eleventy": "^3.0.0", - "@x-govuk/govuk-eleventy-plugin": "^6.6.2", + "@x-govuk/govuk-eleventy-plugin": "^6.7.2", "luxon": "^3.5.0", "parse5": "^7.2.1" }, From 91dc60a93a26159a2c5b50fa8a019ecdcdc8ec72 Mon Sep 17 00:00:00 2001 From: Jeffrey Horton Date: Fri, 3 Jan 2025 11:32:48 +0000 Subject: [PATCH 2/4] Use full path to xgov-eleventy-plugin layouts to work around 6.7.x template precedence changes --- _includes/layouts/base.njk | 2 +- _includes/layouts/collection.njk | 2 +- _includes/layouts/content.njk | 2 +- _includes/layouts/page.njk | 2 +- _includes/layouts/pattern.njk | 2 +- _includes/layouts/post.njk | 2 +- _includes/layouts/principle.njk | 2 +- _includes/layouts/product.njk | 2 +- _includes/layouts/sitemap.njk | 2 +- _includes/layouts/standard.njk | 2 +- _includes/layouts/sub-navigation.njk | 2 +- _includes/layouts/tag.njk | 2 +- _includes/layouts/tags.njk | 2 +- package-lock.json | 24 ++++++++++++++---------- 14 files changed, 27 insertions(+), 23 deletions(-) diff --git a/_includes/layouts/base.njk b/_includes/layouts/base.njk index 41933ecf..348bc04b 100644 --- a/_includes/layouts/base.njk +++ b/_includes/layouts/base.njk @@ -1 +1 @@ -{% extends "layouts/base.njk" %} +{% extends "../../node_modules/@x-govuk/govuk-eleventy-plugin/layouts/base.njk" %} diff --git a/_includes/layouts/collection.njk b/_includes/layouts/collection.njk index 66b80b1a..2bdfe89e 100644 --- a/_includes/layouts/collection.njk +++ b/_includes/layouts/collection.njk @@ -1,4 +1,4 @@ -{% extends "layouts/base.njk" %} +{% extends "../../node_modules/@x-govuk/govuk-eleventy-plugin/layouts/base.njk" %} {#- https://github.com/x-govuk/govuk-eleventy-plugin/blob/main/components/header/template.njk#L4-L6 diff --git a/_includes/layouts/content.njk b/_includes/layouts/content.njk index bdc4c50f..2d164715 100644 --- a/_includes/layouts/content.njk +++ b/_includes/layouts/content.njk @@ -1,4 +1,4 @@ -{% extends "layouts/base.njk" %} +{% extends "../../node_modules/@x-govuk/govuk-eleventy-plugin/layouts/base.njk" %} {% block beforeContent %} {% if phaseBannerConfiguration %} diff --git a/_includes/layouts/page.njk b/_includes/layouts/page.njk index cbb4d2c9..6422678e 100644 --- a/_includes/layouts/page.njk +++ b/_includes/layouts/page.njk @@ -1,4 +1,4 @@ -{% extends "layouts/page.njk" %} +{% extends "../../node_modules/@x-govuk/govuk-eleventy-plugin/layouts/page.njk" %} {% block beforeContent %} {% if phaseBannerConfiguration %} diff --git a/_includes/layouts/pattern.njk b/_includes/layouts/pattern.njk index 99a2bd2e..f149e474 100644 --- a/_includes/layouts/pattern.njk +++ b/_includes/layouts/pattern.njk @@ -1,6 +1,6 @@ {% extends "layouts/content.njk" %} {% block sidebar %} - {{ navigationList(page.url, "Patterns", collections.getAllPatternsOrderedByTitle) }} + {{ navigationList(page.url, "Patterns", collections.getAllPatternsOrderedByTitle) }} {{ super() }} {% endblock %} diff --git a/_includes/layouts/post.njk b/_includes/layouts/post.njk index 244e0548..983bfb5b 100644 --- a/_includes/layouts/post.njk +++ b/_includes/layouts/post.njk @@ -1,4 +1,4 @@ -{% extends "layouts/post.njk" %} +{% extends "../../node_modules/@x-govuk/govuk-eleventy-plugin/layouts/base.njk" %} {% block beforeContent %} {% if phaseBannerConfiguration %} diff --git a/_includes/layouts/principle.njk b/_includes/layouts/principle.njk index 82965b02..cc367fdf 100644 --- a/_includes/layouts/principle.njk +++ b/_includes/layouts/principle.njk @@ -1,6 +1,6 @@ {% extends "layouts/content.njk" %} {% block sidebar %} - {{ navigationList(page.url, "Principles", collections.getAllPrinciplesOrderedByTitle) }} + {{ navigationList(page.url, "Principles", collections.getAllPrinciplesOrderedByTitle) }} {{ super() }} {% endblock %} diff --git a/_includes/layouts/product.njk b/_includes/layouts/product.njk index bb255b7b..838c2572 100644 --- a/_includes/layouts/product.njk +++ b/_includes/layouts/product.njk @@ -1,4 +1,4 @@ -{% extends "layouts/product.njk" %} +{% extends "../../node_modules/@x-govuk/govuk-eleventy-plugin/layouts/product.njk" %} {#- https://github.com/x-govuk/govuk-eleventy-plugin/blob/main/components/header/template.njk#L4-L6 diff --git a/_includes/layouts/sitemap.njk b/_includes/layouts/sitemap.njk index 200f4d55..ac6ad4e6 100644 --- a/_includes/layouts/sitemap.njk +++ b/_includes/layouts/sitemap.njk @@ -1,4 +1,4 @@ -{% extends "layouts/sitemap.njk" %} +{% extends "../../node_modules/@x-govuk/govuk-eleventy-plugin/layouts/sitemap.njk" %} {% block beforeContent %} {% if phaseBannerConfiguration %} diff --git a/_includes/layouts/standard.njk b/_includes/layouts/standard.njk index 78b19d1e..c98eae49 100644 --- a/_includes/layouts/standard.njk +++ b/_includes/layouts/standard.njk @@ -1,6 +1,6 @@ {% extends "layouts/content.njk" %} {% block sidebar %} - {{ navigationList(page.url, "Standards", collections.getAllStandardsOrderedByID) }} + {{ navigationList(page.url, "Standards", collections.getAllStandardsOrderedByID) }} {{ super() }} {% endblock %} diff --git a/_includes/layouts/sub-navigation.njk b/_includes/layouts/sub-navigation.njk index 38487a4c..fc9e2822 100644 --- a/_includes/layouts/sub-navigation.njk +++ b/_includes/layouts/sub-navigation.njk @@ -1,4 +1,4 @@ -{% extends "layouts/sub-navigation.njk" %} +{% extends "../../node_modules/@x-govuk/govuk-eleventy-plugin/layouts/sub-navigation.njk" %} {% block beforeContent %} {% if phaseBannerConfiguration %} diff --git a/_includes/layouts/tag.njk b/_includes/layouts/tag.njk index bd43b4ba..26886be5 100644 --- a/_includes/layouts/tag.njk +++ b/_includes/layouts/tag.njk @@ -1,4 +1,4 @@ -{% extends "layouts/tag.njk" %} +{% extends "../../node_modules/@x-govuk/govuk-eleventy-plugin/layouts/tag.njk" %} {% block beforeContent %} {% if phaseBannerConfiguration %} diff --git a/_includes/layouts/tags.njk b/_includes/layouts/tags.njk index 24ed3431..99a299ff 100644 --- a/_includes/layouts/tags.njk +++ b/_includes/layouts/tags.njk @@ -1,4 +1,4 @@ -{% extends "layouts/tags.njk" %} +{% extends "../../node_modules/@x-govuk/govuk-eleventy-plugin/layouts/tags.njk" %} {% block beforeContent %} {% if phaseBannerConfiguration %} diff --git a/package-lock.json b/package-lock.json index 5354e044..200b4098 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2562,9 +2562,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "license": "MIT", "dependencies": { "path-key": "^3.1.0", @@ -3350,9 +3350,9 @@ } }, "node_modules/express": { - "version": "4.21.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", - "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", + "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", "license": "MIT", "optional": true, "dependencies": { @@ -3375,7 +3375,7 @@ "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.10", + "path-to-regexp": "0.1.12", "proxy-addr": "~2.0.7", "qs": "6.13.0", "range-parser": "~1.2.1", @@ -3390,6 +3390,10 @@ }, "engines": { "node": ">= 0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/express-session": { @@ -3464,9 +3468,9 @@ "optional": true }, "node_modules/express/node_modules/path-to-regexp": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", - "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==", + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", "license": "MIT", "optional": true }, From a73aa6216c4e44f0b61de9ccac81a173720245af Mon Sep 17 00:00:00 2001 From: Jeffrey Horton Date: Fri, 3 Jan 2025 11:37:37 +0000 Subject: [PATCH 3/4] Missed layouts/shared/related.njk --- _includes/layouts/shared/related.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/layouts/shared/related.njk b/_includes/layouts/shared/related.njk index 1315cb4e..8e525be9 100644 --- a/_includes/layouts/shared/related.njk +++ b/_includes/layouts/shared/related.njk @@ -1 +1 @@ -{% extends "layouts/shared/related.njk" %} +{% extends "../../../node_modules/@x-govuk/govuk-eleventy-plugin/layouts/shared/related.njk" %} From 73efd8a0ec4b2cde1c4c063c7fd6dc6f3e246d0a Mon Sep 17 00:00:00 2001 From: Jeffrey Horton Date: Fri, 3 Jan 2025 11:52:22 +0000 Subject: [PATCH 4/4] Use post layout in post, not base --- _includes/layouts/post.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/layouts/post.njk b/_includes/layouts/post.njk index 983bfb5b..02f448cd 100644 --- a/_includes/layouts/post.njk +++ b/_includes/layouts/post.njk @@ -1,4 +1,4 @@ -{% extends "../../node_modules/@x-govuk/govuk-eleventy-plugin/layouts/base.njk" %} +{% extends "../../node_modules/@x-govuk/govuk-eleventy-plugin/layouts/post.njk" %} {% block beforeContent %} {% if phaseBannerConfiguration %}