Merge branch 'master' into production

Author: cotes2020

.commitlintrc.json

@@ -0,0 +1,5 @@
+{
+  "rules": {
+    "body-max-line-length": [0, "always"]
+  }
+}

.github/CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # How to Contribute
 
-We want to thank you for sparing time to improve this project! Here are some guidelines for contributing：
+We'd like to thank you for sparing time to improve this project! Here are some guidelines for contributing：
 
 To ensure that the blog design is not confused, this project does not accept suggestions for design changes, such as color scheme, fonts, typography, etc. If your request is about an enhancement, it is recommended to first submit a [_Feature Request_](https://github.com/cotes2020/jekyll-theme-chirpy/issues/new?labels=enhancement&template=feature_request.md) issue to discuss whether your idea fits the project.
 
@@ -9,34 +9,57 @@ To ensure that the blog design is not confused, this project does not accept sug
 Generally, contribute to the project by:
 
 1. Fork this project on GitHub and clone it locally.
-2. Create a new branch from the default branch and give it a descriptive name (e.g., `my-new-feature`, `fix-a-bug`).
-3. After completing the development, submit a new _Pull Request_.
+2. Create a new branch from the default branch and give it a descriptive name (format: `feature/<add-new-feat>` / `fix/<fix-a-bug>`).
+3. After completing the development, submit a new _Pull Request_. Note that the commit message must follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/), otherwise it will fail the PR check.
 
 ## Modifying JavaScript
 
-If your contribution involves JS modification, please read the following sections.
+If your contribution involves JavaScript modification, please read the following sections.
 
 ### Inline Scripts
 
-If you need to add comments to the inline JS (the JS code between the tags `<script>` and `</script>`), please use `/**/` instead of two slashes `//`. Because the HTML will be compressed by [jekyll-compress-html](https://github.com/penibelst/jekyll-compress-html) during deployment, but it cannot handle the `//` properly. And this will disrupt the structure of the compressed HTML.
+If you need to add comments to the inline JavaScript (the code between the HTML tags `<script>` and `</script>`), please use `/* */` instead of two slashes `//`. Because the HTML will be compressed by [jekyll-compress-html](https://github.com/penibelst/jekyll-compress-html) during deployment, but it cannot handle the `//` properly, which will disrupt the structure of the compressed HTML.
 
 ### External Scripts
 
-If you need to add or modify JavaScripts in the directory `_javascript`, you need to install [Gulp.js](https://gulpjs.com/docs/en/getting-started/quick-start).
+If you need to add/change/delete the JavaScript in the directory `_javascript/`, setting up [`Node.js`](https://nodejs.org/) and [`npx`](https://www.npmjs.com/package/npx) is a requirement. And then install the development dependencies:
 
-During development, real-time debugging can be performed through the following commands:
+```console
+$ npm i
+```
+
+During JavaScript development, real-time debugging can be performed through the following commands:
+
+Firstly, start a Jekyll server:
 
 ```console
 $ bash tools/run.sh
 ```
 
-Open another terminal tab and run:
+And then open a new terminal tab and run:
+
+```console
+# Type 'Ctrl + C' to stop
+$ npx gulp dev
+```
+
+After debugging, run the command `npx gulp` (without any argument) will automatically output the compressed files to the directory `assets/js/dist/`.
+
+## Verify the commit messages
+
+If you want to make sure your commits pass the CI check, you can refer to the following steps.
+
+Install `commitlint` & `husky`:
 
 ```console
-$ gulp dev # Type 'Ctrl + C' to stop
+$ npm i -g @commitlint/{cli,config-conventional} husky
 ```
 
-After debugging, run the command `gulp` (without any argument) will automatically output the compressed files to the directory `assests/js/dist/`.
+And then enable `husky`:
+
+```console
+$ husky install
+```
 
 ---
 

.github/ISSUE_TEMPLATE/bug_report.md

@@ -35,14 +35,15 @@ Steps to reproduce the behavior:
 
 <!-- If applicable, add screenshots to help explain your problem. -->
 
-### Software
-
-<!-- Please complete the following information -->
-- Ruby version: <!-- by running: `ruby -v` -->
-- Gem version: <!-- by running: `gem -v`-->
-- Bundler version: <!-- by running: `bundle -v`-->
-- Jekyll version: <!-- by running: `bundle list | grep " jekyll "` -->
-- Theme version: <!-- by running: `gem list | grep jekyll-theme-chirpy` -->
+### Environment
+
+| Command                           | Version |
+|-----------------------------------|---------|
+| `ruby -v`                         |         |
+| `gem -v`                          |         |
+| `bundle -v`                       |         |
+| `bundle exec jekyll -v`           |         |
+| `bundle info jekyll-theme-chirpy` |         |
 
 ### Desktop
 

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: 'Continuous Integration'
+name: 'CI'
 on:
   push:
     branches-ignore:
@@ -18,23 +18,20 @@ on:
       - '**'
 
 jobs:
-  ci:
-    runs-on: ${{ matrix.os }}
+  build:
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
-
+        ruby: [2.5, 2.6, 2.7, 3]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
         with:
           fetch-depth: 0  # for posts's lastmod
-
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-
       - name: Test Site
         run: bash tools/deploy.sh --dry-run

.github/workflows/commitlint.yml

@@ -0,0 +1,11 @@
+name: Lint Commit Messages
+on: pull_request
+
+jobs:
+  commitlint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: wagoid/commitlint-github-action@v4

.github/workflows/pages-deploy.yml.hook

@@ -2,7 +2,7 @@ name: 'Automatic build'
 on:
   push:
     branches:
-      - main
+      - master
     paths-ignore:
       - .gitignore
       - README.md

.gitignore

@@ -4,6 +4,9 @@
 !.editorconfig
 !.nojekyll
 !.travis.yml
+!.husky
+!.commitlintrc.json
+!.versionrc.json
 
 # bundler cache
 _site

.husky/commit-msg

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx --no -- commitlint -x $(npm root -g)/@commitlint/config-conventional --edit

.travis.yml

@@ -31,9 +31,9 @@ jobs:
 
 stages:
   - name: Upgrade
-    if: branch =~ /^v(\d)+(\.(\d)+){2}$/ OR tag IS present
+    if: branch = production
   - name: Starter
-    if: branch =~ /^v(\d)+(\.(\d)+){2}$/ OR tag IS present
+    if: branch = production
   - name: Docs
     if: branch = docs
 

.versionrc.json

@@ -0,0 +1,20 @@
+{
+  "skip": {
+    "commit": true,
+    "tag": true
+  },
+  "types": [
+    {
+      "type": "feat",
+      "section": "Features"
+    },
+    {
+      "type": "fix",
+      "section": "Bug Fixes"
+    },
+    {
+      "type": "perf",
+      "section": "Improvements"
+    }
+  ]
+}