Skip to content

Commit 6e3f700

Browse files
committed
chore: upgrade to 7.1.1
1 parent bae2551 commit 6e3f700

19 files changed

+356
-65
lines changed

.devcontainer/devcontainer.json

+29
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

+18
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

.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ quote_type = single
1616
quote_type = double
1717

1818
[*.md]
19-
trim_trailing_whitespace = false
19+
trim_trailing_whitespace = false

.github/workflows/pages-deploy.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ 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
4444
with:
45-
ruby-version: "3.2" # reads from a '.ruby-version' or '.tools-version' file if 'ruby-version' is omitted
45+
ruby-version: 3.3
4646
bundler-cache: true
4747

4848
- name: Build site
@@ -53,11 +53,11 @@ jobs:
5353
- name: Test site
5454
run: |
5555
bundle exec htmlproofer _site \
56-
\-\-disable-external=true \
56+
\-\-disable-external \
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

+6-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Gemfile.lock
55

66
# Jekyll cache
77
.jekyll-cache
8+
.jekyll-metadata
89
_site
910

1011
# RubyGems
@@ -16,9 +17,11 @@ package-lock.json
1617

1718
# IDE configurations
1819
.idea
19-
.vscode
20+
.vscode/*
21+
!.vscode/settings.json
22+
!.vscode/extensions.json
23+
!.vscode/tasks.json
2024

2125
# Misc
26+
_sass/dist
2227
assets/js/dist
23-
.editorconfig
24-
.gitattributes

.vscode/extensions.json

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

.vscode/settings.json

+30
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

+26
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

+2-11
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,13 @@
22

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

5-
gem "jekyll-theme-chirpy", "~> 6.4", ">= 6.4.2"
5+
gem "jekyll-theme-chirpy", "~> 7.1", ">= 7.1.1"
66

7-
group :test do
8-
gem "html-proofer", "~> 4.4"
9-
end
7+
gem "html-proofer", "~> 5.0", group: :test
108

11-
# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
12-
# and associated library.
139
platforms :mingw, :x64_mingw, :mswin, :jruby do
1410
gem "tzinfo", ">= 1", "< 3"
1511
gem "tzinfo-data"
1612
end
1713

18-
# Performance-booster for watching directories on Windows
1914
gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
20-
21-
# Lock `http_parser.rb` gem to `v0.6.x` on JRuby builds since newer versions of the gem
22-
# do not have a Java counterpart.
23-
gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby]

README.md

+5-18
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,19 @@ 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:
28+
## Usage
3929

40-
```console
41-
$ bundle
42-
```
30+
Check out the [theme's docs](https://github.com/cotes2020/jekyll-theme-chirpy/wiki).
4331

44-
## Usage
32+
## Contributing
4533

46-
Please see the [theme's docs](https://github.com/cotes2020/jekyll-theme-chirpy#documentation).
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.
4735

4836
## License
4937

5038
This work is published under [MIT][mit] License.
5139

5240
[gem]: https://rubygems.org/gems/jekyll-theme-chirpy
5341
[chirpy]: https://github.com/cotes2020/jekyll-theme-chirpy/
54-
[use-template]: https://github.com/cotes2020/chirpy-starter/generate
5542
[CD]: https://en.wikipedia.org/wiki/Continuous_deployment
56-
[mit]: https://github.com/cotes2020/chirpy-starter/blob/master/LICENSE
43+
[mit]: https://github.com/cotes2020/chirpy-starter/blob/master/LICENSE

_config.yml

+47-22
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ theme: jekyll-theme-chirpy
88
# otherwise, the layout language will use the default value of 'en'.
99
lang: en
1010

11-
1211
# Change to your timezone › https://kevinnovak.github.io/Time-Zone-Picker
1312
timezone:
1413

@@ -44,13 +43,37 @@ social:
4443
# - https://www.facebook.com/username
4544
- https://www.linkedin.com/in/paolo-serra-b689a814b/
4645

47-
google_site_verification: # fill in to your verification string
46+
webmaster_verifications:
47+
google: # fill in your Google verification code
48+
bing: # fill in your Bing verification code
49+
alexa: # fill in your Alexa verification code
50+
yandex: # fill in your Yandex verification code
51+
baidu: # fill in your Baidu verification code
52+
facebook: # fill in your Facebook verification code
4853

4954
# ↑ --------------------------
5055
# The end of `jekyll-seo-tag` settings
5156

52-
google_analytics:
53-
id: G-XZ2VETZR7E # fill in your Google Analytics ID
57+
# Web Analytics Settings
58+
analytics:
59+
google:
60+
id: # fill in your Google Analytics ID
61+
goatcounter:
62+
id: # fill in your GoatCounter ID
63+
umami:
64+
id: # fill in your Umami ID
65+
domain: # fill in your Umami domain
66+
matomo:
67+
id: # fill in your Matomo ID
68+
domain: # fill in your Matomo domain
69+
cloudflare:
70+
id: # fill in your Cloudflare Web Analytics token
71+
fathom:
72+
id: # fill in your Fathom Site ID
73+
74+
# Page views settings
75+
pageviews:
76+
provider: # now only supports 'goatcounter'
5477

5578
# Prefer color scheme setting.
5679
#
@@ -65,12 +88,12 @@ google_analytics:
6588
#
6689
theme_mode: dark
6790

68-
# The CDN endpoint for images.
91+
# The CDN endpoint for media resources.
6992
# Notice that once it is assigned, the CDN url
70-
# will be added to all image (site avatar & posts' images) paths starting with '/'
93+
# will be added to all media resources (site avatar, posts' images, audio and video files) paths starting with '/'
7194
#
7295
# e.g. 'https://cdn.com'
73-
img_cdn:
96+
cdn:
7497

7598
# the avatar on sidebar, support local or CORS resources
7699
avatar: 'images/profile_image.jpeg'
@@ -83,8 +106,9 @@ social_preview_image: # string, local or CORS resources
83106
toc: true
84107

85108
comments:
86-
active: # The global switch for posts comments, e.g., 'disqus'. Keep it empty means disable
87-
# The active options are as follows:
109+
# Global switch for the post-comment system. Keeping it empty means disabled.
110+
provider: # [disqus | utterances | giscus]
111+
# The provider options are as follows:
88112
disqus:
89113
shortname: # fill with the Disqus shortname. › https://help.disqus.com/en/articles/1717111-what-s-a-shortname
90114
# utterances settings › https://utteranc.es/
@@ -98,6 +122,7 @@ comments:
98122
category:
99123
category_id:
100124
mapping: # optional, default to 'pathname'
125+
strict: # optional, default to '0'
101126
input_position: # optional, default to 'bottom'
102127
lang: # optional, default to the value of `site.lang`
103128
reactions_enabled: # optional, default to the value of `1`
@@ -108,10 +133,17 @@ assets:
108133
enabled: # boolean, keep empty means false
109134
# specify the Jekyll environment, empty means both
110135
# only works if `assets.self_host.enabled` is 'true'
111-
env: # [development|production]
136+
env: # [development | production]
112137

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

116148
paginate: 10
117149

@@ -121,6 +153,7 @@ baseurl: ""
121153
# ------------ The following options are not recommended to be modified ------------------
122154

123155
kramdown:
156+
footnote_backlink: "&#8617;&#xfe0e;"
124157
syntax_highlighter: rouge
125158
syntax_highlighter_opts: # Rouge Options › https://github.com/jneen/rouge#full-options
126159
css_class: highlight
@@ -157,14 +190,6 @@ defaults:
157190
values:
158191
layout: page
159192
permalink: /:title/
160-
- scope:
161-
path: assets/img/favicons
162-
values:
163-
swcache: true
164-
- scope:
165-
path: assets/js/dist
166-
values:
167-
swcache: true
168193

169194
sass:
170195
style: compressed
@@ -185,11 +210,11 @@ exclude:
185210
- tools
186211
- README.md
187212
- LICENSE
188-
- rollup.config.js
213+
- "*.config.js"
189214
- package*.json
190215

191216
jekyll-archives:
192-
enabled: [categories] #tags
217+
enabled: [categories]
193218
layouts:
194219
category: category
195220
tag: tag
@@ -198,4 +223,4 @@ jekyll-archives:
198223
category: /categories/:name/
199224

200225
keep_files:
201-
- assets/img/favicons
226+
- assets/img/favicons

0 commit comments

Comments
 (0)