jekyll-minify-js 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acd026f57e7f1f4e1b695587f25a83a067ecbae57514787f6234155f85940def
-  data.tar.gz: 6de165cf4f0d48fb066417a54d7d844bcfe28185966edd1b17c7ef1846a4edef
+  metadata.gz: b44a42e35257584ee45662ee7739a91e85cde0769071ed2373091278955dfa18
+  data.tar.gz: f84f80cc36b6eba9160a5424aef9f1bb77cd74b463d4ec702f83c0575d4f10e8
 SHA512:
-  metadata.gz: b072b14a5eda7cf28a971c585caf4c682b795671fff04d6c1c40c5372d6abe5e50c2b7a141d05b4ce1a4f8a714f7fc5fc53c1115554c9a763c873e42a26d11ad
-  data.tar.gz: 7f916fa240b4a3d415ab0d7f25b9722882ce44801e16410b975a995298aa31751a74c9fecb6b81646a89005bcfadde3ec100d1b0f206895a1a5b447eb18cc3f6
+  metadata.gz: dceea9e11499497a69af5bc29031006c651a4428b83de86634822d2f4e91836d1738595c5cc9ad14881e33d15b77b8b9b50088226c44f12b99c7ea59f875e3d0
+  data.tar.gz: 303a138bf705689bbde1b7da5c875a2c802be8a52dd32c230b23866cf63eba6eb7fc726811cba23fafbef92d3edcd98838e0e778822468cd702f9bc38fa9dc60

data/README.md

@@ -42,10 +42,9 @@ minify_js:
   enable: true
   entry_dir: js
   output_dir: js
-  terser_opts:
-    compress: true
-    mangle: true
-    source_map: true
+  compress: true
+  mangle: true
+  source_map: true
 ```
 
 ### Options

data/lib/color.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+def set_color(index, content, weight = 0)
+  "\e[#{weight};#{index}m#{content}\e[0m "
+end

data/lib/jekyll-minify-js.rb

@@ -1,131 +1,100 @@
 # frozen_string_literal: true
 
+require "logger"
+
 require "jekyll"
-require "json"
-require "open3"
-require "pathname"
+require "fileutils"
+require "terser"
 
 require_relative "version"
+require_relative "color"
 
+# module Jekyll
 module Jekyll
-  # Minifies JavaScript assets after Jekyll finishes writing the site.
-  #
-  # The plugin reads files from a configured entry directory, invokes the
-  # bundled Node-based terser wrapper, and writes the compiled assets into the
-  # destination site output.
+  # module Jekyll::MinifyJs
   module MinifyJs
-    # Runs JavaScript minification from Jekyll's post-write lifecycle.
-    #
-    # The generator itself does not perform work during the normal generation
-    # phase. Instead, {run} is invoked from a `:post_write` hook so Jekyll does
-    # not overwrite the generated minified files.
+    # class Jekyll::MinifyJs:TerserGenerator
     class TerserGenerator < Jekyll::Generator
       safe true
       priority :low
 
-      # Declares the generator without doing work during the normal build phase.
-      #
-      # @param _site [Jekyll::Site] the site being generated
-      # @return [void]
       def generate(_site)
         # Work is done in the :post_write hook to avoid Jekyll overwriting outputs.
       end
 
-      # Merges the plugin configuration with defaults.
-      #
-      # @param site [Jekyll::Site] the current site instance
-      # @return [Hash] the merged `minify_js` configuration
-      def self.minify_js_config(site)
-        default_config = {
-          "enabled" => true,
-          "entry_dir" => "js",
-          "output_dir" => "js",
-          "terser_opts" => {
-            "source_map" => true,
-            "compress" => true
-          }
-        }
-        site.config["minify_js"] = default_config.merge(site.config["minify_js"] || {})
-      end
+      def self.run(site) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+        config = site.config["minify_js"] || {}
+        # disable to skip minification
+        return if config["enable"] && config["enable"] == false
 
-      # Runs the Node-based terser wrapper for one JavaScript source string.
-      #
-      # @param code [String] the JavaScript source to minify
-      # @param ts_opts [Hash, nil] terser options passed to the wrapper
-      # @return [Hash] the parsed JSON response from the wrapper
-      # @raise [RuntimeError] if the wrapper process exits unsuccessfully
-      def self.run_terser(code, ts_opts)
-        script_path = File.expand_path("../assets/index.js", __dir__)
-        input = JSON.generate({
-          code: code,
-          opts: ts_opts
-        }.compact)
-        stdout, stderr, status = Open3.capture3("node", script_path, stdin_data: input)
-        raise "Minify JS failed: #{stderr}" unless status.success?
-
-        JSON.parse(stdout)
-      end
+        started_at = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        # Build options from config
+        compress_opt = config.fetch("compress", true)
+        mangle_opt = config.fetch("mangle", true)
+        source_map_enabled = config.fetch("source_map", true)
 
-      # Finds JavaScript files in the configured entry directory.
-      #
-      # @param site [Jekyll::Site] the current site instance
-      # @param entry [String, nil] the source directory relative to `site.source`
-      # @return [Array<String>, nil] matching absolute file paths, or `nil` when
-      #   no entry directory is configured or no files are found
-      def self.entry_js_files(site, entry)
-        entry_full = File.join(site.source, entry)
-        js_files = Dir.glob(File.join(entry_full, "**", "*.js"))
-        if Dir.exist?(entry_full) && js_files.empty?
-          Jekyll.logger.warn "MinifyJs:",
-                             "No JavaScript files found in #{entry_full}."
-        end
-        return if entry.nil? || js_files.empty?
+        Jekyll.logger.info ""
+        Jekyll.logger.info set_color(96, "Running Jekyll MinifyJs v#{Jekyll::MinifyJs::VERSION}", 1)
 
-        js_files
-      end
+        entry_dir = config["entry_dir"] || "js"
+        out_dir = config["output_dir"] || "js"
 
-      # Resolves the output directory for minified assets.
-      #
-      # @param site [Jekyll::Site] the current site instance
-      # @param out [String, nil] the configured output directory
-      # @param entry [String] the configured entry directory
-      # @return [String] the absolute destination directory inside `site.dest`
-      def self.output_dir(site, out, entry)
-        out ? File.join(site.dest, out) : File.join(site.dest, entry)
-      end
+        if config["entry_dir"]
+          Jekyll.logger.info "Entry  : #{File.join(site.source, config["entry_dir"])}"
+        else
+          Jekyll.logger.info "Entry  : No entry_dir found, look in #{File.join(site.source, "js")}"
+        end
+
+        if config["output_dir"]
+          Jekyll.logger.info "Output : #{File.join(site.dest, config["output_dir"])}"
+        else
+          Jekyll.logger.info "Output : No output_dir found, write to #{File.join(site.dest, "js")}"
+        end
 
-      # Minifies every JavaScript file configured for the site.
-      #
-      # Files are written into the resolved output directory. If minification of
-      # an individual file fails, the original file is copied instead.
-      #
-      # @param site [Jekyll::Site] the current site instance
-      # @return [void]
-      def self.run(site) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-        Jekyll.logger.info "Running jekyll-minify-js v#{Jekyll::MinifyJs::VERSION}"
-        mini_js_config = minify_js_config(site)
-        entry_dir = mini_js_config["entry_dir"]
-        nil if (mini_js_config["enable"] && mini_js_config["enable"] == false) || entry_dir.nil?
-        out_dir = output_dir(site, mini_js_config["output_dir"], entry_dir)
-        ts_opts = mini_js_config["terser_opts"]
         entry_dir_full = File.join(site.source, entry_dir)
-        js_files = entry_js_files(site, entry_dir)
+        out_dir_full = File.join(site.dest, out_dir)
+        js_files = Dir.glob(File.join(entry_dir_full, "**", "*.js"))
+
+        Jekyll.logger.warn "MinifyJs:", "Entry directory not found: #{entry_dir_full}" unless Dir.exist?(entry_dir_full)
+        if Dir.exist?(entry_dir_full) && js_files.empty?
+          Jekyll.logger.info "MinifyJs:",
+                             "No JavaScript files found in #{entry_dir_full}"
+        end
+
+        FileUtils.mkdir_p(out_dir_full)
 
         js_files.each do |src|
           rel = src.sub(/\A#{Regexp.escape(entry_dir_full + File::SEPARATOR)}/, "")
-          out = File.join(out_dir, rel)
+          out = File.join(out_dir_full, rel)
           map_name = "#{File.basename(out)}.map"
-          src_content = File.read(src)
-          result = run_terser(src_content, ts_opts)
-          compiled = result["compiled"]
-          source_map = result["source_map"]
-          compiled += "\n//# sourceMappingURL=#{map_name}\n" if source_map && !compiled.include?("sourceMappingURL")
-          File.write(out, compiled)
-          File.write("#{out}.map", source_map) if source_map
-        rescue StandardError => e
-          Jekyll.logger.warn "jekyll-minify-js:", "failed to minify for #{rel}: #{e.message}; copying original"
-          FileUtils.cp(src, out)
+
+          begin
+            src_content = File.open(src, "r:BOM|UTF-8", &:read)
+            options = {}
+            options[:compress] = compress_opt
+            options[:mangle] = mangle_opt
+            if source_map_enabled
+              options[:source_map] =
+                { filename: File.basename(src), output_filename: File.basename(out), sources_content: true,
+                  url: map_name }
+              compiled, map = Terser.compile_with_map(src_content, options)
+            else
+              compiled = Terser.compile(src_content, options)
+              map = nil
+            end
+            if source_map_enabled && !compiled.include?("sourceMappingURL")
+              compiled += "\n//# sourceMappingURL=#{map_name}\n"
+            end
+            File.write(out, compiled)
+            File.write("#{out}.map", map) if map
+          rescue StandardError => e
+            Jekyll.logger.warn "Terser:", "ruby terser failed for #{rel}: #{e.message}; copying original"
+            FileUtils.cp(src, out)
+          end
         end
+
+        elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - started_at
+        Jekyll.logger.info set_color(92, format("Done in %.2fs", elapsed), 1)
       end
     end
   end

data/lib/version.rb

@@ -6,6 +6,6 @@ module Jekyll
     # Current gem version.
     #
     # @return [String]
-    VERSION = "0.2.13"
+    VERSION = "0.2.14"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-minify-js
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors:
 - phothinmg
@@ -24,19 +24,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.4'
 - !ruby/object:Gem::Dependency
-  name: open3
+  name: terser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 1.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 1.2.7
 email:
 - phothinmg@disroot.org
 executables: []
@@ -45,8 +45,7 @@ extra_rdoc_files: []
 files:
 - LICENSE.txt
 - README.md
-- assets/index.js
-- assets/index.js.map
+- lib/color.rb
 - lib/jekyll-minify-js.rb
 - lib/version.rb
 homepage: https://github.com/phothinmg/jekyll-minify-js