From fc24e9b7d520fd4910e81eb5000ed20a99df40db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Fri, 28 Feb 2025 13:38:03 +0100 Subject: [PATCH 1/3] chore: bump docsy and hugo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- .github/workflows/hugo.yaml | 2 +- docs/go.mod | 4 ++-- docs/go.sum | 3 +++ docs/package.json | 8 ++++---- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/hugo.yaml b/.github/workflows/hugo.yaml index 1d91c85ef3..511f10a8e0 100644 --- a/.github/workflows/hugo.yaml +++ b/.github/workflows/hugo.yaml @@ -32,7 +32,7 @@ jobs: build: runs-on: ubuntu-latest env: - HUGO_VERSION: 0.125.4 + HUGO_VERSION: 0.145.0 steps: - name: Install Hugo CLI run: | diff --git a/docs/go.mod b/docs/go.mod index 00890a6408..514188ec6c 100644 --- a/docs/go.mod +++ b/docs/go.mod @@ -1,5 +1,5 @@ module github.com/google/docsy-example -go 1.12 +go 1.24 -require github.com/google/docsy v0.10.0 // indirect +require github.com/google/docsy v0.11.0 // indirect diff --git a/docs/go.sum b/docs/go.sum index 1b3ed24b03..c7a05f45f1 100644 --- a/docs/go.sum +++ b/docs/go.sum @@ -1,9 +1,12 @@ github.com/FortAwesome/Font-Awesome v0.0.0-20240108205627-a1232e345536/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo= github.com/FortAwesome/Font-Awesome v0.0.0-20240402185447-c0f460dca7f7/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo= +github.com/FortAwesome/Font-Awesome v0.0.0-20240716171331-37eff7fa00de/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo= github.com/google/docsy v0.9.1 h1:+jqges1YCd+yHeuZ1BUvD8V8mEGVtPxULg5j/vaJ984= github.com/google/docsy v0.9.1/go.mod h1:saOqKEUOn07Bc0orM/JdIF3VkOanHta9LU5Y53bwN2U= github.com/google/docsy v0.10.0 h1:6tMDacPwAyRWNCfvsn/9qGOZDQ8b0aRzjRZvnZPY5dg= github.com/google/docsy v0.10.0/go.mod h1:c0nIAqmRTOuJ01F85U/wJPQtc3Zj9N58Kea9bOT2AJc= +github.com/google/docsy v0.11.0 h1:QnV40cc28QwS++kP9qINtrIv4hlASruhC/K3FqkHAmM= +github.com/google/docsy v0.11.0/go.mod h1:hGGW0OjNuG5ZbH5JRtALY3yvN8ybbEP/v2iaK4bwOUI= github.com/twbs/bootstrap v5.2.3+incompatible h1:lOmsJx587qfF7/gE7Vv4FxEofegyJlEACeVV+Mt7cgc= github.com/twbs/bootstrap v5.2.3+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0= github.com/twbs/bootstrap v5.3.3+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0= diff --git a/docs/package.json b/docs/package.json index 02cc7f496a..a5a57eaa4c 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,7 +1,7 @@ { - "name": "docsy-example-site", - "version": "0.9.1", - "version.next": "0.9.2-dev.0-unreleased", + "name": "java-operator-sdk", + "version": "0.10.0", + "version.next": "0.10.1-dev.0-unreleased", "description": "Example site that uses Docsy theme for technical documentation.", "repository": "github:google/docsy-example", "homepage": "https://javaoperatorsdk.io", @@ -34,7 +34,7 @@ "update:pkg:hugo": "npm install --save-dev --save-exact hugo-extended@latest" }, "devDependencies": { - "autoprefixer": "^10.4.19", + "autoprefixer": "^10.4.20", "cross-env": "^7.0.3", "hugo-extended": "0.125.4", "postcss-cli": "^11.0.0" From be78f12d9da3125f39d0ca46bd97697e0c06cebc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Fri, 28 Feb 2025 13:39:20 +0100 Subject: [PATCH 2/3] wip MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- docs/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/go.mod b/docs/go.mod index 514188ec6c..65768398bb 100644 --- a/docs/go.mod +++ b/docs/go.mod @@ -1,5 +1,5 @@ module github.com/google/docsy-example -go 1.24 +go 1.12 require github.com/google/docsy v0.11.0 // indirect From 8e8d541e4bd0edf67345ab630e921b0b6b608fb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Fri, 28 Feb 2025 14:10:40 +0100 Subject: [PATCH 3/3] mermaid fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- docs/layouts/partials/scripts/mermaid.html | 68 ++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 docs/layouts/partials/scripts/mermaid.html diff --git a/docs/layouts/partials/scripts/mermaid.html b/docs/layouts/partials/scripts/mermaid.html new file mode 100644 index 0000000000..ac9290a10f --- /dev/null +++ b/docs/layouts/partials/scripts/mermaid.html @@ -0,0 +1,68 @@ + +{{ $version := .Site.Params.mermaid.version | default "latest" -}} + +{{ $cdnurl := printf "https://cdn.jsdelivr.net/npm/mermaid@%s/dist/mermaid.esm.min.mjs" $version -}} +{{ with try (resources.GetRemote $cdnurl) -}} +{{ with .Err -}} +{{ errorf "Could not retrieve mermaid script from CDN. Reason: %s." . -}} +{{ end -}} +{{ else -}} +{{ errorf "Invalid Mermaid version %s, could not retrieve this version from CDN." $version -}} +{{ end -}} + + \ No newline at end of file