Only render JS tags for pages with JS

veganstraightedge · veganstraightedge · commit bb752f7799ad · 2025-01-17T00:30:49.000-08:00
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -3,7 +3,6 @@
 
 // /admin site
 //= link admin.css
-//= link bootstrap.min.js
 
 // Mini sites
 //= link to_change_everything.css
diff --git a/app/javascript/admin.js b/app/javascript/admin.js
diff --git a/app/views/2017/articles/show.html.erb b/app/views/2017/articles/show.html.erb
@@ -7,8 +7,8 @@
 <% end %>
 
 <% if live_blog_article? && @article.updated_at.after?(1.week.ago) %>
-  <% content_for :head do %>
-    <%= javascript_import_module_tag "live_blog" %>
+  <% content_for :javascript do %>
+    <%= javascript_import_module_tag :live_blog %>
   <% end %>
 
   <%= render_themed "articles/live_blog", article_slug: @article.slug %>
diff --git a/app/views/2017/shared/head/_link_tags.html.erb b/app/views/2017/shared/head/_link_tags.html.erb
@@ -24,5 +24,3 @@
 <!-- Browser hints -->
 <link rel="dns-prefetch" href="https://assets.crimethinc.com">
 <link rel="dns-prefetch" href="https://cdn.crimethinc.com">
-
-<%= yield :head %>
diff --git a/app/views/2017/support/edit.html.erb b/app/views/2017/support/edit.html.erb
@@ -68,6 +68,6 @@
   <%= t('views.support.edit.expires_at', minutes: minutes_until_expiration(@support_session)) %>
 </p>
 
-<% content_for :head do %>
-  <%= javascript_import_module_tag "support" %>
+<% content_for :javascript do %>
+  <%= javascript_import_module_tag :support %>
 <% end %>
diff --git a/app/views/2017/support/new.html.erb b/app/views/2017/support/new.html.erb
@@ -95,6 +95,6 @@
   });
 </script>
 
-<% content_for :foot do %>
-  <%= javascript_import_module_tag "support" %>
+<% content_for :javascript do %>
+  <%= javascript_import_module_tag :support %>
 <% end %>
diff --git a/app/views/layouts/2017/_application.html.erb b/app/views/layouts/2017/_application.html.erb
@@ -6,8 +6,13 @@
              prefix: html_prefix do %>
   <head>
     <%= render_themed "shared/head" %>
-    <%= javascript_importmap_tags %>
+
     <%= yield :head %>
+
+    <% if content_for(:javascript).present? %>
+      <%= javascript_importmap_tags %>
+      <%= yield :javascript %>
+    <% end %>
   </head>
 
   <body id="<%= body_id %>">
@@ -29,7 +34,5 @@
     </main>
 
     <%= render_themed "shared/footer" %>
-
-    <%= yield :foot %>
   </body>
 <% end %>
diff --git a/app/views/layouts/2025/_application.html.erb b/app/views/layouts/2025/_application.html.erb
@@ -14,9 +14,13 @@
 
     <%# TODO: add favicon link tags here %>
 
-    <%= javascript_importmap_tags %>
     <%= render 'layouts/2025/auto_dark_mode' %>
     <%= render 'layouts/2025/stylesheets' %>
+
+    <% if content_for(:javascript).present? %>
+      <%= javascript_importmap_tags %>
+      <%= yield :javascript %>
+    <% end %>
   </head>
 
   <body>
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
@@ -31,11 +31,17 @@
     <link rel="manifest" href="/manifest.json">
 
     <%= stylesheet_link_tag "admin", media: "all" %>
-    <%= javascript_importmap_tags %>
-    <%= javascript_import_module_tag "bootstrap" %>
-    <%= yield(:head) %>
 
-      <%= render 'layouts/2025/auto_dark_mode' %>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.min.js" integrity="sha384-0pUGZvbkm6XF6gxjEnlmuGrJXVbNuzT9qBBavbLwCsOGabYfZo0T0to5eqruptLy" crossorigin="anonymous"></script>
+
+    <%= yield :head %>
+
+    <% if content_for(:javascript).present? %>
+      <%= javascript_importmap_tags %>
+      <%= yield :javascript %>
+    <% end %>
+
+    <%= render 'layouts/2025/auto_dark_mode' %>
   </head>
 
   <body id="<%= body_id %>">
diff --git a/app/views/layouts/steal_something_from_work_day.html.erb b/app/views/layouts/steal_something_from_work_day.html.erb
@@ -14,8 +14,13 @@
     <%= render 'steal_something_from_work_day/head/fav_and_touch_icons' %>
 
     <%= stylesheet_link_tag 'steal-something-from-work-day', media: 'all' %>
-    <%= javascript_importmap_tags %>
-    <%= yield(:head) %>
+
+    <%= yield :head %>
+
+    <% if content_for(:javascript).present? %>
+      <%= javascript_importmap_tags %>
+      <%= yield :javascript %>
+    <% end %>
   </head>
 
   <body id='<%= body_id %>' data-bs-spy='scroll' data-bs-target='#section-list' data-bs-offset='0'>
diff --git a/app/views/shared/head/_link_tags.html.erb b/app/views/shared/head/_link_tags.html.erb
@@ -24,5 +24,3 @@
 <!-- Browser hints -->
 <link rel="dns-prefetch" href="https://assets.crimethinc.com">
 <link rel="dns-prefetch" href="https://cdn.crimethinc.com">
-
-<%= yield :head %>
diff --git a/app/views/steal_something_from_work_day/head/_link_tags.html.erb b/app/views/steal_something_from_work_day/head/_link_tags.html.erb
@@ -24,5 +24,3 @@
 <!-- Browser hints -->
 <link rel="dns-prefetch" href="https://assets.crimethinc.com">
 <link rel="dns-prefetch" href="https://cdn.crimethinc.com">
-
-<%= yield :head %>
diff --git a/app/views/steal_something_from_work_day/show.html.erb b/app/views/steal_something_from_work_day/show.html.erb
@@ -29,7 +29,3 @@
     <br><br><br><br><br>
   </main>
 </div><!-- .main-wrapper -->
-
-<% content_for :head do %>
-  <%= javascript_import_module_tag "bootstrap" %>
-<% end %>
diff --git a/config/importmap.rb b/config/importmap.rb
@@ -1,12 +1,11 @@
 # Pin npm packages by running ./bin/importmap
 
-pin 'application', preload: false
+pin :application
 
 # Our JS files
-pin 'support',   preload: false
-pin 'bootstrap', preload: false, to: 'bootstrap.min.js'
+pin :support
 
-# Hotwired JS https://hotwired.dev
+# Stimulus JS (part of Hotwire JS) https://stimulus.hotwired.dev
 pin '@hotwired/stimulus',         to: 'stimulus.min.js',     preload: false
 pin '@hotwired/stimulus-loading', to: 'stimulus-loading.js', preload: false
 
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
@@ -10,4 +10,4 @@
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets
 # folder are already added.
-# Rails.application.config.assets.precompile += %w[bootstrap.min.js admin.css]
+# Rails.application.config.assets.precompile += %w[]
