jekyll-importmap 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcbca8d3eb68354403dafbf2502eff2aa26d91aeeac77027ba6cadb0423a9d68
-  data.tar.gz: 88e0cf570ed90888f4bf7651f332808e458b9785b789c3abdda5dbb45781852a
+  metadata.gz: 3c1e439d628b643cd1cfabfada7c489a587efb8ea8244e6cd28d34e6af671476
+  data.tar.gz: 548dd81469486e22bd02ea71f81d4a05c282971dec534e7e4641b90a55bebdc6
 SHA512:
-  metadata.gz: 41b49c18099048820a9d2e86ac34b6d4e0e0596178122697caa5254453dee3a8c77db870176389925b9e73eaef2c4f128cc375fc469cabe654ac6df1d7ab0c15
-  data.tar.gz: 566f4ba6489a78700d0001eba036f31f95e1cc48d1de70c4a9ccc8c6b63063ac70bb9079ff2338318fb7987d573ecd30a9762f9e64d523e377ac152d99f12cd3
+  metadata.gz: 773349fdaf7a1525081556e110f4e660c99de2039c878d6cfbd75e9e60832e6fad714b2f32a805eacd95774b093ddbdb84fba622ad9f19d8ede3d366c3cf7560
+  data.tar.gz: a21afdfd2bf77b584cbb7a5039bd7d6bfa420d5212f7160b32a43c7b0c5cfd45d1fc50d2afd8715f9ead84613690437dd3277cc992a7847c0270b56da3d629ad

data/lib/jekyll-importmap/map.rb

@@ -28,18 +28,15 @@ module Jekyll::Importmap
             self
         end
 
-        def pin(name, to: nil, preload: true)
+        def pin(name, to: nil, preload: false)
             @packages[name] = Jekyll::Importmap::MappedFile.new(name: name, path: to || "#{name}.js", preload: preload)
         end
-        def pin_all_from(dir, under: nil, to: nil, preload: true)
+        def pin_all_from(dir, under: nil, to: nil, preload: false)
             @directories[dir] = Jekyll::Importmap::MappedDir.new(dir: dir, under: under, path: to, preload: preload)
         end
 
         def preloaded_module_paths
-            resolve_asset_paths(
-                expanded_preloading_packages_and_directories,
-                resolver: @resolver
-            ).values
+            preloaded_resolved_asset_paths.values
         end
 
         def to_json
@@ -58,6 +55,10 @@ module Jekyll::Importmap
                     end
                 end.compact
             end
+            def preloaded_resolved_asset_paths
+                preloaded_expanded_packages_and_directories
+            end
+
             def expanded_packages_and_directories
                 @packages.dup.tap do |packages|
                     @directories.values.each do |mapped_directory|
@@ -67,5 +68,10 @@ module Jekyll::Importmap
                     end
                 end
             end
+            def preloaded_expanded_packages_and_directories
+                expanded_packages_and_directories.select do |name, mapped_file|
+                    mapped_file.preload == true
+                end
+            end
     end
 end

data/lib/jekyll-importmap/version.rb

@@ -5,6 +5,6 @@ module Liquid; class Tag; end; end
 
 module Jekyll
   class ImportmapTag < Liquid::Tag
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

data/lib/jekyll-importmap.rb

@@ -41,10 +41,10 @@ module Jekyll
                 "<script type='importmap'>#{@importmap.to_json}</script>"
             end
             def importmap_module_preload_tags
-                #module_preload_tag(*importmap.preloaded_module_paths)
+                importmap.preloaded_module_paths.collect {|p| module_preload_tag(p)}.join('\n')
             end
-            def module_preload_tag(*paths)
-                Array(paths).collect {|p| %(<link rel="modulepreload" href="#{p}">)}.join('\n')
+            def module_preload_tag(path)
+                "<link rel='modulepreload' href='#{p}'>"
             end
             def import_module_tag
                 imports = Array(*@entry_point).collect {|e| %(import '#{e}')}.join('\n')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-importmap
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Nathan Kidd