Merge remote-tracking branch 'upstream/master'

mill413 · Apr 3, 2024 · e940d3d · e940d3d
2 parents f7efa8c + 01076cb
commit e940d3d
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 25 deletions.
diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml
@@ -0,0 +1,11 @@
+name: Lint Commit Messages
+on: pull_request
+
+jobs:
+  commitlint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: wagoid/commitlint-github-action@v6
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -7,6 +7,7 @@
     // Common formatter
     "esbenp.prettier-vscode",
     "foxundermoon.shell-format",
-    "stylelint.vscode-stylelint"
+    "stylelint.vscode-stylelint",
+    "yzhang.markdown-all-in-one"
   ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -8,7 +8,7 @@
     "*.html": "liquid"
   },
   "[markdown]": {
-    "editor.formatOnSave": false
+    "editor.defaultFormatter": "yzhang.markdown-all-in-one"
   },
   // Formatter
   "[html][liquid]": {

diff --git a/_includes/comments.html b/_includes/comments.html
@@ -1,5 +1,5 @@
-<!--  The comments switcher -->
-{% if page.comments and site.comments.active %}
-  {% capture path %}comments/{{ site.comments.active }}.html{% endcapture %}
+<!-- The comments switcher -->
+{% if page.comments and site.comments.provider %}
+  {% capture path %}comments/{{ site.comments.provider }}.html{% endcapture %}
   {% include {{ path }} %}
 {% endif %}
diff --git a/_includes/img-url.html b/_includes/img-url.html
@@ -17,24 +17,20 @@
     {%- comment -%} Add page image path prefix {%- endcomment -%}
     {% assign url = include.img_path | default: '' | append: '/' | append: url %}
 
-    {%- comment -%} CND URL {%- endcomment -%}
+    {%- comment -%} Prepend CND URL {%- endcomment -%}
     {% if site.img_cdn %}
-      {% assign url = site.img_cdn
-        | append: '/'
-        | append: url
-        | replace: '///', '/'
-        | replace: '//', '/'
-        | replace: ':/', '://'
-      %}
-
-      {% unless site.img_cdn contains ':' %}
-        {% if include.absolute %}
-          {% assign url = site.url | append: site.baseurl | append: url %}
-        {% else %}
-          {% assign url = site.baseurl | append: url %}
-        {% endif %}
-      {% endunless %}
+      {% assign url = site.img_cdn | append: '/' | append: url %}
     {% endif %}
+
+    {% assign url = url | replace: '///', '/' | replace: '//', '/' | replace: ':/', '://' %}
+
+    {% unless url contains '://' %}
+      {% if include.absolute %}
+        {% assign url = site.url | append: site.baseurl | append: url %}
+      {% else %}
+        {% assign url = site.baseurl | append: url %}
+      {% endif %}
+    {% endunless %}
   {% endunless %}
 {%- endif -%}
 

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [6.5.5](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v6.5.4...v6.5.5) (2024-03-23)
+
+### Bug Fixes
+
+* **post:** correct the image URLs ([#1627](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1627)) ([2d649aa](https://github.com/cotes2020/jekyll-theme-chirpy/commit/2d649aae0e40a24db1ab0d46fa474294e96cb135))
+
 ## [6.5.4](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v6.5.3...v6.5.4) (2024-03-22)
 
 ### Bug Fixes
@@ -11,6 +17,8 @@ All notable changes to this project will be documented in this file. See [standa
 
 ## [6.5.3](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v6.5.2...v6.5.3) (2024-03-07)
 
+* replace `polyfill.io` with `cdnjs` hosted link ([#1598](https://github.com/cotes2020/jekyll-theme-chirpy/pull/1598)) ([75a3d73](https://github.com/cotes2020/jekyll-theme-chirpy/commit/75a3d7399b257256a09d602cbe01062fe1cdf68d))
+
 ## [6.5.2](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v6.5.1...v6.5.2) (2024-02-29)
 
 ### Bug Fixes

diff --git a/jekyll-theme-chirpy.gemspec b/jekyll-theme-chirpy.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-theme-chirpy"
-  spec.version       = "6.5.4"
+  spec.version       = "6.5.5"
   spec.authors       = ["Cotes Chung"]
   spec.email         = ["[email protected]"]
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jekyll-theme-chirpy",
-  "version": "6.5.4",
+  "version": "6.5.5",
   "description": "A minimal, responsive, and feature-rich Jekyll theme for technical writing.",
   "repository": {
     "type": "git",
@@ -30,9 +30,9 @@
     "@rollup/plugin-terser": "^0.4.4",
     "husky": "^9.0.11",
     "rimraf": "^5.0.5",
-    "rollup": "^4.13.0",
+    "rollup": "^4.13.2",
     "rollup-plugin-license": "^3.3.1",
-    "stylelint": "^16.2.1",
+    "stylelint": "^16.3.1",
     "stylelint-config-standard-scss": "^13.0.0"
   },
   "prettier": {