From ae07fc2b38ffe8dc3e5796e1f3e6e57041b5eb36 Mon Sep 17 00:00:00 2001
From: "edd.grant" <edd@eddgrant.com>
Date: Thu, 2 Dec 2021 13:30:59 +0000
Subject: [PATCH 01/14] TRG-128 - Generate Table of Content links as relative
 links.

This aims to address https://github.com/alphagov/tech-docs-gem/issues/271 by ensuring that all TOC links are generated as relative links, rather than absolute. The desired outcome being that the site no longer makes assumptions about being deployed at "/" which in turn makes it "portable" (i.e. possible to deploy it at an arbitrary path).
---
 .../table_of_contents/helpers.rb              |  28 +++-
 spec/table_of_contents/helpers_spec.rb        | 129 ++++++++++++++++--
 2 files changed, 145 insertions(+), 12 deletions(-)

diff --git a/lib/govuk_tech_docs/table_of_contents/helpers.rb b/lib/govuk_tech_docs/table_of_contents/helpers.rb
index d2cb3730..aa577a5b 100644
--- a/lib/govuk_tech_docs/table_of_contents/helpers.rb
+++ b/lib/govuk_tech_docs/table_of_contents/helpers.rb
@@ -36,6 +36,29 @@ def list_items_from_headings(html, url: "", max_level: nil)
         HeadingTreeRenderer.new(tree, max_level: max_level).html
       end
 
+      def get_resource_link_value(config, resource, current_page)
+        if config[:relative_links]
+          current_page_segments = current_page.path.split("/").reject(&:empty?)[0..-2]
+          resource_path_segments = resource.path.split("/").reject(&:empty?)[0..-2]
+          resource_file_name = resource.path.split("/")[-1]
+          number_of_ascents_to_site_root = current_page_segments.length
+
+          if number_of_ascents_to_site_root == 0
+            ascents = ["."]
+          else
+            ascents = number_of_ascents_to_site_root.times.collect { ".." }
+          end
+
+          link_value = ascents.concat(resource_path_segments)
+                              .push(resource_file_name)
+                              .join("/")
+
+        else
+          link_value = resource.url
+        end
+        link_value
+      end
+
       def render_page_tree(resources, current_page, config, current_page_html)
         # Sort by weight frontmatter
         resources = resources
@@ -71,15 +94,16 @@ def render_page_tree(resources, current_page, config, current_page_html)
               config[:http_prefix] + "/"
             end
 
+          link_value = get_resource_link_value(config, resource, current_page)
           if resource.children.any? && resource.url != home_url
-            output += %{<li><a href="#{resource.url}"><span>#{resource.data.title}</span></a>\n}
+            output += %{<li><a href="#{link_value}"><span>#{resource.data.title}</span></a>\n}
             output += render_page_tree(resource.children, current_page, config, current_page_html)
             output += "</li>\n"
           else
             output +=
               list_items_from_headings(
                 content,
-                url: resource.url,
+                url: link_value,
                 max_level: config[:tech_docs][:max_toc_heading_level],
               )
           end
diff --git a/spec/table_of_contents/helpers_spec.rb b/spec/table_of_contents/helpers_spec.rb
index dd2a63bc..346375cd 100644
--- a/spec/table_of_contents/helpers_spec.rb
+++ b/spec/table_of_contents/helpers_spec.rb
@@ -126,16 +126,20 @@ def add_children(children)
 
     subject { Subject.new }
 
-    it "builds a table of contents from several page resources" do
+    it "builds a table of contents using absolute links from several page resources" do
       resources = []
       resources[0] = FakeResource.new("/index.html", '<h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2>', 10, "Index");
-      resources[1] = FakeResource.new("/a.html", '<h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2>', 10, "Sub page A", resources[0]);
-      resources[2] = FakeResource.new("/b.html", '<h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2>', 20, "Sub page B", resources[0]);
-      resources[0].add_children [resources[1], resources[2]]
+      resources[1] = FakeResource.new("/1/2/a.html", '<h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2>', 20, "Sub page A", resources[0]);
+      resources[2] = FakeResource.new("/1/2/3/b.html", '<h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2>', 30, "Sub page A", resources[0]);
+      resources[3] = FakeResource.new("/1/2/3/4/c.html", '<h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2>', 40, "Sub page B", resources[0]);
+      resources[4] = FakeResource.new("/1/5/d.html", '<h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2>', 50, "Sub page A", resources[0]);
+      resources[5] = FakeResource.new("/1/5/6/e.html", '<h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2>', 60, "Sub page A", resources[0]);
+      resources[0].add_children [resources[1], resources[2], resources[3], resources[4], resources[5]]
 
       current_page = double("current_page",
                             data: double("page_frontmatter", description: "The description.", title: "The Title"),
-                            url: "/index.html",
+                            url: "/1/2/3/index.html",
+                            path: "/1/2/3/index.html",
                             metadata: { locals: {} })
 
       current_page_html = '<h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2>';
@@ -152,18 +156,120 @@ def add_children(children)
 <li><a href="/index.html"><span>Index</span></a>
 <ul>
   <li>
-    <a href="/a.html"><span>Heading one</span></a>
+    <a href="/1/2/a.html"><span>Heading one</span></a>
+    <ul>
+      <li>
+        <a href="/1/2/a.html#heading-two"><span>Heading two</span></a>
+      </li>
+    </ul>
+  </li>
+  <li>
+    <a href="/1/2/3/b.html"><span>Heading one</span></a>
+    <ul>
+      <li>
+        <a href="/1/2/3/b.html#heading-two"><span>Heading two</span></a>
+      </li>
+    </ul>
+  </li>
+  <li>
+    <a href="/1/2/3/4/c.html"><span>Heading one</span></a>
+    <ul>
+      <li>
+        <a href="/1/2/3/4/c.html#heading-two"><span>Heading two</span></a>
+      </li>
+    </ul>
+  </li>
+  <li>
+    <a href="/1/5/d.html"><span>Heading one</span></a>
+    <ul>
+      <li>
+        <a href="/1/5/d.html#heading-two"><span>Heading two</span></a>
+      </li>
+    </ul>
+  </li>
+  <li>
+    <a href="/1/5/6/e.html"><span>Heading one</span></a>
+    <ul>
+      <li>
+        <a href="/1/5/6/e.html#heading-two"><span>Heading two</span></a>
+      </li>
+    </ul>
+  </li>
+</ul>
+</li>
+</ul>
+      }
+
+      expect(subject.multi_page_table_of_contents(resources, current_page, config, current_page_html).strip).to eq(expected_multi_page_table_of_contents.strip)
+    end
+
+    it "builds a table of contents using relative links from several page resources" do
+      resources = []
+      resources[0] = FakeResource.new("/index.html", '<h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2>', 10, "Index");
+      resources[1] = FakeResource.new("/1/2/a.html", '<h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2>', 20, "Sub page A", resources[0]);
+      resources[2] = FakeResource.new("/1/2/3/b.html", '<h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2>', 30, "Sub page A", resources[0]);
+      resources[3] = FakeResource.new("/1/2/3/4/c.html", '<h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2>', 40, "Sub page B", resources[0]);
+      resources[4] = FakeResource.new("/1/5/d.html", '<h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2>', 50, "Sub page A", resources[0]);
+      resources[5] = FakeResource.new("/1/5/6/e.html", '<h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2>', 60, "Sub page A", resources[0]);
+      resources[0].add_children [resources[1], resources[2], resources[3], resources[4], resources[5]]
+
+      current_page = double("current_page",
+                            data: double("page_frontmatter", description: "The description.", title: "The Title"),
+                            url: "/1/2/3/index.html",
+                            path: "/1/2/3/index.html",
+                            metadata: { locals: {} })
+
+      current_page_html = '<h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2>';
+
+      config = {
+        http_prefix: "/",
+        relative_links: true,
+        tech_docs: {
+          max_toc_heading_level: 3,
+        },
+      }
+
+      expected_multi_page_table_of_contents = %{
+<ul>
+<li><a href="../../../index.html"><span>Index</span></a>
+<ul>
+  <li>
+    <a href="../../../1/2/a.html"><span>Heading one</span></a>
+    <ul>
+      <li>
+        <a href="../../../1/2/a.html#heading-two"><span>Heading two</span></a>
+      </li>
+    </ul>
+  </li>
+  <li>
+    <a href="../../../1/2/3/b.html"><span>Heading one</span></a>
+    <ul>
+      <li>
+        <a href="../../../1/2/3/b.html#heading-two"><span>Heading two</span></a>
+      </li>
+    </ul>
+  </li>
+  <li>
+    <a href="../../../1/2/3/4/c.html"><span>Heading one</span></a>
+    <ul>
+      <li>
+        <a href="../../../1/2/3/4/c.html#heading-two"><span>Heading two</span></a>
+      </li>
+    </ul>
+  </li>
+  <li>
+    <a href="../../../1/5/d.html"><span>Heading one</span></a>
     <ul>
       <li>
-        <a href="/a.html#heading-two"><span>Heading two</span></a>
+        <a href="../../../1/5/d.html#heading-two"><span>Heading two</span></a>
       </li>
     </ul>
   </li>
   <li>
-    <a href="/b.html"><span>Heading one</span></a>
+    <a href="../../../1/5/6/e.html"><span>Heading one</span></a>
     <ul>
       <li>
-        <a href="/b.html#heading-two"><span>Heading two</span></a>
+        <a href="../../../1/5/6/e.html#heading-two"><span>Heading two</span></a>
       </li>
     </ul>
   </li>
@@ -175,7 +281,8 @@ def add_children(children)
       expect(subject.multi_page_table_of_contents(resources, current_page, config, current_page_html).strip).to eq(expected_multi_page_table_of_contents.strip)
     end
 
-    it "builds a table of contents from several page resources with a custom http prefix ocnfigured" do
+    #TODO: Assess whether this test is still relevant given that we are now generating relative links.
+    it "builds a table of contents from several page resources with a custom http prefix configured" do
       resources = []
       resources[0] = FakeResource.new("/prefix/index.html", '<h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2>', 10, "Index");
       resources[1] = FakeResource.new("/prefix/a.html", '<h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2>', 10, "Sub page A", resources[0]);
@@ -185,6 +292,7 @@ def add_children(children)
       current_page = double("current_page",
                             data: double("page_frontmatter", description: "The description.", title: "The Title"),
                             url: "/prefix/index.html",
+                            path: "/prefix/index.html",
                             metadata: { locals: {} })
 
       current_page_html = '<h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2>';
@@ -231,6 +339,7 @@ def add_children(children)
       current_page = double("current_page",
                             data: double("page_frontmatter", description: "The description.", title: "The Title"),
                             url: "/index.html",
+                            path: "/index.html",
                             metadata: { locals: {} })
 
       current_page_html = '<h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2><h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2><h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2>';

From 17b5c8aa774f2f9ae7a7945b43795043d97a3d17 Mon Sep 17 00:00:00 2001
From: "edd.grant" <edd@eddgrant.com>
Date: Thu, 6 Jan 2022 11:36:57 +0000
Subject: [PATCH 02/14] TRG-128: Make search function work when using
 generating sites using relative links.

---
 lib/assets/javascripts/_modules/search.js     | 24 +++++++++++--------
 .../table_of_contents/helpers.rb              | 16 +++++++++++++
 lib/source/layouts/_search.erb                |  2 +-
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/lib/assets/javascripts/_modules/search.js b/lib/assets/javascripts/_modules/search.js
index 48f6a0b0..e407e736 100644
--- a/lib/assets/javascripts/_modules/search.js
+++ b/lib/assets/javascripts/_modules/search.js
@@ -16,6 +16,7 @@
     var results
     var query
     var maxSearchEntries = 20
+    var pathToSiteRoot
     var searchIndexPath
 
     this.start = function start ($element) {
@@ -27,8 +28,9 @@
       $searchResultsTitle = $searchResultsWrapper.find('.search-results__title')
       $searchHelp = $('#search-help')
       searchIndexPath = $element.data('searchIndexPath')
+      pathToSiteRoot = $element.data('pathToSiteRoot')
 
-      changeSearchAction()
+      changeSearchAction(pathToSiteRoot)
       changeSearchLabel()
 
       // Only do searches on the search page
@@ -40,7 +42,7 @@
           query = s.getQuery()
           if (query) {
             $searchInput.val(query)
-            doSearch(query)
+            doSearch(query, pathToSiteRoot)
             doAnalytics()
             document.title = query + ' - ' + document.title
           }
@@ -51,7 +53,7 @@
     this.downloadSearchIndex = function downloadSearchIndex () {
       updateTitle('Loading search results')
       $.ajax({
-        url: searchIndexPath,
+        url: pathToSiteRoot + (searchIndexPath.startsWith('/') ? searchIndexPath.slice(1) : searchIndexPath),
         cache: true,
         method: 'GET',
         success: function (data) {
@@ -63,11 +65,11 @@
       })
     }
 
-    function changeSearchAction () {
+    function changeSearchAction (pathToSiteRoot) {
       // We need JavaScript to do search, so if JS is not available the search
       // input sends the query string to Google. This JS function changes the
       // input to instead send it to the search page.
-      $searchForm.prop('action', '/search')
+      $searchForm.prop('action', pathToSiteRoot + 'search/index.html')
       $searchForm.find('input[name="as_sitesearch"]').remove()
     }
 
@@ -76,7 +78,8 @@
     }
 
     this.isOnSearchPage = function isOnSearchPage () {
-      return Boolean(window.location.pathname.match(/\/search(\/|\/index.html)?$/))
+      // .* prefix is used to match sites which use relative links.
+      return Boolean(window.location.pathname.match(/.*\/search(\/|\/index.html)?$/))
     }
 
     this.getQuery = function getQuery () {
@@ -88,10 +91,10 @@
       return query
     }
 
-    function doSearch (query) {
+    function doSearch (query, pathToSiteRoot) {
       s.search(query, function (r) {
         results = r
-        renderResults(query)
+        renderResults(query, pathToSiteRoot)
         updateTitle()
       })
     }
@@ -140,7 +143,7 @@
       callback(getResults(query))
     }
 
-    function renderResults (query) {
+    function renderResults (query, pathToSiteRoot) {
       var output = ''
       if (results.length === 0) {
         output += '<p>Nothing found</p>'
@@ -151,7 +154,8 @@
         var content = s.processContent(result.content, query)
         output += '<li class="search-result">'
         output += '<h3 class="search-result__title">'
-        output += '<a href="' + result.url + '">'
+        const url = result.url.startsWith('/') ? result.url.slice(1) : result.url
+        output += '<a href="' + pathToSiteRoot + url + '">'
         output += result.title
         output += '</a>'
         output += '</h3>'
diff --git a/lib/govuk_tech_docs/table_of_contents/helpers.rb b/lib/govuk_tech_docs/table_of_contents/helpers.rb
index aa577a5b..126b0953 100644
--- a/lib/govuk_tech_docs/table_of_contents/helpers.rb
+++ b/lib/govuk_tech_docs/table_of_contents/helpers.rb
@@ -59,6 +59,22 @@ def get_resource_link_value(config, resource, current_page)
         link_value
       end
 
+      def path_to_site_root(*args, &block)
+        if config[:relative_links]
+          current_page_url = args[0]
+          number_of_ascents_to_site_root = current_page_url.to_s.split("/").length() - 1
+          if number_of_ascents_to_site_root == 0
+            ascents = ["."]
+          else
+            ascents = number_of_ascents_to_site_root.times.collect { ".." }
+          end
+          path_to_site_root = ascents.join("/").concat('/')
+        else
+          path_to_site_root = "/"
+        end
+        path_to_site_root
+      end
+
       def render_page_tree(resources, current_page, config, current_page_html)
         # Sort by weight frontmatter
         resources = resources
diff --git a/lib/source/layouts/_search.erb b/lib/source/layouts/_search.erb
index f738b6fc..587ad59f 100644
--- a/lib/source/layouts/_search.erb
+++ b/lib/source/layouts/_search.erb
@@ -1,5 +1,5 @@
 <% if config[:tech_docs][:enable_search] %>
-<div class="search" data-module="search" data-search-index-path="<%= search_index_path %>">
+<div class="search" data-module="search" data-path-to-site-root="<%= path_to_site_root current_page.path %>" data-search-index-path="<%= search_index_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">

From fabb8a6cb64d3394896aa601c1b1d0422c396d9a Mon Sep 17 00:00:00 2001
From: "edd.grant" <edd@eddgrant.com>
Date: Fri, 7 Jan 2022 16:44:52 +0000
Subject: [PATCH 03/14] TRG-128: Refactor path helpers out in to their own
 module.

Also improved the naming of a few methods and variables.
---
 lib/govuk_tech_docs.rb                        |  1 +
 lib/govuk_tech_docs/path_helpers.rb           | 33 ++++++++++++
 .../table_of_contents/helpers.rb              | 44 ++-------------
 lib/source/layouts/_search.erb                |  2 +-
 spec/govuk_tech_docs/path_helpers_spec.rb     | 53 +++++++++++++++++++
 5 files changed, 92 insertions(+), 41 deletions(-)
 create mode 100644 lib/govuk_tech_docs/path_helpers.rb
 create mode 100644 spec/govuk_tech_docs/path_helpers_spec.rb

diff --git a/lib/govuk_tech_docs.rb b/lib/govuk_tech_docs.rb
index cd19219f..4cacd978 100644
--- a/lib/govuk_tech_docs.rb
+++ b/lib/govuk_tech_docs.rb
@@ -67,6 +67,7 @@ def self.configure(context, options = {})
     context.activate :api_reference
 
     context.helpers do
+      include GovukTechDocs::PathHelpers
       include GovukTechDocs::TableOfContents::Helpers
       include GovukTechDocs::ContributionBanner
 
diff --git a/lib/govuk_tech_docs/path_helpers.rb b/lib/govuk_tech_docs/path_helpers.rb
new file mode 100644
index 00000000..cbc06f26
--- /dev/null
+++ b/lib/govuk_tech_docs/path_helpers.rb
@@ -0,0 +1,33 @@
+module GovukTechDocs
+  module PathHelpers
+    def get_path_to_resource(config, resource, current_page)
+      if config[:relative_links]
+        resource_path_segments = resource.path.split("/").reject(&:empty?)[0..-2]
+        resource_file_name = resource.path.split("/")[-1]
+
+        path_to_site_root = path_to_site_root config, current_page.path
+        resource_path = path_to_site_root + resource_path_segments
+                                           .push(resource_file_name)
+                                           .join("/")
+      else
+        resource_path = resource.url
+      end
+      resource_path
+    end
+
+    def path_to_site_root(config, page_path)
+      if config[:relative_links]
+        number_of_ascents_to_site_root = page_path.to_s.split("/").reject(&:empty?)[0..-2].length()
+        if number_of_ascents_to_site_root == 0
+          ascents = ["."]
+        else
+          ascents = number_of_ascents_to_site_root.times.collect { ".." }
+        end
+        path_to_site_root = ascents.join("/").concat('/')
+      else
+        path_to_site_root = "/"
+      end
+      path_to_site_root
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/govuk_tech_docs/table_of_contents/helpers.rb b/lib/govuk_tech_docs/table_of_contents/helpers.rb
index 126b0953..8af4807f 100644
--- a/lib/govuk_tech_docs/table_of_contents/helpers.rb
+++ b/lib/govuk_tech_docs/table_of_contents/helpers.rb
@@ -1,3 +1,4 @@
+require "govuk_tech_docs/path_helpers"
 require "govuk_tech_docs/table_of_contents/heading_tree_builder"
 require "govuk_tech_docs/table_of_contents/heading_tree_renderer"
 require "govuk_tech_docs/table_of_contents/heading_tree"
@@ -7,6 +8,8 @@
 module GovukTechDocs
   module TableOfContents
     module Helpers
+      include GovukTechDocs::PathHelpers
+
       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)
@@ -36,45 +39,6 @@ def list_items_from_headings(html, url: "", max_level: nil)
         HeadingTreeRenderer.new(tree, max_level: max_level).html
       end
 
-      def get_resource_link_value(config, resource, current_page)
-        if config[:relative_links]
-          current_page_segments = current_page.path.split("/").reject(&:empty?)[0..-2]
-          resource_path_segments = resource.path.split("/").reject(&:empty?)[0..-2]
-          resource_file_name = resource.path.split("/")[-1]
-          number_of_ascents_to_site_root = current_page_segments.length
-
-          if number_of_ascents_to_site_root == 0
-            ascents = ["."]
-          else
-            ascents = number_of_ascents_to_site_root.times.collect { ".." }
-          end
-
-          link_value = ascents.concat(resource_path_segments)
-                              .push(resource_file_name)
-                              .join("/")
-
-        else
-          link_value = resource.url
-        end
-        link_value
-      end
-
-      def path_to_site_root(*args, &block)
-        if config[:relative_links]
-          current_page_url = args[0]
-          number_of_ascents_to_site_root = current_page_url.to_s.split("/").length() - 1
-          if number_of_ascents_to_site_root == 0
-            ascents = ["."]
-          else
-            ascents = number_of_ascents_to_site_root.times.collect { ".." }
-          end
-          path_to_site_root = ascents.join("/").concat('/')
-        else
-          path_to_site_root = "/"
-        end
-        path_to_site_root
-      end
-
       def render_page_tree(resources, current_page, config, current_page_html)
         # Sort by weight frontmatter
         resources = resources
@@ -110,7 +74,7 @@ def render_page_tree(resources, current_page, config, current_page_html)
               config[:http_prefix] + "/"
             end
 
-          link_value = get_resource_link_value(config, resource, current_page)
+          link_value = get_path_to_resource(config, resource, current_page)
           if resource.children.any? && resource.url != home_url
             output += %{<li><a href="#{link_value}"><span>#{resource.data.title}</span></a>\n}
             output += render_page_tree(resource.children, current_page, config, current_page_html)
diff --git a/lib/source/layouts/_search.erb b/lib/source/layouts/_search.erb
index 587ad59f..db8b0ae8 100644
--- a/lib/source/layouts/_search.erb
+++ b/lib/source/layouts/_search.erb
@@ -1,5 +1,5 @@
 <% if config[:tech_docs][:enable_search] %>
-<div class="search" data-module="search" data-path-to-site-root="<%= path_to_site_root current_page.path %>" data-search-index-path="<%= search_index_path %>">
+<div class="search" data-module="search" data-path-to-site-root="<%= path_to_site_root config, current_page.path %>" data-search-index-path="<%= search_index_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">
diff --git a/spec/govuk_tech_docs/path_helpers_spec.rb b/spec/govuk_tech_docs/path_helpers_spec.rb
new file mode 100644
index 00000000..14f3c0b2
--- /dev/null
+++ b/spec/govuk_tech_docs/path_helpers_spec.rb
@@ -0,0 +1,53 @@
+
+
+RSpec.describe GovukTechDocs::PathHelpers do
+  include GovukTechDocs::PathHelpers
+
+  describe "#get_path_to_resource" do
+    it "calculates the path to a resource when using absolute links" do
+      resource_url = '/documentation/introduction/index.html'
+
+      config = {}
+      resource = double("resource", url: resource_url)
+
+      resource_path = get_path_to_resource(config, resource, nil)
+      expect(resource_path).to eql(resource_url)
+    end
+
+    it "calculates the path to a resource when using relative links" do
+      current_page_path = '/documentation/introduction/section-one/index.html'
+      url = '/documentation/introduction/index.html'
+
+      config = {
+        :relative_links => true
+      }
+      resource = double("resource", url: url, path: url)
+      current_page = double("current_page", path: current_page_path)
+
+      resource_path = get_path_to_resource(config, resource, current_page)
+      expect(resource_path).to eql('../../../documentation/introduction/index.html')
+    end
+  end
+
+  describe "#path_to_site_root" do
+    it "calculates the path from a page to the site root when using absolute links" do
+      page_path = '/documentation/introduction/index.html'
+
+      config = {}
+
+      path_to_site_root = path_to_site_root(config, page_path)
+      expect(path_to_site_root).to eql('/')
+    end
+
+    it "calculates the path from a page to the site root when using relative links" do
+      page_path = '/documentation/introduction/index.html'
+
+      config = {
+        :relative_links => true
+      }
+
+      path_to_site_root = path_to_site_root(config, page_path)
+      expect(path_to_site_root).to eql('../../')
+    end
+  end
+end

From d874c33e904cad4b47c87555759c85bd273a242a Mon Sep 17 00:00:00 2001
From: "edd.grant" <edd@eddgrant.com>
Date: Thu, 13 Jan 2022 15:52:48 +0000
Subject: [PATCH 04/14] TRG-128: Make /api/pages.json endpoint return relative
 links when the sites is configured to use relative links.

---
 lib/govuk_tech_docs/pages.rb       |  6 ++++--
 lib/source/api/pages.json.erb      |  2 +-
 spec/govuk_tech_docs/pages_spec.rb | 20 ++++++++++++++++++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/lib/govuk_tech_docs/pages.rb b/lib/govuk_tech_docs/pages.rb
index dfe9bcf7..021e2051 100644
--- a/lib/govuk_tech_docs/pages.rb
+++ b/lib/govuk_tech_docs/pages.rb
@@ -1,10 +1,12 @@
 module GovukTechDocs
   class Pages
+    include GovukTechDocs::PathHelpers
     attr_reader :sitemap
 
-    def initialize(sitemap, config)
+    def initialize(sitemap, config, current_page)
       @sitemap = sitemap
       @config = config
+      @current_page = current_page
     end
 
     def to_json(*_args)
@@ -18,7 +20,7 @@ def as_json
         review = PageReview.new(page, @config)
         {
           title: page.data.title,
-          url: "#{@config[:tech_docs][:host]}#{page.url}",
+          url: "#{get_path_to_resource(@config, page, @current_page)}",
           review_by: review.review_by,
           owner_slack: review.owner_slack,
         }
diff --git a/lib/source/api/pages.json.erb b/lib/source/api/pages.json.erb
index 9cec6020..eaf844c4 100644
--- a/lib/source/api/pages.json.erb
+++ b/lib/source/api/pages.json.erb
@@ -1 +1 @@
-<%= GovukTechDocs::Pages.new(sitemap, config).to_json %>
+<%= GovukTechDocs::Pages.new(sitemap, config, current_page).to_json %>
diff --git a/spec/govuk_tech_docs/pages_spec.rb b/spec/govuk_tech_docs/pages_spec.rb
index 02e20494..65b2842d 100644
--- a/spec/govuk_tech_docs/pages_spec.rb
+++ b/spec/govuk_tech_docs/pages_spec.rb
@@ -1,17 +1,33 @@
 RSpec.describe GovukTechDocs::Pages do
   describe "#to_json" do
-    it "returns the pages as JSON" do
+    it "returns the pages as JSON when using absolute links" do
+      current_page = double(path: "/api/pages.json")
       sitemap = double(resources: [
         double(url: "/a.html", data: double(title: "A thing", owner_slack: "#2ndline", last_reviewed_on: Date.yesterday, review_in: "0 days")),
         double(url: "/b.html", data: double(title: "B thing", owner_slack: "#2ndline", last_reviewed_on: Date.yesterday, review_in: "2 days")),
       ])
 
-      json = described_class.new(sitemap, tech_docs: {}).to_json
+      json = described_class.new(sitemap, {}, current_page).to_json
 
       expect(JSON.parse(json)).to eql([
         { "title" => "A thing", "url" => "/a.html", "review_by" => Date.yesterday.to_s, "owner_slack" => "#2ndline" },
         { "title" => "B thing", "url" => "/b.html", "review_by" => Date.tomorrow.to_s, "owner_slack" => "#2ndline" },
       ])
     end
+
+    it "returns the pages as JSON when using relative links" do
+      current_page = double(path: "/api/pages.json")
+      sitemap = double(resources: [
+        double(url: "/a.html", path: "/a.html", data: double(title: "A thing", owner_slack: "#2ndline", last_reviewed_on: Date.yesterday, review_in: "0 days")),
+        double(url: "/b/c.html", path: "/b/c.html", data: double(title: "B thing", owner_slack: "#2ndline", last_reviewed_on: Date.yesterday, review_in: "2 days")),
+      ])
+
+      json = described_class.new(sitemap, {:relative_links => true}, current_page).to_json
+
+      expect(JSON.parse(json)).to eql([
+        { "title" => "A thing", "url" => "../a.html", "review_by" => Date.yesterday.to_s, "owner_slack" => "#2ndline" },
+        { "title" => "B thing", "url" => "../b/c.html", "review_by" => Date.tomorrow.to_s, "owner_slack" => "#2ndline" },
+      ])
+    end
   end
 end

From 73080cae30710d81b350de655a77fd29bb49d19a Mon Sep 17 00:00:00 2001
From: "edd.grant" <edd@eddgrant.com>
Date: Wed, 19 Jan 2022 19:03:39 +0000
Subject: [PATCH 05/14] TRG-128: Make nav bar expanding, collapsing and
 highlighting work when using generating sites using relative links.

---
 .../_modules/collapsible-navigation.js        | 20 ++++++++++++-------
 .../_modules/in-page-navigation.js            | 13 ++++++++----
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/lib/assets/javascripts/_modules/collapsible-navigation.js b/lib/assets/javascripts/_modules/collapsible-navigation.js
index 4e4f6426..0d8baad4 100644
--- a/lib/assets/javascripts/_modules/collapsible-navigation.js
+++ b/lib/assets/javascripts/_modules/collapsible-navigation.js
@@ -57,25 +57,31 @@
       $toggleLabel.text(setOpen ? 'Collapse ' + $heading.text() : 'Expand ' + $heading.text())
     }
 
+    /**
+     * Returns an absolute pathname to $target by combining it with window.location.href
+     * @param $target The target whose pathname to return. This may be an anchor with an absolute or relative href.
+     * @returns {string} The absolute pathname of $target
+     */
+    function getAbsolutePath ($target) {
+      return new URL($target.attr('href'), window.location.href).pathname
+    }
+
     function openActiveHeading () {
       var $activeElement
       var currentPath = window.location.pathname
-      var isActiveTrail = '[href*="' + currentPath + '"]'
-      // Add an exception for the root page, as every href includes /
-      if (currentPath === '/') {
-        isActiveTrail = '[href="' + currentPath + window.location.hash + '"]'
-      }
       for (var i = $topLevelItems.length - 1; i >= 0; i--) {
         var $element = $($topLevelItems[i])
         var $heading = $element.find('> a')
         // Check if this item href matches
-        if ($heading.is(isActiveTrail)) {
+        if (getAbsolutePath($heading) === currentPath) {
           $activeElement = $element
           break
         }
         // Otherwise check the children
         var $children = $element.find('li > a')
-        var $matchingChildren = $children.filter(isActiveTrail)
+        var $matchingChildren = $children.filter(function (_) {
+          return getAbsolutePath($(this)) === currentPath
+        })
         if ($matchingChildren.length) {
           $activeElement = $element
           break
diff --git a/lib/assets/javascripts/_modules/in-page-navigation.js b/lib/assets/javascripts/_modules/in-page-navigation.js
index 8274c876..fc6301eb 100644
--- a/lib/assets/javascripts/_modules/in-page-navigation.js
+++ b/lib/assets/javascripts/_modules/in-page-navigation.js
@@ -70,13 +70,18 @@
     function highlightActiveItemInToc (fragment) {
       // Navigation items for single page navigation don't necessarily include the path name, but
       // navigation items for multipage navigation items do include it. This checks for either case.
-      var $activeTocItem = $tocItems.filter(
-        '[href="' + window.location.pathname + fragment + '"],[href="' + fragment + '"]'
-      )
+      var $activeTocItem = $tocItems.filter(function (_) {
+        var url = new URL($(this).attr('href'), window.location.href)
+        return url.href === window.location.href
+      })
+
       // Navigation items with children don't contain fragments in their url
       // Check to see if any nav items contain just the path name.
       if (!$activeTocItem.get(0)) {
-        $activeTocItem = $tocItems.filter('[href="' + window.location.pathname + '"]')
+        $activeTocItem = $tocItems.filter(function (_) {
+          const url = new URL($(this).attr('href'), window.location.href)
+          return url.hash === '' && url.pathname === window.location.pathname
+        })
       }
       if ($activeTocItem.get(0)) {
         $tocItems.removeClass('toc-link--in-view')

From a6b0eb9a3a39167da8bff9fbd2ffe97f8950a851 Mon Sep 17 00:00:00 2001
From: "edd.grant" <edd@eddgrant.com>
Date: Thu, 20 Jan 2022 16:25:30 +0000
Subject: [PATCH 06/14] Fix Rubocop linting errors.

---
 lib/govuk_tech_docs/pages.rb                  |  2 +-
 lib/govuk_tech_docs/path_helpers.rb           | 12 ++++------
 .../table_of_contents/helpers.rb              |  6 +----
 spec/govuk_tech_docs/pages_spec.rb            |  2 +-
 spec/govuk_tech_docs/path_helpers_spec.rb     | 22 +++++++++----------
 5 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/lib/govuk_tech_docs/pages.rb b/lib/govuk_tech_docs/pages.rb
index 021e2051..32445d6b 100644
--- a/lib/govuk_tech_docs/pages.rb
+++ b/lib/govuk_tech_docs/pages.rb
@@ -20,7 +20,7 @@ def as_json
         review = PageReview.new(page, @config)
         {
           title: page.data.title,
-          url: "#{get_path_to_resource(@config, page, @current_page)}",
+          url: get_path_to_resource(@config, page, @current_page).to_s,
           review_by: review.review_by,
           owner_slack: review.owner_slack,
         }
diff --git a/lib/govuk_tech_docs/path_helpers.rb b/lib/govuk_tech_docs/path_helpers.rb
index cbc06f26..7c86c82d 100644
--- a/lib/govuk_tech_docs/path_helpers.rb
+++ b/lib/govuk_tech_docs/path_helpers.rb
@@ -17,17 +17,13 @@ def get_path_to_resource(config, resource, current_page)
 
     def path_to_site_root(config, page_path)
       if config[:relative_links]
-        number_of_ascents_to_site_root = page_path.to_s.split("/").reject(&:empty?)[0..-2].length()
-        if number_of_ascents_to_site_root == 0
-          ascents = ["."]
-        else
-          ascents = number_of_ascents_to_site_root.times.collect { ".." }
-        end
-        path_to_site_root = ascents.join("/").concat('/')
+        number_of_ascents_to_site_root = page_path.to_s.split("/").reject(&:empty?)[0..-2].length
+        ascents = number_of_ascents_to_site_root.zero? ? ["."] : number_of_ascents_to_site_root.times.collect { ".." }
+        path_to_site_root = ascents.join("/").concat("/")
       else
         path_to_site_root = "/"
       end
       path_to_site_root
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/govuk_tech_docs/table_of_contents/helpers.rb b/lib/govuk_tech_docs/table_of_contents/helpers.rb
index 8af4807f..b83c7109 100644
--- a/lib/govuk_tech_docs/table_of_contents/helpers.rb
+++ b/lib/govuk_tech_docs/table_of_contents/helpers.rb
@@ -51,11 +51,7 @@ def render_page_tree(resources, current_page, config, current_page_html)
 
           # Reuse the generated content for the active page
           # If we generate it twice it increments the heading ids
-          content = if current_page.url == resource.url && current_page_html
-                      current_page_html
-                    else
-                      resource.render(layout: false)
-                    end
+          content = current_page.url == resource.url && current_page_html ? current_page_html : resource.render(layout: false)
           # Avoid redirect pages
           next if content.include? "http-equiv=refresh"
 
diff --git a/spec/govuk_tech_docs/pages_spec.rb b/spec/govuk_tech_docs/pages_spec.rb
index 65b2842d..9b504f81 100644
--- a/spec/govuk_tech_docs/pages_spec.rb
+++ b/spec/govuk_tech_docs/pages_spec.rb
@@ -22,7 +22,7 @@
         double(url: "/b/c.html", path: "/b/c.html", data: double(title: "B thing", owner_slack: "#2ndline", last_reviewed_on: Date.yesterday, review_in: "2 days")),
       ])
 
-      json = described_class.new(sitemap, {:relative_links => true}, current_page).to_json
+      json = described_class.new(sitemap, { relative_links: true }, current_page).to_json
 
       expect(JSON.parse(json)).to eql([
         { "title" => "A thing", "url" => "../a.html", "review_by" => Date.yesterday.to_s, "owner_slack" => "#2ndline" },
diff --git a/spec/govuk_tech_docs/path_helpers_spec.rb b/spec/govuk_tech_docs/path_helpers_spec.rb
index 14f3c0b2..918274ad 100644
--- a/spec/govuk_tech_docs/path_helpers_spec.rb
+++ b/spec/govuk_tech_docs/path_helpers_spec.rb
@@ -1,11 +1,9 @@
-
-
 RSpec.describe GovukTechDocs::PathHelpers do
   include GovukTechDocs::PathHelpers
 
   describe "#get_path_to_resource" do
     it "calculates the path to a resource when using absolute links" do
-      resource_url = '/documentation/introduction/index.html'
+      resource_url = "/documentation/introduction/index.html"
 
       config = {}
       resource = double("resource", url: resource_url)
@@ -15,39 +13,39 @@
     end
 
     it "calculates the path to a resource when using relative links" do
-      current_page_path = '/documentation/introduction/section-one/index.html'
-      url = '/documentation/introduction/index.html'
+      current_page_path = "/documentation/introduction/section-one/index.html"
+      url = "/documentation/introduction/index.html"
 
       config = {
-        :relative_links => true
+        relative_links: true,
       }
       resource = double("resource", url: url, path: url)
       current_page = double("current_page", path: current_page_path)
 
       resource_path = get_path_to_resource(config, resource, current_page)
-      expect(resource_path).to eql('../../../documentation/introduction/index.html')
+      expect(resource_path).to eql("../../../documentation/introduction/index.html")
     end
   end
 
   describe "#path_to_site_root" do
     it "calculates the path from a page to the site root when using absolute links" do
-      page_path = '/documentation/introduction/index.html'
+      page_path = "/documentation/introduction/index.html"
 
       config = {}
 
       path_to_site_root = path_to_site_root(config, page_path)
-      expect(path_to_site_root).to eql('/')
+      expect(path_to_site_root).to eql("/")
     end
 
     it "calculates the path from a page to the site root when using relative links" do
-      page_path = '/documentation/introduction/index.html'
+      page_path = "/documentation/introduction/index.html"
 
       config = {
-        :relative_links => true
+        relative_links: true,
       }
 
       path_to_site_root = path_to_site_root(config, page_path)
-      expect(path_to_site_root).to eql('../../')
+      expect(path_to_site_root).to eql("../../")
     end
   end
 end

From 1f2d71b8b52d2e1737985be1fb0e4c0d48c14793 Mon Sep 17 00:00:00 2001
From: "edd.grant" <edd@eddgrant.com>
Date: Thu, 20 Jan 2022 16:27:53 +0000
Subject: [PATCH 07/14] Remove TODO

---
 spec/table_of_contents/helpers_spec.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/table_of_contents/helpers_spec.rb b/spec/table_of_contents/helpers_spec.rb
index 346375cd..d7802c3b 100644
--- a/spec/table_of_contents/helpers_spec.rb
+++ b/spec/table_of_contents/helpers_spec.rb
@@ -281,7 +281,6 @@ def add_children(children)
       expect(subject.multi_page_table_of_contents(resources, current_page, config, current_page_html).strip).to eq(expected_multi_page_table_of_contents.strip)
     end
 
-    #TODO: Assess whether this test is still relevant given that we are now generating relative links.
     it "builds a table of contents from several page resources with a custom http prefix configured" do
       resources = []
       resources[0] = FakeResource.new("/prefix/index.html", '<h1 id="heading-one">Heading one</h1><h2 id="heading-two">Heading two</h2>', 10, "Index");

From 749fcc5cbf99711049ae56e4360444be2e0b387c Mon Sep 17 00:00:00 2001
From: "edd.grant" <edd@eddgrant.com>
Date: Thu, 20 Jan 2022 16:45:39 +0000
Subject: [PATCH 08/14] isOnSearchPage: Remove erroneous regular expression
 wildcard prefix.

---
 lib/assets/javascripts/_modules/search.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/assets/javascripts/_modules/search.js b/lib/assets/javascripts/_modules/search.js
index e407e736..91fc8593 100644
--- a/lib/assets/javascripts/_modules/search.js
+++ b/lib/assets/javascripts/_modules/search.js
@@ -78,8 +78,7 @@
     }
 
     this.isOnSearchPage = function isOnSearchPage () {
-      // .* prefix is used to match sites which use relative links.
-      return Boolean(window.location.pathname.match(/.*\/search(\/|\/index.html)?$/))
+      return Boolean(window.location.pathname.match(/\/search(\/|\/index.html)?$/))
     }
 
     this.getQuery = function getQuery () {

From 1c3ebc8c663080a1227dbca8f386f6ce245a0aee Mon Sep 17 00:00:00 2001
From: "edd.grant" <edd@eddgrant.com>
Date: Thu, 20 Jan 2022 16:50:08 +0000
Subject: [PATCH 09/14] changeSearchAction(): Don't pass already in-scope
 variable to function.

---
 lib/assets/javascripts/_modules/search.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/assets/javascripts/_modules/search.js b/lib/assets/javascripts/_modules/search.js
index 91fc8593..6dd18067 100644
--- a/lib/assets/javascripts/_modules/search.js
+++ b/lib/assets/javascripts/_modules/search.js
@@ -30,7 +30,7 @@
       searchIndexPath = $element.data('searchIndexPath')
       pathToSiteRoot = $element.data('pathToSiteRoot')
 
-      changeSearchAction(pathToSiteRoot)
+      changeSearchAction()
       changeSearchLabel()
 
       // Only do searches on the search page
@@ -65,7 +65,7 @@
       })
     }
 
-    function changeSearchAction (pathToSiteRoot) {
+    function changeSearchAction () {
       // We need JavaScript to do search, so if JS is not available the search
       // input sends the query string to Google. This JS function changes the
       // input to instead send it to the search page.

From 54ff817572d450638d86e0352ea22fe6e5f3e8ef Mon Sep 17 00:00:00 2001
From: "edd.grant" <edd@eddgrant.com>
Date: Fri, 21 Jan 2022 08:23:21 +0000
Subject: [PATCH 10/14] Replace use of const with var.

---
 lib/assets/javascripts/_modules/in-page-navigation.js | 2 +-
 lib/assets/javascripts/_modules/search.js             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/assets/javascripts/_modules/in-page-navigation.js b/lib/assets/javascripts/_modules/in-page-navigation.js
index fc6301eb..0848bfb6 100644
--- a/lib/assets/javascripts/_modules/in-page-navigation.js
+++ b/lib/assets/javascripts/_modules/in-page-navigation.js
@@ -79,7 +79,7 @@
       // Check to see if any nav items contain just the path name.
       if (!$activeTocItem.get(0)) {
         $activeTocItem = $tocItems.filter(function (_) {
-          const url = new URL($(this).attr('href'), window.location.href)
+          var url = new URL($(this).attr('href'), window.location.href)
           return url.hash === '' && url.pathname === window.location.pathname
         })
       }
diff --git a/lib/assets/javascripts/_modules/search.js b/lib/assets/javascripts/_modules/search.js
index 6dd18067..1f149601 100644
--- a/lib/assets/javascripts/_modules/search.js
+++ b/lib/assets/javascripts/_modules/search.js
@@ -153,7 +153,7 @@
         var content = s.processContent(result.content, query)
         output += '<li class="search-result">'
         output += '<h3 class="search-result__title">'
-        const url = result.url.startsWith('/') ? result.url.slice(1) : result.url
+        var url = result.url.startsWith('/') ? result.url.slice(1) : result.url
         output += '<a href="' + pathToSiteRoot + url + '">'
         output += result.title
         output += '</a>'

From 840a4783814a22e54c9e6fb90e60c0803c6bf8bb Mon Sep 17 00:00:00 2001
From: "edd.grant" <edd@eddgrant.com>
Date: Fri, 21 Jan 2022 08:24:03 +0000
Subject: [PATCH 11/14] Search: Add data-path-to-site-root attribute.

To ensure test code fragment matches the actual generated code.
---
 spec/javascripts/search-spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/javascripts/search-spec.js b/spec/javascripts/search-spec.js
index f2e0f80d..dbebe14a 100644
--- a/spec/javascripts/search-spec.js
+++ b/spec/javascripts/search-spec.js
@@ -10,7 +10,7 @@ describe('Search', function () {
 
   beforeEach(function () {
     module = new GOVUK.Modules.Search()
-    $element = $('<div class="search" data-module="search">' +
+    $element = $('<div class="search" data-module="search" data-path-to-site-root="/">' +
   '<form action="https://www.google.co.uk/search" method="get" role="search">' +
     '<input type="hidden" name="as_sitesearch" value="<%= config[:tech_docs][:host] %>"/>' +
     '<label for="search"  class="govuk-label search__label">Search (via Google)</label>' +

From 7ccde80e16ffbb57500cc591f87a62fd34d9f64a Mon Sep 17 00:00:00 2001
From: "edd.grant" <edd@eddgrant.com>
Date: Mon, 24 Jan 2022 09:22:38 +0000
Subject: [PATCH 12/14] Use :http_prefix when calculating the path to the site
 root, when using absolute links.

This configuration setting defaults to '/' so we can rely on it to always have a value.
---
 lib/govuk_tech_docs/path_helpers.rb       |  3 ++-
 spec/govuk_tech_docs/path_helpers_spec.rb | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/lib/govuk_tech_docs/path_helpers.rb b/lib/govuk_tech_docs/path_helpers.rb
index 7c86c82d..8fdad288 100644
--- a/lib/govuk_tech_docs/path_helpers.rb
+++ b/lib/govuk_tech_docs/path_helpers.rb
@@ -21,7 +21,8 @@ def path_to_site_root(config, page_path)
         ascents = number_of_ascents_to_site_root.zero? ? ["."] : number_of_ascents_to_site_root.times.collect { ".." }
         path_to_site_root = ascents.join("/").concat("/")
       else
-        path_to_site_root = "/"
+        middleman_http_prefix = config[:http_prefix]
+        path_to_site_root = middleman_http_prefix.end_with?("/") ? middleman_http_prefix : "#{middleman_http_prefix}/"
       end
       path_to_site_root
     end
diff --git a/spec/govuk_tech_docs/path_helpers_spec.rb b/spec/govuk_tech_docs/path_helpers_spec.rb
index 918274ad..7e434d33 100644
--- a/spec/govuk_tech_docs/path_helpers_spec.rb
+++ b/spec/govuk_tech_docs/path_helpers_spec.rb
@@ -31,12 +31,25 @@
     it "calculates the path from a page to the site root when using absolute links" do
       page_path = "/documentation/introduction/index.html"
 
-      config = {}
+      config = {
+        http_prefix: "/", # This is Middleman's default setting.
+      }
 
       path_to_site_root = path_to_site_root(config, page_path)
       expect(path_to_site_root).to eql("/")
     end
 
+    it "calculates the path from a page to the site root when a middleman http prefix" do
+      page_path = "/bananas/documentation/introduction/index.html"
+
+      config = {
+        http_prefix: "/bananas",
+      }
+
+      path_to_site_root = path_to_site_root(config, page_path)
+      expect(path_to_site_root).to eql("/bananas/")
+    end
+
     it "calculates the path from a page to the site root when using relative links" do
       page_path = "/documentation/introduction/index.html"
 

From babdeb7fcd05341310010f9b2079af54654bf7b2 Mon Sep 17 00:00:00 2001
From: "edd.grant" <edd@eddgrant.com>
Date: Thu, 3 Feb 2022 09:48:58 +0000
Subject: [PATCH 13/14] TRG-128: Ensure http_prefix is not duplicated when
 generating search result links.

---
 lib/assets/javascripts/_modules/search.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/assets/javascripts/_modules/search.js b/lib/assets/javascripts/_modules/search.js
index 1f149601..3ab6d148 100644
--- a/lib/assets/javascripts/_modules/search.js
+++ b/lib/assets/javascripts/_modules/search.js
@@ -153,8 +153,9 @@
         var content = s.processContent(result.content, query)
         output += '<li class="search-result">'
         output += '<h3 class="search-result__title">'
-        var url = result.url.startsWith('/') ? result.url.slice(1) : result.url
-        output += '<a href="' + pathToSiteRoot + url + '">'
+        var pagePathWithoutLeadingSlash = result.url.startsWith('/') ? result.url.slice(1) : result.url
+        var url = pathToSiteRoot.startsWith('.') ? pathToSiteRoot + pagePathWithoutLeadingSlash : '/' + pagePathWithoutLeadingSlash
+        output += '<a href="' + url + '">'
         output += result.title
         output += '</a>'
         output += '</h3>'

From d49fef089e4f6270c92f5023346e3f101afe7222 Mon Sep 17 00:00:00 2001
From: "edd.grant" <edd@eddgrant.com>
Date: Fri, 11 Feb 2022 08:34:22 +0000
Subject: [PATCH 14/14] TRG-128: Revert back to always obtaining search results
 from /search.json

---
 lib/assets/javascripts/_modules/search.js | 4 +---
 lib/source/layouts/_search.erb            | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/assets/javascripts/_modules/search.js b/lib/assets/javascripts/_modules/search.js
index 3ab6d148..0fa20ecf 100644
--- a/lib/assets/javascripts/_modules/search.js
+++ b/lib/assets/javascripts/_modules/search.js
@@ -17,7 +17,6 @@
     var query
     var maxSearchEntries = 20
     var pathToSiteRoot
-    var searchIndexPath
 
     this.start = function start ($element) {
       $searchForm = $element.find('form')
@@ -27,7 +26,6 @@
       $searchResults = $searchResultsWrapper.find('.search-results__content')
       $searchResultsTitle = $searchResultsWrapper.find('.search-results__title')
       $searchHelp = $('#search-help')
-      searchIndexPath = $element.data('searchIndexPath')
       pathToSiteRoot = $element.data('pathToSiteRoot')
 
       changeSearchAction()
@@ -53,7 +51,7 @@
     this.downloadSearchIndex = function downloadSearchIndex () {
       updateTitle('Loading search results')
       $.ajax({
-        url: pathToSiteRoot + (searchIndexPath.startsWith('/') ? searchIndexPath.slice(1) : searchIndexPath),
+        url: pathToSiteRoot + 'search.json',
         cache: true,
         method: 'GET',
         success: function (data) {
diff --git a/lib/source/layouts/_search.erb b/lib/source/layouts/_search.erb
index db8b0ae8..be33467d 100644
--- a/lib/source/layouts/_search.erb
+++ b/lib/source/layouts/_search.erb
@@ -1,5 +1,5 @@
 <% if config[:tech_docs][:enable_search] %>
-<div class="search" data-module="search" data-path-to-site-root="<%= path_to_site_root config, current_page.path %>" data-search-index-path="<%= search_index_path %>">
+<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">