govuk_publishing_components 67.1.0 → 68.1.0

data/node_modules/govuk-frontend/dist/govuk/settings/_typography-responsive.scss

@@ -16,151 +16,20 @@
 
 $govuk-root-font-size: 16px !default;
 
-/// Feature flag for new typography scale
-///
-/// When set to true, $govuk-typography-scale will use the new font map instead
-/// of the current/old one as well as apply changes in components to account
-/// for the updated scale.
-///
-/// Should be removed in 6.0.
+/// Responsive typography font map
 ///
-/// @type Boolean
-/// @access public
-
-$govuk-new-typography-scale: false !default;
-
-/// The font map for the old typography scale
+/// This is used to generate responsive typography that adapts according to the
+/// breakpoints.
 ///
-/// @type Map
+/// Font size and font weight can be defined for each breakpoint. You can define
+/// different behaviour on tablet and desktop. The 'null' breakpoint is for
+/// mobile.
 ///
-/// @prop {Number} $point.$breakpoint.font-size - Font size for `$point` at `$breakpoint`
-/// @prop {Number} $point.$breakpoint.line-height - Line height for `$point` at `$breakpoint`
-/// @prop {Number} $point.print.font-size - Font size for `$point` when printing
-/// @prop {Number} $point.print.line-height - Line height for `$point` when printing
+/// Line-heights will automatically be converted from pixel measurements into
+/// relative values. For example, with a font-size of 16px and a line-height of
+/// 24px, the line-height will be converted to 1.5 before output.
 ///
-/// @access private
-
-$_govuk-typography-scale-legacy: (
-  80: (
-    null: (
-      font-size: 53px,
-      line-height: 55px
-    ),
-    tablet: (
-      font-size: 80px,
-      line-height: 80px
-    ),
-    print: (
-      font-size: 53pt,
-      line-height: 1.1
-    )
-  ),
-  48: (
-    null: (
-      font-size: 32px,
-      line-height: 35px
-    ),
-    tablet: (
-      font-size: 48px,
-      line-height: 50px
-    ),
-    print: (
-      font-size: 32pt,
-      line-height: 1.15
-    )
-  ),
-  36: (
-    null: (
-      font-size: 24px,
-      line-height: 25px
-    ),
-    tablet: (
-      font-size: 36px,
-      line-height: 40px
-    ),
-    print: (
-      font-size: 24pt,
-      line-height: 1.05
-    )
-  ),
-  27: (
-    null: (
-      font-size: 18px,
-      line-height: 20px
-    ),
-    tablet: (
-      font-size: 27px,
-      line-height: 30px
-    ),
-    print: (
-      font-size: 18pt,
-      line-height: 1.15
-    )
-  ),
-  24: (
-    null: (
-      font-size: 18px,
-      line-height: 20px
-    ),
-    tablet: (
-      font-size: 24px,
-      line-height: 30px
-    ),
-    print: (
-      font-size: 18pt,
-      line-height: 1.15
-    )
-  ),
-  19: (
-    null: (
-      font-size: 16px,
-      line-height: 20px
-    ),
-    tablet: (
-      font-size: 19px,
-      line-height: 25px
-    ),
-    print: (
-      font-size: 14pt,
-      line-height: 1.15
-    )
-  ),
-  16: (
-    null: (
-      font-size: 14px,
-      line-height: 16px
-    ),
-    tablet: (
-      font-size: 16px,
-      line-height: 20px
-    ),
-    print: (
-      font-size: 14pt,
-      line-height: 1.2
-    )
-  ),
-  14: (
-    null: (
-      font-size: 12px,
-      line-height: 15px
-    ),
-    tablet: (
-      font-size: 14px,
-      line-height: 20px
-    ),
-    print: (
-      font-size: 12pt,
-      line-height: 1.2
-    ),
-    deprecation: (
-      key: "govuk-typography-scale-14",
-      message: "14 on the type scale is deprecated and will be removed as " +
-        "a possible option in the next major version."
-    )
-  )
-);
-
-/// The font map for the new typography scale
+/// You can also specify a separate font size and line height for print media.
 ///
 /// @type Map
 ///
@@ -169,9 +38,9 @@ $_govuk-typography-scale-legacy: (
 /// @prop {Number} $point.print.font-size - Font size for `$point` when printing
 /// @prop {Number} $point.print.line-height - Line height for `$point` when printing
 ///
-/// @access private
+/// @access public
 
-$_govuk-typography-scale-modern: (
+$govuk-typography-scale: (
   80: (
     null: (
       font-size: 53px,
@@ -265,53 +134,7 @@ $_govuk-typography-scale-modern: (
       font-size: 14pt,
       line-height: 1.2
     )
-  ),
-  14: (
-    // Stay at 14/20 at all sizes (consider deprecating this size)
-    null: (
-        font-size: 14px,
-        line-height: 20px
-      ),
-    print: (
-      font-size: 12pt,
-      line-height: 1.2
-    ),
-    deprecation: (
-      key: "govuk-typography-scale-14",
-      message: "14 on the type scale is deprecated and will be removed as " +
-        "a possible option in the next major version."
-    )
   )
-);
-
-/// Responsive typography font map
-///
-/// This is used to generate responsive typography that adapts according to the
-/// breakpoints.
-///
-/// Font size and font weight can be defined for each breakpoint. You can define
-/// different behaviour on tablet and desktop. The 'null' breakpoint is for
-/// mobile.
-///
-/// Line-heights will automatically be converted from pixel measurements into
-/// relative values. For example, with a font-size of 16px and a line-height of
-/// 24px, the line-height will be converted to 1.5 before output.
-///
-/// You can also specify a separate font size and line height for print media.
-///
-/// @type Map
-///
-/// @prop {Number} $point.$breakpoint.font-size - Font size for `$point` at `$breakpoint`
-/// @prop {Number} $point.$breakpoint.line-height - Line height for `$point` at `$breakpoint`
-/// @prop {Number} $point.print.font-size - Font size for `$point` when printing
-/// @prop {Number} $point.print.line-height - Line height for `$point` when printing
-///
-/// @access public
-
-$govuk-typography-scale: if(
-  $govuk-new-typography-scale,
-  $_govuk-typography-scale-modern,
-  $_govuk-typography-scale-legacy
 ) !default;
 
 /*# sourceMappingURL=_typography-responsive.scss.map */

data/node_modules/govuk-frontend/dist/govuk/settings/_typography-responsive.scss.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/govuk/settings/_typography-responsive.scss"],"names":[],"mappings":"AAAA,GAAG;AACH,6BAA6B;AAC7B,GAAG;;AAEH,iBAAiB;AACjB,EAAE;AACF,+EAA+E;AAC/E,wDAAwD;AACxD,EAAE;AACF,8EAA8E;AAC9E,yEAAyE;AACzE,yBAAyB;AACzB,EAAE;AACF,eAAe;AACf,iBAAiB;;AAEjB,oCAAoC;;AAEpC,wCAAwC;AACxC,EAAE;AACF,8EAA8E;AAC9E,2EAA2E;AAC3E,yBAAyB;AACzB,EAAE;AACF,4BAA4B;AAC5B,EAAE;AACF,gBAAgB;AAChB,iBAAiB;;AAEjB,2CAA2C;;AAE3C,4CAA4C;AAC5C,EAAE;AACF,YAAY;AACZ,EAAE;AACF,wFAAwF;AACxF,4FAA4F;AAC5F,+EAA+E;AAC/E,mFAAmF;AACnF,EAAE;AACF,kBAAkB;;AAElB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsHC;;AAED,4CAA4C;AAC5C,EAAE;AACF,YAAY;AACZ,EAAE;AACF,wFAAwF;AACxF,4FAA4F;AAC5F,+EAA+E;AAC/E,mFAAmF;AACnF,EAAE;AACF,kBAAkB;;AAElB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+GC;;AAED,iCAAiC;AACjC,EAAE;AACF,8EAA8E;AAC9E,eAAe;AACf,EAAE;AACF,+EAA+E;AAC/E,0EAA0E;AAC1E,UAAU;AACV,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,gEAAgE;AAChE,EAAE;AACF,6EAA6E;AAC7E,EAAE;AACF,YAAY;AACZ,EAAE;AACF,wFAAwF;AACxF,4FAA4F;AAC5F,+EAA+E;AAC/E,mFAAmF;AACnF,EAAE;AACF,iBAAiB;;AAEjB;;;;UAIU","file":"_typography-responsive.scss","sourcesContent":["////\n/// @group settings/typography\n////\n\n/// Root font size\n///\n/// This is used to calculate rem sizes for the typography, and should match the\n/// _effective_ font-size of your root (or html) element.\n///\n/// Ideally you should not be setting the font-size on the html or root element\n/// in order to allow it to scale with user-preference, in which case this\n/// should be set to 16px.\n///\n/// @type Number\n/// @access public\n\n$govuk-root-font-size: 16px !default;\n\n/// Feature flag for new typography scale\n///\n/// When set to true, $govuk-typography-scale will use the new font map instead\n/// of the current/old one as well as apply changes in components to account\n/// for the updated scale.\n///\n/// Should be removed in 6.0.\n///\n/// @type Boolean\n/// @access public\n\n$govuk-new-typography-scale: false !default;\n\n/// The font map for the old typography scale\n///\n/// @type Map\n///\n/// @prop {Number} $point.$breakpoint.font-size - Font size for `$point` at `$breakpoint`\n/// @prop {Number} $point.$breakpoint.line-height - Line height for `$point` at `$breakpoint`\n/// @prop {Number} $point.print.font-size - Font size for `$point` when printing\n/// @prop {Number} $point.print.line-height - Line height for `$point` when printing\n///\n/// @access private\n\n$_govuk-typography-scale-legacy: (\n  80: (\n    null: (\n      font-size: 53px,\n      line-height: 55px\n    ),\n    tablet: (\n      font-size: 80px,\n      line-height: 80px\n    ),\n    print: (\n      font-size: 53pt,\n      line-height: 1.1\n    )\n  ),\n  48: (\n    null: (\n      font-size: 32px,\n      line-height: 35px\n    ),\n    tablet: (\n      font-size: 48px,\n      line-height: 50px\n    ),\n    print: (\n      font-size: 32pt,\n      line-height: 1.15\n    )\n  ),\n  36: (\n    null: (\n      font-size: 24px,\n      line-height: 25px\n    ),\n    tablet: (\n      font-size: 36px,\n      line-height: 40px\n    ),\n    print: (\n      font-size: 24pt,\n      line-height: 1.05\n    )\n  ),\n  27: (\n    null: (\n      font-size: 18px,\n      line-height: 20px\n    ),\n    tablet: (\n      font-size: 27px,\n      line-height: 30px\n    ),\n    print: (\n      font-size: 18pt,\n      line-height: 1.15\n    )\n  ),\n  24: (\n    null: (\n      font-size: 18px,\n      line-height: 20px\n    ),\n    tablet: (\n      font-size: 24px,\n      line-height: 30px\n    ),\n    print: (\n      font-size: 18pt,\n      line-height: 1.15\n    )\n  ),\n  19: (\n    null: (\n      font-size: 16px,\n      line-height: 20px\n    ),\n    tablet: (\n      font-size: 19px,\n      line-height: 25px\n    ),\n    print: (\n      font-size: 14pt,\n      line-height: 1.15\n    )\n  ),\n  16: (\n    null: (\n      font-size: 14px,\n      line-height: 16px\n    ),\n    tablet: (\n      font-size: 16px,\n      line-height: 20px\n    ),\n    print: (\n      font-size: 14pt,\n      line-height: 1.2\n    )\n  ),\n  14: (\n    null: (\n      font-size: 12px,\n      line-height: 15px\n    ),\n    tablet: (\n      font-size: 14px,\n      line-height: 20px\n    ),\n    print: (\n      font-size: 12pt,\n      line-height: 1.2\n    ),\n    deprecation: (\n      key: \"govuk-typography-scale-14\",\n      message: \"14 on the type scale is deprecated and will be removed as \" +\n        \"a possible option in the next major version.\"\n    )\n  )\n);\n\n/// The font map for the new typography scale\n///\n/// @type Map\n///\n/// @prop {Number} $point.$breakpoint.font-size - Font size for `$point` at `$breakpoint`\n/// @prop {Number} $point.$breakpoint.line-height - Line height for `$point` at `$breakpoint`\n/// @prop {Number} $point.print.font-size - Font size for `$point` when printing\n/// @prop {Number} $point.print.line-height - Line height for `$point` when printing\n///\n/// @access private\n\n$_govuk-typography-scale-modern: (\n  80: (\n    null: (\n      font-size: 53px,\n      line-height: 55px\n    ),\n    tablet: (\n      font-size: 80px,\n      line-height: 80px\n    ),\n    print: (\n      font-size: 53pt,\n      line-height: 1.1\n    )\n  ),\n  48: (\n    null: (\n      font-size: 32px,\n      line-height: 35px\n    ),\n    tablet: (\n      font-size: 48px,\n      line-height: 50px\n    ),\n    print: (\n      font-size: 32pt,\n      line-height: 1.15\n    )\n  ),\n  36: (\n    null: (\n      font-size: 27px,\n      line-height: 30px\n    ),\n    tablet: (\n      font-size: 36px,\n      line-height: 40px\n    ),\n    print: (\n      font-size: 24pt,\n      line-height: 1.05\n    )\n  ),\n  27: (\n    // Made same as 24 on mobile (consider deprecating this size)\n    null: (\n        font-size: 21px,\n        line-height: 25px\n      ),\n    tablet: (\n      font-size: 27px,\n      line-height: 30px\n    ),\n    print: (\n      font-size: 18pt,\n      line-height: 1.15\n    )\n  ),\n  24: (\n    // Bump up mobile size from 18/20 to 21/25\n    null: (\n        font-size: 21px,\n        line-height: 25px\n      ),\n    tablet: (\n      font-size: 24px,\n      line-height: 30px\n    ),\n    print: (\n      font-size: 18pt,\n      line-height: 1.15\n    )\n  ),\n  19: (\n    // Stay at 19/25 at all sizes\n    null: (\n        font-size: 19px,\n        line-height: 25px\n      ),\n    print: (\n      font-size: 14pt,\n      line-height: 1.15\n    )\n  ),\n  16: (\n    // Stay at 16/20 at all sizes\n    null: (\n        font-size: 16px,\n        line-height: 20px\n      ),\n    print: (\n      font-size: 14pt,\n      line-height: 1.2\n    )\n  ),\n  14: (\n    // Stay at 14/20 at all sizes (consider deprecating this size)\n    null: (\n        font-size: 14px,\n        line-height: 20px\n      ),\n    print: (\n      font-size: 12pt,\n      line-height: 1.2\n    ),\n    deprecation: (\n      key: \"govuk-typography-scale-14\",\n      message: \"14 on the type scale is deprecated and will be removed as \" +\n        \"a possible option in the next major version.\"\n    )\n  )\n);\n\n/// Responsive typography font map\n///\n/// This is used to generate responsive typography that adapts according to the\n/// breakpoints.\n///\n/// Font size and font weight can be defined for each breakpoint. You can define\n/// different behaviour on tablet and desktop. The 'null' breakpoint is for\n/// mobile.\n///\n/// Line-heights will automatically be converted from pixel measurements into\n/// relative values. For example, with a font-size of 16px and a line-height of\n/// 24px, the line-height will be converted to 1.5 before output.\n///\n/// You can also specify a separate font size and line height for print media.\n///\n/// @type Map\n///\n/// @prop {Number} $point.$breakpoint.font-size - Font size for `$point` at `$breakpoint`\n/// @prop {Number} $point.$breakpoint.line-height - Line height for `$point` at `$breakpoint`\n/// @prop {Number} $point.print.font-size - Font size for `$point` when printing\n/// @prop {Number} $point.print.line-height - Line height for `$point` when printing\n///\n/// @access public\n\n$govuk-typography-scale: if(\n  $govuk-new-typography-scale,\n  $_govuk-typography-scale-modern,\n  $_govuk-typography-scale-legacy\n) !default;\n"]}
+{"version":3,"sources":["../../../src/govuk/settings/_typography-responsive.scss"],"names":[],"mappings":"AAAA,GAAG;AACH,6BAA6B;AAC7B,GAAG;;AAEH,iBAAiB;AACjB,EAAE;AACF,+EAA+E;AAC/E,wDAAwD;AACxD,EAAE;AACF,8EAA8E;AAC9E,yEAAyE;AACzE,yBAAyB;AACzB,EAAE;AACF,eAAe;AACf,iBAAiB;;AAEjB,oCAAoC;;AAEpC,iCAAiC;AACjC,EAAE;AACF,8EAA8E;AAC9E,eAAe;AACf,EAAE;AACF,+EAA+E;AAC/E,0EAA0E;AAC1E,UAAU;AACV,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,gEAAgE;AAChE,EAAE;AACF,6EAA6E;AAC7E,EAAE;AACF,YAAY;AACZ,EAAE;AACF,wFAAwF;AACxF,4FAA4F;AAC5F,+EAA+E;AAC/E,mFAAmF;AACnF,EAAE;AACF,iBAAiB;;AAEjB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA+FU","file":"_typography-responsive.scss","sourcesContent":["////\n/// @group settings/typography\n////\n\n/// Root font size\n///\n/// This is used to calculate rem sizes for the typography, and should match the\n/// _effective_ font-size of your root (or html) element.\n///\n/// Ideally you should not be setting the font-size on the html or root element\n/// in order to allow it to scale with user-preference, in which case this\n/// should be set to 16px.\n///\n/// @type Number\n/// @access public\n\n$govuk-root-font-size: 16px !default;\n\n/// Responsive typography font map\n///\n/// This is used to generate responsive typography that adapts according to the\n/// breakpoints.\n///\n/// Font size and font weight can be defined for each breakpoint. You can define\n/// different behaviour on tablet and desktop. The 'null' breakpoint is for\n/// mobile.\n///\n/// Line-heights will automatically be converted from pixel measurements into\n/// relative values. For example, with a font-size of 16px and a line-height of\n/// 24px, the line-height will be converted to 1.5 before output.\n///\n/// You can also specify a separate font size and line height for print media.\n///\n/// @type Map\n///\n/// @prop {Number} $point.$breakpoint.font-size - Font size for `$point` at `$breakpoint`\n/// @prop {Number} $point.$breakpoint.line-height - Line height for `$point` at `$breakpoint`\n/// @prop {Number} $point.print.font-size - Font size for `$point` when printing\n/// @prop {Number} $point.print.line-height - Line height for `$point` when printing\n///\n/// @access public\n\n$govuk-typography-scale: (\n  80: (\n    null: (\n      font-size: 53px,\n      line-height: 55px\n    ),\n    tablet: (\n      font-size: 80px,\n      line-height: 80px\n    ),\n    print: (\n      font-size: 53pt,\n      line-height: 1.1\n    )\n  ),\n  48: (\n    null: (\n      font-size: 32px,\n      line-height: 35px\n    ),\n    tablet: (\n      font-size: 48px,\n      line-height: 50px\n    ),\n    print: (\n      font-size: 32pt,\n      line-height: 1.15\n    )\n  ),\n  36: (\n    null: (\n      font-size: 27px,\n      line-height: 30px\n    ),\n    tablet: (\n      font-size: 36px,\n      line-height: 40px\n    ),\n    print: (\n      font-size: 24pt,\n      line-height: 1.05\n    )\n  ),\n  27: (\n    // Made same as 24 on mobile (consider deprecating this size)\n    null: (\n        font-size: 21px,\n        line-height: 25px\n      ),\n    tablet: (\n      font-size: 27px,\n      line-height: 30px\n    ),\n    print: (\n      font-size: 18pt,\n      line-height: 1.15\n    )\n  ),\n  24: (\n    // Bump up mobile size from 18/20 to 21/25\n    null: (\n        font-size: 21px,\n        line-height: 25px\n      ),\n    tablet: (\n      font-size: 24px,\n      line-height: 30px\n    ),\n    print: (\n      font-size: 18pt,\n      line-height: 1.15\n    )\n  ),\n  19: (\n    // Stay at 19/25 at all sizes\n    null: (\n        font-size: 19px,\n        line-height: 25px\n      ),\n    print: (\n      font-size: 14pt,\n      line-height: 1.15\n    )\n  ),\n  16: (\n    // Stay at 16/20 at all sizes\n    null: (\n        font-size: 16px,\n        line-height: 20px\n      ),\n    print: (\n      font-size: 14pt,\n      line-height: 1.2\n    )\n  )\n) !default;\n"]}

data/node_modules/govuk-frontend/dist/govuk/template.njk

@@ -1,22 +1,23 @@
 {% from "./macros/attributes.njk" import govukAttributes -%}
 {% from "./components/skip-link/macro.njk" import govukSkipLink -%}
 {% from "./components/header/macro.njk" import govukHeader -%}
+{% from "./components/service-navigation/macro.njk" import govukServiceNavigation -%}
 {% from "./components/footer/macro.njk" import govukFooter -%}
 
-{%- set _rebrand = govukRebrand() if govukRebrand is callable else govukRebrand -%}
-
-{# Hardcoded value is $govuk-brand-blue if rebrand, otherwise govuk-colour("black") -#}
-{% set themeColor = themeColor | default("#1d70b8" if _rebrand else "#0b0c0c", true) -%}
-{% set assetPath = assetPath | default("/assets/rebrand" if _rebrand else "/assets", true) -%}
+{# Hardcoded value is $govuk-brand-blue -#}
+{% set themeColor = themeColor | default("#1d70b8", true) -%}
+{% set assetPath = assetPath | default("/assets", true) -%}
 
 <!DOCTYPE html>
-<html lang="{{ htmlLang | default("en", true) }}" class="govuk-template {%- if _rebrand %} govuk-template--rebranded{% endif %} {%- if htmlClasses %} {{ htmlClasses }}{% endif %}">
+<html lang="{{ htmlLang | default("en", true) }}" class="govuk-template {%- if htmlClasses %} {{ htmlClasses }}{% endif %}">
   <head>
     <meta charset="utf-8">
     <title {%- if pageTitleLang %} lang="{{ pageTitleLang }}"{% endif %}>{% block pageTitle %}GOV.UK - The best place to find government services and information{% endblock %}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
     <meta name="theme-color" content="{{ themeColor }}">
 
+    {% block head %}{% endblock %}
+
     {% block headIcons %}
       <link rel="icon" sizes="48x48" href="{{ assetPath }}/images/favicon.ico">
       <link rel="icon" sizes="any" href="{{ assetPath }}/images/favicon.svg" type="image/svg+xml">
@@ -25,8 +26,6 @@
       <link rel="manifest" href="{{ assetPath }}/manifest.json">
     {% endblock %}
 
-    {% block head %}{% endblock %}
-
     {#- OpenGraph images needs to be absolute, so we need either a URL for the image or for assetUrl to be set #}
     {% if opengraphImageUrl or assetUrl %}
     <meta property="og:image" content="{{ opengraphImageUrl | default(assetUrl + "/images/govuk-opengraph-image.png", true) }}">
@@ -36,32 +35,71 @@
     <script {%- if cspNonce %} nonce="{{ cspNonce }}"{% endif %}>document.body.className += ' js-enabled' + ('noModule' in HTMLScriptElement.prototype ? ' govuk-frontend-supported' : '');</script>
     {% block bodyStart %}{% endblock %}
 
-    {% block skipLink %}
-      {{ govukSkipLink({
-        href: '#main-content',
-        text: 'Skip to main content'
-      }) }}
+    {% block govukSkipLink %}
+      {%- block skipLink %}
+        {{ govukSkipLink({
+          href: '#main-content',
+          text: 'Skip to main content'
+        }) }}
+      {% endblock -%}
     {% endblock %}
 
+    {# Only output <header> if any of its child blocks have content. #}
+    {% macro _govukTemplateHeader() %}
+      {%- if caller() | trim | length > 0 %}
+        <header class="govuk-template__header {%- if headerClasses %} {{ headerClasses }}{% endif %}" {{- govukAttributes(headerAttributes)}}>
+          {{ caller() }}
+        </header>
+      {%- endif %}
+    {% endmacro %}
+
     {% block header %}
-      {{ govukHeader({
-        rebrand: _rebrand
-      }) }}
+      {% call _govukTemplateHeader() %}
+        {% block headerStart %}{% endblock %}
+        {% block govukHeader %}
+          {{ govukHeader() }}
+        {% endblock %}
+        {% block govukServiceNavigation %}
+          {%- if serviceName %}
+            {{ govukServiceNavigation({
+              serviceName: serviceName,
+              serviceUrl: serviceUrl
+            }) }}
+          {%- endif  %}
+        {% endblock %}
+        {% block headerEnd %}{% endblock %}
+      {% endcall %}
     {% endblock %}
 
-    {% block main %}
-      <div class="govuk-width-container {%- if containerClasses %} {{ containerClasses }}{% endif %}">
-        {% block beforeContent %}{% endblock %}
-        <main class="govuk-main-wrapper {%- if mainClasses %} {{ mainClasses }}{% endif %}" id="main-content" {%- if mainLang %} lang="{{ mainLang }}"{% endif %}>
+    {% block container %}
+      <div class="govuk-width-container {%- if containerClasses %} {{ containerClasses }}{% endif %}" {{- govukAttributes(containerAttributes) }}>
+        {% block containerStart %}{% block beforeContent %}{% endblock %}{% endblock %}
+        {% block main %}
+        <main class="govuk-main-wrapper {%- if mainClasses %} {{ mainClasses }}{% endif %}" id="main-content" {%- if mainLang %} lang="{{ mainLang }}"{% endif %} {{- govukAttributes(mainAttributes) }}>
           {% block content %}{% endblock %}
         </main>
+        {% endblock %}
+        {% block containerEnd %}{% endblock %}
       </div>
     {% endblock %}
 
+    {# Only output <footer> if any of its child blocks have content. #}
+    {% macro _govukTemplateFooter() %}
+      {%- if caller() | trim | length > 0 %}
+        <footer class="govuk-template__footer {%- if footerClasses %} {{ footerClasses }}{% endif %}" {{- govukAttributes(footerAttributes)}}>
+          {{ caller() }}
+        </footer>
+      {%- endif %}
+    {% endmacro %}
+
     {% block footer %}
-      {{ govukFooter({
-        rebrand: _rebrand
-      }) }}
+      {% call _govukTemplateFooter() %}
+        {% block footerStart %}{% endblock %}
+        {% block govukFooter %}
+          {{ govukFooter() }}
+        {% endblock %}
+        {% block footerEnd %}{% endblock %}
+      {% endcall %}
     {% endblock %}
 
     {% block bodyEnd %}{% endblock %}

data/node_modules/govuk-frontend/dist/govuk/tools/_index.scss

@@ -3,6 +3,5 @@
 @import "image-url";
 @import "px-to-em";
 @import "px-to-rem";
-@import "rebrand";
 
 /*# sourceMappingURL=_index.scss.map */

data/node_modules/govuk-frontend/dist/govuk/tools/_index.scss.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/govuk/tools/_index.scss"],"names":[],"mappings":"AAAA,iBAAiB;AACjB,kBAAkB;AAClB,mBAAmB;AACnB,kBAAkB;AAClB,mBAAmB;AACnB,iBAAiB","file":"_index.scss","sourcesContent":["@import \"exports\";\n@import \"font-url\";\n@import \"image-url\";\n@import \"px-to-em\";\n@import \"px-to-rem\";\n@import \"rebrand\";\n"]}
+{"version":3,"sources":["../../../src/govuk/tools/_index.scss"],"names":[],"mappings":"AAAA,iBAAiB;AACjB,kBAAkB;AAClB,mBAAmB;AACnB,kBAAkB;AAClB,mBAAmB","file":"_index.scss","sourcesContent":["@import \"exports\";\n@import \"font-url\";\n@import \"image-url\";\n@import \"px-to-em\";\n@import \"px-to-rem\";\n"]}

data/node_modules/govuk-frontend/dist/govuk/tools/_px-to-rem.scss

@@ -2,6 +2,8 @@
 /// @group tools/unit-conversion
 ////
 
+@import "../settings/typography-responsive";
+
 /// Convert pixels to rem
 ///
 /// The $govuk-root-font-size (defined in settings/_typography-responsive.scss)

data/node_modules/govuk-frontend/dist/govuk/tools/_px-to-rem.scss.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/govuk/tools/_px-to-rem.scss"],"names":[],"mappings":"AAAA,GAAG;AACH,+BAA+B;AAC/B,GAAG;;AAEH,wBAAwB;AACxB,EAAE;AACF,8EAA8E;AAC9E,wEAAwE;AACxE,EAAE;AACF,4CAA4C;AAC5C,kCAAkC;AAClC,iBAAiB;;AAEjB;EACE;IACE,oBAAoB;EACtB;;EAEA,6CAA6C;AAC/C","file":"_px-to-rem.scss","sourcesContent":["////\n/// @group tools/unit-conversion\n////\n\n/// Convert pixels to rem\n///\n/// The $govuk-root-font-size (defined in settings/_typography-responsive.scss)\n/// must be configured to match the font-size of your root (html) element\n///\n/// @param {Number} $value - Length in pixels\n/// @return {Number} Length in rems\n/// @access public\n\n@function govuk-px-to-rem($value) {\n  @if unitless($value) {\n    $value: $value * 1px;\n  }\n\n  @return $value / $govuk-root-font-size * 1rem;\n}\n"]}
+{"version":3,"sources":["../../../src/govuk/tools/_px-to-rem.scss"],"names":[],"mappings":"AAAA,GAAG;AACH,+BAA+B;AAC/B,GAAG;;AAEH,2CAA2C;;AAE3C,wBAAwB;AACxB,EAAE;AACF,8EAA8E;AAC9E,wEAAwE;AACxE,EAAE;AACF,4CAA4C;AAC5C,kCAAkC;AAClC,iBAAiB;;AAEjB;EACE;IACE,oBAAoB;EACtB;;EAEA,6CAA6C;AAC/C","file":"_px-to-rem.scss","sourcesContent":["////\n/// @group tools/unit-conversion\n////\n\n@import \"../settings/typography-responsive\";\n\n/// Convert pixels to rem\n///\n/// The $govuk-root-font-size (defined in settings/_typography-responsive.scss)\n/// must be configured to match the font-size of your root (html) element\n///\n/// @param {Number} $value - Length in pixels\n/// @return {Number} Length in rems\n/// @access public\n\n@function govuk-px-to-rem($value) {\n  @if unitless($value) {\n    $value: $value * 1px;\n  }\n\n  @return $value / $govuk-root-font-size * 1rem;\n}\n"]}

data/node_modules/govuk-frontend/govuk-prototype-kit.config.json

@@ -3,7 +3,7 @@
     "description": "GOV.UK Frontend contains the code you need to start building a user interface for government platforms and services.",
     "urls": {
       "documentation": "https://design-system.service.gov.uk/",
-      "releaseNotes": "https://github.com/alphagov/govuk-frontend/releases/tag/v5.14.0",
+      "releaseNotes": "https://github.com/alphagov/govuk-frontend/releases/tag/v6.0.0",
       "versionHistory": "https://github.com/alphagov/govuk-frontend/releases"
     }
   },
@@ -172,8 +172,5 @@
   ],
   "nunjucksPaths": [
     "/dist"
-  ],
-  "nunjucksFunctions": [
-    "/dist/govuk-prototype-kit/functions.js"
   ]
 }

data/node_modules/govuk-frontend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "govuk-frontend",
   "description": "GOV.UK Frontend contains the code you need to start building a user interface for government platforms and services.",
-  "version": "5.14.0",
+  "version": "6.0.0",
   "main": "dist/govuk/all.bundle.js",
   "module": "dist/govuk/all.mjs",
   "sass": "dist/govuk/index.scss",
@@ -63,31 +63,32 @@
     "version": "echo $npm_package_version"
   },
   "devDependencies": {
-    "@babel/core": "^7.28.4",
-    "@babel/preset-env": "^7.28.3",
+    "@babel/core": "^7.28.6",
+    "@babel/preset-env": "^7.28.6",
     "@govuk-frontend/config": "*",
     "@govuk-frontend/helpers": "*",
     "@govuk-frontend/lib": "*",
     "@govuk-frontend/tasks": "*",
-    "@rollup/plugin-babel": "^6.0.4",
-    "@rollup/plugin-replace": "^6.0.2",
+    "@rollup/plugin-babel": "^6.1.0",
+    "@rollup/plugin-replace": "^6.0.3",
     "@rollup/plugin-terser": "^0.4.4",
-    "autoprefixer": "^10.4.21",
-    "cssnano": "^7.1.1",
+    "autoprefixer": "^10.4.23",
+    "cssnano": "^7.1.2",
     "cssnano-preset-default": "^7.0.1",
-    "govuk-prototype-kit": "^13.18.0",
+    "govuk-prototype-kit": "^13.18.1",
     "gulp": "^5.0.1",
     "gulp-cli": "^3.0.0",
-    "html-validate": "10.1.0",
+    "html-validate": "10.7.0",
     "nunjucks": "^3.2.4",
     "outdent": "^0.8.0",
     "postcss": "^8.5.6",
     "postcss-scss": "^4.0.9",
-    "puppeteer": "^24.23.0",
-    "rollup": "^4.52.3",
+    "puppeteer": "^24.34.0",
+    "rollup": "^4.56.0",
     "sass-color-helpers": "^2.1.1",
     "sass-embedded": "^1.89.2",
     "sassdoc": "^2.7.4",
-    "slash": "^5.1.0"
+    "slash": "^5.1.0",
+    "stylelint": "^16.26.1"
   }
 }