Merge pull request #6202 from blish/allow-importmaps-2

tvdeyen · web-flow · commit c6538fe4a1f2 · 2025-05-31T09:26:01.000+02:00
Update importmap-rails to v2
diff --git a/admin/app/views/layouts/solidus_admin/application.html.erb b/admin/app/views/layouts/solidus_admin/application.html.erb
@@ -13,7 +13,7 @@
 
     <%= stylesheet_link_tag SolidusAdmin::Config.theme_path(session[:admin_light_theme]), media: '(prefers-color-scheme: light)', "data-turbo-track": "reload" %>
     <%= stylesheet_link_tag SolidusAdmin::Config.theme_path(session[:admin_dark_theme]), media: '(prefers-color-scheme: dark)', "data-turbo-track": "reload" %>
-    <%= javascript_importmap_tags "solidus_admin/application", shim: false, importmap: SolidusAdmin.importmap %>
+    <%= javascript_importmap_tags "solidus_admin/application", importmap: SolidusAdmin.importmap %>
     <meta name="turbo-refresh-scroll", content="preserve">
   </head>
 
diff --git a/admin/app/views/layouts/solidus_admin/preview.html.erb b/admin/app/views/layouts/solidus_admin/preview.html.erb
@@ -3,7 +3,7 @@
   <head>
     <%= stylesheet_link_tag SolidusAdmin::Config.theme_path(session[:admin_light_theme]), media: '(prefers-color-scheme: light)', "data-turbo-track": "reload" %>
     <%= stylesheet_link_tag SolidusAdmin::Config.theme_path(session[:admin_dark_theme]), media: '(prefers-color-scheme: dark)', "data-turbo-track": "reload" %>
-    <%= javascript_importmap_tags "solidus_admin/application", shim: false, importmap: SolidusAdmin.importmap %>
+    <%= javascript_importmap_tags "solidus_admin/application", importmap: SolidusAdmin.importmap %>
   </head>
   <body class="p-3">
     <%= yield %>
diff --git a/admin/solidus_admin.gemspec b/admin/solidus_admin.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = '>= 1.8.23'
 
   s.add_dependency 'geared_pagination', '~> 1.1'
-  s.add_dependency 'importmap-rails', '~> 1.2', '>= 1.2.1'
+  s.add_dependency 'importmap-rails', ['>= 2.0', '< 3']
   s.add_dependency 'solidus_backend'
   s.add_dependency 'solidus_core', '> 4.2'
   s.add_dependency 'stimulus-rails', '~> 1.2'
diff --git a/promotions/solidus_promotions.gemspec b/promotions/solidus_promotions.gemspec
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.files = files.grep_v(%r{^(spec|bin)/})
 
   spec.add_dependency "csv", "~> 3.0"
-  spec.add_dependency "importmap-rails", "~> 1.2"
+  spec.add_dependency "importmap-rails", [">= 2.0", "< 3"]
   spec.add_dependency "ransack-enum", "~> 1.0"
   spec.add_dependency "solidus_core", [">= 4.0.0", "< 5"]
   spec.add_dependency "solidus_support", ">= 0.12.0"
