Skip to content

Commit 3c52aa0

Browse files
alshedivatodcambc
authored andcommitted
Remove internal copy of jekyll-terser (alshedivat#2945)
since RobertoJBeltran/jekyll-terser#1 has been merged, I'm removing the internal copy jekyll-terser and switching to https://github.com/RobertoJBeltran/jekyll-terser instead. also, refactored `Gemfile` a bit.
1 parent 54b05c0 commit 3c52aa0

File tree

5 files changed

+60
-153
lines changed

5 files changed

+60
-153
lines changed

Gemfile

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
source 'https://rubygems.org'
2+
3+
gem 'jekyll'
4+
5+
# Core plugins that directly affect site building
26
group :jekyll_plugins do
3-
gem 'classifier-reborn'
4-
gem 'jekyll'
57
gem 'jekyll-archives'
68
gem 'jekyll-email-protect'
79
gem 'jekyll-feed'
@@ -15,17 +17,22 @@ group :jekyll_plugins do
1517
gem 'jekyll-scholar'
1618
gem 'jekyll-sitemap'
1719
gem 'jekyll-tabs'
20+
gem 'jekyll-terser', :git => "https://github.com/RobertoJBeltran/jekyll-terser.git"
1821
gem 'jekyll-toc'
1922
gem 'jekyll-twitter-plugin'
2023
gem 'jemoji'
21-
gem 'terser'
22-
gem 'unicode_utils'
23-
gem 'webrick'
24+
25+
gem 'classifier-reborn' # used for content categorization during the build
2426
end
27+
28+
# Gems for development or external data fetching (outside :jekyll_plugins)
2529
group :other_plugins do
2630
gem 'css_parser'
2731
gem 'feedjira'
2832
gem 'httparty'
29-
gem 'observer' # used by jekyll-scholar
30-
gem 'ostruct' # used by jekyll-twitter-plugin
33+
gem 'observer' # used by jekyll-scholar
34+
gem 'ostruct' # used by jekyll-twitter-plugin
35+
gem 'terser' # used by jekyll-terser
36+
# gem 'unicode_utils' -- should be already installed by jekyll
37+
# gem 'webrick' -- should be already installed by jekyll
3138
end

Gemfile.lock

Lines changed: 27 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
GIT
2+
remote: https://github.com/RobertoJBeltran/jekyll-terser.git
3+
revision: 2f737004fe4732b92021c84e4de71e6a8585ff01
4+
specs:
5+
jekyll-terser (0.2.2)
6+
jekyll (>= 0.10.0)
7+
terser (>= 1.0.0)
8+
19
GEM
210
remote: https://rubygems.org/
311
specs:
@@ -32,7 +40,7 @@ GEM
3240
matrix (~> 0.4)
3341
colorator (1.1.0)
3442
concurrent-ruby (1.3.4)
35-
connection_pool (2.4.1)
43+
connection_pool (2.5.0)
3644
crass (1.0.6)
3745
csl (1.6.0)
3846
namae (~> 1.0)
@@ -59,8 +67,6 @@ GEM
5967
ffi (1.17.1-arm-linux-gnu)
6068
ffi (1.17.1-arm-linux-musl)
6169
ffi (1.17.1-arm64-darwin)
62-
ffi (1.17.1-x86-linux-gnu)
63-
ffi (1.17.1-x86-linux-musl)
6470
ffi (1.17.1-x86_64-darwin)
6571
ffi (1.17.1-x86_64-linux-gnu)
6672
ffi (1.17.1-x86_64-linux-musl)
@@ -75,9 +81,6 @@ GEM
7581
google-protobuf (4.29.2-arm64-darwin)
7682
bigdecimal
7783
rake (>= 13)
78-
google-protobuf (4.29.2-x86-linux)
79-
bigdecimal
80-
rake (>= 13)
8184
google-protobuf (4.29.2-x86_64-darwin)
8285
bigdecimal
8386
rake (>= 13)
@@ -167,21 +170,17 @@ GEM
167170
rb-fsevent (~> 0.10, >= 0.10.3)
168171
rb-inotify (~> 0.9, >= 0.9.10)
169172
logger (1.6.4)
170-
loofah (2.23.1)
173+
loofah (2.24.0)
171174
crass (~> 1.0.2)
172175
nokogiri (>= 1.12.0)
173176
matrix (0.4.2)
174177
mercenary (0.4.0)
175178
mini_mime (1.1.5)
176-
mini_portile2 (2.8.8)
177179
minitest (5.25.4)
178180
multi_xml (0.7.1)
179181
bigdecimal (~> 3.1)
180182
namae (1.2.0)
181183
racc (~> 1.7)
182-
nokogiri (1.18.1)
183-
mini_portile2 (~> 2.8.2)
184-
racc (~> 1.4)
185184
nokogiri (1.18.1-aarch64-linux-gnu)
186185
racc (~> 1.4)
187186
nokogiri (1.18.1-aarch64-linux-musl)
@@ -211,26 +210,22 @@ GEM
211210
rexml (3.4.0)
212211
rouge (4.5.1)
213212
safe_yaml (1.0.5)
214-
sass-embedded (1.83.0-aarch64-linux-gnu)
215-
google-protobuf (~> 4.28)
216-
sass-embedded (1.83.0-aarch64-linux-musl)
217-
google-protobuf (~> 4.28)
218-
sass-embedded (1.83.0-arm-linux-gnueabihf)
219-
google-protobuf (~> 4.28)
220-
sass-embedded (1.83.0-arm-linux-musleabihf)
221-
google-protobuf (~> 4.28)
222-
sass-embedded (1.83.0-arm64-darwin)
223-
google-protobuf (~> 4.28)
224-
sass-embedded (1.83.0-x86-linux-gnu)
225-
google-protobuf (~> 4.28)
226-
sass-embedded (1.83.0-x86-linux-musl)
227-
google-protobuf (~> 4.28)
228-
sass-embedded (1.83.0-x86_64-darwin)
229-
google-protobuf (~> 4.28)
230-
sass-embedded (1.83.0-x86_64-linux-gnu)
231-
google-protobuf (~> 4.28)
232-
sass-embedded (1.83.0-x86_64-linux-musl)
233-
google-protobuf (~> 4.28)
213+
sass-embedded (1.83.1-aarch64-linux-gnu)
214+
google-protobuf (~> 4.29)
215+
sass-embedded (1.83.1-aarch64-linux-musl)
216+
google-protobuf (~> 4.29)
217+
sass-embedded (1.83.1-arm-linux-gnueabihf)
218+
google-protobuf (~> 4.29)
219+
sass-embedded (1.83.1-arm-linux-musleabihf)
220+
google-protobuf (~> 4.29)
221+
sass-embedded (1.83.1-arm64-darwin)
222+
google-protobuf (~> 4.29)
223+
sass-embedded (1.83.1-x86_64-darwin)
224+
google-protobuf (~> 4.29)
225+
sass-embedded (1.83.1-x86_64-linux-gnu)
226+
google-protobuf (~> 4.29)
227+
sass-embedded (1.83.1-x86_64-linux-musl)
228+
google-protobuf (~> 4.29)
234229
sax-machine (1.3.2)
235230
securerandom (0.4.1)
236231
terminal-table (3.0.2)
@@ -242,23 +237,18 @@ GEM
242237
uglifier (4.2.1)
243238
execjs (>= 0.3.0, < 3)
244239
unicode-display_width (2.6.0)
245-
unicode_utils (1.4.0)
246240
uri (1.0.2)
247241
webrick (1.9.1)
248242

249243
PLATFORMS
250244
aarch64-linux
251245
aarch64-linux-gnu
252246
aarch64-linux-musl
253-
arm-linux
254247
arm-linux-gnu
255248
arm-linux-gnueabihf
256249
arm-linux-musl
257250
arm-linux-musleabihf
258251
arm64-darwin
259-
x86-linux
260-
x86-linux-gnu
261-
x86-linux-musl
262252
x86_64-darwin
263253
x86_64-linux
264254
x86_64-linux-gnu
@@ -283,14 +273,13 @@ DEPENDENCIES
283273
jekyll-scholar
284274
jekyll-sitemap
285275
jekyll-tabs
276+
jekyll-terser!
286277
jekyll-toc
287278
jekyll-twitter-plugin
288279
jemoji
289280
observer
290281
ostruct
291282
terser
292-
unicode_utils
293-
webrick
294283

295284
BUNDLED WITH
296285
<<<<<<< HEAD

_config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,10 +292,10 @@ plugins:
292292
- jekyll/scholar
293293
- jekyll-sitemap
294294
- jekyll-tabs
295+
- jekyll-terser
295296
- jekyll-toc
296297
- jekyll-twitter-plugin
297298
- jemoji
298-
- terser
299299

300300
# Sitemap settings
301301
defaults:
@@ -709,6 +709,7 @@ third_party_libraries:
709709
jekyll_get_json:
710710
- data: resume
711711
json: assets/json/resume.json # it can also be an url
712+
712713
jsonresume:
713714
- basics
714715
- work

_plugins/terser.rb

Lines changed: 0 additions & 102 deletions
This file was deleted.

package-lock.json

Lines changed: 17 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)