Upgrade docsy to v0.13.0 #7
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…aphy and color (google#2285) Co-authored-by: Tiffany Hrabusa <30397949+tiffany76@users.noreply.github.com>
3 tasks
Member
|
For reference, an interdiff between the v0.12 diff and the v0.13 diff: --- v0.12.0.diff 2026-01-06 18:21:49.884428963 +0000
+++ v0.13.0.diff 2026-01-06 18:23:41.184962495 +0000
@@ -47,10 +47,10 @@
+ {{ end -}}
+{{ end -}}
diff --git c/layouts/_partials/head.html w/layouts/_partials/head.html
-index d25e217..21b5ac9 100644
+index 2f5c24a..40aa8c6 100644
--- c/layouts/_partials/head.html
+++ w/layouts/_partials/head.html
-@@ -27,12 +27,12 @@
+@@ -63,12 +63,12 @@
{{ partial "twitter_cards.html" . -}}
{{ partialCached "head-css.html" . "head-css-cache-key" -}}
<script
@@ -65,7 +65,7 @@
integrity="sha384-203J0SNzyqHby3iU6hzvzltrWi/M41wOP5Gu+BiJMz5nwKykbkUx8Kp7iti0Lpli"
crossorigin="anonymous"></script>
{{ end -}}
-@@ -53,7 +53,7 @@
+@@ -89,7 +89,7 @@
{{ define "algolia/head" -}}
{{ if and .Site.Params.search (isset .Site.Params.search "algolia") -}}
@@ -75,19 +75,19 @@
crossorigin="anonymous" />
{{ end -}}
diff --git c/layouts/_partials/scripts.html w/layouts/_partials/scripts.html
-index 181af65..aba9683 100644
+index 38f1552..9c96fc1 100644
--- c/layouts/_partials/scripts.html
+++ w/layouts/_partials/scripts.html
-@@ -19,7 +19,7 @@
+@@ -18,7 +18,7 @@
},
};
</script>
-<script src="https://cdn.jsdelivr.net/npm/markmap-autoloader"></script>
-+<script src="{{ partial "dl-asset.html" "https://cdn.jsdelivr.net/npm/markmap-autoloader" }}"></script>
++<script src="{{ partial "dl-asset.html" "https://cdn.jsdelivr.net/npm/markmap-autoloader/dist/index.min.js" }}"></script>
{{ end -}}
{{ if .Site.Params.plantuml.enable -}}
-@@ -77,7 +77,7 @@
+@@ -82,7 +82,7 @@
{{ partial "hooks/body-end.html" . -}}
{{ define "algolia/scripts" -}}
@@ -125,10 +125,10 @@
- <script src="https://cdn.jsdelivr.net/npm/redoc@latest/bundles/redoc.standalone.js"></script>
+ <script src="{{ partial "dl-asset.html" "https://cdn.jsdelivr.net/npm/redoc@latest/bundles/redoc.standalone.js" }}"></script>
diff --git c/layouts/swagger/baseof.html w/layouts/swagger/baseof.html
-index b338a58..1b58fe9 100644
+index 8e28dbb..4592987 100644
--- c/layouts/swagger/baseof.html
+++ w/layouts/swagger/baseof.html
-@@ -6,7 +6,7 @@
+@@ -8,7 +8,7 @@
<head>
{{ partial "head.html" . }}
<title>{{ if .IsHome }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{ . }} | {{ end }}{{ .Site.Title }}{{ end }}</title>
@@ -137,7 +137,7 @@
</head>
<body class="td-{{ .Kind }}">
<header>
-@@ -27,8 +27,8 @@
+@@ -29,8 +29,8 @@
{{ if not (.Param "ui.breadcrumb_disable") -}}
{{ partial "breadcrumb.html" . -}}
{{ end -}}
@@ -148,17 +148,3 @@
{{ block "main" . }}{{ end }}
</main>
</div>
-diff --git c/userguide/hugo.yaml w/userguide/hugo.yaml
-index 5143fde..3e31070 100644
---- c/userguide/hugo.yaml
-+++ w/userguide/hugo.yaml
-@@ -146,4 +146,9 @@ module:
- - source: ../CONTRIBUTING.md
- target: content/project/contributing.md
-
-+security:
-+ http:
-+ mediaTypes:
-+ - ^application/javascript
-+
- # cSpell:ignore docsy github goldmark markmap plantuml readingtime userguideThe significant changes are: |
Member
|
(@zecakeh if you can provide any information on those two changes, for the archaeological record, that would be useful) |
richvdh
approved these changes
Jan 6, 2026
Author
|
When merging the upstream branch I got a conflict saying that Then when testing this I got this error for the markmap-autoloader file in CI: It sounds like it couldn't determine the file type, so I updated the URL to point to the same file, but with an extension. Now that I am thinking more about it, I am wondering if the patch was not another way to fix this same error because If they are indeed fixes for the same thing, the advantage of the new fix is that it works for every site using this theme, rather than requiring a workaround in the config of each site. In any case since we don't use markmap for matrix-spec, this fix will have no effect there. |
Member
|
great, thanks. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Smooth transition, got not conflicts.
To compare the changes between this branch and upstream: google/docsy@v0.13.0...zecakeh:matrix-org-docsy:docsy-0.13.0