govuk_tech_docs 6.0.1 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e490b72c74aec01a8e39fa25446e74c7b85cdb81b8e95902d823fc6619ffeabe
-  data.tar.gz: a0a7fee77936966f916c0c6351a5614bdf33e6086ee1a0eeab19dca60deb518b
+  metadata.gz: 5b63d996648a19346b3271b19f10e30b6e81338617ee36fe348ec7060ecc7635
+  data.tar.gz: 790a7e766bf65ab9ab5a7b45dbff30bfa85d03761275938f8517808869cb940c
 SHA512:
-  metadata.gz: 5df8899a2930b154ed270903e47523eb1c4246c074bab40681872d89ecbff9e0ce6510817547d4a3b1120a68510fe29ae9d6a399835706fd6ab3420c3a20c326
-  data.tar.gz: e7bb22be432a4f76a8fa265d09a62747d5ad4be4fae6d85638f2085e96e10665aa311b708a644e2923eda2afdcc1f31f852d538372083d574a2477d88c2b87dc
+  metadata.gz: 31c6547961ed29eb9e56b4c2f761257900d18429e4fd7c73fa151a7fc21e7751c78a8d1c9ccf5c57a4d8f13e6f471384e8900307179b9f82115491f4349d3275
+  data.tar.gz: c0f8a093d245c3ba9ea5c9933eb4eb5f38d1a90fbc4a7dd74ef6b83531b2b3b51d773d7457ad760ab3f214a9b38b1734be839f73709a29decc33ed2a53da2083

data/.github/ISSUE_TEMPLATE/bug.yaml

@@ -0,0 +1,69 @@
+name: 🐛 Bug report
+description: Something is broken or not working as expected
+title: "[Bug]: "
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for reporting a bug in `tech-docs-gem`
+        Please include as much detail as you can.  This will help us prioritise this issue correctly.
+
+  - type: textarea
+    id: tech-docs-gem-version
+    attributes:
+      label: tech-docs-gem version
+      description: Which version of the tech docs gem are you using
+    validations:
+      required: true 
+      
+  - type: textarea
+    id: ruby-version
+    attributes:
+      label: ruby version
+      description: Which version of the ruby are you using (if known)
+    validations:
+      required: false
+
+  - type: textarea
+    id: description
+    attributes:
+      label: What happened?
+      description: Describe the problem and what you expected to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: Steps to reproduce
+      description: |
+        Tell us how to reproduce the issue.
+        Example:
+        1. Run `bundle exec middleman serve`
+        2. Visit `/guides/setup`
+        3. See white screen of death
+      placeholder: Step-by-step instructions
+    validations:
+      required: true
+
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Logs or error output
+      description: Any error messages or logs if available 
+    validations:
+      required: false
+
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: Checks
+      options:
+        - label: I have searched for existing issues
+          required: true
+        - label: I have checked other users also have this issue
+          required: true
+        - label: I have checked that I am not using a local or forked repository with untested changes
+          required: true

data/.github/ISSUE_TEMPLATE/config.yaml

@@ -0,0 +1,6 @@
+
+blank_issues_enabled: false
+contact_links:
+  - name: Ask a question or get help
+    url: https://ukgovernmentdigital.slack.com/archives/C1ZM2T0SG
+    about: Uk Government digital slack channel for Technical Writers

data/.github/ISSUE_TEMPLATE/enhancement.yaml

@@ -0,0 +1,25 @@
+name: ✨ New or updated feature
+description: Suggest a new feature or improvement
+title: "[Enhancement]: "
+labels: ["enhancement"]
+body:
+  - type: textarea
+    id: problem
+    attributes:
+      label: What should change?
+      description: What would fix the issue? Is this something you think should behave differently, or something that you currently cannot do?
+    validations:
+      required: true
+
+  - type: textarea
+    id: user-need
+    attributes:
+      label: User need
+      description: Do you have evidence that the change will meet the needs of users? Let us know about any user research or testing you’ve done
+
+  - type: textarea
+    id: proposal
+    attributes:
+      label: Proposed solution
+      description: Optional — describe how you think this could work or a solution you have in mind
+

data/.github/pull_request_template.md

@@ -1,14 +1,28 @@
-<!--
-## Please fill in the sections below
+## Proposed changes
 
-After you submit your pull request, the technical writing team from the Central Digital and Data Office (CDDO) will discuss and prioritise it at our fortnightly triage meeting. We’ll then let you know if and when we’ll move it forward.
--->
+### What changed
 
-## What’s changed
+Describe the changes made and the impact the changes have.
 
-<!-- What are you trying to do? Is this something that changes how the Tech Docs Template behaves, or is it fixing a bug? -->
+## Related issue or tracking reference
 
+You should have an open GitHub issue that this PR will fix.  
 
-## Identifying a user need
+- Fixes #
+- Relates to #
 
-<!-- Do you have evidence that this meets the needs of users? Let us know about any user research or testing you’ve done. -->
+> If there is no issue, please open one or please explain why one is not needed (for example small maintenance change, routine dependency update).
+
+## Screenshots or examples (if relevant)
+
+Include screenshots, logs, or rendered output if this change affects layout or behaviour.
+
+## Checklist
+
+Before you request approval you should confirm that:
+
+- [ ] the pull request has a clear title with a short description about the update in the documentation
+- [ ] GitHub actions all pass
+- [ ] you have tested the changes with a fresh build against the latest version of the `tech-docs-gem`
+- [ ] you have linked this PR to an issue (or explained why none exists)
+- [ ] you have updated documentation if needed

data/.github/workflows/dependency-review.yaml

@@ -0,0 +1,17 @@
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v6
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v4
+        with:
+          fail-on-severity: high
+          show-patched-versions: true

data/.github/workflows/test.yaml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['3.2', '3.3', '3.4', '4.0']
+        ruby: ['3.3', '3.4', '4.0']
 
     steps:
       - uses: actions/checkout@v6

data/.nvmrc

@@ -1 +1 @@
-18
+22

data/.ruby-version

@@ -1 +1 @@
-3.2.6
+3.3.11

data/CHANGELOG.md

@@ -1,8 +1,25 @@
+## 6.2.0
+
+- Remove support for Ruby 3.2, by updating `required_ruby_version` to  `>= 3.3.0`
+- Unpin ruby gem versions
+- Bump `.nvmrc` to use npm version 22
+- Updates `package.json` and `package-lock.json` to patch security vulnerabilities
+
+## 6.1.0
+
+- [Add custom extensions to render GOV.UK Design System nunjucks components](https://github.com/alphagov/tech-docs-gem/pull/443/changes)
+- [Fix inconsistent active tab behaviour](https://github.com/alphagov/tech-docs-gem/pull/452)
+
 ## 6.0.1
 
 - Update version of `openapi3_parser` allowing support for Ruby 4.0.
 
-## 6.0.0
+> Note:
+> openapi3_parser ~> 0.10.1 has a delcares a depndancy on commonmarker >= 1.0
+> commonmarker >= 1.0 declares required_ruby_version >= 3.3.22
+> If you are using an older ruby verion this may cause issues in your environment. We recommend upgrading to a version >= 3.
+
+## 6.0.0.beta
 
 - [Bump Design System to V6](https://github.com/alphagov/tech-docs-gem/pull/442), which brings in:
   - changes to the colour palette
@@ -20,7 +37,6 @@ ability, we're marking it as a major bump.
 - [Bump jasmine-core from 5.5.0 to 5.13.0 #448](https://github.com/alphagov/tech-docs-gem/pull/448)
 - [Ban pre|post-install NPM scripts #453](https://github.com/alphagov/tech-docs-gem/pull/453)
 
-
 ## 5.2.1
 
 - [Add option to not render child resources when creating a table of contents](https://github.com/alphagov/tech-docs-gem/pull/439/changes)

data/README.md

@@ -15,6 +15,8 @@ Find out how to [contribute](https://tdt-documentation.london.cloudapps.digital/
 
 This gem uses [GOV.UK Frontend](https://github.com/alphagov/govuk-frontend), part of the [GOV.UK Design System](https://design-system.service.gov.uk/).
 
+This gem can also use [GOV.UK Design System nunjucks components](https://design-system.service.gov.uk/components/).  It is recommended that you use these as they are user researched and accessibility tested.  An example using the `govukButton` component is available in the [example site in this gem](./example/source/index.html.md.erb).
+
 We use `npm` to download the govuk-frontend package. To update to a new version, change the version in the [package.json file](package.json) and run `npm update`.
 
 ## Table of contents helper functions
@@ -158,9 +160,8 @@ The documentation is [© Crown copyright][copyright] and available under the ter
 [mit]: LICENCE
 [copyright]: http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/
 [ogl]: http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/
-[tdt-docs]: https://tdt-documentation.london.cloudapps.digital
+[tdt-docs]: https://github.com/alphagov/tdt-documentation/
 [tdt-template]: https://github.com/alphagov/tech-docs-template
-[tdt-readme]: https://github.com/alphagov/tech-docs-template/blob/main/README.md
 [mmt]: https://middlemanapp.com/advanced/project_templates/
 
 [jas]: https://jasmine.github.io/

data/example/.ruby-version

@@ -1 +1 @@
-3.3.0
+3.2.6

data/example/config/tech-docs.yml

@@ -1,6 +1,9 @@
 # Host to use for canonical URL generation (without trailing slash)
 host: https://docs.example.com
 
+# Enable GOV.UK Design System nunjucks components (https://design-system.service.gov.uk/components)
+enable_govuk_components: true
+
 # Header-related options
 show_govuk_logo: true
 service_name: My First Service
@@ -14,6 +17,7 @@ header_links:
   Expired with owner: /expired-page-with-owner.html
   Not expired page: /not-expired-page.html
   Single page nav: /single-page-nav.html
+  Active pages: /active-pages/
 
 footer_links:
   Accessibility: /hidden-page.html

data/example/config.rb

@@ -7,3 +7,18 @@ ignore "templates/*"
 proxy "/a-proxied-page.html", "templates/proxy_template.html", locals: {
   title: "I am a title",
 }
+
+gem_root = File.expand_path("..", __dir__)
+files.watch :reload, path: File.join(gem_root, "lib")
+
+configure :development do
+  ready do
+    files.on_change :reload do |changed|
+      changed.each do |file|
+        next unless file.full_path.extname == ".rb"
+
+        load file.full_path.to_s
+      end
+    end
+  end
+end

data/example/source/active-pages/index.html.md.erb

@@ -0,0 +1,7 @@
+---
+title: Active page section root
+---
+
+# This is a section landing page, under the "Active pages" navigation link.
+
+The "Active pages" navigation link should be active.

data/example/source/active-pages/sub-section/index.html.md.erb

@@ -0,0 +1,7 @@
+---
+title: Active page sub section root
+---
+
+# This is a section sub section, under the "Active pages" navigation link.
+
+The "Active pages" navigation link should STILL BE active.

data/example/source/index.html.md.erb

@@ -18,5 +18,10 @@ To change the title of the page or include additional files you'll need to edit
 If you want slightly more control, you can always use <strong>HTML</strong>.
 
 For more detail and troubleshooting, take a look at the `README.md` file in the root of this project.
+<% if config[:tech_docs][:enable_govuk_components] %>
 
-<%= warning_text "Look out! A warning!" %>
+<%= govukButton({
+  text: "Click me!"
+}) %>
+
+<% end %>

data/govuk_tech_docs.gemspec

@@ -33,34 +33,36 @@ 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 = ">= 3.1.0"
+  spec.required_ruby_version = ">= 3.3.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 "concurrent-ruby", "1.3.4" # 1.3.5 introduced a change that breaks activesupport, and so middleman
+  spec.add_dependency "autoprefixer-rails"
+  spec.add_dependency "chronic"
+  spec.add_dependency "concurrent-ruby"
   spec.add_dependency "csv" # TODO: remove once tilt declares this itself.
-  spec.add_dependency "haml", "~> 6.0"
-  spec.add_dependency "middleman", "~> 4.6.1"
-  spec.add_dependency "middleman-autoprefixer", "~> 2.10"
-  spec.add_dependency "middleman-compass", "~> 4.0"
+  spec.add_dependency "haml", "~> 6.0" # middleman-core (4.6.3) depends on haml (>= 4.0.5, < 7)
+  spec.add_dependency "middleman"
+  spec.add_dependency "middleman-autoprefixer"
+  spec.add_dependency "middleman-compass"
   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.6"
+=begin
+middleman-sprockets is very old and out of date.  V4.1.0 has a breaking change.  Will look to replace with gem "dartsass-sprockets" or uses sass in the package.json
+=end
+  spec.add_dependency "middleman-sprockets", "4.0.0"
+  spec.add_dependency "middleman-syntax"
   spec.add_dependency "mutex_m" # TODO: remove once activesupport declares this itself.
   spec.add_dependency "nokogiri"
-  spec.add_dependency "openapi3_parser", "~> 0.10.1"
-  spec.add_dependency "redcarpet", "~> 3.6"
-  spec.add_dependency "sassc-embedded", "~> 1.78.0"
+  spec.add_dependency "openapi3_parser"
+  spec.add_dependency "redcarpet"
+  spec.add_dependency "sassc-embedded"
+  spec.add_dependency "schmooze", "~> 0.2.0"
   spec.add_dependency "terser", "~> 1.2.3"
 
   spec.add_development_dependency "benchmark"
   spec.add_development_dependency "byebug"
-  spec.add_development_dependency "capybara", "~> 3.32"
+  spec.add_development_dependency "capybara"
   spec.add_development_dependency "ostruct"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.9"
-  spec.add_development_dependency "rubocop-govuk", "~> 4.10"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rubocop-govuk"
 end

data/lib/govuk_tech_docs/custom_method_missing_handler.rb

@@ -0,0 +1,30 @@
+require "middleman-core"
+
+module GovukTechDocs
+  class CustomMethodMissingHandler < Middleman::Extension
+    def initialize(app, options_hash = {}, &block)
+      super
+    end
+
+    helpers do
+      def method_missing(method_name, *args, &block)
+        if method_name.to_s.start_with?("govuk")
+          begin
+            data = args.first || {}
+            @renderer ||= GovukTechDocs::GovukNunjuckComponenetRenderer.new(File.expand_path("../../", __dir__))
+            @renderer.render_govuk_component(method_name, data).html_safe
+          rescue StandardError => e
+            raise e
+          end
+        else
+          super
+        end
+      end
+
+      def respond_to_missing?(method_name, include_private = false)
+        method_name.to_s.start_with?("govuk") || super
+      end
+    end
+  end
+end
+::Middleman::Extensions.register(:custom_method_missing_handler, GovukTechDocs::CustomMethodMissingHandler)

data/lib/govuk_tech_docs/govuk_nunjuck_componenet_renderer.rb

@@ -0,0 +1,43 @@
+require "schmooze"
+
+module GovukTechDocs
+  class GovukNunjuckComponenetRenderer < Schmooze::Base
+    dependencies nunjucks: "nunjucks"
+
+    def initialize(gem_root)
+      super(gem_root) # Pass it up to Schmooze so it finds node_modules
+      @gem_root = gem_root
+    end
+
+    method :render_nunjucks_template, <<~JS
+      (templateString, templateData, searchPaths) => {
+          const env = nunjucks.configure(searchPaths, { autoescape: true });
+          return env.renderString(templateString, templateData);
+      }
+    JS
+
+    def get_component_template_name(component_name)
+      component_name.to_s.delete_prefix("govuk")
+                  .gsub(/([A-Z]+)([A-Z][a-z])/, '\1-\2') # Handle acronyms like "JSONData"
+                  .gsub(/([a-z\d])([A-Z])/, '\1-\2')     # Handle standard "CamelCase"
+                  .downcase
+    end
+
+    def render_govuk_component(component_name, template_data)
+      # 1. Logic for search paths belongs here now
+
+      search_paths = [File.join(@gem_root, "node_modules/govuk-frontend/dist")]
+      component_template_name = get_component_template_name(component_name)
+      # 2. Call the JS method defined above
+      nunjucks_template_string = <<~NJK
+              {% from "govuk/components/#{component_template_name}/macro.njk" import #{component_name} %}
+              {{ #{component_name}(template_data) }}
+      NJK
+      render_nunjucks_template(nunjucks_template_string, { "template_data" => template_data }, search_paths)
+    # rubocop:disable Lint/UselessAssignment
+    rescue StandardError => e
+      raise "Could not load GOV.UK component #{component_name} with data #{template_data}."
+    end
+    # rubocop:enable Lint/UselessAssignment
+  end
+end

data/lib/govuk_tech_docs/version.rb

@@ -1,3 +1,3 @@
 module GovukTechDocs
-  VERSION = "6.0.1".freeze
+  VERSION = "6.2.0".freeze
 end

data/lib/govuk_tech_docs.rb

@@ -24,6 +24,8 @@ require "govuk_tech_docs/unique_identifier_extension"
 require "govuk_tech_docs/unique_identifier_generator"
 require "govuk_tech_docs/warning_text_extension"
 require "govuk_tech_docs/api_reference/api_reference_extension"
+require "govuk_tech_docs/custom_method_missing_handler"
+require "govuk_tech_docs/govuk_nunjuck_componenet_renderer"
 
 module SassWarningSupressor
   def warn(message)
@@ -101,11 +103,35 @@ module GovukTechDocs
       end
 
       def active_page(page_path)
-        [
-          page_path == "/" && current_page.path == "index.html",
-          "/#{current_page.path}" == page_path,
-          !current_page.data.parent.nil? && current_page.data.parent.to_s == page_path,
-        ].any?
+        # if we are on the homepage e.g  Documentation: /
+        if page_path == "/" && current_page.url == "/"
+          return true
+        end
+
+        # if we are on a single page the header links point to e.g Expired page: /expired-page.html
+        if "/#{current_page.path}" == page_path
+          return true
+        end
+
+        # If the doc maintainer has set the parent data in the frontmatter for the current page,
+        # and it matches the value in the config e.g
+        # Expired page: /expired-page.html (config) and parent: /expired-page.html (child-of-expired-page.html)
+        if !current_page.data.parent.nil? && current_page.data.parent.to_s == page_path
+          return true
+        end
+
+        # If we have a nested directory structure that matches a navigation link e.g  Active pages: /active-pages/
+        if current_page.url.start_with?(page_path)
+          # feels like a weird check, but stops false positive where "/" for root is also the start of "/active-pages"
+          if page_path == "/"
+            return current_page.url == "/"
+          end
+
+          # safe to return true, since we aren't in the situation above
+          return true
+        end
+        # no other reason to believe we're active
+        false
       end
     end
 
@@ -138,5 +164,9 @@ module GovukTechDocs
     else
       context.ignore "search/*"
     end
+
+    if context.config[:tech_docs][:enable_govuk_components]
+      context.activate :custom_method_missing_handler
+    end
   end
 end

data/node_modules/govuk-frontend/dist/govuk/all.bundle.js

@@ -4,7 +4,7 @@
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.GOVUKFrontend = global.GOVUKFrontend || {}));
 })(this, (function (exports) { 'use strict';
 
-  const version = '6.0.0';
+  const version = '6.1.0';
 
   function getBreakpoint(name) {
     const property = `--govuk-breakpoint-${name}`;

data/node_modules/govuk-frontend/dist/govuk/all.bundle.mjs

@@ -1,4 +1,4 @@
-const version = '6.0.0';
+const version = '6.1.0';
 
 function getBreakpoint(name) {
   const property = `--govuk-breakpoint-${name}`;

data/node_modules/govuk-frontend/dist/govuk/common/govuk-frontend-version.mjs

@@ -1,4 +1,4 @@
-const version = '6.0.0';
+const version = '6.1.0';
 
 export { version };
 //# sourceMappingURL=govuk-frontend-version.mjs.map

data/node_modules/govuk-frontend/dist/govuk/components/accordion/_accordion.scss

@@ -1,4 +1,7 @@
-@import "../../base";
+@import "../../settings/warnings";
+
+@include _component-scss-file-warning("accordion");
+
 @import "./index";
 
 /*# sourceMappingURL=_accordion.scss.map */

data/node_modules/govuk-frontend/dist/govuk/components/accordion/_index.scss

@@ -1,3 +1,5 @@
+@import "../../base";
+
 @include govuk-exports("govuk/component/accordion") {
   $govuk-accordion-base-colour: govuk-colour("black");
   $govuk-accordion-hover-colour: govuk-colour("black", $variant: "tint-95");
@@ -23,11 +25,11 @@
 
   .govuk-accordion__section-button {
     @include govuk-font($size: 24, $weight: bold);
-    @include govuk-text-colour;
 
     display: block;
     margin-bottom: 0;
     padding-top: govuk-spacing(3);
+    color: govuk-functional-colour(text);
   }
 
   // Remove the bottom margin from the last item inside the content

data/node_modules/govuk-frontend/dist/govuk/components/back-link/_back-link.scss

@@ -1,4 +1,7 @@
-@import "../../base";
+@import "../../settings/warnings";
+
+@include _component-scss-file-warning("back-link");
+
 @import "./index";
 
 /*# sourceMappingURL=_back-link.scss.map */

data/node_modules/govuk-frontend/dist/govuk/components/back-link/_index.scss

@@ -1,3 +1,7 @@
+@use "sass:string";
+
+@import "../../base";
+
 @include govuk-exports("govuk/component/back-link") {
   // Component font-size on the Frontend (used for calculations)
   $font-size: 16;
@@ -49,12 +53,12 @@
     border-width: $chevron-border-min-width $chevron-border-min-width 0 0;
     border-color: $chevron-border-colour;
 
-    @supports (border-width: unquote("max(0px)")) {
+    @supports (border-width: string.unquote("max(0px)")) {
       $border-width-eval: "max(#{$chevron-border-min-width}, #{$chevron-border-width})";
 
       // Ensure that the chevron never gets smaller than 16px
-      border-width: unquote($border-width-eval) unquote($border-width-eval) 0 0;
-      font-size: unquote("max(#{$font-size * 1px}, 1em)");
+      border-width: string.unquote($border-width-eval) string.unquote($border-width-eval) 0 0;
+      font-size: string.unquote("max(#{$font-size * 1px}, 1em)");
     }
   }
 

data/node_modules/govuk-frontend/dist/govuk/components/breadcrumbs/_breadcrumbs.scss

@@ -1,4 +1,7 @@
-@import "../../base";
+@import "../../settings/warnings";
+
+@include _component-scss-file-warning("breadcrumbs");
+
 @import "./index";
 
 /*# sourceMappingURL=_breadcrumbs.scss.map */

data/node_modules/govuk-frontend/dist/govuk/components/breadcrumbs/_index.scss

@@ -1,3 +1,7 @@
+@use "sass:string";
+
+@import "../../base";
+
 @include govuk-exports("govuk/component/breadcrumbs") {
   // Component font-size on the Frontend (used for calculations)
   $font-size: 16;
@@ -20,10 +24,10 @@
 
   .govuk-breadcrumbs {
     @include govuk-font($size: $font-size);
-    @include govuk-text-colour;
 
     margin-top: govuk-spacing(3);
     margin-bottom: govuk-spacing(2);
+    color: govuk-functional-colour(text);
   }
 
   .govuk-breadcrumbs__list {
@@ -71,12 +75,12 @@
       border-width: $chevron-border-min-width $chevron-border-min-width 0 0;
       border-color: $chevron-border-colour;
 
-      @supports (border-width: unquote("max(0px)")) {
+      @supports (border-width: string.unquote("max(0px)")) {
         $border-width-eval: "max(#{$chevron-border-min-width}, #{$chevron-border-width})";
 
         // Ensure that the chevron never gets smaller than 16px
-        border-width: unquote($border-width-eval) unquote($border-width-eval) 0 0;
-        font-size: unquote("max(#{$font-size * 1px}, 1em)");
+        border-width: string.unquote($border-width-eval) string.unquote($border-width-eval) 0 0;
+        font-size: string.unquote("max(#{$font-size * 1px}, 1em)");
       }
     }