railsui 3.2.7 → 3.3.0

data/lib/generators/railsui/install/install_generator.rb

@@ -7,65 +7,149 @@ module Railsui
 
       source_root File.expand_path("templates", __dir__)
 
+      class_option :build, type: :boolean, default: false, desc: "Install with JS bundler (esbuild, bun, webpack, rollup)"
+
+      def check_build_mode_requirements
+        # If --build flag is used, verify jsbundling-rails is installed BEFORE doing anything
+        if options[:build]
+          unless gem_installed?('jsbundling-rails')
+            say ""
+            say "=" * 70, :red
+            say "❌ Build mode requires jsbundling-rails", :red
+            say "=" * 70, :red
+            say ""
+            say "You've used the --build flag, but jsbundling-rails is not installed.", :yellow
+            say ""
+            say "Please install a JS bundler first:", :cyan
+            say ""
+            say "  bundle add jsbundling-rails", :cyan
+            say "  rails javascript:install:[bun|esbuild|rollup|webpack]", :cyan
+            say "  rails railsui:install --build", :cyan
+            say ""
+            say "Or use importmap mode (no --build flag needed):", :cyan
+            say ""
+            say "  rails railsui:install", :cyan
+            say ""
+            say "📚 See README for more details on installation modes", :cyan
+            say ""
+            exit(1)
+          end
+
+          # Also verify a JS bundler is configured
+          bundler = detect_js_bundler
+          if bundler == "unknown" || bundler == "importmap"
+            say ""
+            say "=" * 70, :red
+            say "❌ Build mode requires a configured JS bundler", :red
+            say "=" * 70, :red
+            say ""
+            say "jsbundling-rails is installed, but no bundler is configured.", :yellow
+            say ""
+            say "Install one with:", :cyan
+            say ""
+            say "  rails javascript:install:[bun|esbuild|rollup|webpack]", :cyan
+            say "  rails railsui:install --build", :cyan
+            say ""
+            say "Or use importmap mode (no --build flag needed):", :cyan
+            say ""
+            say "  rails railsui:install", :cyan
+            say ""
+            say "📚 See README for more details on installation modes", :cyan
+            say ""
+            exit(1)
+          end
+        end
+      end
+
       def create_config
+        build_mode = options[:build] ? "build" : "nobuild"
+
         configuration_params = {
           application_name: "Rails UI",
           support_email: "support@example.com",
           theme: "hound",
-          pages: Railsui::Pages.get_pages('hound')
+          pages: Railsui::Pages.get_pages('hound'),
+          build_mode: build_mode
         }
 
         config = Railsui::Configuration.new(configuration_params)
-        config.save
+        config.save(skip_build: true) # Skip CSS build - file doesn't exist yet
       end
 
       def install_dependencies
+        # Detect and warn about existing setup
+        detect_and_warn_about_setup
+
         config = Railsui::Configuration.load!
 
         @theme = Railsui.config.theme
+        @build_mode = config.build_mode
+
+        mode_label = @build_mode == "nobuild" ? "no-build (importmap)" : "build"
+        say "🔥 Installing default theme: #{@theme.humanize} 🐶 in #{mode_label} mode. Don't worry, you can change this."
+
+        # Add engine routes
+        # Add a GUI for easier theme configuration
+        copy_railsui_routes
 
-        if File.exist?("#{Rails.root}/config/importmap.rb")
-          say "❌ Detected importmaps which is unfortunately not supported by Rails UI. For best results, please use another bundling solution from jsbundling-rails (i.e., esbuild, bun) before installing", :yellow
+        # gems railsui_icon and action_text
+        install_gems
+
+        # Install CSS dependencies (unified for both modes)
+        install_css_dependencies
+
+        # mailers
+        update_application_helper
+        update_railsui_mailer_layout(@theme)
+        generate_sample_mailers(@theme)
+
+        # Install JS dependencies based on build mode
+        if @build_mode == "nobuild"
+          install_js_dependencies_nobuild(@theme)
         else
-          say "🔥 Installing default theme: #{@theme.humanize} 🐶. Don't worry, you can change this."
+          install_js_dependencies_build(@theme)
+        end
 
-          # Add engine routes
-          # Add a GUI for easier theme configuration
-          copy_railsui_routes
+        # assets
+        copy_theme_javascript(@theme)
+        copy_theme_stylesheets(@theme)
 
-          # gems railsui_icon and action_text
-          install_gems
+        # view related
+        copy_railsui_head(@theme)
+        copy_railsui_launcher(@theme)
 
-          # mailers
-          update_application_helper
-          update_railsui_mailer_layout(@theme)
-          generate_sample_mailers(@theme)
+        # cleanup
+        remove_action_text_defaults
 
-          # rails ui deps
-          install_theme_dependencies(@theme)
+        # Copy the pages related files.
+        copy_railsui_pages_routes
+        copy_railsui_page_controller(@theme)
+        copy_railsui_images(@theme)
+        copy_railsui_pages(@theme)
 
-          # assets
-          copy_theme_javascript(@theme)
-          copy_theme_stylesheets(@theme)
+        # Copy Procfile for the correct mode
+        copy_procfile
 
-          # view related
-          copy_railsui_head(@theme)
-          copy_railsui_launcher(@theme)
+        # Copy bin/dev script
+        copy_bin_dev
 
-          # cleanup
-          remove_action_text_defaults
+        # Run bundle install to ensure all gems are available
+        say "Running bundle install...", :yellow
+        run "bundle install"
 
-          # Copy the pages related files.
-          copy_railsui_pages_routes
-          copy_railsui_page_controller(@theme)
-          copy_railsui_images(@theme)
-          copy_railsui_pages(@theme)
+        # migrate
+        rails_command "db:migrate"
 
-          # migrate
-          rails_command "db:migrate"
+        # Build JavaScript if in build mode (after all packages are installed)
+        if @build_mode == "build"
+          say "Building JavaScript...", :yellow
+          run "yarn build"
+          say "✓ JavaScript built successfully", :green
+        end
+
+        config.save
 
-          config.save
-say "
+        say "
 MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
 MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
 MMMMMMMMMMMMMWXOxooodOXMMMMMMMMMMWXxxXMMMMMMMMMMMMMMMMMMMMMM
@@ -90,11 +174,13 @@ MMMMMMMMMNxldk0XNWMMMMMWNKkl,.  .lKWMMMMMXo. ,xNMMMMMMMMMMMM
 MMMMMMMMMWWMMMMMMMMMMMMMMMMMW0kkKWMMMMMMMMWKONMMMMMMMMMMMMMM
 MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
 "
-          say "✅ Install complete", :green
-          say "--"
-          say "🔥 Rails UI is now installed. You can access your configuration at /railsui"
-          say "Read documentation at https://railsui.com/docs for FAQs, guides, and more."
-        end
+        say "✅ Install complete", :green
+        say ""
+        say "Next steps:", :cyan
+        say "  1. Run: bin/dev", :cyan
+        say "  2. Visit: http://localhost:3000/railsui", :cyan
+        say ""
+        say "📚 Documentation: https://railsui.com/docs"
       end
     end
   end

data/lib/generators/railsui/install/templates/Procfile.dev.build

@@ -0,0 +1 @@
+css: bin/rails tailwindcss:watch

data/lib/generators/railsui/install/templates/Procfile.dev.nobuild

@@ -0,0 +1,2 @@
+web: bin/rails server -p 3000
+css: bin/rails tailwindcss:watch

data/lib/generators/railsui/install/templates/bin/dev

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+# Exit if any command fails
+set -e
+
+# Check if Procfile.dev exists
+if [ ! -f Procfile.dev ]; then
+  echo "Procfile.dev not found!"
+  exit 1
+fi
+
+# Check for foreman/overmind, otherwise try to install foreman
+if command -v overmind &> /dev/null; then
+  exec overmind start -f Procfile.dev "$@"
+elif command -v foreman &> /dev/null; then
+  exec foreman start -f Procfile.dev "$@"
+else
+  echo "Installing foreman..."
+  gem install foreman
+  exec foreman start -f Procfile.dev "$@"
+fi

data/lib/generators/railsui/install/templates/themes/corgie/stylesheets/railsui/actiontext.css

@@ -1,7 +1,6 @@
 /***************************************
   Default ActionText
 ****************************************/
-@import "trix/dist/trix";
 
 .trix-content .attachment-gallery > action-text-attachment,
 .trix-content .attachment-gallery > .attachment {

data/lib/generators/railsui/install/templates/themes/corgie/views/layouts/rui/railsui.html.erb

@@ -17,8 +17,12 @@
     <%# Enable PWA manifest for installable apps (make sure to enable in config/routes.rb too!) %>
     <%#= tag.link rel: "manifest", href: pwa_manifest_path(format: :json) %>
 
-    <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
-    <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
+    <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
+    <% if Railsui.config.build_mode == "build" %>
+      <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
+    <% else %>
+      <%= javascript_importmap_tags %>
+    <% end %>
 
     <%= railsui_head %>
   </head>
@@ -29,6 +33,7 @@
     <%= yield %>
 
     <%= render "rui/shared/footer" %>
+    <%= render "rui/shared/search" %>
     <%= render "rui/shared/settings/modal" %>
     <%= railsui_launcher if Rails.env.development? %>
   </body>

data/lib/generators/railsui/install/templates/themes/corgie/views/layouts/rui/railsui_admin.html.erb

@@ -17,8 +17,12 @@
     <%# Enable PWA manifest for installable apps (make sure to enable in config/routes.rb too!) %>
     <%#= tag.link rel: "manifest", href: pwa_manifest_path(format: :json) %>
 
-    <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
-    <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
+    <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
+    <% if Railsui.config.build_mode == "build" %>
+      <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
+    <% else %>
+      <%= javascript_importmap_tags %>
+    <% end %>
 
     <%= railsui_head %>
   </head>
@@ -28,6 +32,7 @@
 
     <%= yield %>
 
+    <%= render "rui/shared/search" %>
     <%= render "rui/shared/settings/modal" %>
     <%= railsui_launcher if Rails.env.development? %>
   </body>

data/lib/generators/railsui/install/templates/themes/corgie/views/layouts/rui/railsui_auth.html.erb

@@ -17,8 +17,12 @@
     <%# Enable PWA manifest for installable apps (make sure to enable in config/routes.rb too!) %>
     <%#= tag.link rel: "manifest", href: pwa_manifest_path(format: :json) %>
 
-    <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
-    <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
+    <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
+    <% if Railsui.config.build_mode == "build" %>
+      <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
+    <% else %>
+      <%= javascript_importmap_tags %>
+    <% end %>
 
     <%= railsui_head %>
   </head>

data/lib/generators/railsui/install/templates/themes/corgie/views/rui/pages/{privacy.html.erb → privacy_policy.html.erb}

@@ -131,7 +131,7 @@
         If you have any questions about this Privacy Policy or our data practices, please contact us at:
       </p>
       <ul>
-        <li>Email: <a href="#">privacy@corgi.com</a></li>
+        <li>Email: <a href="#">privacy@corgie.com</a></li>
         <li>Address: <a href="#">123 AI Street, Tech City, TC 12345</a></li>
         <li>Phone: <a href="#">+1 (555) 123-4567</a></li>
       </ul>

data/lib/generators/railsui/install/templates/themes/corgie/views/rui/pages/terms.html.erb

@@ -19,7 +19,7 @@
 
       <p>
         By creating an account or using our service, you acknowledge that you have read, understood, and agree to be
-        bound by these Terms and our <%= link_to "Privacy Policy", rui_privacy_path %>. If you do not agree to these Terms, please do not
+        bound by these Terms and our <%= link_to "Privacy Policy", rui_privacy_policy_path %>. If you do not agree to these Terms, please do not
         use our service.
       </p>
 
@@ -89,7 +89,7 @@
       <h2>6. Privacy and Data Protection</h2>
 
       <p>
-        Your privacy is important to us. Our collection and use of personal information is governed by our <%= link_to "Privacy Policy", rui_privacy_path %>. By using our service, you consent to the collection and use of your information
+        Your privacy is important to us. Our collection and use of personal information is governed by our <%= link_to "Privacy Policy", rui_privacy_policy_path %>. By using our service, you consent to the collection and use of your information
         as described in our Privacy Policy.
       </p>
 

data/lib/generators/railsui/install/templates/themes/corgie/views/rui/shared/sidebar/_link.html.erb

@@ -10,14 +10,14 @@
   <span class="flex-1 truncate transition-opacity duration-200" data-sidebar-target="chatTitle"><%= title %></span>
 
   <div class="opacity-0 group-hover:opacity-100 transition-opacity shrink-0 flex gap-1" data-sidebar-target="chatActions">
-    <%= link_to "#", class: "p-1 hover:bg-neutral-300 dark:hover:bg-neutral-600 rounded text-neutral-600 dark:text-neutral-400" do %>
+    <div class="p-1 hover:bg-neutral-300 dark:hover:bg-neutral-600 rounded text-neutral-600 dark:text-neutral-400">
       <%= icon "pencil-square", class: "size-3.5" %>
       <span class="sr-only">Edit</span>
-    <% end %>
+    </div>
 
-    <%= button_to "#", method: :delete, class: "p-1 hover:bg-neutral-300 dark:hover:bg-neutral-600 rounded text-neutral-600 dark:text-neutral-400" do %>
+    <div class="p-1 hover:bg-neutral-300 dark:hover:bg-neutral-600 rounded text-neutral-600 dark:text-neutral-400">
       <%= icon "trash", class: "size-3.5" %>
       <span class="sr-only">Delete</span>
-    <% end %>
+    </div>
   </div>
 <% end %>

data/lib/generators/railsui/install/templates/themes/hound/stylesheets/railsui/actiontext.css

@@ -1,7 +1,6 @@
 /***************************************
   Default ActionText
 ****************************************/
-@import "trix/dist/trix";
 
 .trix-content .attachment-gallery > action-text-attachment,
 .trix-content .attachment-gallery > .attachment {

data/lib/generators/railsui/install/templates/themes/hound/views/layouts/rui/railsui.html.erb

@@ -16,8 +16,12 @@
     <%# Enable PWA manifest for installable apps (make sure to enable in config/routes.rb too!) %>
     <%#= tag.link rel: "manifest", href: pwa_manifest_path(format: :json) %>
 
-    <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
-    <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
+    <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
+    <% if Railsui.config.build_mode == "build" %>
+      <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
+    <% else %>
+      <%= javascript_importmap_tags %>
+    <% end %>
 
     <%= railsui_head %>
   </head>

data/lib/generators/railsui/install/templates/themes/hound/views/layouts/rui/railsui_admin.html.erb

@@ -16,8 +16,12 @@
     <%# Enable PWA manifest for installable apps (make sure to enable in config/routes.rb too!) %>
     <%#= tag.link rel: "manifest", href: pwa_manifest_path(format: :json) %>
 
-    <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
-    <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
+    <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
+    <% if Railsui.config.build_mode == "build" %>
+      <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
+    <% else %>
+      <%= javascript_importmap_tags %>
+    <% end %>
 
     <%= railsui_head %>
   </head>

data/lib/generators/railsui/install/templates/themes/shepherd/stylesheets/railsui/actiontext.css

@@ -1,7 +1,6 @@
 /***************************************
   Default ActionText
 ****************************************/
-@import "trix/dist/trix";
 
 .trix-content .attachment-gallery > action-text-attachment,
 .trix-content .attachment-gallery > .attachment {

data/lib/generators/railsui/install/templates/themes/shepherd/views/layouts/rui/railsui.html.erb

@@ -16,8 +16,12 @@
     <%# Enable PWA manifest for installable apps (make sure to enable in config/routes.r b too!) %>
     <%#= tag.link rel: "manifest", href: pwa_manifest_path(format: :json) %>
 
-    <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
-    <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
+    <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
+    <% if Railsui.config.build_mode == "build" %>
+      <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
+    <% else %>
+      <%= javascript_importmap_tags %>
+    <% end %>
 
     <%= railsui_head %>
   </head>

data/lib/generators/railsui/install/templates/themes/shepherd/views/layouts/rui/railsui_admin.html.erb

@@ -16,8 +16,12 @@
     <%# Enable PWA manifest for installable apps (make sure to enable in config/routes.r b too!) %>
     <%#= tag.link rel: "manifest", href: pwa_manifest_path(format: :json) %>
 
-    <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
-    <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
+    <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
+    <% if Railsui.config.build_mode == "build" %>
+      <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
+    <% else %>
+      <%= javascript_importmap_tags %>
+    <% end %>
 
     <%= railsui_head %>
   </head>

data/lib/generators/railsui/update/update_generator.rb

@@ -9,22 +9,35 @@ module Railsui
 
       def setup_theme
         @config = Railsui::Configuration.load!
+        @build_mode = @config.build_mode
 
+        say "Updating theme: #{@config.theme} (#{@build_mode} mode)", :yellow
 
-        say @config.theme, :yellow
+        # Migrate old CSS path to new tailwindcss-rails v4 location if needed
+        migrate_css_path_if_needed
 
         say "Updating Rails UI config", :yellow
         # mailers
         update_railsui_mailer_layout(@config.theme)
         copy_sample_mailers(@config.theme)
 
-        # rails ui deps
-        install_theme_dependencies(@config.theme)
+        # Install dependencies based on build mode
+        if @build_mode == "nobuild"
+          install_js_dependencies_nobuild(@config.theme)
+        else
+          install_js_dependencies_build(@config.theme)
+        end
+
+        # CSS dependencies (unified for both modes)
+        install_css_dependencies
 
         # themed assets
         copy_theme_javascript(@config.theme)
         copy_theme_stylesheets(@config.theme)
 
+        # Update Procfile for current mode
+        copy_procfile
+
         # update body classes
         update_railsui_theme_classes
 
@@ -33,12 +46,35 @@ module Railsui
 
         Railsui::Configuration.synchronize_pages
 
+        # Run bundle install to ensure all gems are available
+        say "Running bundle install...", :yellow
+        run "bundle install"
+
         @config.save
-        say "✅ Configuration updated successfully", :green
+        say "✅ Configuration updated successfully for #{@build_mode} mode", :green
       end
 
       private
 
+      def migrate_css_path_if_needed
+        old_path = Rails.root.join("app/assets/stylesheets/application.tailwind.css")
+        new_path = Rails.root.join("app/assets/tailwind/application.css")
+
+        # If using old path and new path doesn't exist, migrate
+        if File.exist?(old_path) && !File.exist?(new_path)
+          say "📦 Migrating CSS to tailwindcss-rails v4 location...", :yellow
+
+          # Create new directory
+          FileUtils.mkdir_p(Rails.root.join("app/assets/tailwind"))
+
+          # Move the file
+          FileUtils.mv(old_path, new_path)
+
+          say "✓ Moved #{old_path.relative_path_from(Rails.root)} → #{new_path.relative_path_from(Rails.root)}", :green
+          say "  Layouts will now use stylesheet_link_tag 'tailwind' instead of 'application'", :cyan
+        end
+      end
+
       def sync_pages
         # Remove old theme's pages. Forcefully for now.
         pages_directory = Rails.root.join("app/views/rui")