@x-govuk/govuk-eleventy-plugin 6.4.1 → 6.5.0

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/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 %}
 
@@ -41,7 +41,7 @@
 {% endblock %}
 
 {% block head %}
-  <link rel="stylesheet" href="/assets/govuk.css">
+  <link rel="stylesheet" href="{{ "/assets/govuk.css" | canonicalUrl }}">
   {% for stylesheet in options.stylesheets %}
   <link rel="stylesheet" href="{{ stylesheet | canonicalUrl }}">
   {% endfor %}
@@ -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/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.1",
+  "version": "6.5.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",
@@ -83,7 +83,7 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-jsdoc": "^48.0.0",
+    "eslint-plugin-jsdoc": "^50.0.0",
     "eslint-plugin-n": "^16.4.0",
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-promise": "^6.1.0",