Merge pull request #163 from henrikbjorn/importmap-changes

rosa · web-flow · commit 78ee499cfe19 · 2024-10-30T14:45:09.000+01:00
Separate importmap from the application
diff --git a/app/views/layouts/mission_control/jobs/application.html.erb b/app/views/layouts/mission_control/jobs/application.html.erb
@@ -9,7 +9,7 @@
   <meta name="turbo-cache-control" content="no-cache">
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@1.0.1/css/bulma.min.css">
   <%= stylesheet_link_tag "mission_control/jobs/application", "data-turbo-track": "reload" %>
-  <%= javascript_importmap_tags "application-mcj" %>
+  <%= javascript_importmap_tags "application", importmap: MissionControl::Jobs.importmap  %>
 </head>
 <body>
 
diff --git a/config/importmap.rb b/config/importmap.rb
@@ -1,4 +1,4 @@
-pin "application-mcj", to: "mission_control/jobs/application.js", preload: true
+pin "application", to: "mission_control/jobs/application.js", preload: true
 pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: true
 pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true
 pin "@hotwired/stimulus-loading", to: "stimulus-loading.js", preload: true
diff --git a/lib/mission_control/jobs.rb b/lib/mission_control/jobs.rb
@@ -19,6 +19,7 @@ module Jobs
     mattr_accessor :internal_query_count_limit, default: 500_000 # Hard limit to keep unlimited count queries fast enough
     mattr_accessor :show_console_help, default: true
     mattr_accessor :scheduled_job_delay_threshold, default: 1.minute
+    mattr_accessor :importmap, default: Importmap::Map.new
     mattr_accessor :backtrace_cleaner
   end
 end
diff --git a/lib/mission_control/jobs/engine.rb b/lib/mission_control/jobs/engine.rb
@@ -87,9 +87,13 @@ class Engine < ::Rails::Engine
         app.config.assets.precompile += %w[ mission_control_jobs_manifest ]
       end
 
-      initializer "mission_control-jobs.importmap", before: "importmap" do |app|
-        app.config.importmap.paths << root.join("config/importmap.rb")
-        app.config.importmap.cache_sweepers << root.join("app/javascript")
+      initializer "mission_control-jobs.importmap", after: "importmap" do |app|
+        MissionControl::Jobs.importmap.draw(root.join("config/importmap.rb"))
+        MissionControl::Jobs.importmap.cache_sweeper(watches: root.join("app/javascript"))
+
+        ActiveSupport.on_load(:action_controller_base) do
+          before_action { MissionControl::Jobs.importmap.cache_sweeper.execute_if_updated }
+        end
       end
     end
   end

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-pin "application-mcj", to: "mission_control/jobs/application.js", preload: true`
	`1`	`+pin "application", to: "mission_control/jobs/application.js", preload: true`
`2`	`2`	`pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: true`
`3`	`3`	`pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true`
`4`	`4`	`pin "@hotwired/stimulus-loading", to: "stimulus-loading.js", preload: true`