jekyll-simple-assets 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 066a9158d842b14dd87beb951baa1012dc97eb74e68009b97ebce1fc75d114dd
-  data.tar.gz: a78b84504fdff45054e89b9b3f017692460d9c74c3ed0017df0c45d4605f6950
+  metadata.gz: 5cb1966e7b454db1edfa880583d7ae1e9342cde2614435f1d297f0e8f7dd280a
+  data.tar.gz: aa8d28e89449c5af18e1cb43f22723d7cc0be644991bcac971fa5b7786de66c4
 SHA512:
-  metadata.gz: 556175bc3e9f81311e942242ac3b00574fdb6ac1fd979fe37cb74bd392b170ac14e49c893e917a870ed9714951e65a53e560bb1a76855bb647c2c945a8513528
-  data.tar.gz: 2e081620199cdf8ec5330678311d260da6b9405c25b7121324955be887018180c643a5e87cb80d2c1abb8b23fe3d28ae39233d20b00e07e0a9fc78d6549e213a
+  metadata.gz: 434b43a8291227d93d6f385e364101a226abd6405147f0dec9e98219093aa0c55f4ccde0a0a5680946e44bdb38513f0196da1287121dd777a7838201bcb2e1fd
+  data.tar.gz: c38b73fd7c9efbfa362221367bcd3362792f5377682161ecff673d0da2d9fda03fc0349163a47bbbe43ea7df6759a9b6dd221fe4c1b9017f0b3d2cce23782833

data/README.md

@@ -77,6 +77,38 @@ This plugin can also be used to generate critical css stylesheets. See
 configuration for more information on doing this. To generate critical css,
 [critical](https://github.com/addyosmani/critical) must be installed.
 
+## Javascript/Typescript bundling
+
+This plugin can also be used to bundle javascript and typescript files and
+modules using esbuild. Node modules can be included just by requiring them.
+Local modules can be required under the `@simple-assets` namespace, which
+will look for js files in the `_js` and `_ts` directories.
+
+For example:
+```javascript
+// assets/js/main.js
+
+// require node_module
+var leftpad = require('left-pad');
+
+// will look for left-pad.js or left-pad.ts at _js/ or _ts/ in the
+// project root
+var rightpad = require('@simple-assets/right-pad');
+```
+
+You can also put variables in the liquid frontmatter of a js/ts file (that is
+not under `_js` or `_ts`) to configure esbuild.
+
+```liquid
+---
+bundle: false # don't bundle or run esbuild on this file
+esbuild_flags: --target=es5 # pass any flags to esbuild for this file
+---
+```
+
+To bundle javascript [esbuild](https://github.com/evanw/esbuild) must be
+installed.
+
 ## Configuration
 
 ```
@@ -109,4 +141,8 @@ simple_assets:
         layout: post
         # If the rules should be removed from the original source css files
         extract: true
+
+  # Options for bundling javascript/typescript with the `esbuild` npm module
+  # Set to true to enable
+  bundle: true
 ```

data/lib/jekyll-simple-assets.rb

@@ -7,10 +7,11 @@ require 'shellwords'
 
 require 'jekyll-simple-assets/content-hash'
 require 'jekyll-simple-assets/critical'
+require 'jekyll-simple-assets/esbuild'
 
 module Jekyll
 	module SimpleAssets
-		def self.site (site)
+		def self.site (site = nil)
 			@@site ||= site
 		end
 
@@ -26,6 +27,14 @@ module Jekyll
 			config.key?('critical_css')
 		end
 
+		def self.esbuild_enabled?
+			config.key?('bundle') && config['bundle'] != false
+		end
+
+		def self.esbuild_config_file (file = nil)
+			@@esbuild_config_file ||= file
+		end
+
 		module SimpleAssetsFilters
 			def md5 (input)
 				Digest::MD5.hexdigest(input)
@@ -110,6 +119,18 @@ Jekyll::Hooks.register :site, :post_render, priority: :low do |site, payload|
 	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)
+	end
+end
+
 Jekyll::Hooks.register :site, :post_read do |site|
 	css_pages = [];
 

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

@@ -60,13 +60,16 @@ def self.generate_critical_css (site)
 			stdin.write(html)
 			stdin.close
 
-			err = stderr.read
-			unless wait_thr.value.success?
-				Jekyll.logger.error("SimpleAssets:", 'Critical:' + err || stdout.read)
-
-				next
-			else
-				Jekyll.logger.warn("SimpleAssets:", 'Critical:' + err) if err
+			if !wait_thr.value.success? || stderr.read != ''
+				Jekyll.logger.error("SimpleAssets:", 'Critical (css) error:')
+				stderr.each do |line|
+					Jekyll.logger.error("", line)
+				end
+			elsif stderr.read != ''
+				Jekyll.logger.error("SimpleAssets:", 'Critical (css) error:')
+				stderr.each do |line|
+					Jekyll.logger.error("", line)
+				end
 			end
 
 			critical_css_str = stdout.read

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

@@ -0,0 +1,84 @@
+module Jekyll
+module SimpleAssets
+
+def self.generate_esbuild_config_file ()
+	source_path = Jekyll::SimpleAssets::site.config['source']
+
+	tsconfig_path = File.join(source_path, 'jsconfig.json')
+	jsconfig_path = File.join(source_path, 'tsconfig.json')
+
+	config = {}
+
+	if File.file?(tsconfig_path)
+		config = JSON.parse(File.read(tsconfig_path))
+	elsif File.file?(jsconfig_path)
+		config = JSON.parse(File.read(jsconfig_path))
+	end
+
+	f = Tempfile.new([ 'jsconfig.esbuild.', '.json' ])
+
+	config['compilerOptions'] = {} unless config['compilerOptions']
+
+	base_url = source_path
+	if config['compilerOptions']['baseUrl']
+		base_url = File.join(source_path, config['compilerOptions']['baseUrl'])
+	end
+	config['compilerOptions']['baseUrl'] = Pathname.new(base_url).relative_path_from(Pathname.new(f.path))
+
+	config['compilerOptions']['paths'] = {} unless config['compilerOptions']['paths']
+
+	relative_path = Pathname.new(source_path).relative_path_from(Pathname.new(base_url))
+
+	config['compilerOptions']['paths']['@simple-assets/*'] = [
+		File.join(relative_path, '_js/*'),
+		File.join(relative_path, '_ts/*'),
+	]
+
+	f.write config.to_json
+	f.close
+
+	Jekyll::SimpleAssets::esbuild_config_file(f)
+
+	Jekyll.logger.debug("SimpleAssets:", "esbuild: using tsconfig #{ f.path }")
+end
+
+def self.esbuild_bundle_file (page, payload, config_path)
+	if page.data['bundle'] == false
+		return
+	end
+
+	bundle_cmd = "npx esbuild --bundle --tsconfig=#{ config_path }"
+
+	if page.data['esbuild_flags']
+		bundle_cmd = "#{ bundle_cmd } #{ page.data['esbuild_flags'] }"
+	end
+
+	dir = File.dirname(page.path)
+
+	Jekyll.logger.info("SimpleAssets:", 'bundling: ' + page.path)
+	Jekyll.logger.debug("SimpleAssets:", 'running command: ' + bundle_cmd)
+
+	Open3.popen3(bundle_cmd, :chdir => dir) do |stdin, stdout, stderr, wait_thr|
+		stdin.write(page.output)
+		stdin.close
+
+		bundled = stdout.read
+
+		if !wait_thr.value.success? || stderr.read != ''
+			Jekyll.logger.error("SimpleAssets:", 'esbuild error:')
+			stderr.each do |line|
+				Jekyll.logger.error("", line)
+			end
+		elsif stderr.read != ''
+			Jekyll.logger.error("SimpleAssets:", 'esbuild error:')
+			stderr.each do |line|
+				Jekyll.logger.error("", line)
+			end
+		end
+
+		page.output = bundled
+	end
+end
+
+end
+end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-simple-assets
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Sophie Askew
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-21 00:00:00.000000000 Z
+date: 2020-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -68,6 +68,7 @@ files:
 - lib/jekyll-simple-assets.rb
 - lib/jekyll-simple-assets/content-hash.rb
 - lib/jekyll-simple-assets/critical.rb
+- lib/jekyll-simple-assets/esbuild.rb
 - lib/jekyll-simple-assets/version.rb
 homepage: https://github.com/syldexiahime/jekyll-simple-assets
 licenses: