From 87d6889bdd2d7e81155899cb3e1419e96071976f Mon Sep 17 00:00:00 2001
From: Martin Geisler <mgeisler@google.com>
Date: Fri, 15 Sep 2023 11:45:21 +0200
Subject: [PATCH] Move JavaScript code to `head` template

This will simplify our mdbook updates since there will be fewer
customizations to copy over when a new mdbook version has changes to
the `index.hbs` template.
---
 theme/head.hbs  | 37 +++++++++++++++++++++++++++++++++++++
 theme/index.hbs | 37 -------------------------------------
 2 files changed, 37 insertions(+), 37 deletions(-)
 create mode 100644 theme/head.hbs

diff --git a/theme/head.hbs b/theme/head.hbs
new file mode 100644
index 000000000000..60e06a5d76ae
--- /dev/null
+++ b/theme/head.hbs
@@ -0,0 +1,37 @@
+<script async src="https://www.gstatic.com/brandstudio/kato/cookie_choice_component/cookie_consent_bar.v3.js"
+        data-autoload-cookie-consent-bar="true"></script>
+
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-ZN78TEJMRW"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+  gtag('config', 'G-ZN78TEJMRW');
+</script>
+
+{{! Move to template code after fixing this issue:
+    https://github.com/google/mdbook-i18n-helpers/issues/70 }}
+<script>
+  (function () {
+      // See these pages for details:
+      // https://developers.google.com/search/docs/crawling-indexing/consolidate-duplicate-urls
+      // https://developers.google.com/search/docs/crawling-indexing/javascript/javascript-seo-basics
+      let base = "https://google.github.io/comprehensive-rust";
+      {{#if (eq language "en")}}
+      let canonical_href = `${base}/{{ path }}`;
+      {{else}}
+      let canonical_href = `${base}/{{ language }}/{{ path }}`;
+      {{/if}}
+
+      // mdbook gives us a string ending in ".md", we replace it with ".html":
+      canonical_href = canonical_href.slice(0, -"md".length) + "html";
+      if (canonical_href.endsWith("/index.html")) {
+          canonical_href = canonical_href.slice(0, -"index.html".length);
+      }
+
+      let link = document.createElement("link");
+      link.rel = "canonical";
+      link.href = canonical_href;
+      document.head.appendChild(link);
+  })()
+</script>
diff --git a/theme/index.hbs b/theme/index.hbs
index 243f054fa7df..ab4aa90677b6 100644
--- a/theme/index.hbs
+++ b/theme/index.hbs
@@ -11,16 +11,6 @@
         <base href="{{ base_url }}">
         {{/if}}
 
-        <script async src="https://www.gstatic.com/brandstudio/kato/cookie_choice_component/cookie_consent_bar.v3.js"
-                data-autoload-cookie-consent-bar="true"></script>
-
-        <script async src="https://www.googletagmanager.com/gtag/js?id=G-ZN78TEJMRW"></script>
-        <script>
-          window.dataLayer = window.dataLayer || [];
-          function gtag(){dataLayer.push(arguments);}
-          gtag('js', new Date());
-          gtag('config', 'G-ZN78TEJMRW');
-        </script>
 
         <!-- Custom HTML head -->
         {{> head}}
@@ -147,33 +137,6 @@
             }
         </script>
 
-        {{! Move to template code after fixing this issue:
-            https://github.com/google/mdbook-i18n-helpers/issues/70 }}
-        <script>
-          (function () {
-              // See these pages for details:
-              // https://developers.google.com/search/docs/crawling-indexing/consolidate-duplicate-urls
-              // https://developers.google.com/search/docs/crawling-indexing/javascript/javascript-seo-basics
-              let base = "https://google.github.io/comprehensive-rust";
-              {{#if (eq language "en")}}
-              let canonical_href = `${base}/{{ path }}`;
-              {{else}}
-              let canonical_href = `${base}/{{ language }}/{{ path }}`;
-              {{/if}}
-
-              // mdbook gives us a string ending in ".md", we replace it with ".html":
-              canonical_href = canonical_href.slice(0, -"md".length) + "html";
-              if (canonical_href.endsWith("/index.html")) {
-                  canonical_href = canonical_href.slice(0, -"index.html".length);
-              }
-
-              let link = document.createElement("link");
-              link.rel = "canonical";
-              link.href = canonical_href;
-              document.head.appendChild(link);
-          })()
-        </script>
-
         <div id="page-wrapper" class="page-wrapper">
 
             <div class="page">