@x-govuk/govuk-eleventy-plugin 8.3.1 → 9.0.1

package/README.md

@@ -11,7 +11,7 @@ You’re welcome to use the plugin even if your service isn’t considered part
 
 ## Requirements
 
-- [Node.js](https://nodejs.org) v22 or later
+- [Node.js](https://nodejs.org) v22.16 or later
 - [Eleventy](https://www.11ty.dev) v3 or later
 
 ## Installation

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@x-govuk/govuk-eleventy-plugin",
-  "version": "8.3.1",
+  "version": "9.0.1",
   "description": "Write documentation using Markdown and publish it using GOV.UK styles",
   "keywords": [
     "govuk",
@@ -12,44 +12,69 @@
   "bugs": {
     "url": "git+https://github.com/x-govuk/govuk-eleventy-plugin/issues"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/x-govuk/govuk-eleventy-plugin.git"
+  },
+  "license": "MIT",
   "contributors": [
     {
       "name": "Paul Robert Lloyd",
       "url": "https://paulrobertlloyd.com"
     }
   ],
-  "license": "MIT",
+  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./src/index.js",
+      "module-sync": "./src/index.js",
+      "sass": "./src/index.scss"
+    },
+    "./collections": {
+      "import": "./src/collections/index.js",
+      "module-sync": "./src/collections/index.js"
+    },
+    "./extensions": {
+      "import": "./src/extensions/index.js",
+      "module-sync": "./src/extensions/index.js"
+    },
+    "./filters": {
+      "import": "./src/filters/index.js",
+      "module-sync": "./src/filters/index.js"
+    },
+    "./templates": {
+      "import": "./src/templates/index.js",
+      "module-sync": "./src/templates/index..js"
+    },
+    "./utils": {
+      "import": "./src/utils.js",
+      "module-sync": "./src/utils.js"
+    }
+  },
+  "main": "src/index.js",
   "files": [
     "src"
   ],
-  "main": "src/index.js",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/x-govuk/govuk-eleventy-plugin.git"
-  },
   "scripts": {
     "build": "eleventy",
     "postbuild": "npm run build:example",
     "build:example": "eleventy --config=example.config.js",
+    "coverage": "node --test --experimental-test-coverage",
     "predev": "npm run build",
     "dev": "eleventy --serve --watch",
     "dev:example": "eleventy --serve --watch --config=example.config.js",
-    "prestart": "npm run build",
-    "start": "eleventy --serve",
-    "lint:prettier": "prettier . --check",
-    "lint:prettier:fix": "prettier . --write",
+    "lint": "npm run lint:prettier && npm run lint:js && npm run lint:scss",
+    "lint:fix": "npm run lint:prettier:fix && npm run lint:js:fix && npm run lint:scss:fix",
     "lint:js": "eslint '**/*.js'",
     "lint:js:fix": "eslint '**/*.js' --fix",
+    "lint:prettier": "prettier . --check",
+    "lint:prettier:fix": "prettier . --write",
     "lint:scss": "stylelint '**/*.scss'",
     "lint:scss:fix": "stylelint '**/*.scss' --fix",
-    "lint": "npm run lint:prettier && npm run lint:js && npm run lint:scss",
-    "lint:fix": "npm run lint:prettier:fix && npm run lint:js:fix && npm run lint:scss:fix",
-    "test": "node --test",
-    "coverage": "node --test --experimental-test-coverage",
-    "release": "np --no-publish"
-  },
-  "publishConfig": {
-    "access": "public"
+    "release": "np --no-publish",
+    "prestart": "npm run build",
+    "start": "eleventy --serve",
+    "test": "node --test"
   },
   "dependencies": {
     "@11ty/eleventy": "^3.0.0",
@@ -57,10 +82,13 @@
     "@11ty/eleventy-plugin-rss": "^2.0.0",
     "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-node-resolve": "^16.0.0",
-    "@rollup/plugin-terser": "^0.4.4",
-    "@x-govuk/govuk-prototype-components": "^5.0.0",
+    "@rollup/plugin-terser": "^1.0.0",
+    "@sindresorhus/slugify": "^3.0.0",
+    "@x-govuk/govuk-prototype-components": "^6.0.0",
+    "accessible-autocomplete": "^3.0.1",
     "deepmerge": "^4.2.2",
-    "govuk-frontend": "^5.11.0",
+    "govuk-frontend": "^6.0.0",
+    "markdown-it": "^14.1.1",
     "markdown-it-abbr": "^2.0.0",
     "markdown-it-anchor": "^9.0.0",
     "markdown-it-attribution": "^0.1.4",
@@ -68,19 +96,20 @@
     "markdown-it-deflist": "^3.0.0",
     "markdown-it-footnote": "^4.0.0",
     "markdown-it-github-alerts": "^1.0.0",
-    "markdown-it-govuk": "^0.8.0",
+    "markdown-it-govuk": "^0.9.0",
     "markdown-it-image-figures": "^2.0.0",
     "markdown-it-ins": "^4.0.0",
     "markdown-it-mark": "^4.0.0",
     "markdown-it-sub": "^2.0.0",
     "markdown-it-sup": "^2.0.0",
     "markdown-it-table-of-contents": "^1.0.0",
+    "nunjucks": "^3.2.4",
     "rollup": "^4.1.0",
     "sass": "^1.45.1",
     "smartypants": "^0.2.0"
   },
   "devDependencies": {
-    "@x-govuk/eslint-config": "^0.0.1",
+    "@x-govuk/eslint-config": "^0.0.2",
     "@x-govuk/govuk-eleventy-plugin": "file:./",
     "np": "^11.0.0",
     "prettier": "^3.1.0",
@@ -89,34 +118,9 @@
     "stylelint-order": "^7.0.0"
   },
   "engines": {
-    "node": ">=22"
+    "node": ">=22.16"
   },
-  "type": "module",
-  "exports": {
-    ".": {
-      "import": "./src/index.js",
-      "module-sync": "./src/index.js",
-      "sass": "./src/index.scss"
-    },
-    "./collections": {
-      "import": "./src/collections/index.js",
-      "module-sync": "./src/collections/index.js"
-    },
-    "./extensions": {
-      "import": "./src/extensions/index.js",
-      "module-sync": "./src/extensions/index.js"
-    },
-    "./filters": {
-      "import": "./src/filters/index.js",
-      "module-sync": "./src/filters/index.js"
-    },
-    "./templates": {
-      "import": "./src/templates/index.js",
-      "module-sync": "./src/templates/index..js"
-    },
-    "./utils": {
-      "import": "./src/utils.js",
-      "module-sync": "./src/utils.js"
-    }
+  "publishConfig": {
+    "access": "public"
   }
 }

package/src/application.scss

@@ -2,9 +2,7 @@
 @use "pkg:govuk-frontend/dist/govuk" with (
   // pathPrefix gets prepended to assets path in `generate-govuk-assets.js`
   $govuk-assets-path: "/assets/",
-  $govuk-global-styles: true,
-  $govuk-new-organisation-colours: true,
-  $govuk-new-typography-scale: true
+  $govuk-global-styles: true
 );
 
 // Use GOV.UK Eleventy Plugin components

package/src/components/aside/_index.scss

@@ -2,10 +2,10 @@
 
 @include govuk-exports("govuk-eleventy-plugin/component/aside") {
   .app-aside {
-    border-top: 2px solid $govuk-brand-colour;
+    border-top: 2px solid govuk-functional-colour(brand);
+    color: govuk-functional-colour(text);
 
     @include govuk-responsive-margin(6, "bottom");
-    @include govuk-text-colour;
   }
 
   .app-aside__heading {

package/src/components/attribution/_index.scss

@@ -6,7 +6,7 @@
   }
 
   .app-attribution__caption {
-    color: $govuk-secondary-text-colour;
+    color: govuk-functional-colour(secondary-text);
     margin: govuk-spacing(-2) 0 govuk-spacing(6);
     padding: 0 0 0 govuk-spacing(6);
   }

package/src/components/contents-list/_index.scss

@@ -17,10 +17,10 @@
     }
 
     li {
+      color: govuk-functional-colour(text);
       padding-top: govuk-spacing(2);
 
       @include govuk-font($size: 16, $weight: bold);
-      @include govuk-text-colour;
 
       @include govuk-media-query($from: tablet) {
         padding-top: govuk-spacing(6) / 4;
@@ -49,9 +49,9 @@
   }
 
   .app-contents-list__title {
+    color: govuk-functional-colour(text);
     margin: 0;
 
-    @include govuk-text-colour;
     @include govuk-font($size: 16, $weight: regular, $line-height: 1.5);
   }
 }

package/src/components/document-header/_index.scss

@@ -2,7 +2,7 @@
 
 @include govuk-exports("govuk-eleventy-plugin/component/document-header") {
   .app-document-header__metadata {
-    color: $govuk-secondary-text-colour;
+    color: govuk-functional-colour(secondary-text);
     max-width: 45em;
 
     @include govuk-font($size: 16, $line-height: 1.5);

package/src/components/document-list/_index.scss

@@ -8,7 +8,7 @@
   }
 
   .app-document-list__item {
-    border-top: 1px solid $govuk-border-colour;
+    border-top: 1px solid govuk-functional-colour(border);
     margin-bottom: govuk-spacing(5);
     padding-top: govuk-spacing(2);
   }
@@ -31,7 +31,7 @@
   }
 
   .app-document-list__attribute {
-    color: $govuk-secondary-text-colour;
+    color: govuk-functional-colour(secondary-text);
     display: inline-block;
     margin: 0;
 

package/src/components/footer/template.njk

@@ -1,7 +1,7 @@
 {% from "macros/x-govuk-logo.njk" import xGovukLogo -%}
 {% from "govuk/macros/logo.njk" import govukLogo -%}
 
-<footer class="govuk-footer app-footer {{ params.classes if params.classes }}" role="contentinfo"{%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
+<div class="govuk-footer app-footer {{ params.classes if params.classes }}" role="contentinfo"{%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
   <div class="govuk-width-container {{ params.containerClasses if params.containerClasses }}">
     {% if xGovuk %}
       {{ xGovukLogo({
@@ -16,8 +16,7 @@
     {% elif params.logo != false %}
       {{- govukLogo({
         classes: "govuk-footer__crown",
-        useLogotype: false,
-        rebrand: true
+        useLogotype: false
       }) }}
     {% endif %}
     {% if params.navigation | length %}
@@ -91,4 +90,4 @@
       {% endif %}
     </div>
   </div>
-</footer>
+</div>

package/src/components/footnotes-list/_index.scss

@@ -49,7 +49,7 @@
     }
 
     :target {
-      background-color: govuk-tint($govuk-focus-colour, 75%);
+      background-color: govuk-colour("yellow", $variant: "tint-80");
     }
 
     :last-child {

package/src/components/header/template.njk

@@ -8,10 +8,10 @@
   {%- set headerClasses = " app-header--no-border" -%}
 {%- endif -%}
 
-<header class="govuk-header app-header{{ headerClasses }}" role="banner" data-module="govuk-header">
+<div class="govuk-header app-header{{ headerClasses }}" role="banner" data-module="govuk-header">
   <div class="govuk-header__container govuk-width-container app-header__container">
     <div class="govuk-header__logo app-header__logo">
-      <a href="{{ params.homepageUrl | default("/") }}" class="govuk-header__link govuk-header__link--homepage">
+      <a href="{{ params.homepageUrl | default("/") }}" class="govuk-header__homepage-link">
         {% if xGovuk %}
           {{ xGovukLogo({
             classes: "govuk-header__logotype x-govuk-header__logotype",
@@ -24,8 +24,7 @@
         {% else %}
           {{ govukLogo({
             classes: "govuk-header__logotype",
-            ariaLabelText: "GOV.UK",
-            rebrand: true
+            ariaLabelText: "GOV.UK"
           }) | trim | indent(10) }}
         {% endif %}
         {% if params.productName %}
@@ -37,4 +36,4 @@
     </div>
     {{ appSearch(params.search) if params.search.indexPath | indent(4) }}
   </div>
-</header>
+</div>

package/src/components/inset-text/_index.scss

@@ -1,33 +1,33 @@
 @use "govuk-frontend/dist/govuk" as *;
 
 .app-inset-text--tip {
-  background-color: govuk-tint(govuk-colour("blue"), 90%);
+  background-color: govuk-colour("blue", "tint-80");
   border-color: govuk-colour("blue");
 }
 
 .app-inset-text--important {
-  background-color: govuk-tint(govuk-colour("bright-purple"), 85%);
-  border-color: govuk-colour("bright-purple");
+  background-color: govuk-colour("purple", "tint-80");
+  border-color: govuk-colour("purple");
 
   .govuk-link {
-    color: govuk-shade(govuk-colour("bright-purple"), 50%);
+    color: govuk-colour("purple", "shade-50");
   }
 }
 
 .app-inset-text--warning {
-  background-color: govuk-tint(govuk-colour("yellow"), 75%);
-  border-color: govuk-colour("brown");
+  background-color: govuk-colour("yellow", $variant: "tint-80");
+  border-color: govuk-colour("yellow", $variant: "shade-25");
 
   .govuk-link {
-    color: govuk-shade(govuk-colour("yellow"), 65%);
+    color: govuk-colour("yellow", "shade-50");
   }
 }
 
 .app-inset-text--caution {
-  background-color: govuk-tint(govuk-colour("red"), 75%);
+  background-color: govuk-colour("red", $variant: "tint-80");
   border-color: govuk-colour("red");
 
   .govuk-link {
-    color: govuk-shade(govuk-colour("red"), 80%);
+    color: govuk-colour("red", "shade-50");
   }
 }

package/src/components/link/_index.scss

@@ -10,7 +10,7 @@
 
   &:hover::after,
   :target &::after {
-    color: govuk-colour("dark-grey");
+    color: govuk-functional-colour(secondary-text);
     content: "#";
     font-variant: all-small-caps;
     font-weight: normal;

package/src/components/metadata/_index.scss

@@ -2,8 +2,8 @@
 
 @include govuk-exports("govuk-eleventy-plugin/components/metadata") {
   .app-metadata {
-    border-bottom: 1px solid $govuk-border-colour;
-    border-top: 1px solid $govuk-border-colour;
+    border-bottom: 1px solid govuk-functional-colour(border);
+    border-top: 1px solid govuk-functional-colour(border);
     margin-top: 0;
 
     @include govuk-font($size: 16, $line-height: 1.5);

package/src/components/prose-scope/_index.scss

@@ -46,7 +46,7 @@
 
     // Use GOV.UK yellow colour for highlighted text
     mark {
-      background-color: govuk-tint($govuk-focus-colour, 50%);
+      background-color: govuk-colour("yellow", $variant: "tint-50");
     }
 
     // Ensure sub- and superscript text doesn’t disrupt vertical rhythm
@@ -84,16 +84,16 @@
       // Show outline around linked images within figures
       img {
         display: inline-block;
-        outline: 1px solid rgba($govuk-border-colour, 0.5);
+        outline: 1px solid rgba(govuk-functional-colour(border), 0.5);
       }
 
       > .govuk-link img {
         &:hover {
-          outline-color: $govuk-link-hover-colour;
+          outline-color: govuk-functional-colour(link-hover);
         }
 
         &:active {
-          outline-color: $govuk-link-active-colour;
+          outline-color: govuk-functional-colour(link-active);
         }
       }
 
@@ -104,12 +104,12 @@
       }
 
       :focus & {
-        background-color: $govuk-focus-colour;
+        background-color: govuk-functional-colour(focus);
       }
     }
 
     figcaption {
-      color: $govuk-secondary-text-colour;
+      color: govuk-functional-colour(secondary-text);
       margin-top: govuk-spacing(1);
 
       @include govuk-font($size: 19);
@@ -119,14 +119,14 @@
     .govuk-table[tabindex] {
       display: block;
       overflow-x: auto;
-      scrollbar-color: $govuk-border-colour govuk-colour("light-grey");
+      scrollbar-color: govuk-functional-colour(border) govuk-colour("black", $variant: "tint-95");
       scrollbar-width: thin;
 
       &:focus,
       &:focus-visible {
         box-shadow:
-          0 0 0 #{$govuk-focus-width * 3} govuk-colour("black"),
-          0 0 0 #{$govuk-focus-width * 4} $govuk-focus-colour;
+          0 0 0 #{$govuk-focus-width * 3} govuk-functional-colour(focus-text),
+          0 0 0 #{$govuk-focus-width * 4} govuk-functional-colour(focus);
         outline: #{$govuk-focus-width * 2} solid govuk-colour("white");
       }
 

package/src/components/search/_index.scss

@@ -49,7 +49,7 @@ $_icon-size: 40px;
     position: relative;
 
     .govuk-service-navigation & {
-      outline: 1px solid $govuk-border-colour;
+      outline: 1px solid govuk-functional-colour(border);
     }
 
     .govuk-service-navigation--inverse & {
@@ -66,7 +66,7 @@ $_icon-size: 40px;
   }
 
   .app-search__hint {
-    color: govuk-colour("mid-grey");
+    color: govuk-colour("black", $variant: "tint-80");
     position: absolute;
   }
 
@@ -79,15 +79,15 @@ $_icon-size: 40px;
     position: relative;
 
     &::placeholder {
-      color: govuk-colour("dark-grey");
+      color: govuk-functional-colour(secondary-text);
     }
   }
 
   .app-search__input:focus,
   .app-search__input--focused {
-    border-color: $govuk-focus-text-colour;
+    border-color: govuk-functional-colour(focus-text);
     box-shadow: inset 0 0 0 $govuk-border-width-form-element;
-    outline: $govuk-focus-width solid $govuk-focus-colour;
+    outline: $govuk-focus-width solid govuk-functional-colour(focus);
     outline-offset: 0;
   }
 
@@ -109,7 +109,7 @@ $_icon-size: 40px;
   .app-search__menu {
     background-color: govuk-colour("white");
     border-top: 0;
-    color: govuk-colour("black");
+    color: govuk-functional-colour(text);
     margin: 0;
     max-height: 342px;
     overflow-x: hidden;
@@ -138,7 +138,7 @@ $_icon-size: 40px;
   }
 
   .app-search__option {
-    border-bottom: solid govuk-colour("mid-grey");
+    border-bottom: solid govuk-functional-colour(border);
     border-width: 1px 0;
     cursor: pointer;
     display: block;
@@ -164,8 +164,8 @@ $_icon-size: 40px;
 
   .app-search__option--focused,
   .app-search__option:hover {
-    background-color: $govuk-link-colour;
-    border-color: $govuk-link-colour;
+    background-color: govuk-functional-colour(link);
+    border-color: govuk-functional-colour(link);
     color: govuk-colour("white");
     // Add a transparent outline for when users change their colours.
     outline: 3px solid transparent;
@@ -178,7 +178,7 @@ $_icon-size: 40px;
 
   .app-search__option--no-results {
     background-color: govuk-colour("white");
-    color: govuk-colour("dark-grey");
+    color: govuk-functional-colour(secondary-text);
     cursor: not-allowed;
   }
 
@@ -189,7 +189,7 @@ $_icon-size: 40px;
   }
 
   .app-search__option-metadata {
-    color: $govuk-secondary-text-colour;
+    color: govuk-functional-colour(secondary-text);
     display: block;
     margin-top: govuk-spacing(1);
 

package/src/data/options.js

@@ -16,9 +16,9 @@ const defaults = {
   },
   homeKey: 'Home',
   icons: {
-    mask: '/assets/rebrand/images/govuk-icon-mask.svg',
-    shortcut: '/assets/rebrand/images/favicon.ico',
-    touch: '/assets/rebrand/images/govuk-icon-180.png'
+    mask: '/assets/images/govuk-icon-mask.svg',
+    shortcut: '/assets/images/favicon.ico',
+    touch: '/assets/images/govuk-icon-180.png'
   },
   markdown: {
     calvert: true,
@@ -26,7 +26,7 @@ const defaults = {
     headingsStartWith: 'xl',
     govspeak: true
   },
-  opengraphImageUrl: '/assets/rebrand/images/govuk-opengraph-image.png',
+  opengraphImageUrl: '/assets/images/govuk-opengraph-image.png',
   scripts: [],
   stylesheets: [],
   titleSuffix: 'GOV.UK',

package/src/events/generate-govuk-assets.js

@@ -12,7 +12,6 @@ import * as sass from 'sass'
  *
  * @param {object} dir - Project directories
  * @param {object} options - Plugin options
- * @returns {Function} Eleventy event
  */
 export async function generateAssets(dir, options) {
   // Generate default CSS

package/src/filters/collection.js

@@ -1,6 +1,6 @@
 /**
  * Get the first `n` elements of a collection. Based on filter provided for the
- * virtual templates in @11ty/eleventy-plugin-rss’
+ * virtual templates in \@11ty/eleventy-plugin-rss’
  *
  * @param {Array} array - Eleventy collection data
  * @param {number} n - Number of items to slice from collection

package/src/filters/date.js

@@ -29,7 +29,7 @@ export function govukDate(string) {
  * Format string into an ISO 8601 date
  *
  * @param {string} string - String
- * @returns {string} ISO 8601 date
+ * @returns {string|undefined} ISO 8601 date
  */
 export function isoDate(string) {
   string = normalise(string, '')

package/src/filters/items-from-navigation.js

@@ -7,14 +7,12 @@ import { smart } from './smart.js'
  *
  * @param {Array} eleventyNavigation - Eleventy navigation data
  * @param {string} [pageUrl] - URL of current page
- * @param {object} [options] - Plugin options
  * @param {boolean} [sort] - Sort navigation items
  * @returns {Array} `items` array
  */
 export function itemsFromNavigation(
   eleventyNavigation,
   pageUrl = false,
-  options = {},
   sort = false
 ) {
   const navigationItems = []

package/src/index.js

@@ -125,11 +125,6 @@ export async function govukEleventyPlugin(eleventyConfig, pluginOptions = {}) {
   eleventyConfig.addPlugin(EleventyHtmlBasePlugin)
   eleventyConfig.addPlugin(eleventyNavigation)
 
-  // Enable GOV.UK rebrand for govuk/template.njk
-  // Can be remove with GOV.UK Frontend v6
-  // https://github.com/alphagov/govuk-frontend/issues/6097
-  eleventyConfig.addNunjucksGlobal('govukRebrand', true)
-
   // Events
   eleventyConfig.on('eleventy.after', async ({ dir }) => {
     generateAssets(dir, options)

package/src/layouts/base.njk

@@ -2,7 +2,7 @@
 
 {#- Hardcoded value is $govuk-brand-blue -#}
 {% set themeColor = options.themeColor | default("#1d70b8", true) -%}
-{% set assetPath = assetPath | default("/assets/rebrand", true) -%}
+{% set assetPath = assetPath | default("/assets", true) -%}
 
 {#- Set the opengraphImageUrl in parent template to either the one
     from the page metadata or else fallback to the generic one from options. -#}
@@ -14,7 +14,7 @@
 {% set pageCount = pagination.pages | length %}
 
 {# Navigation #}
-{% set breadcrumbItems = collections.all | eleventyNavigationBreadcrumb(eleventyNavigation.key, { includeSelf: includeInBreadcrumbs, allowMissing: true }) | itemsFromNavigation(page.url, options) if eleventyNavigation.key %}
+{% set breadcrumbItems = collections.all | eleventyNavigationBreadcrumb(eleventyNavigation.key, { includeSelf: includeInBreadcrumbs, allowMissing: true }) | itemsFromNavigation(page.url) if eleventyNavigation.key %}
 {% set showBreadcrumbs = options.showBreadcrumbs != false and breadcrumbItems | length > 0 %}
 
 {# Components #}
@@ -71,7 +71,7 @@
   {{- " - " + options.titleSuffix if options.titleSuffix -}}
 {% endblock %}
 
-{% block header %}
+{% block govukHeader %}
   {{ appHeader(options.header) }}
   {{ appServiceNavigation(options.serviceNavigation) if options.serviceNavigation }}
   {% block phaseBanner %}
@@ -79,7 +79,7 @@
   {% endblock %}
 {% endblock %}
 
-{% block footer %}
+{% block govukFooter %}
   {{ appFooter(options.footer) }}
 {% endblock %}
 

package/src/layouts/collection.njk

@@ -1,6 +1,6 @@
 {% extends "layouts/base.njk" %}
 
-{% block main %}
+{% block container %}
   {{ xGovukMasthead({
     title: {
       html: title | smart

package/src/layouts/product.njk

@@ -2,7 +2,7 @@
 
 {% set inverseMasthead = inverseMasthead | default(true) %}
 
-{% block main %}
+{% block container %}
   <main id="main-content" role="main" {%- if mainLang %} lang="{{ mainLang }}"{% endif %}>
     {{ xGovukMasthead({
       inverse: inverseMasthead,

package/src/layouts/sub-navigation.njk

@@ -11,7 +11,7 @@
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-one-quarter-from-desktop">
       {{ xGovukSubNavigation({
-        items: collections.navigation | eleventyNavigation(sectionKey or options.homeKey) | itemsFromNavigation(page.url, options, true)
+        items: collections.navigation | eleventyNavigation(sectionKey or options.homeKey) | itemsFromNavigation(page.url, true)
       }) }}
     </div>
     <div class="govuk-grid-column-three-quarters-from-desktop">

package/src/markdown-it/alert.js

@@ -1,7 +1,7 @@
 /**
  * Render a GitHub-style alert
  *
- * @param {Function} md - markdown-it instance
+ * @param {import('markdown-it')} md - markdown-it instance
  */
 export function alertRules(md) {
   const { rules } = md.renderer

package/src/markdown-it/deflist.js

@@ -1,7 +1,7 @@
 /**
  * Render a definition list
  *
- * @param {Function} md - markdown-it instance
+ * @param {import('markdown-it')} md - markdown-it instance
  */
 export function defListRules(md) {
   const { rules } = md.renderer

package/src/markdown-it/footnote.js

@@ -1,7 +1,7 @@
 /**
  * Render footnotes
  *
- * @param {Function} md - markdown-it instance
+ * @param {import('markdown-it')} md - markdown-it instance
  */
 export function footnotesRules(md) {
   const { rules } = md.renderer

package/src/markdown-it/table.js

@@ -1,7 +1,7 @@
 /**
  * Render a table with `tabindex` to enable keyboard scrolling
  *
- * @param {Function} md - markdown-it instance
+ * @param {import('markdown-it')} md - markdown-it instance
  */
 export function tableRules(md) {
   const { rules } = md.renderer

package/src/markdown-it.js

@@ -26,7 +26,7 @@ import { tableRules } from './markdown-it/table.js'
  *
  * @see {@link https://markdown-it.github.io/markdown-it/}
  * @param {object} [markdownOptions] - Plugin Markdown options
- * @returns {Function} markdown-it instance
+ * @returns {import('markdown-it')} markdown-it instance
  */
 export function md(markdownOptions = {}) {
   const opts = {

package/src/nunjucks.js

@@ -21,7 +21,7 @@ const resolveNpmModule = (module) => {
  *
  * @see {@link https://mozilla.github.io/nunjucks/api.html#environment}
  * @param {object} eleventyConfig - Eleventy config
- * @returns {Function} Nunjucks environment
+ * @returns {import('nunjucks').Environment} Nunjucks environment
  */
 export function nunjucksConfig(eleventyConfig) {
   const { includes, input, layouts } = eleventyConfig.dir

package/src/utils.js

@@ -89,9 +89,10 @@ export async function getLayoutTemplates(
  * Normalise value provided to a filter. Checks that a given value exists
  * before performing a transformation.
  *
- * @param {*} value - Input value
- * @param {*} defaultValue - Value to fallback to if no value given
- * @returns {*} defaultValue
+ * @template T
+ * @param {T} value - Input value
+ * @param {T} defaultValue - Value to fallback to if no value given
+ * @returns {T} defaultValue
  */
 export function normalise(value, defaultValue) {
   if (value === null || value === undefined || value === false) {