Merge branch 'js-css-fixes'

This topic brings an indentation fix, and more importantly a fix where
stale CSS/JS files are no longer used, by virtue of employing a
technique called "cache busting" (see e.g.
https://johnjago.com/cache-busting-hugo/). The idea is to add a filename
suffix that is computed from the file contents. That way, it is
guaranteed that:

1) The files can still be cached efficiently, and

2) Stale copies of the files are not used because they have a different
   filename.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

assets/js/application.js

@@ -408,11 +408,11 @@ var Search = {
     (async () => {
       const pagefindURL =
         `${baseURLPrefix}pagefind/pagefind.js`
-	  // adjust the `baseURLPrefix` if it is relative: the `import`
-	  // is relative to the _script URL_ here, which is in /js/.
-	  // That is different from other uses of `baseURLPrefix`, which
-	  // replace `href` and `src` attributes which are relative to the
-	  // page itself that is outside of /js/.
+          // adjust the `baseURLPrefix` if it is relative: the `import`
+          // is relative to the _script URL_ here, which is in /js/.
+          // That is different from other uses of `baseURLPrefix`, which
+          // replace `href` and `src` attributes which are relative to the
+          // page itself that is outside of /js/.
           .replace(/^\.\//, '../')
       Search.pagefind = await import(pagefindURL);
       const options = {

layouts/_default/baseof.html

@@ -64,8 +64,8 @@ <h1>Redirecting&hellip;</h1>
 
   <link href="{{ relURL "favicon.ico" }}" rel='shortcut icon' type='image/x-icon'>
 
-  {{ $style := resources.Get "sass/application.scss" | resources.ExecuteAsTemplate "application.scss" . | css.Sass | resources.Minify }}
-  <link rel="stylesheet" href="{{ $style.RelPermalink }}">
+  {{ $style := resources.Get "sass/application.scss" | resources.ExecuteAsTemplate "application.scss" . | css.Sass | resources.Minify | fingerprint }}
+  <link rel="stylesheet" href="{{ $style.RelPermalink }}"{{ if (hasPrefix .Site.BaseURL "https://") }} integrity="{{ $style.Data.Integrity }}"{{ end }}>
   <!--[if (gte IE 6)&(lte IE 8)]>
   <script src="{{ relURL "js/selectivizr-min.js" }}"></script>
   <![endif]-->

layouts/partials/footer.html

@@ -18,5 +18,5 @@
 <script src="{{ relURL "js/modernizr.js" }}"></script>
 <script src="{{ relURL "js/modernize.js" }}"></script>
 {{ if eq (.Scratch.Get "section") "search" }}<script src="{{ relURL "pagefind/pagefind-ui.js" }}"></script>{{ end }}
-{{ $js := resources.Get "js/application.js" | resources.ExecuteAsTemplate "js/application.js" . | resources.Minify }}
-<script src="{{ $js.RelPermalink }}"></script>
+{{ $js := resources.Get "js/application.js" | resources.ExecuteAsTemplate "js/application.js" . | resources.Minify | fingerprint }}
+<script src="{{ $js.RelPermalink }}"{{ if (hasPrefix .Site.BaseURL "https://") }} integrity="{{ $js.Data.Integrity }}"{{ end }}></script>

tests/git-scm.spec.js

@@ -254,7 +254,7 @@ test('404', async ({ page }) => {
   await expect(page.locator('.inner h1')).toHaveText(`That page doesn't exist.`)
 
   // the 404 page should be styled
-  await expect(page.locator('link[rel="stylesheet"]')).toHaveAttribute('href', /application(\.min)?\.css$/)
+  await expect(page.locator('link[rel="stylesheet"]')).toHaveAttribute('href', /application(\.min)?(\.[0-9a-f]+)?\.css$/)
 
   // the search box is shown
   await expect(page.locator('#search-text')).toBeVisible()