Merge 69f0e2e345 into c01a572d82

📌 Bump tailwindcss from 3.3.5 to 3.3.6

CHANGELOG.md

@@ -13,12 +13,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Warning when building if links to Markdown files cannot be resolved ([#691](https://github.com/jpanther/congo/pull/691))
 - Ability to share articles to Telegram and Line ([#719](https://github.com/jpanther/congo/pull/719))
 - New icon for `line`([#719](https://github.com/jpanther/congo/pull/719))
+- Korean translation ([#731](https://github.com/jpanther/congo/pull/731))
 
 ### Changed
 
 - ⚠️ Hugo extended version is now required when building sites
 - ⚠️ Author params block in language configuration has been moved to `params.author` ([#704](https://github.com/jpanther/congo/pull/704))
 - Refactored image logic into a new `picture.html` partial ([#693](https://github.com/jpanther/congo/pull/693))
+- Upgrade to ChartJS v4.4.1 ([#736](https://github.com/jpanther/congo/pull/736))
+- Upgrade to Tailwind v3.3.6 ([#737](https://github.com/jpanther/congo/pull/737))
 
 ### Fixed
 

assets/css/compiled/main.css

@@ -1,6 +1,6 @@
 /*! Congo v2.7.6 | MIT License | https://github.com/jpanther/congo */
 
-/*! tailwindcss v3.3.5 | MIT License | https://tailwindcss.com */
+/*! tailwindcss v3.3.6 | MIT License | https://tailwindcss.com */
 
 /*
 1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
@@ -121,8 +121,10 @@ strong {
 }
 
 /*
-1. Use the user's configured `mono` font family by default.
+1. Use the user's configured `mono` font-family by default.
-2. Correct the odd `em` font sizing in all browsers.
+2. Use the user's configured `mono` font-feature-settings by default.
+3. Use the user's configured `mono` font-variation-settings by default.
+4. Correct the odd `em` font sizing in all browsers.
 */
 
 code,
@@ -131,8 +133,12 @@ samp,
 pre {
   font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
   /* 1 */
-  font-size: 1em;
+  font-feature-settings: normal;
   /* 2 */
+  font-variation-settings: normal;
+  /* 3 */
+  font-size: 1em;
+  /* 4 */
 }
 
 /*

exampleSite/content/docs/configuration/index.md

@@ -66,6 +66,7 @@ The theme currently supports the following languages out of the box:
 | :indonesia: Indonesian                  | `id`    |
 | :it: Italian                            | `it`    |
 | :jp: Japanese                           | `ja`    |
+| :kr: Korean                             | `ko`    |
 | :poland: Polish                         | `pl`    |
 | :brazil: Portuguese (Brazil)            | `pt-br` |
 | :portugal: Portuguese (Portugal)        | `pt-pt` |

exampleSite/content/docs/hosting-deployment/index.ja.md

@@ -75,7 +75,7 @@ jobs:
 
 設定ファイルをGitHubにプッシュすると、アクションが自動的に実行されるはずです。初回は失敗するかもしれないので、GitHubリポジトリの **Settings > Pages** にアクセスして、ソースが正しいか確認してください。 `gh-pages` ブランチを使うように設定されているべきです。
 
-{{< screenshot src="github-pages-source.jpg" alt="Screen capture of GitHub Pages source" >}}
+![Screen capture of GitHub Pages source](github-pages-source.jpg?2x=true)
 
 設定が完了したら、アクションを再実行し、サイトを正しくビルドしてデプロイします。すべてが正常にデプロイされたことを確認するためにアクションログを参照することができます。
 
@@ -83,7 +83,7 @@ jobs:
 
 [Netlify](https://www.netlify.com)にデプロイするには、Netlify側に新しいデプロイサイトを作成し、ソースコードとリンクします。Netlify UIでは、ビルド設定は空白のまま、使用するドメインだけを設定する必要があります。
 
-{{< screenshot src="netlify-build-settings.jpg" alt="Screen capture of Netlify build settings" >}}
+![Screen capture of Netlify build settings](netlify-build-settings.jpg?2x=true)
 
 次に、サイト・リポジトリのルートに `netlify.toml` ファイルを作成します:
 
@@ -114,7 +114,7 @@ jobs:
 
 新しい**静的サイト**を作成し、プロジェクトのコード・リポジトリにリンクします。そして、ビルドコマンドを `hugo --gc --minify` に、公開ディレクトリを `public` に設定するだけです。
 
-{{< screenshot src="render-settings.jpg" alt="Screen capture of Render settings" >}}
+![Screen capture of Render settings](render-settings.jpg?2x=true)
 
 あなたが変更をリポジトリにプッシュするたびに、自動的にビルドとデプロイを行います。
 

exampleSite/content/docs/hosting-deployment/index.md

@@ -76,11 +76,11 @@ jobs:
 
 Push the config file to GitHub and the action should automatically run. It may fail the first time and you'll need to visit the **Settings > Pages** section of your GitHub repo to check the source is correct. It should be set to use the `gh-pages` branch.
 
-{{< screenshot src="github-pages-source.jpg" alt="Screen capture of GitHub Pages source settings" >}}
+![Screen capture of GitHub Pages source settings](github-pages-source.jpg?2x=true)
 
 You should also visit the **Settings > Actions > General** section and check that the workflow permissions allow actions to make changes to your repo.
 
-{{< screenshot src="github-workflow-permissions.jpg" alt="Screen capture of GitHub Workflow Permissions settings" >}}
+![Screen capture of GitHub Workflow Permissions settings](github-workflow-permissions.jpg?2x=true)
 
 Once the settings are configured, re-run the action and the site should build and deploy correctly. You can consult the actions log to check everything deployed successfully.
 
@@ -88,7 +88,7 @@ Once the settings are configured, re-run the action and the site should build an
 
 To deploy to [Netlify](https://www.netlify.com), create a new continuous deployment site and link it to your source code. The build settings can be left blank in the Netlify UI. You will only need to configure the domain you'll be using.
 
-{{< screenshot src="netlify-build-settings.jpg" alt="Screen capture of Netlify build settings" >}}
+![Screen capture of Netlify build settings](netlify-build-settings.jpg?2x=true)
 
 Then in the root of your site repository, create a `netlify.toml` file:
 
@@ -118,7 +118,7 @@ Deploying to [Render](https://render.com) is very straightforward and all config
 
 Create a new **Static Site** and link it to your project's code repository. Then simply configure the build command to be `hugo --gc --minify` and publish directory to be `public`.
 
-{{< screenshot src="render-settings.jpg" alt="Screen capture of Render settings" >}}
+![Screen capture of Render settings](render-settings.jpg?2x=true)
 
 The site will automatically build and deploy whenever you push a change to your repo.
 

exampleSite/content/docs/version-2/_index.ja.md

@@ -62,7 +62,7 @@ Congo 2.0の大きな変更点は、画像の自動リサイズ機能の追加
 
 今回のアップデートでは、全体的にパフォーマンスが向上している。今回のリリースの主な目的はLighthouseのスコアを向上させることで、Congoは4つの指標すべてで100点満点を獲得しました。
 
-{{< screenshot src="lighthouse.jpg" >}}
+![](lighthouse.jpg?2x=true)
 
 個々の変更点が多すぎて、ここでは紹介しきれませんが、さらに詳しく知りたい場合は、[Lighthouseのレポート](lighthouse.html)をご覧ください。実際のパフォーマンスは、サーバーの構成によって異なります。
 

exampleSite/content/docs/version-2/_index.md

@@ -62,7 +62,7 @@ Best of all there's nothing you need to change! Simply insert standard Markdown
 
 This update packs performance improvements throughout. A key objective for this release was to improve Lighthouse scores and Congo now scores a perfect 100 on all four metrics.
 
-{{< screenshot src="lighthouse.jpg" >}}
+![](lighthouse.jpg?2x=true)
 
 There's too many individual changes to highlight them here but the results speak for themselves. If you want to dig deeper, you can [view the Lighthouse report](lighthouse.html). Real world performance will vary based upon server configuration.
 

i18n/ko.yaml

@@ -0,0 +1,58 @@
+article:
+  anchor_label: "앵커"
+  date: "{{ .Date }}"
+  date_updated: "수정됨: {{ .Date }}"
+  draft: "초안"
+  edit_title: "편집"
+  reading_time:
+    one: "{{ .Count }} 분"
+    other: "{{ .Count }} 분"
+  reading_time_title: "읽는 데 걸리는 시간"
+  table_of_contents: "목차"
+  word_count:
+    one: "{{ .Count }} 자"
+    other: "{{ .Count }} 자"
+
+author:
+  byline_title: "글쓴이"
+
+code:
+  copy: "복사"
+  copied: "복사됨"
+
+error:
+  404_title: "페이지를 찾을 수 없어요 :confused:"
+  404_error: "Error 404"
+  404_description: "요청하신 페이지를 찾을 수 없어요."
+
+footer:
+  dark_appearance: "다크 모드로 전환"
+  light_appearance: "라이트 모드로 전환"
+  powered_by: "Powered by {{ .Hugo }} & {{ .Congo }}"
+
+list:
+  externalurl_title: "외부 사이트 링크"
+  no_articles: "아직 글이 존재하지 않아요."
+
+nav:
+  scroll_to_top_title: "위로 스크롤"
+  skip_to_main: "메인 콘텐츠로 이동하기"
+
+search:
+  open_button_title: "검색 (/)"
+  close_button_title: "닫기 (Esc)"
+  input_placeholder: "검색"
+
+sharing:
+  email: "email로 보내기"
+  facebook: "Facebook에 공유하기"
+  linkedin: "LinkedIn에 공유하기"
+  mastodon: "Mastodon에 게시하기"
+  pinterest: "Pinterest에 핀하기"
+  reddit: "Reddit에 게시하기"
+  twitter: "Twitter에 트윗하기"
+  telegram: "Telegram에 공유하기"
+  line: "LINE에 공유하기"
+
+shortcode:
+  recent_articles: "최신 글"

layouts/partials/picture.html

@@ -54,7 +54,7 @@
     {{ end }}
     {{ if $webp }}
       <source 
-        {{ if lt .Width 660 }}
+        {{ if or (lt .Width 660) $x2 }}
           {{ with .Resize (printf "%dx%d webp" .Width .Height) }}
             src="{{ .RelPermalink }}"
           {{ end }}
@@ -64,17 +64,12 @@
             {{- (.Resize "660x webp").RelPermalink }} 660w
             {{ if gt .Width 1024 }}
               ,{{ (.Resize "1024x webp").RelPermalink }} 1024w
-            {{ else }}
-              {{ with .Resize (printf "%dx%d webp" .Width .Height) }}
-                ,{{ .RelPermalink }} {{ .Width }}w
-              {{ end }}
             {{ end }}
             {{ if gt .Width 1320 }}
               ,{{ (.Resize "1320x webp").RelPermalink }} 2x
-            {{ else }}
+            {{ end }}
             {{ with .Resize (printf "%dx%d webp" .Width .Height) }}
               ,{{ .RelPermalink }} {{ .Width }}w
-              {{ end }}
             {{ end }}"
           src="{{ (.Resize "660x webp").RelPermalink }}" 
         {{ end }}
@@ -88,7 +83,7 @@
         {{ with $class }} class="{{ . }}" {{ end }}
         {{ with $alt }} alt="{{ . }}" {{ end }}
         {{ with $lazy }} loading="lazy" decoding="async" {{ end }}
-        {{ if lt .Width 660 }}
+        {{ if or (lt .Width 660) $x2 }}
           src="{{ .RelPermalink }}"
         {{ else }}
           srcset="
@@ -96,14 +91,11 @@
           {{- (.Resize "660x").RelPermalink }} 660w
           {{ if gt .Width 1024 }}
             ,{{ (.Resize "1024x").RelPermalink }} 1024w
-          {{ else }}
-            ,{{ .RelPermalink }} {{ .Width }}w
           {{ end }}
           {{ if gt .Width 1320 }}
             ,{{ (.Resize "1320x").RelPermalink }} 2x
-          {{ else }}
+          {{ end }}
-            ,{{ .RelPermalink }} {{ .Width }}w
+          ,{{ .RelPermalink }} {{ .Width }}w"
-          {{ end }}"
           src="{{ (.Resize "660x").RelPermalink }}"
         {{ end }}
       >

layouts/shortcodes/screenshot.html

@@ -1,24 +0,0 @@
-{{ if .Get "src" }}
-  {{ $image := .Page.Resources.GetMatch (printf "*%s*" (.Get "src")) }}
-  <figure{{ with .Get "class" }} class="{{ . }}"{{ end }}>
-    {{- if .Get "href" -}}
-      <a href="{{ .Get "href" }}">
-    {{- end -}}
-
-    {{ $altText := "" }}
-    {{ with .Get "alt" }}
-      {{ $altText = . }}
-    {{ else }}
-      {{ $altText = (.Get "caption") | markdownify | plainify }}
-    {{ end }}
-
-    {{ partial "picture.html" (dict "img" $image "alt" $altText "x2" true) }}
-
-    {{- if .Get "href" }}</a>{{ end -}}
-    {{- if .Get "caption" -}}
-      <figcaption>
-        {{- .Get "caption" | markdownify -}}
-      </figcaption>
-    {{- end }}
-  </figure>
-{{ end }}

package-lock.json

@@ -11,7 +11,7 @@
       "license": "MIT",
       "devDependencies": {
         "@tailwindcss/typography": "^0.5.10",
-        "chart.js": "^4.4.0",
+        "chart.js": "^4.4.1",
         "fuse.js": "^7.0.0",
         "katex": "^0.16.9",
         "mermaid": "^10.6.1",
@@ -20,7 +20,7 @@
         "prettier-plugin-tailwindcss": "^0.5.7",
         "quicklink": "^2.3.0",
         "rimraf": "^5.0.5",
-        "tailwindcss": "^3.3.5",
+        "tailwindcss": "^3.3.6",
         "vendor-copy": "^3.0.1"
       },
       "funding": {
@@ -338,9 +338,9 @@
       }
     },
     "node_modules/chart.js": {
-      "version": "4.4.0",
+      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.1.tgz",
-      "integrity": "sha512-vQEj6d+z0dcsKLlQvbKIMYFHd3t8W/7L2vfJIbYcfyPcRx92CsHqECpueN8qVGNlKyDcr5wBrYAYKnfu/9Q1hQ==",
+      "integrity": "sha512-C74QN1bxwV1v2PEujhmKjOZ7iUM4w6BWs23Md/6aOZZSlwMzeCIDGuZay++rBgChYru7/+QFeoQW0fQoP534Dg==",
       "dev": true,
       "dependencies": {
         "@kurkle/color": "^0.3.0"
@@ -2899,9 +2899,9 @@
       }
     },
     "node_modules/tailwindcss": {
-      "version": "3.3.5",
+      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.5.tgz",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.6.tgz",
-      "integrity": "sha512-5SEZU4J7pxZgSkv7FP1zY8i2TIAOooNZ1e/OGtxIEv6GltpoiXUqWvLy89+a10qYTB1N5Ifkuw9lqQkN9sscvA==",
+      "integrity": "sha512-AKjF7qbbLvLaPieoKeTjG1+FyNZT6KaJMJPFeQyLfIp7l82ggH1fbHJSsYIvnbTFQOlkh+gBYpyby5GT1LIdLw==",
       "dev": true,
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
@@ -3456,9 +3456,9 @@
       "dev": true
     },
     "chart.js": {
-      "version": "4.4.0",
+      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.1.tgz",
-      "integrity": "sha512-vQEj6d+z0dcsKLlQvbKIMYFHd3t8W/7L2vfJIbYcfyPcRx92CsHqECpueN8qVGNlKyDcr5wBrYAYKnfu/9Q1hQ==",
+      "integrity": "sha512-C74QN1bxwV1v2PEujhmKjOZ7iUM4w6BWs23Md/6aOZZSlwMzeCIDGuZay++rBgChYru7/+QFeoQW0fQoP534Dg==",
       "dev": true,
       "requires": {
         "@kurkle/color": "^0.3.0"
@@ -5202,9 +5202,9 @@
       "dev": true
     },
     "tailwindcss": {
-      "version": "3.3.5",
+      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.5.tgz",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.6.tgz",
-      "integrity": "sha512-5SEZU4J7pxZgSkv7FP1zY8i2TIAOooNZ1e/OGtxIEv6GltpoiXUqWvLy89+a10qYTB1N5Ifkuw9lqQkN9sscvA==",
+      "integrity": "sha512-AKjF7qbbLvLaPieoKeTjG1+FyNZT6KaJMJPFeQyLfIp7l82ggH1fbHJSsYIvnbTFQOlkh+gBYpyby5GT1LIdLw==",
       "dev": true,
       "requires": {
         "@alloc/quick-lru": "^5.2.0",

package.json

@@ -30,7 +30,7 @@
   "homepage": "https://github.com/jpanther/congo#readme",
   "devDependencies": {
     "@tailwindcss/typography": "^0.5.10",
-    "chart.js": "^4.4.0",
+    "chart.js": "^4.4.1",
     "fuse.js": "^7.0.0",
     "katex": "^0.16.9",
     "mermaid": "^10.6.1",
@@ -39,7 +39,7 @@
     "prettier-plugin-tailwindcss": "^0.5.7",
     "quicklink": "^2.3.0",
     "rimraf": "^5.0.5",
-    "tailwindcss": "^3.3.5",
+    "tailwindcss": "^3.3.6",
     "vendor-copy": "^3.0.1"
   },
   "vendorCopy": [],