Include leaflet import only when no here maps provider is configured (#…

…34)
Platoniq · Oct 2, 2023 · 13cb664 · 13cb664
1 parent 42479d2
commit 13cb664
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/app/cells/decidim/navigation_maps/content_blocks/navigation_map/show.erb b/app/cells/decidim/navigation_maps/content_blocks/navigation_map/show.erb
@@ -18,4 +18,7 @@
 </section>
 
 <%= render partial: "template" %>
+<% unless %w[here].include?(Decidim.config.maps&.fetch(:provider)) %>
+  <%= javascript_pack_tag "decidim_leaflet" %>
+<% end %>
 <%= javascript_pack_tag "decidim_navigation_maps" %>
diff --git a/app/packs/entrypoints/decidim_leaflet.js b/app/packs/entrypoints/decidim_leaflet.js
@@ -0,0 +1 @@
+import "leaflet"
diff --git a/app/packs/src/decidim/navigation_maps/map_view.js b/app/packs/src/decidim/navigation_maps/map_view.js
@@ -1,5 +1,4 @@
 // Creates a map view
-import "leaflet";
 import "leaflet/dist/leaflet.css";
 import "@geoman-io/leaflet-geoman-free";
 import "@geoman-io/leaflet-geoman-free/dist/leaflet-geoman.css";

diff --git a/config/assets.rb b/config/assets.rb
@@ -19,6 +19,7 @@
 # SCSS files within the entrypoints, they become available for inclusion using
 # `stylesheet_pack_tag`.
 Decidim::Webpacker.register_entrypoints(
+  decidim_leaflet: "#{base_path}/app/packs/entrypoints/decidim_leaflet.js",
   decidim_navigation_maps: "#{base_path}/app/packs/entrypoints/decidim_navigation_maps.js",
   decidim_admin_navigation_maps: "#{base_path}/app/packs/entrypoints/decidim_admin_navigation_maps.js"
 )