Skip to content

Commit a47afaa

Browse files
author
David Heinemeier Hansson
committed
Use vendor/javascript instead of app/javascript/vendor
1 parent 3731428 commit a47afaa

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

lib/importmap/engine.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ class Engine < ::Rails::Engine
2626

2727
initializer "importmap.cache_sweeper" do |app|
2828
if app.config.importmap.sweep_cache
29-
app.importmap.cache_sweeper watches: app.root.join("app/javascript")
29+
app.importmap.cache_sweeper watches: [
30+
app.root.join("app/javascript"), app.root.join("vendor/javascript")
31+
]
3032

3133
ActiveSupport.on_load(:action_controller_base) do
3234
before_action { Rails.application.importmap.cache_sweeper.execute_if_updated }
@@ -38,6 +40,7 @@ class Engine < ::Rails::Engine
3840
if Rails.application.config.respond_to?(:assets)
3941
Rails.application.config.assets.precompile += %w( es-module-shims.js es-module-shims.min.js )
4042
Rails.application.config.assets.paths << Rails.root.join("app/javascript")
43+
Rails.application.config.assets.paths << Rails.root.join("vendor/javascript")
4144
end
4245
end
4346

lib/importmap/packager.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ class Importmap::Packager
1010
singleton_class.attr_accessor :endpoint
1111
self.endpoint = URI("https://api.jspm.io/generate")
1212

13-
def initialize(importmap_path = "config/importmap.rb", vendor_path: Pathname.new("app/javascript/vendor"))
14-
@importmap_path = importmap_path
15-
@vendor_path = vendor_path
13+
def initialize(importmap_path = "config/importmap.rb", vendor_path: "vendor/javascript")
14+
@importmap_path = Pathname.new(importmap_path)
15+
@vendor_path = Pathname.new(vendor_path)
1616
end
1717

1818
def import(*packages, env: "production", from: "jspm")

0 commit comments

Comments
 (0)