importmap-rails 1.1.6 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70bd0df53bac3a5b6657fc7184840311bfe68d19de5db9470f8b1b2a7ae0ac25
-  data.tar.gz: 21625eddac92ce45d8174e6023be8e1c602c3b43fab5380c54ee82d67ccdf552
+  metadata.gz: 33dce6ec9c0694844753828ea342c40c03dc7cc07460461b37e0310e995b9238
+  data.tar.gz: fa91a5de60f67973d7075e58c0f6ac45cf74bc023d96407072c65c616f546472
 SHA512:
-  metadata.gz: d96158943de237bfcf6ddf7d5966712635b810a647f2aa4e7e9fbf7fbbc76d8c442e51cead39bf61f71ece5015e1c2f84c75c0a00d7d8e5ae8500c36dc81ad68
-  data.tar.gz: 7e9cfcefeeb5de53bb05fff2401b46e4775949e78a2a5c148e4827deaec590df7e1033c64e4dd7982b4eb69bed8c8e850b60721784097d91f0e0472502624354
+  metadata.gz: 79168173967c286f3ffa36b912cd6a230159f225d1842a0d458b05a54ec8e53ac051cf7fd5903ffab43348b0bfcdf17f17cb1d065de31af6b4b392a5da33e039
+  data.tar.gz: d8eb7c52ace629023a350c01755f2f3a17a8b835905b019bb51599af9e058e2de213902acb1e3fa5b7d4d31f9a623f075b697b5270f5547de98c087a37096672

data/app/helpers/importmap/importmap_tags_helper.rb

@@ -1,9 +1,9 @@
 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", shim: true)
+  def javascript_importmap_tags(entry_point = "application", shim: true, importmap: Rails.application.importmap)
     safe_join [
-      javascript_inline_importmap_tag,
-      javascript_importmap_module_preload_tags,
+      javascript_inline_importmap_tag(importmap.to_json(resolver: self)),
+      javascript_importmap_module_preload_tags(importmap),
       (javascript_importmap_shim_nonce_configuration_tag if shim),
       (javascript_importmap_shim_tag if shim),
       javascript_import_module_tag(entry_point)
@@ -34,7 +34,7 @@ module Importmap::ImportmapTagsHelper
   # Import a named JavaScript module(s) using a script-module tag.
   def javascript_import_module_tag(*module_names)
     imports = Array(module_names).collect { |m| %(import "#{m}") }.join("\n")
-    tag.script imports.html_safe, 
+    tag.script imports.html_safe,
       type: "module", nonce: request&.content_security_policy_nonce
   end
 

data/lib/importmap/commands.rb

@@ -8,7 +8,7 @@ class Importmap::Commands < Thor
   def self.exit_on_failure?
     false
   end
-  
+
   desc "pin [*PACKAGES]", "Pin new packages"
   option :env, type: :string, aliases: :e, default: "production"
   option :from, type: :string, aliases: :f, default: "jspm"
@@ -103,6 +103,11 @@ class Importmap::Commands < Thor
     end
   end
 
+  desc "packages", "Print out packages with version numbers"
+  def packages
+    puts npm.packages_with_versions.map { |x| x.join(' ') }
+  end
+
   private
     def packager
       @packager ||= Importmap::Packager.new

data/lib/importmap/engine.rb

@@ -20,15 +20,17 @@ module Importmap
     end
 
     initializer "importmap.reloader" do |app|
-      Importmap::Reloader.new.tap do |reloader|
-        reloader.execute
-        app.reloaders << reloader
-        app.reloader.to_run { reloader.execute }
+      unless app.config.cache_classes
+        Importmap::Reloader.new.tap do |reloader|
+          reloader.execute
+          app.reloaders << reloader
+          app.reloader.to_run { reloader.execute }
+        end
       end
     end
 
     initializer "importmap.cache_sweeper" do |app|
-      if app.config.importmap.sweep_cache
+      if app.config.importmap.sweep_cache && !app.config.cache_classes
         app.config.importmap.cache_sweepers << app.root.join("app/javascript")
         app.config.importmap.cache_sweepers << app.root.join("vendor/javascript")
         app.importmap.cache_sweeper(watches: app.config.importmap.cache_sweepers)

data/lib/importmap/map.rb

@@ -69,7 +69,7 @@ class Importmap::Map
     Digest::SHA1.hexdigest(to_json(resolver: resolver).to_s)
   end
 
-  # Returns an instance ActiveSupport::EventedFileUpdateChecker configured to clear the cache of the map
+  # Returns an instance of ActiveSupport::EventedFileUpdateChecker configured to clear the cache of the map
   # when the directories passed on initialization via `watches:` have changes. This is used in development
   # and test to ensure the map caches are reset when javascript files are changed.
   def cache_sweeper(watches: nil)

data/lib/importmap/npm.rb

@@ -44,17 +44,19 @@ class Importmap::Npm
     end.sort_by { |p| [p.name, p.severity] }
   end
 
+  def packages_with_versions
+    # We cannot use the name after "pin" because some dependencies are loaded from inside packages
+    # Eg. pin "buffer", to: "https://ga.jspm.io/npm:@jspm/core@2.0.0-beta.19/nodelibs/browser/buffer.js"
+
+    importmap.scan(/^pin .*(?<=npm:|npm\/|skypack\.dev\/|unpkg\.com\/)(.*)(?=@\d+\.\d+\.\d+)@(\d+\.\d+\.\d+(?:[^\/\s"]*)).*$/) |
+      importmap.scan(/^pin "([^"]*)".* #.*@(\d+\.\d+\.\d+(?:[^\s]*)).*$/)
+  end
+
   private
     OutdatedPackage   = Struct.new(:name, :current_version, :latest_version, :error, keyword_init: true)
     VulnerablePackage = Struct.new(:name, :severity, :vulnerable_versions, :vulnerability, keyword_init: true)
 
-    def packages_with_versions
-      # We cannot use the name after "pin" because some dependencies are loaded from inside packages
-      # Eg. pin "buffer", to: "https://ga.jspm.io/npm:@jspm/core@2.0.0-beta.19/nodelibs/browser/buffer.js"
 
-      importmap.scan(/^pin .*(?<=npm:|npm\/|skypack\.dev\/|unpkg\.com\/)(.*)(?=@\d+\.\d+\.\d+)@(\d+\.\d+\.\d+(?:[^\/\s"]*)).*$/) |
-        importmap.scan(/^pin "([^"]*)".* #.*@(\d+\.\d+\.\d+(?:[^\s]*)).*$/)
-    end
 
     def importmap
       @importmap ||= File.read(@importmap_path)

data/lib/importmap/version.rb

@@ -1,3 +1,3 @@
 module Importmap
-  VERSION = "1.1.6"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: importmap-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-23 00:00:00.000000000 Z
+date: 2023-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Use ESM with importmap to manage modern JavaScript in Rails without transpiling