@x-govuk/nhsuk-eleventy-plugin 1.3.0 → 1.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@x-govuk/nhsuk-eleventy-plugin",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "description": "Write documentation using Markdown and publish it using NHS.UK styles",
   "keywords": [
     "nhsuk",
@@ -52,17 +52,17 @@
     "access": "public"
   },
   "dependencies": {
-    "@11ty/eleventy": "^3.1.5",
+    "@11ty/eleventy": "^3.1.6",
     "@11ty/eleventy-navigation": "^1.0.5",
     "@rollup/plugin-commonjs": "^29.0.3",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-terser": "^1.0.0",
-    "@x-govuk/govuk-eleventy-plugin": "^9.0.1",
+    "@x-govuk/govuk-eleventy-plugin": "^9.0.2",
     "accessible-autocomplete": "^3.0.1",
     "deepmerge": "^4.3.1",
     "highlight.js": "^11.11.1",
     "markdown-it-abbr": "^2.0.0",
-    "markdown-it-anchor": "^9.2.0",
+    "markdown-it-anchor": "^9.2.1",
     "markdown-it-attribution": "^0.1.4",
     "markdown-it-attrs": "^5.0.0",
     "markdown-it-deflist": "^3.0.1",
@@ -75,16 +75,16 @@
     "markdown-it-sub": "^2.0.0",
     "markdown-it-sup": "^2.0.0",
     "markdown-it-table-of-contents": "^1.2.0",
-    "nhsuk-frontend": "^10.4.2",
-    "rollup": "^4.61.0",
-    "sass": "^1.100.0"
+    "nhsuk-frontend": "^10.5.2",
+    "rollup": "^4.62.2",
+    "sass": "^1.101.0"
   },
   "devDependencies": {
     "@x-govuk/eslint-config": "^0.0.2",
     "@x-govuk/nhsuk-eleventy-plugin": "file:./",
-    "np": "^11.2.1",
-    "prettier": "^3.8.3",
-    "stylelint": "^17.12.0",
+    "np": "^12.0.0",
+    "prettier": "^3.9.5",
+    "stylelint": "^17.14.0",
     "stylelint-config-gds": "^3.0.0",
     "stylelint-order": "^8.1.1"
   },

package/src/data/eleventy-computed.js

@@ -9,6 +9,9 @@ import {
  * @see {@link https://www.11ty.dev/docs/plugins/navigation/}
  */
 export const eleventyComputed = {
+  // Alias for Eleventy's pagination data to avoid naming conflict with the
+  // nhsuk-frontend `pagination` Nunjucks macro in template-with-imports.njk
+  eleventyPagination: (data) => data.pagination,
   eleventyNavigation: {
     key: (data) => getNavigationKey(data),
     parent: (data) => getNavigationParent(data),

package/src/layouts/base.njk

@@ -1,4 +1,4 @@
-{% extends "nhsuk/template.njk" %}
+{% extends "nhsuk/template-with-imports.njk" %}
 
 {% set themeColor = options.themeColor | default("#005eb8", true) -%}
 
@@ -15,12 +15,6 @@
 {% 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 %}
 
-{% from "nhsuk/components/breadcrumb/macro.njk" import breadcrumb as nhsukBreadcrumb %}
-{% from "nhsuk/components/footer/macro.njk" import footer as nhsukFooter %}
-{% from "nhsuk/components/header/macro.njk" import header as nhsukHeader %}
-{% from "nhsuk/components/images/macro.njk" import image as nhsukImage %}
-{% from "nhsuk/components/pagination/macro.njk" import pagination as nhsukPagination %}
-
 {% from "components/card-group/macro.njk" import appCardGroup with context %}
 {% from "components/document-header/macro.njk" import appDocumentHeader %}
 {% from "components/document-list/macro.njk" import appDocumentList %}
@@ -65,15 +59,15 @@
 {% block header %}
 {% if options._searchIndexPath %}
 <app-search index="{{ options._searchIndexPath | htmlBaseUrl }}">
-  {{ nhsukHeader(options.header | currentPage(page.url)) }}
+  {{ header(options.header | currentPage(page.url)) }}
 </app-search>
 {% else %}
-  {{ nhsukHeader(options.header | currentPage(page.url)) }}
+  {{ header(options.header | currentPage(page.url)) }}
 {% endif %}
 {% endblock %}
 
 {% block footer %}
-  {{ nhsukFooter(options.footer) }}
+  {{ footer(options.footer) }}
 {% endblock %}
 
 {% block bodyEnd %}

package/src/layouts/collection.njk

@@ -1,7 +1,7 @@
 {% extends "layouts/base.njk" %}
 
 {% block beforeContent %}
-  {{ nhsukBreadcrumb({
+  {{ breadcrumb({
     items: breadcrumbItems
   }) if showBreadcrumbs }}
 {% endblock %}
@@ -23,18 +23,18 @@
 
   {{ appDocumentList({
     headingLevel: 3 if paginationHeading else 2,
-    items: pagination.items
+    items: eleventyPagination.items
   }) }}
 
-  {{ nhsukPagination({
+  {{ pagination({
     previous: {
-      href: pagination.href.previous
+      href: eleventyPagination.href.previous
     },
     next: {
-      href: pagination.href.next
+      href: eleventyPagination.href.next
     },
-    items: pagination | itemsFromPagination
-  }) if pagination.pages.length > 1 }}
+    items: eleventyPagination | itemsFromPagination
+  }) if eleventyPagination.pages.length > 1 }}
 
   {{ appRelated(related) if related }}
 {% endblock %}

package/src/layouts/hub.njk

@@ -1,7 +1,7 @@
 {% extends "layouts/base.njk" %}
 
 {% block beforeContent %}
-  {{ nhsukBreadcrumb({
+  {{ breadcrumb({
     items: breadcrumbItems
   }) if showBreadcrumbs }}
 {% endblock %}

package/src/layouts/page.njk

@@ -1,7 +1,7 @@
 {% extends "layouts/base.njk" %}
 
 {% block beforeContent %}
-  {{ nhsukBreadcrumb({
+  {{ breadcrumb({
     items: breadcrumbItems
   }) if showBreadcrumbs }}
 {% endblock %}
@@ -18,7 +18,7 @@
   {% if showPagination %}
     {% set previous = collections.navigation | eleventyNavigation(sectionKey or options.homeKey) | getPreviousNavigationItem(page.url) %}
     {% set next = collections.navigation | eleventyNavigation(sectionKey or options.homeKey) | getNextNavigationItem(page.url) %}
-    {{ nhsukPagination({
+    {{ pagination({
       classes: "nhsuk-u-reading-width",
       previousUrl: previous.url if previous,
       previousPage: previous.title if previous,

package/src/layouts/post.njk

@@ -1,7 +1,7 @@
 {% extends "layouts/base.njk" %}
 
 {% block beforeContent %}
-  {{ nhsukBreadcrumb({
+  {{ breadcrumb({
     items: breadcrumbItems
   }) if showBreadcrumbs }}
 {% endblock %}
@@ -21,7 +21,7 @@
   }) }}
 
   {% call appProseScope() %}
-    {{ nhsukImage({
+    {{ image({
       classes: "app-image--full",
       src: image.src,
       alt: image.alt,
@@ -34,7 +34,7 @@
   {% if showPagination %}
     {% set previous = collections.navigation | eleventyNavigation(sectionKey or options.homeKey) | getPreviousNavigationItem(page.url) %}
     {% set next = collections.navigation | eleventyNavigation(sectionKey or options.homeKey) | getNextNavigationItem(page.url) %}
-    {{ nhsukPagination({
+    {{ pagination({
       classes: "nhsuk-u-reading-width",
       previousUrl: previous.url if previous,
       previousPage: previous.title if previous,

package/src/layouts/sub-navigation.njk

@@ -1,7 +1,7 @@
 {% extends "layouts/base.njk" %}
 
 {% block beforeContent %}
-  {{ nhsukBreadcrumb({
+  {{ breadcrumb({
     items: breadcrumbItems
   }) if showBreadcrumbs }}
 {% endblock %}
@@ -25,7 +25,7 @@
       {% if showPagination %}
         {% set previous = collections.navigation | eleventyNavigation(sectionKey or options.homeKey) | getPreviousNavigationItem(page.url) %}
         {% set next = collections.navigation | eleventyNavigation(sectionKey or options.homeKey) | getNextNavigationItem(page.url) %}
-        {{ nhsukPagination({
+        {{ pagination({
           classes: "nhsuk-u-reading-width",
           previousUrl: previous.url if previous,
           previousPage: previous.title if previous,

package/src/markdown-it/highlight.js

@@ -1,5 +1,13 @@
+import hljs from 'highlight.js'
 import { highlighter } from 'nhsuk-frontend/lib/highlighter/index.mjs'
 
+// Register all highlight.js languages
+for (const name of hljs.listLanguages()) {
+  if (!highlighter.getLanguage(name)) {
+    highlighter.registerLanguage(name, hljs.getLanguage(name).rawDefinition)
+  }
+}
+
 /**
  * Highlight code using highlight.js
  *

package/src/nunjucks.js

@@ -35,8 +35,11 @@ export function nunjucksConfig(eleventyConfig) {
     ...(includes ? [path.join(input, includes)] : []),
     ...(layouts ? [path.join(input, layouts)] : []),
     input,
-    './node_modules/@x-govuk/nhsuk-eleventy-plugin/src',
-    './node_modules/nhsuk-frontend/dist'
+    'node_modules/@x-govuk/nhsuk-eleventy-plugin/src',
+    'node_modules/nhsuk-frontend/dist/nhsuk/components',
+    'node_modules/nhsuk-frontend/dist/nhsuk/macros',
+    'node_modules/nhsuk-frontend/dist/nhsuk',
+    'node_modules/nhsuk-frontend/dist'
   ]
 
   /**