importmap-rails 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33dce6ec9c0694844753828ea342c40c03dc7cc07460461b37e0310e995b9238
-  data.tar.gz: fa91a5de60f67973d7075e58c0f6ac45cf74bc023d96407072c65c616f546472
+  metadata.gz: 5177fd5e9d3aa36dcb9ad47a2990aea48acafe9b11d5ee9186de7be3567aba46
+  data.tar.gz: d3f6c34a20bddb2e13dd5fa1840b9df415a7af920c1f0b8854de47b3158548d0
 SHA512:
-  metadata.gz: 79168173967c286f3ffa36b912cd6a230159f225d1842a0d458b05a54ec8e53ac051cf7fd5903ffab43348b0bfcdf17f17cb1d065de31af6b4b392a5da33e039
-  data.tar.gz: d8eb7c52ace629023a350c01755f2f3a17a8b835905b019bb51599af9e058e2de213902acb1e3fa5b7d4d31f9a623f075b697b5270f5547de98c087a37096672
+  metadata.gz: a8320c74f6f8af0515aaf518a0fe6c60f595cc30f0006eb82268eb0097cc141a7dd8353ee7712d7a804bf5bec7a37520047c9deefd61e75624ea343c437a74dc
+  data.tar.gz: 683b27fe8a26e146ee381424eb3a4e297e8f87ab87178c746fe029ffcf90cfa66e2a8ca45eb746d5b4685cde7d508ec53ea935f82c94ef02f30e148a0fee6f98

data/README.md

@@ -63,6 +63,27 @@ It's in `app/javascript/application.js` you setup your application by importing
 
 It makes sense to use logical names that match the package names used by npm, such that if you later want to start transpiling or bundling your code, you won't have to change any module imports.
 
+### Local modules
+
+If you want to import local js module files from `app/javascript/src` or other sub-folders of `app/javascript` (such as `channels`), you must pin these to be able to import them.
+You can use `pin_all_from` to pick all files in a specific folder, so you don't have to `pin` each module individually.
+
+```rb
+# config/importmap.rb
+pin_all_from 'app/javascript/src`, under: 'src', to: 'src'
+```
+
+The `:to` parameter is only required if you want to change the destination logical import name. If you drop the :to option, you must place the :under option directly after the first parameter.
+
+Allows you to:
+
+```js
+// app/javascript/application.js
+import { ExampleFunction } from 'src/example_function'
+```
+Which imports the function from `app/javascript/src/example_function.js`.
+
+Note: Sprockets used to serve assets (albeit without filename digests) it couldn't find from the `app/javascripts` folder with logical relative paths, meaning pinning local files wasn't needed. Propshaft doesn't have this fallback, so when you use Propshaft you have to pin your local modules.
 
 ## Using npm packages via JavaScript CDNs
 

data/lib/importmap/map.rb

@@ -145,7 +145,7 @@ class Importmap::Map
     end
 
     def module_path_from(filename, mapping)
-      [ mapping.path || mapping.under, filename.to_s ].compact.join("/")
+      [ mapping.path || mapping.under, filename.to_s ].compact.reject(&:empty?).join("/")
     end
 
     def find_javascript_files_in_tree(path)

data/lib/importmap/npm.rb

@@ -48,8 +48,8 @@ class Importmap::Npm
     # 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]*)).*$/)
+    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

data/lib/importmap/reloader.rb

@@ -1,3 +1,6 @@
+require "active_support"
+require "active_support/core_ext/module/delegation"
+
 class Importmap::Reloader
   delegate :execute_if_updated, :execute, :updated?, to: :updater
 

data/lib/importmap/version.rb

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

data/lib/importmap-rails.rb

@@ -3,4 +3,4 @@ end
 
 require "importmap/version"
 require "importmap/reloader"
-require "importmap/engine"
+require "importmap/engine" if defined?(Rails::Railtie)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: importmap-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-18 00:00:00.000000000 Z
+date: 2023-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement