govuk_tech_docs 3.5.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d573b1127b670bb4605149a4f22c8fb65fd932a3cdda57f86c313ce5e036d608
-  data.tar.gz: 1e433b243c842c41a89bb0ac93cc25267388c9725c1818822cc360d2625656de
+  metadata.gz: 4dc850d9644bdfb68d0604fb1a6b9710e677d10efcb3ad7107b4ac592924931d
+  data.tar.gz: c6cf243d37b9e353ce4400dc2b9a5b521753ff3a56338fcb406f063205a01b55
 SHA512:
-  metadata.gz: 44270c0b5dc9bec93e9a415fd7bd40ba89280ec50924ca2168f9b4073949d580a337ceafb85783506ead8ee02fd18b6c6853cb691db45f1ddb6e590f6a13f5f7
-  data.tar.gz: 66cde4fc8d7e89e17027fc860e4436f9469b886e5a30c00a65fae69e9236a8076f7c04cdcdbde73a193f59e71f07b12c566aa01d27c1c0167cd7841ebbc3fa9c
+  metadata.gz: 9b270f50021512617508ed2204b67b87a5b329baf833ea6c3446eee3918d889c1553c2854faf0fcf250183c1b75d59125c7f325497215a5fd3ebd4670b0acdc6
+  data.tar.gz: 257a1b7a1d73f43ae716986ae98eea6bb8843eb06100a870691d6c3a0e7c26eecba849aef97d8b93c08a899724e8176384f0470b96c77b58b3c1bd8ff099cd2e

data/.github/workflows/publish.yaml

@@ -16,7 +16,9 @@ jobs:
       go: ${{ steps.gem_version.outputs.new_version }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          show-progress: false
 
       - uses: ruby/setup-ruby@v1
         with:
@@ -43,12 +45,14 @@ jobs:
       contents: write  # needed to be able to tag the release
     runs-on: ubuntu-latest
     needs: pre
-    if: ${{ needs.pre.outputs.go == 'true' }}
+    if: needs.pre.outputs.go == 'true'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          show-progress: false
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'

data/.github/workflows/test.yaml

@@ -1,6 +1,11 @@
 name: Test
 
-on: [push, pull_request]
+on: 
+  push:
+    branches:
+      - main
+  pull_request:
+  workflow_dispatch:
 
 jobs:
   test:
@@ -9,12 +14,14 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['2.7', '3.2']
+        ruby: ['3.1', '3.2', '3.3']
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          show-progress: false
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'

data/.rubocop.yml

@@ -3,7 +3,7 @@ inherit_gem:
     - config/default.yml
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.1
 
 Layout/HeredocIndentation:
   Enabled: false

data/CHANGELOG.md

@@ -1,7 +1,26 @@
-# Changelog
-
 ## Unreleased
 
+## 4.0.0
+
+### Breaking
+- BREAKING: drop support for end-of-life Ruby versions 2.7 and 3.0. The minimum Ruby version is now 3.1.
+- BREAKING: drop support for IE8
+- Upgrade to govuk-frontend v5.7.1 and introduce new Javascript entry point
+
+To upgrade you need to:
+  - create a `govuk_frontend.js` file your project’s `source/assets/javascripts` directory
+  - add `//= require govuk_frontend_all` into it
+
+### Fixes
+
+- Update gem dependencies.
+- Declare some missing indirect dependencies to prepare for Ruby 3.4. This also resolves some warnings about this at build time.
+- Remove aria-hidden from search label to let assistive technologies see its accessible name
+- Use hidden attribute to show/hide expiry notices instead of just CSS
+- Only use dialog role for table of contents when it behaves like one (accessibility fix)
+- Prevent interactive elements being obscured by sticky table of contents header
+- Only wrap images with alt text in hyperlinks
+
 ## 3.5.0
 
 ### New features

data/example/.ruby-version

@@ -1 +1 @@
-2.7.2
+3.3.0

data/example/source/javascripts/govuk_frontend.js

@@ -0,0 +1 @@
+//= require govuk_frontend_all

data/govuk_tech_docs.gemspec

@@ -7,7 +7,7 @@ require "govuk_tech_docs/version"
 `npm install`
 abort "npm install failed" unless $CHILD_STATUS.success?
 
-unless File.exist?("node_modules/govuk-frontend/govuk/all.scss")
+unless File.exist?("node_modules/govuk-frontend/dist/govuk/all.scss")
   abort "govuk-frontend npm package not installed"
 end
 
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   files_in_git = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
 
   # Include assets from GOV.UK Frontend library in the distributed gem
-  govuk_frontend_assets = Dir["node_modules/govuk-frontend/**/*.{scss,js,woff,woff2,png,svg,ico}"]
+  govuk_frontend_assets = Dir["node_modules/govuk-frontend/**/*.{scss,js,mjs,woff,woff2,png,svg,ico}"]
 
   spec.files         = files_in_git + govuk_frontend_assets
 
@@ -33,26 +33,32 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = %w[lib]
 
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.1.0"
 
   spec.add_dependency "autoprefixer-rails", "~> 10.2"
+  spec.add_dependency "base64" # TODO: remove once middleman-sprockets declares this itself.
+  spec.add_dependency "bigdecimal" # TODO: remove once activesupport declares this itself.
   spec.add_dependency "chronic", "~> 0.10.2"
-  spec.add_dependency "haml", "< 6.0.0"
+  spec.add_dependency "csv" # TODO: remove once tilt declares this itself.
+  spec.add_dependency "haml", "~> 6.0"
   spec.add_dependency "middleman", "~> 4.0"
-  spec.add_dependency "middleman-autoprefixer", "~> 2.10.0"
-  spec.add_dependency "middleman-compass", ">= 4.0.0"
+  spec.add_dependency "middleman-autoprefixer", "~> 2.10"
+  spec.add_dependency "middleman-compass", "~> 4.0"
   spec.add_dependency "middleman-livereload"
   spec.add_dependency "middleman-search-gds"
   spec.add_dependency "middleman-sprockets", "~> 4.0.0"
-  spec.add_dependency "middleman-syntax", "~> 3.2.0"
+  spec.add_dependency "middleman-syntax", "~> 3.4"
+  spec.add_dependency "mutex_m" # TODO: remove once activesupport declares this itself.
   spec.add_dependency "nokogiri"
   spec.add_dependency "openapi3_parser", "~> 0.9.0"
-  spec.add_dependency "redcarpet", "~> 3.5.1"
+  spec.add_dependency "redcarpet", "~> 3.6"
+  spec.add_dependency "terser", "~> 1.2.3"
+  spec.add_dependency "sassc-embedded", "~> 1.78.0"
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "capybara", "~> 3.32"
-  spec.add_development_dependency "jasmine", "~> 3.5.0"
+  spec.add_development_dependency "jasmine", "~> 3.5"
   spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.9.0"
-  spec.add_development_dependency "rubocop-govuk", "~> 4.10.0"
+  spec.add_development_dependency "rspec", "~> 3.9"
+  spec.add_development_dependency "rubocop-govuk", "~> 4.10"
 end

data/lib/assets/javascripts/_modules/page-expiry.js

@@ -7,8 +7,8 @@
       var isExpired = Date.parse(rawDate) < new Date()
 
       if (isExpired) {
-        $element.find('.page-expiry--not-expired').hide(0)
-        $element.find('.page-expiry--expired').show(0)
+        $element.find('.page-expiry--not-expired').attr('hidden', '')
+        $element.find('.page-expiry--expired').removeAttr('hidden')
       }
     }
   }

data/lib/assets/javascripts/_modules/table-of-contents.js

@@ -1,6 +1,41 @@
 (function ($, Modules) {
   'use strict'
 
+  // Most of the code below is gratefully taken from:
+  // https://www.tpgi.com/prevent-focused-elements-from-being-obscured-by-sticky-headers/
+  var StickyOverlapMonitors = function ($sticky) {
+    this.$sticky = $sticky
+    this.offset = 0
+    this.onFocus = this.showObscured.bind(this)
+    this.isMonitoring = false
+  }
+  StickyOverlapMonitors.prototype.run = function () {
+    var stickyIsVisible = this.$sticky.length > 0 && this.$sticky.is(':visible')
+    if (stickyIsVisible && !this.isMonitoring) {
+      document.addEventListener('focus', this.onFocus, true)
+      this.isMonitoring = true
+    }
+    if (!stickyIsVisible && this.isMonitoring) {
+      document.removeEventListener('focus', this.onFocus, true)
+      this.isMonitoring = false
+    }
+  }
+  StickyOverlapMonitors.prototype.showObscured = function () {
+    var focused = document.activeElement || document.body
+    var applicable = focused !== document.body
+
+    if (!applicable) { return }
+
+    if (this.$sticky && this.$sticky.is(':visible') && this.$sticky.get(0)) {
+      var stickyEdge = this.$sticky.get(0).getBoundingClientRect().bottom + this.offset
+      var diff = focused.getBoundingClientRect().top - stickyEdge
+
+      if (diff < 0) {
+        $(window).scrollTop($(window).scrollTop() + diff)
+      }
+    }
+  }
+
   Modules.TableOfContents = function () {
     var $html = $('html')
 
@@ -10,6 +45,8 @@
     var $openButton
     var $closeButton
 
+    var stickyOverlapMonitors
+
     this.start = function ($element) {
       $toc = $element
       $tocList = $toc.find('.js-toc-list')
@@ -19,6 +56,8 @@
 
       fixRubberBandingInIOS()
       updateAriaAttributes()
+      stickyOverlapMonitors = new StickyOverlapMonitors($('.fixedsticky'))
+      stickyOverlapMonitors.run()
 
       // Need delegated handler for show link as sticky polyfill recreates element
       $openButton.on('click.toc', preventingScrolling(openNavigation))
@@ -27,7 +66,10 @@
 
       // Allow aria hidden to be updated when resizing from mobile to desktop or
       // vice versa
-      $(window).on('resize.toc', updateAriaAttributes)
+      $(window).on('resize.toc', function () {
+        updateAriaAttributes()
+        stickyOverlapMonitors.run()
+      })
 
       $(document).on('keydown.toc', function (event) {
         var ESC_KEY = 27
@@ -80,11 +122,15 @@
 
     function updateAriaAttributes () {
       var tocIsVisible = $toc.is(':visible')
+      var openButtonIsVisible = $openButton.is(':visible')
 
       $($openButton).add($closeButton)
         .attr('aria-expanded', tocIsVisible ? 'true' : 'false')
 
-      $toc.attr('aria-hidden', tocIsVisible ? 'false' : 'true')
+      $toc.attr({
+        'aria-hidden': tocIsVisible ? 'false' : 'true',
+        role: openButtonIsVisible ? 'dialog' : null
+      })
     }
 
     function preventingScrolling (callback) {

data/lib/assets/javascripts/govuk_frontend_all.js

@@ -0,0 +1,3 @@
+//= require govuk/all.bundle.js
+const { initAll } = window.GOVUKFrontend
+initAll()

data/lib/assets/javascripts/govuk_tech_docs.js

@@ -4,9 +4,7 @@
 //= require _vendor/lodash
 //= require _analytics
 //= require _start-modules
-//= require govuk/all.js
 
 $(function () {
   $('.fixedsticky').fixedsticky()
-  GOVUKFrontend.initAll()
 })

data/lib/assets/stylesheets/_govuk_tech_docs.scss

@@ -11,8 +11,8 @@ $govuk-assets-path: "/assets/govuk/assets/" !default;
 $govuk-new-link-styles: true;
 @import "govuk/base";
 
-@import "govuk/core/all";
-@import "govuk/objects/all";
+@import "govuk/core/index";
+@import "govuk/objects/index";
 
 @import "govuk/components/footer/index";
 @import "govuk/components/header/index";
@@ -22,14 +22,8 @@ $govuk-new-link-styles: true;
 @import "govuk/components/skip-link/index";
 @import "govuk/components/warning-text/index";
 
-@import "govuk/utilities/all";
-@import "govuk/overrides/all";
+@import "govuk/utilities/index";
+@import "govuk/overrides/index";
 
 @import "core";
 @import "vendor/fixedsticky";
-
-// manual Tudor Crown spacing adjustment from govuk-frontend 4.8
-.govuk-header__logotype-crown[width="32"] {
-  top: -3px;
-  margin-right: 2px;
-}

data/lib/assets/stylesheets/modules/_page-review.scss

@@ -24,8 +24,6 @@
 }
 
 .page-expiry--expired {
-  display: none;
-
   padding: govuk-spacing(3);
   margin-top: govuk-spacing(9);
   border: govuk-spacing(1) solid $govuk-error-colour;

data/lib/assets/stylesheets/modules/_search.scss

@@ -45,10 +45,6 @@ $input-size: 40px;
     outline: $govuk-focus-width solid $govuk-focus-colour;
     outline-offset: 0;
     box-shadow: inset 0 0 0 $govuk-border-width-form-element * 2 govuk-colour("black");
-
-    @include govuk-if-ie8 {
-      border-width: $govuk-border-width-form-element * 2;
-    }
   }
 }
 

data/lib/govuk_tech_docs/meta_tags.rb

@@ -48,7 +48,7 @@ module GovukTechDocs
     attr_reader :config, :current_page
 
     def page_image
-      "#{host}/images/govuk-large.png"
+      "#{host}/assets/govuk/assets/images/govuk-opengraph-image.png"
     end
 
     def site_name

data/lib/govuk_tech_docs/redirects.rb

@@ -1,6 +1,6 @@
 module GovukTechDocs
   class Redirects
-    LEADING_SLASH = %r{\A/}.freeze
+    LEADING_SLASH = %r{\A/}
 
     def initialize(context)
       @context = context

data/lib/govuk_tech_docs/table_of_contents/heading_tree_builder.rb

@@ -11,7 +11,7 @@ module GovukTechDocs
         @headings.each do |heading|
           move_to_depth(heading.size)
 
-          @pointer.children << HeadingTree.new(parent: @pointer, heading: heading)
+          @pointer.children << HeadingTree.new(parent: @pointer, heading:)
         end
 
         @tree

data/lib/govuk_tech_docs/table_of_contents/helpers.rb

@@ -12,7 +12,7 @@ module GovukTechDocs
 
       def single_page_table_of_contents(html, url: "", max_level: nil)
         output = "<ul>\n"
-        output += list_items_from_headings(html, url: url, max_level: max_level)
+        output += list_items_from_headings(html, url:, max_level:)
         output += "</ul>\n"
 
         output
@@ -36,7 +36,7 @@ module GovukTechDocs
         end
 
         tree = HeadingTreeBuilder.new(headings).tree
-        HeadingTreeRenderer.new(tree, max_level: max_level).html
+        HeadingTreeRenderer.new(tree, max_level:).html
       end
 
       def render_page_tree(resources, current_page, config, current_page_html)

data/lib/govuk_tech_docs/tech_docs_html_renderer.rb

@@ -19,8 +19,12 @@ module GovukTechDocs
       %(<h#{level} id="#{anchor}">#{text}</h#{level}>\n)
     end
 
-    def image(link, *args)
-      %(<a href="#{link}" rel="noopener noreferrer">#{super}</a>)
+    def image(link, title, alt_text)
+      if alt_text && !alt_text.strip.empty?
+        %(<a href="#{link}" rel="noopener noreferrer">#{super}</a>)
+      else
+        super
+      end
     end
 
     def table(header, body)

data/lib/govuk_tech_docs/version.rb

@@ -1,3 +1,3 @@
 module GovukTechDocs
-  VERSION = "3.5.0".freeze
+  VERSION = "4.0.0".freeze
 end

data/lib/govuk_tech_docs.rb

@@ -10,6 +10,8 @@ require "middleman-search"
 require "nokogiri"
 require "chronic"
 require "active_support/all"
+require "terser"
+require "sassc-embedded"
 
 require "govuk_tech_docs/redirects"
 require "govuk_tech_docs/table_of_contents/helpers"
@@ -23,6 +25,18 @@ require "govuk_tech_docs/unique_identifier_generator"
 require "govuk_tech_docs/warning_text_extension"
 require "govuk_tech_docs/api_reference/api_reference_extension"
 
+module SassWarningSupressor
+  def warn(message)
+    if message.to_s.match?(/Sass|dart-sass/i)
+      # suppress dart sass warnings
+    else
+      super
+    end
+  end
+end
+
+Warning.extend(SassWarningSupressor)
+
 module GovukTechDocs
   # Configure the tech docs template
   #
@@ -32,7 +46,7 @@ module GovukTechDocs
   def self.configure(context, options = {})
     context.activate :sprockets
 
-    context.sprockets.append_path File.join(__dir__, "../node_modules/govuk-frontend/")
+    context.sprockets.append_path File.join(__dir__, "../node_modules/govuk-frontend/dist")
     context.sprockets.append_path File.join(__dir__, "./source")
 
     context.activate :syntax
@@ -44,12 +58,15 @@ module GovukTechDocs
                 renderer: TechDocsHTMLRenderer.new(
                   with_toc_data: true,
                   api: true,
-                  context: context,
+                  context:,
                 ),
                 fenced_code_blocks: true,
                 tables: true,
                 no_intra_emphasis: true
 
+    # this doesnt seem to work
+    context.set :sass, { output_style: "nested", quiet_deps: true }
+
     # Reload the browser automatically whenever files change
     context.configure :development do
       activate :livereload, options[:livereload].to_h
@@ -57,7 +74,7 @@ module GovukTechDocs
 
     context.configure :build do
       activate :autoprefixer
-      activate :minify_javascript, ignore: ["/raw_assets/*"]
+      activate :minify_javascript, compressor: Terser.new, ignore: ["/raw_assets/*"]
     end
 
     config_file = ENV.fetch("CONFIG_FILE", "config/tech-docs.yml")

data/lib/source/layouts/_header.erb

@@ -8,22 +8,18 @@
       <% end %>
         <% if config[:tech_docs][:show_govuk_logo] %>
         <svg
-          aria-hidden="true"
           focusable="false"
-          class="govuk-header__logotype-crown"
+          role="img"
+          class="govuk-header__logotype"
           xmlns="http://www.w3.org/2000/svg"
-          viewBox="0 0 32 30"
+          viewBox="0 0 148 30"
           height="30"
-          width="32"
+          width="148"
+          aria-label="GOV.UK"
         >
-          <path
-            fill="currentColor" fill-rule="evenodd"
-            d="M22.6 10.4c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m-5.9 6.7c-.9.4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m10.8-3.7c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s0 2-1 2.4m3.3 4.8c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4M17 4.7l2.3 1.2V2.5l-2.3.7-.2-.2.9-3h-3.4l.9 3-.2.2c-.1.1-2.3-.7-2.3-.7v3.4L15 4.7c.1.1.1.2.2.2l-1.3 4c-.1.2-.1.4-.1.6 0 1.1.8 2 1.9 2.2h.7c1-.2 1.9-1.1 1.9-2.1 0-.2 0-.4-.1-.6l-1.3-4c-.1-.2 0-.2.1-.3m-7.6 5.7c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m-5 3c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s.1 2 1 2.4m-3.2 4.8c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m14.8 11c4.4 0 8.6.3 12.3.8 1.1-4.5 2.4-7 3.7-8.8l-2.5-.9c.2 1.3.3 1.9 0 2.7-.4-.4-.8-1.1-1.1-2.3l-1.2 4c.7-.5 1.3-.8 2-.9-1.1 2.5-2.6 3.1-3.5 3-1.1-.2-1.7-1.2-1.5-2.1.3-1.2 1.5-1.5 2.1-.1 1.1-2.3-.8-3-2-2.3 1.9-1.9 2.1-3.5.6-5.6-2.1 1.6-2.1 3.2-1.2 5.5-1.2-1.4-3.2-.6-2.5 1.6.9-1.4 2.1-.5 1.9.8-.2 1.1-1.7 2.1-3.5 1.9-2.7-.2-2.9-2.1-2.9-3.6.7-.1 1.9.5 2.9 1.9l.4-4.3c-1.1 1.1-2.1 1.4-3.2 1.4.4-1.2 2.1-3 2.1-3h-5.4s1.7 1.9 2.1 3c-1.1 0-2.1-.2-3.2-1.4l.4 4.3c1-1.4 2.2-2 2.9-1.9-.1 1.5-.2 3.4-2.9 3.6-1.9.2-3.4-.8-3.5-1.9-.2-1.3 1-2.2 1.9-.8.7-2.3-1.2-3-2.5-1.6.9-2.2.9-3.9-1.2-5.5-1.5 2-1.3 3.7.6 5.6-1.2-.7-3.1 0-2 2.3.6-1.4 1.8-1.1 2.1.1.2.9-.3 1.9-1.5 2.1-.9.2-2.4-.5-3.5-3 .6 0 1.2.3 2 .9l-1.2-4c-.3 1.1-.7 1.9-1.1 2.3-.3-.8-.2-1.4 0-2.7l-2.9.9C1.3 23 2.6 25.5 3.7 30c3.7-.5 7.9-.8 12.3-.8"></path>
+          <title>GOV.UK</title>
+          <path d="M22.6 10.4c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m-5.9 6.7c-.9.4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m10.8-3.7c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s0 2-1 2.4m3.3 4.8c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4M17 4.7l2.3 1.2V2.5l-2.3.7-.2-.2.9-3h-3.4l.9 3-.2.2c-.1.1-2.3-.7-2.3-.7v3.4L15 4.7c.1.1.1.2.2.2l-1.3 4c-.1.2-.1.4-.1.6 0 1.1.8 2 1.9 2.2h.7c1-.2 1.9-1.1 1.9-2.1 0-.2 0-.4-.1-.6l-1.3-4c-.1-.2 0-.2.1-.3m-7.6 5.7c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m-5 3c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s.1 2 1 2.4m-3.2 4.8c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m14.8 11c4.4 0 8.6.3 12.3.8 1.1-4.5 2.4-7 3.7-8.8l-2.5-.9c.2 1.3.3 1.9 0 2.7-.4-.4-.8-1.1-1.1-2.3l-1.2 4c.7-.5 1.3-.8 2-.9-1.1 2.5-2.6 3.1-3.5 3-1.1-.2-1.7-1.2-1.5-2.1.3-1.2 1.5-1.5 2.1-.1 1.1-2.3-.8-3-2-2.3 1.9-1.9 2.1-3.5.6-5.6-2.1 1.6-2.1 3.2-1.2 5.5-1.2-1.4-3.2-.6-2.5 1.6.9-1.4 2.1-.5 1.9.8-.2 1.1-1.7 2.1-3.5 1.9-2.7-.2-2.9-2.1-2.9-3.6.7-.1 1.9.5 2.9 1.9l.4-4.3c-1.1 1.1-2.1 1.4-3.2 1.4.4-1.2 2.1-3 2.1-3h-5.4s1.7 1.9 2.1 3c-1.1 0-2.1-.2-3.2-1.4l.4 4.3c1-1.4 2.2-2 2.9-1.9-.1 1.5-.2 3.4-2.9 3.6-1.9.2-3.4-.8-3.5-1.9-.2-1.3 1-2.2 1.9-.8.7-2.3-1.2-3-2.5-1.6.9-2.2.9-3.9-1.2-5.5-1.5 2-1.3 3.7.6 5.6-1.2-.7-3.1 0-2 2.3.6-1.4 1.8-1.1 2.1.1.2.9-.3 1.9-1.5 2.1-.9.2-2.4-.5-3.5-3 .6 0 1.2.3 2 .9l-1.2-4c-.3 1.1-.7 1.9-1.1 2.3-.3-.8-.2-1.4 0-2.7l-2.9.9C1.3 23 2.6 25.5 3.7 30c3.7-.5 7.9-.8 12.3-.8m28.3-11.6c0 .9.1 1.7.3 2.5.2.8.6 1.5 1 2.2.5.6 1 1.1 1.7 1.5.7.4 1.5.6 2.5.6.9 0 1.7-.1 2.3-.4s1.1-.7 1.5-1.1c.4-.4.6-.9.8-1.5.1-.5.2-1 .2-1.5v-.2h-5.3v-3.2h9.4V28H55v-2.5c-.3.4-.6.8-1 1.1-.4.3-.8.6-1.3.9-.5.2-1 .4-1.6.6s-1.2.2-1.8.2c-1.5 0-2.9-.3-4-.8-1.2-.6-2.2-1.3-3-2.3-.8-1-1.4-2.1-1.8-3.4-.3-1.4-.5-2.8-.5-4.3s.2-2.9.7-4.2c.5-1.3 1.1-2.4 2-3.4.9-1 1.9-1.7 3.1-2.3 1.2-.6 2.6-.8 4.1-.8 1 0 1.9.1 2.8.3.9.2 1.7.6 2.4 1s1.4.9 1.9 1.5c.6.6 1 1.3 1.4 2l-3.7 2.1c-.2-.4-.5-.9-.8-1.2-.3-.4-.6-.7-1-1-.4-.3-.8-.5-1.3-.7-.5-.2-1.1-.2-1.7-.2-1 0-1.8.2-2.5.6-.7.4-1.3.9-1.7 1.5-.5.6-.8 1.4-1 2.2-.3.8-.4 1.9-.4 2.7zM71.5 6.8c1.5 0 2.9.3 4.2.8 1.2.6 2.3 1.3 3.1 2.3.9 1 1.5 2.1 2 3.4s.7 2.7.7 4.2-.2 2.9-.7 4.2c-.4 1.3-1.1 2.4-2 3.4-.9 1-1.9 1.7-3.1 2.3-1.2.6-2.6.8-4.2.8s-2.9-.3-4.2-.8c-1.2-.6-2.3-1.3-3.1-2.3-.9-1-1.5-2.1-2-3.4-.4-1.3-.7-2.7-.7-4.2s.2-2.9.7-4.2c.4-1.3 1.1-2.4 2-3.4.9-1 1.9-1.7 3.1-2.3 1.2-.5 2.6-.8 4.2-.8zm0 17.6c.9 0 1.7-.2 2.4-.5s1.3-.8 1.7-1.4c.5-.6.8-1.3 1.1-2.2.2-.8.4-1.7.4-2.7v-.1c0-1-.1-1.9-.4-2.7-.2-.8-.6-1.6-1.1-2.2-.5-.6-1.1-1.1-1.7-1.4-.7-.3-1.5-.5-2.4-.5s-1.7.2-2.4.5-1.3.8-1.7 1.4c-.5.6-.8 1.3-1.1 2.2-.2.8-.4 1.7-.4 2.7v.1c0 1 .1 1.9.4 2.7.2.8.6 1.6 1.1 2.2.5.6 1.1 1.1 1.7 1.4.6.3 1.4.5 2.4.5zM88.9 28 83 7h4.7l4 15.7h.1l4-15.7h4.7l-5.9 21h-5.7zm28.8-3.6c.6 0 1.2-.1 1.7-.3.5-.2 1-.4 1.4-.8.4-.4.7-.8.9-1.4.2-.6.3-1.2.3-2v-13h4.1v13.6c0 1.2-.2 2.2-.6 3.1s-1 1.7-1.8 2.4c-.7.7-1.6 1.2-2.7 1.5-1 .4-2.2.5-3.4.5-1.2 0-2.4-.2-3.4-.5-1-.4-1.9-.9-2.7-1.5-.8-.7-1.3-1.5-1.8-2.4-.4-.9-.6-2-.6-3.1V6.9h4.2v13c0 .8.1 1.4.3 2 .2.6.5 1 .9 1.4.4.4.8.6 1.4.8.6.2 1.1.3 1.8.3zm13-17.4h4.2v9.1l7.4-9.1h5.2l-7.2 8.4L148 28h-4.9l-5.5-9.4-2.7 3V28h-4.2V7zm-27.6 16.1c-1.5 0-2.7 1.2-2.7 2.7s1.2 2.7 2.7 2.7 2.7-1.2 2.7-2.7-1.2-2.7-2.7-2.7z"></path>
         </svg>
-          <span class="govuk-header__logotype-text">
-            GOV.UK
-          </span>
-        </span>
         <% end %>
         <span class="govuk-header__product-name">
           <%= config[:tech_docs][:service_name] %>
@@ -40,7 +36,7 @@
     <% if config[:tech_docs][:header_links] %>
     <div class="govuk-header__content">
       <nav class="govuk-header__navigation govuk-header__navigation--end" aria-label="Menu">
-        <button type="button" class="govuk-header__menu-button govuk-js-header-toggle" aria-controls="navigation" aria-label="Show or hide menu">Menu</button>
+        <button type="button" class="govuk-header__menu-button govuk-js-header-toggle" aria-controls="navigation" hidden>Menu</button>
         <ul id="navigation" class="govuk-header__navigation-list">
           <% config[:tech_docs][:header_links].each do |title, path| %>
             <li class="govuk-header__navigation-item<% if active_page(path) %> govuk-header__navigation-item--active<% end %>">

data/lib/source/layouts/_page_review.erb

@@ -12,7 +12,7 @@
     </div>
 
     <% if current_page_review.show_expiry? %>
-    <div class='page-expiry--expired'>
+    <div class='page-expiry--expired' hidden>
       This page was set to be reviewed before <%= format_date current_page_review.review_by %><% if current_page_review.owner_slack %>
        by the page owner <%= link_to current_page_review.owner_slack, current_page_review.owner_slack_url %><% end %>.
       This might mean the content is out of date.

data/lib/source/layouts/_search.erb

@@ -2,11 +2,11 @@
 <div class="search" data-module="search" data-path-to-site-root="<%= path_to_site_root config, current_page.path %>">
   <form action="https://www.google.co.uk/search" method="get" role="search" class="search__form govuk-!-margin-bottom-4">
     <input type="hidden" name="as_sitesearch" value="<%= config[:tech_docs][:host] %>"/>
-    <label class="govuk-label search__label" for="search" aria-hidden="true">
+    <label class="govuk-label search__label" for="search">
       Search (via Google)
     </label>
     <input
-      type="text"
+      type="search"
       id="search" name="q"
       class="govuk-input govuk-!-margin-bottom-0 search__input"
       aria-controls="search-results"

data/lib/source/layouts/core.erb

@@ -10,6 +10,11 @@
     <%= stylesheet_link_tag :manifest %>
 
     <link rel="canonical" href="<%= meta_tags.canonical_url %>">
+    <link rel="icon" sizes="48x48" href="/assets/govuk/assets/images/favicon.ico">
+    <link rel="icon" sizes="any" href="/assets/govuk/assets/images/favicon.svg" type="image/svg+xml">
+    <link rel="mask-icon" href="/assets/govuk/assets/images/govuk-icon-mask.svg" color="#0b0c0c">
+    <link rel="apple-touch-icon" href="/assets/govuk/assets/images/govuk-icon-180.png">
+    <link rel="manifest" href="/assets/govuk/assets/manifest.json">
 
     <% meta_tags.tags.each do |name, content| %>
       <%= tag :meta, name: name, content: content %>
@@ -23,7 +28,7 @@
   </head>
 
   <body class="govuk-template__body">
-    <script>document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');</script>
+    <script>document.body.className += ' js-enabled' + ('noModule' in HTMLScriptElement.prototype ? ' govuk-frontend-supported' : '');</script>
 
     <div class="app-pane">
       <div class="app-pane__header toc-open-disabled">
@@ -43,7 +48,7 @@
       <div class="app-pane__body"<%= " data-module=\"#{yield_content(:toc_module)}\"" if content_for? :toc_module %>>
         <% if content_for? :sidebar %>
           <div class="app-pane__toc">
-            <div class="toc" data-module="table-of-contents" tabindex="-1" aria-label="Table of contents" role="dialog">
+            <div class="toc" data-module="table-of-contents" tabindex="-1" aria-label="Table of contents">
               <%= partial "layouts/search" %>
               <button type="button" class="toc__close js-toc-close" aria-controls="toc" aria-label="Hide table of contents"></button>
               <nav id="toc" class="js-toc-list toc__list" aria-labelledby="toc-heading"<%= " data-module=\"collapsible-navigation\"" if config[:tech_docs][:collapsible_nav] %>>
@@ -75,6 +80,7 @@
     </div>
 
     <%= partial 'layouts/analytics' %>
+    <%= javascript_include_tag :govuk_frontend, :type => "module" %>
     <%= javascript_include_tag :application %>
   </body>
 </html>

data/lib/source/stylesheets/manifest.css

@@ -1,3 +1,3 @@
-//= link_tree ../../../node_modules/govuk-frontend/govuk/assets
+//= link_tree ../../../node_modules/govuk-frontend/dist/govuk/assets
 
 //= require screen

data/node_modules/govuk-frontend/dist/govuk/_base.scss

@@ -0,0 +1,5 @@
+@import "settings/index";
+@import "tools/index";
+@import "helpers/index";
+
+/*# sourceMappingURL=_base.scss.map */