Merge pull request #563 from nunocoracao/dev

🔖 release v2.29.0
nunocoracao · Mar 2, 2023 · 8d87128 · 8d87128
2 parents a95a757 + 7e41c9c
commit 8d87128
Show file tree

Hide file tree

Showing 15 changed files with 84 additions and 1,689 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -36,13 +36,6 @@ jobs:
           push_options: "--dry-run"
           file_pattern: "assets/lib/katex/*"
           commit_message: "📦 Update packaged KaTeX"
-      - name: Commit Mermaid changes
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          branch: "${{ github.head_ref }}"
-          push_options: "--dry-run"
-          file_pattern: "assets/lib/mermaid/*"
-          commit_message: "📦 Update packaged Mermaid"
       - run: npm run build
       - name: Commit CSS changes
         uses: stefanzweifel/git-auto-commit-action@v4

diff --git a/.github/workflows/firebase-preview.yml b/.github/workflows/firebase-preview.yml
@@ -12,7 +12,7 @@ jobs:
           ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: true  # Fetch Hugo themes (true OR recursive)
           fetch-depth: 0    # Fetch all history for .GitInfo and .Lastmod

diff --git a/.github/workflows/firebase-production.yml b/.github/workflows/firebase-production.yml
@@ -14,7 +14,7 @@ jobs:
           ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: true  # Fetch Hugo themes (true OR recursive)
           fetch-depth: 0    # Fetch all history for .GitInfo and .Lastmod

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -18,7 +18,7 @@ jobs:
       pull-requests: write
 
     steps:
-    - uses: actions/stale@v5
+    - uses: actions/stale@v7
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue will be closed since it has been stale for 60 days.'

diff --git a/assets/js/mermaid.js b/assets/js/mermaid.js
diff --git a/assets/lib/.DS_Store b/assets/lib/.DS_Store
diff --git a/assets/lib/mermaid/mermaid.min.js b/assets/lib/mermaid/mermaid.min.js
diff --git a/assets/lib/tw-elements/index.min.js b/assets/lib/tw-elements/index.min.js
diff --git a/config.toml b/config.toml
@@ -2,4 +2,4 @@
   [module.hugoVersion]
     extended = true
     min = "0.87.0 "
-    max = "0.110.0"
+    max = "0.111.1"
diff --git a/exampleSite/content/docs/configuration/index.md b/exampleSite/content/docs/configuration/index.md
@@ -105,7 +105,7 @@ The default file can be used as a template to create additional languages, or re
 | `dateFormat`      | `"2 January 2006"` | How dates are formatted in this language. Refer to the [Hugo docs](https://gohugo.io/functions/format/#gos-layout-string) for acceptable formats.                                                                                                                                                                           |
 | `title`           | `"Blowfish"`       | The title of the website. This will be displayed in the site header and footer.                                                                                                                                                                                                                                             |
 | `description`     | _Not set_          | The website description. This will be used in the site metadata.                                                                                                                                                                                                                                                            |
-| `copyright`       | _Not set_          | A Markdown string containing the copyright message to be displayed in the site footer. If none is provided, Blowfish will automatically generate a copyright string using the site `title`.                                                                                                                                 |
+| `copyright`       | _Not set_          | A Markdown string for the site footer copyright message can include the placeholder { year } to dynamically insert the current year. If none is provided, Blowfish will automatically generate a copyright string using the site `title`.                                                                                                                                 |
 | `author.name`     | _Not set_          | The author's name. This will be displayed in article footers, and on the homepage when the profile layout is used.                                                                                                                                                                                                          |
 | `author.image`    | _Not set_          | Path to the image file of the author. The image should be a 1:1 aspect ratio and placed in the site's `assets/` folder.                                                                                                                                                                                                     |
 | `author.headline` | _Not set_          | A Markdown string containing the author's headline. It will be displayed on the profile homepage under the author's name.                                                                                                                                                                                                   |

diff --git a/exampleSite/content/users/index.md b/exampleSite/content/users/index.md
@@ -69,6 +69,7 @@ Real websites that are built with Blowfish.
 | [fugugames.com](https://fugugames.com/)                               | Games Site                   |
 | [hyperbowl3d.com](https://hyperbowl3d.com/)                           | Game Site                    |
 | [talkdimsum.com](https://talkdimsum.com/)                             | App Site                     |
+| [alanctanner.com](https://alanctanner.com/)                           | Personal Site                |
 
 
 {{< alert >}}

diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
@@ -19,7 +19,7 @@
     {{/* Copyright */}}
     {{ if .Site.Params.footer.showCopyright | default true }}
     <p class="text-sm text-neutral-500 dark:text-neutral-400">
-      {{- with .Site.Params.copyright }}
+      {{- with replace .Site.Params.copyright "{ year }" now.Year  }}
       {{ . | emojify | markdownify }}
       {{- else }}
       &copy;

diff --git a/layouts/partials/vendor.html b/layouts/partials/vendor.html
@@ -4,13 +4,12 @@
 
 {{/* Mermaid */}}
 {{ if .Page.HasShortcode "mermaid" }}
-{{ $mermaidLib := resources.Get "lib/mermaid/mermaid.min.js" }}
-{{ $mermaidConfig := resources.Get "js/mermaid.js" }}
-{{ $mermaidConfig := $mermaidConfig | resources.Minify }}
-{{ $mermaidJS := slice $mermaidLib $mermaidConfig | resources.Concat "js/mermaid.bundle.js" | resources.Fingerprint
-"sha512" }}
-<script defer type="text/javascript" src="{{ $mermaidJS.RelPermalink }}"
-  integrity="{{ $mermaidJS.Data.Integrity }}"></script>
+<script type="module">
+  import mermaid from 'https://cdn.jsdelivr.net/npm/mermaid@10/dist/mermaid.esm.min.mjs';
+  mermaid.initialize({
+    startOnLoad: true
+  });
+</script>
 {{ end }}
 
 {{/* Chart */}}

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hugo-blowfish-theme",
-  "version": "2.28.0",
+  "version": "2.29.0",
   "description": "Blowfish theme for Hugo",
   "scripts": {
     "fullinstall": "npm run preinstall && npm install && npm run postinstall",
@@ -39,23 +39,18 @@
     "fuse.js": "^6.6.2",
     "jquery": "^3.6.3",
     "katex": "^0.16.4",
-    "mermaid": "^10.0.0",
     "packery": "^2.1.2",
     "prettier": "^2.8.4",
     "prettier-plugin-go-template": "^0.0.13",
     "prettier-plugin-tailwindcss": "^0.2.3",
-    "rimraf": "^4.1.2",
+    "rimraf": "^4.1.3",
     "tailwindcss": "^3.2.7",
     "tw-elements": "^1.0.0-beta1",
     "typeit": "^8.7.1",
     "vendor-copy": "^3.0.1"
   },
   "vendorCopy": [],
   "devVendorCopy": [
-    {
-      "from": "node_modules/mermaid/dist/mermaid.min.js",
-      "to": "assets/lib/mermaid/mermaid.min.js"
-    },
     {
       "from": "node_modules/chart.js/dist/chart.umd.js",
       "to": "assets/lib/chart/chart.min.js"
@@ -98,7 +93,7 @@
     }
   ],
   "dependencies": {
-    "@headlessui/react": "^1.7.11",
+    "@headlessui/react": "^1.7.12",
     "@heroicons/react": "^2.0.16",
     "@tailwindcss/forms": "^0.5.3",
     "commander": "^10.0.0"