importmap-rails 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91837e96107f59efa73a314dec3955a488f9f40826c27e116da43c5d9ef0a44a
-  data.tar.gz: ce9d44539cd6bb86b1e027c9c714dc8274b4a7b918ee0a67493b79b9eb58103f
+  metadata.gz: e86788c54e7b80120cf17b2df4f51a02f03e8b40356bb2f8abad069639b763a0
+  data.tar.gz: 4e29f8b3e0cacb49f7d379b2536e736acb015f2b9b55a7fdfa97cfb83ccdf916
 SHA512:
-  metadata.gz: 95a4d846c8a808b8037e2425ad307e1cecd736051053e86f5c9739f9118375d81e0e967f64be3f6cee916d0ce7ca763fd7b236684f9b0889679b62f5718643a0
-  data.tar.gz: 5e20ed5b2d79945a603db1cf6e0e5d694a8a7ad7b96f5bb13e6e1083225034fcbf7ba2019acf397b004345bd4d54827895b9e4ffd5c831eb1fdfc2c051dcb063
+  metadata.gz: 48ebde452587115deed3ab2f6a2dbcc777eb15bde84feb76cc77d12e884f22557a6131c584e60a4cfcb19a031e131f83fcc78a7fbfc21dbeb7625543d40f7600
+  data.tar.gz: d5f5992507d837c9de40bc88af8776c73150a6fbb628264b96dd6895ee50eb5692776a28f4ff9239e90894a803a59617f370c213a96beacec67a2a0dcc31689a

data/Rakefile

@@ -3,8 +3,6 @@ require "bundler/setup"
 APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
 load "rails/tasks/engine.rake"
 
-load "rails/tasks/statistics.rake"
-
 require "bundler/gem_tasks"
 
 require "rake/testtask"

data/lib/importmap/map.rb

@@ -302,7 +302,7 @@ class Importmap::Map
       # folder/index
       index_regex = /(?:\/|^)index$/
 
-      [ mapping.under, filename.to_s.remove(filename.extname).remove(index_regex).presence ].compact.join("/")
+      [ mapping.under, filename.to_s.chomp(filename.extname).remove(index_regex).presence ].compact.join("/")
     end
 
     def module_path_from(filename, mapping)

data/lib/importmap/npm.rb

@@ -54,6 +54,10 @@ class Importmap::Npm
     with_versions = importmap.scan(/^pin .*(?<=npm:|npm\/|skypack\.dev\/|unpkg\.com\/)([^@\/]+)@(\d+\.\d+\.\d+(?:[^\/\s"']*))/) |
       importmap.scan(/#{PIN_REGEX} #.*@(\d+\.\d+\.\d+(?:[^\s]*)).*$/)
 
+    with_versions.map! do |package, version|
+      [extract_base_package_name(package), version]
+    end.uniq!
+
     vendored_packages_without_version(with_versions).each do |package, path|
       $stdout.puts "Ignoring #{package} (#{path}) since no version is specified in the importmap"
     end
@@ -138,6 +142,17 @@ class Importmap::Npm
       raise HTTPError, "Unexpected transport error (#{error.class}: #{error.message})"
     end
 
+    def extract_base_package_name(package)
+      if package.start_with?("@")
+        # Scoped packages can have nested paths, e.g. @scope/package/subpath
+        parts = package.split("/", 3)
+        parts.size > 2 ? parts.first(2).join("/") : package
+      else
+        # Non-scoped packages - just take the first part
+        package.split("/").first
+      end
+    end
+
     def vendored_packages_without_version(packages_with_versions)
       versioned_packages = packages_with_versions.map(&:first).to_set
 

data/lib/importmap/version.rb

@@ -1,3 +1,3 @@
 module Importmap
-  VERSION = "2.2.2"
+  VERSION = "2.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: importmap-rails
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Use ESM with importmap to manage modern JavaScript in Rails without transpiling
   or bundling.