Update critical file(s) according to Chirpy v5.5.2

.editorconfig

@@ -2,10 +2,15 @@ root = true
 
 [*]
 charset = utf-8
-# 2 space indentation
 indent_style = space
 indent_size = 2
 trim_trailing_whitespace = true
 # Unix-style newlines with a newline ending every file
 end_of_line = lf
 insert_final_newline = true
+
+[*.js]
+indent_size = 4
+
+[*.md]
+trim_trailing_whitespace = false

.github/workflows/pages-deploy.yml

@@ -1,29 +1,71 @@
-name: 'Automatic build'
+name: "Build and Deploy"
 on:
   push:
     branches:
       - main
+      - master
     paths-ignore:
       - .gitignore
       - README.md
       - LICENSE
 
-jobs:
+  # Allows you to run this workflow manually from the Actions tab
-  continuous-delivery:
+  workflow_dispatch:
 
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow one concurrent deployment
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+jobs:
+  build:
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
-          fetch-depth: 0  # for posts's lastmod
+          fetch-depth: 0
+          # submodules: true
+          # If using the 'assets' git submodule from Chirpy Starter, uncomment above
+          # (See: https://github.com/cotes2020/chirpy-starter/tree/main/assets)
+
+      - name: Setup Pages
+        id: pages
+        uses: actions/configure-pages@v1
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3   # reads from a '.ruby-version' or '.tools-version' file if 'ruby-version' is omitted
           bundler-cache: true
 
-      - name: Deploy
+      - name: Build site
-        run: bash tools/deploy.sh
+        run: bundle exec jekyll b -d "_site${{ steps.pages.outputs.base_path }}"
+        env:
+          JEKYLL_ENV: "production"
+
+      - name: Test site
+        run: |
+          bundle exec htmlproofer _site --disable-external --check-html --allow_hash_href
+
+      - name: Upload site artifact
+        uses: actions/upload-pages-artifact@v1
+        with:
+          path: "_site${{ steps.pages.outputs.base_path }}"
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v1

.gitignore

@@ -3,11 +3,15 @@
 !.git*
 !.editorconfig
 !.nojekyll
-!.travis.yml
+!.husky
+!.commitlintrc.json
+!.versionrc.json
+!.stylelintrc.json
 
 # bundler cache
 _site
 vendor
+Gemfile.lock
 
 # rubygem
 *.gem

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "assets/lib"]
+	path = assets/lib
+	url = https://github.com/cotes2020/chirpy-static-assets.git

Gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "jekyll-theme-chirpy", "~> 4.3", ">= 4.3.4"
+gem "jekyll-theme-chirpy", "~> 5.5", ">= 5.5.2"
 
 group :test do
   gem "html-proofer", "~> 3.18"
@@ -10,13 +10,19 @@ end
 
 # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
 # and associated library.
-install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do
+platforms :mingw, :x64_mingw, :mswin, :jruby do
-  gem "tzinfo", "~> 1.2"
+  gem "tzinfo", ">= 1", "< 3"
   gem "tzinfo-data"
 end
 
 # Performance-booster for watching directories on Windows
-gem "wdm", "~> 0.1.1", :install_if => Gem.win_platform?
+gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
 
-# Jekyll <= 4.2.0 compatibility with Ruby 3.0
+# Lock `http_parser.rb` gem to `v0.6.x` on JRuby builds since newer versions of the gem
-gem "webrick", "~> 1.7"
+# do not have a Java counterpart.
+gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby]
+
+# Lock jekyll-sass-converter to 2.x on Linux-musl
+if RUBY_PLATFORM =~ /linux-musl/
+  gem "jekyll-sass-converter", "~> 2.0"
+end

README.md

@@ -1,21 +1,20 @@
 # Chirpy Starter [![Gem Version](https://img.shields.io/gem/v/jekyll-theme-chirpy)](https://rubygems.org/gems/jekyll-theme-chirpy) [![GitHub license](https://img.shields.io/github/license/cotes2020/chirpy-starter.svg?color=blue)][mit]
 
-When installing the [**Chirpy**][chirpy] theme through [RubyGems.org][gem], Jekyll can only read files in the folders `_includes`, `_layout`, `_sass` and `assets`, as well as a small part of options of the `_config.yml` file from the theme's gem. If you have ever installed this theme gem, you can use the command `bundle info --path jekyll-theme-chirpy` to locate these files.
+When installing the [**Chirpy**][chirpy] theme through [RubyGems.org][gem], Jekyll can only read files in the folders `/_data`, `/_layouts`, `/_includes`, `/_sass` and `/assets`, as well as a small part of options of the `/_config.yml` file from the theme's gem. If you have ever installed this theme gem, you can use the command `bundle info --path jekyll-theme-chirpy` to locate these files.
 
-The Jekyll organization claims that this is to leave the ball in the user’s court, but this also results in users not being able to enjoy the out-of-the-box experience when using feature-rich themes.
+The Jekyll team claims that this is to leave the ball in the user’s court, but this also results in users not being able to enjoy the out-of-the-box experience when using feature-rich themes.
 
 To fully use all the features of **Chirpy**, you need to copy the other critical files from the theme's gem to your Jekyll site. The following is a list of targets:
 
 ```shell
 .
 ├── _config.yml
-├── _data
 ├── _plugins
 ├── _tabs
 └── index.html
 ```
 
-In order to save your time, and to prevent you from missing some files when copying, we extract those files/configurations of the latest version of the **Chirpy** theme and the [CD][CD] workflow to here, so that you can start writing in minutes.
+To save you time, and also in case you lose some files while copying, we extract those files/configurations of the latest version of the **Chirpy** theme and the [CD][CD] workflow to here, so that you can start writing in minutes.
 
 ## Prerequisites
 
@@ -33,7 +32,7 @@ $ bundle
 
 ## Usage
 
-Please see the [theme's docs](https://github.com/cotes2020/jekyll-theme-chirpy#usage).
+Please see the [theme's docs](https://github.com/cotes2020/jekyll-theme-chirpy#documentation).
 
 ## License
 

_config.yml

@@ -12,8 +12,9 @@ baseurl: ''
 # otherwise, the layout language will use the default value of 'en'.
 lang: en
 
+
 # Change to your timezone › http://www.timezoneconverter.com/cgi-bin/findzone/findzone
-timezone: Asia/Shanghai
+timezone:
 
 # jekyll-seo-tag settings › https://github.com/jekyll/jekyll-seo-tag/blob/master/docs/usage.md
 # ↓ --------------------------
@@ -23,9 +24,7 @@ title: Chirpy                          # the main title
 tagline: A text-focused Jekyll theme   # it will display as the sub-title
 
 description: >-                        # used by seo meta and the atom feed
-  A minimal, portfolio, sidebar,
+  A minimal, responsive, and powerful Jekyll theme for presenting professional writing.
-  bootstrap Jekyll theme with responsive web design
-  and focuses on text presentation.
 
 # fill in the protocol & hostname for your site, e.g., 'https://username.github.io'
 url: ''
@@ -40,7 +39,7 @@ social:
   # Change to your full name.
   # It will be displayed as the default author of the posts and the copyright owner in the Footer
   name: your_full_name
-  email: example@doamin.com             # change to your email address
+  email: example@domain.com             # change to your email address
   links:
     # The first element serves as the copyright owner's link
     - https://twitter.com/username      # change to your twitter homepage
@@ -49,13 +48,13 @@ social:
     # - https://www.facebook.com/username
     # - https://www.linkedin.com/in/username
 
-google_site_verification: google_meta_tag_verification # change to your verification string
+google_site_verification:               # fill in to your verification string
 
 # ↑ --------------------------
-
+# The end of `jekyll-seo-tag` settings
 
 google_analytics:
-  id: ''              # fill in your Google Analytics ID
+  id:                 # fill in your Google Analytics ID
   # Google Analytics pageviews report settings
   pv:
     proxy_endpoint:   # fill in the Google Analytics superProxy endpoint of Google App Engine
@@ -87,9 +86,36 @@ avatar:
 # boolean type, the global switch for ToC in posts.
 toc: true
 
-disqus:
+comments:
-  comments: false  # boolean type, the global switch for posts comments.
+  active:         # The global switch for posts comments, e.g., 'disqus'.  Keep it empty means disable
-  shortname: ''    # Fill with your Disqus shortname. › https://help.disqus.com/en/articles/1717111-what-s-a-shortname
+  # The active options are as follows:
+  disqus:
+    shortname:    # fill with the Disqus shortname. › https://help.disqus.com/en/articles/1717111-what-s-a-shortname
+  # utterances settings › https://utteranc.es/
+  utterances:
+    repo:         # <gh-username>/<repo>
+    issue_term:   # < url | pathname | title | ...>
+  # Giscus options › https://giscus.app
+  giscus:
+    repo:              # <gh-username>/<repo>
+    repo_id:
+    category:
+    category_id:
+    mapping:           # optional, default to 'pathname'
+    input_position:    # optional, default to 'bottom'
+    lang:              # optional, default to the value of `site.lang`
+    reactions_enabled: # optional, default to the value of `1`
+
+# Self-hosted static assets, optional › https://github.com/cotes2020/chirpy-static-assets
+assets:
+  self_host:
+    enabled:      # boolean, keep empty means false
+    # specify the Jekyll environment, empty means both
+    # only works if `assets.self_host.enabled` is 'true'
+    env:          # [development|production]
+
+pwa:
+  enabled: true   # the option for PWA feature
 
 paginate: 10
 
@@ -111,10 +137,8 @@ collections:
     output: true
     sort_by: order
 
-
 defaults:
-  -
+  - scope:
-    scope:
       path: ''          # An empty string here means all files in the project
       type: posts
     values:
@@ -124,19 +148,24 @@ defaults:
       # DO NOT modify the following parameter unless you are confident enough
       # to update the code of all other post links in this project.
       permalink: /posts/:title/
-  -
+  - scope:
-    scope:
       path: _drafts
     values:
       comments: false
-  -
+  - scope:
-    scope:
       path: ''
       type: tabs             # see `site.collections`
     values:
       layout: page
       permalink: /:title/
-      dynamic_title: true    # Hide title in mobile screens.
+  - scope:
+      path: assets/img/favicons
+    values:
+      swcache: true
+  - scope:
+      path: assets/js/dist
+    values:
+      swcache: true
 
 sass:
   style: compressed
@@ -154,8 +183,8 @@ exclude:
   - '*.gem'
   - '*.gemspec'
   - tools
-  - docs
   - README.md
+  - CHANGELOG.md
   - LICENSE
   - gulpfile.js
   - node_modules

_data/contact.yml

@@ -19,7 +19,7 @@
 # -
 #   type: mastodon
 #   icon: 'fab fa-mastodon'   # icons powered by <https://fontawesome.com/>
-#   url:  ''                  # Fill with your mastodon account page
+#   url:  ''                  # Fill with your Mastodon account page, rel="me" will be applied for verification
 # -
 #   type: linkedin
 #   icon: 'fab fa-linkedin'   # icons powered by <https://fontawesome.com/>

_data/locales/en.yml

@@ -1,90 +0,0 @@
-# The layout text of site
-
-# ----- Commons label -----
-
-layout:
-  post: Post
-  category: Category
-  tag: Tag
-
-# The tabs of sidebar
-tabs:
-  # format: <filename_without_extension>: <value>
-  home: Home
-  categories: Categories
-  tags: Tags
-  archives: Archives
-  about: About
-
-# the text displayed in the search bar & search results
-search:
-  hint: search
-  cancel: Cancel
-  no_results: Oops! No result founds.
-
-panel:
-  lastmod: Recent Update
-  trending_tags: Trending Tags
-  toc: Contents
-
-#  The liquid date format › http://strftime.net/
-date_format:
-  tooltip: '%a, %b %e, %Y, %l:%M %p %z'
-  post:
-    long: '%b %e, %Y'
-    short: '%b %e'
-    archive_month: '%b'
-
-copyright:
-  # Shown at the bottom of the post
-  license:
-    template: This post is licensed under :LICENSE_NAME by the author.
-    name: CC BY 4.0
-    link: https://creativecommons.org/licenses/by/4.0/
-
-  # Displayed in the footer
-  brief: Some rights reserved.
-  verbose: >-
-    Except where otherwise noted, the blog posts on this site are licensed
-    under the Creative Commons Attribution 4.0 International (CC BY 4.0) License by the author.
-
-meta: Powered by :PLATFORM with :THEME theme.
-
-not_found:
-  statment: Sorry, we've misplaced that URL or it's pointing to something that doesn't exist.
-  hint_template: :HEAD_BAK to try finding it again, or search for it on the :ARCHIVES_PAGE.
-  head_back: Head back Home
-  archives_page: Archives page
-
-# ----- Posts related labels -----
-
-post:
-  published: 'on'
-  updated: Updated
-  timeago:
-    day: days ago
-    hour: hours ago
-    minute: minutes ago
-    just_now: just now
-  words: words
-  pageview_measure: views
-  read_time:
-    unit: min
-    prompt: read
-  relate_posts: Further Reading
-  share: Share
-  button:
-    next: Newer
-    previous: Older
-    copy_code:
-      succeed: Copied!
-    share_link:
-      title: Copy link
-      succeed: Link copied successfully!
-  # pinned prompt of posts list on homepage
-  pin_prompt: Pinned
-
-# categories page
-categories:
-  category_measure: categories
-  post_measure: posts

_data/locales/id-ID.yml

@@ -1,90 +0,0 @@
-# The layout text of site
-
-# ----- Commons label -----
-
-layout:
-  post: Postingan
-  category: Kategori
-  tag: Tagar
-
-# The tabs of sidebar
-tabs:
-  # format: <filename_without_extension>: <value>
-  home: Beranda
-  categories: Kategori
-  tags: Tagar
-  archives: Arsip
-  about: Tentang
-
-# the text displayed in the search bar & search results
-search:
-  hint: Cari
-  cancel: Batal
-  no_results: Ups! Tidak ada hasil yang ditemukan.
-
-panel:
-  lastmod: Postingan Terbaru
-  trending_tags: Tagar Terpopuler
-  toc: Konten
-
-#  The liquid date format › http://strftime.net/
-date_format:
-  tooltip: "%a, %e %b, %Y, %l:%M %p"
-  post:
-    long: "%e %b, %Y"
-    short: "%e %b"
-    archive_month: "%b"
-
-copyright:
-  # Shown at the bottom of the post
-  license:
-    template: Postingan ini dilisensikan di bawah :LICENSE_NAME oleh penulis.
-    name: CC BY 4.0
-    link: https://creativecommons.org/licenses/by/4.0/
-
-  # Displayed in the footer
-  brief: Sebagian konten dilindungi.
-  verbose: >-
-    Kecuali jika dinyatakan, Postingan blog di situs ini dilisensikan
-    di bawah Lisensi Creative Commons Attribution 4.0 International (CC BY 4.0) oleh penulis.
-
-meta: Didukung oleh :PLATFORM dengan tema :THEME.
-
-not_found:
-  statment: Maaf, kami gagal menemukan URL itu atau memang mengarah ke sesuatu yang tidak ada.
-  hint_template: :HEAD_BAK untuk mencoba mencari kembali, atau cari di :ARCHIVES_PAGE.
-  head_back: Kembali ke Beranda
-  archives_page: Halaman Arsip
-
-# ----- Posts related labels -----
-
-post:
-  published: "pada"
-  updated: Diperbarui
-  timeago:
-    day: hari yang lalu
-    hour: jam yang lalu
-    minute: menit yang lalu
-    just_now: baru saja
-  words: kata
-  pageview_measure: dilihat
-  read_time:
-    unit: menit
-    prompt: baca
-  relate_posts: Postingan Lainya
-  share: Bagikan
-  button:
-    next: Terbaru
-    previous: Terlama
-    copy_code:
-      succeed: Disalin!
-    share_link:
-      title: Salin tautan
-      succeed: Tautan berhasil disalin!
-  # pinned prompt of posts list on homepage
-  pin_prompt: Disematkan
-
-# categories page
-categories:
-  category_measure: kategori
-  post_measure: Postingan

_data/locales/zh-CN.yml

@@ -1,89 +0,0 @@
-# The layout text of site
-
-# ----- Commons label -----
-
-layout:
-  post: 文章
-  category: 分类
-  tag: 标签
-
-# The tabs of sidebar
-tabs:
-  # format: <filename_without_extension>: <value>
-  home: 首页
-  categories: 分类
-  tags: 标签
-  archives: 归档
-  about: 关于
-
-# the text displayed in the search bar & search results
-search:
-  hint: 搜索
-  cancel: 取消
-  no_results: 搜索结果为空
-
-panel:
-  lastmod: 最近更新
-  trending_tags: 热门标签
-  toc: 文章内容
-
-#  The liquid date format › http://strftime.net/
-date_format:
-  tooltip: '%F, %R %z'
-  post:
-    long: '%F'
-    short: '%m-%d'
-    archive_month: '%m月'
-
-copyright:
-  # Shown at the bottom of the post
-  license:
-    template: 本文由作者按照 :LICENSE_NAME 进行授权
-    name: CC BY 4.0
-    link: https://creativecommons.org/licenses/by/4.0/
-
-  # Displayed in the footer
-  brief: 保留部分权利。
-  verbose: >-
-    除非另有说明，本网站上的博客文章均由作者按照知识共享署名 4.0 国际 (CC BY 4.0) 许可协议进行授权。
-
-meta: 本站由 :PLATFORM 生成，采用 :THEME 主题。
-
-not_found:
-  statment: 抱歉，我们放错了该 URL，或者它指向了不存在的内容。
-  hint_template: :HEAD_BAK尝试再次查找它，或在:ARCHIVES_PAGE上搜索它。
-  head_back: 返回主页
-  archives_page: 归档页面
-
-# ----- Posts related labels -----
-
-post:
-  published: 发表于
-  updated: 更新于
-  timeago:
-    day: 天前
-    hour: 小时前
-    minute: 分钟前
-    just_now: 刚刚
-  words: 字
-  pageview_measure: 次浏览
-  read_time:
-    unit: 分钟
-    prompt: 阅读
-  relate_posts: 相关文章
-  share: 分享
-  button:
-    next: 下一篇
-    previous: 上一篇
-    copy_code:
-      succeed: 已复制！
-    share_link:
-      title:  分享链接
-      succeed: 链接已复制！
-  # pinned prompt of posts list on homepage
-  pin_prompt: 顶置
-
-# categories page
-categories:
-  category_measure: 个分类
-  post_measure: 篇文章

_data/share.yml

@@ -13,7 +13,7 @@ platforms:
   -
     type: Telegram
     icon: "fab fa-telegram"
-    link: "https://telegram.me/share?text=TITLE&url=URL"
+    link: "https://t.me/share/url?url=URL&text=TITLE"
 
   # Uncomment below if you need to.
   # -

_tabs/about.md

@@ -1,8 +1,8 @@
 ---
-title: About
+# the default layout is 'page'
 icon: fas fa-info-circle
 order: 4
 ---
 
-
+> Add Markdown syntax content to file `_tabs/about.md`{: .filepath } and it will show up on this page.
-> **Note**: Add Markdown syntax content to file `_tabs/about.md` and it will show up on this page.
+{: .prompt-tip }

_tabs/archives.md

@@ -1,7 +1,5 @@
 ---
 layout: archives
-title: Archives
 icon: fas fa-archive
 order: 3
 ---
-

_tabs/categories.md

@@ -1,6 +1,5 @@
 ---
 layout: categories
-title: Categories
 icon: fas fa-stream
 order: 1
 ---

_tabs/tags.md

@@ -1,6 +1,5 @@
 ---
 layout: tags
-title: Tags
 icon: fas fa-tag
 order: 2
 ---

tools/deploy.sh

@@ -1,159 +0,0 @@
-#!/usr/bin/env bash
-#
-# Build, test and then deploy the site content to 'origin/<pages_branch>'
-#
-# Requirement: html-proofer, jekyll
-#
-# Usage: See help information
-
-set -eu
-
-PAGES_BRANCH="gh-pages"
-
-SITE_DIR="_site"
-
-_opt_dry_run=false
-
-_config="_config.yml"
-
-_no_pages_branch=false
-
-_backup_dir="$(mktemp -d)"
-
-_baseurl=""
-
-help() {
-  echo "Build, test and then deploy the site content to 'origin/<pages_branch>'"
-  echo
-  echo "Usage:"
-  echo
-  echo "   bash ./tools/deploy.sh [options]"
-  echo
-  echo "Options:"
-  echo '     -c, --config   "<config_a[,config_b[...]]>"    Specify config file(s)'
-  echo "     --dry-run                Build site and test, but not deploy"
-  echo "     -h, --help               Print this information."
-}
-
-init() {
-  if [[ -z ${GITHUB_ACTION+x} && $_opt_dry_run == 'false' ]]; then
-    echo "ERROR: It is not allowed to deploy outside of the GitHub Action envrionment."
-    echo "Type option '-h' to see the help information."
-    exit -1
-  fi
-
-  _baseurl="$(grep '^baseurl:' _config.yml | sed "s/.*: *//;s/['\"]//g;s/#.*//")"
-}
-
-build() {
-  # clean up
-  if [[ -d $SITE_DIR ]]; then
-    rm -rf "$SITE_DIR"
-  fi
-
-  # build
-  JEKYLL_ENV=production bundle exec jekyll b -d "$SITE_DIR$_baseurl" --config "$_config"
-}
-
-test() {
-  bundle exec htmlproofer \
-    --disable-external \
-    --check-html \
-    --allow_hash_href \
-    "$SITE_DIR"
-}
-
-resume_site_dir() {
-  if [[ -n $_baseurl ]]; then
-    # Move the site file to the regular directory '_site'
-    mv "$SITE_DIR$_baseurl" "${SITE_DIR}-rename"
-    rm -rf "$SITE_DIR"
-    mv "${SITE_DIR}-rename" "$SITE_DIR"
-  fi
-}
-
-setup_gh() {
-  if [[ -z $(git branch -av | grep "$PAGES_BRANCH") ]]; then
-    _no_pages_branch=true
-    git checkout -b "$PAGES_BRANCH"
-  else
-    git checkout "$PAGES_BRANCH"
-  fi
-}
-
-backup() {
-  mv "$SITE_DIR"/* "$_backup_dir"
-  mv .git "$_backup_dir"
-
-  # When adding custom domain from Github website,
-  # the CANME only exist on `gh-pages` branch
-  if [[ -f CNAME ]]; then
-    mv CNAME "$_backup_dir"
-  fi
-}
-
-flush() {
-  rm -rf ./*
-  rm -rf .[^.] .??*
-
-  shopt -s dotglob nullglob
-  mv "$_backup_dir"/* .
-}
-
-deploy() {
-  git config --global user.name "GitHub Actions"
-  git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-
-  git update-ref -d HEAD
-  git add -A
-  git commit -m "[Automation] Site update No.${GITHUB_RUN_NUMBER}"
-
-  if $_no_pages_branch; then
-    git push -u origin "$PAGES_BRANCH"
-  else
-    git push -f
-  fi
-}
-
-main() {
-  init
-  build
-  test
-  resume_site_dir
-
-  if $_opt_dry_run; then
-    exit 0
-  fi
-
-  setup_gh
-  backup
-  flush
-  deploy
-}
-
-while (($#)); do
-  opt="$1"
-  case $opt in
-    -c | --config)
-      _config="$2"
-      shift
-      shift
-      ;;
-    --dry-run)
-      # build & test, but not deploy
-      _opt_dry_run=true
-      shift
-      ;;
-    -h | --help)
-      help
-      exit 0
-      ;;
-    *)
-      # unknown option
-      help
-      exit 1
-      ;;
-  esac
-done
-
-main