jekyll-esm 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 874a4a2123da08d7db10936aa7c1ef9c0ad4bd4b40e1bbdba9c112c362834648
-  data.tar.gz: 7eb4809d66b456733505bf68cbad740528c333a116bc8c15f05fe68884ed1b5f
+  metadata.gz: 1afb8eff9885f0d3929ec26e1e8453171c9e3ce80cbc324636aaa4e0560fd5a3
+  data.tar.gz: d3839dd0821dfc36e51f5e67e4b3560a1b3e50c2d73bb8385a08c371bfe21d79
 SHA512:
-  metadata.gz: e80869a7324675efcec4ee35c88dc8fba77f82f4068a30aee3aa896e512bc2db17eaa3bce7c736f6ad26ec44bc7ff1ceeae1c3c57a4e452c3352687e8298a676
-  data.tar.gz: 3929653faeb53d75ea0754f48dbdacd39c8e2f59b2f0defbccdfdda323e4328b3021542af40055c4865fa5b0dbe7ea1a8e6759a7fa9b6c051825c60822ffa2c9
+  metadata.gz: 044f9722e1c7f6a4a8e56e0cbf451ac2648ecc8fd27c342e3862b24641c9f6a8a86a74c8c8e8b62d18e9289ed527b5b36f44fa039e70686e24fdc8c175b27ccb
+  data.tar.gz: 4fbe841607df6d91039683482ffd7a06eb01153a51cead4e5ec826970438919afcd7b4565d59bbf749ef0b88588d7ddbe9630d85ed7ceee358426726c5433dc1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jekyll-esm (0.1.1)
+    jekyll-esm (0.2.0)
       jekyll
       listen
       nokogiri

data/README.md

@@ -41,9 +41,17 @@ plugins:
   - jekyll/esm
 ```
 
+# Ingore package.json!
+Currently You *MUST* exclude package.json in the `_config.yml` otherwise jekyll will go into a loop. Sucks a bit but will try and improve that.
+
+```yml
+exclude:
+  - package.json
+```
+
 ### Example `_config.yml`
-You can have a look at the possible configuration options in the fixtures config file at `spec/fixtures/_config.yml` in this repo.
 
+You can have a look at the possible configuration options in the fixtures config file at `spec/fixtures/_config.yml` in this repo.
 
 ## Development
 

data/lib/jekyll/esm.rb

@@ -23,11 +23,14 @@ module Jekyll
         importmap = JSON.parse(value.children[0].content)
         imports = importmap["imports"]
         imports.keys.each do |import_key|
+          next if import_key =~ /https?:\/\/[\S]+/
+          next if import_key =~ /(^\.+\/)+/
+
           import = import_key.split('/').first
           pkg_path = File.join(page.site.source, 'node_modules', import)
 
           # don't repeatedly attempt to install a package
-          return if Dir.exists?(pkg_path) && @@new_esm_packages.include?(import)
+          next if Dir.exists?(pkg_path) && @@new_esm_packages.include?(import)
 
           @@new_esm_packages << import
 
@@ -47,25 +50,28 @@ module Jekyll
     end
 
     def self.apply(site)
-      existing_packages = Dir.children(File.join(site.source, 'node_modules')).reject { |dir| dir =~ /^\..*$/ }
-      for_removal = existing_packages - @@new_esm_packages.uniq
+      if @@existing_esm_packages.any?
+        for_removal = @@existing_esm_packages - @@new_esm_packages.uniq
 
-      # Remove any packages that are no longer referenced in an esm declaration
-      if for_removal.any?
-        stdout, stderr, status = Open3.capture3(
-          "yarn remove #{for_removal.join(' ')}",
-          chdir: File.expand_path(site.source)
-        )
+        # Remove any packages that are no longer referenced in an esm declaration
+        if for_removal.any?
+          stdout, stderr, status = Open3.capture3(
+            "yarn remove #{for_removal.join(' ')}",
+            chdir: File.expand_path(site.source)
+          )
 
-        if site.config.dig('esm', 'strict')
-          runtime_error = stdout =~ /ERROR in|SyntaxError/
+          if site.config.dig('esm', 'strict')
+            runtime_error = stdout =~ /ERROR in|SyntaxError/
 
-          raise Error, stderr if stderr.size > 0
-          raise Error, stdout if !runtime_error.nil?
+            raise Error, stderr if stderr.size > 0
+            raise Error, stdout if !runtime_error.nil?
+          end
         end
       end
 
+      FileUtils.rm_rf(File.join(site.dest, 'node_modules'))
       FileUtils.cp_r(File.join(site.source, 'node_modules'), File.join(site.dest, 'node_modules'))
+      @@existing_esm_packages = @@new_esm_packages
       @@new_esm_packages = []
     end
   end

data/lib/jekyll/esm/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Esm
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-esm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Steve Martin