jekyll-importmap 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f846c42361c7da6b6bac17de40f7d49d371d492edf7cedaee988aaa8acf8736
-  data.tar.gz: 4533b6d72f8cd5d654ae602f527eb9c5e6e583f10c4d76895f47f32b486ea96c
+  metadata.gz: ead9e5ef88119687765f61cdfd463ee731c94b78864a29f63220ea3ecc694336
+  data.tar.gz: b0844196067dbb1cd631738fcbdb1d909c118827bafe441fee55dfc74e8412f1
 SHA512:
-  metadata.gz: 56dac94721fadb3a3be47564011703297c7abb6dedd81e263031d589d9c9bcd83400c58f37e3f13dd00f0e3444b14d0d97f9855aebe502e8af424359d7c81db0
-  data.tar.gz: ea08f250e99326219589c8f94344e713d557b765b6efe00845b146ff91daadeab77e356d166cf4c2085dfd01e33e55f1b51077d6814fc2f03a7cbfe98057430d
+  metadata.gz: ebfa452243f27acd9b091051d57b9ef21f670c979e06b5257f2b5384d7bb32901c4efc098341313c708adf0036822495753a2c877cd51a32ffc7cd6e82038c5a
+  data.tar.gz: ef39d2ea8b94d535658dd910c11daef2856e222c5a07aa5babc5a51ee7efa47266f6086015633c6284c2aaa02b2ebe2b0e4b55d6df111c2d61144bcc507f00d0

data/lib/jekyll-importmap/resolver.rb

@@ -6,12 +6,30 @@ module Jekyll::Importmap
             'https://' + self.url + JS_PATH + '/' + path
         end
 
-        def self.url
-            if Jekyll.configuration['port'] && Jekyll.configuration['port'].length > 0
-                Jekyll.configuration['host'] + ':' + Jekyll.configuration['port']
+        def self.host_or_url
+            if Jekyll.configuration['url']
+                Jekyll.configuration['url']
             else
                 Jekyll.configuration['host']
             end
         end
+        def self.base_url
+            if Jekyll.configuration['baseurl']
+                '/' + Jekyll.configuration['baseurl']
+            else
+                ''
+            end
+        end
+        def self.port
+            if Jekyll.configuration['port'] && Jekyll.configuration['port'].length > 0
+                ':' + Jekyll.configuration['port']
+            else
+                ''
+            end
+        end
+
+        def self.url
+            self.host_or_url + self.port + self.base_url
+        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.1"
+    VERSION = "0.1.3"
   end
 end

data/lib/jekyll-importmap.rb

@@ -18,7 +18,7 @@ module Jekyll
             super
             #root_path = Pathname.new(Jekyll.configuration['source']) + '/'
             root_path = Dir.pwd + '/'
-            @importmap = Jekyll::Importmap::Map.new.draw(root_path.join(IMPORTMAP_PATH))
+            @importmap = Jekyll::Importmap::Map.new.draw(root_path.concat(IMPORTMAP_PATH))
             @entry_point = "application"
         end
 
@@ -47,7 +47,7 @@ module Jekyll
                 Array(paths).collect {|p| %(<link rel="modulepreload" href="#{p}">)}.join('\n')
             end
             def import_module_tag
-                imports = Array(@entry_points).collect {|e| %(import '#{e}')}.join('\n')
+                imports = Array(*@entry_point).collect {|e| %(import '#{e}')}.join('\n')
                 "<script type='module'>#{imports}</script>"
             end
             def es_module_shim_tag

metadata

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