importmap-rails 0.2.3 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ec141d17e7859eac9dae9d91c47f04957f650f2cef7eeae7cc0449b9c92cd89
-  data.tar.gz: a2ce05f0a9c340668d407f5c7e2cf64b2fe68f262e567ab94fb1ccc029b10487
+  metadata.gz: d76219ce916f51a755ec35408f60b5258cf63b8d8d5b5252ab04b351348cfebb
+  data.tar.gz: 9467508f9d692ce701ccf1943adf146b776be046e1eac06f60541209fe26ace7
 SHA512:
-  metadata.gz: e692f3214ec9f899ebffd3f239a8f87202811b8098de1f2b2906bcb2558d446801a34fe359b3a94b8b8768220d54918f089ed8149ede3e04708d29f435314872
-  data.tar.gz: 89eafbbd709cd3e9eb2e97310c96297465bb935b713e841c8b8f7c9dd4a7d4f59c05b0d5720f0d9087dfbcb3a7e86d17c6d89a6c061622c9b8e6387719707795
+  metadata.gz: c013fde57b613a62f6f228e6ceb5f106dbbe77af14d3737e2206bcdd38e78d1a8bbdf2c21d5e292b155b03ea6069918c4083c9f913595c925dc626d91286f1ca
+  data.tar.gz: dce28047300891ecdea4b5165dd99163066676fbf3145789ac094f74a2ef2aeb5f4f5a99d6b576da66ea70cb502ba3be61d8517e6ab9e0e8d62e40269d85f06d

data/app/helpers/importmap/importmap_tags_helper.rb

@@ -2,8 +2,8 @@ module Importmap::ImportmapTagsHelper
   # Setup all script tags needed to use an importmap-powered entrypoint (which defaults to application.js)
   def javascript_importmap_tags(entry_point = "application")
     safe_join [
-      javascript_importmap_module_preload_tags,
       javascript_inline_importmap_tag,
+      javascript_importmap_module_preload_tags,
       javascript_importmap_shim_tag,
       javascript_import_module_tag(entry_point)
     ], "\n"

data/lib/importmap/map.rb

@@ -14,8 +14,8 @@ class Importmap::Map
     @files[name] = MappedFile.new(name: name, path: to || "#{name}.js", preload: preload)
   end
 
-  def pin_all_from(path, under: nil, preload: true)
-    @directories[path] = MappedDir.new(path: path, under: under, preload: preload)
+  def pin_all_from(dir, under: nil, to: nil, preload: true)
+    @directories[dir] = MappedDir.new(dir: dir, under: under, path: to, preload: preload)
   end
 
   def preloaded_module_paths(resolver:)
@@ -32,7 +32,7 @@ class Importmap::Map
 
   private
     MappedFile = Struct.new(:name, :path, :preload, keyword_init: true)
-    MappedDir  = Struct.new(:path, :under, :preload, keyword_init: true)
+    MappedDir  = Struct.new(:dir, :path, :under, :preload, keyword_init: true)
 
     def cache_as(name)
       if (cached && result = instance_variable_get("@cached_#{name}"))
@@ -63,11 +63,11 @@ class Importmap::Map
 
     def expand_directories_into(paths)
       @directories.values.each do |mapping|
-        if (absolute_path = absolute_root_of(mapping.path)).exist?
+        if (absolute_path = absolute_root_of(mapping.dir)).exist?
           find_javascript_files_in_tree(absolute_path).each do |filename|
             module_filename = filename.relative_path_from(absolute_path)
-            module_name     = module_name_from(module_filename, mapping.under)
-            module_path     = mapping.under ? absolute_path.basename.join(module_filename).to_s : module_filename.to_s
+            module_name     = module_name_from(module_filename, mapping)
+            module_path     = module_path_from(module_filename, mapping)
 
             paths[module_name] = MappedFile.new(name: module_name, path: module_path, preload: mapping.preload)
           end
@@ -75,18 +75,23 @@ class Importmap::Map
       end
     end
 
-    # Strip off the extension, /index, or any versioning data for an absolute module name.
-    def module_name_from(filename, under)
-      filename_without_ext = filename.to_s.remove(filename.extname)
+    def module_name_from(filename, mapping)
+      filename_without_ext_and_version = filename.to_s.remove(filename.extname).split("@").first
 
-      if filename_without_ext == "index" && under
-        under
+      case
+      when filename_without_ext_and_version == "index" && mapping.under
+        mapping.under
+      when mapping.under
+        "#{mapping.under}/#{filename_without_ext_and_version}"
       else
-        module_name = filename_without_ext.split("@").first
-        under ? "#{under}/#{module_name}" : module_name
+        module_name
       end
     end
 
+    def module_path_from(filename, mapping)
+      [ mapping.path || mapping.under, filename.to_s ].join("/")
+    end
+
     def find_javascript_files_in_tree(path)
       Dir[path.join("**/*.js{,m}")].collect { |file| Pathname.new(file) }.select(&:file?)
     end

data/lib/importmap/version.rb

@@ -1,3 +1,3 @@
 module Importmap
-  VERSION = "0.2.3"
+  VERSION = "0.2.7"
 end

data/lib/install/install.rb

@@ -18,7 +18,7 @@ JS
 end
 
 say "Ensure JavaScript files are in the asset pipeline manifest"
-append_to_file Rails.root.join("app/assets/config/manifest.js"), %(//= link_tree ../../../javascript .js\n)
+append_to_file Rails.root.join("app/assets/config/manifest.js"), %(//= link_tree ../../javascript .js\n)
 
 say "Configure importmap paths in config/initializers/importmap.rb"
 create_file Rails.root.join("config/initializers/importmap.rb") do <<-RUBY
@@ -29,9 +29,9 @@ Rails.application.config.importmap.draw do
   # pin "@rails/actioncable", to: "actioncable.esm.js"
   # pin "@rails/activestorage", to: "activestorage.esm.js"
 
-  # Use libraries directly from JavaScript CDNs (see https://www.skypack.dev, https://cdnjs.com, https://www.jsdelivr.com/esm)
-  # pin "vue", to: "https://cdn.jsdelivr.net/npm/vue@2.6.14/dist/vue.esm.browser.js", preload: true
-  # pin "d3", to: "https://cdn.skypack.dev/pin/d3@v7.0.0-03vFl9bie0TSesDkWTJV/mode=imports/optimized/d3.js", preload: true
+  # Use libraries directly from JavaScript CDNs (see https://www.skypack.dev, https://esm.sh, https://www.jsdelivr.com/esm)
+  # pin "vue", to: "https://cdn.jsdelivr.net/npm/vue@2.6.14/dist/vue.esm.browser.js"
+  # pin "d3", to: "https://esm.sh/d3?bundle"
 
   # Pin vendored modules by first adding the following to app/assets/config/manifest.js:
   # //= link_tree ../../../vendor/assets/javascripts .js

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: importmap-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.7
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails