Fix Sprockets bugs

When installing Rails, Sprockets is the default use case for assets like CSS, JavaScript, and Images. A few folks were getting double render errors which lead me to the manifest.js file. On a first run Rails will append both a javascript and css file there. Rails UI leverages cssbundling so these aren’t necessary. This update removes them outright to hopefully make the double render error non-existent going forward. Also fixed some typos.

Author: justalever

app/views/railsui/themes/bootstrap/retriever/components/flash/_dynamic.html.erb

@@ -35,7 +35,7 @@ document.addEventListener('turbo:load', () => {
 <%= doc_label(:stimulus) %>
 
 <% content_for :html, flush: true do %>
-<div class="notice" role="alert" data-controller="flash">
+<div class="flash flash-warning" role="alert" data-controller="flash">
   <p>...</p>
 </div>
 <% end %>

lib/install/bootstrap/install.rb

@@ -2,11 +2,12 @@
   say "🥾 Bootstrap is already installed."
 else
 
-  def swap_sprockets_to_builds
+  # ensure sprockets plays nicely
+  def optimize_sprockets
     if (sprockets_manifest_path = Rails.root.join("app/assets/config/manifest.js")).exist?
-    append_to_file sprockets_manifest_path, %(//= link_tree ../builds\n)
-
-    gsub_file "app/assets/config/manifest.js", "//= link_directory ../stylesheets .css\n", ""
+      gsub_file "app/assets/config/manifest.js", "//= link_directory ../stylesheets .css\n", ""
+      gsub_file "app/assets/config/manifest.js", "//= link_tree ../../javascript .js\n", ""
+      gsub_file "app/assets/config/manifest.js", "//= link_tree ../../../vendor/javascript .js\n", ""
     end
   end
 
@@ -19,8 +20,6 @@ def copy_custom_css
   end
 
   def install_bootstrap
-    # source: https://github.com/rails/cssbundling-rails/blob/main/lib/install/bootstrap/install.rb
-
     # Copy customized Bootstrap CSS
     copy_file "#{__dir__}/themes/#{Railsui.config.theme}/stylesheets/application.bootstrap.scss",
       "app/assets/stylesheets/application.bootstrap.scss"
@@ -107,8 +106,8 @@ def copy_stimulus_js_controllers
     end
   end
 
-  say "Stop linking stylesheets automatically"
-  swap_sprockets_to_builds
+  say "Make Sprockets behave"
+  optimize_sprockets
 
   say "🎨️ Copy custom CSS"
   copy_custom_css

lib/install/install.rb

@@ -54,11 +54,12 @@ def remove_importmaps
 end
 
 def add_esbuild
-  # rails_command "javascript:install:esbuild", force: true
-  # Node versions make this thing a chore and we want it to be fully automated not dependent on a specific version so we gotta go full manual for now
+  # rails_command "javascript:install:esbuild", force: true <<- replacement
 
   if (sprockets_manifest_path = Rails.root.join("app/assets/config/manifest.js")).exist?
     append_to_file sprockets_manifest_path, %(//= link_tree ../builds\n)
+    gsub_file "app/assets/config/manifest.js", "//= link_tree ../../javascript .js\n", ""
+    gsub_file "app/assets/config/manifest.js", "//= link_tree ../../../vendor/javascript .js\n", ""
   end
 
   if Rails.root.join(".gitignore").exist?
@@ -257,7 +258,7 @@ def add_devise_customizations
 initializer_content = <<-RUBY
 Rails.application.config.to_prepare do
   Devise::SessionsController.layout "devise"
-  Devise::RegistrationsController.layout proc{ |controller| user_signed_in? ? "application" : "devise" }
+  Devise::RegistrationsController.layout proc { |controller| user_signed_in? ? "application" : "devise" }
   Devise::ConfirmationsController.layout "devise"
   Devise::UnlocksController.layout "devise"
   Devise::PasswordsController.layout "devise"

lib/install/tailwind/install.rb

@@ -19,6 +19,13 @@
       say "✅ tailwind.config.js already exists"
     end
 
+    # ensure sprockets plays nicely
+    if (sprockets_manifest_path = Rails.root.join("app/assets/config/manifest.js")).exist?
+      gsub_file "app/assets/config/manifest.js", "//= link_directory ../stylesheets .css\n", ""
+      gsub_file "app/assets/config/manifest.js", "//= link_tree ../../javascript .js\n", ""
+      gsub_file "app/assets/config/manifest.js", "//= link_tree ../../../vendor/javascript .js\n", ""
+    end
+
     # remove application.css
     say "⚡️ Remove app/assets/stylesheets/application.css so build output can take over"
     remove_file "app/assets/stylesheets/application.css"
@@ -40,10 +47,7 @@
       directory "#{__dir__}/themes/#{Railsui.config.theme}/devise", Rails.root.join("app/views/devise")
     end
 
-    # TODO: Do we need this? - Inherited from railsui/lib/generators/railsui/templates/tailwind/<theme> somehow? Seems it's using the config in `application.rb - g.template_engine :railsui`. Pretty cool.
-    # Keeping for now
     say "⚡️ Add Tailwind-themed scaffold .erb templates"
-    # directory "#{__dir__}/themes/#{Railsui.config.theme}/templates/erb/scaffold", Rails.root.join("lib/templates/erb/scaffold"), force: true
     file_names = ["_form.html.erb.tt", "edit.html.erb.tt", "index.html.erb.tt", "new.html.erb.tt", "partial.html.erb.tt", "show.html.erb.tt"]
 
     file_names.each do |name|
@@ -56,7 +60,6 @@
 
     # Copy themed globally shared partials
     # These files overide those shipped during first install of Rails UI
-    # TODO: Improve this so we don't have to call explicit file names but rather files within the folder per theme
     say "⚡️ Copy shared partial files"
     shared_files = ["_error_messages.html.erb", "_flash.html.erb", "_nav.html.erb", "_nav_menu.html.erb", "_footer.html.erb"]