Merge branch 'dev' into feat/add-icon-script

Fixes: #794

CHANGELOG.md

@@ -6,6 +6,21 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [2.8.1] - 2024-03-09
+
+### Changed
+
+- Upgrade to ChartJS v4.4.2 ([#817](https://github.com/jpanther/congo/pull/817))
+- Upgrade to Mermaid v10.9.0 ([#825](https://github.com/jpanther/congo/pull/825))
+
+### Fixed
+
+- Table of Contents missing left border detail ([#794](https://github.com/jpanther/congo/issues/794))
+- `x-twitter` option missing when using sharing links ([#809](https://github.com/jpanther/congo/issues/809))
+- Chinese default config contains incorrect `author` block name ([#807](https://github.com/jpanther/congo/pull/807))
+- Links in articles are prefixed with a blank space ([#813](https://github.com/jpanther/congo/pull/813))
+- HTML tables would not fill the container width on desktop ([#826](https://github.com/jpanther/congo/issues/826))
+
 ## [2.8.0] - 2024-01-22
 
 ### Added
@@ -841,7 +856,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Advanced customisation using simple Tailwind colour definitions and styles
 - Fully documented
 
-[Unreleased]: https://github.com/jpanther/congo/compare/v2.8.0...HEAD
+[Unreleased]: https://github.com/jpanther/congo/compare/v2.8.1...HEAD
+[2.8.1]: https://github.com/jpanther/congo/compare/v2.8.0...v2.8.1
 [2.8.0]: https://github.com/jpanther/congo/compare/v2.7.6...v2.8.0
 [2.7.6]: https://github.com/jpanther/congo/compare/v2.7.5...v2.7.6
 [2.7.5]: https://github.com/jpanther/congo/compare/v2.7.4...v2.7.5

assets/css/compiled/main.css

@@ -1,4 +1,4 @@
-/*! Congo v2.8.0 | MIT License | https://github.com/jpanther/congo */
+/*! Congo v2.8.1 | MIT License | https://github.com/jpanther/congo */
 
 /*! tailwindcss v3.4.1 | MIT License | https://tailwindcss.com */
 
@@ -1254,13 +1254,18 @@ table {
   overflow: auto;
 }
 
+@media (min-width: 768px) {
+  table {
+    display: table;
+  }
+}
+
 /* Fix long inline code sections breaking out of article on mobile */
 
 code {
   word-wrap: break-word;
   /* All browsers since IE 5.5+ */
   overflow-wrap: break-word;
-  /* Renamed property in CSS3 draft spec */
 }
 
 /* -- Chroma Highlight -- */

assets/css/main.css

@@ -1,4 +1,4 @@
-/*! Congo v2.8.0 | MIT License | https://github.com/jpanther/congo */
+/*! Congo v2.8.1 | MIT License | https://github.com/jpanther/congo */
 
 @tailwind base;
 @tailwind components;
@@ -109,14 +109,13 @@ body:has(#menu-controller:checked) {
 
 /* Fix long tables breaking out of article on mobile */
 table {
-  display: block;
+  @apply block overflow-auto md:table;
-  overflow: auto;
 }
 
 /* Fix long inline code sections breaking out of article on mobile */
 code {
   word-wrap: break-word; /* All browsers since IE 5.5+ */
-  overflow-wrap: break-word; /* Renamed property in CSS3 draft spec */
+  @apply break-words;
 }
 
 /* -- Chroma Highlight -- */

config/_default/params.toml

@@ -51,7 +51,7 @@ fingerprintAlgorithm = "sha256"
   showTaxonomies = false
   showWordCount = false
   showComments = false
-  # sharingLinks = ["facebook", "twitter", "mastodon", "pinterest", "reddit", "linkedin", "email", "telegram", "line", "weibo"]
+  # sharingLinks = ["facebook", "x-twitter", "mastodon", "pinterest", "reddit", "linkedin", "email", "telegram", "line", "weibo"]
 
 [list]
   showBreadcrumbs = false

data/sharing.json

@@ -34,6 +34,11 @@
     "title": "sharing.twitter",
     "url": "https://twitter.com/intent/tweet/?url=%s&text=%s"
   },
+  "x-twitter": {
+    "icon": "x-twitter",
+    "title": "sharing.x-twitter",
+    "url": "https://x.com/intent/tweet/?url=%s&text=%s"
+  },
   "telegram": {
     "icon": "telegram",
     "title": "sharing.telegram",

exampleSite/config/_default/languages.zh-CN.toml

@@ -12,7 +12,7 @@ copyright = "© 2023 Congo contributors"
   mainSections = ["samples"]
   description = "一款基于Tailwindcss的强大且轻量的Hugo主题"
 
-[author]
+[params.author]
   name = "Congo"
   image = "img/author.jpg"
   headline = "非凡的主题！"

exampleSite/content/docs/configuration/index.md

@@ -162,7 +162,7 @@ Many of the article defaults here can be overridden on a per article basis by sp
 |`article.showTaxonomies`|`false`|Whether or not the taxonomies related to this article are displayed.|
 |`article.showWordCount`|`false`|Whether or not article word counts are displayed.|
 |`article.showComments`|`false`|Whether or not the [comments partial]({{< ref "partials#comments" >}}) is included after the article footer.|
-|`article.sharingLinks`|_Not set_|An array of sharing links to display at the end of each article. Valid options include `facebook`, `twitter`, `mastodon`, `pinterest`, `reddit`, `linkedin`, `email`, `telegram` and `line`. When not provided, or set to `false`, no links will be displayed.|
+|`article.sharingLinks`|_Not set_|An array of sharing links to display at the end of each article. Valid options include `facebook`, `x-twitter`, `mastodon`, `pinterest`, `reddit`, `linkedin`, `email`, `telegram` and `line`. When not provided, or set to `false`, no links will be displayed.|
 |`list.showBreadcrumbs`|`false`|Whether or not breadcrumbs are displayed in the header on list pages.|
 |`list.showTableOfContents`|`false`|Whether or not the table of contents is displayed on list pages.|
 |`list.showTaxonomies`|`false`|Whether or not the taxonomies related to this article are displayed on list pages.|

exampleSite/content/users/index.es.md

@@ -71,5 +71,7 @@ La lista a continuación es solo un puñado de sitios web creados con el tema Co
 | [stupidjoey.net](https://stupidjoey.net)                               | Personal Site and Tech blog     |
 | [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).

exampleSite/content/users/index.ja.md

@@ -71,5 +71,7 @@ Congoを使用して構築された実際のウェブサイト。
 | [stupidjoey.net](https://stupidjoey.net)                               | Personal Site and Tech blog     |
 | [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)を投げてください。

exampleSite/content/users/index.md

@@ -71,5 +71,7 @@ The list below is just a handful of the websites that are built using the Congo
 | [stupidjoey.net](https://stupidjoey.net)                               | Personal Site and Tech blog     |
 | [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).

exampleSite/content/users/index.zh-cn.md

@@ -71,5 +71,7 @@ showEdit: false
 | [stupidjoey.net](https://stupidjoey.net)                               | Personal Site and Tech blog     |
 | [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)来添加。

i18n/ar.yaml

@@ -54,6 +54,7 @@ sharing:
   telegram: "شارك على تيليجرام"
   line: "شارك على لاين"
   # weibo: "Share on Weibo"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "حديثًا"

i18n/bg.yaml

@@ -54,6 +54,7 @@ sharing:
   telegram: "Споделете в Telegram"
   line: "Споделете в LINE"
   weibo: "Споделете в Weibo"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "Последни"

i18n/bn.yaml

@@ -54,6 +54,7 @@ sharing:
   telegram: "টেলিগ্রামে শেয়ার করুন"
   line: "লাইনে শেয়ার করুন"
   # weibo: "Share on Weibo"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "সাম্প্রতিক"

i18n/cs.yaml

@@ -54,6 +54,7 @@ sharing:
   telegram: "Sdílejte na Telegram"
   line: "Sdílejte na LINE"
   weibo: "Sdílejte na Weibo"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "Nedávné"

i18n/de.yaml

@@ -54,6 +54,7 @@ sharing:
   telegram: "Auf Telegram teilen"
   line: "Auf LINE teilen"
   weibo: "Auf Weibo teilen"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "Neue Beiträge"

i18n/en.yaml

@@ -54,6 +54,7 @@ sharing:
   telegram: "Share on Telegram"
   line: "Share on LINE"
   weibo: "Share on Weibo"
+  x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "Recent"

i18n/es.yaml

@@ -54,6 +54,7 @@ sharing:
   telegram: "Compartir en Telegram"
   line: "Compartir en LINE"
   weibo: "Compartir en Weibo"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "Reciente"

i18n/fi.yaml

@@ -54,6 +54,7 @@ sharing:
   telegram: "Jaa Telegramissa"
   line: "Jaa LINEssä"
   weibo: "Jaa Weibossä"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "Viimeaikaiset"

i18n/fr.yaml

@@ -54,6 +54,7 @@ sharing:
   telegram: "Partager sur Telegram"
   line: "Partager sur LINE"
   weibo: "Partager sur Weibo"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "Articles récents"

i18n/he.yaml

@@ -54,6 +54,7 @@ sharing:
   telegram: "שיתוף בטלגרם"
   line: "שיתוף בליין"
   # weibo: "Share on Weibo"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "חדשים"

i18n/hu.yaml

@@ -54,6 +54,7 @@ sharing:
   telegram: "Megosztás a Telegramon"
   line: "Megosztás a LINE-on"
   weibo: "Megosztás a Weibo-on"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "Friss"

i18n/id.yaml

@@ -54,6 +54,7 @@ sharing:
   telegram: "Bagikan ke Telegram"
   line: "Bagikan ke LINE"
   weibo: "Bagikan ke Weibo"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "Terbaru"

i18n/it.yaml

@@ -54,6 +54,7 @@ sharing:
   telegram: "Condividi su Telegram"
   line: "Condividi su LINE"
   weibo: "Condividi su Weibo"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "Recenti"

i18n/ja.yaml

@@ -54,6 +54,7 @@ sharing:
   telegram: "Telegramでシェアする"
   line: "LINEでシェアする"
   weibo: "Weiboでシェアする"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "最近の記事"

i18n/ko.yaml

@@ -54,6 +54,7 @@ sharing:
   telegram: "Telegram에 공유하기"
   line: "LINE에 공유하기"
   weibo: "Weibo에 공유하기"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "최신 글"

i18n/nl.yaml

@@ -54,6 +54,7 @@ sharing:
   telegram: "Deel op Telegram"
   line: "Deel op LINE"
   weibo: "Deel op Weibo"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "Recent"

i18n/pl.yaml

@@ -54,6 +54,7 @@ sharing:
   telegram: "Udostępnij na Telegram"
   line: "Udostępnij na LINE"
   weibo: "Udostępnij na Weibo"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "Ostatnie"

i18n/pt-BR.yaml

@@ -54,6 +54,7 @@ sharing:
   telegram: "Compartilhar pelo Telegram"
   line: "Compartilhar pelo LINE"
   weibo: "Compartilhar pelo weibo"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "Recente"

i18n/pt-PT.yaml

@@ -54,6 +54,7 @@ sharing:
   telegram: "Partilhar pelo Telegram"
   line: "Partilhar pelo LINE"
   weibo: "Partilhar pelo Weibo"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "Recente"

i18n/ro.yaml

@@ -54,6 +54,7 @@ sharing:
   telegram: "Trimite pe Telegram"
   line: "Trimite pe LINE"
   weibo: "Trimite pe Weibo"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "Cele mai noi"

i18n/ru.yaml

@@ -58,6 +58,7 @@ sharing:
   telegram: "Поделиться на Telegram"
   line: "Поделиться на LINE"
   weibo: "Поделиться на Weibo"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "Последние"

i18n/sk.yaml

@@ -54,6 +54,7 @@ sharing:
   telegram: "Zdieľaj na Telegram"
   line: "Zdieľaj na LINE"
   weibo: "Zdieľaj na Weibo"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "Nedávne"

i18n/tr.yaml

@@ -53,6 +53,7 @@ sharing:
   telegram: "Telegram'da paylaş"
   line: "LINE'da paylaş"
   weibo: "Weibo'da paylaş"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "Güncel"

i18n/uk.yaml

@@ -58,6 +58,7 @@ sharing:
   telegram: "Поширити на Telegram"
   line: "Поширити на LINE"
   weibo: "Поширити на Weibo"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "Недавні дописи"

i18n/zh-CN.yaml

@@ -53,6 +53,7 @@ sharing:
   telegram: "分享到 Telegram"
   line: "分享到 LINE"
   weibo: "分享到 微博"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "最近的文章"

i18n/zh-TW.yaml

@@ -54,6 +54,7 @@ sharing:
   telegram: "分享到 Telegram"
   line: "分享到 LINE"
   weibo: "分享到 微博"
+  # x-twitter: "Post on X"
 
 shortcode:
   recent_articles: "最近的文章"

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 -->
+<!-- prettier-ignore --><a href="{{ $link | safeURL }}"{{ with .Title }} title="{{ . }}"{{ end }}{{ if $isRemote }} target="_blank" rel="noreferrer"{{ end }}>{{- .Text | safeHTML -}}</a>
-<a href="{{ $link | safeURL }}"{{ with .Title }} title="{{ . }}"{{ end }}{{ if $isRemote }} target="_blank" rel="noreferrer"{{ end }}>{{- .Text | safeHTML -}}</a>

layouts/partials/toc.html

@@ -1,10 +1,10 @@
 <details open class="-ms-5 mt-0 overflow-hidden rounded-lg ps-5">
   <summary
-    class="-ms-5 block cursor-pointer bg-neutral-100 py-1 ps-5 text-lg font-semibold text-neutral-800 lg:hidden dark:bg-neutral-700 dark:text-neutral-100"
+    class="block cursor-pointer bg-neutral-100 py-1 ps-5 text-lg font-semibold text-neutral-800 dark:bg-neutral-700 dark:text-neutral-100 lg:hidden"
   >
     {{ i18n "article.table_of_contents" }}
   </summary>
-  <div class="-ms-5 border-s border-dotted border-neutral-300 py-2 ps-5 dark:border-neutral-600">
+  <div class="border-s border-dotted border-neutral-300 py-2 ps-5 dark:border-neutral-600">
     {{ .TableOfContents | emojify }}
   </div>
 </details>

package-lock.json

@@ -1,24 +1,27 @@
 {
   "name": "hugo-congo-theme",
-  "version": "2.7.6",
+  "version": "2.8.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "hugo-congo-theme",
-      "version": "2.7.6",
+      "version": "2.8.0",
       "hasInstallScript": true,
       "license": "MIT",
+      "dependencies": {
+        "@fortawesome/fontawesome-free": "^6.5.1"
+      },
       "devDependencies": {
         "@tailwindcss/typography": "^0.5.10",
-        "chart.js": "^4.4.1",
+        "chart.js": "^4.4.2",
         "fuse.js": "^7.0.0",
         "jsdom": "^23.0.1",
         "katex": "^0.16.9",
-        "mermaid": "^10.7.0",
+        "mermaid": "^10.9.0",
-        "prettier": "^3.2.4",
+        "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",
@@ -46,6 +49,15 @@
       "integrity": "sha512-Tbsj02wXCbqGmzdnXNk0SOF19ChhRU70BsroIi4Pm6Ehp56in6vch94mfbdQ17DozxkL3BAVjbZ4Qc1a0HFRAg==",
       "dev": true
     },
+    "node_modules/@fortawesome/fontawesome-free": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz",
+      "integrity": "sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw==",
+      "hasInstallScript": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -357,15 +369,15 @@
       }
     },
     "node_modules/chart.js": {
-      "version": "4.4.1",
+      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.2.tgz",
-      "integrity": "sha512-C74QN1bxwV1v2PEujhmKjOZ7iUM4w6BWs23Md/6aOZZSlwMzeCIDGuZay++rBgChYru7/+QFeoQW0fQoP534Dg==",
+      "integrity": "sha512-6GD7iKwFpP5kbSD4MeRRRlTnQvxfQREy36uEtm1hzHzcOqwWx0YEHuspuoNlslu+nciLIB7fjjsHkUv/FzFcOg==",
       "dev": true,
       "dependencies": {
         "@kurkle/color": "^0.3.0"
       },
       "engines": {
-        "pnpm": ">=7"
+        "pnpm": ">=8"
       }
     },
     "node_modules/chokidar": {
@@ -500,9 +512,9 @@
       }
     },
     "node_modules/cytoscape": {
-      "version": "3.23.0",
+      "version": "3.28.1",
-      "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.23.0.tgz",
+      "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.28.1.tgz",
-      "integrity": "sha512-gRZqJj/1kiAVPkrVFvz/GccxsXhF3Qwpptl32gKKypO4IlqnKBjTOu+HbXtEggSGzC5KCaHp3/F7GgENrtsFkA==",
+      "integrity": "sha512-xyItz4O/4zp9/239wCcH8ZcFuuZooEeF8KHRmzjDfGdXsj3OG9MFSMA0pJE0uX3uCN/ygof6hHf4L7lst+JaDg==",
       "dev": true,
       "dependencies": {
         "heap": "^0.2.6",
@@ -524,33 +536,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",
@@ -1691,23 +1676,23 @@
       }
     },
     "node_modules/mermaid": {
-      "version": "10.7.0",
+      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-10.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-10.9.0.tgz",
-      "integrity": "sha512-PsvGupPCkN1vemAAjScyw4pw34p4/0dZkSrqvAB26hUvJulOWGIwt35FZWmT9wPIi4r0QLa5X0PB4YLIGn0/YQ==",
+      "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",
@@ -2553,9 +2538,9 @@
       "dev": true
     },
     "node_modules/prettier": {
-      "version": "3.2.4",
+      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
-      "integrity": "sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==",
+      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
       "dev": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
@@ -2583,9 +2568,9 @@
       }
     },
     "node_modules/prettier-plugin-tailwindcss": {
-      "version": "0.5.11",
+      "version": "0.5.12",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.11.tgz",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.12.tgz",
-      "integrity": "sha512-AvI/DNyMctyyxGOjyePgi/gqj5hJYClZ1avtQvLlqMT3uDZkRbi4HhGUpok3DRzv9z7Lti85Kdj3s3/1CeNI0w==",
+      "integrity": "sha512-o74kiDBVE73oHW+pdkFSluHBL3cYEvru5YgEqNkBMFF7Cjv+w1vI565lTlfoJT4VLWDe0FMtZ7FkE/7a4pMXSQ==",
       "dev": true,
       "engines": {
         "node": ">=14.21.3"
@@ -2603,6 +2588,7 @@
         "prettier-plugin-marko": "*",
         "prettier-plugin-organize-attributes": "*",
         "prettier-plugin-organize-imports": "*",
+        "prettier-plugin-sort-imports": "*",
         "prettier-plugin-style-order": "*",
         "prettier-plugin-svelte": "*"
       },
@@ -2640,6 +2626,9 @@
         "prettier-plugin-organize-imports": {
           "optional": true
         },
+        "prettier-plugin-sort-imports": {
+          "optional": true
+        },
         "prettier-plugin-style-order": {
           "optional": true
         },
@@ -3621,6 +3610,11 @@
       "integrity": "sha512-Tbsj02wXCbqGmzdnXNk0SOF19ChhRU70BsroIi4Pm6Ehp56in6vch94mfbdQ17DozxkL3BAVjbZ4Qc1a0HFRAg==",
       "dev": true
     },
+    "@fortawesome/fontawesome-free": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz",
+      "integrity": "sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw=="
+    },
     "@isaacs/cliui": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -3876,9 +3870,9 @@
       "dev": true
     },
     "chart.js": {
-      "version": "4.4.1",
+      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.2.tgz",
-      "integrity": "sha512-C74QN1bxwV1v2PEujhmKjOZ7iUM4w6BWs23Md/6aOZZSlwMzeCIDGuZay++rBgChYru7/+QFeoQW0fQoP534Dg==",
+      "integrity": "sha512-6GD7iKwFpP5kbSD4MeRRRlTnQvxfQREy36uEtm1hzHzcOqwWx0YEHuspuoNlslu+nciLIB7fjjsHkUv/FzFcOg==",
       "dev": true,
       "requires": {
         "@kurkle/color": "^0.3.0"
@@ -3983,9 +3977,9 @@
       }
     },
     "cytoscape": {
-      "version": "3.23.0",
+      "version": "3.28.1",
-      "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.23.0.tgz",
+      "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.28.1.tgz",
-      "integrity": "sha512-gRZqJj/1kiAVPkrVFvz/GccxsXhF3Qwpptl32gKKypO4IlqnKBjTOu+HbXtEggSGzC5KCaHp3/F7GgENrtsFkA==",
+      "integrity": "sha512-xyItz4O/4zp9/239wCcH8ZcFuuZooEeF8KHRmzjDfGdXsj3OG9MFSMA0pJE0uX3uCN/ygof6hHf4L7lst+JaDg==",
       "dev": true,
       "requires": {
         "heap": "^0.2.6",
@@ -4001,32 +3995,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",
@@ -4905,23 +4873,23 @@
       "dev": true
     },
     "mermaid": {
-      "version": "10.7.0",
+      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-10.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-10.9.0.tgz",
-      "integrity": "sha512-PsvGupPCkN1vemAAjScyw4pw34p4/0dZkSrqvAB26hUvJulOWGIwt35FZWmT9wPIi4r0QLa5X0PB4YLIGn0/YQ==",
+      "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",
@@ -5419,9 +5387,9 @@
       "dev": true
     },
     "prettier": {
-      "version": "3.2.4",
+      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
-      "integrity": "sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==",
+      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
       "dev": true
     },
     "prettier-plugin-go-template": {
@@ -5434,9 +5402,9 @@
       }
     },
     "prettier-plugin-tailwindcss": {
-      "version": "0.5.11",
+      "version": "0.5.12",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.11.tgz",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.12.tgz",
-      "integrity": "sha512-AvI/DNyMctyyxGOjyePgi/gqj5hJYClZ1avtQvLlqMT3uDZkRbi4HhGUpok3DRzv9z7Lti85Kdj3s3/1CeNI0w==",
+      "integrity": "sha512-o74kiDBVE73oHW+pdkFSluHBL3cYEvru5YgEqNkBMFF7Cjv+w1vI565lTlfoJT4VLWDe0FMtZ7FkE/7a4pMXSQ==",
       "dev": true,
       "requires": {}
     },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hugo-congo-theme",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "description": "Congo theme for Hugo",
   "scripts": {
     "preinstall": "rimraf assets/lib",
@@ -31,14 +31,14 @@
   "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",
     "jsdom": "^23.0.1",
     "katex": "^0.16.9",
-    "mermaid": "^10.7.0",
+    "mermaid": "^10.9.0",
-    "prettier": "^3.2.4",
+    "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",
@@ -78,5 +78,8 @@
       "from": "node_modules/quicklink/dist/quicklink.umd.js",
       "to": "assets/lib/quicklink/quicklink.umd.js"
     }
-  ]
+  ],
+  "dependencies": {
+    "@fortawesome/fontawesome-free": "^6.5.1"
+  }
 }

scripts/update_icon.js

@@ -1,8 +1,8 @@
 const jsdom = require("jsdom");
 const fs = require("fs");
 
+const SVG_FILE_DIR = 'node_modules/@fortawesome/fontawesome-free/svgs/brands';
 const DOC_DIR = "./exampleSite/content/samples/icons";
-const FONTAWESOME_VERSION = "v6.5.1";
 const DEFAULT_TABLE_DELIMITER = "| -------------------- | --------------------------------- |";
 
 /**
@@ -12,8 +12,7 @@ const DEFAULT_TABLE_DELIMITER = "| -------------------- | ----------------------
  */
 const add_icon_to_congo = async (icon_name) => {
   try {
-    const icon_url = create_icon_url(icon_name, FONTAWESOME_VERSION);
+    const file = await get_file(icon_name);
-    const file = await get_file(icon_url);
     const final_svg = modify_svg_string(file);
     const icon_download_path = create_icon_download_path(icon_name);
     save_file(icon_download_path, final_svg);
@@ -31,26 +30,16 @@ const modify_svg_string = (svg_string) => {
     svg.querySelector("path").setAttribute("fill", "currentColor");
     return svg.outerHTML;
   } catch (e) {
-    throw new Error("Invalid SVG file");
+    throw new Error("Invalid SVG file" + e);
   }
 };
 
-const create_icon_url = (icon_name, fontawesome_version) => {
-  return `https://site-assets.fontawesome.com/releases/${fontawesome_version}/svgs/brands/${icon_name}.svg`;
-};
-
 const create_icon_download_path = (icon_name) => {
   return `./assets/icons/${icon_name}.svg`;
 };
 
 const get_file = async (url) => {
-  console.log("Getting file at " + url + "...");
+  return fs.readFileSync(SVG_FILE_DIR + `/${url}.svg`, "utf8");
-  const response = await fetch(url);
-  if (response.status >= 400) {
-    throw new Error("Could not download icon / icon not found");
-  }
-  console.log("File retrieved!");
-  return response.text();
 };
 
 const save_file = (file_path, file) => {
@@ -84,12 +73,16 @@ const add_documentation = async (icon_name) => {
 const process_file = (file_contents, icon_name) => {
   const [headers, table] = file_contents.split(DEFAULT_TABLE_DELIMITER);
   const table_rows = table.split("\n").map((x) => x.trim()).filter((row) => row !== "");
-  table_rows.push(table_rows[0].replace("amazon", icon_name));
+  table_rows.push(create_table_row(icon_name));
   table_rows.sort();
   const new_table = table_rows.join("\n");
   return `${headers.trimEnd()}\n${DEFAULT_TABLE_DELIMITER}\n${new_table}\n`;
 };
 
+const create_table_row = (name) => {
+  return `| ${name}                | {{< icon ${name} >}}                |`
+}
+
 const get_md_docs = () => {
   return fs.readdirSync(DOC_DIR).filter((file) => file.endsWith(".md"));
 };