jekyll-minify-js 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e69100dbb0743cb01a51bb500368c85622ebf8ae36045868a7df51901d124a9
-  data.tar.gz: 5c01abd49ffb1fc246c04c15e942be2e6ef7b09da2edbeab639141040a74cc3f
+  metadata.gz: c041f8521ebee7c8566cf323651ccc353420efeef273f8fc3bdfd02663e2b113
+  data.tar.gz: '09726cc6fa6a01c886401c88598e31d51ba8f484a769d90e2123bb54e14cb4a5'
 SHA512:
-  metadata.gz: f4f4d8bec2fed75e8c6c5172bd9f3769b9ee95895501cce6af94355c45e63a45525be3b794a900eb14a49f167b615e69c3d91e54965cf6b92dcae4759f8dfef5
-  data.tar.gz: 54c2874d562f4ac4b4ab974ceb93568bbd55925f7bb9680cbca64470332014a6aa7171198fd0570e3c010b27ec6c70b40d36107a5d10a537939d342fe2a526a2
+  metadata.gz: 23b0a1eba4256d7ebeda0a84438c5726ad7bd3c116458215835e2b3e2f96e480ba9b269f345ddf45eb88713620379d9e899341db7c90224a9686e72090824372
+  data.tar.gz: 4951af9f563429564fd604263d3c183d9185c61d21df851080519ab84425d4387f6c33821d22768dd75a1ff6193aee0351ad6781ed8274148a71387108496866

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

@@ -2,63 +2,70 @@
 
 require 'jekyll'
 require 'fileutils'
-require 'shellwords'
-begin
-  require 'terser'
-rescue LoadError
-  # terser gem not available; plugin will fallback to external CLI or copy
-end
-require 'pathname'
+require 'terser'
+
+require_relative 'version'
+require_relative 'color'
 
 # module Jekyll
 module Jekyll
-  # MinifyJs is a Jekyll `Generator` that minifies JavaScript files found under
-  # common asset directories. It prefers the `terser` Ruby gem when available
-  # and falls back to an external `terser` CLI when necessary.
-  class MinifyJs < Generator
-    safe true
-    priority :low
-
-    def generate(_site)
-      # Work is done in the :post_write hook to avoid Jekyll overwriting outputs.
-    end
+  # module Jekyll::MinifyJs
+  module MinifyJs
+    # class Jekyll::MinifyJs:TerserGenerator
+    class TerserGenerator < Jekyll::Generator
+      safe true
+      priority :low
+
+      def generate(_site)
+        # Work is done in the :post_write hook to avoid Jekyll overwriting outputs.
+      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
+
+        started_at = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        # Build options from config
+        compress_opt = config['compress'] || true
+        mangle_opt = config['mangle'] || true
+        source_map_enabled = config['source_map'] || true
+
+        Jekyll.logger.info ''
+        Jekyll.logger.info set_color(96, "Running Jekyll MinifyJs v#{Jekyll::MinifyJs::VERSION}", 1)
+
+        entry_dir = config['entry_dir'] || 'js'
+        out_dir = config['output_dir'] || 'js'
+
+        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
+
+        entry_dir_full = File.join(site.source, 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_full, rel)
+          map_name = "#{File.basename(out)}.map"
 
-    def self.run(site) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
-      # Support both repository-root layout and app/ layout.
-      candidates = [
-        File.join(site.source, 'assets', 'js'),
-        File.join(site.source, 'app', 'assets', 'js')
-      ]
-      src_dir = candidates.find { |p| Dir.exist?(p) }
-      return unless src_dir
-
-      # Read configuration from _config.yml under `minify_js:` key
-      cfg = site.config.fetch('minify_js', {})
-      return if cfg.key?('enabled') && cfg['enabled'] == false
-
-      dest_dir = File.join(site.dest, cfg.fetch('output_dir', 'assets/js'))
-      FileUtils.mkdir_p(dest_dir)
-
-      terser_available = defined?(Terser)
-
-      # Build options from config
-      compress_opt = cfg.fetch('compress', true)
-      mangle_opt = cfg.fetch('mangle', true)
-      source_map_enabled = cfg.fetch('source_map', true)
-      exclude_patterns = cfg.fetch('exclude', ['**/*.min.js'])
-
-      Dir.glob(File.join(src_dir, '**', '*.js')).each do |src| # rubocop:disable Metrics/BlockLength
-        rel = Pathname.new(src).relative_path_from(Pathname.new(src_dir)).to_s
-        out = File.join(dest_dir, rel)
-        out_dir = File.dirname(out)
-        FileUtils.mkdir_p(out_dir)
-        map_name = "#{File.basename(out)}.map"
-
-        # Skip excluded files
-        next if exclude_patterns.any? { |pat| File.fnmatch(pat, rel) }
-
-        if terser_available
-          Jekyll.logger.info 'Terser:', "minifying #{rel} via terser Ruby gem"
           begin
             src_content = File.open(src, 'r:BOM|UTF-8', &:read)
             options = {}
@@ -80,30 +87,15 @@ module Jekyll
             Jekyll.logger.warn 'Terser:', "ruby terser failed for #{rel}: #{e.message}; copying original"
             FileUtils.cp(src, out)
           end
-        else
-          terser_cmd = new.detect_terser_cmd
-          if terser_cmd
-            cmd = %(#{terser_cmd} #{Shellwords.escape(src)} --compress --mangle -o #{Shellwords.escape(out)} --source-map "url='#{map_name}',includeSources") # rubocop:disable Layout/LineLength
-            Jekyll.logger.info 'Terser:', "minifying #{rel} via external terser"
-            success = system(cmd)
-            unless success && File.exist?(out)
-              Jekyll.logger.warn 'Terser:', "minify failed for #{rel}; copying original"
-              FileUtils.cp(src, out)
-            end
-          else
-            Jekyll.logger.warn 'Terser:', 'no terser available — copying original JS'
-            FileUtils.cp(src, out)
-          end
         end
-      end
-    end
-
-    def detect_terser_cmd
-      # Prefer the bundler-installed terser (from the `terser` gem) via `bundle exec terser`.
-      return 'bundle exec terser' if system('bundle exec terser --version > /dev/null 2>&1')
-      return 'terser' if system('terser --version > /dev/null 2>&1')
 
-      nil
+        elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - started_at
+        Jekyll.logger.info set_color(92, format('Done in %.2fs', elapsed), 1)
+      end
     end
   end
 end
+
+Jekyll::Hooks.register :site, :post_write do |site|
+  Jekyll::MinifyJs::TerserGenerator.run(site)
+end

data/lib/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module MinifyJs
+    VERSION = '0.2.1'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-minify-js
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Pho Thin Maung
@@ -37,34 +37,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.4'
-- !ruby/object:Gem::Dependency
-  name: pathname
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: shellwords
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: terser
   requirement: !ruby/object:Gem::Requirement
@@ -85,8 +57,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
+- lib/color.rb
 - lib/jekyll-minify-js.rb
-homepage: https://rubygems.org/gems/jekyll-minify-js
+- lib/version.rb
+homepage: https://github.com/phothinmg/jekyll-minify-js
 licenses:
 - MIT
 metadata: