From 00b4c6819ef02e6af8fc4eed4ba1dcbfdb2c21a7 Mon Sep 17 00:00:00 2001 From: Michael McKeen Date: Fri, 20 Jun 2025 08:47:00 -0400 Subject: [PATCH 1/3] Hugo: Update remote resource handling for version bump --- layouts/shortcodes/dimensions.html | 7 +------ layouts/shortcodes/ghcode.html | 8 ++++---- layouts/shortcodes/metrics.html | 4 ---- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/layouts/shortcodes/dimensions.html b/layouts/shortcodes/dimensions.html index 8fd1f4d..54fcca4 100644 --- a/layouts/shortcodes/dimensions.html +++ b/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 }} -
diff --git a/layouts/shortcodes/ghcode.html b/layouts/shortcodes/ghcode.html index 3aed9ec..8bac9d0 100644 --- a/layouts/shortcodes/ghcode.html +++ b/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 "." }}
- {{ highlight .Content $lang $params }} + {{ highlight .Value $lang $params }}
+
{{ end }} {{ else }} {{ errorf "Unable to load github content from %s from %q" $file .Position}} diff --git a/layouts/shortcodes/metrics.html b/layouts/shortcodes/metrics.html index c879a1c..94c12ca 100644 --- a/layouts/shortcodes/metrics.html +++ b/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 }} From ee4df06a2612045736720e0f6fe776826118c684 Mon Sep 17 00:00:00 2001 From: Michael McKeen Date: Fri, 20 Jun 2025 14:35:57 -0400 Subject: [PATCH 2/3] Hugo: Move docs template content to default single template --- layouts/_default/docs.html | 73 ------------------------------------ layouts/_default/single.html | 72 ++++++++++++++++++++++++++++++++++- 2 files changed, 71 insertions(+), 74 deletions(-) delete mode 100644 layouts/_default/docs.html diff --git a/layouts/_default/docs.html b/layouts/_default/docs.html deleted file mode 100644 index 46ec4ea..0000000 --- a/layouts/_default/docs.html +++ /dev/null @@ -1,73 +0,0 @@ -{{ define "main" }} -
-
- - - - {{ $content := partial "icon-replacement.html" (dict "content" .Content) }} - - {{if (.Params.catalog) }} -
- {{ else if and (gt .WordCount 200 ) (.Params.toc) }} -
- {{ else }} -
- {{ end }} - -
- - -
-
- - {{ partial "banner" .}} -

{{ .Title }}

- {{ $content | safeHTML }} - {{ if eq .Page.Draft true }}{{ partial "draft-badge.html" . }}{{ end }} - {{ if in .Params.doctypes "beta" }}{{ partial "beta-badge" . }}{{ end }} - -
- - {{ if .Page.Lastmod }} -
- {{ partial "page-meta-links" . }} -
- {{ end }} - - {{ partial "version-list" . }} - {{ partial "qualtrics-feedback.html" }} - - {{ partial "previous-next-links-in-section-with-title.html" . }} -
- {{ if and (gt .WordCount 200 ) (.Params.toc) }} - {{ if (add (len (findRE " - {{ partial "toc.html" . }} -
- {{ end }} - {{ end }} - -
- - - - -{{if .Params.script}} - {{ $script := (delimit (slice "scripts" .Params.script) "/")}} - {{ partial (string $script) .}} -{{end }} - -{{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 1fd0ee4..23edb76 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,2 +1,72 @@ -{{ .Render "docs" }} +{{ define "main" }} +
+ + + {{ $content := partial "icon-replacement.html" (dict "content" .Content) }} + + {{if (.Params.catalog) }} +
+ {{ else if and (gt .WordCount 200 ) (.Params.toc) }} +
+ {{ else }} +
+ {{ end }} + +
+ + +
+
+ + {{ partial "banner" .}} +

{{ .Title }}

+ {{ $content | safeHTML }} + {{ if eq .Page.Draft true }}{{ partial "draft-badge.html" . }}{{ end }} + {{ if in .Params.doctypes "beta" }}{{ partial "beta-badge" . }}{{ end }} + +
+ + {{ if .Page.Lastmod }} +
+ {{ partial "page-meta-links" . }} +
+ {{ end }} + + {{ partial "version-list" . }} + {{ partial "qualtrics-feedback.html" }} + + {{ partial "previous-next-links-in-section-with-title.html" . }} +
+ {{ if and (gt .WordCount 200 ) (.Params.toc) }} + {{ if (add (len (findRE " + {{ partial "toc.html" . }} +
+ {{ end }} + {{ end }} + + + + + + +{{if .Params.script}} + {{ $script := (delimit (slice "scripts" .Params.script) "/")}} + {{ partial (string $script) .}} +{{end }} + +{{ end }} \ No newline at end of file From 447582459afece3b2d2a496086d50e67d958620d Mon Sep 17 00:00:00 2001 From: Michael McKeen Date: Tue, 24 Jun 2025 12:10:32 -0400 Subject: [PATCH 3/3] CI: Update build-push action sha --- .github/workflows/build-push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index ecacdc7..6a80545 100644 --- a/.github/workflows/build-push.yml +++ b/.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"