Skip to content

Commit 69353b9

Browse files
Merge pull request #426 from friederbluemle/update-jekyll
2 parents b3cfac8 + 193e89f commit 69353b9

15 files changed

+154
-306
lines changed

.gitignore

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
_site/
2+
.sass-cache/
3+
.jekyll-cache/
4+
.jekyll-metadata/
5+
vendor/
6+
17
.DS_Store
28
.idea/
3-
.jekyll-metadata/
4-
.sass-cache/
5-
_site/
6-
node_modules/

Gemfile

Lines changed: 20 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
source "https://rubygems.org"
2-
ruby RUBY_VERSION
3-
42
# Hello! This is where you manage which Jekyll version is used to run.
53
# When you want to use a different version, change it below, save the
64
# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
@@ -9,31 +7,24 @@ ruby RUBY_VERSION
97
#
108
# This will help ensure the proper Jekyll version is running.
119
# Happy Jekylling!
12-
gem "jekyll", "3.4.3"
13-
10+
gem "jekyll", "~> 4.1.1"
1411
# This is the default theme for new Jekyll sites. You may change this to anything you like.
15-
gem "minima"
16-
17-
# Jekyll extensions
18-
gem 'jekyll-redirect-from'
19-
gem 'jekyll-paginate'
20-
21-
# JSON
22-
gem 'json'
23-
24-
# For `rake watch`
25-
gem 'rb-fsevent'
26-
27-
# For markdown header cleanup
28-
gem 'sanitize', '~>2.0'
29-
30-
# Markdown
31-
gem 'redcarpet'
32-
33-
# Syntax highlighting
34-
gem 'pygments.rb'
35-
36-
# Avoid having to poll for changes on Windows
37-
gem 'wdm', '>= 0.1.0' if Gem.win_platform?
38-
39-
gem 'bourbon'
12+
gem "minima", "~> 2.5"
13+
# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
14+
# uncomment the line below. To upgrade, run `bundle update github-pages`.
15+
# gem "github-pages", group: :jekyll_plugins
16+
# If you have any plugins, put them here!
17+
group :jekyll_plugins do
18+
gem 'bourbon', "~> 4"
19+
gem "jekyll-feed", "~> 0.12"
20+
end
21+
22+
# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
23+
# and associated library.
24+
platforms :mingw, :x64_mingw, :mswin, :jruby do
25+
gem "tzinfo", "~> 1.2"
26+
gem "tzinfo-data"
27+
end
28+
29+
# Performance-booster for watching directories on Windows
30+
gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]

Gemfile.lock

Lines changed: 76 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -3,79 +3,108 @@ GEM
33
specs:
44
addressable (2.7.0)
55
public_suffix (>= 2.0.2, < 5.0)
6-
bourbon (7.0.0)
7-
thor (~> 1.0)
6+
bourbon (4.3.4)
7+
sass (~> 3.4)
8+
thor (~> 0.19)
89
colorator (1.1.0)
9-
ffi (1.13.1)
10+
concurrent-ruby (1.1.8)
11+
em-websocket (0.5.2)
12+
eventmachine (>= 0.12.9)
13+
http_parser.rb (~> 0.6.0)
14+
eventmachine (1.2.7)
15+
eventmachine (1.2.7-java)
16+
eventmachine (1.2.7-x64-mingw32)
17+
eventmachine (1.2.7-x86-mingw32)
18+
ffi (1.15.0)
19+
ffi (1.15.0-java)
20+
ffi (1.15.0-x64-mingw32)
21+
ffi (1.15.0-x86-mingw32)
1022
forwardable-extended (2.6.0)
11-
jekyll (3.4.3)
23+
http_parser.rb (0.6.0)
24+
http_parser.rb (0.6.0-java)
25+
i18n (1.8.10)
26+
concurrent-ruby (~> 1.0)
27+
jekyll (4.1.1)
1228
addressable (~> 2.4)
1329
colorator (~> 1.0)
14-
jekyll-sass-converter (~> 1.0)
15-
jekyll-watch (~> 1.1)
16-
kramdown (~> 1.3)
17-
liquid (~> 3.0)
18-
mercenary (~> 0.3.3)
30+
em-websocket (~> 0.5)
31+
i18n (~> 1.0)
32+
jekyll-sass-converter (~> 2.0)
33+
jekyll-watch (~> 2.0)
34+
kramdown (~> 2.1)
35+
kramdown-parser-gfm (~> 1.0)
36+
liquid (~> 4.0)
37+
mercenary (~> 0.4.0)
1938
pathutil (~> 0.9)
20-
rouge (~> 1.7)
39+
rouge (~> 3.0)
2140
safe_yaml (~> 1.0)
22-
jekyll-paginate (1.1.0)
23-
jekyll-redirect-from (0.16.0)
24-
jekyll (>= 3.3, < 5.0)
25-
jekyll-sass-converter (1.5.2)
26-
sass (~> 3.4)
27-
jekyll-watch (1.5.1)
41+
terminal-table (~> 1.8)
42+
jekyll-feed (0.15.1)
43+
jekyll (>= 3.7, < 5.0)
44+
jekyll-sass-converter (2.1.0)
45+
sassc (> 2.0.1, < 3.0)
46+
jekyll-seo-tag (2.7.1)
47+
jekyll (>= 3.8, < 5.0)
48+
jekyll-watch (2.2.1)
2849
listen (~> 3.0)
29-
json (2.3.1)
30-
kramdown (1.17.0)
31-
liquid (3.0.6)
32-
listen (3.2.1)
50+
kramdown (2.3.1)
51+
rexml
52+
kramdown-parser-gfm (1.1.0)
53+
kramdown (~> 2.0)
54+
liquid (4.0.3)
55+
listen (3.5.1)
3356
rb-fsevent (~> 0.10, >= 0.10.3)
3457
rb-inotify (~> 0.9, >= 0.9.10)
35-
mercenary (0.3.6)
36-
mini_portile2 (2.4.0)
37-
minima (2.1.1)
38-
jekyll (~> 3.3)
39-
multi_json (1.15.0)
40-
nokogiri (1.10.10)
41-
mini_portile2 (~> 2.4.0)
58+
mercenary (0.4.0)
59+
minima (2.5.1)
60+
jekyll (>= 3.5, < 5.0)
61+
jekyll-feed (~> 0.9)
62+
jekyll-seo-tag (~> 2.1)
4263
pathutil (0.16.2)
4364
forwardable-extended (~> 2.6)
4465
public_suffix (4.0.6)
45-
pygments.rb (1.2.1)
46-
multi_json (>= 1.0.0)
4766
rb-fsevent (0.10.4)
4867
rb-inotify (0.10.1)
4968
ffi (~> 1.0)
50-
redcarpet (3.5.0)
51-
rouge (1.11.1)
69+
rexml (3.2.5)
70+
rouge (3.26.0)
5271
safe_yaml (1.0.5)
53-
sanitize (2.1.1)
54-
nokogiri (>= 1.4.4)
5572
sass (3.7.4)
5673
sass-listen (~> 4.0.0)
5774
sass-listen (4.0.0)
5875
rb-fsevent (~> 0.9, >= 0.9.4)
5976
rb-inotify (~> 0.9, >= 0.9.7)
60-
thor (1.0.1)
77+
sassc (2.4.0)
78+
ffi (~> 1.9)
79+
sassc (2.4.0-x64-mingw32)
80+
ffi (~> 1.9)
81+
terminal-table (1.8.0)
82+
unicode-display_width (~> 1.1, >= 1.1.1)
83+
thor (0.20.3)
84+
thread_safe (0.3.6)
85+
thread_safe (0.3.6-java)
86+
tzinfo (1.2.9)
87+
thread_safe (~> 0.1)
88+
tzinfo-data (1.2021.1)
89+
tzinfo (>= 1.0.0)
90+
unicode-display_width (1.7.0)
91+
wdm (0.1.1)
6192

6293
PLATFORMS
94+
java
6395
ruby
96+
x64-mingw32
97+
x86-mingw32
98+
x86-mswin32
6499

65100
DEPENDENCIES
66-
bourbon
67-
jekyll (= 3.4.3)
68-
jekyll-paginate
69-
jekyll-redirect-from
70-
json
71-
minima
72-
pygments.rb
73-
rb-fsevent
74-
redcarpet
75-
sanitize (~> 2.0)
76-
77-
RUBY VERSION
78-
ruby 2.7.1p83
101+
bourbon (~> 4)
102+
jekyll (~> 4.1.1)
103+
jekyll-feed (~> 0.12)
104+
minima (~> 2.5)
105+
tzinfo (~> 1.2)
106+
tzinfo-data
107+
wdm (~> 0.1.1)
79108

80109
BUNDLED WITH
81110
2.1.4

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ is generated using [Jekyll](http://jekyllrb.com/).
2323
Install the project dependencies using Bundler:
2424

2525
```sh
26-
npm run bootstrap
26+
bundle install
2727
```
2828

2929
Run the server locally:
3030

3131
```sh
32-
npm start
32+
bundle exec jekyll serve
3333
```
3434

3535
You should be able to access the site at: [127.0.0.1:4000](http://127.0.0.1:4000/)

_config.yml

Lines changed: 43 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,60 @@
22
#
33
# This config file is meant for settings that affect your whole blog, values
44
# which you are expected to set up once and rarely edit after that. If you find
5-
# yourself editing these this file very often, consider using Jekyll's data files
5+
# yourself editing this file very often, consider using Jekyll's data files
66
# feature for the data you need to update frequently.
77
#
88
# For technical reasons, this file is *NOT* reloaded automatically when you use
9-
# 'jekyll serve'. If you change this file, please restart the server process.
10-
9+
# 'bundle exec jekyll serve'. If you change this file, please restart the server process.
10+
#
11+
# If you need help with YAML syntax, here are some quick references for you:
12+
# https://learn-the-web.algonquindesign.ca/topics/markdown-yaml-cheat-sheet/#yaml
13+
# https://learnxinyminutes.com/docs/yaml/
14+
#
1115
# Site settings
1216
# These are used to personalize your new site. If you look in the HTML files,
1317
# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
1418
# You can create any custom variable you would like, and they will be accessible
1519
# in the templates via {{ site.myvariable }}.
16-
---
17-
name: Electrode
18-
description: Universal React and Node Applications simplified, performant, and reusable.
19-
url: https://electrode-io.github.io
20+
21+
title: Electrode
22+
description: >-
23+
Universal React and Node Applications simplified, performant, and reusable.
2024
baseurl: ""
21-
permalink: "/blog/:year/:month/:day/:title.html"
22-
paginate_path: "/blog/page:num/"
23-
paginate: 5
24-
timezone: America/Los_Angeles
25-
highlighter: pygments
25+
url: https://electrode-io.github.io
26+
27+
# Build settings
28+
theme: minima
29+
plugins:
30+
- jekyll-feed
31+
32+
# Exclude from processing.
33+
# The following items will not be processed, by default.
34+
# Any item listed under the `exclude:` key here will be automatically added to
35+
# the internal "default list".
36+
#
37+
# Excluded items can be processed by explicitly listing the directories or
38+
# their entries' file path in the `include:` list.
39+
#
40+
# exclude:
41+
# - .sass-cache/
42+
# - .jekyll-cache/
43+
# - gemfiles/
44+
# - Gemfile
45+
# - Gemfile.lock
46+
# - node_modules/
47+
# - vendor/bundle/
48+
# - vendor/cache/
49+
# - vendor/gems/
50+
# - vendor/ruby/
51+
2652
defaults:
2753
- scope:
2854
path: ''
29-
type: posts
30-
values:
31-
layout: post
32-
sectionid: blog
33-
- scope:
34-
path: blog
35-
type: pages
55+
type: docs
3656
values:
37-
sectionid: blog
57+
layout: docs
58+
sectionid: docs
3859
- scope:
3960
path: docs
4061
type: pages
@@ -46,41 +67,13 @@ defaults:
4667
type: pages
4768
values:
4869
sectionid: docs
49-
- scope:
50-
path: contributing
51-
type: pages
52-
values:
53-
sectionid: docs
54-
- scope:
55-
path: ""
56-
type: docs
57-
values:
58-
layout: docs
59-
sectionid: docs
60-
exclude:
61-
- Gemfile
62-
- Gemfile.lock
63-
- README.md
64-
- Rakefile
65-
- vendor/bundle
66-
markdown: redcarpet
67-
redcarpet:
68-
extensions:
69-
- fenced_code_blocks
70-
- footnotes
70+
7171
sass:
72-
style: :compressed
7372
sass_dir: _css
74-
gems:
75-
- jekyll-redirect-from
76-
- jekyll-paginate
77-
- bourbon
73+
style: compressed
7874

7975
collections:
8076
docs:
8177
output: true
8278

83-
# display future blog posts
84-
future: true
85-
8679
google_analytics: UA-84301828-1

_layouts/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616

1717
<link rel="shortcut icon" href="{{ site.baseurl }}/img/favicon-64.png">
18-
<link rel="alternate" type="application/rss+xml" title="{{ site.name }}" href="{{ site.url }}{{ site.baseurl }}/feed.xml">
18+
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ site.url }}{{ site.baseurl }}/feed.xml">
1919

2020
<link rel="stylesheet" href="{{ site.baseurl }}/css/syntax.css">
2121
<link rel="stylesheet" href="{{ site.baseurl }}/css/electrode-docs.css">

0 commit comments

Comments
 (0)