@x-govuk/govuk-eleventy-plugin 6.4.2 → 6.6.0

package/components/footer/template.njk

@@ -53,20 +53,22 @@
           <span class="govuk-footer__licence-description">
             {{ params.contentLicence.html | safe if params.contentLicence.html else params.contentLicence.text }}
           </span>
-        {% else %}
+        {% elseif params.contentLicence != false %}
           {% include "./_ogl.svg" %}
           <span class="govuk-footer__licence-description">
             All content is available under the <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence v3.0</a>, except where otherwise stated
           </span>
         {% endif %}
       </div>
-      <div class="govuk-footer__meta-item">
-      {%- if params.copyright.html or params.copyright.text -%}
-        {{ params.copyright.html | safe if params.copyright.html else params.copyright.text }}
-      {% else %}
-        <a class="govuk-footer__link govuk-footer__copyright-logo" href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/">©&nbsp;Crown copyright</a>
+      {%- if params.copyright != false -%}
+        <div class="govuk-footer__meta-item">
+          {%- if params.copyright.html or params.copyright.text -%}
+            {{ params.copyright.html | safe if params.copyright.html else params.copyright.text }}
+          {% else %}
+            <a class="govuk-footer__link govuk-footer__copyright-logo" href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/">©&nbsp;Crown copyright</a>
+          {% endif %}
+        </div>
       {% endif %}
-      </div>
     </div>
   </div>
 </footer>

package/components/header/_header.scss

@@ -2,10 +2,6 @@
 // See: https://github.com/alphagov/govuk-design-system/blob/master/src/stylesheets/components/_header.scss
 
 @include govuk-exports("app-header") {
-  .app-header--full-width-border {
-    border-bottom: $govuk-border-width-wide solid $govuk-brand-colour;
-  }
-
   .app-header--no-border {
     border-bottom: 0;
   }

package/components/header/template.njk

@@ -1,10 +1,10 @@
 {%- from "../site-search/macro.njk" import appSiteSearch -%}
 {%- if options.navigation -%}
-  {%- set headerType = "full-width-border" -%}
+  {%- set headerClasses = " govuk-header--full-width-border" -%}
 {% elif layout == "product" or layout == "collection" %}
-  {%- set headerType = "no-border" -%}
+  {%- set headerClasses = " app-header--no-border" -%}
 {%- endif -%}
-<header class="govuk-header app-header{% if headerType %} app-header--{{ headerType }}{% endif %}" role="banner" data-module="govuk-header">
+<header 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">

package/components/site-search/template.njk

@@ -1,4 +1,4 @@
-<site-search class="app-site-search govuk-!-display-none-print" index="{{ params.indexPath | htmlBaseUrl }}" label="{{ params.label | default("Search site") }}">
+<site-search class="app-site-search govuk-!-display-none-print" index="{{ params.indexPath | canonicalUrl }}" label="{{ params.label | default("Search site") }}">
 {%- if params.sitemapPath -%}
   <a class="app-site-search__link" href="{{ params.sitemapPath }}">Sitemap</a>
 {%- endif -%}

package/layouts/base.njk

@@ -21,9 +21,9 @@
 {# Components #}
 {% from "govuk/components/breadcrumbs/macro.njk" import govukBreadcrumbs %}
 {% from "govuk/components/pagination/macro.njk" import govukPagination %}
+{% from "govuk/components/service-navigation/macro.njk" import govukServiceNavigation %}
 
 {% from "x-govuk/components/masthead/macro.njk" import xGovukMasthead %}
-{% from "x-govuk/components/primary-navigation/macro.njk" import xGovukPrimaryNavigation %}
 {% from "x-govuk/components/related-navigation/macro.njk" import xGovukRelatedNavigation %}
 {% from "x-govuk/components/sub-navigation/macro.njk" import xGovukSubNavigation %}
 
@@ -65,9 +65,9 @@
 
 {% block header %}
   {{ appHeader(options.header) }}
-  {{ xGovukPrimaryNavigation({
-    visuallyHiddenTitle: options.navigation.visuallyHiddenTitle,
-    items: options.navigation.items | currentPage(page.url)
+  {{ govukServiceNavigation({
+    navigationLabel: options.navigation.visuallyHiddenTitle,
+    navigation: options.navigation.items | currentPage(page.url)
   }) if options.navigation }}
 {% endblock %}
 

package/lib/filters/canonical-url.js

@@ -6,14 +6,19 @@ const path = require('node:path')
  * @returns {string} Canonical site URL with resolved path
  */
 module.exports = function (string = '') {
-  const { url } = this.ctx.options
+  const { options } = this.ctx
+
+  // No site URL configured
+  if (!options?.url) {
+    return string
+  }
 
   // If plugin options do not provide a site URL, return the path
-  if (!URL.canParse(url)) {
+  if (!URL.canParse(options.url)) {
     return string
   }
 
-  const siteUrl = new URL(url)
+  const siteUrl = new URL(options.url)
 
   // If incoming string is a URL, return that if it’s an external URL
   if (URL.canParse(string)) {

package/lib/filters/current-page.js

@@ -6,7 +6,7 @@
  */
 module.exports = (array, pageUrl) => {
   return array.map((item) => {
-    item.current =
+    item.active =
       item.href === '/'
         ? pageUrl === '/' // Page is home page
         : pageUrl.startsWith(item.href) // Page is within navigation section

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@x-govuk/govuk-eleventy-plugin",
-  "version": "6.4.2",
+  "version": "6.6.0",
   "description": "Write documentation using Markdown and publish it using GOV.UK styles",
   "keywords": [
     "govuk",
@@ -59,7 +59,7 @@
     "@rollup/plugin-node-resolve": "^15.0.0",
     "@x-govuk/govuk-prototype-components": "^3.0.0",
     "deepmerge": "^4.2.2",
-    "govuk-frontend": "^5.0.0",
+    "govuk-frontend": "^5.6.0",
     "luxon": "^3.0.1",
     "markdown-it-abbr": "^2.0.0",
     "markdown-it-anchor": "^9.0.0",
@@ -71,7 +71,7 @@
     "markdown-it-mark": "^4.0.0",
     "markdown-it-sub": "^2.0.0",
     "markdown-it-sup": "^2.0.0",
-    "markdown-it-table-of-contents": "^0.6.0",
+    "markdown-it-table-of-contents": "^0.8.0",
     "rimraf": "^5.0.0",
     "rollup": "^4.1.0",
     "sass": "^1.45.1",