From 61bdca2db45179cd0d1b4b885a4c4864e3ffa3c1 Mon Sep 17 00:00:00 2001 From: Filippo Date: Tue, 9 Apr 2024 16:57:06 +0200 Subject: [PATCH 01/47] feat(analytics): add Umami and Matomo tracking codes (#1658) --- README.md | 2 +- _config.yml | 6 ++++++ _includes/analytics/matomo.html | 14 ++++++++++++++ _includes/analytics/umami.html | 6 ++++++ 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 _includes/analytics/matomo.html create mode 100644 _includes/analytics/umami.html diff --git a/README.md b/README.md index f084852eeee..5bcfcb7fed4 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ - Built-in Search - Atom Feeds - PWA -- Google Analytics / GoatCounter +- Web Analytics - SEO & Performance Optimization ## Documentation diff --git a/_config.yml b/_config.yml index 1076673d013..f64411d6102 100644 --- a/_config.yml +++ b/_config.yml @@ -62,6 +62,12 @@ analytics: id: # fill in your Google Analytics ID goatcounter: id: # fill in your GoatCounter ID + umami: + id: # fill in your Umami ID + domain: # fill in your Umami domain + matomo: + id: # fill in your Matomo ID + domain: # fill in your Matomo domain # Pageviews settings pageviews: diff --git a/_includes/analytics/matomo.html b/_includes/analytics/matomo.html new file mode 100644 index 00000000000..72b2c463cfa --- /dev/null +++ b/_includes/analytics/matomo.html @@ -0,0 +1,14 @@ + + + diff --git a/_includes/analytics/umami.html b/_includes/analytics/umami.html new file mode 100644 index 00000000000..bfcb1d09ff6 --- /dev/null +++ b/_includes/analytics/umami.html @@ -0,0 +1,6 @@ + + From 9f8aeaadbfef9967a9b0a9dd323d8bed46e14d9f Mon Sep 17 00:00:00 2001 From: Azamat Mambetov Date: Sat, 13 Apr 2024 00:34:48 +0400 Subject: [PATCH 02/47] refactor!: rename media-url file and related parameters (#1651) - Changed variable `img_cdn` to `cdn` in site configuration file. - Changed the variable defining the relative path of the image in the post from `img_url` to `media_subpath` --- _config.yml | 6 +++--- _includes/embed/audio.html | 2 +- _includes/embed/video.html | 4 ++-- _includes/head.html | 4 ++-- _includes/{img-url.html => media-url.html} | 16 ++++++++-------- _includes/refactor-content.html | 2 +- _includes/sidebar.html | 2 +- _layouts/home.html | 2 +- _posts/2019-08-08-write-a-new-post.md | 14 +++++++------- _posts/2019-08-09-getting-started.md | 2 +- assets/js/data/swconf.js | 4 ++-- tools/init | 2 +- tools/release | 2 +- 13 files changed, 31 insertions(+), 31 deletions(-) rename _includes/{img-url.html => media-url.html} (59%) diff --git a/_config.yml b/_config.yml index f64411d6102..6062ac6ea8f 100644 --- a/_config.yml +++ b/_config.yml @@ -86,12 +86,12 @@ pageviews: # theme_mode: # [light | dark] -# The CDN endpoint for images. +# The CDN endpoint for media resources. # Notice that once it is assigned, the CDN url -# will be added to all image (site avatar & posts' images) paths starting with '/' +# will be added to all media resources (site avatar, posts' images, audio and video files) paths starting with '/' # # e.g. 'https://cdn.com' -img_cdn: "https://chirpy-img.netlify.app" +cdn: "https://chirpy-img.netlify.app" # the avatar on sidebar, support local or CORS resources avatar: "/commons/avatar.jpg" diff --git a/_includes/embed/audio.html b/_includes/embed/audio.html index d618890af2f..e2b897901e2 100644 --- a/_includes/embed/audio.html +++ b/_includes/embed/audio.html @@ -4,7 +4,7 @@ {% unless src contains '://' %} {%- capture src -%} - {% include img-url.html src=src %} + {% include media-url.html src=src %} {%- endcapture -%} {% endunless %} diff --git a/_includes/embed/video.html b/_includes/embed/video.html index 72ec4fbeb69..712a266a345 100644 --- a/_includes/embed/video.html +++ b/_includes/embed/video.html @@ -5,14 +5,14 @@ {% unless video_url contains '://' %} {%- capture video_url -%} - {% include img-url.html src=video_url %} + {% include media-url.html src=video_url %} {%- endcapture -%} {% endunless %} {% if poster_url %} {% unless poster_url contains '://' %} {%- capture poster_url -%} - {% include img-url.html src=poster_url img_path=page.img_path %} + {% include media-url.html src=poster_url subpath=page.media_subpath %} {%- endcapture -%} {% endunless %} {% assign poster = 'poster="' | append: poster_url | append: '"' %} diff --git a/_includes/head.html b/_includes/head.html index 2848c866137..67c5390d4f4 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -20,7 +20,7 @@ {% unless src contains '://' %} {%- capture img_url -%} - {% include img-url.html src=src img_path=page.img_path absolute=true %} + {% include media-url.html src=src subpath=page.media_subpath absolute=true %} {%- endcapture -%} {%- capture old_url -%}{{ src | absolute_url }}{%- endcapture -%} @@ -31,7 +31,7 @@ {% elsif site.social_preview_image %} {%- capture img_url -%} - {% include img-url.html src=site.social_preview_image absolute=true %} + {% include media-url.html src=site.social_preview_image absolute=true %} {%- endcapture -%} {%- capture og_image -%} diff --git a/_includes/img-url.html b/_includes/media-url.html similarity index 59% rename from _includes/img-url.html rename to _includes/media-url.html index bb4758c72d3..ea410750268 100644 --- a/_includes/img-url.html +++ b/_includes/media-url.html @@ -1,25 +1,25 @@ {%- comment -%} - Generate image final URL based on `site.img_cdn`, `page.img_path` + Generate media resource final URL based on `site.cdn`, `page.media_subpath` Arguments: - src - required, basic image path - img_path - optional, relative path of image + src - required, basic media resources path + subpath - optional, relative path of media resources absolute - optional, boolean, if true, generate absolute URL Return: - image URL + media resources URL {%- endcomment -%} {% assign url = include.src %} {%- if url -%} {% unless url contains ':' %} - {%- comment -%} Add page image path prefix {%- endcomment -%} - {% assign url = include.img_path | default: '' | append: '/' | append: url %} + {%- comment -%} Add media resources subpath prefix {%- endcomment -%} + {% assign url = include.subpath | default: '' | append: '/' | append: url %} {%- comment -%} Prepend CND URL {%- endcomment -%} - {% if site.img_cdn %} - {% assign url = site.img_cdn | append: '/' | append: url %} + {% if site.cdn %} + {% assign url = site.cdn | append: '/' | append: url %} {% endif %} {% assign url = url | replace: '///', '/' | replace: '//', '/' | replace: ':/', '://' %} diff --git a/_includes/refactor-content.html b/_includes/refactor-content.html index e4abcbc2a51..8d298cde6c0 100644 --- a/_includes/refactor-content.html +++ b/_includes/refactor-content.html @@ -97,7 +97,7 @@ {% assign _lazyload = true %} {%- capture _img_url -%} - {% include img-url.html src=_src img_path=page.img_path %} + {% include media-url.html src=_src subpath=page.media_subpath %} {%- endcapture -%} {% assign _path_prefix = _img_url | remove: _src %} diff --git a/_includes/sidebar.html b/_includes/sidebar.html index b8f92e37e9d..0b5560a33b0 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -5,7 +5,7 @@ {%- if site.avatar != empty and site.avatar -%} {%- capture avatar_url -%} - {% include img-url.html src=site.avatar %} + {% include media-url.html src=site.avatar %} {%- endcapture -%} avatar {%- endif -%} diff --git a/_layouts/home.html b/_layouts/home.html index a9f5bd366a7..e44efe8f4cb 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -49,7 +49,7 @@ {% if post.image %} {% assign src = post.image.path | default: post.image %} {% unless src contains '//' %} - {% assign src = post.img_path | append: '/' | append: src | replace: '//', '/' %} + {% assign src = post.media_subpath | append: '/' | append: src | replace: '//', '/' %} {% endunless %} {% assign alt = post.image.alt | xml_escape | default: 'Preview Image' %} diff --git a/_posts/2019-08-08-write-a-new-post.md b/_posts/2019-08-08-write-a-new-post.md index 0a451fa8c42..090453be9dd 100644 --- a/_posts/2019-08-08-write-a-new-post.md +++ b/_posts/2019-08-08-write-a-new-post.md @@ -247,14 +247,14 @@ The screenshots of the program window can be considered to show the shadow effec ### CDN URL -If you host the images on the CDN, you can save the time of repeatedly writing the CDN URL by assigning the variable `img_cdn` of `_config.yml`{: .filepath} file: +If you host the media resources on the CDN, you can save the time of repeatedly writing the CDN URL by assigning the variable `cdn` of `_config.yml`{: .filepath} file: ```yaml -img_cdn: https://cdn.com +cdn: https://cdn.com ``` {: file='_config.yml' .nolineno} -Once `img_cdn` is assigned, the CDN URL will be added to the path of all images (images of site avatar and posts) starting with `/`. +Once `cdn` is assigned, the CDN URL will be added to the path of all media resources (site avatar, posts' images, audio and video files) starting with `/`. For instance, when using images: @@ -270,13 +270,13 @@ The parsing result will automatically add the CDN prefix `https://cdn.com` befor ``` {: .nolineno } -### Image Path +### Media Subpath -When a post contains many images, it will be a time-consuming task to repeatedly define the path of the images. To solve this, we can define this path in the YAML block of the post: +When a post contains many images, it will be a time-consuming task to repeatedly define the path of the media resources. To solve this, we can define this path in the YAML block of the post: ```yml --- -img_path: /img/path/ +media_subpath: /img/path/ --- ``` @@ -308,7 +308,7 @@ image: --- ``` -Note that the [`img_path`](#image-path) can also be passed to the preview image, that is, when it has been set, the attribute `path` only needs the image file name. +Note that the [`media_subpath`](#media-subpath) can also be passed to the preview image, that is, when it has been set, the attribute `path` only needs the image file name. For simple use, you can also just use `image` to define the path. diff --git a/_posts/2019-08-09-getting-started.md b/_posts/2019-08-09-getting-started.md index 701824fa35e..6653c62d9f4 100644 --- a/_posts/2019-08-09-getting-started.md +++ b/_posts/2019-08-09-getting-started.md @@ -8,7 +8,7 @@ date: 2019-08-09 20:55:00 +0800 categories: [Blogging, Tutorial] tags: [getting started] pin: true -img_path: '/posts/20180809' +media_subpath: '/posts/20180809' --- ## Prerequisites diff --git a/assets/js/data/swconf.js b/assets/js/data/swconf.js index cc11f79c750..c02638fa5e1 100644 --- a/assets/js/data/swconf.js +++ b/assets/js/data/swconf.js @@ -24,8 +24,8 @@ const swconf = { {%- comment -%} The request url with below domain will be cached. {%- endcomment -%} allowHosts: [ - {% if site.img_cdn and site.img_cdn contains '//' %} - '{{ site.img_cdn | split: '//' | last | split: '/' | first }}', + {% if site.cdn and site.cdn contains '//' %} + '{{ site.cdn | split: '//' | last | split: '/' | first }}', {% endif %} {%- unless site.assets.self_host.enabled -%} diff --git a/tools/init b/tools/init index 5baac5d829c..bf1ef85871e 100755 --- a/tools/init +++ b/tools/init @@ -93,7 +93,7 @@ init_files() { mv ./${ACTIONS_WORKFLOW}.hook .github/workflows/${ACTIONS_WORKFLOW} ## Cleanup image settings in site config - _sedi "s/^img_cdn:.*/img_cdn:/;s/^avatar:.*/avatar:/" _config.yml + _sedi "s/^cdn:.*/cdn:/;s/^avatar:.*/avatar:/" _config.yml fi # remove the other files diff --git a/tools/release b/tools/release index 9ca63dccce4..965828bd541 100755 --- a/tools/release +++ b/tools/release @@ -156,7 +156,7 @@ build_gem() { git checkout "$PROD_BRANCH" # Remove unnecessary theme settings - sed -i "s/^img_cdn:.*/img_cdn:/;s/^avatar:.*/avatar:/" _config.yml + sed -i "s/^cdn:.*/cdn:/;s/^avatar:.*/avatar:/" _config.yml rm -f ./*.gem npm run build From 7d48d32c7b272c48f1ce76dc3dc7f6ebf09468b4 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 14 Apr 2024 04:16:15 +0800 Subject: [PATCH 03/47] ci: avoid duplicate builds for PR commits --- .github/workflows/ci.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c7b1f5a692a..e1d4670ab02 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,9 +1,8 @@ name: "CI" on: push: - branches-ignore: - - "production" - - "docs" + branches: + - "master" paths-ignore: - ".github/**" - "!.github/workflows/ci.yml" @@ -12,8 +11,6 @@ on: - "README.md" - "LICENSE" pull_request: - paths: - - "**" jobs: build: From 44f552cbcee83d037de0e59496bf6bb19eea2691 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 14 Apr 2024 04:34:32 +0800 Subject: [PATCH 04/47] feat(deps): move `MathJax` configuration to a separate file (#1670) Move `MathJax` configuration to file `assets/js/data/mathjax.js` will help add extensions. --- _includes/js-selector.html | 20 +------------------- _posts/2019-08-08-write-a-new-post.md | 10 +++++++++- assets/js/data/mathjax.js | 25 +++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 20 deletions(-) create mode 100644 assets/js/data/mathjax.js diff --git a/_includes/js-selector.html b/_includes/js-selector.html index 662e9a45f26..2e52c9622d5 100644 --- a/_includes/js-selector.html +++ b/_includes/js-selector.html @@ -72,25 +72,7 @@ {% if page.math %} - + {% endif %} diff --git a/_posts/2019-08-08-write-a-new-post.md b/_posts/2019-08-08-write-a-new-post.md index 090453be9dd..0492b02930b 100644 --- a/_posts/2019-08-08-write-a-new-post.md +++ b/_posts/2019-08-08-write-a-new-post.md @@ -109,7 +109,9 @@ comments: false ## Mathematics -For website performance reasons, the mathematical feature won't be loaded by default. But it can be enabled by: +We use [**MathJax**][mathjax] to generate mathematics. For website performance reasons, the mathematical feature won't be loaded by default. But it can be enabled by: + +[mathjax]: https://www.mathjax.org/ ```yaml --- @@ -154,6 +156,12 @@ Can be referenced as \eqref{eq:label_name}. 3. \$$ LaTeX_math_expression $$ ``` +> Starting with `v7.0.0`, configuration options for **MathJax** have been moved to file `assets/js/data/mathjax.js`{: .filepath }, and you can change the options as needed, such as adding [extensions][mathjax-exts]. +> If you are building the site via `chirpy-starter`, copy that file from the gem installation directory (check with command `bundle info --path jekyll-theme-chirpy`) to the same directory in your repository. +{: .prompt-tip } + +[mathjax-exts]: https://docs.mathjax.org/en/latest/input/tex/extensions/index.html + ## Mermaid [**Mermaid**](https://github.com/mermaid-js/mermaid) is a great diagram generation tool. To enable it on your post, add the following to the YAML block: diff --git a/assets/js/data/mathjax.js b/assets/js/data/mathjax.js new file mode 100644 index 00000000000..ca3d0de52c7 --- /dev/null +++ b/assets/js/data/mathjax.js @@ -0,0 +1,25 @@ +--- +layout: compress +# WARNING: Don't use '//' to comment out code, use '{% comment %}' and '{% endcomment %}' instead. +--- + +{%- comment -%} + See: +{%- endcomment -%} + +MathJax = { + tex: { + {%- comment -%} start/end delimiter pairs for in-line math {%- endcomment -%} + inlineMath: [ + ['$', '$'], + ['\\(', '\\)'] + ], + {%- comment -%} start/end delimiter pairs for display math {%- endcomment -%} + displayMath: [ + ['$$', '$$'], + ['\\[', '\\]'] + ], + {%- comment -%} equation numbering {%- endcomment -%} + tags: 'ams' + } +}; From 1914c786a0bdd00ac15db4de45709f31e20e6010 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 14 Apr 2024 04:40:01 +0800 Subject: [PATCH 05/47] docs: add missing head to changelog --- docs/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index bc86dbc73c2..8a686ab30d4 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -17,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) +### Changes + * 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) From 7808ee157c7714e88e3ae2b504ae8a2961a02ec6 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 14 Apr 2024 04:45:52 +0800 Subject: [PATCH 06/47] chore: move starter workflow into subfolder The `.hook` suffix does not make it easy to maintain code in the editor --- .../{pages-deploy.yml.hook => starter/pages-deploy.yml} | 0 tools/init | 7 +++---- 2 files changed, 3 insertions(+), 4 deletions(-) rename .github/workflows/{pages-deploy.yml.hook => starter/pages-deploy.yml} (100%) diff --git a/.github/workflows/pages-deploy.yml.hook b/.github/workflows/starter/pages-deploy.yml similarity index 100% rename from .github/workflows/pages-deploy.yml.hook rename to .github/workflows/starter/pages-deploy.yml diff --git a/tools/init b/tools/init index bf1ef85871e..dd15c697d85 100755 --- a/tools/init +++ b/tools/init @@ -87,10 +87,9 @@ init_files() { rm -rf .github else ## Change the files of `.github` - mv .github/workflows/$ACTIONS_WORKFLOW.hook . - rm -rf .github - mkdir -p .github/workflows - mv ./${ACTIONS_WORKFLOW}.hook .github/workflows/${ACTIONS_WORKFLOW} + mv .github/workflows/starter/$ACTIONS_WORKFLOW . + rm -rf .github && mkdir -p .github/workflows + mv ./$ACTIONS_WORKFLOW .github/workflows/${ACTIONS_WORKFLOW} ## Cleanup image settings in site config _sedi "s/^cdn:.*/cdn:/;s/^avatar:.*/avatar:/" _config.yml From 8c1be9f2f38606a82925585dc8ad2bc36df8e6d5 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 14 Apr 2024 05:06:06 +0800 Subject: [PATCH 07/47] ci: fix checkout depth for commitlint --- .github/workflows/commitlint.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml index f8cb2d529f9..c9c48c33f97 100644 --- a/.github/workflows/commitlint.yml +++ b/.github/workflows/commitlint.yml @@ -6,6 +6,4 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - fetch-depth: 0 - uses: wagoid/commitlint-github-action@v6 From bf16d6039ad8e6f9698c45b924725368a1d9d79d Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 14 Apr 2024 05:15:27 +0800 Subject: [PATCH 08/47] ci(release): replace `standard-version` with `semantic-release` (#1666) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [`standard-version`](https://github.com/conventional-changelog/standard-version/) has been deprecated since May 2022, so it is necessary to stop using it for this project. [**`semantic-release`**](https://github.com/semantic-release/semantic-release) is available as a more capable alternative to help automate the release process: 1. Updating Node/Gem version numbers 2. Generating changelogs 3. Automating GitHub Releases 4. Building Chirpy-gem and pushing it to RubyGems.org 5. Create commits and tags on the `production` branch 6. Merge the `production` branch into the `master` branch > ⚠️ Note: Step _6_ may be canceled in CD environments due to merge conflicts, so we need to do this step manually in such cases. Whenever a commit is pushed to the release branch (`production`), all of the above release processes will be triggered. --- .github/workflows/cd.yml | 38 ++++++-- .github/workflows/publish.yml | 17 ++++ docs/CHANGELOG.md | 2 - package.json | 93 +++++++++++++++---- tools/release | 168 +++++++++++++++------------------- 5 files changed, 193 insertions(+), 125 deletions(-) create mode 100644 .github/workflows/publish.yml diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 2e239a45073..bd9d2945c87 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -1,17 +1,37 @@ name: CD + on: push: - tags: - - "v[0-9]+.[0-9]+.[0-9]+" branches: - - docs + - production + tags-ignore: + - "**" jobs: - launch: + release: + permissions: + contents: write + issues: write + pull-requests: write runs-on: ubuntu-latest steps: - - run: | - curl -X POST -H "Accept: application/vnd.github+json" \ - -H "Authorization: Bearer ${{ secrets.GH_PAT }}" \ - https://api.github.com/repos/${{ secrets.BUILDER }}/dispatches \ - -d '{"event_type":"deploy", "client_payload":{"branch": "${{ github.ref_name }}"}}' + - uses: actions/checkout@v4 + + - uses: ruby/setup-ruby@v1 + with: + ruby-version: 3.2 + bundler-cache: true + + - uses: actions/setup-node@v4 + with: + node-version: latest + + - run: npm install + - run: npx semantic-release + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GEM_HOST_API_KEY: ${{ secrets.GEM_HOST_API_KEY }} + + publish: + needs: release + uses: ./.github/workflows/publish.yml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 00000000000..20e46915167 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,17 @@ +name: Publish + +on: + push: + branches: + - docs + workflow_call: + +jobs: + launch: + runs-on: ubuntu-latest + steps: + - run: | + curl -X POST -H "Accept: application/vnd.github+json" \ + -H "Authorization: Bearer ${{ secrets.GH_PAT }}" \ + https://api.github.com/repos/${{ secrets.BUILDER }}/dispatches \ + -d '{"event_type":"deploy", "client_payload":{"branch": "${{ github.ref_name }}"}}' diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 8a686ab30d4..8f28580b180 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,7 +1,5 @@ # Changelog -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 diff --git a/package.json b/package.json index b023362daa0..79b81619d15 100644 --- a/package.json +++ b/package.json @@ -28,10 +28,15 @@ "@commitlint/config-conventional": "^19.1.0", "@rollup/plugin-babel": "^6.0.4", "@rollup/plugin-terser": "^0.4.4", + "@semantic-release/changelog": "^6.0.3", + "@semantic-release/exec": "^6.0.3", + "@semantic-release/git": "^10.0.1", + "conventional-changelog-conventionalcommits": "^7.0.2", "husky": "^9.0.11", "rimraf": "^5.0.5", "rollup": "^4.13.2", "rollup-plugin-license": "^3.3.1", + "semantic-release": "^23.0.8", "stylelint": "^16.3.1", "stylelint-config-standard-scss": "^13.0.0" }, @@ -89,24 +94,76 @@ "media-feature-range-notation": "prefix" } }, - "standard-version": { - "skip": { - "commit": true, - "tag": true - }, - "types": [ - { - "type": "feat", - "section": "Features" - }, - { - "type": "fix", - "section": "Bug Fixes" - }, - { - "type": "perf", - "section": "Improvements" - } + "release": { + "branches": [ + "production" + ], + "plugins": [ + [ + "@semantic-release/commit-analyzer", + { + "preset": "conventionalcommits" + } + ], + [ + "@semantic-release/release-notes-generator", + { + "preset": "conventionalcommits", + "presetConfig": { + "types": [ + { + "type": "feat", + "section": "Features" + }, + { + "type": "fix", + "section": "Bug Fixes" + }, + { + "type": "perf", + "section": "Improvements" + }, + { + "type": "refactor", + "section": "Changes", + "hidden": true + } + ] + } + } + ], + [ + "@semantic-release/changelog", + { + "changelogFile": "docs/CHANGELOG.md", + "changelogTitle": "# Changelog" + } + ], + [ + "@semantic-release/npm", + { + "npmPublish": false + } + ], + [ + "@semantic-release/exec", + { + "prepareCmd": "bash tools/release --prepare", + "publishCmd": "bash tools/release" + } + ], + [ + "@semantic-release/git", + { + "assets": [ + "docs", + "package.json", + "*.gemspec" + ], + "message": "chore(release): ${nextRelease.version}\n\n${nextRelease.notes}" + } + ], + "@semantic-release/github" ] } } diff --git a/tools/release b/tools/release index 965828bd541..90b18232ea6 100755 --- a/tools/release +++ b/tools/release @@ -1,56 +1,47 @@ #!/usr/bin/env bash # -# Release a new version to the GitLab flow production branch. -# -# For a new major/minor version, bump version on the main branch, and then merge into the production branch. -# -# For a patch version, bump the version number on the patch branch, then merge that branch into the main branch -# and production branch. -# -# -# Usage: run on the default, release or the patch branch -# # Requires: Git, NPM and RubyGems set -eu -opt_pre=false # preview mode option - -working_branch="$(git branch --show-current)" +opt_pre=false # option for bump gem version +opt_pkg=false # option for building gem package -DEFAULT_BRANCH="$(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@')" - -PROD_BRANCH="production" +MAIN_BRANCH="master" +RELEASE_BRANCH="production" GEM_SPEC="jekyll-theme-chirpy.gemspec" -NODE_CONFIG="package.json" -CHANGE_LOG="docs/CHANGELOG.md" +NODE_SPEC="package.json" +CHANGELOG="docs/CHANGELOG.md" +CONFIG="_config.yml" JS_DIST="assets/js/dist" -BACKUP_PATH="$(mktemp -d)" FILES=( "$GEM_SPEC" - "$NODE_CONFIG" + "$NODE_SPEC" + "$CHANGELOG" + "$CONFIG" ) TOOLS=( "git" "npm" - "standard-version" "gem" ) help() { - echo "A tool to release new version Chirpy gem" + echo -e "A tool to release new version Chirpy gem.\nThis tool will:" + echo " 1. Build a new gem and publish it to RubyGems.org" + echo " 2. Merge the release branch into the default branch" echo echo "Usage:" - echo - echo " bash ./tools/release [options]" + echo " bash ./tools/release [options]" echo echo "Options:" - echo " -p, --preview Enable preview mode, only package, and will not modify the branches" - echo " -h, --help Print this information." + echo " --prepare Preparation for release" + echo " -p, --package Build a gem package only, for local packaging in case of auto-publishing failure" + echo " -h, --help Display this help message" } _check_cli() { @@ -70,11 +61,9 @@ _check_git() { exit 1 fi - $opt_pre || ( - if [[ $working_branch != "$DEFAULT_BRANCH" && - $working_branch != hotfix/* && - $working_branch != "$PROD_BRANCH" ]]; then - echo "> Abort: Please run on the default, release or patch branch." + $opt_pkg || ( + if [[ "$(git branch --show-current)" != "$RELEASE_BRANCH" ]]; then + echo "> Abort: Please run the tool in the '$RELEASE_BRANCH' branch." exit 1 fi ) @@ -103,108 +92,95 @@ check() { _check_node_packages } -# Auto-generate a new version number to the file 'package.json' -bump_node() { - bump="standard-version -i $CHANGE_LOG" - - if $opt_pre; then - bump="$bump -p rc" - fi - - eval "$bump" +## Bump new version to gem-spec file +_bump_version() { + _version="$(grep '"version":' "$NODE_SPEC" | sed 's/.*: "//;s/".*//')" + sed -i "s/[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+/$_version/" "$GEM_SPEC" + echo "> Bump gem version to $_version" +} - # Change heading of Patch version to heading level 2 (a bug from `standard-version`) - sed -i "s/^### \[/## \[/g" "$CHANGE_LOG" +_improve_changelog() { # Replace multiple empty lines with a single empty line - sed -i "/^$/N;/^\n$/D" "$CHANGE_LOG" + sed -i '/^$/N;/^\n$/D' "$CHANGELOG" + # Escape left angle brackets of HTML tag in the changelog as they break the markdown structure. e.g., '
' + sed -i -E 's/\s(<[a-z])/ \\\1/g' "$CHANGELOG" } -## Bump new version to gem config file -bump_gem() { - _ver="$1" - - if $opt_pre; then - _ver="${1/-/.}" - fi - - sed -i "s/[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+/$_ver/" "$GEM_SPEC" -} - -# Creates a new tag on the production branch with the given version number. -# Also commits the changes and merges the production branch into the default branch. -branch() { - _version="$1" # X.Y.Z - - git add . - git commit -m "chore(release): $_version" - - # Create a new tag on production branch - echo -e "> Create tag v$_version\n" - git tag "v$_version" - - git checkout "$DEFAULT_BRANCH" - git merge --no-ff --no-edit "$PROD_BRANCH" - - if [[ $working_branch == hotfix/* ]]; then - # delete the patch branch - git branch -D "$working_branch" - fi +prepare() { + _bump_version + _improve_changelog } ## Build a Gem package build_gem() { - git checkout "$PROD_BRANCH" + if $opt_pkg; then + BACKUP_PATH="$(mktemp -d)" + cp "$JS_DIST"/* "$BACKUP_PATH" + fi # Remove unnecessary theme settings - sed -i "s/^cdn:.*/cdn:/;s/^avatar:.*/avatar:/" _config.yml + sed -i "s/^cdn:.*/cdn:/;s/^avatar:.*/avatar:/" $CONFIG rm -f ./*.gem npm run build git add "$JS_DIST" -f # add JS distribution files to gem gem build "$GEM_SPEC" - cp "$JS_DIST"/* "$BACKUP_PATH" - # Resume the settings + # resume the settings git reset git checkout . - # restore the dist files for future development - mkdir -p "$JS_DIST" && cp "$BACKUP_PATH"/* "$JS_DIST" - - # back to the default branch - git checkout "$DEFAULT_BRANCH" + if $opt_pkg; then + # restore the dist files for future development + mkdir -p "$JS_DIST" && cp "$BACKUP_PATH"/* "$JS_DIST" + rm -rf "$BACKUP_PATH" + fi } -main() { - check +# Push the gem to RubyGems.org (using $GEM_HOST_API_KEY) +push_gem() { + gem push ./*.gem +} - if [[ $opt_pre = false && $working_branch != "$PROD_BRANCH" ]]; then - git checkout "$PROD_BRANCH" - git merge --no-ff --no-edit "$working_branch" - fi +## Merge the release branch into the default branch +merge() { + git fetch origin "$MAIN_BRANCH" + git checkout -b "$MAIN_BRANCH" origin/"$MAIN_BRANCH" - bump_node + git merge --no-ff --no-edit "$RELEASE_BRANCH" || ( + git merge --abort + echo -e "\n> Conflict detected. Aborting merge.\n" + exit 0 + ) - _version="$(grep '"version":' "$NODE_CONFIG" | sed 's/.*: "//;s/".*//')" + git push origin "$MAIN_BRANCH" +} - bump_gem "$_version" +main() { + check - if [[ $opt_pre = false ]]; then - branch "$_version" + if $opt_pre; then + prepare + exit 0 fi - echo -e "> Build the gem package for v$_version\n" - build_gem + $opt_pkg && exit 0 + push_gem + merge } while (($#)); do opt="$1" case $opt in - -p | --preview) + --prepare) opt_pre=true shift ;; + -p | --package) + opt_pkg=true + shift + ;; -h | --help) help exit 0 From c85e9e239491dfafea83b68660807e6675edce44 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Wed, 17 Apr 2024 06:00:36 +0800 Subject: [PATCH 09/47] ci: avoid trigger redundant workflows (#1682) CodeQL and Sytle Lint --- .github/workflows/codeql.yml | 1 + .github/workflows/style-lint.yml | 10 +++------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index b09590d4830..06feb7fd69a 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -2,6 +2,7 @@ name: "CodeQL" on: push: + branches: ["master"] paths: ["_javascript/**/*.js"] pull_request: paths: ["_javascript/**/*.js"] diff --git a/.github/workflows/style-lint.yml b/.github/workflows/style-lint.yml index f7aa54db344..e095978d05a 100644 --- a/.github/workflows/style-lint.yml +++ b/.github/workflows/style-lint.yml @@ -2,14 +2,10 @@ name: "Style Lint" on: push: - branches-ignore: - - "production" - - "docs" - paths: - - "_sass/**/*.scss" + branches: ["master"] + paths: ["_sass/**/*.scss"] pull_request: - paths: - - "_sass/**/*.scss" + paths: ["_sass/**/*.scss"] jobs: stylelint: From fe7afa379f0af0ca98a207f85bdc0fa98575b1ad Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Wed, 17 Apr 2024 06:10:01 +0800 Subject: [PATCH 10/47] perf: replace jQuery with Vanilla JS (#1681) Also replaced `magnific-popup` with `GLightbox` --- _data/origin/basic.yml | 9 +- _data/origin/cors.yml | 9 +- _includes/comments/disqus.html | 4 +- _includes/comments/giscus.html | 3 +- _includes/comments/utterances.html | 3 +- _includes/head.html | 4 +- _includes/js-selector.html | 11 +- _includes/mermaid.html | 50 +++---- _includes/sidebar.html | 2 +- _includes/topbar.html | 2 +- _javascript/modules/components/back-to-top.js | 15 +- .../modules/components/category-collapse.js | 49 ++++--- _javascript/modules/components/clipboard.js | 123 +++++++++-------- _javascript/modules/components/img-loading.js | 36 +++-- _javascript/modules/components/img-popup.js | 17 +-- .../modules/components/locale-datetime.js | 42 +++--- .../modules/components/mode-watcher.js | 15 +- .../modules/components/search-display.js | 130 ++++++++---------- _javascript/modules/components/sidebar.js | 12 +- _sass/addon/commons.scss | 25 ++-- assets/js/pwa/app.js | 14 +- assets/lib | 2 +- 22 files changed, 273 insertions(+), 304 deletions(-) diff --git a/_data/origin/basic.yml b/_data/origin/basic.yml index ed99ea850a6..73822515027 100644 --- a/_data/origin/basic.yml +++ b/_data/origin/basic.yml @@ -4,9 +4,6 @@ webfonts: /assets/lib/fonts/main.css # Libraries -jquery: - js: /assets/lib/jquery/jquery.min.js - bootstrap: css: /assets/lib/bootstrap/bootstrap.min.css js: /assets/lib/bootstrap/bootstrap.bundle.min.js @@ -31,9 +28,9 @@ dayjs: relativeTime: /assets/lib/dayjs/plugin/relativeTime.min.js localizedFormat: /assets/lib/dayjs/plugin/localizedFormat.min.js -magnific-popup: - css: /assets/lib/magnific-popup/magnific-popup.css - js: /assets/lib/magnific-popup/jquery.magnific-popup.min.js +glightbox: + css: /assets/lib/glightbox/glightbox.min.css + js: /assets/lib/glightbox/glightbox.min.js lazy-polyfill: css: /assets/lib/loading-attribute-polyfill/loading-attribute-polyfill.min.css diff --git a/_data/origin/cors.yml b/_data/origin/cors.yml index 614139f8e37..a10d31cc274 100644 --- a/_data/origin/cors.yml +++ b/_data/origin/cors.yml @@ -17,9 +17,6 @@ webfonts: https://fonts.googleapis.com/css2?family=Lato:wght@300;400&family=Sour # Libraries -jquery: - js: https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js - bootstrap: css: https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css js: https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js @@ -44,9 +41,9 @@ dayjs: relativeTime: https://cdn.jsdelivr.net/npm/dayjs@1.11.10/plugin/relativeTime.min.js localizedFormat: https://cdn.jsdelivr.net/npm/dayjs@1.11.10/plugin/localizedFormat.min.js -magnific-popup: - css: https://cdn.jsdelivr.net/npm/magnific-popup@1.1.0/dist/magnific-popup.min.css - js: https://cdn.jsdelivr.net/npm/magnific-popup@1.1.0/dist/jquery.magnific-popup.min.js +glightbox: + css: https://cdn.jsdelivr.net/npm/glightbox@3.3.0/dist/css/glightbox.min.css + js: https://cdn.jsdelivr.net/npm/glightbox@3.3.0/dist/js/glightbox.min.js lazy-polyfill: css: https://cdn.jsdelivr.net/npm/loading-attribute-polyfill@2.1.1/dist/loading-attribute-polyfill.min.css diff --git a/_includes/comments/disqus.html b/_includes/comments/disqus.html index e59ed37dd2b..bef843acc35 100644 --- a/_includes/comments/disqus.html +++ b/_includes/comments/disqus.html @@ -28,7 +28,7 @@ { threshold: [0] } ); - disqus_observer.observe(document.querySelector('#disqus_thread')); + disqus_observer.observe(document.getElementById('disqus_thread')); /* Auto switch theme */ function reloadDisqus() { @@ -44,7 +44,7 @@ } } - if (document.querySelector('.mode-toggle')) { + if (document.getElementById('mode-toggle')) { window.addEventListener('message', reloadDisqus); } diff --git a/_includes/comments/giscus.html b/_includes/comments/giscus.html index 526aa22bcf1..f3b8a54b73c 100644 --- a/_includes/comments/giscus.html +++ b/_includes/comments/giscus.html @@ -2,7 +2,6 @@ diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 0b5560a33b0..577cc13f814 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -44,7 +44,7 @@

{% unless site.theme_mode %} - diff --git a/_includes/topbar.html b/_includes/topbar.html index d85101ac72e..fd68d1feb9d 100644 --- a/_includes/topbar.html +++ b/_includes/topbar.html @@ -59,7 +59,7 @@ - + { - if ($window.scrollTop() > 50) { - $btn.fadeIn(); + window.addEventListener('scroll', () => { + if (window.scrollY > 50) { + btn.classList.add('show'); } else { - $btn.fadeOut(); + btn.classList.remove('show'); } }); - $btn.on('click', () => { - $window.scrollTop(0); + btn.addEventListener('click', () => { + window.scrollTo({ top: 0 }); }); } diff --git a/_javascript/modules/components/category-collapse.js b/_javascript/modules/components/category-collapse.js index d6027a18389..b530626e532 100644 --- a/_javascript/modules/components/category-collapse.js +++ b/_javascript/modules/components/category-collapse.js @@ -3,34 +3,31 @@ */ const childPrefix = 'l_'; const parentPrefix = 'h_'; -const collapse = $('.collapse'); +const children = document.getElementsByClassName('collapse'); export function categoryCollapse() { - /* close up top-category */ - collapse.on('hide.bs.collapse', function () { - /* Bootstrap collapse events. */ const parentId = - parentPrefix + $(this).attr('id').substring(childPrefix.length); - if (parentId) { - $(`#${parentId} .far.fa-folder-open`).attr( - 'class', - 'far fa-folder fa-fw' - ); - $(`#${parentId} i.fas`).addClass('rotate'); - $(`#${parentId}`).removeClass('hide-border-bottom'); - } - }); + [...children].forEach((elem) => { + const id = parentPrefix + elem.id.substring(childPrefix.length); + const parent = document.getElementById(id); + + // collapse sub-categories + elem.addEventListener('hide.bs.collapse', () => { + if (parent) { + parent.querySelector('.far.fa-folder-open').className = + 'far fa-folder fa-fw'; + parent.querySelector('.fas.fa-angle-down').classList.add('rotate'); + parent.classList.remove('hide-border-bottom'); + } + }); - /* expand the top category */ - collapse.on('show.bs.collapse', function () { - const parentId = - parentPrefix + $(this).attr('id').substring(childPrefix.length); - if (parentId) { - $(`#${parentId} .far.fa-folder`).attr( - 'class', - 'far fa-folder-open fa-fw' - ); - $(`#${parentId} i.fas`).removeClass('rotate'); - $(`#${parentId}`).addClass('hide-border-bottom'); - } + // expand sub-categories + elem.addEventListener('show.bs.collapse', () => { + if (parent) { + parent.querySelector('.far.fa-folder').className = + 'far fa-folder-open fa-fw'; + parent.querySelector('.fas.fa-angle-down').classList.remove('rotate'); + parent.classList.add('hide-border-bottom'); + } + }); }); } diff --git a/_javascript/modules/components/clipboard.js b/_javascript/modules/components/clipboard.js index 68f6afd155a..8d4b23ffb93 100644 --- a/_javascript/modules/components/clipboard.js +++ b/_javascript/modules/components/clipboard.js @@ -7,102 +7,103 @@ */ const clipboardSelector = '.code-header>button'; + +const ICON_DEFAULT = 'far fa-clipboard'; const ICON_SUCCESS = 'fas fa-check'; + const ATTR_TIMEOUT = 'timeout'; const ATTR_TITLE_SUCCEED = 'data-title-succeed'; const ATTR_TITLE_ORIGIN = 'data-bs-original-title'; const TIMEOUT = 2000; // in milliseconds function isLocked(node) { - if ($(node)[0].hasAttribute(ATTR_TIMEOUT)) { - let timeout = $(node).attr(ATTR_TIMEOUT); + if (node.hasAttribute(ATTR_TIMEOUT)) { + let timeout = node.getAttribute(ATTR_TIMEOUT); if (Number(timeout) > Date.now()) { return true; } } + return false; } function lock(node) { - $(node).attr(ATTR_TIMEOUT, Date.now() + TIMEOUT); + node.setAttribute(ATTR_TIMEOUT, Date.now() + TIMEOUT); } function unlock(node) { - $(node).removeAttr(ATTR_TIMEOUT); + node.removeAttribute(ATTR_TIMEOUT); } -function getIcon(btn) { - let iconNode = $(btn).children(); - return iconNode.attr('class'); -} - -const ICON_DEFAULT = getIcon(clipboardSelector); - function showTooltip(btn) { - const succeedTitle = $(btn).attr(ATTR_TITLE_SUCCEED); - $(btn).attr(ATTR_TITLE_ORIGIN, succeedTitle).tooltip('show'); + const succeedTitle = btn.getAttribute(ATTR_TITLE_SUCCEED); + btn.setAttribute(ATTR_TITLE_ORIGIN, succeedTitle); + bootstrap.Tooltip.getInstance(btn).show(); } function hideTooltip(btn) { - $(btn).tooltip('hide').removeAttr(ATTR_TITLE_ORIGIN); + bootstrap.Tooltip.getInstance(btn).hide(); + btn.removeAttribute(ATTR_TITLE_ORIGIN); } function setSuccessIcon(btn) { - let btnNode = $(btn); - let iconNode = btnNode.children(); - iconNode.attr('class', ICON_SUCCESS); + const icon = btn.children[0]; + icon.setAttribute('class', ICON_SUCCESS); } function resumeIcon(btn) { - let btnNode = $(btn); - let iconNode = btnNode.children(); - iconNode.attr('class', ICON_DEFAULT); + const icon = btn.children[0]; + icon.setAttribute('class', ICON_DEFAULT); } export function initClipboard() { + const clipboardList = document.querySelectorAll(clipboardSelector); + + if (clipboardList.length === 0) { + return; + } + // Initial the clipboard.js object - if ($(clipboardSelector).length) { - const clipboard = new ClipboardJS(clipboardSelector, { - target(trigger) { - let codeBlock = trigger.parentNode.nextElementSibling; - return codeBlock.querySelector('code .rouge-code'); - } - }); + const clipboard = new ClipboardJS(clipboardSelector, { + target: (trigger) => { + const codeBlock = trigger.parentNode.nextElementSibling; + return codeBlock.querySelector('code .rouge-code'); + } + }); - const clipboardList = document.querySelectorAll(clipboardSelector); - [...clipboardList].map( - (elem) => - new bootstrap.Tooltip(elem, { - placement: 'left' - }) - ); + [...clipboardList].map( + (elem) => + new bootstrap.Tooltip(elem, { + placement: 'left' + }) + ); - clipboard.on('success', (e) => { - e.clearSelection(); + clipboard.on('success', (e) => { + const trigger = e.trigger; - const trigger = e.trigger; - if (isLocked(trigger)) { - return; - } + e.clearSelection(); - setSuccessIcon(trigger); - showTooltip(trigger); - lock(trigger); + if (isLocked(trigger)) { + return; + } - setTimeout(() => { - hideTooltip(trigger); - resumeIcon(trigger); - unlock(trigger); - }, TIMEOUT); - }); - } + setSuccessIcon(trigger); + showTooltip(trigger); + lock(trigger); + + setTimeout(() => { + hideTooltip(trigger); + resumeIcon(trigger); + unlock(trigger); + }, TIMEOUT); + }); /* --- Post link sharing --- */ - const btnCopyLink = $('#copy-link'); + const btnCopyLink = document.getElementById('copy-link'); - btnCopyLink.on('click', (e) => { - let target = $(e.target); + btnCopyLink.addEventListener('click', (e) => { + const target = e.target; if (isLocked(target)) { return; @@ -110,21 +111,23 @@ export function initClipboard() { // Copy URL to clipboard navigator.clipboard.writeText(window.location.href).then(() => { - const defaultTitle = target.attr(ATTR_TITLE_ORIGIN); - const succeedTitle = target.attr(ATTR_TITLE_SUCCEED); + const defaultTitle = target.getAttribute(ATTR_TITLE_ORIGIN); + const succeedTitle = target.getAttribute(ATTR_TITLE_SUCCEED); + // Switch tooltip title - target.attr(ATTR_TITLE_ORIGIN, succeedTitle).tooltip('show'); + target.setAttribute(ATTR_TITLE_ORIGIN, succeedTitle); + bootstrap.Tooltip.getInstance(target).show(); + lock(target); setTimeout(() => { - target.attr(ATTR_TITLE_ORIGIN, defaultTitle); + target.setAttribute(ATTR_TITLE_ORIGIN, defaultTitle); unlock(target); }, TIMEOUT); }); }); - btnCopyLink.on('mouseleave', function (e) { - const target = $(e.target); - target.tooltip('hide'); + btnCopyLink.addEventListener('mouseleave', (e) => { + bootstrap.Tooltip.getInstance(e.target).hide(); }); } diff --git a/_javascript/modules/components/img-loading.js b/_javascript/modules/components/img-loading.js index c9b7b7f3880..989d9e683c7 100644 --- a/_javascript/modules/components/img-loading.js +++ b/_javascript/modules/components/img-loading.js @@ -11,7 +11,7 @@ const cover = { }; function removeCover(clzss) { - $(this).parent().removeClass(clzss); + this.parentElement.classList.remove(clzss); } function handleImage() { @@ -30,32 +30,38 @@ function handleImage() { * Switches the LQIP with the real image URL. */ function switchLQIP() { - const $img = $(this); - const src = $img.attr(ATTR_DATA_SRC); - - $img.attr('src', encodeURI(src)); - $img.removeAttr(ATTR_DATA_SRC); + const src = this.getAttribute(ATTR_DATA_SRC); + this.setAttribute('src', encodeURI(src)); + this.removeAttribute(ATTR_DATA_SRC); } export function loadImg() { - const $images = $('article img'); + const images = document.querySelectorAll('article img'); - if ($images.length) { - $images.on('load', handleImage); + if (images.length === 0) { + return; } + images.forEach((img) => { + img.addEventListener('load', handleImage); + }); + // Images loaded from the browser cache do not trigger the 'load' event - $('article img[loading="lazy"]').each(function () { - if (this.complete) { - removeCover.call(this, cover.SHIMMER); + document.querySelectorAll('article img[loading="lazy"]').forEach((img) => { + if (img.complete) { + removeCover.call(img, cover.SHIMMER); } }); // LQIPs set by the data URI or WebP will not trigger the 'load' event, // so manually convert the URI to the URL of a high-resolution image. - const $lqips = $(`article img[${ATTR_DATA_LQIP}="true"]`); + const lqips = document.querySelectorAll( + `article img[${ATTR_DATA_LQIP}="true"]` + ); - if ($lqips.length) { - $lqips.each(switchLQIP); + if (lqips.length) { + lqips.forEach((lqip) => { + switchLQIP.call(lqip); + }); } } diff --git a/_javascript/modules/components/img-popup.js b/_javascript/modules/components/img-popup.js index 7f78d9928e1..b5c7c6eae4d 100644 --- a/_javascript/modules/components/img-popup.js +++ b/_javascript/modules/components/img-popup.js @@ -1,22 +1,15 @@ /** * Set up image popup * - * See: https://github.com/dimsemenov/Magnific-Popup + * Dependencies: https://github.com/biati-digital/glightbox */ +const IMG_CLASS = 'popup'; + export function imgPopup() { - if ($('.popup') <= 0) { + if (document.getElementsByClassName(IMG_CLASS).length === 0) { return; } - $('.popup').magnificPopup({ - type: 'image', - closeOnContentClick: true, - showCloseBtn: false, - zoom: { - enabled: true, - duration: 300, - easing: 'ease-in-out' - } - }); + GLightbox({ selector: `.${IMG_CLASS}` }); } diff --git a/_javascript/modules/components/locale-datetime.js b/_javascript/modules/components/locale-datetime.js index 214f2bff471..eb75626dd32 100644 --- a/_javascript/modules/components/locale-datetime.js +++ b/_javascript/modules/components/locale-datetime.js @@ -15,15 +15,15 @@ class LocaleHelper { } static get locale() { - return $('html').attr('lang').substring(0, 2); + return document.documentElement.getAttribute('lang').substring(0, 2); } static getTimestamp(elem) { - return Number(elem.attr(LocaleHelper.attrTimestamp)); // unix timestamp + return Number(elem.getAttribute(this.attrTimestamp)); // unix timestamp } static getDateFormat(elem) { - return elem.attr(LocaleHelper.attrDateFormat); + return elem.getAttribute(this.attrDateFormat); } } @@ -31,21 +31,23 @@ export function initLocaleDatetime() { dayjs.locale(LocaleHelper.locale); dayjs.extend(window.dayjs_plugin_localizedFormat); - $(`[${LocaleHelper.attrTimestamp}]`).each(function () { - const date = dayjs.unix(LocaleHelper.getTimestamp($(this))); - const text = date.format(LocaleHelper.getDateFormat($(this))); - $(this).text(text); - $(this).removeAttr(LocaleHelper.attrTimestamp); - $(this).removeAttr(LocaleHelper.attrDateFormat); - - // setup tooltips - const tooltip = $(this).attr('data-bs-toggle'); - if (typeof tooltip === 'undefined' || tooltip !== 'tooltip') { - return; - } - - const tooltipText = date.format('llll'); // see: https://day.js.org/docs/en/display/format#list-of-localized-formats - $(this).attr('data-bs-title', tooltipText); - new bootstrap.Tooltip($(this)); - }); + document + .querySelectorAll(`[${LocaleHelper.attrTimestamp}]`) + .forEach((elem) => { + const date = dayjs.unix(LocaleHelper.getTimestamp(elem)); + const text = date.format(LocaleHelper.getDateFormat(elem)); + elem.textContent = text; + elem.removeAttribute(LocaleHelper.attrTimestamp); + elem.removeAttribute(LocaleHelper.attrDateFormat); + + // setup tooltips + if ( + elem.hasAttribute('data-bs-toggle') && + elem.getAttribute('data-bs-toggle') === 'tooltip' + ) { + // see: https://day.js.org/docs/en/display/format#list-of-localized-formats + const tooltipText = date.format('llll'); + elem.setAttribute('data-bs-title', tooltipText); + } + }); } diff --git a/_javascript/modules/components/mode-watcher.js b/_javascript/modules/components/mode-watcher.js index 7b2298a9521..9eecd0961ef 100644 --- a/_javascript/modules/components/mode-watcher.js +++ b/_javascript/modules/components/mode-watcher.js @@ -1,21 +1,14 @@ /** * Add listener for theme mode toggle */ -const $toggleElem = $('.mode-toggle'); +const toggle = document.getElementById('mode-toggle'); export function modeWatcher() { - if ($toggleElem.length === 0) { + if (!toggle) { return; } - $toggleElem.off().on('click', (e) => { - const $target = $(e.target); - let $btn = - $target.prop('tagName') === 'button'.toUpperCase() - ? $target - : $target.parent(); - - modeToggle.flipMode(); // modeToggle: `_includes/mode-toggle.html` - $btn.trigger('blur'); // remove the clicking outline + toggle.addEventListener('click', () => { + modeToggle.flipMode(); }); } diff --git a/_javascript/modules/components/search-display.js b/_javascript/modules/components/search-display.js index ad009c2deb4..98a97ab5dbe 100644 --- a/_javascript/modules/components/search-display.js +++ b/_javascript/modules/components/search-display.js @@ -1,121 +1,109 @@ /** * This script make #search-result-wrapper switch to unloaded or shown automatically. */ -const $btnSbTrigger = $('#sidebar-trigger'); -const $btnSearchTrigger = $('#search-trigger'); -const $btnCancel = $('#search-cancel'); -const $content = $('#main-wrapper>.container>.row'); -const $topbarTitle = $('#topbar-title'); -const $search = $('search'); -const $resultWrapper = $('#search-result-wrapper'); -const $results = $('#search-results'); -const $input = $('#search-input'); -const $hints = $('#search-hints'); -const $viewport = $('html,body'); -// class names -const C_LOADED = 'loaded'; -const C_UNLOADED = 'unloaded'; -const C_FOCUS = 'input-focus'; -const C_FLEX = 'd-flex'; - -class ScrollBlocker { - static offset = 0; - static resultVisible = false; - - static on() { - ScrollBlocker.offset = window.scrollY; - $viewport.scrollTop(0); - } - - static off() { - $viewport.scrollTop(ScrollBlocker.offset); - } -} - -/*--- Actions in mobile screens (Sidebar hidden) ---*/ +const btnSbTrigger = document.getElementById('sidebar-trigger'); +const btnSearchTrigger = document.getElementById('search-trigger'); +const btnCancel = document.getElementById('search-cancel'); +const content = document.querySelectorAll('#main-wrapper>.container>.row'); +const topbarTitle = document.getElementById('topbar-title'); +const search = document.getElementById('search'); +const resultWrapper = document.getElementById('search-result-wrapper'); +const results = document.getElementById('search-results'); +const input = document.getElementById('search-input'); +const hints = document.getElementById('search-hints'); + +// CSS class names +const LOADED = 'loaded'; +const UNLOADED = 'unloaded'; +const FOCUS = 'input-focus'; +const FLEX = 'd-flex'; + +/* Actions in mobile screens (Sidebar hidden) */ class MobileSearchBar { static on() { - $btnSbTrigger.addClass(C_UNLOADED); - $topbarTitle.addClass(C_UNLOADED); - $btnSearchTrigger.addClass(C_UNLOADED); - $search.addClass(C_FLEX); - $btnCancel.addClass(C_LOADED); + btnSbTrigger.classList.add(UNLOADED); + topbarTitle.classList.add(UNLOADED); + btnSearchTrigger.classList.add(UNLOADED); + search.classList.add(FLEX); + btnCancel.classList.add(LOADED); } static off() { - $btnCancel.removeClass(C_LOADED); - $search.removeClass(C_FLEX); - $btnSbTrigger.removeClass(C_UNLOADED); - $topbarTitle.removeClass(C_UNLOADED); - $btnSearchTrigger.removeClass(C_UNLOADED); + btnCancel.classList.remove(LOADED); + search.classList.remove(FLEX); + btnSbTrigger.classList.remove(UNLOADED); + topbarTitle.classList.remove(UNLOADED); + btnSearchTrigger.classList.remove(UNLOADED); } } class ResultSwitch { + static resultVisible = false; + static on() { - if (!ScrollBlocker.resultVisible) { - // the block method must be called before $(#main-wrapper>.container) unloaded. - ScrollBlocker.on(); - $resultWrapper.removeClass(C_UNLOADED); - $content.addClass(C_UNLOADED); - ScrollBlocker.resultVisible = true; + if (!this.resultVisible) { + resultWrapper.classList.remove(UNLOADED); + content.forEach((el) => { + el.classList.add(UNLOADED); + }); + this.resultVisible = true; } } static off() { - if (ScrollBlocker.resultVisible) { - $results.empty(); - if ($hints.hasClass(C_UNLOADED)) { - $hints.removeClass(C_UNLOADED); - } - $resultWrapper.addClass(C_UNLOADED); - $content.removeClass(C_UNLOADED); + if (this.resultVisible) { + results.innerHTML = ''; - // now the release method must be called after $(#main-wrapper>.container) display - ScrollBlocker.off(); + if (hints.classList.contains(UNLOADED)) { + hints.classList.remove(UNLOADED); + } - $input.val(''); - ScrollBlocker.resultVisible = false; + resultWrapper.classList.add(UNLOADED); + content.forEach((el) => { + el.classList.remove(UNLOADED); + }); + input.textContent = ''; + this.resultVisible = false; } } } function isMobileView() { - return $btnCancel.hasClass(C_LOADED); + return btnCancel.classList.contains(LOADED); } export function displaySearch() { - $btnSearchTrigger.on('click', function () { + btnSearchTrigger.addEventListener('click', () => { MobileSearchBar.on(); ResultSwitch.on(); - $input.trigger('focus'); + input.focus(); }); - $btnCancel.on('click', function () { + btnCancel.addEventListener('click', () => { MobileSearchBar.off(); ResultSwitch.off(); }); - $input.on('focus', function () { - $search.addClass(C_FOCUS); + input.addEventListener('focus', () => { + search.classList.add(FOCUS); }); - $input.on('focusout', function () { - $search.removeClass(C_FOCUS); + input.addEventListener('focusout', () => { + search.classList.remove(FOCUS); }); - $input.on('input', () => { - if ($input.val() === '') { + input.addEventListener('input', () => { + if (input.value === '') { if (isMobileView()) { - $hints.removeClass(C_UNLOADED); + hints.classList.remove(UNLOADED); } else { ResultSwitch.off(); } } else { ResultSwitch.on(); if (isMobileView()) { - $hints.addClass(C_UNLOADED); + hints.classList.add(UNLOADED); } } }); diff --git a/_javascript/modules/components/sidebar.js b/_javascript/modules/components/sidebar.js index 9d8567eadda..6b562d84147 100644 --- a/_javascript/modules/components/sidebar.js +++ b/_javascript/modules/components/sidebar.js @@ -2,7 +2,6 @@ * Expand or close the sidebar in mobile screens. */ -const $body = $('body'); const ATTR_DISPLAY = 'sidebar-display'; class SidebarUtil { @@ -10,9 +9,9 @@ class SidebarUtil { static toggle() { if (SidebarUtil.isExpanded === false) { - $body.attr(ATTR_DISPLAY, ''); + document.body.setAttribute(ATTR_DISPLAY, ''); } else { - $body.removeAttr(ATTR_DISPLAY); + document.body.removeAttribute(ATTR_DISPLAY); } SidebarUtil.isExpanded = !SidebarUtil.isExpanded; @@ -20,6 +19,9 @@ class SidebarUtil { } export function sidebarExpand() { - $('#sidebar-trigger').on('click', SidebarUtil.toggle); - $('#mask').on('click', SidebarUtil.toggle); + document + .getElementById('sidebar-trigger') + .addEventListener('click', SidebarUtil.toggle); + + document.getElementById('mask').addEventListener('click', SidebarUtil.toggle); } diff --git a/_sass/addon/commons.scss b/_sass/addon/commons.scss index 678db47562b..e02a79fecab 100644 --- a/_sass/addon/commons.scss +++ b/_sass/addon/commons.scss @@ -672,18 +672,6 @@ main { /* --- Overriding --- */ -/* magnific-popup */ - -figure .mfp-title { - text-align: center; - padding-right: 0; - margin-top: 0.5rem; -} - -.mfp-img { - transition: none; -} - /* mermaid */ .mermaid { text-align: center; @@ -876,7 +864,7 @@ $btn-mb: 0.5rem; line-height: $btn-size; } - .mode-toggle { + #mode-toggle { padding: 0; border: 0; @@ -1158,7 +1146,8 @@ search { /* --- button back-to-top --- */ #back-to-top { - display: none; + visibility: hidden; + opacity: 0; z-index: 1; cursor: pointer; position: fixed; @@ -1171,8 +1160,7 @@ search { height: $back2top-size; border-radius: 50%; border: 1px solid var(--btn-backtotop-border-color); - transition: transform 0.2s ease-out; - -webkit-transition: transform 0.2s ease-out; + transition: opacity 0.5s ease-in-out, transform 0.2s ease-out; &:hover { transform: translate3d(0, -5px, 0); @@ -1184,6 +1172,11 @@ search { position: relative; bottom: 2px; } + + &.show { + opacity: 1; + visibility: visible; + } } #notification { diff --git a/assets/js/pwa/app.js b/assets/js/pwa/app.js index 8599fe3f516..173ea2938bf 100644 --- a/assets/js/pwa/app.js +++ b/assets/js/pwa/app.js @@ -8,30 +8,32 @@ if ('serviceWorker' in navigator) { if (isEnabled) { const swUrl = '{{ '/sw.min.js' | relative_url }}'; - const $notification = $('#notification'); - const $btnRefresh = $('#notification .toast-body>button'); + const notification = document.getElementById('notification'); + const btnRefresh = notification.querySelector('.toast-body>button'); + const popupWindow = bootstrap.Toast.getOrCreateInstance(notification); navigator.serviceWorker.register(swUrl).then((registration) => { {% comment %}In case the user ignores the notification{% endcomment %} if (registration.waiting) { - $notification.toast('show'); + popupWindow.show(); } registration.addEventListener('updatefound', () => { registration.installing.addEventListener('statechange', () => { if (registration.waiting) { if (navigator.serviceWorker.controller) { - $notification.toast('show'); + popupWindow.show(); } } }); }); - $btnRefresh.on('click', () => { + btnRefresh.addEventListener('click', () => { if (registration.waiting) { registration.waiting.postMessage('SKIP_WAITING'); } - $notification.toast('hide'); + + popupWindow.hide(); }); }); diff --git a/assets/lib b/assets/lib index 7bc0d86b6af..29d7021f453 160000 --- a/assets/lib +++ b/assets/lib @@ -1 +1 @@ -Subproject commit 7bc0d86b6af83d7acfc63db50f29a5975cec2513 +Subproject commit 29d7021f45317d02df9a3297d3c52a30bd4ae795 From d013c11c8d7b980261f54b3dd31c2b00399ad814 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Wed, 17 Apr 2024 19:25:28 +0800 Subject: [PATCH 11/47] docs: update readme --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5bcfcb7fed4..747b8bc1dd3 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ ## Features -- Dark / Light Theme Mode +- Dark Theme - Localized UI language - Pinned Posts on Home Page - Hierarchical Categories @@ -30,9 +30,9 @@ - Syntax Highlighting - Mathematical Expressions - Mermaid Diagrams & Flowcharts -- Dark / Light Mode Images -- Embed Videos -- Disqus / Giscus / Utterances Comments +- Dark Mode Images +- Embed Media +- Comment Systems - Built-in Search - Atom Feeds - PWA @@ -56,7 +56,7 @@ For details, see the "[Contributing Guidelines][contribute-guide]". Thanks to [all the contributors][contributors] involved in the development of the project! [![all-contributors](https://contrib.rocks/image?repo=cotes2020/jekyll-theme-chirpy&columns=16)][contributors] - —— Made with [contrib.rocks](https://contrib.rocks) + — Made with [contrib.rocks](https://contrib.rocks) ### Third-Party Assets From 662cd331e3f724a2d1b428dd07b7769c8dd86caa Mon Sep 17 00:00:00 2001 From: Vinicius Rocha Date: Fri, 19 Apr 2024 09:36:44 -0400 Subject: [PATCH 12/47] chore: add `.jekyll-metadata` to .gitignore (#1686) --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index cee9e1210f5..3f4427c27f6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ Gemfile.lock # Jekyll cache .jekyll-cache +.jekyll-metadata _site # RubyGems From 63c51384dfb8e7ad17dbd92259ae741c8bb77fd3 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 20 Apr 2024 23:59:59 +0800 Subject: [PATCH 13/47] chore: remove comments from compressed HTML --- _includes/mode-toggle.html | 14 ++++++++------ _includes/search-loader.html | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/_includes/mode-toggle.html b/_includes/mode-toggle.html index a347750f8b1..ab202341978 100644 --- a/_includes/mode-toggle.html +++ b/_includes/mode-toggle.html @@ -33,7 +33,7 @@ let self = this; - /* always follow the system prefers */ + {%- comment -%} always follow the system prefers {%- endcomment -%} this.sysDarkPrefers.addEventListener('change', () => { if (self.hasMode) { if (self.isDarkMode) { @@ -51,7 +51,7 @@ self.notify(); }); - } /* constructor() */ + } {%- comment -%} constructor() {%- endcomment -%} get sysDarkPrefers() { return window.matchMedia('(prefers-color-scheme: dark)'); @@ -77,7 +77,7 @@ return sessionStorage.getItem(ModeToggle.MODE_KEY); } - /* get the current mode on screen */ + {%- comment -%} get the current mode on screen {%- endcomment -%} get modeStatus() { if (this.isDarkMode || (!this.hasMode && this.isSysDarkPrefer)) { return ModeToggle.DARK_MODE; @@ -101,7 +101,9 @@ sessionStorage.removeItem(ModeToggle.MODE_KEY); } - /* Notify another plugins that the theme mode has changed */ + {%- comment -%} + Notify another plugins that the theme mode has changed + {%- endcomment -%} notify() { window.postMessage( { @@ -136,8 +138,8 @@ } this.notify(); - } /* flipMode() */ - } /* ModeToggle */ + } + } const modeToggle = new ModeToggle(); diff --git a/_includes/search-loader.html b/_includes/search-loader.html index be3ca8a69f5..2582580a91b 100644 --- a/_includes/search-loader.html +++ b/_includes/search-loader.html @@ -19,7 +19,7 @@

{title}

{% capture not_found %}

{{ site.data.locales[include.lang].search.no_results }}

{% endcapture %} + {% if page.math %} @@ -88,6 +88,10 @@ {% endif %} {% endif %} +{% if page.mermaid %} + {% include mermaid.html %} +{% endif %} + {% if jekyll.environment == 'production' %} {% if site.pwa.enabled %} diff --git a/_javascript/commons.js b/_javascript/commons.js index 05a9765c1fb..6a17fb93a38 100644 --- a/_javascript/commons.js +++ b/_javascript/commons.js @@ -1,5 +1,5 @@ import { basic, initSidebar, initTopbar } from './modules/layouts'; -basic(); initSidebar(); initTopbar(); +basic(); diff --git a/_javascript/home.js b/_javascript/home.js index 02948c952a9..ef22cb97c1f 100644 --- a/_javascript/home.js +++ b/_javascript/home.js @@ -1,8 +1,8 @@ import { basic, initSidebar, initTopbar } from './modules/layouts'; import { initLocaleDatetime, loadImg } from './modules/plugins'; -basic(); +loadImg(); +initLocaleDatetime(); initSidebar(); initTopbar(); -initLocaleDatetime(); -loadImg(); +basic(); diff --git a/_javascript/misc.js b/_javascript/misc.js index c7a19d6a2b0..52b40438c89 100644 --- a/_javascript/misc.js +++ b/_javascript/misc.js @@ -1,7 +1,7 @@ import { basic, initSidebar, initTopbar } from './modules/layouts'; import { initLocaleDatetime } from './modules/plugins'; -basic(); initSidebar(); initTopbar(); initLocaleDatetime(); +basic(); diff --git a/_javascript/page.js b/_javascript/page.js index f13bd2f936c..76e8ce97c10 100644 --- a/_javascript/page.js +++ b/_javascript/page.js @@ -1,9 +1,9 @@ import { basic, initSidebar, initTopbar } from './modules/layouts'; import { loadImg, imgPopup, initClipboard } from './modules/plugins'; -basic(); -initSidebar(); -initTopbar(); loadImg(); imgPopup(); +initSidebar(); +initTopbar(); initClipboard(); +basic(); diff --git a/_javascript/post.js b/_javascript/post.js index 86ea32b8ae5..9340f05e70d 100644 --- a/_javascript/post.js +++ b/_javascript/post.js @@ -7,11 +7,11 @@ import { toc } from './modules/plugins'; -initSidebar(); -initTopbar(); loadImg(); +toc(); imgPopup(); +initSidebar(); initLocaleDatetime(); initClipboard(); -toc(); +initTopbar(); basic(); diff --git a/_layouts/default.html b/_layouts/default.html index 6e865b920f5..ea438fe7abb 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -75,13 +75,8 @@ {% endif %} - {% include js-selector.html lang=lang %} - {% if page.mermaid %} - {% include mermaid.html %} - {% endif %} - {% include_cached search-loader.html lang=lang %} From 76d58fe0ffdc4bd1df35b60815e97560c3564700 Mon Sep 17 00:00:00 2001 From: Azamat Mambetov Date: Mon, 29 Apr 2024 19:27:41 +0400 Subject: [PATCH 25/47] fix(pwa): skip range requests in service worker (#1672) --- assets/js/pwa/sw.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/js/pwa/sw.js b/assets/js/pwa/sw.js index adc707ef9fb..dbf30f476ac 100644 --- a/assets/js/pwa/sw.js +++ b/assets/js/pwa/sw.js @@ -75,6 +75,10 @@ self.addEventListener('message', (event) => { }); self.addEventListener('fetch', (event) => { + if (event.request.headers.has('range')) { + return; + } + event.respondWith( caches.match(event.request).then((response) => { if (response) { From 8608147fb5037804695d93496c62f96b9c41e9cd Mon Sep 17 00:00:00 2001 From: Huanyu Shi Date: Wed, 1 May 2024 23:12:46 +0800 Subject: [PATCH 26/47] fix: prevent footnote back arrow from becoming an emoji (#1716) --- _config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/_config.yml b/_config.yml index 6062ac6ea8f..b742e072502 100644 --- a/_config.yml +++ b/_config.yml @@ -151,6 +151,7 @@ baseurl: "" # ------------ The following options are not recommended to be modified ------------------ kramdown: + footnote_backlink: "↩︎" syntax_highlighter: rouge syntax_highlighter_opts: # Rouge Options › https://github.com/jneen/rouge#full-options css_class: highlight From 05ebfb705e424b75e5feac6894701e8f8b164aa9 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Thu, 2 May 2024 03:16:35 +0800 Subject: [PATCH 27/47] chore: update discussion template --- .github/DISCUSSION_TEMPLATE/general.yml | 9 --------- .github/DISCUSSION_TEMPLATE/ideas.yml | 7 +++++++ 2 files changed, 7 insertions(+), 9 deletions(-) create mode 100644 .github/DISCUSSION_TEMPLATE/ideas.yml diff --git a/.github/DISCUSSION_TEMPLATE/general.yml b/.github/DISCUSSION_TEMPLATE/general.yml index 4e879f95049..18d0f8585fb 100644 --- a/.github/DISCUSSION_TEMPLATE/general.yml +++ b/.github/DISCUSSION_TEMPLATE/general.yml @@ -9,15 +9,6 @@ body: [contributing guidelines](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/docs/CONTRIBUTING.md). required: true - - type: dropdown - attributes: - label: What is the topic? - options: - - Sharing tips and tricks - - Just chatting - validations: - required: true - - type: textarea attributes: label: Description diff --git a/.github/DISCUSSION_TEMPLATE/ideas.yml b/.github/DISCUSSION_TEMPLATE/ideas.yml new file mode 100644 index 00000000000..e4c987d794e --- /dev/null +++ b/.github/DISCUSSION_TEMPLATE/ideas.yml @@ -0,0 +1,7 @@ +body: + - type: textarea + attributes: + label: Description + description: Please describe in detail what you want to share. + validations: + required: true From f1c6d2a817425973ed4121f942bcbd460a619f86 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Thu, 2 May 2024 03:18:35 +0800 Subject: [PATCH 28/47] build: enhance the run script --- tools/run | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/tools/run b/tools/run index 8072e414897..04f23f5e76b 100755 --- a/tools/run +++ b/tools/run @@ -2,4 +2,49 @@ # # Run jekyll serve and then launch the site -bundle exec jekyll s -H 0.0.0.0 -l +prod=false +command="bundle exec jekyll s -l" +host="127.0.0.1" + +help() { + echo "Usage:" + echo + echo " bash /path/to/run [options]" + echo + echo "Options:" + echo " -H, --host [HOST] Host to bind to." + echo " -p, --production Run Jekyll in 'production' mode." + echo " -h, --help Print this help information." +} + +while (($#)); do + opt="$1" + case $opt in + -H | --host) + host="$2" + shift 2 + ;; + -p | --production) + prod=true + shift + ;; + -h | --help) + help + exit 0 + ;; + *) + echo -e "> Unknown option: '$opt'\n" + help + exit 1 + ;; + esac +done + +command="$command -H $host" + +if $prod; then + command="JEKYLL_ENV=production $command" +fi + +echo -e "\n> $command\n" +eval "$command" From dcb0add47bf1adf92215514f1ccfa4661d5215be Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Thu, 2 May 2024 05:11:45 +0800 Subject: [PATCH 29/47] refactor!: optimize the resource hints (#1717) Improved the data structure for defining resource hints to the browser. --- _data/origin/cors.yml | 24 +++++++++++++----------- _includes/head.html | 36 +++++++++++++++--------------------- assets/js/data/swconf.js | 14 -------------- assets/js/pwa/sw.js | 18 ------------------ 4 files changed, 28 insertions(+), 64 deletions(-) diff --git a/_data/origin/cors.yml b/_data/origin/cors.yml index a10d31cc274..ff249e6ea9e 100644 --- a/_data/origin/cors.yml +++ b/_data/origin/cors.yml @@ -1,18 +1,20 @@ -# CDNs - -cdns: - # Google Fonts +# Resource Hints +resource_hints: - url: https://fonts.googleapis.com + links: + - rel: preconnect + - rel: dns-prefetch - url: https://fonts.gstatic.com - args: crossorigin - - url: https://fonts.googleapis.com - # jsDelivr CDN + links: + - rel: preconnect + opts: [crossorigin] + - rel: dns-prefetch - url: https://cdn.jsdelivr.net - # polyfill.io for math (cdnjs.cloudflare.com/polyfill) - - url: https://cdnjs.cloudflare.com - -# fonts + links: + - rel: preconnect + - rel: dns-prefetch +# Web Fonts webfonts: https://fonts.googleapis.com/css2?family=Lato:wght@300;400&family=Source+Sans+Pro:wght@400;600;700;900&display=swap # Libraries diff --git a/_includes/head.html b/_includes/head.html index f3434cf5f8d..0e4725c78ac 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -59,34 +59,28 @@ {% include_cached favicons.html %} - {% if site.resources.ignore_env != jekyll.environment and site.resources.self_hosted %} - - - {% else %} - {% for cdn in site.data.origin[type].cdns %} - - + + {% unless site.assets.self_host.enabled %} + {% for hint in site.data.origin.cors.resource_hints %} + {% for link in hint.links %} + + {% endfor %} {% endfor %} - - - {% endif %} - - - {% if jekyll.environment == 'production' and site.analytics.google.id != empty and site.analytics.google.id %} - - - - - - {% endif %} + {% endunless %} - + + + + + + + - + {% if site.toc and page.toc %} diff --git a/assets/js/data/swconf.js b/assets/js/data/swconf.js index c02638fa5e1..5c1ed29205a 100644 --- a/assets/js/data/swconf.js +++ b/assets/js/data/swconf.js @@ -22,20 +22,6 @@ const swconf = { {% endfor %} ], - {%- comment -%} The request url with below domain will be cached. {%- endcomment -%} - allowHosts: [ - {% if site.cdn and site.cdn contains '//' %} - '{{ site.cdn | split: '//' | last | split: '/' | first }}', - {% endif %} - - {%- unless site.assets.self_host.enabled -%} - {% for cdn in site.data.origin["cors"].cdns %} - '{{ cdn.url | split: "//" | last }}' - {%- unless forloop.last -%},{%- endunless -%} - {% endfor %} - {% endunless %} - ], - {%- comment -%} The request url with below path will not be cached. {%- endcomment -%} denyPaths: [ {% for path in site.pwa.cache.deny_paths %} diff --git a/assets/js/pwa/sw.js b/assets/js/pwa/sw.js index dbf30f476ac..e9609b13179 100644 --- a/assets/js/pwa/sw.js +++ b/assets/js/pwa/sw.js @@ -9,21 +9,7 @@ const swconfUrl = '{{ '/assets/js/data/swconf.js' | relative_url }}'; importScripts(swconfUrl); const purge = swconf.purge; -function verifyHost(url) { - for (const host of swconf.allowHosts) { - const regex = RegExp(`^http(s)?://${host}/`); - if (regex.test(url)) { - return true; - } - } - return false; -} - function verifyUrl(url) { - if (!verifyHost(url)) { - return false; - } - const requestPath = new URL(url).pathname; for (const path of swconf.denyPaths) { @@ -34,10 +20,6 @@ function verifyUrl(url) { return true; } -if (!purge) { - swconf.allowHosts.push(location.host); -} - self.addEventListener('install', (event) => { if (purge) { return; From 12c340e98b6ad75c3e6eb91c2ff80b9a478f457b Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 4 May 2024 00:41:00 +0800 Subject: [PATCH 30/47] ci: update dependabot settings --- .github/dependabot.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index bec10467f41..393fa980313 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -2,10 +2,6 @@ version: 2 updates: - package-ecosystem: "bundler" directory: "/" - versioning-strategy: increase - groups: - bundler: - dependency-type: "production" schedule: interval: "weekly" - package-ecosystem: "npm" @@ -13,7 +9,10 @@ updates: versioning-strategy: increase groups: npm: - dependency-type: "development" + update-types: + - "major" + - "minor" + - "patch" schedule: interval: "weekly" - package-ecosystem: "github-actions" From c17fba44f53767c9dfaa8d92cfc6e275e5977f8a Mon Sep 17 00:00:00 2001 From: Hieu D <48117687+dqhntt@users.noreply.github.com> Date: Fri, 3 May 2024 17:46:17 -0700 Subject: [PATCH 31/47] feat: add cloudflare web analytics (#1723) --- _config.yml | 2 ++ _includes/analytics/cloudflare.html | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 _includes/analytics/cloudflare.html diff --git a/_config.yml b/_config.yml index b742e072502..0de0965dfc1 100644 --- a/_config.yml +++ b/_config.yml @@ -68,6 +68,8 @@ analytics: matomo: id: # fill in your Matomo ID domain: # fill in your Matomo domain + cloudflare: + id: # fill in your Cloudflare Web Analytics token # Pageviews settings pageviews: diff --git a/_includes/analytics/cloudflare.html b/_includes/analytics/cloudflare.html new file mode 100644 index 00000000000..1eeb1a924ff --- /dev/null +++ b/_includes/analytics/cloudflare.html @@ -0,0 +1,7 @@ + + + From ddb48eda52827aae16aff720212d7b6d2d8647f9 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 11 May 2024 10:29:14 +0800 Subject: [PATCH 32/47] perf: lean bootstrap javascript (#1734) --- _data/origin/basic.yml | 1 - _data/origin/cors.yml | 1 - _includes/js-selector.html | 4 +- .../modules/components/category-collapse.js | 3 ++ _javascript/modules/components/clipboard.js | 30 ++++++++---- .../modules/components/tooltip-loader.js | 7 ++- _javascript/pwa/_frontmatter | 3 ++ {assets/js => _javascript}/pwa/app.js | 19 +++----- {assets/js => _javascript}/pwa/sw.js | 11 ++--- package.json | 19 +++++--- rollup.config.js | 46 +++++++++++++++---- 11 files changed, 89 insertions(+), 55 deletions(-) create mode 100644 _javascript/pwa/_frontmatter rename {assets/js => _javascript}/pwa/app.js (73%) rename {assets/js => _javascript}/pwa/sw.js (83%) diff --git a/_data/origin/basic.yml b/_data/origin/basic.yml index 73822515027..9f3415a7ef7 100644 --- a/_data/origin/basic.yml +++ b/_data/origin/basic.yml @@ -6,7 +6,6 @@ webfonts: /assets/lib/fonts/main.css bootstrap: css: /assets/lib/bootstrap/bootstrap.min.css - js: /assets/lib/bootstrap/bootstrap.bundle.min.js toc: css: /assets/lib/tocbot/tocbot.min.css diff --git a/_data/origin/cors.yml b/_data/origin/cors.yml index ff249e6ea9e..220d131eeb1 100644 --- a/_data/origin/cors.yml +++ b/_data/origin/cors.yml @@ -21,7 +21,6 @@ webfonts: https://fonts.googleapis.com/css2?family=Lato:wght@300;400&family=Sour bootstrap: css: https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css - js: https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js toc: css: https://cdn.jsdelivr.net/npm/tocbot@4.25.0/dist/tocbot.min.css diff --git a/_includes/js-selector.html b/_includes/js-selector.html index 3e1eb471626..b229b70d738 100644 --- a/_includes/js-selector.html +++ b/_includes/js-selector.html @@ -2,9 +2,7 @@ -{%- capture urls -%} - {{ site.data.origin[type].bootstrap.js }},{{ site.data.origin[type].search.js }} -{%- endcapture -%} +{% assign urls = site.data.origin[type].search.js %} diff --git a/_javascript/modules/components/category-collapse.js b/_javascript/modules/components/category-collapse.js index b530626e532..0c53cb4bc93 100644 --- a/_javascript/modules/components/category-collapse.js +++ b/_javascript/modules/components/category-collapse.js @@ -1,6 +1,9 @@ /** * Tab 'Categories' expand/close effect. */ + +import 'bootstrap/js/src/collapse.js'; + const childPrefix = 'l_'; const parentPrefix = 'h_'; const children = document.getElementsByClassName('collapse'); diff --git a/_javascript/modules/components/clipboard.js b/_javascript/modules/components/clipboard.js index 8d4b23ffb93..9566e9d311a 100644 --- a/_javascript/modules/components/clipboard.js +++ b/_javascript/modules/components/clipboard.js @@ -2,10 +2,11 @@ * Clipboard functions * * Dependencies: - * - popper.js (https://github.com/popperjs/popper-core) - * - clipboard.js (https://github.com/zenorocha/clipboard.js) + * clipboard.js (https://github.com/zenorocha/clipboard.js) */ +import Tooltip from 'bootstrap/js/src/tooltip'; + const clipboardSelector = '.code-header>button'; const ICON_DEFAULT = 'far fa-clipboard'; @@ -38,11 +39,11 @@ function unlock(node) { function showTooltip(btn) { const succeedTitle = btn.getAttribute(ATTR_TITLE_SUCCEED); btn.setAttribute(ATTR_TITLE_ORIGIN, succeedTitle); - bootstrap.Tooltip.getInstance(btn).show(); + Tooltip.getInstance(btn).show(); } function hideTooltip(btn) { - bootstrap.Tooltip.getInstance(btn).hide(); + Tooltip.getInstance(btn).hide(); btn.removeAttribute(ATTR_TITLE_ORIGIN); } @@ -56,7 +57,7 @@ function resumeIcon(btn) { icon.setAttribute('class', ICON_DEFAULT); } -export function initClipboard() { +function setCodeClipboard() { const clipboardList = document.querySelectorAll(clipboardSelector); if (clipboardList.length === 0) { @@ -73,7 +74,7 @@ export function initClipboard() { [...clipboardList].map( (elem) => - new bootstrap.Tooltip(elem, { + new Tooltip(elem, { placement: 'left' }) ); @@ -97,11 +98,15 @@ export function initClipboard() { unlock(trigger); }, TIMEOUT); }); +} - /* --- Post link sharing --- */ - +function setLinkClipboard() { const btnCopyLink = document.getElementById('copy-link'); + if (btnCopyLink === null) { + return; + } + btnCopyLink.addEventListener('click', (e) => { const target = e.target; @@ -116,7 +121,7 @@ export function initClipboard() { // Switch tooltip title target.setAttribute(ATTR_TITLE_ORIGIN, succeedTitle); - bootstrap.Tooltip.getInstance(target).show(); + Tooltip.getInstance(target).show(); lock(target); @@ -128,6 +133,11 @@ export function initClipboard() { }); btnCopyLink.addEventListener('mouseleave', (e) => { - bootstrap.Tooltip.getInstance(e.target).hide(); + Tooltip.getInstance(e.target).hide(); }); } + +export function initClipboard() { + setCodeClipboard(); + setLinkClipboard(); +} diff --git a/_javascript/modules/components/tooltip-loader.js b/_javascript/modules/components/tooltip-loader.js index a90660020fb..c36c8799699 100644 --- a/_javascript/modules/components/tooltip-loader.js +++ b/_javascript/modules/components/tooltip-loader.js @@ -1,12 +1,11 @@ -/** - * Initial Bootstrap Tooltip. - */ +import Tooltip from 'bootstrap/js/src/tooltip'; + export function loadTooptip() { const tooltipTriggerList = document.querySelectorAll( '[data-bs-toggle="tooltip"]' ); [...tooltipTriggerList].map( - (tooltipTriggerEl) => new bootstrap.Tooltip(tooltipTriggerEl) + (tooltipTriggerEl) => new Tooltip(tooltipTriggerEl) ); } diff --git a/_javascript/pwa/_frontmatter b/_javascript/pwa/_frontmatter new file mode 100644 index 00000000000..97ecf0a6bde --- /dev/null +++ b/_javascript/pwa/_frontmatter @@ -0,0 +1,3 @@ +--- +permalink: /:basename +--- diff --git a/assets/js/pwa/app.js b/_javascript/pwa/app.js similarity index 73% rename from assets/js/pwa/app.js rename to _javascript/pwa/app.js index 173ea2938bf..c71036a56a9 100644 --- a/assets/js/pwa/app.js +++ b/_javascript/pwa/app.js @@ -1,19 +1,15 @@ ---- -layout: compress -permalink: /assets/js/dist/:basename.min.js ---- +import { pwa, baseurl } from '../../_config.yml'; +import Toast from 'bootstrap/js/src/toast'; if ('serviceWorker' in navigator) { - const isEnabled = '{{ site.pwa.enabled }}' === 'true'; - - if (isEnabled) { - const swUrl = '{{ '/sw.min.js' | relative_url }}'; + if (pwa.enabled) { + const swUrl = `${baseurl}/sw.min.js`; const notification = document.getElementById('notification'); const btnRefresh = notification.querySelector('.toast-body>button'); - const popupWindow = bootstrap.Toast.getOrCreateInstance(notification); + const popupWindow = Toast.getOrCreateInstance(notification); navigator.serviceWorker.register(swUrl).then((registration) => { - {% comment %}In case the user ignores the notification{% endcomment %} + // In case the user ignores the notification if (registration.waiting) { popupWindow.show(); } @@ -32,14 +28,13 @@ if ('serviceWorker' in navigator) { if (registration.waiting) { registration.waiting.postMessage('SKIP_WAITING'); } - popupWindow.hide(); }); }); let refreshing = false; - {% comment %}Detect controller change and refresh all the opened tabs{% endcomment %} + // Detect controller change and refresh all the opened tabs navigator.serviceWorker.addEventListener('controllerchange', () => { if (!refreshing) { window.location.reload(); diff --git a/assets/js/pwa/sw.js b/_javascript/pwa/sw.js similarity index 83% rename from assets/js/pwa/sw.js rename to _javascript/pwa/sw.js index e9609b13179..bc67bd8307b 100644 --- a/assets/js/pwa/sw.js +++ b/_javascript/pwa/sw.js @@ -1,12 +1,7 @@ ---- -layout: compress -permalink: /:basename.min.js -# PWA service worker ---- +import { baseurl } from '../../_config.yml'; -const swconfUrl = '{{ '/assets/js/data/swconf.js' | relative_url }}'; +importScripts(`${baseurl}/assets/js/data/swconf.js`); -importScripts(swconfUrl); const purge = swconf.purge; function verifyUrl(url) { @@ -74,7 +69,7 @@ self.addEventListener('fetch', (event) => { return response; } - {% comment %}See: {% endcomment %} + // See: let responseToCache = response.clone(); caches.open(swconf.cacheName).then((cache) => { diff --git a/package.json b/package.json index 3fa3931f8e0..ef094a125b9 100644 --- a/package.json +++ b/package.json @@ -13,12 +13,16 @@ }, "homepage": "https://github.com/cotes2020/jekyll-theme-chirpy/", "scripts": { - "prebuild": "npx rimraf assets/js/dist", - "build": "NODE_ENV=production npx rollup -c --bundleConfigAsCjs", - "prewatch": "npx rimraf assets/js/dist", - "watch": "npx rollup -c --bundleConfigAsCjs -w", - "test": "npx stylelint _sass/**/*.scss", - "fixlint": "npm run test -- --fix" + "build": "npm run build:js", + "build:js": "rollup -c --bundleConfigAsCjs --environment BUILD:production", + "watch:js": "rollup -c --bundleConfigAsCjs -w", + "lint:style": "stylelint _sass/**/*.scss", + "lint:fix:style": "npm run lint:style -- --fix", + "test": "npm run lint:scss" + }, + "dependencies": { + "@popperjs/core": "^2.11.8", + "bootstrap": "^5.3.3" }, "devDependencies": { "@babel/core": "^7.24.4", @@ -27,13 +31,14 @@ "@commitlint/cli": "^19.2.2", "@commitlint/config-conventional": "^19.2.2", "@rollup/plugin-babel": "^6.0.4", + "@rollup/plugin-node-resolve": "^15.2.3", "@rollup/plugin-terser": "^0.4.4", + "@rollup/plugin-yaml": "^4.1.2", "@semantic-release/changelog": "^6.0.3", "@semantic-release/exec": "^6.0.3", "@semantic-release/git": "^10.0.1", "conventional-changelog-conventionalcommits": "^7.0.2", "husky": "^9.0.11", - "rimraf": "^5.0.5", "rollup": "^4.15.0", "rollup-plugin-license": "^3.3.1", "semantic-release": "^23.0.8", diff --git a/rollup.config.js b/rollup.config.js index 6226080c26f..823401e0dad 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -1,23 +1,42 @@ import babel from '@rollup/plugin-babel'; import terser from '@rollup/plugin-terser'; import license from 'rollup-plugin-license'; +import { nodeResolve } from '@rollup/plugin-node-resolve'; +import fs from 'fs'; import path from 'path'; +import yaml from '@rollup/plugin-yaml'; const SRC_DEFAULT = '_javascript'; const DIST_DEFAULT = 'assets/js/dist'; -const isProd = process.env.NODE_ENV === 'production'; +const SRC_PWA = `${SRC_DEFAULT}/pwa`; + +const isProd = process.env.BUILD === 'production'; + +if (fs.existsSync(DIST_DEFAULT)) { + fs.rm(DIST_DEFAULT, { recursive: true, force: true }, (err) => { + if (err) { + throw err; + } + }); +} + +function build(filename, opts = {}) { + const src = opts.src || SRC_DEFAULT; + const dist = opts.dist || DIST_DEFAULT; + const bannerUrl = + opts.bannerUrl || path.join(__dirname, SRC_DEFAULT, '_copyright'); + const commentStyle = opts.commentStyle || 'ignored'; -function build(filename) { return { - input: [`${SRC_DEFAULT}/${filename}.js`], + input: [`${src}/${filename}.js`], output: { - file: `${DIST_DEFAULT}/${filename}.min.js`, + file: `${dist}/${filename}.min.js`, format: 'iife', name: 'Chirpy', sourcemap: !isProd }, watch: { - include: `${SRC_DEFAULT}/**` + include: `${src}/**` }, plugins: [ babel({ @@ -25,13 +44,16 @@ function build(filename) { presets: ['@babel/env'], plugins: ['@babel/plugin-transform-class-properties'] }), + nodeResolve(), + yaml(), + isProd && commentStyle === 'none' && terser(), license({ banner: { - commentStyle: 'ignored', - content: { file: path.join(__dirname, SRC_DEFAULT, '_copyright') } + commentStyle, + content: { file: bannerUrl } } }), - isProd && terser() + isProd && commentStyle !== 'none' && terser() ] }; } @@ -42,5 +64,11 @@ export default [ build('categories'), build('page'), build('post'), - build('misc') + build('misc'), + build('app', { src: SRC_PWA }), + build('sw', { + src: SRC_PWA, + bannerUrl: path.join(__dirname, SRC_PWA, '_frontmatter'), + commentStyle: 'none' + }) ]; From 363a3d936bbd688fa4f28527e85ef7dd3fe3a79b Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 11 May 2024 11:07:48 +0800 Subject: [PATCH 33/47] perf: tree shaking Bootstrap CSS (#1736) --- .gitignore | 4 ++++ _config.yml | 2 +- _data/origin/basic.yml | 3 --- _data/origin/cors.yml | 3 --- _includes/head.html | 4 +++- _posts/2019-08-09-getting-started.md | 8 +++---- _sass/main.bundle.scss | 2 ++ assets/css/jekyll-theme-chirpy.scss | 6 +++++- assets/lib | 2 +- package.json | 9 +++++--- purgecss.config.js | 23 +++++++++++++++++++++ tools/init | 6 +++--- tools/release | 31 +++++++++++++++------------- 13 files changed, 69 insertions(+), 34 deletions(-) create mode 100644 _sass/main.bundle.scss create mode 100644 purgecss.config.js diff --git a/.gitignore b/.gitignore index 3f4427c27f6..d6bf5096400 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,10 @@ package-lock.json # IDE configurations .idea +.vscode +!.vscode/settings.json +!.vscode/extensions.json # Misc +_sass/dist assets/js/dist diff --git a/_config.yml b/_config.yml index 0de0965dfc1..613b043b253 100644 --- a/_config.yml +++ b/_config.yml @@ -214,7 +214,7 @@ exclude: - tools - README.md - LICENSE - - rollup.config.js + - "*.config.js" - package*.json jekyll-archives: diff --git a/_data/origin/basic.yml b/_data/origin/basic.yml index 9f3415a7ef7..9027e6e4e82 100644 --- a/_data/origin/basic.yml +++ b/_data/origin/basic.yml @@ -4,9 +4,6 @@ webfonts: /assets/lib/fonts/main.css # Libraries -bootstrap: - css: /assets/lib/bootstrap/bootstrap.min.css - toc: css: /assets/lib/tocbot/tocbot.min.css js: /assets/lib/tocbot/tocbot.min.js diff --git a/_data/origin/cors.yml b/_data/origin/cors.yml index 220d131eeb1..abedb6c6ed4 100644 --- a/_data/origin/cors.yml +++ b/_data/origin/cors.yml @@ -19,9 +19,6 @@ webfonts: https://fonts.googleapis.com/css2?family=Lato:wght@300;400&family=Sour # Libraries -bootstrap: - css: https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css - toc: css: https://cdn.jsdelivr.net/npm/tocbot@4.25.0/dist/tocbot.min.css js: https://cdn.jsdelivr.net/npm/tocbot@4.25.0/dist/tocbot.min.js diff --git a/_includes/head.html b/_includes/head.html index 0e4725c78ac..fd260c0e22b 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -69,7 +69,9 @@ {% endunless %} - + {% unless jekyll.environment == 'production' %} + + {% endunless %} diff --git a/_posts/2019-08-09-getting-started.md b/_posts/2019-08-09-getting-started.md index 6653c62d9f4..1cea5be96a8 100644 --- a/_posts/2019-08-09-getting-started.md +++ b/_posts/2019-08-09-getting-started.md @@ -21,8 +21,8 @@ Follow the instructions in the [Jekyll Docs](https://jekyllrb.com/docs/installat There are two ways to create a new repository for this theme: -- [**Using the Chirpy Starter**](#option-1-using-the-chirpy-starter) - Easy to upgrade, isolates irrelevant project files so you can focus on writing. -- [**GitHub Fork**](#option-2-github-fork) - Convenient for custom development, but difficult to upgrade. Unless you are familiar with Jekyll and are determined to tweak or contribute to this project, this approach is not recommended. +- [**Using the Chirpy Starter**](#option-1-using-the-chirpy-starter) — Easy to upgrade, isolates irrelevant project files so you can focus on writing. +- [**GitHub Fork**](#option-2-github-fork) — Convenient for custom development, but difficult to upgrade. Unless you are familiar with Jekyll and are determined to tweak or contribute to this project, this approach is not recommended. #### Option 1. Using the Chirpy Starter @@ -32,7 +32,7 @@ Sign in to GitHub and browse to [**Chirpy Starter**][starter], click the button Sign in to GitHub to [fork **Chirpy**](https://github.com/cotes2020/jekyll-theme-chirpy/fork), and then rename it to `USERNAME.github.io` (`USERNAME` means your username). -Next, clone your site to local machine. In order to build JavaScript files later, we need to install [Node.js][nodejs], and then run the tool: +Next, clone the repository to your local machine, make sure it has [Node.js][nodejs] installed, then go to the root directory of the repo and run the following command: ```console $ bash tools/init @@ -45,7 +45,7 @@ The above command will: 1. Check out the code to the [latest tag][latest-tag] (to ensure the stability of your site: as the code for the default branch is under development). 2. Remove non-essential sample files and take care of GitHub-related files. -3. Build JavaScript files and export to `assets/js/dist/`{: .filepath }, then make them tracked by Git. +3. Build CSS/JS assets files and then make them tracked by Git. 4. Automatically create a new commit to save the changes above. ### Installing Dependencies diff --git a/_sass/main.bundle.scss b/_sass/main.bundle.scss new file mode 100644 index 00000000000..52e893feb36 --- /dev/null +++ b/_sass/main.bundle.scss @@ -0,0 +1,2 @@ +@import 'dist/bootstrap'; +@import 'main'; diff --git a/assets/css/jekyll-theme-chirpy.scss b/assets/css/jekyll-theme-chirpy.scss index 1280b9e650b..d20545ba80b 100644 --- a/assets/css/jekyll-theme-chirpy.scss +++ b/assets/css/jekyll-theme-chirpy.scss @@ -1,6 +1,10 @@ --- --- -@import 'main'; +@import 'main +{%- if jekyll.environment == 'production' -%} + .bundle +{%- endif -%} +'; /* append your custom style below */ diff --git a/assets/lib b/assets/lib index 29d7021f453..e8ef8fb673e 160000 --- a/assets/lib +++ b/assets/lib @@ -1 +1 @@ -Subproject commit 29d7021f45317d02df9a3297d3c52a30bd4ae795 +Subproject commit e8ef8fb673e88ae4404a4bc0d0f43d90bb774e60 diff --git a/package.json b/package.json index ef094a125b9..a52b377f9ee 100644 --- a/package.json +++ b/package.json @@ -13,11 +13,12 @@ }, "homepage": "https://github.com/cotes2020/jekyll-theme-chirpy/", "scripts": { - "build": "npm run build:js", + "build": "concurrently npm:build:*", + "build:css": "purgecss -c purgecss.config.js", "build:js": "rollup -c --bundleConfigAsCjs --environment BUILD:production", "watch:js": "rollup -c --bundleConfigAsCjs -w", - "lint:style": "stylelint _sass/**/*.scss", - "lint:fix:style": "npm run lint:style -- --fix", + "lint:scss": "stylelint _sass/**/*.scss", + "lint:fix:scss": "npm run lint:style -- --fix", "test": "npm run lint:scss" }, "dependencies": { @@ -37,8 +38,10 @@ "@semantic-release/changelog": "^6.0.3", "@semantic-release/exec": "^6.0.3", "@semantic-release/git": "^10.0.1", + "concurrently": "^8.2.2", "conventional-changelog-conventionalcommits": "^7.0.2", "husky": "^9.0.11", + "purgecss": "^6.0.0", "rollup": "^4.15.0", "rollup-plugin-license": "^3.3.1", "semantic-release": "^23.0.8", diff --git a/purgecss.config.js b/purgecss.config.js new file mode 100644 index 00000000000..de370dea30c --- /dev/null +++ b/purgecss.config.js @@ -0,0 +1,23 @@ +const fs = require('fs'); +const DIST_PATH = '_sass/dist'; + +fs.rm(DIST_PATH, { recursive: true, force: true }, (err) => { + if (err) { + throw err; + } + + fs.mkdirSync(DIST_PATH); +}); + +module.exports = { + content: ['_includes/**/*.html', '_layouts/**/*.html', '_javascript/**/*.js'], + css: ['node_modules/bootstrap/dist/css/bootstrap.min.css'], + keyframes: true, + variables: true, + output: `${DIST_PATH}/bootstrap.css`, + // The `safelist` should be changed appropriately for future development + safelist: { + standard: [/^collaps/, /^w-/, 'shadow', 'border', 'kbd'], + greedy: [/^col-/, /tooltip/] + } +}; diff --git a/tools/init b/tools/init index be8ac0150f5..ed478d793f7 100755 --- a/tools/init +++ b/tools/init @@ -82,7 +82,7 @@ init_files() { rm -rf "$temp" ## Cleanup image settings in site config - _sedi "s/(^.*cdn:).*/\1/;s/(^avatar:).*/\1/" _config.yml + _sedi "s/(^timezone:).*/\1/;s/(^.*cdn:).*/\1/;s/(^avatar:).*/\1/" _config.yml fi # remove the other files @@ -91,8 +91,8 @@ init_files() { # build assets npm i && npm run build - # track the js output - _sedi "/^assets.*\/dist/d" .gitignore + # track the CSS/JS output + _sedi "/.*\/dist$/d" .gitignore } commit() { diff --git a/tools/release b/tools/release index 90b18232ea6..351321a984b 100755 --- a/tools/release +++ b/tools/release @@ -15,6 +15,7 @@ NODE_SPEC="package.json" CHANGELOG="docs/CHANGELOG.md" CONFIG="_config.yml" +CSS_DIST="_sass/dist" JS_DIST="assets/js/dist" FILES=( @@ -79,17 +80,12 @@ _check_src() { done } -_check_node_packages() { - if [[ ! -d node_modules || "$(du node_modules | awk '{print $1}')" == "0" ]]; then - npm i - fi -} - -check() { +init() { _check_cli _check_git _check_src - _check_node_packages + echo -e "> npm install\n" + npm i } ## Bump new version to gem-spec file @@ -115,24 +111,31 @@ prepare() { build_gem() { if $opt_pkg; then BACKUP_PATH="$(mktemp -d)" - cp "$JS_DIST"/* "$BACKUP_PATH" + mkdir -p "$BACKUP_PATH"/css "$BACKUP_PATH"/js + [[ -d $CSS_DIST ]] && cp "$CSS_DIST"/* "$BACKUP_PATH"/css + [[ -d $JS_DIST ]] && cp "$JS_DIST"/* "$BACKUP_PATH"/js fi # Remove unnecessary theme settings - sed -i "s/^cdn:.*/cdn:/;s/^avatar:.*/avatar:/" $CONFIG + sed -i -E "s/(^timezone:).*/\1/;s/(^cdn:).*/\1/;s/(^avatar:).*/\1/" $CONFIG rm -f ./*.gem npm run build - git add "$JS_DIST" -f # add JS distribution files to gem + # add CSS/JS distribution files to gem package + git add "$CSS_DIST" "$JS_DIST" -f + + echo -e "\n> gem build $GEM_SPEC\n" gem build "$GEM_SPEC" - # resume the settings + echo -e "\n> Resume file changes ...\n" git reset git checkout . if $opt_pkg; then # restore the dist files for future development - mkdir -p "$JS_DIST" && cp "$BACKUP_PATH"/* "$JS_DIST" + mkdir -p "$CSS_DIST" "$JS_DIST" + cp "$BACKUP_PATH"/css/* "$CSS_DIST" + cp "$BACKUP_PATH"/js/* "$JS_DIST" rm -rf "$BACKUP_PATH" fi } @@ -157,7 +160,7 @@ merge() { } main() { - check + init if $opt_pre; then prepare From 75891e714fdf08d3409b0aedd24e9d7d2c80fc29 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 11 May 2024 13:51:25 +0800 Subject: [PATCH 34/47] build(deps-dev): bump the npm group across 1 directory with 6 updates Updates `@babel/core` to 7.24.5 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.24.5/packages/babel-core) Updates `@babel/preset-env` to 7.24.5 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.24.5/packages/babel-preset-env) Updates `@commitlint/cli` to 19.3.0 - [Release notes](https://github.com/conventional-changelog/commitlint/releases) - [Changelog](https://github.com/conventional-changelog/commitlint/blob/master/@commitlint/cli/CHANGELOG.md) - [Commits](https://github.com/conventional-changelog/commitlint/commits/v19.3.0/@commitlint/cli) Updates `rollup` to 4.17.2 - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](https://github.com/rollup/rollup/compare/v4.15.0...v4.17.2) Updates `semantic-release` to 23.1.1 - [Release notes](https://github.com/semantic-release/semantic-release/releases) - [Commits](https://github.com/semantic-release/semantic-release/compare/v23.0.8...v23.1.1) Updates `stylelint` to 16.5.0 - [Release notes](https://github.com/stylelint/stylelint/releases) - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md) - [Commits](https://github.com/stylelint/stylelint/compare/16.3.1...16.5.0) --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index a52b377f9ee..fb9a52417d9 100644 --- a/package.json +++ b/package.json @@ -26,10 +26,10 @@ "bootstrap": "^5.3.3" }, "devDependencies": { - "@babel/core": "^7.24.4", + "@babel/core": "^7.24.5", "@babel/plugin-transform-class-properties": "^7.24.1", - "@babel/preset-env": "^7.24.4", - "@commitlint/cli": "^19.2.2", + "@babel/preset-env": "^7.24.5", + "@commitlint/cli": "^19.3.0", "@commitlint/config-conventional": "^19.2.2", "@rollup/plugin-babel": "^6.0.4", "@rollup/plugin-node-resolve": "^15.2.3", @@ -42,10 +42,10 @@ "conventional-changelog-conventionalcommits": "^7.0.2", "husky": "^9.0.11", "purgecss": "^6.0.0", - "rollup": "^4.15.0", + "rollup": "^4.17.2", "rollup-plugin-license": "^3.3.1", - "semantic-release": "^23.0.8", - "stylelint": "^16.3.1", + "semantic-release": "^23.1.1", + "stylelint": "^16.5.0", "stylelint-config-standard-scss": "^13.1.0" }, "prettier": { From fdbd7f02e3a739fe1f87103f9afac5fe1eedc96c Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 11 May 2024 11:42:03 +0800 Subject: [PATCH 35/47] build(deps): update assets submodule --- assets/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/lib b/assets/lib index e8ef8fb673e..b9c58cf485a 160000 --- a/assets/lib +++ b/assets/lib @@ -1 +1 @@ -Subproject commit e8ef8fb673e88ae4404a4bc0d0f43d90bb774e60 +Subproject commit b9c58cf485a7dcbc833e698d67dd1850bdc93eb3 From f87fdd0ea0b52291744fae14850bbfe931282a95 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 11 May 2024 14:08:39 +0800 Subject: [PATCH 36/47] build(deps): upgrade `html-proofer` to v5.x --- .github/workflows/starter/pages-deploy.yml | 2 +- Gemfile | 16 +--------------- _posts/2019-08-08-write-a-new-post.md | 2 +- tools/test | 2 +- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/.github/workflows/starter/pages-deploy.yml b/.github/workflows/starter/pages-deploy.yml index 3d65f75b8e4..cc28f99fd25 100644 --- a/.github/workflows/starter/pages-deploy.yml +++ b/.github/workflows/starter/pages-deploy.yml @@ -53,7 +53,7 @@ jobs: - name: Test site run: | bundle exec htmlproofer _site \ - \-\-disable-external=true \ + \-\-disable-external \ \-\-ignore-urls "/^http:\/\/127.0.0.1/,/^http:\/\/0.0.0.0/,/^http:\/\/localhost/" - name: Upload site artifact diff --git a/Gemfile b/Gemfile index 043b28eec7a..672e9e4b6a5 100644 --- a/Gemfile +++ b/Gemfile @@ -5,19 +5,5 @@ source "https://rubygems.org" gemspec group :test do - gem "html-proofer", "~> 4.4" + gem "html-proofer", "~> 5.0" end - -# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem -# and associated library. -platforms :mingw, :x64_mingw, :mswin, :jruby do - gem "tzinfo", ">= 1", "< 3" - gem "tzinfo-data" -end - -# Performance-booster for watching directories on Windows -gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] - -# Lock `http_parser.rb` gem to `v0.6.x` on JRuby builds since newer versions of the gem -# do not have a Java counterpart. -gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby] diff --git a/_posts/2019-08-08-write-a-new-post.md b/_posts/2019-08-08-write-a-new-post.md index 0492b02930b..bda7705e464 100644 --- a/_posts/2019-08-08-write-a-new-post.md +++ b/_posts/2019-08-08-write-a-new-post.md @@ -337,7 +337,7 @@ image: --- ``` -> You can observe LQIP in the preview image of post [_Text and Typography_](/posts/text-and-typography/). +> You can observe LQIP in the preview image of post \"[Text and Typography](../text-and-typography/)\". For normal images: diff --git a/tools/test b/tools/test index 9fa02ad13b9..fe47d446d16 100755 --- a/tools/test +++ b/tools/test @@ -62,7 +62,7 @@ main() { # test bundle exec htmlproofer "$SITE_DIR" \ - --disable-external=true \ + --disable-external \ --ignore-urls "/^http:\/\/127.0.0.1/,/^http:\/\/0.0.0.0/,/^http:\/\/localhost/" } From b2245492e6ea63936df043dadee09d72e48d0311 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 11 May 2024 14:09:15 +0800 Subject: [PATCH 37/47] build(deps): upgrade `jekyll-compress-html` to v3.2.0 --- _layouts/compress.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_layouts/compress.html b/_layouts/compress.html index bb34487d2a7..2779e92a18e 100644 --- a/_layouts/compress.html +++ b/_layouts/compress.html @@ -1,10 +1,10 @@ --- # Jekyll layout that compresses HTML -# v3.1.0 +# v3.2.0 # http://jch.penibelst.de/ # © 2014–2015 Anatol Broder # MIT License --- {% capture _LINE_FEED %} -{% endcapture %}{% if site.compress_html.ignore.envs contains jekyll.environment or site.compress_html.ignore.envs == "all" %}{{ content }}{% else %}{% capture _content %}{{ content }}{% endcapture %}{% assign _profile = site.compress_html.profile %}{% if site.compress_html.endings == "all" %}{% assign _endings = "html head body li dt dd optgroup option colgroup caption thead tbody tfoot tr td th" | split: " " %}{% else %}{% assign _endings = site.compress_html.endings %}{% endif %}{% for _element in _endings %}{% capture _end %}{% endcapture %}{% assign _content = _content | remove: _end %}{% endfor %}{% if _profile and _endings %}{% assign _profile_endings = _content | size | plus: 1 %}{% endif %}{% for _element in site.compress_html.startings %}{% capture _start %}<{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _start %}{% endfor %}{% if _profile and site.compress_html.startings %}{% assign _profile_startings = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.comments == "all" %}{% assign _comments = "" | split: " " %}{% else %}{% assign _comments = site.compress_html.comments %}{% endif %}{% if _comments.size == 2 %}{% capture _comment_befores %}.{{ _content }}{% endcapture %}{% assign _comment_befores = _comment_befores | split: _comments.first %}{% for _comment_before in _comment_befores %}{% if forloop.first %}{% continue %}{% endif %}{% capture _comment_outside %}{% if _carry %}{{ _comments.first }}{% endif %}{{ _comment_before }}{% endcapture %}{% capture _comment %}{% unless _carry %}{{ _comments.first }}{% endunless %}{{ _comment_outside | split: _comments.last | first }}{% if _comment_outside contains _comments.last %}{{ _comments.last }}{% assign _carry = false %}{% else %}{% assign _carry = true %}{% endif %}{% endcapture %}{% assign _content = _content | remove_first: _comment %}{% endfor %}{% if _profile %}{% assign _profile_comments = _content | size | plus: 1 %}{% endif %}{% endif %}{% assign _pre_befores = _content | split: "" %}{% assign _pres_after = "" %}{% if _pres.size != 0 %}{% if site.compress_html.blanklines %}{% assign _lines = _pres.last | split: _LINE_FEED %}{% capture _pres_after %}{% for _line in _lines %}{% assign _trimmed = _line | split: " " | join: " " %}{% if _trimmed != empty or forloop.last %}{% unless forloop.first %}{{ _LINE_FEED }}{% endunless %}{{ _line }}{% endif %}{% endfor %}{% endcapture %}{% else %}{% assign _pres_after = _pres.last | split: " " | join: " " %}{% endif %}{% endif %}{% capture _content %}{{ _content }}{% if _pre_before contains "" %}{% endif %}{% unless _pre_before contains "" and _pres.size == 1 %}{{ _pres_after }}{% endunless %}{% endcapture %}{% endfor %}{% if _profile %}{% assign _profile_collapse = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.clippings == "all" %}{% assign _clippings = "html head title base link meta style body article section nav aside h1 h2 h3 h4 h5 h6 hgroup header footer address p hr blockquote ol ul li dl dt dd figure figcaption main div table caption colgroup col tbody thead tfoot tr td th" | split: " " %}{% else %}{% assign _clippings = site.compress_html.clippings %}{% endif %}{% for _element in _clippings %}{% assign _edges = " ;; ;" | replace: "e", _element | split: ";" %}{% assign _content = _content | replace: _edges[0], _edges[1] | replace: _edges[2], _edges[3] | replace: _edges[4], _edges[5] %}{% endfor %}{% if _profile and _clippings %}{% assign _profile_clippings = _content | size | plus: 1 %}{% endif %}{{ _content }}{% if _profile %}
Step Bytes
raw {{ content | size }}{% if _profile_endings %}
endings {{ _profile_endings }}{% endif %}{% if _profile_startings %}
startings {{ _profile_startings }}{% endif %}{% if _profile_comments %}
comments {{ _profile_comments }}{% endif %}{% if _profile_collapse %}
collapse {{ _profile_collapse }}{% endif %}{% if _profile_clippings %}
clippings {{ _profile_clippings }}{% endif %}
{% endif %}{% endif %} +{% endcapture %}{% if site.compress_html.ignore.envs contains jekyll.environment or site.compress_html.ignore.envs == "all" or page.compress_html == false %}{{ content }}{% else %}{% capture _content %}{{ content }}{% endcapture %}{% assign _profile = site.compress_html.profile %}{% if site.compress_html.endings == "all" %}{% assign _endings = "html head body li dt dd optgroup option colgroup caption thead tbody tfoot tr td th" | split: " " %}{% else %}{% assign _endings = site.compress_html.endings %}{% endif %}{% for _element in _endings %}{% capture _end %}{% endcapture %}{% assign _content = _content | remove: _end %}{% endfor %}{% if _profile and _endings %}{% assign _profile_endings = _content | size | plus: 1 %}{% endif %}{% for _element in site.compress_html.startings %}{% capture _start %}<{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _start %}{% endfor %}{% if _profile and site.compress_html.startings %}{% assign _profile_startings = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.comments == "all" %}{% assign _comments = "" | split: " " %}{% else %}{% assign _comments = site.compress_html.comments %}{% endif %}{% if _comments.size == 2 %}{% capture _comment_befores %}.{{ _content }}{% endcapture %}{% assign _comment_befores = _comment_befores | split: _comments.first %}{% for _comment_before in _comment_befores %}{% if forloop.first %}{% continue %}{% endif %}{% capture _comment_outside %}{% if _carry %}{{ _comments.first }}{% endif %}{{ _comment_before }}{% endcapture %}{% capture _comment %}{% unless _carry %}{{ _comments.first }}{% endunless %}{{ _comment_outside | split: _comments.last | first }}{% if _comment_outside contains _comments.last %}{{ _comments.last }}{% assign _carry = false %}{% else %}{% assign _carry = true %}{% endif %}{% endcapture %}{% assign _content = _content | remove_first: _comment %}{% endfor %}{% if _profile %}{% assign _profile_comments = _content | size | plus: 1 %}{% endif %}{% endif %}{% assign _pre_befores = _content | split: "" %}{% assign _pres_after = "" %}{% if _pres.size != 0 %}{% if site.compress_html.blanklines %}{% assign _lines = _pres.last | split: _LINE_FEED %}{% capture _pres_after %}{% for _line in _lines %}{% assign _trimmed = _line | split: " " | join: " " %}{% if _trimmed != empty or forloop.last %}{% unless forloop.first %}{{ _LINE_FEED }}{% endunless %}{{ _line }}{% endif %}{% endfor %}{% endcapture %}{% else %}{% assign _pres_after = _pres.last | split: " " | join: " " %}{% endif %}{% endif %}{% capture _content %}{{ _content }}{% if _pre_before contains "" %}{% endif %}{% unless _pre_before contains "" and _pres.size == 1 %}{{ _pres_after }}{% endunless %}{% endcapture %}{% endfor %}{% if _profile %}{% assign _profile_collapse = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.clippings == "all" %}{% assign _clippings = "html head title base link meta style body article section nav aside h1 h2 h3 h4 h5 h6 hgroup header footer address p hr blockquote ol ul li dl dt dd figure figcaption main div table caption colgroup col tbody thead tfoot tr td th" | split: " " %}{% else %}{% assign _clippings = site.compress_html.clippings %}{% endif %}{% for _element in _clippings %}{% assign _edges = " ;; ;" | replace: "e", _element | split: ";" %}{% assign _content = _content | replace: _edges[0], _edges[1] | replace: _edges[2], _edges[3] | replace: _edges[4], _edges[5] %}{% endfor %}{% if _profile and _clippings %}{% assign _profile_clippings = _content | size | plus: 1 %}{% endif %}{{ _content }}{% if _profile %}
Step Bytes
raw {{ content | size }}{% if _profile_endings %}
endings {{ _profile_endings }}{% endif %}{% if _profile_startings %}
startings {{ _profile_startings }}{% endif %}{% if _profile_comments %}
comments {{ _profile_comments }}{% endif %}{% if _profile_collapse %}
collapse {{ _profile_collapse }}{% endif %}{% if _profile_clippings %}
clippings {{ _profile_clippings }}{% endif %}
{% endif %}{% endif %} From febc01db527078c265431df6a41d644308ff903e Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 11 May 2024 14:10:23 +0800 Subject: [PATCH 38/47] docs: update supported versions of Security Policy --- docs/SECURITY.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/SECURITY.md b/docs/SECURITY.md index 5a07d266457..8d357fe5219 100644 --- a/docs/SECURITY.md +++ b/docs/SECURITY.md @@ -2,10 +2,10 @@ ## Supported Versions -| Version | Supported | -|:----------|:---------:| -| `6.x` | ✓ | -| < `6.0.0` | ✗ | +| Version | Supported | +| :--------- | :-------: | +| >= `7.0.0` | ✓ | +| <= `6.0.0` | ✗ | ## Reporting a Vulnerability From 37827d81e5809d50d602525a0b5095d5e7c93bdd Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 11 May 2024 14:24:15 +0800 Subject: [PATCH 39/47] chore: correct npm script name --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fb9a52417d9..0444667376c 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "build:js": "rollup -c --bundleConfigAsCjs --environment BUILD:production", "watch:js": "rollup -c --bundleConfigAsCjs -w", "lint:scss": "stylelint _sass/**/*.scss", - "lint:fix:scss": "npm run lint:style -- --fix", + "lint:fix:scss": "npm run lint:scss -- --fix", "test": "npm run lint:scss" }, "dependencies": { From 9ffd997c3bed893e1d2c6cc4a4f5561acc5954fc Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 11 May 2024 14:58:23 +0800 Subject: [PATCH 40/47] ci(release): skip git status check in prep phase --- tools/release | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/release b/tools/release index 351321a984b..c2ea59e1d70 100755 --- a/tools/release +++ b/tools/release @@ -56,11 +56,13 @@ _check_cli() { } _check_git() { - # ensure that changes have been committed - if [[ -n $(git status . -s) ]]; then - echo "> Abort: Commit the staged files first, and then run this tool again." - exit 1 - fi + $opt_pre || ( + # ensure that changes have been committed + if [[ -n $(git status . -s) ]]; then + echo "> Abort: Commit the staged files first, and then run this tool again." + exit 1 + fi + ) $opt_pkg || ( if [[ "$(git branch --show-current)" != "$RELEASE_BRANCH" ]]; then From e33547fe5de25269ede80685409ad1d95e29a3b2 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sat, 11 May 2024 07:30:33 +0000 Subject: [PATCH 41/47] chore(release): 7.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## [7.0.0](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v6.5.5...v7.0.0) (2024-05-11) ### ⚠ BREAKING CHANGES * optimize the resource hints (#1717) * rename media-url file and related parameters (#1651) * rename comment setting parameter (#1563) * **analytics:** add post pageviews for GoatCounter (#1543) ### Features * add cloudflare web analytics ([#1723](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1723)) ([c17fba4](https://github.com/cotes2020/jekyll-theme-chirpy/commit/c17fba44f53767c9dfaa8d92cfc6e275e5977f8a)) * add support for embed video files ([#1558](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1558)) ([9592146](https://github.com/cotes2020/jekyll-theme-chirpy/commit/9592146ca392236e69ee358412ecc32ef1662127)) * add support for giscus strict title matching ([#1614](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1614)) ([700fd5b](https://github.com/cotes2020/jekyll-theme-chirpy/commit/700fd5bad7272dd950f861e8550215cd8fafb413)) * **analytics:** add post pageviews for GoatCounter ([#1543](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1543)) ([b641b3f](https://github.com/cotes2020/jekyll-theme-chirpy/commit/b641b3f1f2e54bcfe96d8dff46d4f94186492d98)) * **analytics:** add Umami and Matomo tracking codes ([#1658](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1658)) ([61bdca2](https://github.com/cotes2020/jekyll-theme-chirpy/commit/61bdca2db45179cd0d1b4b885a4c4864e3ffa3c1)) * change site verification settings ([#1561](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1561)) ([e436387](https://github.com/cotes2020/jekyll-theme-chirpy/commit/e4363871b5be0608d2b92b8aff482825a8044c1b)) * **deps:** move `MathJax` configuration to a separate file ([#1670](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1670)) ([44f552c](https://github.com/cotes2020/jekyll-theme-chirpy/commit/44f552cbcee83d037de0e59496bf6bb19eea2691)) * display theme version in footer ([#1611](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1611)) ([8349314](https://github.com/cotes2020/jekyll-theme-chirpy/commit/834931486dc3e5ed544ce4ff47cd1b2bc45f42fd)) * **i18n:** allow `page.lang` to override `site.lang` ([#1586](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1586)) ([547b95c](https://github.com/cotes2020/jekyll-theme-chirpy/commit/547b95cc7ae35018dadcc01b6eb1dc8c8943e67e)) * make post description customizable ([#1602](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1602)) ([f865336](https://github.com/cotes2020/jekyll-theme-chirpy/commit/f865336c896e0db34edf8482a53e0e5d8f07ff95)) * **media:** support audio and video tag with multi sources ([#1618](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1618)) ([23be416](https://github.com/cotes2020/jekyll-theme-chirpy/commit/23be4162b3f8598db14dc5b39726932ccf2cdc23)) ### Bug Fixes * make TOC title and entries visible at the same time ([#1711](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1711)) ([e0950fc](https://github.com/cotes2020/jekyll-theme-chirpy/commit/e0950fc973d029dc65d0bc1bd68f3d11242527c8)) * mode toggle not outlined when receiving keyboard focus ([#1690](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1690)) ([cd37f63](https://github.com/cotes2020/jekyll-theme-chirpy/commit/cd37f63a0144e0499ea991d3309da064ad5eccea)) * prevent footnote back arrow from becoming an emoji ([#1716](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1716)) ([8608147](https://github.com/cotes2020/jekyll-theme-chirpy/commit/8608147fb5037804695d93496c62f96b9c41e9cd)) * **pwa:** skip range requests in service worker ([#1672](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1672)) ([76d58fe](https://github.com/cotes2020/jekyll-theme-chirpy/commit/76d58fe0ffdc4bd1df35b60815e97560c3564700)) * search result prompt is empty ([#1583](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1583)) ([8a2afae](https://github.com/cotes2020/jekyll-theme-chirpy/commit/8a2afae6cab8fc9639be0a866b71699c8a80084c)) * use `https` for Weibo sharing URL ([#1612](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1612)) ([8e5fbb7](https://github.com/cotes2020/jekyll-theme-chirpy/commit/8e5fbb7a74d04a4b3cdde69bcc821f8ccd1a3bc0)) ### Improvements * improve
visibility in dark mode ([#1565](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1565)) ([4ddd5c4](https://github.com/cotes2020/jekyll-theme-chirpy/commit/4ddd5c437046a1e70cf396113e2351c452a25493)) * lean bootstrap javascript ([#1734](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1734)) ([ddb48ed](https://github.com/cotes2020/jekyll-theme-chirpy/commit/ddb48eda52827aae16aff720212d7b6d2d8647f9)) * rename comment setting parameter ([#1563](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1563)) ([f8390d4](https://github.com/cotes2020/jekyll-theme-chirpy/commit/f8390d4384600fb015728b1b186570fa58ca216f)) * replace jQuery with Vanilla JS ([#1681](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1681)) ([fe7afa3](https://github.com/cotes2020/jekyll-theme-chirpy/commit/fe7afa379f0af0ca98a207f85bdc0fa98575b1ad)) * simplify mode toggle script ([#1692](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1692)) ([d4a6d64](https://github.com/cotes2020/jekyll-theme-chirpy/commit/d4a6d640bd6d4ab185faf96c0255369a9903ee1d)) * tree shaking Bootstrap CSS ([#1736](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1736)) ([363a3d9](https://github.com/cotes2020/jekyll-theme-chirpy/commit/363a3d936bbd688fa4f28527e85ef7dd3fe3a79b)) ### Changes * optimize the resource hints ([#1717](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1717)) ([dcb0add](https://github.com/cotes2020/jekyll-theme-chirpy/commit/dcb0add47bf1adf92215514f1ccfa4661d5215be)) * rename media-url file and related parameters ([#1651](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1651)) ([9f8aeaa](https://github.com/cotes2020/jekyll-theme-chirpy/commit/9f8aeaadbfef9967a9b0a9dd323d8bed46e14d9f)) --- docs/CHANGELOG.md | 46 +++++++++++++++++++++++++++++++++++++ jekyll-theme-chirpy.gemspec | 2 +- package.json | 2 +- 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 8f28580b180..777e27b277e 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,51 @@ # Changelog +## [7.0.0](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v6.5.5...v7.0.0) (2024-05-11) + +### ⚠ BREAKING CHANGES + +* optimize the resource hints (#1717) +* rename media-url file and related parameters (#1651) +* rename comment setting parameter (#1563) +* **analytics:** add post pageviews for GoatCounter (#1543) + +### Features + +* add cloudflare web analytics ([#1723](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1723)) ([c17fba4](https://github.com/cotes2020/jekyll-theme-chirpy/commit/c17fba44f53767c9dfaa8d92cfc6e275e5977f8a)) +* add support for embed video files ([#1558](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1558)) ([9592146](https://github.com/cotes2020/jekyll-theme-chirpy/commit/9592146ca392236e69ee358412ecc32ef1662127)) +* add support for giscus strict title matching ([#1614](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1614)) ([700fd5b](https://github.com/cotes2020/jekyll-theme-chirpy/commit/700fd5bad7272dd950f861e8550215cd8fafb413)) +* **analytics:** add post pageviews for GoatCounter ([#1543](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1543)) ([b641b3f](https://github.com/cotes2020/jekyll-theme-chirpy/commit/b641b3f1f2e54bcfe96d8dff46d4f94186492d98)) +* **analytics:** add Umami and Matomo tracking codes ([#1658](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1658)) ([61bdca2](https://github.com/cotes2020/jekyll-theme-chirpy/commit/61bdca2db45179cd0d1b4b885a4c4864e3ffa3c1)) +* change site verification settings ([#1561](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1561)) ([e436387](https://github.com/cotes2020/jekyll-theme-chirpy/commit/e4363871b5be0608d2b92b8aff482825a8044c1b)) +* **deps:** move `MathJax` configuration to a separate file ([#1670](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1670)) ([44f552c](https://github.com/cotes2020/jekyll-theme-chirpy/commit/44f552cbcee83d037de0e59496bf6bb19eea2691)) +* display theme version in footer ([#1611](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1611)) ([8349314](https://github.com/cotes2020/jekyll-theme-chirpy/commit/834931486dc3e5ed544ce4ff47cd1b2bc45f42fd)) +* **i18n:** allow `page.lang` to override `site.lang` ([#1586](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1586)) ([547b95c](https://github.com/cotes2020/jekyll-theme-chirpy/commit/547b95cc7ae35018dadcc01b6eb1dc8c8943e67e)) +* make post description customizable ([#1602](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1602)) ([f865336](https://github.com/cotes2020/jekyll-theme-chirpy/commit/f865336c896e0db34edf8482a53e0e5d8f07ff95)) +* **media:** support audio and video tag with multi sources ([#1618](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1618)) ([23be416](https://github.com/cotes2020/jekyll-theme-chirpy/commit/23be4162b3f8598db14dc5b39726932ccf2cdc23)) + +### Bug Fixes + +* make TOC title and entries visible at the same time ([#1711](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1711)) ([e0950fc](https://github.com/cotes2020/jekyll-theme-chirpy/commit/e0950fc973d029dc65d0bc1bd68f3d11242527c8)) +* mode toggle not outlined when receiving keyboard focus ([#1690](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1690)) ([cd37f63](https://github.com/cotes2020/jekyll-theme-chirpy/commit/cd37f63a0144e0499ea991d3309da064ad5eccea)) +* prevent footnote back arrow from becoming an emoji ([#1716](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1716)) ([8608147](https://github.com/cotes2020/jekyll-theme-chirpy/commit/8608147fb5037804695d93496c62f96b9c41e9cd)) +* **pwa:** skip range requests in service worker ([#1672](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1672)) ([76d58fe](https://github.com/cotes2020/jekyll-theme-chirpy/commit/76d58fe0ffdc4bd1df35b60815e97560c3564700)) +* search result prompt is empty ([#1583](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1583)) ([8a2afae](https://github.com/cotes2020/jekyll-theme-chirpy/commit/8a2afae6cab8fc9639be0a866b71699c8a80084c)) +* use `https` for Weibo sharing URL ([#1612](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1612)) ([8e5fbb7](https://github.com/cotes2020/jekyll-theme-chirpy/commit/8e5fbb7a74d04a4b3cdde69bcc821f8ccd1a3bc0)) + +### Improvements + +* improve \
visibility in dark mode ([#1565](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1565)) ([4ddd5c4](https://github.com/cotes2020/jekyll-theme-chirpy/commit/4ddd5c437046a1e70cf396113e2351c452a25493)) +* lean bootstrap javascript ([#1734](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1734)) ([ddb48ed](https://github.com/cotes2020/jekyll-theme-chirpy/commit/ddb48eda52827aae16aff720212d7b6d2d8647f9)) +* rename comment setting parameter ([#1563](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1563)) ([f8390d4](https://github.com/cotes2020/jekyll-theme-chirpy/commit/f8390d4384600fb015728b1b186570fa58ca216f)) +* replace jQuery with Vanilla JS ([#1681](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1681)) ([fe7afa3](https://github.com/cotes2020/jekyll-theme-chirpy/commit/fe7afa379f0af0ca98a207f85bdc0fa98575b1ad)) +* simplify mode toggle script ([#1692](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1692)) ([d4a6d64](https://github.com/cotes2020/jekyll-theme-chirpy/commit/d4a6d640bd6d4ab185faf96c0255369a9903ee1d)) +* tree shaking Bootstrap CSS ([#1736](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1736)) ([363a3d9](https://github.com/cotes2020/jekyll-theme-chirpy/commit/363a3d936bbd688fa4f28527e85ef7dd3fe3a79b)) + +### Changes + +* optimize the resource hints ([#1717](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1717)) ([dcb0add](https://github.com/cotes2020/jekyll-theme-chirpy/commit/dcb0add47bf1adf92215514f1ccfa4661d5215be)) +* rename media-url file and related parameters ([#1651](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1651)) ([9f8aeaa](https://github.com/cotes2020/jekyll-theme-chirpy/commit/9f8aeaadbfef9967a9b0a9dd323d8bed46e14d9f)) + ## [6.5.5](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v6.5.4...v6.5.5) (2024-03-23) ### Bug Fixes diff --git a/jekyll-theme-chirpy.gemspec b/jekyll-theme-chirpy.gemspec index 3b2335a2d58..88d5c4240ad 100644 --- 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.5" + spec.version = "7.0.0" spec.authors = ["Cotes Chung"] spec.email = ["cotes.chung@gmail.com"] diff --git a/package.json b/package.json index 0444667376c..00f8545330d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jekyll-theme-chirpy", - "version": "6.5.5", + "version": "7.0.0", "description": "A minimal, responsive, and feature-rich Jekyll theme for technical writing.", "repository": { "type": "git", From 9630fd647f89740d137d9a8d5aa559b44369c796 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 12 May 2024 07:35:58 +0800 Subject: [PATCH 42/47] ci(release): pass secrets to called workflow --- .github/workflows/cd.yml | 3 +++ .github/workflows/publish.yml | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 160750d6b08..d0cc84a36dd 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -35,3 +35,6 @@ jobs: publish: needs: release uses: ./.github/workflows/publish.yml + secrets: + GH_PAT: ${{ secrets.GH_PAT }} + BUILDER: ${{ secrets.BUILDER }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 20e46915167..99114ea3cb6 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -5,6 +5,11 @@ on: branches: - docs workflow_call: + secrets: + GH_PAT: + required: true + BUILDER: + required: true jobs: launch: From c4b58e350265362e1e78119bea9529fc0fcf20cc Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Fri, 17 May 2024 00:03:53 +0800 Subject: [PATCH 43/47] build: upgrade dependencies Updates `@fortawesome/fontawesome-free` to 6.5.2 - [Release notes](https://github.com/FortAwesome/Font-Awesome/releases) - [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md) - [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.5.1...6.5.2) Updates `dayjs` to 1.11.11 - [Release notes](https://github.com/iamkun/dayjs/releases) - [Changelog](https://github.com/iamkun/dayjs/blob/dev/CHANGELOG.md) - [Commits](https://github.com/iamkun/dayjs/compare/v1.11.10...v1.11.11) Updates `mermaid` 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.8.0...v10.9.0) Updates `tocbot` to 4.27.20 - [Release notes](https://github.com/tscanlin/tocbot/releases) - [Changelog](https://github.com/tscanlin/tocbot/blob/master/CHANGELOG.md) - [Commits](https://github.com/tscanlin/tocbot/compare/v4.25.0...v4.27.20) --- _data/origin/cors.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/_data/origin/cors.yml b/_data/origin/cors.yml index abedb6c6ed4..18806665698 100644 --- a/_data/origin/cors.yml +++ b/_data/origin/cors.yml @@ -20,24 +20,24 @@ webfonts: https://fonts.googleapis.com/css2?family=Lato:wght@300;400&family=Sour # Libraries toc: - css: https://cdn.jsdelivr.net/npm/tocbot@4.25.0/dist/tocbot.min.css - js: https://cdn.jsdelivr.net/npm/tocbot@4.25.0/dist/tocbot.min.js + css: https://cdn.jsdelivr.net/npm/tocbot@4.27.20/dist/tocbot.min.css + js: https://cdn.jsdelivr.net/npm/tocbot@4.27.20/dist/tocbot.min.js fontawesome: - css: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.1/css/all.min.css + css: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.2/css/all.min.css search: js: https://cdn.jsdelivr.net/npm/simple-jekyll-search@1.10.0/dest/simple-jekyll-search.min.js mermaid: - js: https://cdn.jsdelivr.net/npm/mermaid@10.8.0/dist/mermaid.min.js + js: https://cdn.jsdelivr.net/npm/mermaid@10.9.0/dist/mermaid.min.js dayjs: js: - common: https://cdn.jsdelivr.net/npm/dayjs@1.11.10/dayjs.min.js - locale: https://cdn.jsdelivr.net/npm/dayjs@1.11.10/locale/:LOCALE.min.js - relativeTime: https://cdn.jsdelivr.net/npm/dayjs@1.11.10/plugin/relativeTime.min.js - localizedFormat: https://cdn.jsdelivr.net/npm/dayjs@1.11.10/plugin/localizedFormat.min.js + common: https://cdn.jsdelivr.net/npm/dayjs@1.11.11/dayjs.min.js + locale: https://cdn.jsdelivr.net/npm/dayjs@1.11.11/locale/:LOCALE.min.js + relativeTime: https://cdn.jsdelivr.net/npm/dayjs@1.11.11/plugin/relativeTime.min.js + localizedFormat: https://cdn.jsdelivr.net/npm/dayjs@1.11.11/plugin/localizedFormat.min.js glightbox: css: https://cdn.jsdelivr.net/npm/glightbox@3.3.0/dist/css/glightbox.min.css From 5cdde7dbc5d2ae7dfba4fd53e2991d3acc2a073d Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Fri, 17 May 2024 20:11:08 +0800 Subject: [PATCH 44/47] ci: enable ci/style-lint for the `hotfix` branches --- .github/workflows/ci.yml | 1 + .github/workflows/style-lint.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 078e4f13e11..fa8d0c9ee05 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,6 +3,7 @@ on: push: branches: - "master" + - "hotfix/**" paths-ignore: - ".github/**" - "!.github/workflows/ci.yml" diff --git a/.github/workflows/style-lint.yml b/.github/workflows/style-lint.yml index 89eeaeffe0f..a2cf4f69b7a 100644 --- a/.github/workflows/style-lint.yml +++ b/.github/workflows/style-lint.yml @@ -2,7 +2,7 @@ name: "Style Lint" on: push: - branches: ["master"] + branches: ["master", "hotfix/**"] paths: ["_sass/**/*.scss"] pull_request: paths: ["_sass/**/*.scss"] From 00a27a1b85f665d0642b77babd54c6903fbdeb22 Mon Sep 17 00:00:00 2001 From: Alexander Fuks Date: Sat, 18 May 2024 14:47:12 +0400 Subject: [PATCH 45/47] fix: audio/video path apply variable `media_subpath` (#1745) --- _includes/embed/audio.html | 2 +- _includes/embed/video.html | 2 +- _posts/2019-08-08-write-a-new-post.md | 331 ++++++++++++-------------- 3 files changed, 152 insertions(+), 183 deletions(-) diff --git a/_includes/embed/audio.html b/_includes/embed/audio.html index e2b897901e2..cf928a7f835 100644 --- a/_includes/embed/audio.html +++ b/_includes/embed/audio.html @@ -4,7 +4,7 @@ {% unless src contains '://' %} {%- capture src -%} - {% include media-url.html src=src %} + {% include media-url.html src=src subpath=page.media_subpath %} {%- endcapture -%} {% endunless %} diff --git a/_includes/embed/video.html b/_includes/embed/video.html index 712a266a345..9b6918f7b57 100644 --- a/_includes/embed/video.html +++ b/_includes/embed/video.html @@ -5,7 +5,7 @@ {% unless video_url contains '://' %} {%- capture video_url -%} - {% include media-url.html src=video_url %} + {% include media-url.html src=video_url subpath=page.media_subpath %} {%- endcapture -%} {% endunless %} diff --git a/_posts/2019-08-08-write-a-new-post.md b/_posts/2019-08-08-write-a-new-post.md index bda7705e464..e6259ba3bf9 100644 --- a/_posts/2019-08-08-write-a-new-post.md +++ b/_posts/2019-08-08-write-a-new-post.md @@ -107,76 +107,35 @@ comments: false --- ``` -## Mathematics - -We use [**MathJax**][mathjax] to generate mathematics. For website performance reasons, the mathematical feature won't be loaded by default. But it can be enabled by: - -[mathjax]: https://www.mathjax.org/ +## Media -```yaml ---- -math: true ---- -``` +We refer to images, audio and video as media resources in _Chirpy_. -After enabling the mathematical feature, you can add math equations with the following syntax: +### URL Prefix -- **Block math** should be added with `$$ math $$` with **mandatory** blank lines before and after `$$` - - **Inserting equation numbering** should be added with `$$\begin{equation} math \end{equation}$$` - - **Referencing equation numbering** should be done with `\label{eq:label_name}` in the equation block and `\eqref{eq:label_name}` inline with text (see example below) -- **Inline math** (in lines) should be added with `$$ math $$` without any blank line before or after `$$` -- **Inline math** (in lists) should be added with `\$$ math $$` +From time to time we have to define duplicate URL prefixes for multiple resources in a post, which is a boring task that you can avoid by setting two parameters. -```markdown - - -$$ -LaTeX_math_expression -$$ - - - -$$ -\begin{equation} - LaTeX_math_expression - \label{eq:label_name} -\end{equation} -$$ +- If you are using a CDN to host media files, you can specify the `cdn` in `_config.yml`{: .filepath }. The URLs of media resources for site avatar and posts are then prefixed with the CDN domain name. -Can be referenced as \eqref{eq:label_name}. - - - -"Lorem ipsum dolor sit amet, $$ LaTeX_math_expression $$ consectetur adipiscing elit." - - - -1. \$$ LaTeX_math_expression $$ -2. \$$ LaTeX_math_expression $$ -3. \$$ LaTeX_math_expression $$ -``` - -> Starting with `v7.0.0`, configuration options for **MathJax** have been moved to file `assets/js/data/mathjax.js`{: .filepath }, and you can change the options as needed, such as adding [extensions][mathjax-exts]. -> If you are building the site via `chirpy-starter`, copy that file from the gem installation directory (check with command `bundle info --path jekyll-theme-chirpy`) to the same directory in your repository. -{: .prompt-tip } - -[mathjax-exts]: https://docs.mathjax.org/en/latest/input/tex/extensions/index.html - -## Mermaid + ```yaml + cdn: https://cdn.com + ``` + {: file='_config.yml' .nolineno } -[**Mermaid**](https://github.com/mermaid-js/mermaid) is a great diagram generation tool. To enable it on your post, add the following to the YAML block: +- To specify the resource path prefix for the current post/page range, set `media_subpath` in the _front matter_ of the post: -```yaml ---- -mermaid: true ---- -``` + ```yaml + --- + media_subpath: /path/to/media/ + --- + ``` + {: .nolineno } -Then you can use it like other markdown languages: surround the graph code with ```` ```mermaid ```` and ```` ``` ````. +The option `site.cdn` and `page.media_subpath` can be used individually or in combination to flexibly compose the final resource URL: `[site.cdn/][page.media_subpath/]file.ext` -## Images +### Images -### Caption +#### Caption Add italics to the next line of an image, then it will become the caption and appear at the bottom of the image: @@ -186,7 +145,7 @@ _Image Caption_ ``` {: .nolineno} -### Size +#### Size In order to prevent the page content layout from shifting when the image is loaded, we should set the width and height for each image. @@ -205,7 +164,7 @@ Starting from _Chirpy v5.0.0_, `height` and `width` support abbreviations (`heig ``` {: .nolineno} -### Position +#### Position By default, the image is centered, but you can specify the position by using one of the classes `normal`, `left`, and `right`. @@ -235,7 +194,7 @@ By default, the image is centered, but you can specify the position by using one ``` {: .nolineno} -### Dark/Light mode +#### Dark/Light mode You can make images follow theme preferences in dark/light mode. This requires you to prepare two images, one for dark mode and one for light mode, and then assign them a specific class (`dark` or `light`): @@ -244,7 +203,7 @@ You can make images follow theme preferences in dark/light mode. This requires y ![Dark mode only](/path/to/dark-mode.png){: .dark } ``` -### Shadow +#### Shadow The screenshots of the program window can be considered to show the shadow effect: @@ -253,56 +212,7 @@ The screenshots of the program window can be considered to show the shadow effec ``` {: .nolineno} -### CDN URL - -If you host the media resources on the CDN, you can save the time of repeatedly writing the CDN URL by assigning the variable `cdn` of `_config.yml`{: .filepath} file: - -```yaml -cdn: https://cdn.com -``` -{: file='_config.yml' .nolineno} - -Once `cdn` is assigned, the CDN URL will be added to the path of all media resources (site avatar, posts' images, audio and video files) starting with `/`. - -For instance, when using images: - -```markdown -![The flower](/path/to/flower.png) -``` -{: .nolineno} - -The parsing result will automatically add the CDN prefix `https://cdn.com` before the image path: - -```html -The flower -``` -{: .nolineno } - -### Media Subpath - -When a post contains many images, it will be a time-consuming task to repeatedly define the path of the media resources. To solve this, we can define this path in the YAML block of the post: - -```yml ---- -media_subpath: /img/path/ ---- -``` - -And then, the image source of Markdown can write the file name directly: - -```md -![The flower](flower.png) -``` -{: .nolineno } - -The output will be: - -```html -The flower -``` -{: .nolineno } - -### Preview Image +#### Preview Image If you want to add an image at the top of the post, please provide an image with a resolution of `1200 x 630`. Please note that if the image aspect ratio does not meet `1.91 : 1`, the image will be scaled and cropped. @@ -316,7 +226,7 @@ image: --- ``` -Note that the [`media_subpath`](#media-subpath) can also be passed to the preview image, that is, when it has been set, the attribute `path` only needs the image file name. +Note that the [`media_subpath`](#url-prefix) can also be passed to the preview image, that is, when it has been set, the attribute `path` only needs the image file name. For simple use, you can also just use `image` to define the path. @@ -326,7 +236,7 @@ image: /path/to/image --- ``` -### LQIP +#### LQIP For preview images: @@ -346,6 +256,86 @@ For normal images: ``` {: .nolineno } +### Video + +#### Social Media Platform + +You can embed videos from social media platforms with the following syntax: + +```liquid +{% include embed/{Platform}.html id='{ID}' %} +``` + +Where `Platform` is the lowercase of the platform name, and `ID` is the video ID. + +The following table shows how to get the two parameters we need in a given video URL, and you can also know the currently supported video platforms. + +| Video URL | Platform | ID | +| -------------------------------------------------------------------------------------------------- | ---------- | :------------- | +| [https://www.**youtube**.com/watch?v=**H-B46URT4mg**](https://www.youtube.com/watch?v=H-B46URT4mg) | `youtube` | `H-B46URT4mg` | +| [https://www.**twitch**.tv/videos/**1634779211**](https://www.twitch.tv/videos/1634779211) | `twitch` | `1634779211` | +| [https://www.**bilibili**.com/video/**BV1Q44y1B7Wf**](https://www.bilibili.com/video/BV1Q44y1B7Wf) | `bilibili` | `BV1Q44y1B7Wf` | + +#### Video Files + +If you want to embed a video file directly, use the following syntax: + +```liquid +{% include embed/video.html src='{URL}' %} +``` + +Where `URL` is an URL to a video file e.g. `/path/to/sample/video.mp4`. + +You can also specify additional attributes for the embedded video file. Here is a full list of attributes allowed. + +- `poster='/path/to/poster.png'` — poster image for a video that is shown while video is downloading +- `title='Text'` — title for a video that appears below the video and looks same as for images +- `autoplay=true` — video automatically begins to play back as soon as it can +- `loop=true` — automatically seek back to the start upon reaching the end of the video +- `muted=true` — audio will be initially silenced +- `types` — specify the extensions of additional video formats separated by `|`. Ensure these files exist in the same directory as your primary video file. + +Consider an example utilizing all of the above: + +```liquid +{% + include embed/video.html + src='/path/to/video.mp4' + types='ogg|mov' + poster='poster.png' + title='Demo video' + autoplay=true + loop=true + muted=true +%} +``` + +### Audios + +If you want to embed an audio file directly, use the following syntax: + +```liquid +{% include embed/audio.html src='{URL}' %} +``` + +Where `URL` is an URL to an audio file e.g. `/path/to/audio.mp3`. + +You can also specify additional attributes for the embedded audio file. Here is a full list of attributes allowed. + +- `title='Text'` — title for an audio that appears below the audio and looks same as for images +- `types` — specify the extensions of additional audio formats separated by `|`. Ensure these files exist in the same directory as your primary audio file. + +Consider an example utilizing all of the above: + +```liquid +{% + include embed/audio.html + src='/path/to/audio.mp3' + types='ogg|wav|aac' + title='Demo audio' +%} +``` + ## Pinned Posts You can pin one or more posts to the top of the home page, and the fixed posts are sorted in reverse order according to their release date. Enable by: @@ -443,95 +433,74 @@ If you want to display the **Liquid** snippet, surround the liquid code with `{% Or adding `render_with_liquid: false` (Requires Jekyll 4.0 or higher) to the post's YAML block. -## Videos - -### Video Sharing Platform - -You can embed a video with the following syntax: - -```liquid -{% include embed/{Platform}.html id='{ID}' %} ``` -Where `Platform` is the lowercase of the platform name, and `ID` is the video ID. - -The following table shows how to get the two parameters we need in a given video URL, and you can also know the currently supported video platforms. - -| Video URL | Platform | ID | -| -------------------------------------------------------------------------------------------------- | ---------- | :------------- | -| [https://www.**youtube**.com/watch?v=**H-B46URT4mg**](https://www.youtube.com/watch?v=H-B46URT4mg) | `youtube` | `H-B46URT4mg` | -| [https://www.**twitch**.tv/videos/**1634779211**](https://www.twitch.tv/videos/1634779211) | `twitch` | `1634779211` | -| [https://www.**bilibili**.com/video/**BV1Q44y1B7Wf**](https://www.bilibili.com/video/BV1Q44y1B7Wf) | `bilibili` | `BV1Q44y1B7Wf` | +## Mathematics -### Video File +We use [**MathJax**][mathjax] to generate mathematics. For website performance reasons, the mathematical feature won't be loaded by default. But it can be enabled by: -If you want to embed a video file directly, use the following syntax: +[mathjax]: https://www.mathjax.org/ -```liquid -{% include embed/video.html src='{URL}' %} +```yaml +--- +math: true +--- ``` -Where `URL` is an URL to a video file e.g. `/assets/img/sample/video.mp4`. +After enabling the mathematical feature, you can add math equations with the following syntax: -You can also specify additional attributes for the embedded video file. Here is a full list of attributes allowed. +- **Block math** should be added with `$$ math $$` with **mandatory** blank lines before and after `$$` + - **Inserting equation numbering** should be added with `$$\begin{equation} math \end{equation}$$` + - **Referencing equation numbering** should be done with `\label{eq:label_name}` in the equation block and `\eqref{eq:label_name}` inline with text (see example below) +- **Inline math** (in lines) should be added with `$$ math $$` without any blank line before or after `$$` +- **Inline math** (in lists) should be added with `\$$ math $$` -- `poster='/path/to/poster.png'` - poster image for a video that is shown while video is downloading -- `title='Text'` - title for a video that appears below the video and looks same as for images -- `autoplay=true` - video automatically begins to play back as soon as it can -- `loop=true` - automatically seek back to the start upon reaching the end of the video -- `muted=true` - audio will be initially silenced -- `types` - specify the extensions of additional video formats separated by `|`. Ensure these files exist in the same directory as your primary video file. +```markdown + -Consider an example utilizing all of the above: +$$ +LaTeX_math_expression +$$ -```liquid -{% - include embed/video.html - src='/path/to/video/video.mp4' - types='ogg|mov' - poster='poster.png' - title='Demo video' - autoplay=true - loop=true - muted=true -%} -``` + -> It's not recommended to host video files in `assets` folder as they cannot be cached by PWA and may cause issues. -> Instead, use CDN to host video files. Alternatively, use a separate folder that is excluded from PWA (see `pwa.deny_paths` setting in `_config.yml`). -{: .prompt-warning } +$$ +\begin{equation} + LaTeX_math_expression + \label{eq:label_name} +\end{equation} +$$ + +Can be referenced as \eqref{eq:label_name}. -## Audios + -### Audio File +"Lorem ipsum dolor sit amet, $$ LaTeX_math_expression $$ consectetur adipiscing elit." -If you want to embed an audio file directly, use the following syntax: + -```liquid -{% include embed/audio.html src='{URL}' %} +1. \$$ LaTeX_math_expression $$ +2. \$$ LaTeX_math_expression $$ +3. \$$ LaTeX_math_expression $$ ``` -Where `URL` is an URL to an audio file e.g. `/assets/img/sample/audio.mp3`. +> Starting with `v7.0.0`, configuration options for **MathJax** have been moved to file `assets/js/data/mathjax.js`{: .filepath }, and you can change the options as needed, such as adding [extensions][mathjax-exts]. +> If you are building the site via `chirpy-starter`, copy that file from the gem installation directory (check with command `bundle info --path jekyll-theme-chirpy`) to the same directory in your repository. +{: .prompt-tip } -You can also specify additional attributes for the embedded audio file. Here is a full list of attributes allowed. +[mathjax-exts]: https://docs.mathjax.org/en/latest/input/tex/extensions/index.html -- `title='Text'` - title for an audio that appears below the audio and looks same as for images -- `types` - specify the extensions of additional audio formats separated by `|`. Ensure these files exist in the same directory as your primary audio file. +## Mermaid -Consider an example utilizing all of the above: +[**Mermaid**](https://github.com/mermaid-js/mermaid) is a great diagram generation tool. To enable it on your post, add the following to the YAML block: -```liquid -{% - include embed/audio.html - src='/path/to/audio/audio.mp3' - types='ogg|wav|aac' - title='Demo audio' -%} +```yaml +--- +mermaid: true +--- ``` -> It's not recommended to host audio files in `assets` folder as they cannot be cached by PWA and may cause issues. -> Instead, use CDN to host audio files. Alternatively, use a separate folder that is excluded from PWA (see `pwa.deny_paths` setting in `_config.yml`). -{: .prompt-warning } +Then you can use it like other markdown languages: surround the graph code with ```` ```mermaid ```` and ```` ``` ````. ## Learn More From 33a1fa7cae2181625e2f335708d59de4dd20ee7d Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 18 May 2024 18:52:45 +0800 Subject: [PATCH 46/47] fix(analytics): goatcounter pv greater than 1K cannot be converted to numbers (#1762) The goatcounter PV report splits numbers with spaces, e.g. 1024 would be '1 024' --- _includes/pageviews/goatcounter.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_includes/pageviews/goatcounter.html b/_includes/pageviews/goatcounter.html index af536dbdd7c..e62fd698d9b 100644 --- a/_includes/pageviews/goatcounter.html +++ b/_includes/pageviews/goatcounter.html @@ -9,7 +9,8 @@ fetch(url) .then((response) => response.json()) .then((data) => { - pv.innerText = new Intl.NumberFormat().format(data.count); + const count = data.count.replace(/\s/g, ''); + pv.innerText = new Intl.NumberFormat().format(count); }) .catch((error) => { pv.innerText = '1'; From 20987f2afe033cf9af8d6b534079b5bd06f6a30f Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sat, 18 May 2024 11:01:22 +0000 Subject: [PATCH 47/47] chore(release): 7.0.1 ## [7.0.1](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.0.0...v7.0.1) (2024-05-18) ### Bug Fixes * **analytics:** goatcounter pv greater than 1K cannot be converted to numbers ([#1762](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1762)) ([33a1fa7](https://github.com/cotes2020/jekyll-theme-chirpy/commit/33a1fa7cae2181625e2f335708d59de4dd20ee7d)) * audio/video path apply variable `media_subpath` ([#1745](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1745)) ([00a27a1](https://github.com/cotes2020/jekyll-theme-chirpy/commit/00a27a1b85f665d0642b77babd54c6903fbdeb22)) --- docs/CHANGELOG.md | 7 +++++++ jekyll-theme-chirpy.gemspec | 2 +- package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 777e27b277e..abe0a1783c9 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [7.0.1](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.0.0...v7.0.1) (2024-05-18) + +### Bug Fixes + +* **analytics:** goatcounter pv greater than 1K cannot be converted to numbers ([#1762](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1762)) ([33a1fa7](https://github.com/cotes2020/jekyll-theme-chirpy/commit/33a1fa7cae2181625e2f335708d59de4dd20ee7d)) +* audio/video path apply variable `media_subpath` ([#1745](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1745)) ([00a27a1](https://github.com/cotes2020/jekyll-theme-chirpy/commit/00a27a1b85f665d0642b77babd54c6903fbdeb22)) + ## [7.0.0](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v6.5.5...v7.0.0) (2024-05-11) ### ⚠ BREAKING CHANGES diff --git a/jekyll-theme-chirpy.gemspec b/jekyll-theme-chirpy.gemspec index 88d5c4240ad..91d618c156f 100644 --- 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 = "7.0.0" + spec.version = "7.0.1" spec.authors = ["Cotes Chung"] spec.email = ["cotes.chung@gmail.com"] diff --git a/package.json b/package.json index 00f8545330d..8600aa4ee5e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jekyll-theme-chirpy", - "version": "7.0.0", + "version": "7.0.1", "description": "A minimal, responsive, and feature-rich Jekyll theme for technical writing.", "repository": { "type": "git",