From 1af82fef6cc681da11ec715df89c9d2bb8213436 Mon Sep 17 00:00:00 2001
From: Stefan <git@stefn.co.uk>
Date: Mon, 25 Nov 2024 23:15:42 +0000
Subject: [PATCH] Remove jekyll-minifier

---
 .build.yml   |  1 +
 Gemfile.lock | 15 ---------------
 _config.yml  |  3 ---
 bin/build    | 18 ++----------------
 bin/push     | 10 ++++++++++
 5 files changed, 13 insertions(+), 34 deletions(-)
 create mode 100755 bin/push

diff --git a/.build.yml b/.build.yml
index d614383..037b86f 100644
--- a/.build.yml
+++ b/.build.yml
@@ -7,3 +7,4 @@ tasks:
   - build: |
       cd chobble
       sh bin/build
+      sh bin/push
diff --git a/Gemfile.lock b/Gemfile.lock
index 7fd69eb..0cef3fe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,12 +6,10 @@ GEM
     bigdecimal (3.1.8)
     colorator (1.1.0)
     concurrent-ruby (1.3.4)
-    cssminify2 (2.0.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    execjs (2.10.0)
     ffi (1.17.0)
     ffi (1.17.0-aarch64-linux-gnu)
     ffi (1.17.0-aarch64-linux-musl)
@@ -42,7 +40,6 @@ GEM
     google-protobuf (4.28.3-x86_64-linux)
       bigdecimal
       rake (>= 13)
-    htmlcompressor (0.4.0)
     http_parser.rb (0.8.0)
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
@@ -62,19 +59,10 @@ GEM
       safe_yaml (~> 1.0)
       terminal-table (>= 1.8, < 4.0)
       webrick (~> 1.7)
-    jekyll-minifier (0.1.10)
-      cssminify2 (~> 2.0)
-      htmlcompressor (~> 0.4)
-      jekyll (>= 3.5)
-      json-minify (~> 0.0.3)
-      uglifier (~> 4.1)
     jekyll-sass-converter (3.0.0)
       sass-embedded (~> 1.54)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json (2.8.2)
-    json-minify (0.0.3)
-      json (> 0)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
@@ -141,8 +129,6 @@ GEM
       google-protobuf (~> 4.28)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    uglifier (4.2.1)
-      execjs (>= 0.3.0, < 3)
     unicode-display_width (2.6.0)
     webrick (1.9.0)
 
@@ -176,7 +162,6 @@ PLATFORMS
 
 DEPENDENCIES
   jekyll
-  jekyll-minifier
   sass-embedded (= 1.80.3)
   webrick (~> 1.7)
 
diff --git a/_config.yml b/_config.yml
index 14ca256..b90297e 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,6 +1,3 @@
-plugins:
-  - jekyll-minifier
-
 collections:
   sites:
     output: false
diff --git a/bin/build b/bin/build
index 6cfa3bb..194c6cb 100755
--- a/bin/build
+++ b/bin/build
@@ -2,26 +2,12 @@
 
 rm -rf _site
 
-nix-shell -p ruby_3_3 imagemagick pkg-config --pure --command "
-  export JEKYLL_ENV=production
-  echo 'Installing bundles'
-  bundle config set path 'vendor/cache'
-  bundle install --gemfile=Gemfile
-
+nix-shell -p jekyll --pure --command "
   echo 'Building site'
-  bundle exec jekyll build
+  jekyll build
 "
 
 nix-shell -p html-minifier --pure --command "
   echo 'Minifying site'
   html-minifier --input-dir _site --output-dir _site --collapse-whitespace --file-ext html
 "
-
-nix-shell -p neocities-cli --command "
-  echo 'Pushing to Neocities'
-
-  set +x
-  export NEOCITIES_API_KEY=$(cat ~/.neocities/chobble)
-  set -x
-  neocities push --prune _site
-"
diff --git a/bin/push b/bin/push
new file mode 100755
index 0000000..b3589ef
--- /dev/null
+++ b/bin/push
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+nix-shell -p neocities-cli --command "
+  echo 'Pushing to Neocities'
+
+  set +x
+  export NEOCITIES_API_KEY=$(cat ~/.neocities/chobble)
+  set -x
+  neocities push --prune _site
+"