Merged in CHOUETTE-3246-webpack-runtime-is-include (pull request #1535)

CHOUETTE-3246 Fix double inclusion of webpack runtime Approved-by: Luc Donnet
enroute-mobi · Nov 30, 2023 · 4b613c3 · 4b613c3
2 parents a2a6844 + 01c3f85
commit 4b613c3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
@@ -20,9 +20,8 @@ html lang=I18n.locale
 
     // Webpack bundle
     = favicon_pack_tag 'static/favicon.ico'
-    = javascript_pack_tag 'application'
     - additional_packs = (yield :additional_packs).split.to_set.to_a
-    = javascript_pack_tag *(additional_packs), defer: true
+    = javascript_pack_tag 'application', *additional_packs, defer: true
     = stylesheet_pack_tag 'application'
 
     // Sprockets bundle

diff --git a/app/views/layouts/devise.html.slim b/app/views/layouts/devise.html.slim
@@ -10,9 +10,8 @@ html lang=I18n.locale
 
     // Webpack bundle
     = favicon_pack_tag 'static/favicon.ico'
-    = javascript_pack_tag 'application'
     - additional_packs = (yield :additional_packs).split.to_set.to_a
-    = javascript_pack_tag *(additional_packs), defer: true
+    = javascript_pack_tag 'application', *additional_packs, defer: true
     = stylesheet_pack_tag 'application'
 
     // Sprockets bundle