Skip to content

Commit 1726336

Browse files
jinPreludejinPrelude
committed
chore: upgrade to v7.2.4
1 parent 60212f9 commit 1726336

File tree

15 files changed

+314
-54
lines changed

15 files changed

+314
-54
lines changed

‎.devcontainer/devcontainer.json

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"name": "Jekyll",
3+
"image": "mcr.microsoft.com/devcontainers/jekyll:2-bullseye",
4+
"onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
5+
"postCreateCommand": "bash .devcontainer/post-create.sh",
6+
"customizations": {
7+
"vscode": {
8+
"settings": {
9+
"terminal.integrated.defaultProfile.linux": "zsh"
10+
},
11+
"extensions": [
12+
// Liquid tags auto-complete
13+
"killalau.vscode-liquid-snippets",
14+
// Liquid syntax highlighting and formatting
15+
"Shopify.theme-check-vscode",
16+
// Shell
17+
"timonwong.shellcheck",
18+
"mkhl.shfmt",
19+
// Common formatter
20+
"EditorConfig.EditorConfig",
21+
"esbenp.prettier-vscode",
22+
"stylelint.vscode-stylelint",
23+
"yzhang.markdown-all-in-one",
24+
// Git
25+
"mhutchie.git-graph"
26+
]
27+
}
28+
}
29+
}

‎.devcontainer/post-create.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/usr/bin/env bash
2+
3+
if [ -f package.json ]; then
4+
bash -i -c "nvm install --lts && nvm install-latest-npm"
5+
npm i
6+
npm run build
7+
fi
8+
9+
# Install dependencies for shfmt extension
10+
curl -sS https://webi.sh/shfmt | sh &>/dev/null
11+
12+
# Add OMZ plugins
13+
git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting
14+
git clone https://github.com/zsh-users/zsh-autosuggestions ~/.oh-my-zsh/custom/plugins/zsh-autosuggestions
15+
sed -i -E "s/^(plugins=\()(git)(\))/\1\2 zsh-syntax-highlighting zsh-autosuggestions\3/" ~/.zshrc
16+
17+
# Avoid git log use less
18+
echo -e "\nunset LESS" >>~/.zshrc

‎.github/workflows/pages-deploy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
- name: Setup Pages
3939
id: pages
40-
uses: actions/configure-pages@v3
40+
uses: actions/configure-pages@v4
4141

4242
- name: Setup Ruby
4343
uses: ruby/setup-ruby@v1
@@ -57,7 +57,7 @@ jobs:
5757
\-\-ignore-urls "/^http:\/\/127.0.0.1/,/^http:\/\/0.0.0.0/,/^http:\/\/localhost/"
5858
5959
- name: Upload site artifact
60-
uses: actions/upload-pages-artifact@v1
60+
uses: actions/upload-pages-artifact@v3
6161
with:
6262
path: "_site${{ steps.pages.outputs.base_path }}"
6363

@@ -70,4 +70,4 @@ jobs:
7070
steps:
7171
- name: Deploy to GitHub Pages
7272
id: deployment
73-
uses: actions/deploy-pages@v2
73+
uses: actions/deploy-pages@v4

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ package-lock.json
2020
.vscode
2121
!.vscode/settings.json
2222
!.vscode/extensions.json
23+
!.vscode/tasks.json
2324

2425
# Misc
25-
_sass/dist
26+
_sass/vendors
2627
assets/js/dist
2728

2829
.DS_Store

‎.vscode/extensions.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"recommendations": ["ms-vscode-remote.remote-containers"]
3+
}

‎.vscode/settings.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
// Prettier
3+
"editor.defaultFormatter": "esbenp.prettier-vscode",
4+
"editor.formatOnSave": true,
5+
// Shopify Liquid
6+
"files.associations": {
7+
"*.html": "liquid"
8+
},
9+
"[markdown]": {
10+
"editor.defaultFormatter": "yzhang.markdown-all-in-one"
11+
},
12+
// Formatter
13+
"[html][liquid]": {
14+
"editor.defaultFormatter": "Shopify.theme-check-vscode"
15+
},
16+
"[shellscript]": {
17+
"editor.defaultFormatter": "mkhl.shfmt"
18+
},
19+
// Disable vscode built-in stylelint
20+
"css.validate": false,
21+
"scss.validate": false,
22+
"less.validate": false,
23+
// Stylint extension settings
24+
"stylelint.snippet": ["css", "scss"],
25+
"stylelint.validate": ["css", "scss"],
26+
// Run tasks in macOS
27+
"terminal.integrated.profiles.osx": {
28+
"zsh": { "path": "/bin/zsh", "args": ["-l", "-i"] }
29+
}
30+
}

‎.vscode/tasks.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "Run Jekyll Server",
6+
"type": "shell",
7+
"command": "./tools/run.sh",
8+
"group": {
9+
"kind": "build",
10+
"isDefault": true
11+
},
12+
"problemMatcher": [],
13+
"detail": "Runs the Jekyll server with live reload."
14+
},
15+
{
16+
"label": "Build Jekyll Site",
17+
"type": "shell",
18+
"command": "./tools/test.sh",
19+
"group": {
20+
"kind": "build"
21+
},
22+
"problemMatcher": [],
23+
"detail": "Build the Jekyll site for production."
24+
}
25+
]
26+
}

‎Gemfile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@
22

33
source "https://rubygems.org"
44

5-
gem "jekyll-theme-chirpy", "~> 7.0"
5+
gem "jekyll-theme-chirpy", "~> 7.2", ">= 7.2.4"
66

7-
group :test do
8-
gem "html-proofer", "~> 5.0"
9-
end
7+
gem "html-proofer", "~> 5.0", group: :test
8+
9+
platforms :mingw, :x64_mingw, :mswin, :jruby do
10+
gem "tzinfo", ">= 1", "< 3"
11+
gem "tzinfo-data"
12+
end
13+
14+
gem "wdm", "~> 0.2.0", :platforms => [:mingw, :x64_mingw, :mswin]

‎README.md

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,38 +25,20 @@ Jekyll site. The following is a list of targets:
2525
To save you time, and also in case you lose some files while copying, we extract those files/configurations of the
2626
latest version of the **Chirpy** theme and the [CD][CD] workflow to here, so that you can start writing in minutes.
2727

28-
## Prerequisites
29-
30-
Follow the instructions in the [Jekyll Docs](https://jekyllrb.com/docs/installation/) to complete the installation of
31-
the basic environment. [Git](https://git-scm.com/) also needs to be installed.
32-
33-
## Installation
34-
35-
Sign in to GitHub and [**use this template**][use-template] to generate a brand new repository and name it
36-
`USERNAME.github.io`, where `USERNAME` represents your GitHub username.
37-
38-
Then clone it to your local machine and run:
39-
40-
```console
41-
$ bundle
42-
```
43-
4428
## Usage
4529

46-
Please see the [theme's docs](https://github.com/cotes2020/jekyll-theme-chirpy#documentation).
30+
Check out the [theme's docs](https://github.com/cotes2020/jekyll-theme-chirpy/wiki).
4731

48-
## Contributing
32+
## Contributing
4933

50-
The contents of this repository are automatically updated when new releases are made to the [main repository][chirpy].
51-
If you have problems using it, or would like to participate in improving it, please go to the main repository for feedback!
34+
This repository is automatically updated with new releases from the theme repository. If you encounter any issues or want to contribute to its improvement, please visit the [theme repository][chirpy] to provide feedback.
5235

5336
## License
5437

5538
This work is published under [MIT][mit] License.
5639

5740
[gem]: https://rubygems.org/gems/jekyll-theme-chirpy
5841
[chirpy]: https://github.com/cotes2020/jekyll-theme-chirpy/
59-
[use-template]: https://github.com/cotes2020/chirpy-starter/generate
6042
[CD]: https://en.wikipedia.org/wiki/Continuous_deployment
6143
[mit]: https://github.com/cotes2020/chirpy-starter/blob/master/LICENSE
6244

‎_config.yml

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,13 @@ analytics:
7070
domain: # fill in your Matomo domain
7171
cloudflare:
7272
id: # fill in your Cloudflare Web Analytics token
73+
fathom:
74+
id: # fill in your Fathom Site ID
7375

74-
# Pageviews settings
76+
# Page views settings
7577
pageviews:
7678
provider: # now only supports 'goatcounter'
7779

78-
goatcounter:
79-
id: # fill in your Goatcounter ID
80-
8180
# Prefer color scheme setting.
8281
#
8382
# Note: Keep empty will follow the system prefer color by default,
@@ -86,8 +85,8 @@ goatcounter:
8685
#
8786
# Available options:
8887
#
89-
# light - Use the light color scheme
90-
# dark - Use the dark color scheme
88+
# light — Use the light color scheme
89+
# dark — Use the dark color scheme
9190
#
9291
theme_mode: # [light | dark]
9392

@@ -138,14 +137,14 @@ assets:
138137
env: # [development | production]
139138

140139
pwa:
141-
enabled: true # the option for PWA feature (installable)
142-
cache:
143-
enabled: true # the option for PWA offline cache
144-
# Paths defined here will be excluded from the PWA cache.
145-
# Usually its value is the `baseurl` of another website that
146-
# shares the same domain name as the current website.
147-
deny_paths:
148-
# - "/example" # URLs match `<SITE_URL>/example/*` will not be cached by the PWA
140+
enabled: true # The option for PWA feature (installable)
141+
cache:
142+
enabled: true # The option for PWA offline cache
143+
# Paths defined here will be excluded from the PWA cache.
144+
# Usually its value is the `baseurl` of another website that
145+
# shares the same domain name as the current website.
146+
deny_paths:
147+
# - "/example" # URLs match `<SITE_URL>/example/*` will not be cached by the PWA
149148

150149
paginate: 10
151150

@@ -192,10 +191,6 @@ defaults:
192191
values:
193192
layout: page
194193
permalink: /:title/
195-
- scope:
196-
path: assets/js/dist
197-
values:
198-
swcache: true
199194

200195
sass:
201196
style: compressed
@@ -216,8 +211,9 @@ exclude:
216211
- tools
217212
- README.md
218213
- LICENSE
219-
- "*.config.js"
220-
- package*.json
214+
- purgecss.js
215+
- rollup.config.js
216+
- "package*.json"
221217

222218
jekyll-archives:
223219
enabled: [categories, tags]

0 commit comments

Comments
 (0)