Skip to content

Commit 7f64e35

Browse files
committed
[MOD] Update to latest Jekyll (gh-pages gem 193)
1 parent 453e6f3 commit 7f64e35

File tree

4 files changed

+73
-19
lines changed

4 files changed

+73
-19
lines changed

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source 'https://rubygems.org'
22

33
# for some reason omitting the version defaults to 0
4-
gem 'github-pages', '>= 127'
4+
gem 'github-pages', '= 193', group: :jekyll_plugins
55

66
# http://jekyllrb.com/docs/windows/#auto-regeneration
77
# for --watch to work on Windows

README.md

+54-5
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,63 @@ me@windows$ gradle serve dev noskip
3333
```
3434

3535
## Usage
36-
Update dependencies occasionally by
37-
38-
```shell
39-
me@website$ bundle update
40-
```
4136

4237
Check if site build successfully before each commit
4338

4439
```shell
4540
me@webiste$ gradle preCommitServe local
4641
```
42+
43+
## Upgrade
44+
45+
* Change `gem 'github-pages'` version to [GitHub version](https://pages.github.com/versions/)
46+
* `bundle update`, watch for these two lines:
47+
> Fetching github-pages 192 (was 127)
48+
> Fetching jekyll 3.7.4 (was 3.4.1)
49+
* Read release notes for missed versions:
50+
* https://github.com/github/pages-gem/releases
51+
* https://jekyllrb.com/news/releases/
52+
https://jekyllrb.com/docs/history/
53+
* Watch out for Liquid updates
54+
* Watch out for Ruby updates
55+
* Check if https://help.github.com/articles/configuring-jekyll/#configuration-settings-you-cannot-change has changed
56+
57+
## TODO
58+
59+
GHPages:
60+
161 Whitelist jekyll-octicons (#483) https://github.com/github/pages-gem/pull/483
61+
86-192: rouge 1.11.1 -> 2.2.1
62+
kramdown 1.13.2 -> 1.17.0
63+
Jekyll 3.5
64+
Sitemaps for static files
65+
Liquid 4: https://github.com/Shopify/liquid/blob/master/History.md#400--2016-12-14--branch-4-0-stable
66+
Jekyll now uses Liquid 4, the latest! It comes with whitespace control, new filters concat and compact, loop performance improvements and many fixes
67+
Pages, posts, and other documents can now access layout variables via {{ layout }}.
68+
The gems key in the _config.yml is now plugins.
69+
Filters like sort now allow you to sort based on a subvalue, e.g. {% assign sorted = site.posts | sort: "image.alt_text" %}.
70+
layout: null -> layout: none (null = default, none = no layout)
71+
Jekyll 3.6
72+
Rouge 2 support, but note you can continue to use Rouge 1
73+
Jekyll 3.7
74+
--livereload
75+
slugify latin
76+
collections folder (https://jekyllrb.com/docs/collections/)
77+
Ruby 2.5.3
78+
79+
Finished reading news <3.8 and changelog <=3.8
80+
81+
these two end up in sitemap after update
82+
/dev/assets/css/style.css
83+
/dev/redirects.json
84+
85+
dev > sass > line_numbers: true is broken after update (generated CSS files no longer have line numbers)
86+
ref https://github.com/jekyll/jekyll-sass-converter/blob/master/lib/jekyll/converters/scss.rb#L48
87+
88+
dev > sass > sourcemap is disabled, check if it can be enabled
89+
90+
new RegExp('vegetarian is broken in javascript, report backslash issue
91+
contact wasn't working, now it is? (probably should be generated in debug)
92+
shell code formatting lost user@machine$ formatting
93+
94+
https://github.com/jekyll/jekyll/pull/6384/files#diff-514abd885acda367325e5236a9be3192R68
95+
https://github.com/kacperduras/disqus-for-jekyll

_config.yml

+17-11
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ whitelist:
5959
- jekyll-gist
6060
- jemoji
6161

62-
gems:
62+
plugins:
6363
# !github-pages! optional › https://github.com/github/pages-gem/blob/jekyll-v3-4-2/lib/github-pages/plugins.rb#L6-L16
6464
# paginate and paginate_path in _config is used
6565
- jekyll-paginate
@@ -85,11 +85,11 @@ paginate: 10
8585
# Pagination path › Important for blog page in /blog/ to work
8686
paginate_path: "/blog/page:num/"
8787

88-
# !github-pages! mandatory › https://help.github.com/articles/using-jekyll-with-pages/#configuration-settings-you-cannot-change
88+
# !github-pages! mandatory › https://help.github.com/articles/configuring-jekyll/#configuration-settings-you-cannot-change
8989
# Disables custom plugins and ignore symbolic links
9090
# This means that ```java will not work because it requires https://github.com/mvdbos/kramdown-with-pygments
9191
safe: true
92-
# !github-pages! mandatory provided › https://help.github.com/articles/using-jekyll-with-pages/#configuration-settings-you-cannot-change
92+
# !github-pages! mandatory provided › https://help.github.com/articles/configuring-jekyll/#configuration-settings-you-cannot-change
9393
#source: '.' # auto-set
9494

9595
# Include/Exclude these files from production _site
@@ -140,7 +140,7 @@ excerpt_separator: "<!--more-->"
140140

141141
# Theme works best with Kramdown (using the table of contents function)
142142
markdown: kramdown
143-
# !github-pages! mandatory › https://help.github.com/articles/using-jekyll-with-pages/#configuration-settings-you-cannot-change
143+
# !github-pages! mandatory › https://help.github.com/articles/configuring-jekyll/#configuration-settings-you-cannot-change
144144
# Since Jekyll 3 the default highlighter is Rouge (replaced Pygments.rb in v44)
145145
highlighter: rouge
146146

@@ -157,16 +157,22 @@ kramdown:
157157
toc_panel: true
158158
smart_quotes: lsquo,rsquo,ldquo,rdquo
159159
hard_wrap: false
160+
# !github-pages! mandatory › https://help.github.com/articles/configuring-jekyll/#configuration-settings-you-cannot-change
160161
# https://github.com/jekyll/jekyll/pull/4090
161162
syntax_highlighter: rouge
163+
# !github-pages! mandatory › https://help.github.com/articles/configuring-jekyll/#configuration-settings-you-cannot-change
164+
math_engine: mathjax
165+
show_warnings: true
162166

163167
# Rouge Highlighter in Kramdown › http://kramdown.gettalong.org/syntax_highlighter/rouge.html
164168
# span, block element options fall back to global
165169
syntax_highlighter_opts:
166170
# Rouge Options › https://github.com/jneen/rouge#full-options
167171
#debug: false
168172
#parent: ''
169-
css_class: 'highlight'
173+
# Affects <pre class>, but not <div class> around <pre>
174+
# disabled to prevent problems with CSS due to .highlight > .highlight structure
175+
css_class: ''
170176
default_lang: text
171177
disable: false
172178
span:
@@ -178,14 +184,15 @@ kramdown:
178184
disable: false
179185

180186
# More › http://sass-lang.com
181-
# Options › http://jekyllrb.com/docs/assets/#sassscss
187+
# Docs › http://jekyllrb.com/docs/assets/#sassscss
188+
# Options › http://sass-lang.com/documentation/file.SASS_REFERENCE.html#options
182189
# Safe mode only allows style, syntax=based on extension, cache=false
183190
sass:
184191
sass_dir: _sass
185192
# Options › http://sass-lang.com/documentation/file.SASS_REFERENCE.html#output_style
186193
style: :compressed # :nested | :expanded | :compact | :compressed
187194

188-
# Used › default.html front-matter and comress.html
195+
# Used › default.html front-matter and compress.html
189196
# Options › http://jch.penibelst.de
190197
compress_html:
191198
clippings: all
@@ -197,10 +204,9 @@ compress_html:
197204
ignore:
198205
envs: [development]
199206

200-
# !github-pages! mandatory › https://help.github.com/articles/using-jekyll-with-pages/#configuration-settings-you-cannot-change
201-
# Since Jekyll 3 the default highlighter is Rouge (replaced Pygments.rb in v44)
207+
# !github-pages! mandatory › https://help.github.com/articles/configuring-jekyll/#configuration-settings-you-cannot-change
202208
incremental: false
203-
# !github-pages! mandatory › https://help.github.com/articles/using-jekyll-with-pages/#configuration-settings-you-cannot-change
209+
# !github-pages! mandatory › https://help.github.com/articles/configuring-jekyll/#configuration-settings-you-cannot-change
204210
# TODO what is this?
205211
lsi: false
206212

@@ -352,7 +358,7 @@ google_analytics_tracking_id: UA-38202353-4
352358
#tawkto_embed_uri: https://embed.tawk.to/<id>/default<script>
353359

354360
gist:
355-
# !github-pages! mandatory › https://help.github.com/articles/using-jekyll-with-pages/#configuration-settings-you-cannot-change
361+
# !github-pages! mandatory › https://help.github.com/articles/configuring-jekyll/#configuration-settings-you-cannot-change
356362
noscript: false
357363

358364
# !github-pages! provided › https://help.github.com/articles/repository-metadata-on-github-pages/

_config_dev.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@ unpublished: true
1919
future: true
2020

2121
sass:
22-
# http://sass-lang.com/documentation/file.SASS_REFERENCE.html#output_style
2322
style: :expanded
2423
line_numbers: true
2524
#trace_selectors: true
2625
#debug_info: true
2726
# FUTURE https://github.com/jekyll/jekyll-sass-converter/issues/12
28-
sourcemap: true
27+
#sourcemap: true

0 commit comments

Comments
 (0)