🔀 Merge pull request #813 from tomy0000000/dev

🛠 fix: Space in rendered link
🔀 Merge pull request #807 from Jh123x/fix/fix-author-params-in-chinese-translation
2024-03-09 14:02:23 +11:00 · 2024-03-09 14:00:55 +11:00 · 2024-03-09 13:59:15 +11:00 · 2024-03-09 13:58:48 +11:00 · 2024-03-09 13:55:38 +11:00 · 2024-03-09 13:55:38 +11:00
10 changed files with 729 additions and 388 deletions
--- a/assets/lib/chart/chart.umd.js
+++ b/assets/lib/chart/chart.umd.js
--- a/assets/lib/mermaid/mermaid.min.js
+++ b/assets/lib/mermaid/mermaid.min.js
--- a/exampleSite/config/_default/languages.zh-CN.toml
+++ b/exampleSite/config/_default/languages.zh-CN.toml
@ -12,7 +12,7 @@ copyright = "&copy; 2023 Congo contributors"
  mainSections = ["samples"]
  description = "一款基于Tailwindcss的强大且轻量的Hugo主题"

-[author]
+[params.author]
  name = "Congo"
  image = "img/author.jpg"
  headline = "非凡的主题！"
--- a/exampleSite/content/users/index.es.md
+++ b/exampleSite/content/users/index.es.md
@ -72,5 +72,6 @@ La lista a continuación es solo un puñado de sitios web creados con el tema Co
 | [aminelch.github.io](https://aminelch.github.io)                       | Personal Site and Blog          |
 | [robertboscacci.com](https://robertboscacci.com)                       | Personal Site and Blog          |
 | [gorbe.io](https://www.gorbe.io)                                       | Business Site and Blog          |
+| [techwolf12.nl](https://techwolf12.nl)                       | Personal Site and Tech Blog          |

 **¿Usuaria de congo?** Para agregar tu sitio a esta lista, [haz un pull request](https://github.com/jpanther/congo/blob/dev/exampleSite/content/users/index.md).
--- a/exampleSite/content/users/index.ja.md
+++ b/exampleSite/content/users/index.ja.md
@ -72,5 +72,6 @@ Congoを使用して構築された実際のウェブサイト。
 | [aminelch.github.io](https://aminelch.github.io)                       | Personal Site and Blog          |
 | [robertboscacci.com](https://robertboscacci.com)                       | Personal Site and Blog          |
 | [gorbe.io](https://www.gorbe.io)                                       | Business Site and Blog          |
+| [techwolf12.nl](https://techwolf12.nl)                       | Personal Site and Tech Blog          |

 **Congoを使っていますか？** あなたのウェブサイトを加えるために[Pull Request](https://github.com/jpanther/congo/blob/dev/exampleSite/content/users/index.md)を投げてください。
--- a/exampleSite/content/users/index.md
+++ b/exampleSite/content/users/index.md
@ -72,5 +72,6 @@ The list below is just a handful of the websites that are built using the Congo
 | [aminelch.github.io](https://aminelch.github.io)                       | Personal Site and Blog          |
 | [robertboscacci.com](https://robertboscacci.com)                       | Personal Site and Blog          |
 | [gorbe.io](https://www.gorbe.io)                                       | Business Site and Blog          |
+| [techwolf12.nl](https://techwolf12.nl)                       | Personal Site and Tech Blog          |

 **Congo user?** To add your site to this list, [submit a pull request](https://github.com/jpanther/congo/blob/dev/exampleSite/content/users/index.md).
--- a/exampleSite/content/users/index.zh-cn.md
+++ b/exampleSite/content/users/index.zh-cn.md
@ -72,5 +72,6 @@ showEdit: false
 | [aminelch.github.io](https://aminelch.github.io)                       | Personal Site and Blog          |
 | [robertboscacci.com](https://robertboscacci.com)                       | Personal Site and Blog          |
 | [gorbe.io](https://www.gorbe.io)                                       | Business Site and Blog          |
+| [techwolf12.nl](https://techwolf12.nl)                       | Personal Site and Tech Blog          |

 **想成为Congo的用户？** 要将您的网站添加到此列表中，请提交[Pull Request](https://github.com/jpanther/congo/blob/dev/exampleSite/content/users/index.md)来添加。
--- a/layouts/_default/_markup/render-link.html
+++ b/layouts/_default/_markup/render-link.html
@ -1,9 +1,9 @@
 {{- $link := .Destination -}}
 {{- $isRemote := strings.HasPrefix $link "http" -}}
 {{- if not $isRemote }}
-  {{ $url := urls.Parse .Destination }}
+  {{- $url := urls.Parse .Destination -}}
  {{- if $url.Path }}
-    {{ $fragment := "" }}
+    {{- $fragment := "" }}
    {{- with $url.Fragment }}{{ $fragment = printf "#%s" . }}{{ end -}}
    {{- with .Page.GetPage $url.Path }}
      {{ $link = printf "%s%s" .RelPermalink $fragment }}
@ -14,5 +14,4 @@
    {{ end -}}
  {{ end -}}
 {{ end -}}
-<!-- prettier-ignore -->
-<a href="{{ $link | safeURL }}"{{ with .Title }} title="{{ . }}"{{ end }}{{ if $isRemote }} target="_blank" rel="noreferrer"{{ end }}>{{- .Text | safeHTML -}}</a>
+<!-- prettier-ignore --><a href="{{ $link | safeURL }}"{{ with .Title }} title="{{ . }}"{{ end }}{{ if $isRemote }} target="_blank" rel="noreferrer"{{ end }}>{{- .Text | safeHTML -}}</a>
--- a/package-lock.json
+++ b/package-lock.json
@ -11,13 +11,13 @@
      "license": "MIT",
      "devDependencies": {
        "@tailwindcss/typography": "^0.5.10",
-        "chart.js": "^4.4.1",
+        "chart.js": "^4.4.2",
        "fuse.js": "^7.0.0",
        "katex": "^0.16.9",
-        "mermaid": "^10.7.0",
+        "mermaid": "^10.9.0",
        "prettier": "^3.2.5",
        "prettier-plugin-go-template": "^0.0.15",
-        "prettier-plugin-tailwindcss": "^0.5.11",
+        "prettier-plugin-tailwindcss": "^0.5.12",
        "quicklink": "^2.3.0",
        "rimraf": "^5.0.5",
        "tailwindcss": "^3.4.1",
@ -338,15 +338,15 @@
      }
    },
    "node_modules/chart.js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.1.tgz",
-      "integrity": "sha512-C74QN1bxwV1v2PEujhmKjOZ7iUM4w6BWs23Md/6aOZZSlwMzeCIDGuZay++rBgChYru7/+QFeoQW0fQoP534Dg==",
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.2.tgz",
+      "integrity": "sha512-6GD7iKwFpP5kbSD4MeRRRlTnQvxfQREy36uEtm1hzHzcOqwWx0YEHuspuoNlslu+nciLIB7fjjsHkUv/FzFcOg==",
      "dev": true,
      "dependencies": {
        "@kurkle/color": "^0.3.0"
      },
      "engines": {
-        "pnpm": ">=7"
+        "pnpm": ">=8"
      }
    },
    "node_modules/chokidar": {
@ -457,9 +457,9 @@
      }
    },
    "node_modules/cytoscape": {
-      "version": "3.23.0",
-      "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.23.0.tgz",
-      "integrity": "sha512-gRZqJj/1kiAVPkrVFvz/GccxsXhF3Qwpptl32gKKypO4IlqnKBjTOu+HbXtEggSGzC5KCaHp3/F7GgENrtsFkA==",
+      "version": "3.28.1",
+      "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.28.1.tgz",
+      "integrity": "sha512-xyItz4O/4zp9/239wCcH8ZcFuuZooEeF8KHRmzjDfGdXsj3OG9MFSMA0pJE0uX3uCN/ygof6hHf4L7lst+JaDg==",
      "dev": true,
      "dependencies": {
        "heap": "^0.2.6",
@ -481,33 +481,6 @@
        "cytoscape": "^3.2.0"
      }
    },
-    "node_modules/cytoscape-fcose": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cytoscape-fcose/-/cytoscape-fcose-2.2.0.tgz",
-      "integrity": "sha512-ki1/VuRIHFCzxWNrsshHYPs6L7TvLu3DL+TyIGEsRcvVERmxokbf5Gdk7mFxZnTdiGtnA4cfSmjZJMviqSuZrQ==",
-      "dev": true,
-      "dependencies": {
-        "cose-base": "^2.2.0"
-      },
-      "peerDependencies": {
-        "cytoscape": "^3.2.0"
-      }
-    },
-    "node_modules/cytoscape-fcose/node_modules/cose-base": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cose-base/-/cose-base-2.2.0.tgz",
-      "integrity": "sha512-AzlgcsCbUMymkADOJtQm3wO9S3ltPfYOFD5033keQn9NJzIbtnZj+UdBJe7DYml/8TdbtHJW3j58SOnKhWY/5g==",
-      "dev": true,
-      "dependencies": {
-        "layout-base": "^2.0.0"
-      }
-    },
-    "node_modules/cytoscape-fcose/node_modules/layout-base": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/layout-base/-/layout-base-2.0.1.tgz",
-      "integrity": "sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg==",
-      "dev": true
-    },
    "node_modules/d3": {
      "version": "7.8.4",
      "resolved": "https://registry.npmjs.org/d3/-/d3-7.8.4.tgz",
@ -1510,23 +1483,23 @@
      }
    },
    "node_modules/mermaid": {
-      "version": "10.7.0",
-      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-10.7.0.tgz",
-      "integrity": "sha512-PsvGupPCkN1vemAAjScyw4pw34p4/0dZkSrqvAB26hUvJulOWGIwt35FZWmT9wPIi4r0QLa5X0PB4YLIGn0/YQ==",
+      "version": "10.9.0",
+      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-10.9.0.tgz",
+      "integrity": "sha512-swZju0hFox/B/qoLKK0rOxxgh8Cf7rJSfAUc1u8fezVihYMvrJAS45GzAxTVf4Q+xn9uMgitBcmWk7nWGXOs/g==",
      "dev": true,
      "dependencies": {
        "@braintree/sanitize-url": "^6.0.1",
        "@types/d3-scale": "^4.0.3",
        "@types/d3-scale-chromatic": "^3.0.0",
-        "cytoscape": "^3.23.0",
+        "cytoscape": "^3.28.1",
        "cytoscape-cose-bilkent": "^4.1.0",
-        "cytoscape-fcose": "^2.1.0",
        "d3": "^7.4.0",
        "d3-sankey": "^0.12.3",
        "dagre-d3-es": "7.0.10",
        "dayjs": "^1.11.7",
        "dompurify": "^3.0.5",
        "elkjs": "^0.9.0",
+        "katex": "^0.16.9",
        "khroma": "^2.0.0",
        "lodash-es": "^4.17.21",
        "mdast-util-from-markdown": "^1.3.0",
@ -2363,9 +2336,9 @@
      }
    },
    "node_modules/prettier-plugin-tailwindcss": {
-      "version": "0.5.11",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.11.tgz",
-      "integrity": "sha512-AvI/DNyMctyyxGOjyePgi/gqj5hJYClZ1avtQvLlqMT3uDZkRbi4HhGUpok3DRzv9z7Lti85Kdj3s3/1CeNI0w==",
+      "version": "0.5.12",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.12.tgz",
+      "integrity": "sha512-o74kiDBVE73oHW+pdkFSluHBL3cYEvru5YgEqNkBMFF7Cjv+w1vI565lTlfoJT4VLWDe0FMtZ7FkE/7a4pMXSQ==",
      "dev": true,
      "engines": {
        "node": ">=14.21.3"
@ -2383,6 +2356,7 @@
        "prettier-plugin-marko": "*",
        "prettier-plugin-organize-attributes": "*",
        "prettier-plugin-organize-imports": "*",
+        "prettier-plugin-sort-imports": "*",
        "prettier-plugin-style-order": "*",
        "prettier-plugin-svelte": "*"
      },
@ -2420,6 +2394,9 @@
        "prettier-plugin-organize-imports": {
          "optional": true
        },
+        "prettier-plugin-sort-imports": {
+          "optional": true
+        },
        "prettier-plugin-style-order": {
          "optional": true
        },
@ -3453,9 +3430,9 @@
      "dev": true
    },
    "chart.js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.1.tgz",
-      "integrity": "sha512-C74QN1bxwV1v2PEujhmKjOZ7iUM4w6BWs23Md/6aOZZSlwMzeCIDGuZay++rBgChYru7/+QFeoQW0fQoP534Dg==",
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.2.tgz",
+      "integrity": "sha512-6GD7iKwFpP5kbSD4MeRRRlTnQvxfQREy36uEtm1hzHzcOqwWx0YEHuspuoNlslu+nciLIB7fjjsHkUv/FzFcOg==",
      "dev": true,
      "requires": {
        "@kurkle/color": "^0.3.0"
@ -3542,9 +3519,9 @@
      "dev": true
    },
    "cytoscape": {
-      "version": "3.23.0",
-      "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.23.0.tgz",
-      "integrity": "sha512-gRZqJj/1kiAVPkrVFvz/GccxsXhF3Qwpptl32gKKypO4IlqnKBjTOu+HbXtEggSGzC5KCaHp3/F7GgENrtsFkA==",
+      "version": "3.28.1",
+      "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.28.1.tgz",
+      "integrity": "sha512-xyItz4O/4zp9/239wCcH8ZcFuuZooEeF8KHRmzjDfGdXsj3OG9MFSMA0pJE0uX3uCN/ygof6hHf4L7lst+JaDg==",
      "dev": true,
      "requires": {
        "heap": "^0.2.6",
@ -3560,32 +3537,6 @@
        "cose-base": "^1.0.0"
      }
    },
-    "cytoscape-fcose": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cytoscape-fcose/-/cytoscape-fcose-2.2.0.tgz",
-      "integrity": "sha512-ki1/VuRIHFCzxWNrsshHYPs6L7TvLu3DL+TyIGEsRcvVERmxokbf5Gdk7mFxZnTdiGtnA4cfSmjZJMviqSuZrQ==",
-      "dev": true,
-      "requires": {
-        "cose-base": "^2.2.0"
-      },
-      "dependencies": {
-        "cose-base": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/cose-base/-/cose-base-2.2.0.tgz",
-          "integrity": "sha512-AzlgcsCbUMymkADOJtQm3wO9S3ltPfYOFD5033keQn9NJzIbtnZj+UdBJe7DYml/8TdbtHJW3j58SOnKhWY/5g==",
-          "dev": true,
-          "requires": {
-            "layout-base": "^2.0.0"
-          }
-        },
-        "layout-base": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/layout-base/-/layout-base-2.0.1.tgz",
-          "integrity": "sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg==",
-          "dev": true
-        }
-      }
-    },
    "d3": {
      "version": "7.8.4",
      "resolved": "https://registry.npmjs.org/d3/-/d3-7.8.4.tgz",
@ -4361,23 +4312,23 @@
      "dev": true
    },
    "mermaid": {
-      "version": "10.7.0",
-      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-10.7.0.tgz",
-      "integrity": "sha512-PsvGupPCkN1vemAAjScyw4pw34p4/0dZkSrqvAB26hUvJulOWGIwt35FZWmT9wPIi4r0QLa5X0PB4YLIGn0/YQ==",
+      "version": "10.9.0",
+      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-10.9.0.tgz",
+      "integrity": "sha512-swZju0hFox/B/qoLKK0rOxxgh8Cf7rJSfAUc1u8fezVihYMvrJAS45GzAxTVf4Q+xn9uMgitBcmWk7nWGXOs/g==",
      "dev": true,
      "requires": {
        "@braintree/sanitize-url": "^6.0.1",
        "@types/d3-scale": "^4.0.3",
        "@types/d3-scale-chromatic": "^3.0.0",
-        "cytoscape": "^3.23.0",
+        "cytoscape": "^3.28.1",
        "cytoscape-cose-bilkent": "^4.1.0",
-        "cytoscape-fcose": "^2.1.0",
        "d3": "^7.4.0",
        "d3-sankey": "^0.12.3",
        "dagre-d3-es": "7.0.10",
        "dayjs": "^1.11.7",
        "dompurify": "^3.0.5",
        "elkjs": "^0.9.0",
+        "katex": "^0.16.9",
        "khroma": "^2.0.0",
        "lodash-es": "^4.17.21",
        "mdast-util-from-markdown": "^1.3.0",
@ -4860,9 +4811,9 @@
      }
    },
    "prettier-plugin-tailwindcss": {
-      "version": "0.5.11",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.11.tgz",
-      "integrity": "sha512-AvI/DNyMctyyxGOjyePgi/gqj5hJYClZ1avtQvLlqMT3uDZkRbi4HhGUpok3DRzv9z7Lti85Kdj3s3/1CeNI0w==",
+      "version": "0.5.12",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.12.tgz",
+      "integrity": "sha512-o74kiDBVE73oHW+pdkFSluHBL3cYEvru5YgEqNkBMFF7Cjv+w1vI565lTlfoJT4VLWDe0FMtZ7FkE/7a4pMXSQ==",
      "dev": true,
      "requires": {}
    },
--- a/package.json
+++ b/package.json
@ -30,13 +30,13 @@
  "homepage": "https://github.com/jpanther/congo#readme",
  "devDependencies": {
    "@tailwindcss/typography": "^0.5.10",
-    "chart.js": "^4.4.1",
+    "chart.js": "^4.4.2",
    "fuse.js": "^7.0.0",
    "katex": "^0.16.9",
-    "mermaid": "^10.7.0",
+    "mermaid": "^10.9.0",
    "prettier": "^3.2.5",
    "prettier-plugin-go-template": "^0.0.15",
-    "prettier-plugin-tailwindcss": "^0.5.11",
+    "prettier-plugin-tailwindcss": "^0.5.12",
    "quicklink": "^2.3.0",
    "rimraf": "^5.0.5",
    "tailwindcss": "^3.4.1",
Author	SHA1	Message	Date
James Panther	e2fa33ad46	🔀 Merge pull request #813 from tomy0000000/dev 🛠 fix: Space in rendered link	2024-03-09 14:02:23 +11:00
James Panther	21b554c341	🔀 Merge pull request #807 from Jh123x/fix/fix-author-params-in-chinese-translation fix: fix chinese config settings	2024-03-09 14:00:55 +11:00
James Panther	eec81f340f	🔀 Merge pull request #817 from jpanther/dependabot/npm_and_yarn/chart.js-4.4.2 📌 Bump chart.js from 4.4.1 to 4.4.2	2024-03-09 13:59:15 +11:00
James Panther	6bbcd04910	🔀 Merge pull request #825 from jpanther/dependabot/npm_and_yarn/mermaid-10.9.0 📌 Bump mermaid from 10.7.0 to 10.9.0	2024-03-09 13:58:48 +11:00
dependabot[bot]	8fa0ef1381	📦 Update packaged Mermaid	2024-03-09 13:55:38 +11:00
dependabot[bot]	c943158c17	📌 Bump mermaid from 10.7.0 to 10.9.0 Bumps [mermaid](https://github.com/mermaid-js/mermaid) from 10.7.0 to 10.9.0. - [Release notes](https://github.com/mermaid-js/mermaid/releases) - [Changelog](https://github.com/mermaid-js/mermaid/blob/develop/CHANGELOG.md) - [Commits](https://github.com/mermaid-js/mermaid/compare/v10.7.0...v10.9.0) --- updated-dependencies: - dependency-name: mermaid dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-03-09 13:55:38 +11:00
James Panther	67a61da329	🔀 Merge pull request #824 from jpanther/dependabot/npm_and_yarn/prettier-plugin-tailwindcss-0.5.12 📌 Bump prettier-plugin-tailwindcss from 0.5.11 to 0.5.12	2024-03-09 13:54:54 +11:00
James Panther	4eb6c7ff61	🔀 Merge pull request #821 from Techwolf12/dev Add techwolf12.nl as user of the theme	2024-03-09 13:53:35 +11:00
dependabot[bot]	c3c7eb6048	📌 Bump prettier-plugin-tailwindcss from 0.5.11 to 0.5.12 Bumps [prettier-plugin-tailwindcss](https://github.com/tailwindlabs/prettier-plugin-tailwindcss) from 0.5.11 to 0.5.12. - [Release notes](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/compare/v0.5.11...v0.5.12) --- updated-dependencies: - dependency-name: prettier-plugin-tailwindcss dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-03-06 22:38:08 +00:00
Christiaan de Die le Clercq	cc3872f270	Add techwolf12.nl as user of the theme	2024-03-03 15:25:17 +01:00
dependabot[bot]	03a4d345f0	📦 Update packaged ChartJS	2024-02-28 22:25:40 +00:00
dependabot[bot]	a22b1ad664	📌 Bump chart.js from 4.4.1 to 4.4.2 Bumps [chart.js](https://github.com/chartjs/Chart.js) from 4.4.1 to 4.4.2. - [Release notes](https://github.com/chartjs/Chart.js/releases) - [Commits](https://github.com/chartjs/Chart.js/compare/v4.4.1...v4.4.2) --- updated-dependencies: - dependency-name: chart.js dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-02-28 22:25:16 +00:00
Tomy Hsieh	0a6267c171	🛠 fix: Space in rendered link	2024-02-22 21:36:43 -05:00
Wen Junhua	4c31074d5c	fix: fix config for chinese translation	2024-02-06 23:20:48 +08:00