jekyll-simple-assets 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cb1966e7b454db1edfa880583d7ae1e9342cde2614435f1d297f0e8f7dd280a
-  data.tar.gz: aa8d28e89449c5af18e1cb43f22723d7cc0be644991bcac971fa5b7786de66c4
+  metadata.gz: 33de2b5bfcba3d41e98a6b9563c8991bc91a84b29b3bccfde8db15fce364a73b
+  data.tar.gz: 955d21f9c5f563afa9fe1ac125844fc3ade01f4bf8ed3314963402b2f7eb10c4
 SHA512:
-  metadata.gz: 434b43a8291227d93d6f385e364101a226abd6405147f0dec9e98219093aa0c55f4ccde0a0a5680946e44bdb38513f0196da1287121dd777a7838201bcb2e1fd
-  data.tar.gz: c38b73fd7c9efbfa362221367bcd3362792f5377682161ecff673d0da2d9fda03fc0349163a47bbbe43ea7df6759a9b6dd221fe4c1b9017f0b3d2cce23782833
+  metadata.gz: 45cd69ba7ef27c6660e6e6b4b46d148e6b19f0f7d3f0ee5b0cbfec6bba6e90a39b36c932cda1d668c03881e0a200adbf701cbb6e4cacec4332c96a173479b516
+  data.tar.gz: 8c6905fd79f86ce0fed4828bc9258f0952992a316a88ae5364b636a0dcf841515be2edf3d9d6816c94e69cdda52c66e001dd0491cea2973874709f10f11000c5

data/README.md

@@ -109,6 +109,14 @@ esbuild_flags: --target=es5 # pass any flags to esbuild for this file
 To bundle javascript [esbuild](https://github.com/evanw/esbuild) must be
 installed.
 
+## Javascript minification
+
+The uglifier package is also included and will minify files if `uglifier_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.
+
 ## Configuration
 
 ```
@@ -145,4 +153,11 @@ simple_assets:
   # Options for bundling javascript/typescript with the `esbuild` npm module
   # 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
+    output:
+      ascii_only: true
 ```

data/jekyll-simple-assets.gemspec

@@ -20,6 +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_development_dependency "bundler"
 end

data/lib/jekyll-simple-assets.rb

@@ -8,11 +8,14 @@ require 'shellwords'
 require 'jekyll-simple-assets/content-hash'
 require 'jekyll-simple-assets/critical'
 require 'jekyll-simple-assets/esbuild'
+require 'jekyll-simple-assets/uglify'
 
 module Jekyll
 	module SimpleAssets
 		def self.site (site = nil)
-			@@site ||= site
+			@@site = site if site
+
+			@@site
 		end
 
 		def self.config
@@ -35,6 +38,10 @@ module Jekyll
 			@@esbuild_config_file ||= file
 		end
 
+		def self.uglifier_enabled?
+			config['uglifier_enabled'] || ENV['JEKYLL_ENV'] == 'production'
+		end
+
 		module SimpleAssetsFilters
 			def md5 (input)
 				Digest::MD5.hexdigest(input)

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

@@ -7,19 +7,21 @@ module Jekyll
 module SimpleAssets
 
 
-def self.critical_css_source_files
-	@@critical_css_source_files ||= []
+def self.critical_css_source_files ()
+	@@critical_css_source_files ||= {}
 end
 
 def self.make_temp_css_files_for_critical (asset)
 	SimpleAssets::config['critical_css']['css_files'].each do |path|
 		next unless asset.path == path || asset.path == path.sub(/\.css$/, '.scss')
 
-		f = Tempfile.new('css-source')
+		f = Tempfile.new([ 'css-source', '.css' ])
 		f.write asset.output
 		f.close
 
-		SimpleAssets::critical_css_source_files << { 'file' => f, 'page' => asset }
+		Jekyll.logger.debug("SimpleAssets:", "Created new temp file for css: #{ asset.path } at: #{ f.path }")
+
+		SimpleAssets::critical_css_source_files[path] = { 'file' => f, 'page' => asset }
 	end
 end
 
@@ -40,7 +42,7 @@ end
 def self.generate_critical_css (site)
 	css_files_str = ''
 
-	SimpleAssets::critical_css_source_files.each do |f|
+	SimpleAssets::critical_css_source_files.each do |_, f|
 		css_files_str += "--css #{ f['file'].path } "
 
 		f['css'] = CssParser::Parser.new
@@ -91,7 +93,7 @@ def self.generate_critical_css (site)
 
 				critical_css.load_string! critical_css_str
 
-				SimpleAssets::critical_css_source_files.each do |f|
+				SimpleAssets::critical_css_source_files.each do |_, f|
 					f['css'].each_rule_set do |source_rule_set, source_media_type|
 						critical_css.each_rule_set do |critical_rule_set, critical_media_type|
 							if critical_rule_set.selectors.join(',') == source_rule_set.selectors.join(',')
@@ -107,13 +109,19 @@ def self.generate_critical_css (site)
 		end
 	end
 
-	SimpleAssets::critical_css_source_files.each do |f|
-		f['page'].output = f['css'].to_s if f['extract']
+	SimpleAssets::critical_css_source_files.each do |_, f|
+		leftover_css = f['css'].to_s if f['extract']
+
+		# css_parser leaves blank keyframes so fix them
+		keyframes = f['page'].output.scan(/@keyframes\s+(?:.*?)\s*{(?:\s*\S*?\s*{.*?}\s*)+}/m)
+		keyframes.each { |keyframe| leftover_css += keyframe }
+
+		f['page'].output
 	end
 end
 
 def self.resolve_critical_css_content_hashes (site)
-	SimpleAssets::critical_css_source_files.each do |source_file|
+	SimpleAssets::critical_css_source_files.each do |_, source_file|
 		page = source_file['page']
 		page_path = page.path.sub("#{ site.config['source'] }/", '')
 

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

@@ -0,0 +1,105 @@
+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)

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-simple-assets
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Sophie Askew
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-24 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: uglifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -69,6 +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/version.rb
 homepage: https://github.com/syldexiahime/jekyll-simple-assets
 licenses: