Skip to content

Commit

Permalink
Replaced jekyll-minifier that uses uglifier by terser (#2571)
Browse files Browse the repository at this point in the history
Hopefully fixes #2548.

---------

Signed-off-by: George Araujo <george.gcac@gmail.com>
Signed-off-by: George Araújo <george.gcac@gmail.com>
  • Loading branch information
george-gca authored Dec 23, 2024
1 parent ec7d7c3 commit 05eb46a
Show file tree
Hide file tree
Showing 53 changed files with 1,421 additions and 1,246 deletions.
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
**/*.min.css
**/*.min.js
assets/css/main.scss
assets/js/search-data.js
assets/js/distillpub/template.v2.js
assets/js/search/*.js
assets/plotly/demo.html
lighthouse_results/**
_posts/2015-10-20-math.md
_sass/font-awesome/*.scss
_sass/tabler-icons/*.scss
_scripts/search.liquid.js
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ group :jekyll_plugins do
gem 'jekyll-toc'
gem 'jekyll-twitter-plugin'
gem 'jemoji'
gem 'terser'
gem 'unicode_utils'
gem 'webrick'
end
Expand Down
44 changes: 24 additions & 20 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (8.0.0.1)
activesupport (8.0.1)
base64
benchmark (>= 0.3)
bigdecimal
Expand Down Expand Up @@ -39,7 +39,7 @@ GEM
rexml
csl-styles (1.0.1.11)
csl (~> 1.0)
css_parser (1.19.1)
css_parser (1.21.0)
addressable
cssminify2 (2.0.1)
csv (3.3.0)
Expand Down Expand Up @@ -166,7 +166,7 @@ GEM
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
logger (1.6.2)
logger (1.6.3)
loofah (2.23.1)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand All @@ -178,17 +178,17 @@ GEM
bigdecimal (~> 3.1)
namae (1.2.0)
racc (~> 1.7)
nokogiri (1.17.1-aarch64-linux)
nokogiri (1.17.2-aarch64-linux)
racc (~> 1.4)
nokogiri (1.17.1-arm-linux)
nokogiri (1.17.2-arm-linux)
racc (~> 1.4)
nokogiri (1.17.1-arm64-darwin)
nokogiri (1.17.2-arm64-darwin)
racc (~> 1.4)
nokogiri (1.17.1-x86-linux)
nokogiri (1.17.2-x86-linux)
racc (~> 1.4)
nokogiri (1.17.1-x86_64-darwin)
nokogiri (1.17.2-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.17.1-x86_64-linux)
nokogiri (1.17.2-x86_64-linux)
racc (~> 1.4)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
Expand All @@ -201,30 +201,32 @@ GEM
rexml (3.3.9)
rouge (4.5.1)
safe_yaml (1.0.5)
sass-embedded (1.82.0-aarch64-linux-gnu)
sass-embedded (1.83.0-aarch64-linux-gnu)
google-protobuf (~> 4.28)
sass-embedded (1.82.0-aarch64-linux-musl)
sass-embedded (1.83.0-aarch64-linux-musl)
google-protobuf (~> 4.28)
sass-embedded (1.82.0-arm-linux-gnueabihf)
sass-embedded (1.83.0-arm-linux-gnueabihf)
google-protobuf (~> 4.28)
sass-embedded (1.82.0-arm-linux-musleabihf)
sass-embedded (1.83.0-arm-linux-musleabihf)
google-protobuf (~> 4.28)
sass-embedded (1.82.0-arm64-darwin)
sass-embedded (1.83.0-arm64-darwin)
google-protobuf (~> 4.28)
sass-embedded (1.82.0-x86-linux-gnu)
sass-embedded (1.83.0-x86-linux-gnu)
google-protobuf (~> 4.28)
sass-embedded (1.82.0-x86-linux-musl)
sass-embedded (1.83.0-x86-linux-musl)
google-protobuf (~> 4.28)
sass-embedded (1.82.0-x86_64-darwin)
sass-embedded (1.83.0-x86_64-darwin)
google-protobuf (~> 4.28)
sass-embedded (1.82.0-x86_64-linux-gnu)
sass-embedded (1.83.0-x86_64-linux-gnu)
google-protobuf (~> 4.28)
sass-embedded (1.82.0-x86_64-linux-musl)
sass-embedded (1.83.0-x86_64-linux-musl)
google-protobuf (~> 4.28)
sax-machine (1.3.2)
securerandom (0.4.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
terser (1.2.4)
execjs (>= 0.3.0, < 3)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uglifier (4.2.1)
Expand All @@ -248,6 +250,7 @@ PLATFORMS
x86-linux-gnu
x86-linux-musl
x86_64-darwin
x86_64-linux
x86_64-linux-gnu
x86_64-linux-musl

Expand All @@ -273,8 +276,9 @@ DEPENDENCIES
jekyll-toc
jekyll-twitter-plugin
jemoji
terser
unicode_utils
webrick

BUNDLED WITH
2.5.18
2.5.7
16 changes: 12 additions & 4 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ kramdown:
start_line: 1

# Includes & excludes
include: ["_pages"]
include: ["_pages", "_scripts"]
exclude:
- bin/
- CONTRIBUTING.md
Expand Down Expand Up @@ -224,6 +224,7 @@ plugins:
- jekyll-toc
- jekyll-twitter-plugin
- jemoji
- terser

# Sitemap settings
defaults:
Expand All @@ -240,9 +241,16 @@ sass:
# -----------------------------------------------------------------------------

jekyll-minifier:
exclude: ["robots.txt", "assets/js/search/*.js", "assets/libs/**/*"]
uglifier_args:
harmony: true
compress_javascript: false # set to false since we are using terser as the js minifier
# exclude: ["robots.txt", "assets/js/search/*.js"]

# -----------------------------------------------------------------------------
# Terser
# -----------------------------------------------------------------------------

terser:
compress:
drop_console: true

# -----------------------------------------------------------------------------
# Jekyll Archives
Expand Down
Loading

0 comments on commit 05eb46a

Please sign in to comment.