Merge pull request #1155 from daniel-ac-martin/misc-fixes

Misc fixes
daniel-ac-martin · Nov 10, 2024 · 7685785 · 7685785 · github-actions · Nov 10, 2024
2 parents 200b25c + fad3cdc
commit 7685785
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/.github/actions/test-code/action.yml b/.github/actions/test-code/action.yml
@@ -8,7 +8,7 @@ inputs:
   node:
     description: The version of Node.js to use.
     required: false
-    default: 20
+    default: 22
 runs:
   using: composite
   steps:

diff --git a/apps/govuk-docs/package.json b/apps/govuk-docs/package.json
@@ -26,7 +26,7 @@
   "author": "Daniel A.C. Martin <npm@daniel-martin.co.uk> (http://daniel-martin.co.uk/)",
   "license": "MIT",
   "engines": {
-    "node": ">=16.0.0 <21",
+    "node": ">=18",
     "os": [
       "darwin",
       "linux"

diff --git a/apps/govuk-template/package.json b/apps/govuk-template/package.json
@@ -26,7 +26,7 @@
   "author": "Daniel A.C. Martin <npm@daniel-martin.co.uk> (http://daniel-martin.co.uk/)",
   "license": "MIT",
   "engines": {
-    "node": ">=16.0.0 <21",
+    "node": ">=18",
     "os": [
       "darwin",
       "linux"

diff --git a/components/aside/assets/Aside.scss b/components/aside/assets/Aside.scss
@@ -61,6 +61,9 @@ aside {
 .not-govuk-page--hmpo .not-govuk-aside,
 .not-govuk-page--hmpo aside {
   $home-office: map.get($govuk-colours-organisations, "home-office");
+  $contrast-safe: map.get($home-office, "contrast-safe");
+  $light-colour: map.get($home-office, "colour");
+  $colour: if($contrast-safe, $contrast-safe, $light-colour);
 
-  border-color: map.get($home-office, "colour-websafe");
+  border-color: $colour;
 }
diff --git a/lib/plop-pack/skel/app/package.json.hbs b/lib/plop-pack/skel/app/package.json.hbs
@@ -26,7 +26,7 @@
   "author": "{{{pkg 'author'}}}",
   "license": "{{{pkg 'license'}}}",
   "engines": {
-    "node": ">=16.0.0 <21",
+    "node": ">=18",
     "os": [
       "darwin",
       "linux"

diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "pnpm": "pnpm",
     "pnpm:all": "npm run pnpm -- -r",
     "pnpm:apps": "npm run pnpm:all -- --filter './apps/**'",
-    "pnpm:libs": "npm run pnpm:all -- --filter './components/**' --filter './components-internal/**' --filter './lib/**' --filter './lib-govuk/**' --filter './packages/**'",
+    "pnpm:libs": "npm run pnpm:all -- --filter './components/**' --filter './components-internal/**' --filter './lib/**' --filter './lib-govuk/**'",
     "all:build": "npm run pnpm:all -- run build",
     "all:clean": "npm run pnpm:all -- run clean",
     "all:publish": "npm run libs:publish",