Skip to content

Commit 381e665

Browse files
author
Matthieu Oger
committed
Use webpack build pipeline
See https://github.com/solarsailer/jekyll-boilerplate
1 parent 5b32f53 commit 381e665

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+4952
-754
lines changed

‎Gemfile

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
source "https://rubygems.org"
2+
ruby RUBY_VERSION
23

3-
gem 'sass'
4-
gem 'sass-globbing'
4+
gem 'jekyll', '3.3.1'
55

66
group :jekyll_plugins do
7-
gem "github-pages"
8-
gem 'jekyll-paginate'
9-
gem 'jekyll-redirect-from'
7+
gem 'jekyll-paginate', '1.1.0'
8+
gem 'jekyll-redirect-from', '0.12.1'
109
end

‎Gemfile.lock

+6-158
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,11 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.2.7)
5-
i18n (~> 0.7)
6-
json (~> 1.7, >= 1.7.7)
7-
minitest (~> 5.1)
8-
thread_safe (~> 0.3, >= 0.3.4)
9-
tzinfo (~> 1.1)
104
addressable (2.5.0)
115
public_suffix (~> 2.0, >= 2.0.2)
12-
coffee-script (2.4.1)
13-
coffee-script-source
14-
execjs
15-
coffee-script-source (1.12.2)
166
colorator (1.1.0)
17-
ethon (0.10.1)
18-
ffi (>= 1.3.0)
19-
execjs (2.7.0)
20-
faraday (0.11.0)
21-
multipart-post (>= 1.2, < 3)
227
ffi (1.9.17)
238
forwardable-extended (2.6.0)
24-
gemoji (3.0.0)
25-
github-pages (123)
26-
activesupport (= 4.2.7)
27-
github-pages-health-check (= 1.3.0)
28-
jekyll (= 3.3.1)
29-
jekyll-avatar (= 0.4.2)
30-
jekyll-coffeescript (= 1.0.1)
31-
jekyll-default-layout (= 0.1.4)
32-
jekyll-feed (= 0.9.1)
33-
jekyll-gist (= 1.4.0)
34-
jekyll-github-metadata (= 2.3.1)
35-
jekyll-mentions (= 1.2.0)
36-
jekyll-optional-front-matter (= 0.1.2)
37-
jekyll-paginate (= 1.1.0)
38-
jekyll-readme-index (= 0.0.4)
39-
jekyll-redirect-from (= 0.12.1)
40-
jekyll-relative-links (= 0.3.0)
41-
jekyll-sass-converter (= 1.5.0)
42-
jekyll-seo-tag (= 2.1.0)
43-
jekyll-sitemap (= 1.0.0)
44-
jekyll-swiss (= 0.4.0)
45-
jekyll-theme-architect (= 0.0.3)
46-
jekyll-theme-cayman (= 0.0.3)
47-
jekyll-theme-dinky (= 0.0.3)
48-
jekyll-theme-hacker (= 0.0.3)
49-
jekyll-theme-leap-day (= 0.0.3)
50-
jekyll-theme-merlot (= 0.0.3)
51-
jekyll-theme-midnight (= 0.0.3)
52-
jekyll-theme-minimal (= 0.0.3)
53-
jekyll-theme-modernist (= 0.0.3)
54-
jekyll-theme-primer (= 0.1.7)
55-
jekyll-theme-slate (= 0.0.3)
56-
jekyll-theme-tactile (= 0.0.3)
57-
jekyll-theme-time-machine (= 0.0.3)
58-
jekyll-titles-from-headings (= 0.1.4)
59-
jemoji (= 0.8.0)
60-
kramdown (= 1.13.2)
61-
liquid (= 3.0.6)
62-
listen (= 3.0.6)
63-
mercenary (~> 0.3)
64-
minima (= 2.0.0)
65-
nokogiri (= 1.6.8.1)
66-
rouge (= 1.11.1)
67-
terminal-table (~> 1.4)
68-
github-pages-health-check (1.3.0)
69-
addressable (~> 2.3)
70-
net-dns (~> 0.8)
71-
octokit (~> 4.0)
72-
public_suffix (~> 2.0)
73-
typhoeus (~> 0.7)
74-
html-pipeline (2.5.0)
75-
activesupport (>= 2)
76-
nokogiri (>= 1.4)
77-
i18n (0.8.1)
789
jekyll (3.3.1)
7910
addressable (~> 2.4)
8011
colorator (~> 1.0)
@@ -86,90 +17,19 @@ GEM
8617
pathutil (~> 0.9)
8718
rouge (~> 1.7)
8819
safe_yaml (~> 1.0)
89-
jekyll-avatar (0.4.2)
90-
jekyll (~> 3.0)
91-
jekyll-coffeescript (1.0.1)
92-
coffee-script (~> 2.2)
93-
jekyll-default-layout (0.1.4)
94-
jekyll (~> 3.0)
95-
jekyll-feed (0.9.1)
96-
jekyll (~> 3.3)
97-
jekyll-gist (1.4.0)
98-
octokit (~> 4.2)
99-
jekyll-github-metadata (2.3.1)
100-
jekyll (~> 3.1)
101-
octokit (~> 4.0, != 4.4.0)
102-
jekyll-mentions (1.2.0)
103-
activesupport (~> 4.0)
104-
html-pipeline (~> 2.3)
105-
jekyll (~> 3.0)
106-
jekyll-optional-front-matter (0.1.2)
107-
jekyll (~> 3.0)
10820
jekyll-paginate (1.1.0)
109-
jekyll-readme-index (0.0.4)
110-
jekyll (~> 3.0)
11121
jekyll-redirect-from (0.12.1)
11222
jekyll (~> 3.3)
113-
jekyll-relative-links (0.3.0)
114-
jekyll (~> 3.3)
11523
jekyll-sass-converter (1.5.0)
11624
sass (~> 3.4)
117-
jekyll-seo-tag (2.1.0)
118-
jekyll (~> 3.3)
119-
jekyll-sitemap (1.0.0)
120-
jekyll (~> 3.3)
121-
jekyll-swiss (0.4.0)
122-
jekyll-theme-architect (0.0.3)
123-
jekyll (~> 3.3)
124-
jekyll-theme-cayman (0.0.3)
125-
jekyll (~> 3.3)
126-
jekyll-theme-dinky (0.0.3)
127-
jekyll (~> 3.3)
128-
jekyll-theme-hacker (0.0.3)
129-
jekyll (~> 3.3)
130-
jekyll-theme-leap-day (0.0.3)
131-
jekyll (~> 3.3)
132-
jekyll-theme-merlot (0.0.3)
133-
jekyll (~> 3.3)
134-
jekyll-theme-midnight (0.0.3)
135-
jekyll (~> 3.3)
136-
jekyll-theme-minimal (0.0.3)
137-
jekyll (~> 3.3)
138-
jekyll-theme-modernist (0.0.3)
139-
jekyll (~> 3.3)
140-
jekyll-theme-primer (0.1.7)
141-
jekyll (~> 3.3)
142-
jekyll-theme-slate (0.0.3)
143-
jekyll (~> 3.3)
144-
jekyll-theme-tactile (0.0.3)
145-
jekyll (~> 3.3)
146-
jekyll-theme-time-machine (0.0.3)
147-
jekyll (~> 3.3)
148-
jekyll-titles-from-headings (0.1.4)
149-
jekyll (~> 3.3)
15025
jekyll-watch (1.5.0)
15126
listen (~> 3.0, < 3.1)
152-
jemoji (0.8.0)
153-
activesupport (~> 4.0)
154-
gemoji (~> 3.0)
155-
html-pipeline (~> 2.2)
156-
jekyll (>= 3.0)
157-
json (1.8.6)
15827
kramdown (1.13.2)
15928
liquid (3.0.6)
16029
listen (3.0.6)
16130
rb-fsevent (>= 0.9.3)
16231
rb-inotify (>= 0.9.7)
16332
mercenary (0.3.6)
164-
mini_portile2 (2.1.0)
165-
minima (2.0.0)
166-
minitest (5.10.1)
167-
multipart-post (2.0.0)
168-
net-dns (0.8.0)
169-
nokogiri (1.6.8.1)
170-
mini_portile2 (~> 2.1.0)
171-
octokit (4.6.2)
172-
sawyer (~> 0.8.0, >= 0.5.3)
17333
pathutil (0.14.0)
17434
forwardable-extended (~> 2.6)
17535
public_suffix (2.0.5)
@@ -179,29 +39,17 @@ GEM
17939
rouge (1.11.1)
18040
safe_yaml (1.0.4)
18141
sass (3.4.23)
182-
sass-globbing (1.1.5)
183-
sass (>= 3.1)
184-
sawyer (0.8.1)
185-
addressable (>= 2.3.5, < 2.6)
186-
faraday (~> 0.8, < 1.0)
187-
terminal-table (1.7.3)
188-
unicode-display_width (~> 1.1.1)
189-
thread_safe (0.3.5)
190-
typhoeus (0.8.0)
191-
ethon (>= 0.8.0)
192-
tzinfo (1.2.2)
193-
thread_safe (~> 0.1)
194-
unicode-display_width (1.1.3)
19542

19643
PLATFORMS
19744
ruby
19845

19946
DEPENDENCIES
200-
github-pages
201-
jekyll-paginate
202-
jekyll-redirect-from
203-
sass
204-
sass-globbing
47+
jekyll (= 3.3.1)
48+
jekyll-paginate (= 1.1.0)
49+
jekyll-redirect-from (= 0.12.1)
50+
51+
RUBY VERSION
52+
ruby 2.3.3p222
20553

20654
BUNDLED WITH
20755
1.14.3

‎_config.yml

+17-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,23 @@ show_drafts: nil
99
permalink: /:categories/:year/:month/:title/
1010

1111
include: ['_pages']
12-
exclude: ['README.md', 'LICENSE', 'package.json', 'gulpfile.js', 'node_modules', 'Gemfile', 'Gemfile.lock']
12+
13+
exclude:
14+
- 'README.md'
15+
- 'LICENSE'
16+
- 'Gemfile'
17+
- 'Gemfile.lock'
18+
- 'package.json'
19+
- 'webpack.config.js'
20+
- 'yarn.lock'
21+
- 'node_modules'
22+
- 'src'
23+
24+
keep_files:
25+
- static/bundle.css
26+
- static/bundle.css.map
27+
- static/bundle.js
28+
- static/bundle.js.map
1329

1430
# -------------------------------------------------------
1531
# Collections.

‎_includes/css.html

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
<!-- Fonts. -->
21
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Alegreya+Sans:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,800,800italic,900,900italic" />
32
<link rel="stylesheet" type="text/css" href="/static/fonts/bebas-neue/font.css" />
43

5-
<!-- CSS. -->
6-
<link rel="stylesheet" type="text/css" href="/static/vendor/css/normalize.css" />
7-
84
{% if jekyll.environment == "production" %}
9-
<link rel="stylesheet" type="text/css" href="/static/css/pixelnest.min.css" />
5+
<link rel="stylesheet" href="/static/assets/bundle.css">
106
{% else %}
11-
<link rel="stylesheet" type="text/css" href="/static/css/pixelnest.css" />
7+
<link rel="stylesheet" href="/static/bundle.css">
128
{% endif %}

‎_includes/js.html

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
{% if jekyll.environment == "production" %}
2+
<script src="/static/assets/bundle.js"></script>
3+
{% else %}
4+
<script src="/static/bundle.js"></script>
5+
{% endif %}
6+
17
{% if jekyll.environment == "production" %}
28
<script type="text/javascript">
39
var _gaq = _gaq || [];

‎_sass/pixelnest.scss

-17
This file was deleted.

0 commit comments

Comments
 (0)