importmap-rails 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80b9cda4f79989099769db06ef9eeb785a7f9906cfa9eacbd3d6bf1dcd437edd
-  data.tar.gz: 77972151d15109c1ee373331fa71f42e3957afb97af470fb8683f2c7e027df73
+  metadata.gz: 19ceaae3202d5f82c6ef2b17bfc294b3330a792a809c575eb0f959bd0f57aba4
+  data.tar.gz: 136f545bb38d4076dd6314bb2d35cb706d64fe2903f552c0ce1bbbf977549794
 SHA512:
-  metadata.gz: 5a1c26adbcb471b81dcd1504771f36ac73dfb542a41c379dd257f01a6ec633545030ea0a4d33d49ff40fe56f30c336a0cee8e990aa58f1a3088acf7f0738c46b
-  data.tar.gz: d1c94f03f8c844303887d08af37028e78b667120ce7fa04cbf3c7d7c52b1f56bd10ba69ed9ce0de8ea8b6af234443f96c03c0a3da21d2e0ba301a7997b00ecd4
+  metadata.gz: 332685ead888c7ea3c0de2187a6c34fbb0966e0806f31d6fa953483508623bdaec66add67f1a176fc74411530c76c2e1cfb465d1a95a5ce9b6a9163d57d24ecc
+  data.tar.gz: 1a8c37e746483245f90d8f3e763c321dca4bf363fdcd1a44802af48582637abafe05ac3af90fbd53e1cae1a612334a3ce9e15b06d4c11be9cea838448475732d

data/README.md

@@ -38,7 +38,7 @@ You can use the `./bin/importmap` command that's added as part of the install to
 It works like so:
 
 ```bash
-/bin/importmap pin react react-dom
+./bin/importmap pin react react-dom
 Pinning "react" to https://ga.jspm.io/npm:react@17.0.2/index.js
 Pinning "react-dom" to https://ga.jspm.io/npm:react-dom@17.0.2/index.js
 Pinning "object-assign" to https://ga.jspm.io/npm:object-assign@4.1.1/index.js
@@ -141,6 +141,32 @@ pin "md5", to: "https://cdn.jsdelivr.net/npm/md5@2.3.0/md5.js", preload: false
 ...
 ```
 
+## Composing import maps
+
+By default, Rails loads import map definition from the application's `config/importmap.rb` to the `Importmap::Map` object available at `Rails.application.config.importmap`.
+
+You can combine multiple import maps by drawing their definitions onto the `Rails.application.config.importmap`. For example, appending import maps defined in Rails engines:
+
+```ruby
+# my_engine/lib/my_engine/engine.rb
+
+module MyEngine
+  class Engine < ::Rails::Engine
+    # ...
+    initializer "my-engine.importmap" do |app|
+      app.config.importmap.draw(Engine.root.join("config/importmap.rb"))
+    end
+  end
+end
+```
+
+And pinning JavaScript modules from the engine:
+
+```ruby
+# my_engine/config/importmap.rb
+
+pin_all_from File.expand_path("../app/assets/javascripts", __dir__)
+```
 
 ## Caching the import map and preload modules
 

data/app/helpers/importmap/importmap_tags_helper.rb

@@ -12,7 +12,8 @@ module Importmap::ImportmapTagsHelper
   # Generate an inline importmap tag using the passed `importmap_json` JSON string.
   # By default, `Rails.application.config.importmap.to_json(resolver: self)` is used.
   def javascript_inline_importmap_tag(importmap_json = Rails.application.config.importmap.to_json(resolver: self))
-    tag.script(importmap_json.html_safe, type: "importmap", "data-turbo-track": "reload")
+    tag.script importmap_json.html_safe,
+      type: "importmap", "data-turbo-track": "reload", nonce: content_security_policy_nonce
   end
 
   # Include the es-module-shim needed to make importmaps work in browsers without native support (like Firefox + Safari).
@@ -20,9 +21,11 @@ module Importmap::ImportmapTagsHelper
     javascript_include_tag "es-module-shims", async: true, "data-turbo-track": "reload"
   end
 
-  # Import a named JavaScript module using a script-module tag.
-  def javascript_import_module_tag(module_name)
-    tag.script %(import "#{module_name}").html_safe, type: "module"
+  # 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, 
+      type: "module", nonce: content_security_policy_nonce
   end
 
   # Link tags for preloading all modules marked as preload: true in the `importmap`

data/lib/importmap/map.rb

@@ -11,7 +11,7 @@ class Importmap::Map
   def draw(path = nil, &block)
     if path && File.exist?(path)
       begin
-        instance_eval(File.read(path))
+        instance_eval(File.read(path), path.to_s)
       rescue Exception => e
         Rails.logger.error "Unable to parse import map from #{path}: #{e.message}"
         raise "Unable to parse import map from #{path}: #{e.message}"

data/lib/importmap/version.rb

@@ -1,3 +1,3 @@
 module Importmap
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: importmap-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-06 00:00:00.000000000 Z
+date: 2021-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails