jekyll-simple-assets 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33de2b5bfcba3d41e98a6b9563c8991bc91a84b29b3bccfde8db15fce364a73b
-  data.tar.gz: 955d21f9c5f563afa9fe1ac125844fc3ade01f4bf8ed3314963402b2f7eb10c4
+  metadata.gz: f9a88ce587480260a2b882650c270bdc2109b2e85fb0171259b19134d8860c7e
+  data.tar.gz: 89d8af9b0ccc245da99c45e43369cfb636e978d862ad80a7bf01a595f2df75f6
 SHA512:
-  metadata.gz: 45cd69ba7ef27c6660e6e6b4b46d148e6b19f0f7d3f0ee5b0cbfec6bba6e90a39b36c932cda1d668c03881e0a200adbf701cbb6e4cacec4332c96a173479b516
-  data.tar.gz: 8c6905fd79f86ce0fed4828bc9258f0952992a316a88ae5364b636a0dcf841515be2edf3d9d6816c94e69cdda52c66e001dd0491cea2973874709f10f11000c5
+  metadata.gz: d4104483ef4f80d627cab01fbc07799aae26849d4015ec03671b4cd74ed09728d39f7f2ffdcef339c2fc5a7ace21933b8218c200a34750216ac40234f3e7bb69
+  data.tar.gz: 144171dcfee48d6800d2796ed8eb14772ea82873914e5b53f616a206bfe1af28b73c6c2ba5b265edaae9de24931877f5f0a69cfd2ee5d6fce50939186a72f4fb

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    jekyll-simple-assets (0.2.0)
+    jekyll-simple-assets (0.6.0)
       css_parser
       jekyll
+      terser
 
 GEM
   remote: https://rubygems.org/
@@ -11,59 +12,62 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.6)
-    css_parser (1.7.1)
+    concurrent-ruby (1.1.8)
+    css_parser (1.9.0)
       addressable
-    em-websocket (0.5.1)
+    em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.13.1)
+    execjs (2.7.0)
+    ffi (1.15.0)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
-    i18n (1.8.3)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    jekyll (4.1.0)
+    jekyll (4.2.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
       jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.1)
+      kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
       mercenary (~> 0.4.0)
       pathutil (~> 0.9)
       rouge (~> 3.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 1.8)
+      terminal-table (~> 2.0)
     jekyll-sass-converter (2.1.0)
       sassc (> 2.0.1, < 3.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.2.1)
+    kramdown (2.3.1)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.3)
-    listen (3.2.1)
+    listen (3.5.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.4)
-    rouge (3.20.0)
+    rouge (3.26.0)
     safe_yaml (1.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
-    terminal-table (1.8.0)
+    terminal-table (2.0.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
+    terser (1.1.3)
+      execjs (>= 0.3.0, < 3)
     unicode-display_width (1.7.0)
 
 PLATFORMS

data/README.md

@@ -23,6 +23,7 @@ Returns a base64 encoded md5 hash based on the contents of the path given.
 
 Returns a relative url to the path given, with a hash based on the content of
 the file as a query string.
+Will link to a minified version of the file if possible.
 
 ```liquid
 {% asset assets/js/app.js %}
@@ -58,6 +59,15 @@ Returns an md5 hash of the input string.
 {{ 'some text' | md5 }}
 ```
 
+#### uglify
+
+Minifies javascript given as an input string (uses terser, and terser settings
+even though the filter is called `uglify`
+
+```liquid
+{{ 'const foo = "bar"' | uglify }}
+```
+
 ## Content hashes
 
 How the content hashes work is by generating a placeholder string that is
@@ -111,11 +121,13 @@ installed.
 
 ## Javascript minification
 
-The uglifier package is also included and will minify files if `uglifier_enabled`
+The terser package is also included and will minify files if `terser_enabled`
 is set to true in config.yml, or if JEKYLL_ENV is set to production. Any
-options can be passed to uglifier under the `uglifer` key in config.yml
-(see configuration for example). Additionally you can set uglifier settings in
-the liquid frontmatter of a js file in the same manner as in config.yml.
+options can be passed to terser under the `terser` key in config.yml
+(see configuration for example, or
+[here](https://github.com/ahorek/terser-ruby) for detailed options).
+Additionally you can set terser settings in the liquid frontmatter of a js file
+in the same manner as in config.yml, also under the `terser` key.
 
 ## Configuration
 
@@ -126,6 +138,10 @@ simple_assets:
   # default: false
   hashing_enabled: true
 
+  # If set to true, source maps will be generated for javascript
+  # default: false
+  source_maps_enabled: true
+
   # The length of the content hashes generated.
   # default: 16
   hash_length: 8
@@ -154,10 +170,9 @@ simple_assets:
   # Set to true to enable
   bundle: true
 
-  # Options for javascript minification with uglifier
-  uglifier:
-    # any options for uglifier can be put here and will be passed to it
-    harmony: true
+  # Options for javascript minification with terser
+  terser:
+    # any options for terser can be put here and will be passed to it
     output:
       ascii_only: true
 ```

data/jekyll-simple-assets.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 	
 	spec.add_runtime_dependency "jekyll"
 	spec.add_runtime_dependency "css_parser"
-	spec.add_runtime_dependency "uglifier"
+	spec.add_runtime_dependency "terser"
 	
 	spec.add_development_dependency "bundler"
 end

data/lib/jekyll-simple-assets.rb

@@ -8,7 +8,7 @@ require 'shellwords'
 require 'jekyll-simple-assets/content-hash'
 require 'jekyll-simple-assets/critical'
 require 'jekyll-simple-assets/esbuild'
-require 'jekyll-simple-assets/uglify'
+require 'jekyll-simple-assets/terser'
 
 module Jekyll
 	module SimpleAssets
@@ -38,8 +38,12 @@ module Jekyll
 			@@esbuild_config_file ||= file
 		end
 
-		def self.uglifier_enabled?
-			config['uglifier_enabled'] || ENV['JEKYLL_ENV'] == 'production'
+		def self.terser_enabled?
+			config['terser_enabled'] || ENV['JEKYLL_ENV'] == 'production'
+		end
+
+		def self.source_maps_enabled?
+			config['source_maps_enabled']
 		end
 
 		module SimpleAssetsFilters
@@ -121,20 +125,39 @@ Jekyll::Hooks.register :site, :post_render, priority: :low do |site, payload|
 		end
 
 		potential_pages.each do |doc|
-			Jekyll::SimpleAssets::replace_placeholders_for_asset(doc, site)
+			page_path = doc.path.sub("#{ site.config['source'] }/", '')
+
+			if Jekyll::SimpleAssets::page_assets_map[page_path]
+				doc.output = Jekyll::SimpleAssets::replace_placeholders_for_path(page_path, doc.output)
+			end
+
+			if doc.extname =~ /^\.(j|t)s$/i and Jekyll::SimpleAssets::should_minify_file?(doc)
+				min_path, minified = Jekyll::SimpleAssets::minify_file(doc)
+
+				if min_path and Jekyll::SimpleAssets::page_assets_map[page_path]
+					minified = Jekyll::SimpleAssets::replace_placeholders_for_path(page_path, minified)
+				end
+
+				File.write(File.join(Jekyll::SimpleAssets::site.config['destination'], min_path), minified)
+			end
 		end
 	end
 end
 
 Jekyll::Hooks.register :pages, :post_render do |page, payload|
-	next unless Jekyll::SimpleAssets::esbuild_enabled?
-
 	unless Jekyll::SimpleAssets::esbuild_config_file
 		Jekyll::SimpleAssets::generate_esbuild_config_file()
 	end
 
 	if page.extname =~ /^\.(j|t)s$/i
-		Jekyll::SimpleAssets::esbuild_bundle_file(page, payload, Jekyll::SimpleAssets::esbuild_config_file.path)
+		if Jekyll::SimpleAssets::esbuild_enabled?
+			Jekyll::SimpleAssets::esbuild_bundle_file(page, payload, Jekyll::SimpleAssets::esbuild_config_file.path)
+		end
+
+		if Jekyll::SimpleAssets::should_minify_file?(page)
+			min_path = page.path.sub(/\.(j|t)s$/i, '.min.js')
+			File.write(File.join(Jekyll::SimpleAssets::site.config['destination'], min_path), '')
+		end
 	end
 end
 

data/lib/jekyll-simple-assets/content-hash.rb

@@ -155,7 +155,10 @@ def self.replace_placeholders_for_path (page_path, input)
 				replacement = SimpleAssets::asset_contenthash_map[asset_path]
 
 				if type == 'path'
-					replacement = "#{ asset_path }?v=#{ replacement }"
+					min_path = asset_path.sub(/\.([^\.]*?)$/, '.min.\1')
+					url = (File.file? File.join(SimpleAssets::site.config['destination'], min_path)) ? min_path : asset_path
+
+					replacement = "#{ url }?v=#{ replacement }"
 
 					replacement = SimpleAssets::relative_url(replacement)
 				end
@@ -170,14 +173,6 @@ def self.replace_placeholders_for_path (page_path, input)
 	output
 end
 
-def self.replace_placeholders_for_asset (doc, site)
-	page_path = doc.path.sub("#{ site.config['source'] }/", '')
-
-	return unless SimpleAssets::page_assets_map[page_path]
-
-	doc.output = SimpleAssets::replace_placeholders_for_path(page_path, doc.output)
-end
-
 
 end
 end

data/lib/jekyll-simple-assets/esbuild.rb

@@ -50,7 +50,15 @@ def self.esbuild_bundle_file (page, payload, config_path)
 	bundle_cmd = "npx esbuild --bundle --tsconfig=#{ config_path }"
 
 	if page.data['esbuild_flags']
-		bundle_cmd = "#{ bundle_cmd } #{ page.data['esbuild_flags'] }"
+		bundle_cmd += ' ' + page.data['esbuild_flags']
+	end
+
+	node_env = '--define:process.env.NODE_ENV="' + (ENV['JEKYLL_ENV'] != 'production' ? "'development'" : "'production'") + '"'
+
+	bundle_cmd += ' ' + node_env + " --sourcefile=#{ page.path[/[^\/]*$/] }"
+
+	if SimpleAssets::source_maps_enabled?
+		bundle_cmd += ' ' + '--sourcemap=inline'
 	end
 
 	dir = File.dirname(page.path)

data/lib/jekyll-simple-assets/terser.rb

@@ -0,0 +1,100 @@
+require 'fileutils'
+require 'terser'
+
+module Jekyll
+
+module SimpleAssets
+	def self.symbolize_keys (hash)
+		return {} if hash.nil?
+
+		hash.inject({}) do |result, (key, value)|
+
+			new_key = case key
+				when String then key.to_sym
+				else key
+			end
+			new_value = case value
+				when Hash then symbolize_keys(value)
+				else value
+			end
+
+			if new_value.is_a?(String) and new_value.match(/^\/.*\/$/)
+				new_value = /#{ Regexp.quote(new_value[1..-2]) }/
+			end
+
+			result[new_key] = new_value
+
+			result
+		end
+	end
+
+	def self.merge_recursively(a, b)
+		a.merge(b) {|key, a_item, b_item| SimpleAssets::merge_recursively(a_item, b_item) }
+	end
+
+	def self.should_minify_file? (page)
+		return false unless page.respond_to? :output
+		return false unless SimpleAssets::terser_enabled?
+		return false if page.data['do_not_compress'] == true
+		return true
+	end
+
+	def self.minify_file (page)
+		return unless SimpleAssets::should_minify_file?(page)
+
+		site_config = symbolize_keys(SimpleAssets::site.config['simple_assets']['terser'])
+		page_config = symbolize_keys(page.data['terser'])
+
+		config = SimpleAssets::merge_recursively(site_config || {}, page_config || {})
+
+		map_path = page.path + '.map'
+		if SimpleAssets::source_maps_enabled?
+			config = SimpleAssets::merge_recursively(config, {
+				:source_map => { :filename => page.path[/[^\/]*$/], :url => true },
+			})
+
+			minified, source_map = Terser.new(config).compile_with_map(page.output)
+		else
+			minified = Terser.new(config).compile(page.output)
+		end
+
+		min_path = page.path.sub(/\.(j|t)s$/i, '.min.js')
+		Jekyll.logger.info("SimpleAssets:", 'minified: ' + min_path)
+
+		if source_map
+			File.write(File.join(SimpleAssets::site.config['destination'], map_path), source_map)
+			minified = minified.gsub(/^\/\/#\s*?source(Mapping)?URL=.*$/, '')
+			minified += "\n//# sourceMappingURL=#{ SimpleAssets::relative_url(map_path) }"
+
+			Jekyll.logger.debug("SimpleAssets:", 'created source map: ' + map_path)
+
+			SimpleAssets::site.config['keep_files'] << map_path
+		end
+
+		if SimpleAssets::page_assets_map[page.path]
+			SimpleAssets::page_assets_map[min_path] = SimpleAssets::page_assets_map[page.path]
+		end
+
+		SimpleAssets::site.config['keep_files'] << min_path
+
+		return min_path, minified
+	end
+
+	module UglifyFilter
+		def uglify (input)
+			return if input.nil?
+
+			return input.split('\n').join('\\\n') unless SimpleAssets::terser_enabled?
+
+			config = @context.registers[:site].config['simple_assets']
+
+			terser_config = SimpleAssets::symbolize_keys(config['terser'])
+
+			Terser.new(terser_config).compile(input)
+		end
+	end
+end
+
+end
+
+Liquid::Template.register_filter(Jekyll::SimpleAssets::UglifyFilter)

data/lib/jekyll-simple-assets/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
 	module SimpleAssets
-		VERSION = "0.5.0"
+		VERSION = "0.6.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-simple-assets
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Sophie Askew
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2021-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: uglifier
+  name: terser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -83,7 +83,7 @@ files:
 - lib/jekyll-simple-assets/content-hash.rb
 - lib/jekyll-simple-assets/critical.rb
 - lib/jekyll-simple-assets/esbuild.rb
-- lib/jekyll-simple-assets/uglify.rb
+- lib/jekyll-simple-assets/terser.rb
 - lib/jekyll-simple-assets/version.rb
 homepage: https://github.com/syldexiahime/jekyll-simple-assets
 licenses:

data/lib/jekyll-simple-assets/uglify.rb

@@ -1,105 +0,0 @@
-require 'uglifier'
-
-module Jekyll
-
-module SimpleAssets
-	def self.symbolize_keys (hash)
-		return {} if hash.nil?
-
-		hash.inject({}) do |result, (key, value)|
-
-			new_key = case key
-				when String then key.to_sym
-				else key
-			end
-			new_value = case value
-				when Hash then symbolize_keys(value)
-				else value
-			end
-
-			if new_value.is_a?(String) and new_value.match(/^\/.*\/$/)
-				new_value = /#{ Regexp.quote(new_value[1..-2]) }/
-			end
-
-			result[new_key] = new_value
-
-			result
-		end
-	end
-
-	module UglifyFilter
-		def uglify (input)
-			return if input.nil?
-
-			return input.split('\n').join('\\\n') unless SimpleAssets::uglifier_enabled?
-
-			config = @context.registers[:site].config['simple_assets']
-
-			uglifier_config = SimpleAssets::symbolize_keys(config['uglifier'])
-
-			Uglifier.new(uglifier_config).compile input
-		end
-	end
-end
-
-module Converters
-
-class SimpleAssetsUglify < Converter
-	safe true
-	priority :lowest
-
-	def initialize (config={})
-		super(config)
-
-		@config = SimpleAssets::symbolize_keys(config['simple_assets']['uglifier'])
-
-		Jekyll::Hooks.register :pages, :pre_render do |page|
-			ext = '.' + page.path.split('.').last
-
-			if matches(ext)
-				@meta = SimpleAssets::symbolize_keys(page.data['uglifier'])
-			end
-		end 
-
-		Jekyll::Hooks.register :pages, :post_render do |page|
-			ext = '.' +  page.path.split('.').last
-
-			if matches(ext)
-				@meta = nil
-			end
-		end
-	end
-
-	def merge_recursively(a, b)
-		a.merge(b) {|key, a_item, b_item| merge_recursively(a_item, b_item) }
-	end
-
-	def get_config ()
-		merge_recursively(@config || {}, @meta || {})
-	end
-
-	def matches (ext)
-		return nil unless ext
-
-		ext.downcase == '.js'
-	end
-
-	def output_ext (ext)
-		'.js'
-	end
-
-	def convert (content)
-		return content unless SimpleAssets::uglifier_enabled?
-
-		config = get_config
-
-		return content if config[:do_not_compress] == true
-
-		Uglifier.new(config).compile content
-	end
-end
-
-end
-end
-
-Liquid::Template.register_filter(Jekyll::SimpleAssets::UglifyFilter)