govuk_tech_docs 6.3.0 → 6.4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e14e31166315775ce210071e6369ceed8e305111f6667a75e9dfb56216879616
-  data.tar.gz: 79b82c15e10ac592f12fa635db39838d0676cb86abcc2a33e654ed22cbe2cd7c
+  metadata.gz: 8f326d15a8bd80fdec03049e06969fa49df12a72e1379c0638c32b6438553491
+  data.tar.gz: a51886d4182c8938ae188075568fd92028bf1899b410d0caaff864612ec17763
 SHA512:
-  metadata.gz: 8fea921277de197457d49755c9c7ddee7cf60cfcff80e599304824a47b6f094e58947a7673f849719b00a730a7d2a6b4c9e5933b5c70b5d0d9b627d797c30cf2
-  data.tar.gz: 2009a67d569ae66cfeda08739e7223a74da595bdba126a9bb0f440bb5c5704ec90e8285ea543a4943ea794350b7fdffafb0e230f2aa308d8c71d9db1ed24fc3b
+  metadata.gz: 48c680742a7eb673015b3d4c0d0e84d11e2f3bd220ba99a50aace843c110d8eb756ec3ed599242e9290e2f9ab407090115961f685407d44edd6545b4186f2d87
+  data.tar.gz: 223a5bf9bfa71d7977a83d5fc1c8f45d3aec88e0f7270688c0d03d7f6eb1952aa540a2424fe938992b8a0c455c52a37b3d437500fdec3deffb4a2ecc049b4b8a

data/.github/dependabot.yml

@@ -1,8 +1,3 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
-
 version: 2
 updates:
   # 1. Update Ruby dependencies (Gemfile/gemspec) in the root
@@ -12,9 +7,11 @@ updates:
       interval: "weekly"
       day: "monday"
       time: "06:00"
+    # Essential for gem projects without a Gemfile.lock:
+    versioning-strategy: "increase"
     commit-message:
       prefix: chore
-    open-pull-requests-limit: 3
+    open-pull-requests-limit: 5
     groups:
       prod-safe-updates:
         dependency-type: "production"
@@ -23,9 +20,15 @@ updates:
         update-types:
           - "minor"
           - "patch"
+      dev-safe-updates:
+        dependency-type: "development"
+        patterns:
+          - "*"
+        update-types:
+          - "minor"
+          - "patch"
 
-
-  # 2. Update GitHub Actions (keeps your CI workflows secure)
+  # 2. Update GitHub Actions
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
@@ -39,15 +42,15 @@ updates:
         patterns:
           - "*"
 
+  # 3. Update npm dependencies
   - package-ecosystem: "npm"
-    directory: "/" 
+    directory: "/"
     schedule:
       interval: "weekly"
       day: "monday"
       time: "06:00"
-    open-pull-requests-limit: 3
+    open-pull-requests-limit: 5
     groups:
-      # Group all "development" dependencies (linters, test runners, etc.)
       dev-dependencies:
         dependency-type: "development"
         patterns:
@@ -55,12 +58,10 @@ updates:
         update-types:
           - "patch"
           - "minor"
-      # Group all "production" dependencies (react, express, etc.) 
-      # but ONLY for minor/patch versions to avoid breaking changes
       prod-safe-updates:
         dependency-type: "production"
         patterns:
           - "*"
         update-types:
           - "patch"
-          - "minor"
+          - "minor"

data/.github/workflows/build-middleman-artifact.yaml

@@ -15,15 +15,15 @@ jobs:
         working-directory: documentation
     steps:
       - name: Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           fetch-depth: 0
       - name: Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
         with:
           node-version-file: 'documentation/.nvmrc'
       - name: Setup Ruby
-        uses: ruby/setup-ruby@89f90524b88a01fe6e0b732220432cc6142926af # v1.313.0
+        uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
         with:
           bundler-cache: true
           working-directory: documentation

data/.github/workflows/check-documentation-updates.yaml

@@ -0,0 +1,32 @@
+name: check-documentation-updates
+
+on:
+  workflow_call:
+    outputs:
+      documentation-updated:
+        value: ${{ jobs.check-documentation-updates.outputs.documentation-updated }}
+
+
+jobs:
+  check-documentation-updates:
+    runs-on: ubuntu-latest
+    outputs:
+      documentation-updated: ${{ steps.documentation_updated.outputs.documentation-updated }}
+
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          show-progress: false
+
+      - uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
+        with:
+          ruby-version: '3'
+
+      - name: Documentation updated
+        id: documentation_updated
+        run: |
+          if git diff --name-only ${{ github.event.before }} ${{ github.sha }} | grep -q '^documentation/'; then
+            echo "documentation-updated=true" >> $GITHUB_OUTPUT
+          else
+            echo "documentation-updated=false" >> $GITHUB_OUTPUT
+          fi

data/.github/workflows/check-gem-version.yaml

@@ -0,0 +1,36 @@
+name: check-gem-version
+on:
+  workflow_call:
+    outputs:
+      version-changed:
+        value: ${{ jobs.check-gem-version.outputs.version-changed }}
+
+
+jobs:
+  check-gem-version:
+    runs-on: ubuntu-latest
+    outputs:
+      version-changed: ${{ steps.gem_version.outputs.version-changed }}
+
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          show-progress: false
+
+      - uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
+        with:
+          ruby-version: '3'
+
+      - name: Gem version changed
+        id: gem_version
+        run: |
+          gem_version=$(ruby -r rubygems -e "puts Gem::Specification::load('govuk_tech_docs.gemspec').version")
+          echo "gem_version=$gem_version" >> "$GITHUB_OUTPUT"
+  
+          if git fetch origin "refs/tags/v$gem_version" >/dev/null 2>&1
+          then
+            echo "Tag 'v$gem_version' already exists"
+            echo "version-changed=false" >> "$GITHUB_OUTPUT"
+          else
+            echo "version-changed=true" >> "$GITHUB_OUTPUT"
+          fi

data/.github/workflows/npm-vulnerability-scanner.yaml

@@ -0,0 +1,55 @@
+name: NPM Audit Security Check
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  npm-audit:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
+
+      - name: Setup Node.js
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020
+        with:
+          node-version: '20'
+          cache: 'npm'
+
+      - name: Run NPM Audit & Generate Summary
+        run: |
+          # 1. Run npm audit in JSON mode to capture raw audit metadata
+          AUDIT_JSON=$(npm audit --audit-level=high --json 2>/dev/null) || true
+
+          # 2. Extract counts using node's built-in JSON parser
+          CRITICAL_COUNT=$(echo "$AUDIT_JSON" | node -e "let d=''; process.stdin.on('data', c => d += c); process.stdin.on('end', () => { try { console.log(JSON.parse(d).metadata.vulnerabilities.critical || 0) } catch { console.log(0) } })")
+          HIGH_COUNT=$(echo "$AUDIT_JSON" | node -e "let d=''; process.stdin.on('data', c => d += c); process.stdin.on('end', () => { try { console.log(JSON.parse(d).metadata.vulnerabilities.high || 0) } catch { console.log(0) } })")
+          
+          # 3. Build GitHub Job Summary Markdown
+          echo "## 🛡️ NPM Dependency Audit Summary" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+
+          if [ "$CRITICAL_COUNT" -eq 0 ] && [ "$HIGH_COUNT" -eq 0 ]; then
+            echo "✅ **No high or critical vulnerabilities found!** All JS packages passed security checks." >> $GITHUB_STEP_SUMMARY
+          else
+            echo "⚠️ **High/Critical Vulnerabilities Detected in npm Dependencies**" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "| Vulnerability Severity | Total Count |" >> $GITHUB_STEP_SUMMARY
+            echo "| :--- | :--- |" >> $GITHUB_STEP_SUMMARY
+            echo "| 🔴 **Critical** | $CRITICAL_COUNT \vert{}" >> $GITHUB_STEP_SUMMARY
+            echo "| 🟠 **High** | $HIGH_COUNT \vert{}" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "### Detailed Audit Report" >> $GITHUB_STEP_SUMMARY
+            echo '```text' >> $GITHUB_STEP_SUMMARY
+            # Output human-readable audit text into the summary block
+            npm audit --audit-level=high 2>/dev/null || true
+            echo '```' >> $GITHUB_STEP_SUMMARY
+
+            # 4. Fail the workflow step
+            echo "::error::npm audit detected $CRITICAL_COUNT critical and $HIGH_COUNT high vulnerabilities."
+            exit 1
+          fi

data/.github/workflows/pipeline.yaml

@@ -0,0 +1,56 @@
+name: pipeline
+on:
+  pull_request:
+    branches: [ "main"]
+  push:
+    branches: [ "main"]
+
+jobs:
+  npm-vulnerability-scanner:
+    uses: ./.github/workflows/npm-vulnerability-scanner.yaml
+    permissions:
+      contents: read
+
+  ruby-vulnerability-scanner:
+    needs: npm-vulnerability-scanner
+    uses: ./.github/workflows/ruby-vulnerability-scanner.yaml
+    permissions:
+      contents: read
+
+  test:
+    needs: ruby-vulnerability-scanner
+    uses: ./.github/workflows/test.yaml
+    permissions:
+      contents: read          # Allows the action to check out your repository code
+      pull-requests: write    # Allows the action to comment on or update the Dependabot PR
+      statuses: write         # Allows the action to post pass/fail build statuses
+
+  check-gem-version:
+    needs: test
+    uses: ./.github/workflows/check-gem-version.yaml
+
+  publish-gem:
+    needs: check-gem-version
+    if: github.event_name == 'push' && needs.check-gem-version.outputs.version-changed == 'true'
+    with:
+      new-gem-version: true
+    uses: ./.github/workflows/publish-gem.yaml
+    permissions:
+      contents: write  # needed to be able to tag the release
+
+  check-documentation-updates:
+     needs: publish-gem
+     if: |
+       github.event_name == 'push' && 
+       always() && 
+       (needs.publish-gem.result == 'success' || needs.publish-gem.result == 'skipped')
+     uses: ./.github/workflows/check-documentation-updates.yaml
+
+  publish-github-pages:
+    needs: check-documentation-updates
+    if: github.event_name == 'push' && needs.check-documentation-updates.outputs.documentation-updated == 'true'
+    uses: ./.github/workflows/publish-github-pages.yaml
+    permissions:
+      contents: read
+      pages: write
+      id-token: write

data/.github/workflows/publish-gem.yaml

@@ -0,0 +1,70 @@
+name: Publish
+
+on:
+  workflow_call:
+    inputs:
+      new-gem-version:
+        default: false
+        type: boolean
+  
+  workflow_dispatch:
+    inputs:
+      new-gem-version:
+        description: 'Force publish gem?'
+        default: false
+        type: boolean
+
+concurrency: rubygems
+
+jobs:
+  deploy:
+    name: Publish Ruby Gem
+    environment: rubygems
+    permissions:
+      contents: write  # needed to be able to tag the release
+    runs-on: ubuntu-latest
+    if: inputs.new-gem-version
+
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          show-progress: false
+
+      - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'npm'
+
+      - uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
+        with:
+          ruby-version: '3'
+          bundler-cache: true
+
+      - name: Verify Secret Presence
+        run: |
+          if [ -z "${{ secrets.RUBYGEMS_API_KEY }}" ]; then
+            echo "Error: Secret is empty or missing from this context!"
+            exit 1
+          else
+            echo "Secret is populated."
+          fi
+
+      - name: Publish
+        env:
+          RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
+        run: |
+          mkdir -p ~/.gem
+
+          cat << EOF > ~/.gem/credentials
+          ---
+          :rubygems_api_key: ${RUBYGEMS_API_KEY}
+          EOF
+
+          chmod 0600 ~/.gem/credentials
+
+          # tag will be associated with github-actions bot user, see
+          # https://github.community/t/github-actions-bot-email-address/17204
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+          bundle exec rake release

data/.github/workflows/{deploy-to-pages.yaml → publish-github-pages.yaml}

@@ -1,8 +1,7 @@
-name: 'Deploy to GitHub Pages'
+name: Publish GitHub pages
 on:
-  push:
-    branches: ["main", "feature/publish-documentation"]
-    paths: ['documentation/**']
+  workflow_call:
+
 
 permissions:
   contents: read
@@ -36,4 +35,4 @@ jobs:
           path: "build"
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 # v5.0.0
+        uses: actions/deploy-pages@368f82528645a54fb793d4d04e342629a3f51346 # v5.0.1

data/.github/workflows/ruby-vulnerability-scanner.yaml

@@ -0,0 +1,44 @@
+name: Ruby vulnerability scanner
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  bundler-audit:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b
+        with:
+          ruby-version: '3.3'
+          bundler-cache: true
+
+      - name: Run Audit Check
+        run: |
+          gem install bundler-audit
+          
+          # Run audit and save output to file (preventing immediate job failure via || true)
+          bundle-audit check --update > audit_results.txt || AUDIT_EXIT_CODE=$?
+          
+          echo "## 🛡️ Ruby Dependency Audit Summary" >> $GITHUB_STEP_SUMMARY
+          
+          if [ -z "$AUDIT_EXIT_CODE" ]; then
+            echo "::notice::No vulnerabilities found in Ruby dependencies."
+            echo "✅ **No vulnerabilities found!** All resolved gems from your `.gemspec` passed security checks." >> $GITHUB_STEP_SUMMARY
+          else
+            echo "⚠️ **Vulnerabilities Detected in Ruby Dependencies**" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo '```text' >> $GITHUB_STEP_SUMMARY
+            cat audit_results.txt >> $GITHUB_STEP_SUMMARY
+            echo '```' >> $GITHUB_STEP_SUMMARY
+          
+            # Fail the step if vulnerabilities were found
+            exit $AUDIT_EXIT_CODE
+          fi

data/.github/workflows/test.yaml

@@ -1,10 +1,7 @@
 name: Test
 
 on:
-  pull_request:
-    branches: [ "main" ]
-  push:
-    branches: [ "main" ]
+  workflow_call:
   workflow_dispatch:
 
 permissions:
@@ -12,26 +9,31 @@ permissions:
   pull-requests: write    # Allows the action to comment on or update the Dependabot PR
   statuses: write         # Allows the action to post pass/fail build statuses
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     name: Test
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
         ruby: ['3.3', '3.4', '4.0']
 
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           show-progress: false
 
-      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+      - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'
 
-      - uses: ruby/setup-ruby@89f90524b88a01fe6e0b732220432cc6142926af # v1.313.0
+      - uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true

data/.rspec

@@ -1,2 +1,3 @@
 --color
 --require spec_helper
+--format documentation

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## Unreleased changes
+
+## 6.4.1
+
+- Bugfix: [Issue 283](https://github.com/alphagov/tech-docs-gem/issues/283) - correctly read report issue url (backwards compatible)
+- Update: [Issue 543](https://github.com/alphagov/tech-docs-gem/issues/543) - allow full git urls as well as just repository name for report issue url
+- [PR 542](https://github.com/alphagov/tech-docs-gem/pull/542) to improve vale linter handling and output when using rake task
+
+## 6.4.0.beta
+
+- [Remove govuk wrapper class](https://github.com/alphagov/tech-docs-gem/pull/530) that introduced extra padding 
+- Update[ template html syntax](https://github.com/alphagov/tech-docs-gem/pull/520) to more closely match gov.uk design template
+- bump govuk-frontend from [6.2.0 to 6.3.0](https://github.com/alphagov/tech-docs-gem/pull/517)
+
 ## 6.3.0
 
 - Bugfix [issue 258](https://github.com/alphagov/tech-docs-template/issues/258) - page layout structure to remove whitespace on short pages ([pull request 513](https://github.com/alphagov/tech-docs-gem/pull/513))  

data/README.md

@@ -45,6 +45,9 @@ The linting job can take the following optional parameters:
 | `clean_build` | If true runs `bundle exec middleman build` to create a clean build.                         | 'true'    |
 | `full_output` | If true the full report is printed to the console, otherwise only the summary is displayed. | 'true'    |
 
+
+If running the linter causes timeouts or crashes, you can use `bundle exec tech_docs_jobs lint:debug`.  You should use this locally, not as part of a pipeline.
+
 ## GOV.UK frontend
 
 This gem uses [GOV.UK Frontend](https://github.com/alphagov/govuk-frontend), part of
@@ -163,7 +166,7 @@ the [Tech Docs template documentation on previewing your documentation](https://
 You can run the Ruby test suite with the following command:
 
 ```shell
-bundle exec rspec
+bundle exec rake spec
 ```
 
 To test a specific file include the filepath after `rspec`.

data/documentation/config/tech-docs.yml

@@ -29,7 +29,7 @@ collapsible_nav: true
 
 # Show links to contribute on GitHub
 show_contribution_banner: true
-github_repo: https://github.com/alphagov/tech-docs-gem/documentation
+github_repo: https://github.com/alphagov/tech-docs-gem
 
 # Enable search
 enable_search: true

data/documentation/source/configure_project/global_configuration/index.html.md.erb

@@ -211,12 +211,20 @@ show_contribution_banner: true
 
 ### github_repo
 
-Your documentation project's GitHub repository. You must enable this if you have enabled [show_contribution_banner].
+Your documentation project's GitHub repository. You must configure this if you have enabled [show_contribution_banner].
+
+Set this to either the repository's `owner/name` or its full GitHub URL. Link to the repository itself, rather than a file or directory, because the contribution banner builds its links relative to this URL.
 
 ```yaml
 github_repo: alphagov/example-repo
 ```
 
+You can also use the full URL:
+
+```yaml
+github_repo: https://github.com/alphagov/example-repo
+```
+
 ### github_branch
 
 Your project's GitHub default branch name. You can change this if your default branch is not named main.

data/lib/govuk_tech_docs/contribution_banner.rb

@@ -19,7 +19,8 @@ module GovukTechDocs
     end
 
     def report_issue_url
-      url = config[:source_urls]&.[](:report_issue_url)
+      url = config[:tech_docs][:source_urls]&.[](:report_issue_url)
+      url ||= config[:source_urls]&.[](:report_issue_url)
       params = {
         body: "Problem with '#{current_page.data.title}' (#{config[:tech_docs][:host]}#{current_page.url})",
       }
@@ -35,11 +36,22 @@ module GovukTechDocs
     end
 
     def repo_url
-      "https://github.com/#{config[:tech_docs][:github_repo]}"
+      github_repo = config[:tech_docs][:github_repo]
+      if github_repo.nil? || github_repo.empty?
+        raise ArgumentError, "github_repo value not found in config/tech-docs.yml"
+      end
+
+      repo_url = if github_repo.match?(%r{\Ahttps://github\.com/}i)
+                   github_repo
+                 else
+                   "https://github.com/#{github_repo}"
+                 end
+
+      repo_url.delete_suffix("/")
     end
 
     def repo_branch
-      config[:tech_docs][:github_branch] || "master" # TODO: change this to 'main' in a future breaking release
+      config[:tech_docs][:github_branch] || "master"
     end
 
   private

data/lib/govuk_tech_docs/version.rb

@@ -1,3 +1,3 @@
 module GovukTechDocs
-  VERSION = "6.3.0".freeze
+  VERSION = "6.4.1.0".freeze
 end

data/lib/source/layouts/_footer.erb

@@ -1,4 +1,4 @@
-<div class="govuk-footer app-footer" role="contentinfo">
+<div class="govuk-footer app-footer">
   <% if config[:tech_docs][:show_govuk_logo] %>
   <svg focusable="false" role="presentation" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 60" height="30" width="32" fill="currentcolor" class="govuk-footer__crown">
     <g>

data/lib/source/layouts/_header.erb

@@ -1,4 +1,4 @@
-<div class="govuk-header app-header" role="banner" data-module="govuk-header">
+<div class="govuk-header app-header">
   <div class="govuk-header__container govuk-header__container--full-width">
     <div class="govuk-header__logo">
       <% if config[:tech_docs][:service_link] %>

data/lib/source/layouts/_service_navigation.erb

@@ -1,4 +1,5 @@
- <div class="govuk-width-container">
+<div class="govuk-service-navigation app-pane__navigation" data-module="govuk-service-navigation">
+<div class="govuk-width-container">
     <div class="govuk-service-navigation__container">
       <nav aria-label="Menu" class="govuk-service-navigation__wrapper">
         <button type="button" class="govuk-service-navigation__toggle govuk-js-service-navigation-toggle" aria-controls="navigation" hidden aria-hidden="true">
@@ -20,3 +21,4 @@
       </nav>
     </div>
   </div>
+</div>

data/lib/source/layouts/core.erb

@@ -50,13 +50,11 @@
 
   <body class="govuk-template__body">
     <script>document.body.className += ' js-enabled' + ('noModule' in HTMLScriptElement.prototype ? ' govuk-frontend-supported' : '');</script>
-    <header class="govuk-template__header app-header" role="banner" data-module="govuk-header">
+    <header class="govuk-template__header app-header">
       <%= partial 'layouts/header' %>
     </header>
     <% if config[:tech_docs][:header_links] %>
-      <div class="govuk-service-navigation app-pane__navigation" data-module="govuk-service-navigation">
         <%= partial 'layouts/service_navigation' %>
-      </div>
     <% end %>
 
 
@@ -87,7 +85,7 @@
         <% end %>
 
         <div class="app-pane__content toc-open-disabled" aria-label="Content">
-          <main id="content" class="govuk-main-wrapper technical-documentation"<% if config[:tech_docs][:enable_anchored_headings] != false %> data-module="anchored-headings"<% end %>>
+          <main id="content" class="technical-documentation"<% if config[:tech_docs][:enable_anchored_headings] != false %> data-module="anchored-headings"<% end %>>
             <%= yield %>
             <%= partial "layouts/page_review" %>
           </main>