@x-govuk/govuk-eleventy-plugin 6.7.0 → 6.7.2

package/components/header/template.njk

@@ -1,4 +1,4 @@
-{%- from "../site-search/macro.njk" import appSiteSearch -%}
+{%- from "components/site-search/macro.njk" import appSiteSearch with context -%}
 {%- if options.navigation -%}
   {%- set headerClasses = " govuk-header--full-width-border" -%}
 {% elif layout == "product" or layout == "collection" %}

package/index.js

@@ -1,5 +1,7 @@
 const { EleventyHtmlBasePlugin } = require('@11ty/eleventy')
 
+const addCollections = require('./lib/collections/index.js')
+
 module.exports = function (eleventyConfig, pluginOptions = {}) {
   const { pathPrefix } = eleventyConfig
 
@@ -11,16 +13,7 @@ module.exports = function (eleventyConfig, pluginOptions = {}) {
   eleventyConfig.setLibrary('njk', require('./lib/nunjucks.js')(eleventyConfig))
 
   // Collections
-  eleventyConfig.addCollection('all', require('./lib/collections/all.js'))
-  eleventyConfig.addCollection(
-    'ordered',
-    require('./lib/collections/ordered.js')
-  )
-  eleventyConfig.addCollection(
-    'sitemap',
-    require('./lib/collections/sitemap.js')
-  )
-  eleventyConfig.addCollection('tags', require('./lib/collections/tags.js'))
+  addCollections(eleventyConfig)
 
   // Extensions and template formats
   eleventyConfig.addExtension('scss', require('./lib/extensions/scss.js'))

package/layouts/base.njk

@@ -35,9 +35,9 @@
 {% from "components/prose-scope/macro.njk" import appProseScope %}
 
 {% block headIcons %}
-  <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="{{ options.icons.shortcut }}" type="image/x-icon">
-  <link rel="mask-icon" href="{{ options.icons.mask }}" color="{{ themeColor }}">
-  <link rel="apple-touch-icon" href="{{ options.icons.touch }}">
+  {%- if options.icons.shortcut %}<link rel="shortcut icon" sizes="16x16 32x32 48x48" href="{{ options.icons.shortcut }}" type="image/x-icon">{% endif %}
+  {%- if options.icons.mask %}<link rel="mask-icon" href="{{ options.icons.mask }}" color="{{ themeColor }}">{% endif %}
+  {%- if options.icons.touch %}<link rel="apple-touch-icon" href="{{ options.icons.touch }}">{% endif %}
 {% endblock %}
 
 {% block head %}

package/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.ordered | eleventyNavigation(sectionKey or options.homeKey) | itemsFromNavigation(page.url, { pathPrefix: options.pathPrefix })
+        items: collections.navigation | eleventyNavigation(sectionKey or options.homeKey) | itemsFromNavigation(page.url, { pathPrefix: options.pathPrefix })
       }) }}
     </div>
     <div class="govuk-grid-column-three-quarters-from-desktop">

package/lib/collections/index.js

@@ -0,0 +1,17 @@
+module.exports = function (eleventyConfig) {
+  if (!eleventyConfig.collections.all) {
+    eleventyConfig.addCollection('all', require('./all.js'))
+  }
+
+  if (!eleventyConfig.collections.navigation) {
+    eleventyConfig.addCollection('navigation', require('./navigation.js'))
+  }
+
+  if (!eleventyConfig.collections.sitemap) {
+    eleventyConfig.addCollection('sitemap', require('./sitemap.js'))
+  }
+
+  if (!eleventyConfig.collections.tag) {
+    eleventyConfig.addCollection('tags', require('./tags.js'))
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@x-govuk/govuk-eleventy-plugin",
-  "version": "6.7.0",
+  "version": "6.7.2",
   "description": "Write documentation using Markdown and publish it using GOV.UK styles",
   "keywords": [
     "govuk",
@@ -56,7 +56,7 @@
     "@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",