From 8bcfeeb30a71b467c696c09e5d5274a2905ff820 Mon Sep 17 00:00:00 2001 From: Andreas Deininger Date: Thu, 9 Nov 2023 12:03:54 +0100 Subject: [PATCH] Bump to mermaid 10.6.1 --- layouts/partials/scripts/mermaid.html | 2 +- .../diagrams-and-formulae/index.md | 6 +- userguide/hugo.yaml | 3 +- userguide/hugo.yaml.orig | 141 ++++++++++++++++++ 4 files changed, 147 insertions(+), 5 deletions(-) create mode 100644 userguide/hugo.yaml.orig diff --git a/layouts/partials/scripts/mermaid.html b/layouts/partials/scripts/mermaid.html index f97a1f4f6..09746e962 100644 --- a/layouts/partials/scripts/mermaid.html +++ b/layouts/partials/scripts/mermaid.html @@ -1,4 +1,4 @@ -{{ $version := cond ( ge hugo.Version "0.90.0" ) "latest" "10.2.3" -}} +{{ $version := cond ( ge hugo.Version "0.90.0" ) "latest" "10.6.1" -}} {{ with .Site.Params.mermaid.version -}} {{ $version = . -}} {{ end -}} diff --git a/userguide/content/en/docs/adding-content/diagrams-and-formulae/index.md b/userguide/content/en/docs/adding-content/diagrams-and-formulae/index.md index cdc1af706..5df424f5d 100644 --- a/userguide/content/en/docs/adding-content/diagrams-and-formulae/index.md +++ b/userguide/content/en/docs/adding-content/diagrams-and-formulae/index.md @@ -396,18 +396,18 @@ By default, docsy pulls in the latest officially released version of Mermaid at {{< tab header="Hugo version >= 0.90 only:" disabled=true />}} {{< tab header="hugo.toml" lang="toml" >}} [params.mermaid] -version = "10.2.3" +version = "10.6.1" {{< /tab >}} {{< tab header="hugo.yaml" lang="yaml" >}} params: mermaid: - version: 10.2.3 + version: 10.6.1 {{< /tab >}} {{< tab header="hugo.json" lang="json" >}} { "params": { "mermaid": { - "version": "10.2.3" + "version": "10.6.1" } } } diff --git a/userguide/hugo.yaml b/userguide/hugo.yaml index 867841976..b646cb574 100644 --- a/userguide/hugo.yaml +++ b/userguide/hugo.yaml @@ -119,7 +119,8 @@ params: disable_toc: false markmap: enable: true - version: 10.2.3 + mermaid: + version: 10.6.1 drawio: enable: true diff --git a/userguide/hugo.yaml.orig b/userguide/hugo.yaml.orig new file mode 100644 index 000000000..12adf3a4c --- /dev/null +++ b/userguide/hugo.yaml.orig @@ -0,0 +1,141 @@ +baseURL: / +title: &title Docsy +description: &desc Docsy does docs +enableRobotsTXT: true +theme: [docsy] +enableGitInfo: true + +pygmentsCodeFences: true +pygmentsUseClasses: false +pygmentsUseClassic: false +pygmentsStyle: tango + +outputs: + home: [HTML] + page: [HTML] + section: [HTML, RSS, print] + +imaging: + resampleFilter: CatmullRom + quality: 75 + anchor: smart + +menu: + main: + - name: Example Site + weight: 40 + url: https://example.docsy.dev + post: + +services: + googleAnalytics: + id: UA-00000000-0 + +languages: + en: + languageName: English + params: + title: *title + description: *desc + +markup: + goldmark: + parser: + attribute: + block: true + renderer: + unsafe: true + highlight: + style: tango + +params: + copyright: The Docsy Authors + privacy_policy: https://policies.google.com/privacy + version_menu: Releases + archived_version: false + version: 0.7.2 + url_latest_version: https://example.com + github_repo: https://github.com/google/docsy + github_project_repo: https://github.com/google/docsy + github_subdir: userguide + time_format_blog: Monday, January 02, 2006 + time_format_default: January 2, 2006 + rss_sections: [blog] # TODO: drop since this is the default + gcs_engine_id: 011217106833237091527:la2vtv2emlw + offlineSearch: false + offlineSearchSummaryLength: 70 + offlineSearchMaxResults: 10 + prism_syntax_highlighting: false + search: + # algolia: + ui: + sidebar_cache_limit: 10 + sidebar_menu_compact: true + sidebar_menu_foldable: false + sidebar_search_disable: false + feedback: + enable: true + 'yes': >- + Glad to hear it! Please tell us how we can + improve. + 'no': >- + Sorry to hear that. Please tell us how we can + improve. + readingtime: + enable: false + links: + user: + - name: GitHub Discussions + url: https://github.com/google/docsy/discussions + icon: fa-brands fa-github + desc: Discussion and help from your fellow users + - name: User mailing list + url: https://groups.google.com/forum/#!forum/docsy-users + icon: fa-solid fa-envelope + desc: Sign up for Docsy announcements + - name: Twitter + url: https://twitter.com/docsydocs + icon: fa-brands fa-twitter + desc: Follow us on Twitter to get the latest news! + - name: Stack Overflow + url: https://stackoverflow.com/questions/tagged/docsy + icon: fa-brands fa-stack-overflow + desc: Practical questions and curated answers + developer: + - name: GitHub + url: https://github.com/google/docsy + icon: fa-brands fa-github + desc: Development takes place here! + + plantuml: + enable: true + theme: default + svg_image_url: https://www.plantuml.com/plantuml/svg/ + svg: false + print: + disable_toc: false + markmap: + enable: true +<<<<<<< HEAD + version: 10.0.2 +======= + mermaid: + version: 10.2.3 + theme: default + flowchart: + diagramPadding: 20 +>>>>>>> 633427a (Bump to mermaid 10.2.3) + drawio: + enable: true + +taxonomies: + tag: tags + category: categories + +module: + mounts: + - source: content/en + target: content