lib/importmap/engine.rb in importmap-rails-0.8.2 vs lib/importmap/engine.rb in importmap-rails-0.9.0

@@ -4,44 +4,46 @@
 Rails::Application.send(:attr_accessor, :importmap)
 
 module Importmap
   class Engine < ::Rails::Engine
     config.importmap = ActiveSupport::OrderedOptions.new
+    config.importmap.paths = []
     config.importmap.sweep_cache = Rails.env.development? || Rails.env.test?
+    config.importmap.cache_sweepers = []
     config.importmap.rescuable_asset_errors = []
 
     config.autoload_once_paths = %W( #{root}/app/helpers )
 
     initializer "importmap" do |app|
-      app.importmap = Importmap::Map.new.draw("config/importmap.rb")
+      app.importmap = Importmap::Map.new
+      app.config.importmap.paths << app.root.join("config/importmap.rb")
+      app.config.importmap.paths.each { |path| app.importmap.draw(path) }
     end
 
     initializer "importmap.reloader" do |app|
-      app.config.paths.add "config/importmap.rb"
-
       Importmap::Reloader.new.tap do |reloader|
         reloader.execute
         app.reloaders << reloader
         app.reloader.to_run { reloader.execute }
       end
     end
 
     initializer "importmap.cache_sweeper" do |app|
       if app.config.importmap.sweep_cache
-        app.importmap.cache_sweeper watches: [ 
-          app.root.join("app/javascript"), app.root.join("vendor/javascript")
-        ]
+        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)
 
         ActiveSupport.on_load(:action_controller_base) do
           before_action { Rails.application.importmap.cache_sweeper.execute_if_updated }
         end
       end
     end
 
     initializer "importmap.assets" do
       if Rails.application.config.respond_to?(:assets)
-        Rails.application.config.assets.precompile += %w( es-module-shims.js es-module-shims.min.js )
+        Rails.application.config.assets.precompile += %w( es-module-shims.js es-module-shims.min.js es-module-shims.js.map )
         Rails.application.config.assets.paths << Rails.root.join("app/javascript")
         Rails.application.config.assets.paths << Rails.root.join("vendor/javascript")
       end
     end
 
@@ -49,10 +51,14 @@
       ActiveSupport.on_load(:action_controller_base) do
         helper Importmap::ImportmapTagsHelper
       end
     end
 
-    initializer 'importmap.rescuable_asset_errors' do |app|
+    initializer "importmap.rescuable_asset_errors" do |app|
+      if defined?(Propshaft)
+        app.config.importmap.rescuable_asset_errors << Propshaft::MissingAssetError
+      end
+
       if defined?(Sprockets::Rails)
         app.config.importmap.rescuable_asset_errors << Sprockets::Rails::Helper::AssetNotFound
       end
     end
   end