Hugo: Update remote resource handling for version bump

.github/workflows/build-push.yml

@@ -11,7 +11,7 @@ env:
 
 jobs:
     deploy-example-site:
-      uses: nginxinc/docs-actions/.github/workflows/docs-build-push.yml@9c59fab05a8131f4d691ba6ea2b6a119f3ef832a # v1.0.7
+      uses: nginxinc/docs-actions/.github/workflows/docs-build-push.yml@285440f02d9967b62aeb1b7e0b5c2c70d4f950cf # v1.0.10
       with:
         production_url_path: "/nginx-hugo-theme"
         preview_url_path: "/previews/nginx-hugo-theme"

layouts/_default/single.html

@@ -1,2 +1,72 @@
-{{ .Render "docs" }}
+{{ define "main" }}
+<div class="docs-container row override-sidebar-collapse">
+  <nav id="sidebar" class="sidenav overflow-auto col-md-3 d-none d-xl-block d-print-none align-top">
+    {{ partial "sidebar.html" . }}
+  </nav>
 
+  <!-- Replace icons -->
+  {{ $content := partial "icon-replacement.html" (dict "content" .Content) }}
+
+  {{if (.Params.catalog) }}
+  <main class="content content-has-toc" role="main">
+  {{ else if and (gt .WordCount 200 ) (.Params.toc) }}
+  <main class="content col d-block align-top content-has-toc" role="main">
+  {{ else }}
+  <main class="content col d-block align-top content-no-toc" role="main">
+  {{ end }}
+
+  <section class="main-layout">
+    <div class="sidebar-layout" id="sidebar-layout">
+      <button class="sidebar__mobile__toggle" aria-expanded="false" data-mf="true">{{ partial "lucide" (dict "context" . "icon" "x")}}Close</button>
+      <nav data-mf="true" id="sidebar-v2" class="sidebar">
+        {{ partial "sidebar-v2.html" . }}
+      </nav>
+    </div>
+
+    <section id="maincontent" class="content-layout">
+      <div data-cms-edit="content" class="text-content">
+        <section class="breadcrumb-layout wide" data-mf="true" style="display: none;">
+          {{ if not .IsHome }}
+            {{ if not (in .Params.display_breadcrumb "false" ) }}
+            {{ partial "breadcrumb" .}}
+            {{ end }}
+          {{ end }}
+        </section>
+        {{ partial "banner" .}}
+        <h1>{{ .Title }}</h1>
+        {{ $content | safeHTML }}
+        {{ if eq .Page.Draft true }}{{ partial "draft-badge.html" . }}{{ end }}
+        {{ if in .Params.doctypes "beta" }}{{ partial "beta-badge" . }}{{ end }}
+
+        <hr>
+
+        {{ if .Page.Lastmod }}
+        <div class="last-modified">
+          {{ partial "page-meta-links" . }}
+        </div>
+        {{ end }}
+
+        {{ partial "version-list" . }}
+        {{ partial "qualtrics-feedback.html" }}
+
+        {{ partial "previous-next-links-in-section-with-title.html" . }}
+        </main>
+        {{ if and (gt .WordCount 200 ) (.Params.toc) }}
+          {{ if (add  (len (findRE "<h3" .Content)) (len (findRE "<h2" .Content))) }}
+            <div id="toc" class="col-md-3 d-none d-xl-block d-print-none nginx-toc align-top">
+            {{ partial "toc.html" . }}
+            </div>
+          {{ end }}
+        {{ end }}
+
+      </div>
+    </section>
+  </section>
+</div>
+<!-- If there is a script defined in the page metadata, load it  -->
+{{if .Params.script}}
+  {{ $script := (delimit (slice "scripts" .Params.script) "/")}}
+  {{ partial (string $script) .}}
+{{end }}
+
+{{ end }}

layouts/shortcodes/dimensions.html

@@ -3,16 +3,11 @@
 {{ $jsPath := replace $rawJSPath "/static" "" }}
 {{ $dimensionsRef := dict }}
 {{ with resources.Get $jsPath }}
-  {{ with .Err }}
-    {{ errorf "%s" . }}
-  {{ else }}
     {{ $dimensionsRef = . | transform.Unmarshal }}
-  {{ end }}
 {{ else }}
-  {{ errorf "Unable to get asset resource %q" $jsPath }}
+    {{ errorf "Unable to get asset resource %q" $jsPath }}
 {{ end }}
 
-
 <div class="row flex-xl-nowrap">
 
 

layouts/shortcodes/ghcode.html

@@ -1,13 +1,13 @@
 {{ $file := .Get 0 }}
 {{ $params := .Get 1 }}
 {{ $codeBlockId :=  printf "id-%x" (now.UnixNano) }}
-{{ with resources.GetRemote $file }}
+{{ with try (resources.GetRemote $file) }}
   {{ with .Err }}
     {{ errorf "%s" . }}
   {{ else }}
     {{ $lang := path.Ext $file | strings.TrimPrefix "." }}
     <div id="code-block-v1" data-mf="false">
-      {{ highlight .Content $lang $params }}
+      {{ highlight .Value $lang $params }}
     </div>
 
     <div class="code-block" data-mf="true" style="display: none;">
@@ -17,10 +17,10 @@
       <div class="code-container chroma">
           <button onclick="copyToClipBoard(this, {{ $codeBlockId }})" class="code-copy-button multi-line" type="button">Copy</button>
           <div class="highlight-v2" id="{{ $codeBlockId }}">
-            {{ highlight .Content $lang $params }}
+            {{ highlight .Value $lang $params }}
           </div>
       </div>
-  </div>
+    </div>
   {{ end }}
 {{ else }}
   {{ errorf "Unable to load github content from %s from %q" $file .Position}}

layouts/shortcodes/metrics.html

@@ -3,11 +3,7 @@
 {{ $jsPath := replace $rawJSPath "/static" "" }}
 {{ $metricsRef := dict }}
 {{ with resources.Get $jsPath }}
-  {{ with .Err }}
-    {{ errorf "%s" . }}
-  {{ else }}
     {{ $metricsRef = . | transform.Unmarshal }}
-  {{ end }}
 {{ else }}
   {{ errorf "Unable to get asset resource %q" $jsPath }}
 {{ end }}