From 486fa2b766fc8e4a19a5ba898cc80a63a3837abd Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Thu, 18 Jun 2026 23:50:45 -1000
Subject: [PATCH 01/24] Fix generated demo path hints

---
 .../react_on_rails/base_generator.rb          | 21 ++---
 .../react_on_rails/demo_page_config.rb        |  8 +-
 .../react_on_rails/generator_helper.rb        | 81 +++++++++++++++++++
 .../react_no_redux_generator.rb               | 18 +++--
 .../react_with_redux_generator.rb             | 22 ++---
 .../generators/react_on_rails/rsc_setup.rb    |  7 +-
 .../app/views/hello_world/index.html.erb.tt   |  7 +-
 .../base/app/views/home/index.html.erb.tt     |  4 +
 .../generators/install_generator_spec.rb      | 58 +++++++++++++
 .../react_no_redux_generator_examples.rb      |  2 +
 .../react_with_redux_generator_examples.rb    |  2 +
 11 files changed, 196 insertions(+), 34 deletions(-)

diff --git a/react_on_rails/lib/generators/react_on_rails/base_generator.rb b/react_on_rails/lib/generators/react_on_rails/base_generator.rb
index 417cbc60a2..11dc13dac7 100644
--- a/react_on_rails/lib/generators/react_on_rails/base_generator.rb
+++ b/react_on_rails/lib/generators/react_on_rails/base_generator.rb
@@ -192,7 +192,7 @@ def create_react_directories
         # Skip HelloWorld directory for Redux (uses HelloWorldApp) or RSC (uses HelloServer)
         return if options.redux? || use_rsc?
 
-        empty_directory("app/javascript/src/HelloWorld/ror_components")
+        empty_directory(File.join(example_component_source_directory("HelloWorld"), "ror_components"))
       end
 
       def copy_base_files
@@ -235,14 +235,15 @@ def copy_base_files
 
       def copy_js_bundle_files
         base_path = "base/base/"
-        base_files = %w[app/javascript/packs/server-bundle.js]
+        copy_file("#{base_path}app/javascript/packs/server-bundle.js",
+                  shakapacker_entrypoint_path("server-bundle.js"))
 
         # Skip HelloWorld CSS for Redux (uses HelloWorldApp) or RSC (uses HelloServer)
-        unless options.redux? || use_rsc? || use_tailwind?
-          base_files << "app/javascript/src/HelloWorld/ror_components/HelloWorld.module.css"
-        end
+        return if options.redux? || use_rsc? || use_tailwind?
 
-        base_files.each { |file| copy_file("#{base_path}#{file}", file) }
+        copy_file("#{base_path}app/javascript/src/HelloWorld/ror_components/HelloWorld.module.css",
+                  File.join(example_component_source_directory("HelloWorld"),
+                            "ror_components/HelloWorld.module.css"))
       end
 
       def copy_webpack_config
@@ -274,7 +275,7 @@ def copy_tailwind_files
 
         base_path = "base/tailwind/"
         copy_file("#{base_path}app/javascript/stylesheets/application.css",
-                  "app/javascript/stylesheets/application.css")
+                  shakapacker_stylesheet_path("application.css"))
       end
 
       def copy_packer_config
@@ -686,10 +687,10 @@ def home_page_stack_badges
       end
 
       def example_source_path
-        return "app/javascript/src/HelloServer/" if use_rsc? && !options.redux?
-        return "app/javascript/src/HelloWorldApp/" if options.redux?
+        return example_component_source_path("HelloServer") if use_rsc? && !options.redux?
+        return example_component_source_path("HelloWorldApp") if options.redux?
 
-        "app/javascript/src/HelloWorld/"
+        example_component_source_path("HelloWorld")
       end
 
       def example_view_path
diff --git a/react_on_rails/lib/generators/react_on_rails/demo_page_config.rb b/react_on_rails/lib/generators/react_on_rails/demo_page_config.rb
index 991ec58768..bf6e5c8fa4 100644
--- a/react_on_rails/lib/generators/react_on_rails/demo_page_config.rb
+++ b/react_on_rails/lib/generators/react_on_rails/demo_page_config.rb
@@ -15,13 +15,13 @@ def build_hello_world_view_config(component_name:, source_path:, landing_page:,
         }
       end
 
-      def build_hello_server_view_config(landing_page:, redux_demo:)
+      def build_hello_server_view_config(landing_page:, redux_demo:, source_path:)
         {
           title: "React Server Components Demo",
           intro: "This route shows the Pro React Server Components flow: Rails streams an async server " \
                  "component response while only client islands ship JavaScript to the browser.",
           highlights: hello_server_highlights,
-          file_hints: hello_server_file_hints,
+          file_hints: hello_server_file_hints(source_path:),
           quick_links: hello_server_quick_links(landing_page:, redux_demo:),
           learning_links: hello_server_learning_links
         }
@@ -167,10 +167,10 @@ def hello_server_highlights
         ]
       end
 
-      def hello_server_file_hints
+      def hello_server_file_hints(source_path:)
         [
           {
-            path: "app/javascript/src/HelloServer/",
+            path: source_path,
             description: "Source for the generated server component example and client island."
           },
           {
diff --git a/react_on_rails/lib/generators/react_on_rails/generator_helper.rb b/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
index c7e93f8666..ea06694f5c 100644
--- a/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
+++ b/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
 require "json"
+require "pathname"
 require_relative "shakapacker_precompile_hook_helper"
 
 # rubocop:disable Metrics/ModuleLength
 module GeneratorHelper
   include ReactOnRails::Generators::ShakapackerPrecompileHookHelper
 
+  DEFAULT_SHAKAPACKER_SOURCE_PATH = "app/javascript"
+  DEFAULT_SHAKAPACKER_SOURCE_ENTRY_PATH = "packs"
+
   def package_json
     # Lazy load package_json gem only when actually needed for dependency management
 
@@ -75,6 +79,83 @@ def component_extension(options)
     options.typescript? ? "tsx" : "jsx"
   end
 
+  def shakapacker_source_path
+    configured_shakapacker_relative_path("source_path", DEFAULT_SHAKAPACKER_SOURCE_PATH)
+  end
+
+  def shakapacker_source_entry_path
+    configured_shakapacker_relative_path("source_entry_path", DEFAULT_SHAKAPACKER_SOURCE_ENTRY_PATH)
+  end
+
+  def shakapacker_entrypoint_path(filename)
+    File.join(shakapacker_source_path, shakapacker_source_entry_path, filename)
+  end
+
+  def shakapacker_stylesheet_path(filename)
+    File.join(shakapacker_source_path, "stylesheets", filename)
+  end
+
+  def example_component_source_directory(component_name)
+    File.join(shakapacker_source_path, "src", component_name)
+  end
+
+  def example_component_source_path(component_name)
+    "#{example_component_source_directory(component_name)}/"
+  end
+
+  def configured_shakapacker_relative_path(config_key, default)
+    config_path = File.join(destination_root, "config/shakapacker.yml")
+    return default unless File.exist?(config_path)
+
+    config = parse_shakapacker_yml(config_path)
+    configured_path = shakapacker_path_config_value(config, config_key)
+
+    safe_generator_destination_path(configured_path, default:)
+  end
+
+  def shakapacker_path_config_value(config, config_key)
+    %w[development default].each do |section_name|
+      section = shakapacker_config_section(config, section_name)
+      value = shakapacker_config_value(section, config_key)
+      return value unless value.to_s.strip.empty?
+    end
+
+    nil
+  end
+
+  def safe_generator_destination_path(path, default:)
+    candidate = path.to_s.strip
+    return default if candidate.empty?
+
+    pathname = Pathname.new(candidate).cleanpath
+    relative_path = if pathname.absolute?
+                      absolute_path_relative_to_destination(pathname)
+                    else
+                      pathname.to_s
+                    end
+
+    return default if unsafe_generator_destination_path?(relative_path)
+
+    relative_path
+  rescue ArgumentError
+    default
+  end
+
+  def absolute_path_relative_to_destination(pathname)
+    destination = Pathname.new(destination_root).cleanpath
+    relative_path = pathname.relative_path_from(destination).to_s
+
+    return nil if unsafe_generator_destination_path?(relative_path)
+
+    relative_path
+  rescue ArgumentError
+    nil
+  end
+
+  def unsafe_generator_destination_path?(path)
+    path.nil? || path == "." || path == ".." || path.start_with?("../")
+  end
+
   # Check if a gem is present in Gemfile.lock
   # Always checks the target app's Gemfile.lock, not inherited BUNDLE_GEMFILE
   # See: https://github.com/shakacode/react_on_rails/issues/2287
diff --git a/react_on_rails/lib/generators/react_on_rails/react_no_redux_generator.rb b/react_on_rails/lib/generators/react_on_rails/react_no_redux_generator.rb
index e0d05a0c66..477fb86a66 100644
--- a/react_on_rails/lib/generators/react_on_rails/react_no_redux_generator.rb
+++ b/react_on_rails/lib/generators/react_on_rails/react_no_redux_generator.rb
@@ -32,22 +32,26 @@ def copy_base_files
         base_js_path = "base/base"
         tailwind_js_path = "base/tailwind"
         ext = component_extension(options)
+        component_dir = example_component_source_directory("HelloWorld")
 
         # Determine which component files to copy based on TypeScript option
         client_component =
-          "app/javascript/src/HelloWorld/ror_components/HelloWorld.client.#{ext}"
+          "#{component_dir}/ror_components/HelloWorld.client.#{ext}"
         server_component =
-          "app/javascript/src/HelloWorld/ror_components/HelloWorld.server.#{ext}"
+          "#{component_dir}/ror_components/HelloWorld.server.#{ext}"
 
         if use_tailwind?
-          copy_file("#{tailwind_js_path}/#{client_component}", client_component)
+          copy_file("#{tailwind_js_path}/app/javascript/src/HelloWorld/ror_components/HelloWorld.client.#{ext}",
+                    client_component)
         else
-          copy_file("#{base_js_path}/#{client_component}", client_component)
+          copy_file("#{base_js_path}/app/javascript/src/HelloWorld/ror_components/HelloWorld.client.#{ext}",
+                    client_component)
           copy_file("#{base_js_path}/app/javascript/src/HelloWorld/ror_components/HelloWorld.module.css",
-                    "app/javascript/src/HelloWorld/ror_components/HelloWorld.module.css")
+                    "#{component_dir}/ror_components/HelloWorld.module.css")
         end
 
-        copy_file("#{base_js_path}/#{server_component}", server_component)
+        copy_file("#{base_js_path}/app/javascript/src/HelloWorld/ror_components/HelloWorld.server.#{ext}",
+                  server_component)
       end
 
       def create_appropriate_templates
@@ -58,7 +62,7 @@ def create_appropriate_templates
                  "app/views/hello_world/index.html.erb",
                  build_hello_world_view_config(
                    component_name: "HelloWorld",
-                   source_path: "app/javascript/src/HelloWorld/",
+                   source_path: example_component_source_path("HelloWorld"),
                    landing_page: new_app_landing_page_available?,
                    redux: false,
                    rsc_demo: false
diff --git a/react_on_rails/lib/generators/react_on_rails/react_with_redux_generator.rb b/react_on_rails/lib/generators/react_on_rails/react_with_redux_generator.rb
index ad9e9fec47..e2a7f40c02 100644
--- a/react_on_rails/lib/generators/react_on_rails/react_with_redux_generator.rb
+++ b/react_on_rails/lib/generators/react_on_rails/react_with_redux_generator.rb
@@ -41,31 +41,34 @@ class ReactWithReduxGenerator < Rails::Generators::Base
                    hide: true
 
       def create_redux_directories
+        component_dir = example_component_source_directory("HelloWorldApp")
+
         # Create auto-bundling directory structure for Redux
-        empty_directory("app/javascript/src/HelloWorldApp/ror_components")
+        empty_directory("#{component_dir}/ror_components")
 
         # Create Redux support directories within the component directory
         dirs = %w[actions constants containers reducers store components]
-        dirs.each { |name| empty_directory("app/javascript/src/HelloWorldApp/#{name}") }
+        dirs.each { |name| empty_directory("#{component_dir}/#{name}") }
       end
 
       def copy_base_files
         base_js_path = "redux/base"
         ext = component_extension(options)
+        component_dir = example_component_source_directory("HelloWorldApp")
 
         # Copy Redux-connected component to auto-bundling structure
         copy_file("#{base_js_path}/app/javascript/bundles/HelloWorld/startup/HelloWorldApp.client.#{ext}",
-                  "app/javascript/src/HelloWorldApp/ror_components/HelloWorldApp.client.#{ext}")
+                  "#{component_dir}/ror_components/HelloWorldApp.client.#{ext}")
         copy_file("#{base_js_path}/app/javascript/bundles/HelloWorld/startup/HelloWorldApp.server.#{ext}",
-                  "app/javascript/src/HelloWorldApp/ror_components/HelloWorldApp.server.#{ext}")
+                  "#{component_dir}/ror_components/HelloWorldApp.server.#{ext}")
 
         unless use_tailwind?
           copy_file("#{base_js_path}/app/javascript/bundles/HelloWorld/components/HelloWorld.module.css",
-                    "app/javascript/src/HelloWorldApp/components/HelloWorld.module.css")
+                    "#{component_dir}/components/HelloWorld.module.css")
         end
 
         # Update import paths in client component
-        ror_client_file = "app/javascript/src/HelloWorldApp/ror_components/HelloWorldApp.client.#{ext}"
+        ror_client_file = "#{component_dir}/ror_components/HelloWorldApp.client.#{ext}"
         gsub_file(ror_client_file, "../store/helloWorldStore", "../store/helloWorldStore")
         gsub_file(ror_client_file, "../containers/HelloWorldContainer",
                   "../containers/HelloWorldContainer")
@@ -86,6 +89,7 @@ def copy_base_redux_files
         base_hello_world_path = "redux/base/app/javascript/bundles/HelloWorld"
         tailwind_hello_world_path = "redux/tailwind/app/javascript/bundles/HelloWorld"
         redux_extension = options.typescript? ? "ts" : "js"
+        component_dir = example_component_source_directory("HelloWorldApp")
 
         # Copy Redux infrastructure files with appropriate extension
         %W[actions/helloWorldActionCreators.#{redux_extension}
@@ -94,13 +98,13 @@ def copy_base_redux_files
            reducers/helloWorldReducer.#{redux_extension}
            store/helloWorldStore.#{redux_extension}].each do |file|
              copy_file("#{base_hello_world_path}/#{file}",
-                       "app/javascript/src/HelloWorldApp/#{file}")
+                       "#{component_dir}/#{file}")
            end
 
         component_file = "components/HelloWorld.#{component_extension(options)}"
         component_source_path = use_tailwind? ? tailwind_hello_world_path : base_hello_world_path
         copy_file("#{component_source_path}/#{component_file}",
-                  "app/javascript/src/HelloWorldApp/#{component_file}")
+                  "#{component_dir}/#{component_file}")
       end
 
       def create_appropriate_templates
@@ -111,7 +115,7 @@ def create_appropriate_templates
                  "app/views/hello_world/index.html.erb",
                  build_hello_world_view_config(
                    component_name: "HelloWorldApp",
-                   source_path: "app/javascript/src/HelloWorldApp/",
+                   source_path: example_component_source_path("HelloWorldApp"),
                    landing_page: new_app_landing_page_available?,
                    redux: true,
                    rsc_demo: options[:rsc]
diff --git a/react_on_rails/lib/generators/react_on_rails/rsc_setup.rb b/react_on_rails/lib/generators/react_on_rails/rsc_setup.rb
index d8d8825e53..72efcf81bb 100644
--- a/react_on_rails/lib/generators/react_on_rails/rsc_setup.rb
+++ b/react_on_rails/lib/generators/react_on_rails/rsc_setup.rb
@@ -198,7 +198,7 @@ def add_rsc_to_procfile
       end
 
       def create_hello_server_component
-        hello_server_dir = "app/javascript/src/HelloServer"
+        hello_server_dir = example_component_source_directory("HelloServer")
         ror_components_dir = "#{hello_server_dir}/ror_components"
         components_dir = "#{hello_server_dir}/components"
         ext = component_extension(options)
@@ -246,7 +246,7 @@ def add_tailwind_import_to_rsc_client_component(components_dir)
         end
         return false unless relative_entry_path
 
-        # Path is relative to app/javascript/src/HelloServer/components/.
+        # Path is relative to the generated HelloServer components directory.
         stylesheet_import = "import '../../../stylesheets/application.css';"
         entry_path = File.join(destination_root, relative_entry_path)
         entry_content = File.read(entry_path)
@@ -296,7 +296,8 @@ def create_hello_server_view
                  view_path,
                  build_hello_server_view_config(
                    landing_page: new_app_landing_page_available?,
-                   redux_demo: options[:redux]
+                   redux_demo: options[:redux],
+                   source_path: example_component_source_path("HelloServer")
                  ))
 
         say "✅ Created #{view_path}", :green
diff --git a/react_on_rails/lib/generators/react_on_rails/templates/base/base/app/views/hello_world/index.html.erb.tt b/react_on_rails/lib/generators/react_on_rails/templates/base/base/app/views/hello_world/index.html.erb.tt
index 40542a99db..ea093b357b 100644
--- a/react_on_rails/lib/generators/react_on_rails/templates/base/base/app/views/hello_world/index.html.erb.tt
+++ b/react_on_rails/lib/generators/react_on_rails/templates/base/base/app/views/hello_world/index.html.erb.tt
@@ -129,6 +129,11 @@
     background: rgba(17, 32, 49, 0.06);
     color: var(--ink);
     font-size: 0.95em;
+  }
+
+  .path-hint {
+    display: inline-block;
+    max-width: 100%;
     overflow-wrap: anywhere;
     word-break: break-word;
   }
@@ -181,7 +186,7 @@
       <ul>
         <% config[:file_hints].each do |hint| %>
           <li>
-            <code><%= hint[:path] %></code><br>
+            <code class="path-hint"><%= hint[:path] %></code><br>
             <%= hint[:description] %>
           </li>
         <% end %>
diff --git a/react_on_rails/lib/generators/react_on_rails/templates/base/base/app/views/home/index.html.erb.tt b/react_on_rails/lib/generators/react_on_rails/templates/base/base/app/views/home/index.html.erb.tt
index 576f304320..cd41be5b77 100644
--- a/react_on_rails/lib/generators/react_on_rails/templates/base/base/app/views/home/index.html.erb.tt
+++ b/react_on_rails/lib/generators/react_on_rails/templates/base/base/app/views/home/index.html.erb.tt
@@ -261,11 +261,15 @@
 
   .command-list code,
   .hint-list code {
+    display: inline-block;
+    max-width: 100%;
     padding: 2px 6px;
     border-radius: 8px;
     background: rgba(17, 32, 49, 0.06);
     color: var(--ink);
     font-size: 0.95em;
+    overflow-wrap: anywhere;
+    word-break: break-word;
   }
 
   .footer-note {
diff --git a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
index c074bda8f3..a9ac642168 100644
--- a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
@@ -166,6 +166,39 @@ def simulate_managed_stock_webpack_files(options = {})
     end
   end
 
+  def simulate_preinstalled_shakapacker(source_path:, source_entry_path:)
+    simulate_existing_file("config/shakapacker.yml", <<~YAML)
+      default: &default
+        source_path: #{source_path}
+        source_entry_path: #{source_entry_path}
+        public_root_path: public
+        public_output_path: packs
+        cache_path: tmp/shakapacker
+        webpack_compile_output: true
+        shakapacker_precompile: true
+        additional_paths: []
+        cache_manifest: false
+        assets_bundler: "webpack"
+
+      development:
+        <<: *default
+
+      test:
+        <<: *default
+        compile: true
+
+      production:
+        <<: *default
+    YAML
+    simulate_existing_file("bin/shakapacker", "")
+    simulate_existing_file("bin/shakapacker-dev-server", "")
+    simulate_existing_file("config/webpack/webpack.config.js", <<~JS)
+      const { generateWebpackConfig } = require('shakapacker')
+      const webpackConfig = generateWebpackConfig()
+      module.exports = webpackConfig
+    JS
+  end
+
   # Reads the repo's own package.json packageManager pin and returns the version.
   # Anchoring on package.json (the user-visible source of truth) instead of
   # `const_get(:CI_PNPM_FALLBACK_VERSION)` keeps the assertion on observable surface
@@ -377,6 +410,31 @@ def run_add_agent_files(options = {})
     end
   end
 
+  context "with a pre-installed custom Shakapacker source root" do
+    before(:all) do
+      run_generator_test_with_args(%w[], package_json: true, force: false) do
+        simulate_preinstalled_shakapacker(source_path: "client/app", source_entry_path: "entrypoints")
+      end
+    end
+
+    it "generates the demo source and entrypoint under the configured Shakapacker paths" do
+      assert_file "client/app/src/HelloWorld/ror_components/HelloWorld.client.jsx"
+      assert_file "client/app/src/HelloWorld/ror_components/HelloWorld.server.jsx"
+      assert_file "client/app/src/HelloWorld/ror_components/HelloWorld.module.css"
+      assert_file "client/app/entrypoints/server-bundle.js"
+
+      assert_no_file "app/javascript/src/HelloWorld/ror_components/HelloWorld.client.jsx"
+      assert_no_file "app/javascript/packs/server-bundle.js"
+    end
+
+    it "uses the configured source path in generated demo hints" do
+      assert_file "app/views/hello_world/index.html.erb" do |content|
+        expect(content).to include('<code class="path-hint">client/app/src/HelloWorld/</code>')
+        expect(content).not_to include("app/javascript/src/HelloWorld/")
+      end
+    end
+  end
+
   context "with --new-app" do
     before(:all) { run_generator_test_with_args(%w[--new-app], package_json: true) }
 
diff --git a/react_on_rails/spec/react_on_rails/support/shared_examples/react_no_redux_generator_examples.rb b/react_on_rails/spec/react_on_rails/support/shared_examples/react_no_redux_generator_examples.rb
index 4eb7982489..afe54ca035 100644
--- a/react_on_rails/spec/react_on_rails/support/shared_examples/react_no_redux_generator_examples.rb
+++ b/react_on_rails/spec/react_on_rails/support/shared_examples/react_no_redux_generator_examples.rb
@@ -10,6 +10,8 @@
       expect(contents).to include("React SSR Demo")
       expect(contents).to include("What this page shows")
       expect(contents).to include("Inspect these files next")
+      expect(contents).to include('<code class="path-hint">app/javascript/src/HelloWorld/</code>')
+      expect(contents).to include("overflow-wrap: anywhere")
       expect(contents).to include("Compare OSS and Pro")
     end
   end
diff --git a/react_on_rails/spec/react_on_rails/support/shared_examples/react_with_redux_generator_examples.rb b/react_on_rails/spec/react_on_rails/support/shared_examples/react_with_redux_generator_examples.rb
index 75de6028bb..b1734dbb41 100644
--- a/react_on_rails/spec/react_on_rails/support/shared_examples/react_with_redux_generator_examples.rb
+++ b/react_on_rails/spec/react_on_rails/support/shared_examples/react_with_redux_generator_examples.rb
@@ -14,6 +14,8 @@
       expect(contents).to include("Redux SSR Demo")
       expect(contents).to include("Redux store bootstrapping")
       expect(contents).to include("Inspect these files next")
+      expect(contents).to include('<code class="path-hint">app/javascript/src/HelloWorldApp/</code>')
+      expect(contents).to include("overflow-wrap: anywhere")
       expect(contents).to include("Compare OSS and Pro")
     end
   end

From c825e0f14ec737792f09b2d6c2c3e9fa8bd0c861 Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 10:23:32 -1000
Subject: [PATCH 02/24] Address generator path hint review

---
 .../react_on_rails/generator_helper.rb        |  9 +++-
 .../generators/react_on_rails/rsc_setup.rb    |  2 +-
 .../app/views/hello_server/index.html.erb.tt  |  7 ++-
 .../generators/install_generator_spec.rb      | 53 +++++++++++++++++++
 4 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/react_on_rails/lib/generators/react_on_rails/generator_helper.rb b/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
index ea06694f5c..264969b496 100644
--- a/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
+++ b/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
@@ -10,6 +10,7 @@ module GeneratorHelper
 
   DEFAULT_SHAKAPACKER_SOURCE_PATH = "app/javascript"
   DEFAULT_SHAKAPACKER_SOURCE_ENTRY_PATH = "packs"
+  private_constant :DEFAULT_SHAKAPACKER_SOURCE_PATH, :DEFAULT_SHAKAPACKER_SOURCE_ENTRY_PATH
 
   def package_json
     # Lazy load package_json gem only when actually needed for dependency management
@@ -80,11 +81,14 @@ def component_extension(options)
   end
 
   def shakapacker_source_path
-    configured_shakapacker_relative_path("source_path", DEFAULT_SHAKAPACKER_SOURCE_PATH)
+    @shakapacker_source_path ||= configured_shakapacker_relative_path("source_path", DEFAULT_SHAKAPACKER_SOURCE_PATH)
   end
 
   def shakapacker_source_entry_path
-    configured_shakapacker_relative_path("source_entry_path", DEFAULT_SHAKAPACKER_SOURCE_ENTRY_PATH)
+    @shakapacker_source_entry_path ||= configured_shakapacker_relative_path(
+      "source_entry_path",
+      DEFAULT_SHAKAPACKER_SOURCE_ENTRY_PATH
+    )
   end
 
   def shakapacker_entrypoint_path(filename)
@@ -114,6 +118,7 @@ def configured_shakapacker_relative_path(config_key, default)
   end
 
   def shakapacker_path_config_value(config, config_key)
+    # Generators run in the development context, so prefer that section before falling back to shared defaults.
     %w[development default].each do |section_name|
       section = shakapacker_config_section(config, section_name)
       value = shakapacker_config_value(section, config_key)
diff --git a/react_on_rails/lib/generators/react_on_rails/rsc_setup.rb b/react_on_rails/lib/generators/react_on_rails/rsc_setup.rb
index 72efcf81bb..e7cc09b10d 100644
--- a/react_on_rails/lib/generators/react_on_rails/rsc_setup.rb
+++ b/react_on_rails/lib/generators/react_on_rails/rsc_setup.rb
@@ -246,7 +246,7 @@ def add_tailwind_import_to_rsc_client_component(components_dir)
         end
         return false unless relative_entry_path
 
-        # Path is relative to the generated HelloServer components directory.
+        # Always 3 levels deep: src/HelloServer/components/ -> ../../.. -> source_path/.
         stylesheet_import = "import '../../../stylesheets/application.css';"
         entry_path = File.join(destination_root, relative_entry_path)
         entry_content = File.read(entry_path)
diff --git a/react_on_rails/lib/generators/react_on_rails/templates/rsc/base/app/views/hello_server/index.html.erb.tt b/react_on_rails/lib/generators/react_on_rails/templates/rsc/base/app/views/hello_server/index.html.erb.tt
index 36b63a2be8..281085abf6 100644
--- a/react_on_rails/lib/generators/react_on_rails/templates/rsc/base/app/views/hello_server/index.html.erb.tt
+++ b/react_on_rails/lib/generators/react_on_rails/templates/rsc/base/app/views/hello_server/index.html.erb.tt
@@ -131,6 +131,11 @@
     font-size: 0.95em;
   }
 
+  .path-hint {
+    overflow-wrap: anywhere;
+    word-break: break-word;
+  }
+
   @media (max-width: 900px) {
     .hero,
     .card,
@@ -179,7 +184,7 @@
       <ul>
         <% config[:file_hints].each do |hint| %>
           <li>
-            <code><%= hint[:path] %></code><br>
+            <code class="path-hint"><%= hint[:path] %></code><br>
             <%= hint[:description] %>
           </li>
         <% end %>
diff --git a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
index a9ac642168..9a21387895 100644
--- a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
@@ -190,6 +190,8 @@ def simulate_preinstalled_shakapacker(source_path:, source_entry_path:)
       production:
         <<: *default
     YAML
+    # These files satisfy the generator's existing Shakapacker-install detection;
+    # the custom path assertions below exercise config/shakapacker.yml.
     simulate_existing_file("bin/shakapacker", "")
     simulate_existing_file("bin/shakapacker-dev-server", "")
     simulate_existing_file("config/webpack/webpack.config.js", <<~JS)
@@ -435,6 +437,57 @@ def run_add_agent_files(options = {})
     end
   end
 
+  context "with --redux and a pre-installed custom Shakapacker source root" do
+    before(:all) do
+      run_generator_test_with_args(%w[--redux], package_json: true, force: false) do
+        simulate_preinstalled_shakapacker(source_path: "client/app", source_entry_path: "entrypoints")
+      end
+    end
+
+    it "generates Redux demo files under the configured Shakapacker source path" do
+      assert_file "client/app/src/HelloWorldApp/ror_components/HelloWorldApp.client.jsx"
+      assert_file "client/app/src/HelloWorldApp/ror_components/HelloWorldApp.server.jsx"
+      assert_file "client/app/src/HelloWorldApp/components/HelloWorld.jsx"
+      assert_file "client/app/entrypoints/server-bundle.js"
+
+      assert_no_file "app/javascript/src/HelloWorldApp/ror_components/HelloWorldApp.client.jsx"
+      assert_no_file "app/javascript/packs/server-bundle.js"
+    end
+
+    it "uses the configured source path in generated Redux demo hints" do
+      assert_file "app/views/hello_world/index.html.erb" do |content|
+        expect(content).to include('<code class="path-hint">client/app/src/HelloWorldApp/</code>')
+        expect(content).not_to include("app/javascript/src/HelloWorldApp/")
+      end
+    end
+  end
+
+  context "with --rsc and a pre-installed custom Shakapacker source root" do
+    before(:all) do
+      run_generator_test_with_args(%w[--rsc --no-rspack], package_json: true, force: false) do
+        simulate_preinstalled_shakapacker(source_path: "client/app", source_entry_path: "entrypoints")
+      end
+    end
+
+    it "generates RSC demo files under the configured Shakapacker source path" do
+      assert_file "client/app/src/HelloServer/ror_components/HelloServer.jsx"
+      assert_file "client/app/src/HelloServer/components/HelloServer.jsx"
+      assert_file "client/app/src/HelloServer/components/LikeButton.jsx"
+      assert_file "client/app/entrypoints/server-bundle.js"
+      assert_file "config/webpack/rscWebpackConfig.js"
+
+      assert_no_file "app/javascript/src/HelloServer/ror_components/HelloServer.jsx"
+      assert_no_file "app/javascript/packs/server-bundle.js"
+    end
+
+    it "uses the configured source path in generated RSC demo hints" do
+      assert_file "app/views/hello_server/index.html.erb" do |content|
+        expect(content).to include('<code class="path-hint">client/app/src/HelloServer/</code>')
+        expect(content).not_to include("app/javascript/src/HelloServer/")
+      end
+    end
+  end
+
   context "with --new-app" do
     before(:all) { run_generator_test_with_args(%w[--new-app], package_json: true) }
 

From 782a0309f6d7babc799b3b24c16ddd80428a30c1 Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 10:37:06 -1000
Subject: [PATCH 03/24] Handle root Shakapacker entry paths

---
 .../generators/react_on_rails/generator_helper.rb   | 11 +++++++----
 .../react_on_rails/react_with_redux_generator.rb    |  1 -
 .../base/app/views/hello_server/index.html.erb.tt   |  2 ++
 .../generators/install_generator_spec.rb            | 13 +++++++++++++
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/react_on_rails/lib/generators/react_on_rails/generator_helper.rb b/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
index 264969b496..4c01634edf 100644
--- a/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
+++ b/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
@@ -87,7 +87,8 @@ def shakapacker_source_path
   def shakapacker_source_entry_path
     @shakapacker_source_entry_path ||= configured_shakapacker_relative_path(
       "source_entry_path",
-      DEFAULT_SHAKAPACKER_SOURCE_ENTRY_PATH
+      DEFAULT_SHAKAPACKER_SOURCE_ENTRY_PATH,
+      allow_root: true
     )
   end
 
@@ -107,14 +108,14 @@ def example_component_source_path(component_name)
     "#{example_component_source_directory(component_name)}/"
   end
 
-  def configured_shakapacker_relative_path(config_key, default)
+  def configured_shakapacker_relative_path(config_key, default, allow_root: false)
     config_path = File.join(destination_root, "config/shakapacker.yml")
     return default unless File.exist?(config_path)
 
     config = parse_shakapacker_yml(config_path)
     configured_path = shakapacker_path_config_value(config, config_key)
 
-    safe_generator_destination_path(configured_path, default:)
+    safe_generator_destination_path(configured_path, default:, allow_root:)
   end
 
   def shakapacker_path_config_value(config, config_key)
@@ -128,11 +129,13 @@ def shakapacker_path_config_value(config, config_key)
     nil
   end
 
-  def safe_generator_destination_path(path, default:)
+  def safe_generator_destination_path(path, default:, allow_root: false)
     candidate = path.to_s.strip
     return default if candidate.empty?
 
     pathname = Pathname.new(candidate).cleanpath
+    return "" if allow_root && pathname.to_s == "/"
+
     relative_path = if pathname.absolute?
                       absolute_path_relative_to_destination(pathname)
                     else
diff --git a/react_on_rails/lib/generators/react_on_rails/react_with_redux_generator.rb b/react_on_rails/lib/generators/react_on_rails/react_with_redux_generator.rb
index e2a7f40c02..79295df0e8 100644
--- a/react_on_rails/lib/generators/react_on_rails/react_with_redux_generator.rb
+++ b/react_on_rails/lib/generators/react_on_rails/react_with_redux_generator.rb
@@ -69,7 +69,6 @@ def copy_base_files
 
         # Update import paths in client component
         ror_client_file = "#{component_dir}/ror_components/HelloWorldApp.client.#{ext}"
-        gsub_file(ror_client_file, "../store/helloWorldStore", "../store/helloWorldStore")
         gsub_file(ror_client_file, "../containers/HelloWorldContainer",
                   "../containers/HelloWorldContainer")
         return unless use_tailwind?
diff --git a/react_on_rails/lib/generators/react_on_rails/templates/rsc/base/app/views/hello_server/index.html.erb.tt b/react_on_rails/lib/generators/react_on_rails/templates/rsc/base/app/views/hello_server/index.html.erb.tt
index 281085abf6..fb8c4bdcd6 100644
--- a/react_on_rails/lib/generators/react_on_rails/templates/rsc/base/app/views/hello_server/index.html.erb.tt
+++ b/react_on_rails/lib/generators/react_on_rails/templates/rsc/base/app/views/hello_server/index.html.erb.tt
@@ -132,6 +132,8 @@
   }
 
   .path-hint {
+    display: inline-block;
+    max-width: 100%;
     overflow-wrap: anywhere;
     word-break: break-word;
   }
diff --git a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
index 9a21387895..9b175c116a 100644
--- a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
@@ -437,6 +437,19 @@ def run_add_agent_files(options = {})
     end
   end
 
+  context "with a slash Shakapacker source entry path" do
+    before(:all) do
+      run_generator_test_with_args(%w[], package_json: true, force: false) do
+        simulate_preinstalled_shakapacker(source_path: "client/app", source_entry_path: "/")
+      end
+    end
+
+    it "generates entrypoints directly under the configured Shakapacker source path" do
+      assert_file "client/app/server-bundle.js"
+      assert_no_file "client/app/packs/server-bundle.js"
+    end
+  end
+
   context "with --redux and a pre-installed custom Shakapacker source root" do
     before(:all) do
       run_generator_test_with_args(%w[--redux], package_json: true, force: false) do

From 8d1fdd7697eff056e3be7f4290e2a1feef853db4 Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 10:45:16 -1000
Subject: [PATCH 04/24] Finalize Shakapacker config before path copies

---
 .../react_on_rails/base_generator.rb          | 52 +++++++++----------
 .../generators/install_generator_spec.rb      | 22 ++++++++
 2 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/react_on_rails/lib/generators/react_on_rails/base_generator.rb b/react_on_rails/lib/generators/react_on_rails/base_generator.rb
index 11dc13dac7..a67642fffd 100644
--- a/react_on_rails/lib/generators/react_on_rails/base_generator.rb
+++ b/react_on_rails/lib/generators/react_on_rails/base_generator.rb
@@ -188,6 +188,32 @@ def add_hello_world_route
         route "get 'hello_world', to: 'hello_world#index'"
       end
 
+      def copy_packer_config
+        base_path = "base/base/"
+        config = "config/shakapacker.yml"
+
+        if options.shakapacker_just_installed?
+          say "Replacing Shakapacker default config with React on Rails version"
+          # Shakapacker's installer just created this file from scratch (no pre-existing config).
+          # Safe to overwrite silently with RoR's version-aware template (e.g., private_output_path).
+          template("#{base_path}#{config}.tt", config, force: true)
+        else
+          say "Adding Shakapacker #{ReactOnRails::PackerUtils.shakapacker_version} config"
+          # Thor handles the conflict: prompts user interactively, or respects --force/--skip flags.
+          template("#{base_path}#{config}.tt", config)
+        end
+
+        # Configure bundler-specific settings
+        configure_rspack_in_shakapacker if using_rspack?
+
+        # Always ensure precompile_hook is configured (Shakapacker 9.0+ only)
+        configure_precompile_hook_in_shakapacker
+
+        # For SSR bundles, configure Shakapacker private_output_path (9.0+ only)
+        # This keeps Shakapacker and React on Rails server bundle paths in sync.
+        configure_private_output_path_in_shakapacker
+      end
+
       def create_react_directories
         # Skip HelloWorld directory for Redux (uses HelloWorldApp) or RSC (uses HelloServer)
         return if options.redux? || use_rsc?
@@ -278,32 +304,6 @@ def copy_tailwind_files
                   shakapacker_stylesheet_path("application.css"))
       end
 
-      def copy_packer_config
-        base_path = "base/base/"
-        config = "config/shakapacker.yml"
-
-        if options.shakapacker_just_installed?
-          say "Replacing Shakapacker default config with React on Rails version"
-          # Shakapacker's installer just created this file from scratch (no pre-existing config).
-          # Safe to overwrite silently with RoR's version-aware template (e.g., private_output_path).
-          template("#{base_path}#{config}.tt", config, force: true)
-        else
-          say "Adding Shakapacker #{ReactOnRails::PackerUtils.shakapacker_version} config"
-          # Thor handles the conflict: prompts user interactively, or respects --force/--skip flags.
-          template("#{base_path}#{config}.tt", config)
-        end
-
-        # Configure bundler-specific settings
-        configure_rspack_in_shakapacker if using_rspack?
-
-        # Always ensure precompile_hook is configured (Shakapacker 9.0+ only)
-        configure_precompile_hook_in_shakapacker
-
-        # For SSR bundles, configure Shakapacker private_output_path (9.0+ only)
-        # This keeps Shakapacker and React on Rails server bundle paths in sync.
-        configure_private_output_path_in_shakapacker
-      end
-
       def add_base_gems_to_gemfile
         run "bundle"
       end
diff --git a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
index 9b175c116a..b44c69fdc4 100644
--- a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
@@ -450,6 +450,28 @@ def run_add_agent_files(options = {})
     end
   end
 
+  context "with --force and a pre-installed custom Shakapacker source root" do
+    before(:all) do
+      run_generator_test_with_args(%w[], package_json: true, force: true) do
+        simulate_preinstalled_shakapacker(source_path: "client/app", source_entry_path: "entrypoints")
+      end
+    end
+
+    it "generates base demo files from the final Shakapacker config" do
+      assert_file "app/javascript/packs/server-bundle.js"
+      assert_file "app/javascript/src/HelloWorld/ror_components/HelloWorld.client.jsx"
+      assert_no_file "client/app/entrypoints/server-bundle.js"
+      assert_no_file "client/app/src/HelloWorld/ror_components/HelloWorld.client.jsx"
+    end
+
+    it "uses the final Shakapacker source path in generated demo hints" do
+      assert_file "app/views/hello_world/index.html.erb" do |content|
+        expect(content).to include('<code class="path-hint">app/javascript/src/HelloWorld/</code>')
+        expect(content).not_to include("client/app/src/HelloWorld/")
+      end
+    end
+  end
+
   context "with --redux and a pre-installed custom Shakapacker source root" do
     before(:all) do
       run_generator_test_with_args(%w[--redux], package_json: true, force: false) do

From f8d7f036a033538165edc4b3ec93af69a1a33d50 Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 10:50:31 -1000
Subject: [PATCH 05/24] Address generator review cleanups

---
 .../lib/generators/react_on_rails/generator_helper.rb      | 7 ++-----
 .../react_on_rails/react_with_redux_generator.rb           | 5 +----
 react_on_rails/lib/generators/react_on_rails/rsc_setup.rb  | 3 ++-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/react_on_rails/lib/generators/react_on_rails/generator_helper.rb b/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
index 4c01634edf..b76b9e0e5c 100644
--- a/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
+++ b/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
@@ -134,6 +134,7 @@ def safe_generator_destination_path(path, default:, allow_root: false)
     return default if candidate.empty?
 
     pathname = Pathname.new(candidate).cleanpath
+    # Shakapacker uses "/" to mean entrypoints live directly under source_path.
     return "" if allow_root && pathname.to_s == "/"
 
     relative_path = if pathname.absolute?
@@ -151,11 +152,7 @@ def safe_generator_destination_path(path, default:, allow_root: false)
 
   def absolute_path_relative_to_destination(pathname)
     destination = Pathname.new(destination_root).cleanpath
-    relative_path = pathname.relative_path_from(destination).to_s
-
-    return nil if unsafe_generator_destination_path?(relative_path)
-
-    relative_path
+    pathname.relative_path_from(destination).to_s
   rescue ArgumentError
     nil
   end
diff --git a/react_on_rails/lib/generators/react_on_rails/react_with_redux_generator.rb b/react_on_rails/lib/generators/react_on_rails/react_with_redux_generator.rb
index 79295df0e8..5a4f17d0e9 100644
--- a/react_on_rails/lib/generators/react_on_rails/react_with_redux_generator.rb
+++ b/react_on_rails/lib/generators/react_on_rails/react_with_redux_generator.rb
@@ -67,13 +67,10 @@ def copy_base_files
                     "#{component_dir}/components/HelloWorld.module.css")
         end
 
-        # Update import paths in client component
-        ror_client_file = "#{component_dir}/ror_components/HelloWorldApp.client.#{ext}"
-        gsub_file(ror_client_file, "../containers/HelloWorldContainer",
-                  "../containers/HelloWorldContainer")
         return unless use_tailwind?
 
         stylesheet_import = "import '../../../stylesheets/application.css';\n"
+        ror_client_file = "#{component_dir}/ror_components/HelloWorldApp.client.#{ext}"
         ror_client_file_path = File.join(destination_root, ror_client_file)
         if options[:pretend]
           say_status :pretend, "Would add Tailwind stylesheet import to #{ror_client_file}", :yellow
diff --git a/react_on_rails/lib/generators/react_on_rails/rsc_setup.rb b/react_on_rails/lib/generators/react_on_rails/rsc_setup.rb
index e7cc09b10d..2926663775 100644
--- a/react_on_rails/lib/generators/react_on_rails/rsc_setup.rb
+++ b/react_on_rails/lib/generators/react_on_rails/rsc_setup.rb
@@ -246,7 +246,8 @@ def add_tailwind_import_to_rsc_client_component(components_dir)
         end
         return false unless relative_entry_path
 
-        # Always 3 levels deep: src/HelloServer/components/ -> ../../.. -> source_path/.
+        # The component entry is always 3 levels below source_path via example_component_source_directory.
+        # If that structure changes, update this import depth too.
         stylesheet_import = "import '../../../stylesheets/application.css';"
         entry_path = File.join(destination_root, relative_entry_path)
         entry_content = File.read(entry_path)

From 6ccc12abf8cd902e5a36dc5a7aa5fc4cb3d61f7b Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 11:10:19 -1000
Subject: [PATCH 06/24] Document generator path invariants

---
 .../react_on_rails/base_generator.rb          |  2 +
 .../react_on_rails/generator_helper.rb        |  6 ++-
 .../react_no_redux_generator.rb               |  2 +
 .../base/app/views/home/index.html.erb.tt     |  1 +
 .../generators/generator_helper_spec.rb       | 53 +++++++++++++++++++
 5 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/react_on_rails/lib/generators/react_on_rails/base_generator.rb b/react_on_rails/lib/generators/react_on_rails/base_generator.rb
index a67642fffd..4e3247ff19 100644
--- a/react_on_rails/lib/generators/react_on_rails/base_generator.rb
+++ b/react_on_rails/lib/generators/react_on_rails/base_generator.rb
@@ -189,6 +189,8 @@ def add_hello_world_route
       end
 
       def copy_packer_config
+        # Keep this before path-dependent copy actions; GeneratorHelper memoizes
+        # Shakapacker paths on first read, so --force overwrites must happen first.
         base_path = "base/base/"
         config = "config/shakapacker.yml"
 
diff --git a/react_on_rails/lib/generators/react_on_rails/generator_helper.rb b/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
index b76b9e0e5c..523d8faee7 100644
--- a/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
+++ b/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
@@ -81,6 +81,8 @@ def component_extension(options)
   end
 
   def shakapacker_source_path
+    # These helpers memoize config-backed paths. Install generators must copy or
+    # overwrite config/shakapacker.yml before any path-dependent copy action runs.
     @shakapacker_source_path ||= configured_shakapacker_relative_path("source_path", DEFAULT_SHAKAPACKER_SOURCE_PATH)
   end
 
@@ -93,10 +95,12 @@ def shakapacker_source_entry_path
   end
 
   def shakapacker_entrypoint_path(filename)
-    File.join(shakapacker_source_path, shakapacker_source_entry_path, filename)
+    entry_dir = shakapacker_source_entry_path # "" means entrypoints live directly under source_path.
+    File.join(shakapacker_source_path, entry_dir, filename)
   end
 
   def shakapacker_stylesheet_path(filename)
+    # "stylesheets" is a generated demo convention, not a Shakapacker config key.
     File.join(shakapacker_source_path, "stylesheets", filename)
   end
 
diff --git a/react_on_rails/lib/generators/react_on_rails/react_no_redux_generator.rb b/react_on_rails/lib/generators/react_on_rails/react_no_redux_generator.rb
index 477fb86a66..8d172833e3 100644
--- a/react_on_rails/lib/generators/react_on_rails/react_no_redux_generator.rb
+++ b/react_on_rails/lib/generators/react_on_rails/react_no_redux_generator.rb
@@ -40,6 +40,8 @@ def copy_base_files
         server_component =
           "#{component_dir}/ror_components/HelloWorld.server.#{ext}"
 
+        # Source paths are relative to this generator's templates; only
+        # destinations vary with the app's Shakapacker config.
         if use_tailwind?
           copy_file("#{tailwind_js_path}/app/javascript/src/HelloWorld/ror_components/HelloWorld.client.#{ext}",
                     client_component)
diff --git a/react_on_rails/lib/generators/react_on_rails/templates/base/base/app/views/home/index.html.erb.tt b/react_on_rails/lib/generators/react_on_rails/templates/base/base/app/views/home/index.html.erb.tt
index cd41be5b77..fa5cd9257e 100644
--- a/react_on_rails/lib/generators/react_on_rails/templates/base/base/app/views/home/index.html.erb.tt
+++ b/react_on_rails/lib/generators/react_on_rails/templates/base/base/app/views/home/index.html.erb.tt
@@ -259,6 +259,7 @@
     letter-spacing: 0.08em;
   }
 
+  /* Home-page code samples are all compact commands or path hints, so they share wrapping rules. */
   .command-list code,
   .hint-list code {
     display: inline-block;
diff --git a/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb b/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
index b9d4c06660..ba17481b74 100644
--- a/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
@@ -262,6 +262,59 @@ def self.read
     end
   end
 
+  describe "#safe_generator_destination_path" do
+    let(:default_path) { "app/javascript" }
+
+    it "keeps safe relative paths" do
+      expect(safe_generator_destination_path("client/app", default: default_path)).to eq("client/app")
+    end
+
+    it "relativizes absolute paths inside the destination root" do
+      absolute_path = File.join(destination_root, "client/app")
+
+      expect(safe_generator_destination_path(absolute_path, default: default_path)).to eq("client/app")
+    end
+
+    it "falls back for paths outside the destination root" do
+      expect(safe_generator_destination_path("/tmp/client/app", default: default_path)).to eq(default_path)
+    end
+
+    it "falls back for degenerate or traversing paths" do
+      expect(safe_generator_destination_path(".", default: default_path)).to eq(default_path)
+      expect(safe_generator_destination_path("..", default: default_path)).to eq(default_path)
+      expect(safe_generator_destination_path("../client/app", default: default_path)).to eq(default_path)
+    end
+
+    it "uses an empty sentinel for Shakapacker root entry paths" do
+      expect(safe_generator_destination_path("/", default: "packs", allow_root: true)).to eq("")
+    end
+  end
+
+  describe "#shakapacker_stylesheet_path" do
+    let(:shakapacker_yml_path) { File.join(destination_root, "config/shakapacker.yml") }
+
+    before do
+      FileUtils.mkdir_p(File.dirname(shakapacker_yml_path))
+      File.write(shakapacker_yml_path, <<~YAML)
+        default:
+          source_path: app/javascript
+
+        development:
+          source_path: client/app
+      YAML
+      remove_instance_variable(:@shakapacker_source_path) if instance_variable_defined?(:@shakapacker_source_path)
+    end
+
+    after do
+      FileUtils.rm_rf(File.join(destination_root, "config"))
+      remove_instance_variable(:@shakapacker_source_path) if instance_variable_defined?(:@shakapacker_source_path)
+    end
+
+    it "places generated demo stylesheets under the configured Shakapacker source path" do
+      expect(shakapacker_stylesheet_path("application.css")).to eq("client/app/stylesheets/application.css")
+    end
+  end
+
   describe "#active_precompile_hook_configured?" do
     it "treats quoted and unquoted command strings beside a placeholder as active" do
       expect(active_precompile_hook_configured?(<<~YAML)).to be(true)

From f8eb86f97608ddf750856238aac81476b080be30 Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 11:18:40 -1000
Subject: [PATCH 07/24] Compute generated stylesheet imports

---
 .../react_on_rails/generator_helper.rb        |  9 +++++-
 .../react_with_redux_generator.rb             |  2 +-
 .../generators/react_on_rails/rsc_setup.rb    |  4 +--
 .../generators/generator_helper_spec.rb       | 28 +++++++++++++++++++
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/react_on_rails/lib/generators/react_on_rails/generator_helper.rb b/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
index 523d8faee7..6536bc9693 100644
--- a/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
+++ b/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
@@ -96,7 +96,7 @@ def shakapacker_source_entry_path
 
   def shakapacker_entrypoint_path(filename)
     entry_dir = shakapacker_source_entry_path # "" means entrypoints live directly under source_path.
-    File.join(shakapacker_source_path, entry_dir, filename)
+    File.join(*[shakapacker_source_path, entry_dir, filename].reject(&:empty?))
   end
 
   def shakapacker_stylesheet_path(filename)
@@ -104,6 +104,13 @@ def shakapacker_stylesheet_path(filename)
     File.join(shakapacker_source_path, "stylesheets", filename)
   end
 
+  def relative_stylesheet_import_path(entry_path, filename: "application.css")
+    entry_dir = Pathname.new(File.join(destination_root, entry_path)).dirname
+    stylesheet = Pathname.new(File.join(destination_root, shakapacker_stylesheet_path(filename)))
+
+    stylesheet.relative_path_from(entry_dir).to_s
+  end
+
   def example_component_source_directory(component_name)
     File.join(shakapacker_source_path, "src", component_name)
   end
diff --git a/react_on_rails/lib/generators/react_on_rails/react_with_redux_generator.rb b/react_on_rails/lib/generators/react_on_rails/react_with_redux_generator.rb
index 5a4f17d0e9..32208b4fd7 100644
--- a/react_on_rails/lib/generators/react_on_rails/react_with_redux_generator.rb
+++ b/react_on_rails/lib/generators/react_on_rails/react_with_redux_generator.rb
@@ -69,8 +69,8 @@ def copy_base_files
 
         return unless use_tailwind?
 
-        stylesheet_import = "import '../../../stylesheets/application.css';\n"
         ror_client_file = "#{component_dir}/ror_components/HelloWorldApp.client.#{ext}"
+        stylesheet_import = "import '#{relative_stylesheet_import_path(ror_client_file)}';\n"
         ror_client_file_path = File.join(destination_root, ror_client_file)
         if options[:pretend]
           say_status :pretend, "Would add Tailwind stylesheet import to #{ror_client_file}", :yellow
diff --git a/react_on_rails/lib/generators/react_on_rails/rsc_setup.rb b/react_on_rails/lib/generators/react_on_rails/rsc_setup.rb
index 2926663775..0c441cea78 100644
--- a/react_on_rails/lib/generators/react_on_rails/rsc_setup.rb
+++ b/react_on_rails/lib/generators/react_on_rails/rsc_setup.rb
@@ -246,9 +246,7 @@ def add_tailwind_import_to_rsc_client_component(components_dir)
         end
         return false unless relative_entry_path
 
-        # The component entry is always 3 levels below source_path via example_component_source_directory.
-        # If that structure changes, update this import depth too.
-        stylesheet_import = "import '../../../stylesheets/application.css';"
+        stylesheet_import = "import '#{relative_stylesheet_import_path(relative_entry_path)}';"
         entry_path = File.join(destination_root, relative_entry_path)
         entry_content = File.read(entry_path)
         return false if entry_content.include?(stylesheet_import)
diff --git a/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb b/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
index ba17481b74..34b36a7225 100644
--- a/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
@@ -315,6 +315,34 @@ def self.read
     end
   end
 
+  describe "#relative_stylesheet_import_path" do
+    let(:shakapacker_yml_path) { File.join(destination_root, "config/shakapacker.yml") }
+
+    before do
+      FileUtils.mkdir_p(File.dirname(shakapacker_yml_path))
+      File.write(shakapacker_yml_path, <<~YAML)
+        development:
+          source_path: client/app
+      YAML
+      remove_instance_variable(:@shakapacker_source_path) if instance_variable_defined?(:@shakapacker_source_path)
+    end
+
+    after do
+      FileUtils.rm_rf(File.join(destination_root, "config"))
+      remove_instance_variable(:@shakapacker_source_path) if instance_variable_defined?(:@shakapacker_source_path)
+    end
+
+    it "computes the stylesheet import path from the generated entry file" do
+      expect(relative_stylesheet_import_path("client/app/src/HelloServer/components/LikeButton.jsx"))
+        .to eq("../../../stylesheets/application.css")
+    end
+
+    it "adjusts when the generated entry moves deeper under the source path" do
+      expect(relative_stylesheet_import_path("client/app/src/HelloServer/components/nested/LikeButton.jsx"))
+        .to eq("../../../../stylesheets/application.css")
+    end
+  end
+
   describe "#active_precompile_hook_configured?" do
     it "treats quoted and unquoted command strings beside a placeholder as active" do
       expect(active_precompile_hook_configured?(<<~YAML)).to be(true)

From a6c64410a4227f71aa67f499d4cc2fb247b93a90 Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 11:21:52 -1000
Subject: [PATCH 08/24] Cover root entrypoint helper path

---
 .../generators/generator_helper_spec.rb       | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb b/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
index 34b36a7225..906a872cf6 100644
--- a/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
@@ -315,6 +315,35 @@ def self.read
     end
   end
 
+  describe "#shakapacker_entrypoint_path" do
+    let(:shakapacker_yml_path) { File.join(destination_root, "config/shakapacker.yml") }
+
+    before do
+      FileUtils.mkdir_p(File.dirname(shakapacker_yml_path))
+      File.write(shakapacker_yml_path, <<~YAML)
+        development:
+          source_path: client/app
+          source_entry_path: /
+      YAML
+      remove_instance_variable(:@shakapacker_source_path) if instance_variable_defined?(:@shakapacker_source_path)
+      if instance_variable_defined?(:@shakapacker_source_entry_path)
+        remove_instance_variable(:@shakapacker_source_entry_path)
+      end
+    end
+
+    after do
+      FileUtils.rm_rf(File.join(destination_root, "config"))
+      remove_instance_variable(:@shakapacker_source_path) if instance_variable_defined?(:@shakapacker_source_path)
+      if instance_variable_defined?(:@shakapacker_source_entry_path)
+        remove_instance_variable(:@shakapacker_source_entry_path)
+      end
+    end
+
+    it "places root entrypoints directly under source_path without a double slash" do
+      expect(shakapacker_entrypoint_path("server-bundle.js")).to eq("client/app/server-bundle.js")
+    end
+  end
+
   describe "#relative_stylesheet_import_path" do
     let(:shakapacker_yml_path) { File.join(destination_root, "config/shakapacker.yml") }
 

From b9e7d68bd0c348508437dea5d3c7e4f3501df2f4 Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 11:27:10 -1000
Subject: [PATCH 09/24] Keep generator helper test memoization isolated

---
 .../spec/react_on_rails/generators/generator_helper_spec.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb b/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
index 906a872cf6..1ac4395a39 100644
--- a/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
@@ -303,11 +303,17 @@ def self.read
           source_path: client/app
       YAML
       remove_instance_variable(:@shakapacker_source_path) if instance_variable_defined?(:@shakapacker_source_path)
+      if instance_variable_defined?(:@shakapacker_source_entry_path)
+        remove_instance_variable(:@shakapacker_source_entry_path)
+      end
     end
 
     after do
       FileUtils.rm_rf(File.join(destination_root, "config"))
       remove_instance_variable(:@shakapacker_source_path) if instance_variable_defined?(:@shakapacker_source_path)
+      if instance_variable_defined?(:@shakapacker_source_entry_path)
+        remove_instance_variable(:@shakapacker_source_entry_path)
+      end
     end
 
     it "places generated demo stylesheets under the configured Shakapacker source path" do

From 9db0ddd98ecc7c2827e7457688163ea3ed21e7fd Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 11:32:08 -1000
Subject: [PATCH 10/24] Cover Tailwind custom source paths

---
 .../react_on_rails/generator_helper.rb        |  1 +
 .../app/views/hello_world/index.html.erb.tt   |  2 ++
 .../generators/install_generator_spec.rb      | 20 +++++++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/react_on_rails/lib/generators/react_on_rails/generator_helper.rb b/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
index 6536bc9693..01df87d0b3 100644
--- a/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
+++ b/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
@@ -105,6 +105,7 @@ def shakapacker_stylesheet_path(filename)
   end
 
   def relative_stylesheet_import_path(entry_path, filename: "application.css")
+    # InstallGenerator copies the final Shakapacker config before path-dependent demo files are generated.
     entry_dir = Pathname.new(File.join(destination_root, entry_path)).dirname
     stylesheet = Pathname.new(File.join(destination_root, shakapacker_stylesheet_path(filename)))
 
diff --git a/react_on_rails/lib/generators/react_on_rails/templates/base/base/app/views/hello_world/index.html.erb.tt b/react_on_rails/lib/generators/react_on_rails/templates/base/base/app/views/hello_world/index.html.erb.tt
index ea093b357b..54ade4e483 100644
--- a/react_on_rails/lib/generators/react_on_rails/templates/base/base/app/views/hello_world/index.html.erb.tt
+++ b/react_on_rails/lib/generators/react_on_rails/templates/base/base/app/views/hello_world/index.html.erb.tt
@@ -129,6 +129,8 @@
     background: rgba(17, 32, 49, 0.06);
     color: var(--ink);
     font-size: 0.95em;
+    overflow-wrap: anywhere;
+    word-break: break-word;
   }
 
   .path-hint {
diff --git a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
index b44c69fdc4..a43e8e7fbb 100644
--- a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
@@ -458,6 +458,7 @@ def run_add_agent_files(options = {})
     end
 
     it "generates base demo files from the final Shakapacker config" do
+      # Thor's global --force overwrites the pre-installed config before path-dependent files are copied.
       assert_file "app/javascript/packs/server-bundle.js"
       assert_file "app/javascript/src/HelloWorld/ror_components/HelloWorld.client.jsx"
       assert_no_file "client/app/entrypoints/server-bundle.js"
@@ -497,6 +498,25 @@ def run_add_agent_files(options = {})
     end
   end
 
+  context "with --tailwind and a pre-installed custom Shakapacker source root" do
+    before(:all) do
+      run_generator_test_with_args(%w[--tailwind], package_json: true, force: false) do
+        simulate_preinstalled_shakapacker(source_path: "client/app", source_entry_path: "entrypoints")
+      end
+    end
+
+    it "generates Tailwind assets under the configured Shakapacker source path" do
+      assert_file "client/app/stylesheets/application.css", /@import "tailwindcss";/
+      assert_no_file "app/javascript/stylesheets/application.css"
+    end
+
+    it "injects the stylesheet import into the generated client component" do
+      assert_file "client/app/src/HelloWorld/ror_components/HelloWorld.client.jsx" do |content|
+        expect(content).to include("import '../../../stylesheets/application.css';")
+      end
+    end
+  end
+
   context "with --rsc and a pre-installed custom Shakapacker source root" do
     before(:all) do
       run_generator_test_with_args(%w[--rsc --no-rspack], package_json: true, force: false) do

From caa273061a7a93af7c9f7bed0e1975fca9b65bb6 Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 11:41:57 -1000
Subject: [PATCH 11/24] Harden generator path helper tests

---
 .../lib/generators/react_on_rails/base_generator.rb    |  1 +
 .../lib/generators/react_on_rails/generator_helper.rb  |  3 +++
 .../react_on_rails/generators/generator_helper_spec.rb | 10 ++++++++++
 .../generators/install_generator_spec.rb               |  2 +-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/react_on_rails/lib/generators/react_on_rails/base_generator.rb b/react_on_rails/lib/generators/react_on_rails/base_generator.rb
index 4e3247ff19..5584124dc7 100644
--- a/react_on_rails/lib/generators/react_on_rails/base_generator.rb
+++ b/react_on_rails/lib/generators/react_on_rails/base_generator.rb
@@ -189,6 +189,7 @@ def add_hello_world_route
       end
 
       def copy_packer_config
+        # Rails generator actions run in method definition order.
         # Keep this before path-dependent copy actions; GeneratorHelper memoizes
         # Shakapacker paths on first read, so --force overwrites must happen first.
         base_path = "base/base/"
diff --git a/react_on_rails/lib/generators/react_on_rails/generator_helper.rb b/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
index 01df87d0b3..715bc400f2 100644
--- a/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
+++ b/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
@@ -95,6 +95,9 @@ def shakapacker_source_entry_path
   end
 
   def shakapacker_entrypoint_path(filename)
+    filename = filename.to_s
+    raise ArgumentError, "filename must be present" if filename.empty?
+
     entry_dir = shakapacker_source_entry_path # "" means entrypoints live directly under source_path.
     File.join(*[shakapacker_source_path, entry_dir, filename].reject(&:empty?))
   end
diff --git a/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb b/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
index 1ac4395a39..ae231a21c0 100644
--- a/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
@@ -348,6 +348,10 @@ def self.read
     it "places root entrypoints directly under source_path without a double slash" do
       expect(shakapacker_entrypoint_path("server-bundle.js")).to eq("client/app/server-bundle.js")
     end
+
+    it "raises a clear error for blank entrypoint filenames" do
+      expect { shakapacker_entrypoint_path("") }.to raise_error(ArgumentError, "filename must be present")
+    end
   end
 
   describe "#relative_stylesheet_import_path" do
@@ -360,11 +364,17 @@ def self.read
           source_path: client/app
       YAML
       remove_instance_variable(:@shakapacker_source_path) if instance_variable_defined?(:@shakapacker_source_path)
+      if instance_variable_defined?(:@shakapacker_source_entry_path)
+        remove_instance_variable(:@shakapacker_source_entry_path)
+      end
     end
 
     after do
       FileUtils.rm_rf(File.join(destination_root, "config"))
       remove_instance_variable(:@shakapacker_source_path) if instance_variable_defined?(:@shakapacker_source_path)
+      if instance_variable_defined?(:@shakapacker_source_entry_path)
+        remove_instance_variable(:@shakapacker_source_entry_path)
+      end
     end
 
     it "computes the stylesheet import path from the generated entry file" do
diff --git a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
index a43e8e7fbb..bdf955eb68 100644
--- a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
@@ -457,7 +457,7 @@ def run_add_agent_files(options = {})
       end
     end
 
-    it "generates base demo files from the final Shakapacker config" do
+    it "generates base demo files from the config after --force overwrites the custom setup" do
       # Thor's global --force overwrites the pre-installed config before path-dependent files are copied.
       assert_file "app/javascript/packs/server-bundle.js"
       assert_file "app/javascript/src/HelloWorld/ror_components/HelloWorld.client.jsx"

From 86348aacb97426da5cad6bb5e161ba5ec2e51580 Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 11:45:28 -1000
Subject: [PATCH 12/24] Extract generator memoization reset helper

---
 .../react_on_rails/generator_helper.rb        |  2 +-
 .../generators/generator_helper_spec.rb       | 36 +++++++------------
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/react_on_rails/lib/generators/react_on_rails/generator_helper.rb b/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
index 715bc400f2..4e0747d194 100644
--- a/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
+++ b/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
@@ -161,7 +161,7 @@ def safe_generator_destination_path(path, default:, allow_root: false)
     return default if unsafe_generator_destination_path?(relative_path)
 
     relative_path
-  rescue ArgumentError
+  rescue ArgumentError # Pathname.new raises on null bytes in path strings.
     default
   end
 
diff --git a/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb b/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
index ae231a21c0..48c692dbbb 100644
--- a/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
@@ -32,6 +32,12 @@ def options
     @options ||= {}
   end
 
+  def reset_shakapacker_memoization!
+    %i[@shakapacker_source_path @shakapacker_source_entry_path].each do |ivar|
+      remove_instance_variable(ivar) if instance_variable_defined?(ivar)
+    end
+  end
+
   let(:destination_root) { File.expand_path("../dummy-for-generators", __dir__) }
 
   describe "#print_generator_messages" do
@@ -302,18 +308,12 @@ def self.read
         development:
           source_path: client/app
       YAML
-      remove_instance_variable(:@shakapacker_source_path) if instance_variable_defined?(:@shakapacker_source_path)
-      if instance_variable_defined?(:@shakapacker_source_entry_path)
-        remove_instance_variable(:@shakapacker_source_entry_path)
-      end
+      reset_shakapacker_memoization!
     end
 
     after do
       FileUtils.rm_rf(File.join(destination_root, "config"))
-      remove_instance_variable(:@shakapacker_source_path) if instance_variable_defined?(:@shakapacker_source_path)
-      if instance_variable_defined?(:@shakapacker_source_entry_path)
-        remove_instance_variable(:@shakapacker_source_entry_path)
-      end
+      reset_shakapacker_memoization!
     end
 
     it "places generated demo stylesheets under the configured Shakapacker source path" do
@@ -331,18 +331,12 @@ def self.read
           source_path: client/app
           source_entry_path: /
       YAML
-      remove_instance_variable(:@shakapacker_source_path) if instance_variable_defined?(:@shakapacker_source_path)
-      if instance_variable_defined?(:@shakapacker_source_entry_path)
-        remove_instance_variable(:@shakapacker_source_entry_path)
-      end
+      reset_shakapacker_memoization!
     end
 
     after do
       FileUtils.rm_rf(File.join(destination_root, "config"))
-      remove_instance_variable(:@shakapacker_source_path) if instance_variable_defined?(:@shakapacker_source_path)
-      if instance_variable_defined?(:@shakapacker_source_entry_path)
-        remove_instance_variable(:@shakapacker_source_entry_path)
-      end
+      reset_shakapacker_memoization!
     end
 
     it "places root entrypoints directly under source_path without a double slash" do
@@ -363,18 +357,12 @@ def self.read
         development:
           source_path: client/app
       YAML
-      remove_instance_variable(:@shakapacker_source_path) if instance_variable_defined?(:@shakapacker_source_path)
-      if instance_variable_defined?(:@shakapacker_source_entry_path)
-        remove_instance_variable(:@shakapacker_source_entry_path)
-      end
+      reset_shakapacker_memoization!
     end
 
     after do
       FileUtils.rm_rf(File.join(destination_root, "config"))
-      remove_instance_variable(:@shakapacker_source_path) if instance_variable_defined?(:@shakapacker_source_path)
-      if instance_variable_defined?(:@shakapacker_source_entry_path)
-        remove_instance_variable(:@shakapacker_source_entry_path)
-      end
+      reset_shakapacker_memoization!
     end
 
     it "computes the stylesheet import path from the generated entry file" do

From 61f4c268459f72bedfaddf953740c4c62400e42d Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 11:53:46 -1000
Subject: [PATCH 13/24] Guard generator path helper inputs

---
 .../lib/generators/react_on_rails/base_generator.rb      | 9 +++++++--
 .../lib/generators/react_on_rails/generator_helper.rb    | 8 ++++++--
 .../react_on_rails/generators/generator_helper_spec.rb   | 5 +++++
 .../react_on_rails/generators/install_generator_spec.rb  | 4 ++--
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/react_on_rails/lib/generators/react_on_rails/base_generator.rb b/react_on_rails/lib/generators/react_on_rails/base_generator.rb
index 5584124dc7..d27d2555b9 100644
--- a/react_on_rails/lib/generators/react_on_rails/base_generator.rb
+++ b/react_on_rails/lib/generators/react_on_rails/base_generator.rb
@@ -190,8 +190,13 @@ def add_hello_world_route
 
       def copy_packer_config
         # Rails generator actions run in method definition order.
-        # Keep this before path-dependent copy actions; GeneratorHelper memoizes
-        # Shakapacker paths on first read, so --force overwrites must happen first.
+        # Keep this before actions that call shakapacker_source_path or
+        # shakapacker_source_entry_path; those helpers memoize on first read.
+        if instance_variable_defined?(:@shakapacker_source_path) ||
+           instance_variable_defined?(:@shakapacker_source_entry_path)
+          raise "copy_packer_config must run before path-dependent generator actions"
+        end
+
         base_path = "base/base/"
         config = "config/shakapacker.yml"
 
diff --git a/react_on_rails/lib/generators/react_on_rails/generator_helper.rb b/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
index 4e0747d194..808ba72868 100644
--- a/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
+++ b/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
@@ -109,7 +109,10 @@ def shakapacker_stylesheet_path(filename)
 
   def relative_stylesheet_import_path(entry_path, filename: "application.css")
     # InstallGenerator copies the final Shakapacker config before path-dependent demo files are generated.
-    entry_dir = Pathname.new(File.join(destination_root, entry_path)).dirname
+    safe_entry_path = safe_generator_destination_path(entry_path, default: nil)
+    raise ArgumentError, "entry_path must stay inside the generator destination" if safe_entry_path.nil?
+
+    entry_dir = Pathname.new(File.join(destination_root, safe_entry_path)).dirname
     stylesheet = Pathname.new(File.join(destination_root, shakapacker_stylesheet_path(filename)))
 
     stylesheet.relative_path_from(entry_dir).to_s
@@ -120,6 +123,7 @@ def example_component_source_directory(component_name)
   end
 
   def example_component_source_path(component_name)
+    # Trailing slash is intentional: this value is only for generated demo file hints.
     "#{example_component_source_directory(component_name)}/"
   end
 
@@ -169,7 +173,7 @@ def absolute_path_relative_to_destination(pathname)
     destination = Pathname.new(destination_root).cleanpath
     pathname.relative_path_from(destination).to_s
   rescue ArgumentError
-    nil
+    nil # Signals the caller to fall back to the default path.
   end
 
   def unsafe_generator_destination_path?(path)
diff --git a/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb b/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
index 48c692dbbb..429545012f 100644
--- a/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
@@ -374,6 +374,11 @@ def self.read
       expect(relative_stylesheet_import_path("client/app/src/HelloServer/components/nested/LikeButton.jsx"))
         .to eq("../../../../stylesheets/application.css")
     end
+
+    it "rejects entry paths outside the generator destination" do
+      expect { relative_stylesheet_import_path("../../outside/LikeButton.jsx") }
+        .to raise_error(ArgumentError, "entry_path must stay inside the generator destination")
+    end
   end
 
   describe "#active_precompile_hook_configured?" do
diff --git a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
index bdf955eb68..27eec4df0a 100644
--- a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
@@ -169,8 +169,8 @@ def simulate_managed_stock_webpack_files(options = {})
   def simulate_preinstalled_shakapacker(source_path:, source_entry_path:)
     simulate_existing_file("config/shakapacker.yml", <<~YAML)
       default: &default
-        source_path: #{source_path}
-        source_entry_path: #{source_entry_path}
+        source_path: #{source_path.to_s.inspect}
+        source_entry_path: #{source_entry_path.to_s.inspect}
         public_root_path: public
         public_output_path: packs
         cache_path: tmp/shakapacker

From 6c3b0e9cdb9281619ec9a20046a2fcbdf6c7b673 Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 12:04:04 -1000
Subject: [PATCH 14/24] Cover RSC Tailwind custom source paths

---
 .../react_on_rails/base_generator.rb          |  2 +-
 .../generators/install_generator_spec.rb      | 24 +++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/react_on_rails/lib/generators/react_on_rails/base_generator.rb b/react_on_rails/lib/generators/react_on_rails/base_generator.rb
index d27d2555b9..75f5f51b88 100644
--- a/react_on_rails/lib/generators/react_on_rails/base_generator.rb
+++ b/react_on_rails/lib/generators/react_on_rails/base_generator.rb
@@ -194,7 +194,7 @@ def copy_packer_config
         # shakapacker_source_entry_path; those helpers memoize on first read.
         if instance_variable_defined?(:@shakapacker_source_path) ||
            instance_variable_defined?(:@shakapacker_source_entry_path)
-          raise "copy_packer_config must run before path-dependent generator actions"
+          raise Thor::Error, "copy_packer_config must run before path-dependent generator actions"
         end
 
         base_path = "base/base/"
diff --git a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
index 27eec4df0a..7e09ea3e40 100644
--- a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "json"
+
 require_relative "../support/generator_spec_helper"
 require_relative "../support/version_test_helpers"
 describe InstallGenerator, type: :generator do
@@ -169,8 +171,8 @@ def simulate_managed_stock_webpack_files(options = {})
   def simulate_preinstalled_shakapacker(source_path:, source_entry_path:)
     simulate_existing_file("config/shakapacker.yml", <<~YAML)
       default: &default
-        source_path: #{source_path.to_s.inspect}
-        source_entry_path: #{source_entry_path.to_s.inspect}
+        source_path: #{yaml_quoted_string(source_path)}
+        source_entry_path: #{yaml_quoted_string(source_entry_path)}
         public_root_path: public
         public_output_path: packs
         cache_path: tmp/shakapacker
@@ -201,6 +203,10 @@ def simulate_preinstalled_shakapacker(source_path:, source_entry_path:)
     JS
   end
 
+  def yaml_quoted_string(value)
+    JSON.generate(value.to_s)
+  end
+
   # Reads the repo's own package.json packageManager pin and returns the version.
   # Anchoring on package.json (the user-visible source of truth) instead of
   # `const_get(:CI_PNPM_FALLBACK_VERSION)` keeps the assertion on observable surface
@@ -543,6 +549,20 @@ def run_add_agent_files(options = {})
     end
   end
 
+  context "with --rsc --tailwind and a pre-installed custom Shakapacker source root" do
+    before(:all) do
+      run_generator_test_with_args(%w[--rsc --tailwind --no-rspack], package_json: true, force: false) do
+        simulate_preinstalled_shakapacker(source_path: "client/app", source_entry_path: "entrypoints")
+      end
+    end
+
+    it "injects the stylesheet import into the generated RSC client component" do
+      assert_file "client/app/src/HelloServer/components/LikeButton.jsx" do |content|
+        expect(content).to include("import '../../../stylesheets/application.css';")
+      end
+    end
+  end
+
   context "with --new-app" do
     before(:all) { run_generator_test_with_args(%w[--new-app], package_json: true) }
 

From cfa66d774852c65933c1f0e814df94386dc8c282 Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 12:17:42 -1000
Subject: [PATCH 15/24] Cover generator path guard reviews

---
 .../generators/generator_helper_spec.rb             |  6 ++++++
 .../generators/install_generator_spec.rb            | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb b/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
index 429545012f..518a3e0df6 100644
--- a/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
@@ -285,6 +285,12 @@ def self.read
       expect(safe_generator_destination_path("/tmp/client/app", default: default_path)).to eq(default_path)
     end
 
+    it "falls back for absolute paths that relativize outside the destination root" do
+      outside_destination_path = File.expand_path("../client/app", destination_root)
+
+      expect(safe_generator_destination_path(outside_destination_path, default: default_path)).to eq(default_path)
+    end
+
     it "falls back for degenerate or traversing paths" do
       expect(safe_generator_destination_path(".", default: default_path)).to eq(default_path)
       expect(safe_generator_destination_path("..", default: default_path)).to eq(default_path)
diff --git a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
index 7e09ea3e40..1f4585d361 100644
--- a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
@@ -464,7 +464,10 @@ def run_add_agent_files(options = {})
     end
 
     it "generates base demo files from the config after --force overwrites the custom setup" do
-      # Thor's global --force overwrites the pre-installed config before path-dependent files are copied.
+      # --force causes copy_packer_config (which runs first) to overwrite the
+      # pre-installed custom config with the stock config before
+      # shakapacker_source_path memoizes. All path-dependent copies see the
+      # stock app/javascript root.
       assert_file "app/javascript/packs/server-bundle.js"
       assert_file "app/javascript/src/HelloWorld/ror_components/HelloWorld.client.jsx"
       assert_no_file "client/app/entrypoints/server-bundle.js"
@@ -1534,6 +1537,14 @@ class ActiveSupport::TestCase
       expect(gen).to have_received(:template)
         .with("base/base/config/shakapacker.yml.tt", "config/shakapacker.yml")
     end
+
+    it "raises when path helpers memoize before copy_packer_config runs" do
+      gen = BaseGenerator.new([], {}, { destination_root: destination })
+      gen.instance_variable_set(:@shakapacker_source_path, "client/app")
+
+      expect { gen.copy_packer_config }
+        .to raise_error(Thor::Error, /copy_packer_config must run before path-dependent generator actions/)
+    end
   end
 
   context "with --rspack" do

From 33e8f0ca39f9e55d7cda147569d874bcd97a6094 Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 12:26:11 -1000
Subject: [PATCH 16/24] Cover Redux Tailwind custom source paths

---
 .../react_with_redux_generator.rb             |  5 +++--
 .../generators/install_generator_spec.rb      | 20 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/react_on_rails/lib/generators/react_on_rails/react_with_redux_generator.rb b/react_on_rails/lib/generators/react_on_rails/react_with_redux_generator.rb
index 32208b4fd7..5af9c58390 100644
--- a/react_on_rails/lib/generators/react_on_rails/react_with_redux_generator.rb
+++ b/react_on_rails/lib/generators/react_on_rails/react_with_redux_generator.rb
@@ -70,12 +70,13 @@ def copy_base_files
         return unless use_tailwind?
 
         ror_client_file = "#{component_dir}/ror_components/HelloWorldApp.client.#{ext}"
-        stylesheet_import = "import '#{relative_stylesheet_import_path(ror_client_file)}';\n"
-        ror_client_file_path = File.join(destination_root, ror_client_file)
         if options[:pretend]
           say_status :pretend, "Would add Tailwind stylesheet import to #{ror_client_file}", :yellow
           return
         end
+
+        stylesheet_import = "import '#{relative_stylesheet_import_path(ror_client_file)}';\n"
+        ror_client_file_path = File.join(destination_root, ror_client_file)
         return if File.read(ror_client_file_path).include?(stylesheet_import)
 
         prepend_to_file(ror_client_file, stylesheet_import)
diff --git a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
index 1f4585d361..ad67fb5b28 100644
--- a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
@@ -204,6 +204,7 @@ def simulate_preinstalled_shakapacker(source_path:, source_entry_path:)
   end
 
   def yaml_quoted_string(value)
+    # JSON strings are valid YAML scalars, so JSON.generate gives us safe quoting for free.
     JSON.generate(value.to_s)
   end
 
@@ -526,6 +527,25 @@ def run_add_agent_files(options = {})
     end
   end
 
+  context "with --redux --tailwind and a pre-installed custom Shakapacker source root" do
+    before(:all) do
+      run_generator_test_with_args(%w[--redux --tailwind], package_json: true, force: false) do
+        simulate_preinstalled_shakapacker(source_path: "client/app", source_entry_path: "entrypoints")
+      end
+    end
+
+    it "generates Tailwind assets under the configured Shakapacker source path" do
+      assert_file "client/app/stylesheets/application.css", /@import "tailwindcss";/
+      assert_no_file "app/javascript/stylesheets/application.css"
+    end
+
+    it "injects the stylesheet import into the generated Redux client component" do
+      assert_file "client/app/src/HelloWorldApp/ror_components/HelloWorldApp.client.jsx" do |content|
+        expect(content).to include("import '../../../stylesheets/application.css';")
+      end
+    end
+  end
+
   context "with --rsc and a pre-installed custom Shakapacker source root" do
     before(:all) do
       run_generator_test_with_args(%w[--rsc --no-rspack], package_json: true, force: false) do

From a406d3eebb1d0f6e7c7843b0e60b4b2b346e9d8d Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 12:45:38 -1000
Subject: [PATCH 17/24] Cover generator guard review feedback

---
 .../generators/react_on_rails/react_no_redux_generator.rb | 7 +++----
 .../react_on_rails/generators/install_generator_spec.rb   | 8 ++++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/react_on_rails/lib/generators/react_on_rails/react_no_redux_generator.rb b/react_on_rails/lib/generators/react_on_rails/react_no_redux_generator.rb
index 8d172833e3..c2c48c9b1e 100644
--- a/react_on_rails/lib/generators/react_on_rails/react_no_redux_generator.rb
+++ b/react_on_rails/lib/generators/react_on_rails/react_no_redux_generator.rb
@@ -39,15 +39,14 @@ def copy_base_files
           "#{component_dir}/ror_components/HelloWorld.client.#{ext}"
         server_component =
           "#{component_dir}/ror_components/HelloWorld.server.#{ext}"
+        client_component_template = "app/javascript/src/HelloWorld/ror_components/HelloWorld.client.#{ext}"
 
         # Source paths are relative to this generator's templates; only
         # destinations vary with the app's Shakapacker config.
         if use_tailwind?
-          copy_file("#{tailwind_js_path}/app/javascript/src/HelloWorld/ror_components/HelloWorld.client.#{ext}",
-                    client_component)
+          copy_file("#{tailwind_js_path}/#{client_component_template}", client_component)
         else
-          copy_file("#{base_js_path}/app/javascript/src/HelloWorld/ror_components/HelloWorld.client.#{ext}",
-                    client_component)
+          copy_file("#{base_js_path}/#{client_component_template}", client_component)
           copy_file("#{base_js_path}/app/javascript/src/HelloWorld/ror_components/HelloWorld.module.css",
                     "#{component_dir}/ror_components/HelloWorld.module.css")
         end
diff --git a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
index ad67fb5b28..8efd351bcd 100644
--- a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
@@ -1565,6 +1565,14 @@ class ActiveSupport::TestCase
       expect { gen.copy_packer_config }
         .to raise_error(Thor::Error, /copy_packer_config must run before path-dependent generator actions/)
     end
+
+    it "raises when source_entry_path memoizes before copy_packer_config runs" do
+      gen = BaseGenerator.new([], {}, { destination_root: destination })
+      gen.instance_variable_set(:@shakapacker_source_entry_path, "entrypoints")
+
+      expect { gen.copy_packer_config }
+        .to raise_error(Thor::Error, /copy_packer_config must run before path-dependent generator actions/)
+    end
   end
 
   context "with --rspack" do

From b71a72792d376caeeb2f4d065f35621c28fa55b1 Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 12:49:03 -1000
Subject: [PATCH 18/24] Preserve bundler choice during config copy

---
 .../react_on_rails/base_generator.rb          |  3 ++-
 .../react_on_rails/generator_helper.rb        |  2 ++
 .../generators/generator_helper_spec.rb       | 19 +++++++++++++
 .../generators/install_generator_spec.rb      | 27 +++++++++++++++++++
 4 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/react_on_rails/lib/generators/react_on_rails/base_generator.rb b/react_on_rails/lib/generators/react_on_rails/base_generator.rb
index 75f5f51b88..e7efcd52f1 100644
--- a/react_on_rails/lib/generators/react_on_rails/base_generator.rb
+++ b/react_on_rails/lib/generators/react_on_rails/base_generator.rb
@@ -199,6 +199,7 @@ def copy_packer_config
 
         base_path = "base/base/"
         config = "config/shakapacker.yml"
+        use_rspack = using_rspack?
 
         if options.shakapacker_just_installed?
           say "Replacing Shakapacker default config with React on Rails version"
@@ -212,7 +213,7 @@ def copy_packer_config
         end
 
         # Configure bundler-specific settings
-        configure_rspack_in_shakapacker if using_rspack?
+        configure_rspack_in_shakapacker if use_rspack
 
         # Always ensure precompile_hook is configured (Shakapacker 9.0+ only)
         configure_precompile_hook_in_shakapacker
diff --git a/react_on_rails/lib/generators/react_on_rails/generator_helper.rb b/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
index 808ba72868..bbb63b1a80 100644
--- a/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
+++ b/react_on_rails/lib/generators/react_on_rails/generator_helper.rb
@@ -135,6 +135,8 @@ def configured_shakapacker_relative_path(config_key, default, allow_root: false)
     configured_path = shakapacker_path_config_value(config, config_key)
 
     safe_generator_destination_path(configured_path, default:, allow_root:)
+  rescue Psych::SyntaxError
+    default
   end
 
   def shakapacker_path_config_value(config, config_key)
diff --git a/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb b/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
index 518a3e0df6..72665065b0 100644
--- a/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/generator_helper_spec.rb
@@ -327,6 +327,25 @@ def self.read
     end
   end
 
+  describe "#shakapacker_stylesheet_path with malformed Shakapacker config" do
+    let(:shakapacker_yml_path) { File.join(destination_root, "config/shakapacker.yml") }
+
+    before do
+      FileUtils.mkdir_p(File.dirname(shakapacker_yml_path))
+      File.write(shakapacker_yml_path, "default:\n  source_path: [unterminated\n")
+      reset_shakapacker_memoization!
+    end
+
+    after do
+      FileUtils.rm_rf(File.join(destination_root, "config"))
+      reset_shakapacker_memoization!
+    end
+
+    it "falls back to the default generated stylesheet path" do
+      expect(shakapacker_stylesheet_path("application.css")).to eq("app/javascript/stylesheets/application.css")
+    end
+  end
+
   describe "#shakapacker_entrypoint_path" do
     let(:shakapacker_yml_path) { File.join(destination_root, "config/shakapacker.yml") }
 
diff --git a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
index 8efd351bcd..6a391678b7 100644
--- a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
@@ -1558,6 +1558,33 @@ class ActiveSupport::TestCase
         .with("base/base/config/shakapacker.yml.tt", "config/shakapacker.yml")
     end
 
+    it "preserves an existing Rspack choice before overwriting the Shakapacker config" do
+      shakapacker_yml_path = File.join(destination, "config/shakapacker.yml")
+      FileUtils.mkdir_p(File.dirname(shakapacker_yml_path))
+      File.write(shakapacker_yml_path, <<~YAML)
+        default:
+          assets_bundler: "rspack"
+      YAML
+
+      gen = BaseGenerator.new([], { force: true }, { destination_root: destination })
+      allow(gen).to receive(:template) do |_source, target, *_args|
+        File.write(File.join(destination, target), <<~YAML)
+          default:
+            assets_bundler: "webpack"
+        YAML
+      end
+      allow(gen).to receive(:configure_rspack_in_shakapacker)
+      allow(gen).to receive(:configure_precompile_hook_in_shakapacker)
+      allow(gen).to receive(:configure_private_output_path_in_shakapacker)
+
+      gen.copy_packer_config
+
+      expect(gen).to have_received(:configure_rspack_in_shakapacker)
+      expect(gen.using_rspack?).to be(true)
+    ensure
+      FileUtils.rm_rf(File.join(destination, "config"))
+    end
+
     it "raises when path helpers memoize before copy_packer_config runs" do
       gen = BaseGenerator.new([], {}, { destination_root: destination })
       gen.instance_variable_set(:@shakapacker_source_path, "client/app")

From b278327052cafa1cc265a133177a8f95a50e5e26 Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 12:57:22 -1000
Subject: [PATCH 19/24] Cover slash entry demo generation paths

---
 .../generators/install_generator_spec.rb      | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
index 6a391678b7..1fd7ab2922 100644
--- a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
@@ -455,6 +455,40 @@ def run_add_agent_files(options = {})
       assert_file "client/app/server-bundle.js"
       assert_no_file "client/app/packs/server-bundle.js"
     end
+
+    it "generates demo source files under the configured Shakapacker source path" do
+      assert_file "client/app/src/HelloWorld/ror_components/HelloWorld.client.jsx"
+      assert_file "client/app/src/HelloWorld/ror_components/HelloWorld.server.jsx"
+      assert_file "client/app/src/HelloWorld/ror_components/HelloWorld.module.css"
+
+      assert_no_file "app/javascript/src/HelloWorld/ror_components/HelloWorld.client.jsx"
+    end
+
+    it "uses the configured source path in generated demo hints" do
+      assert_file "app/views/hello_world/index.html.erb" do |content|
+        expect(content).to include('<code class="path-hint">client/app/src/HelloWorld/</code>')
+        expect(content).not_to include("app/javascript/src/HelloWorld/")
+      end
+    end
+  end
+
+  context "with --tailwind and a slash Shakapacker source entry path" do
+    before(:all) do
+      run_generator_test_with_args(%w[--tailwind], package_json: true, force: false) do
+        simulate_preinstalled_shakapacker(source_path: "client/app", source_entry_path: "/")
+      end
+    end
+
+    it "keeps Tailwind assets and imports anchored to the configured source path" do
+      assert_file "client/app/server-bundle.js"
+      assert_file "client/app/stylesheets/application.css", /@import "tailwindcss";/
+      assert_file "client/app/src/HelloWorld/ror_components/HelloWorld.client.jsx" do |content|
+        expect(content).to include("import '../../../stylesheets/application.css';")
+      end
+
+      assert_no_file "client/app/packs/server-bundle.js"
+      assert_no_file "app/javascript/stylesheets/application.css"
+    end
   end
 
   context "with --force and a pre-installed custom Shakapacker source root" do

From 756544e333483b4ceba6bfee79b5b052e14f788f Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 12:59:50 -1000
Subject: [PATCH 20/24] Respect custom source roots for TypeScript setup

---
 .../react_on_rails/install_generator.rb       |  8 +++---
 .../generators/install_generator_spec.rb      | 26 +++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/react_on_rails/lib/generators/react_on_rails/install_generator.rb b/react_on_rails/lib/generators/react_on_rails/install_generator.rb
index 70cb20e7bf..15f775f4d6 100644
--- a/react_on_rails/lib/generators/react_on_rails/install_generator.rb
+++ b/react_on_rails/lib/generators/react_on_rails/install_generator.rb
@@ -1169,8 +1169,8 @@ def create_css_module_types
 
         say "📝 Creating CSS module type definitions...", :yellow
 
-        # Ensure the types directory exists
-        FileUtils.mkdir_p("app/javascript/types")
+        css_module_types_path = File.join(shakapacker_source_path, "types", "css-modules.d.ts")
+        FileUtils.mkdir_p(File.dirname(css_module_types_path))
 
         css_module_types_content = <<~TS.strip
           // TypeScript definitions for CSS modules
@@ -1190,7 +1190,7 @@ def create_css_module_types
           }
         TS
 
-        File.write("app/javascript/types/css-modules.d.ts", css_module_types_content)
+        File.write(css_module_types_path, css_module_types_content)
         say "✅ Created CSS module type definitions", :green
       end
 
@@ -1222,7 +1222,7 @@ def create_typescript_config
             "jsx" => "react-jsx"
           },
           "include" => [
-            "app/javascript/**/*"
+            File.join(shakapacker_source_path, "**/*")
           ]
         }
 
diff --git a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
index 1fd7ab2922..3ae923e36c 100644
--- a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
@@ -561,6 +561,32 @@ def run_add_agent_files(options = {})
     end
   end
 
+  context "with --typescript and a pre-installed custom Shakapacker source root" do
+    before(:all) do
+      run_generator_test_with_args(%w[--typescript], package_json: true, force: false) do
+        simulate_preinstalled_shakapacker(source_path: "client/app", source_entry_path: "entrypoints")
+      end
+    end
+
+    it "generates TypeScript demo files under the configured Shakapacker source path" do
+      assert_file "client/app/src/HelloWorld/ror_components/HelloWorld.client.tsx"
+      assert_file "client/app/src/HelloWorld/ror_components/HelloWorld.server.tsx"
+
+      assert_no_file "app/javascript/src/HelloWorld/ror_components/HelloWorld.client.tsx"
+    end
+
+    it "points TypeScript support files at the configured Shakapacker source path" do
+      assert_file "client/app/types/css-modules.d.ts"
+      assert_no_file "app/javascript/types/css-modules.d.ts"
+
+      assert_file "tsconfig.json" do |content|
+        config = JSON.parse(content)
+        expect(config["include"]).to include("client/app/**/*")
+        expect(config["include"]).not_to include("app/javascript/**/*")
+      end
+    end
+  end
+
   context "with --redux --tailwind and a pre-installed custom Shakapacker source root" do
     before(:all) do
       run_generator_test_with_args(%w[--redux --tailwind], package_json: true, force: false) do

From 558296bd358ee46b24021087a3eeaf362f26cda9 Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 13:04:57 -1000
Subject: [PATCH 21/24] Create TypeScript support after Shakapacker config

---
 .../react_on_rails/install_generator.rb       | 11 +++++-----
 .../generators/install_generator_spec.rb      | 20 +++++++++++++++++++
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/react_on_rails/lib/generators/react_on_rails/install_generator.rb b/react_on_rails/lib/generators/react_on_rails/install_generator.rb
index 15f775f4d6..773f40e56b 100644
--- a/react_on_rails/lib/generators/react_on_rails/install_generator.rb
+++ b/react_on_rails/lib/generators/react_on_rails/install_generator.rb
@@ -234,11 +234,7 @@ def rspack_bundler_default
 
       def invoke_generators
         ensure_shakapacker_installed
-        if options.typescript?
-          install_typescript_dependencies
-          create_css_module_types
-          create_typescript_config
-        end
+        install_typescript_dependencies if options.typescript?
         # `invoke` instantiates child generators with a fresh options hash, so
         # --pretend/--force/--skip must be forwarded explicitly at each boundary.
         invoke "react_on_rails:base", [],
@@ -247,6 +243,11 @@ def invoke_generators
                  shakapacker_just_installed: shakapacker_just_installed?,
                  force: options[:force], skip: options[:skip], pretend: options[:pretend] }
 
+        if options.typescript?
+          create_css_module_types
+          create_typescript_config
+        end
+
         # Component generator logic:
         # - --rsc without --redux: Skip HelloWorld, HelloServer will be generated in setup_rsc
         # - --rsc with --redux: Generate HelloWorldApp (user explicitly wants Redux) + HelloServer
diff --git a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
index 3ae923e36c..51afcd2cd3 100644
--- a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
@@ -587,6 +587,26 @@ def run_add_agent_files(options = {})
     end
   end
 
+  context "with --typescript --force and a pre-installed custom Shakapacker source root" do
+    before(:all) do
+      run_generator_test_with_args(%w[--typescript], package_json: true, force: true) do
+        simulate_preinstalled_shakapacker(source_path: "client/app", source_entry_path: "entrypoints")
+      end
+    end
+
+    it "points TypeScript support files at the overwritten Shakapacker source path" do
+      assert_file "app/javascript/types/css-modules.d.ts"
+      assert_file "app/javascript/src/HelloWorld/ror_components/HelloWorld.client.tsx"
+      assert_no_file "client/app/types/css-modules.d.ts"
+
+      assert_file "tsconfig.json" do |content|
+        config = JSON.parse(content)
+        expect(config["include"]).to include("app/javascript/**/*")
+        expect(config["include"]).not_to include("client/app/**/*")
+      end
+    end
+  end
+
   context "with --redux --tailwind and a pre-installed custom Shakapacker source root" do
     before(:all) do
       run_generator_test_with_args(%w[--redux --tailwind], package_json: true, force: false) do

From b2a6c070ebd72ec1cd16cc08647af4f86f0e5542 Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 13:14:47 -1000
Subject: [PATCH 22/24] Honor skip for CSS module type generation

---
 .../generators/react_on_rails/install_generator.rb   |  4 +---
 .../generators/install_generator_spec.rb             | 12 ++++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/react_on_rails/lib/generators/react_on_rails/install_generator.rb b/react_on_rails/lib/generators/react_on_rails/install_generator.rb
index 773f40e56b..6e2dcc5f46 100644
--- a/react_on_rails/lib/generators/react_on_rails/install_generator.rb
+++ b/react_on_rails/lib/generators/react_on_rails/install_generator.rb
@@ -1171,8 +1171,6 @@ def create_css_module_types
         say "📝 Creating CSS module type definitions...", :yellow
 
         css_module_types_path = File.join(shakapacker_source_path, "types", "css-modules.d.ts")
-        FileUtils.mkdir_p(File.dirname(css_module_types_path))
-
         css_module_types_content = <<~TS.strip
           // TypeScript definitions for CSS modules
           declare module "*.module.css" {
@@ -1191,7 +1189,7 @@ def create_css_module_types
           }
         TS
 
-        File.write(css_module_types_path, css_module_types_content)
+        create_file(css_module_types_path, css_module_types_content)
         say "✅ Created CSS module type definitions", :green
       end
 
diff --git a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
index 51afcd2cd3..b0422dc617 100644
--- a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
@@ -3714,6 +3714,18 @@ class ActiveSupport::TestCase
     end
   end
 
+  describe "#create_css_module_types" do
+    it "uses Thor file creation at the configured Shakapacker source path" do
+      install_generator = install_generator_fixture(skip: true)
+      allow(install_generator).to receive(:shakapacker_source_path).and_return("client/app")
+
+      expect(install_generator).to receive(:create_file)
+        .with("client/app/types/css-modules.d.ts", a_string_including('declare module "*.module.css"'))
+
+      install_generator.send(:create_css_module_types)
+    end
+  end
+
   context "when detecting node availability" do
     let(:install_generator) { install_generator_fixture }
 

From aa8edbf1006447f70806d5b109d31a256637cd8b Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 13:29:12 -1000
Subject: [PATCH 23/24] Normalize RSC slash entry discovery paths

---
 .../base/config/webpack/rscWebpackConfig.js.tt   |  5 ++++-
 .../generators/install_generator_spec.rb         | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/react_on_rails/lib/generators/react_on_rails/templates/rsc/base/config/webpack/rscWebpackConfig.js.tt b/react_on_rails/lib/generators/react_on_rails/templates/rsc/base/config/webpack/rscWebpackConfig.js.tt
index 73a5ae3ac4..f0343da004 100644
--- a/react_on_rails/lib/generators/react_on_rails/templates/rsc/base/config/webpack/rscWebpackConfig.js.tt
+++ b/react_on_rails/lib/generators/react_on_rails/templates/rsc/base/config/webpack/rscWebpackConfig.js.tt
@@ -50,10 +50,13 @@ const configureRsc = () => {
   // Pass true to skip the RSC manifest plugin - RSC bundle doesn't need it
   const rscConfig = serverWebpackConfig(true);
   const discoveryBuild = process.env.RSC_REFERENCE_DISCOVERY_BUILD === 'true';
+  // Shakapacker uses "/" to mean entrypoints live directly under source_path.
+  // Keep that sentinel relative so path.resolve does not escape to the filesystem root.
+  const sourceEntryPath = config.source_entry_path === '/' ? '' : config.source_entry_path;
 
   const defaultServerComponentRegistrationEntry = resolve(
     config.source_path,
-    config.source_entry_path,
+    sourceEntryPath,
     '../generated/server-component-registration-entry.js',
   );
   const expectedServerComponentRegistrationEntry = 'server-component-registration-entry.js';
diff --git a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
index b0422dc617..dca0a9b9ed 100644
--- a/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
+++ b/react_on_rails/spec/react_on_rails/generators/install_generator_spec.rb
@@ -652,6 +652,22 @@ def run_add_agent_files(options = {})
     end
   end
 
+  context "with --rsc and a slash Shakapacker source entry path" do
+    before(:all) do
+      run_generator_test_with_args(%w[--rsc --no-rspack], package_json: true, force: false) do
+        simulate_preinstalled_shakapacker(source_path: "client/app", source_entry_path: "/")
+      end
+    end
+
+    it "normalizes the RSC discovery registration entry path" do
+      assert_file "client/app/server-bundle.js"
+      assert_file "config/webpack/rscWebpackConfig.js" do |content|
+        expect(content).to include("const sourceEntryPath = config.source_entry_path === '/' ? '' :")
+        expect(content).to include("sourceEntryPath,\n    '../generated/server-component-registration-entry.js'")
+      end
+    end
+  end
+
   context "with --rsc --tailwind and a pre-installed custom Shakapacker source root" do
     before(:all) do
       run_generator_test_with_args(%w[--rsc --tailwind --no-rspack], package_json: true, force: false) do

From b52c633526a6f2e4390acc240f6c6842e790a0c3 Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Fri, 19 Jun 2026 17:03:22 -1000
Subject: [PATCH 24/24] Add changelog for generator path hints

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a3ae571c3..0264cf4ead 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,8 @@ After a release, run `/update-changelog` in Claude Code to analyze commits, writ
 
 - **Explicit Webpack installs now pass the resolved bundler to Shakapacker.** `rails generate react_on_rails:install --no-rspack` and `--webpack` now set `SHAKAPACKER_ASSETS_BUNDLER=webpack` before running `shakapacker:install`, so Shakapacker installs Webpack dependencies instead of falling back to its default bundler. Fixes [Issue 4108](https://github.com/shakacode/react_on_rails/issues/4108). [PR 4109](https://github.com/shakacode/react_on_rails/pull/4109) by [ihabadham](https://github.com/ihabadham).
 
+- **Generated demo paths now honor custom Shakapacker source roots.** The install generator resolves demo components, entrypoints, stylesheets, TypeScript includes, Tailwind imports, and RSC hints from the app's Shakapacker `source_path` / `source_entry_path` settings, including slash entry roots, while wrapping long source hints in the generated demo views. Fixes [Issue 4062](https://github.com/shakacode/react_on_rails/issues/4062). [PR 4130](https://github.com/shakacode/react_on_rails/pull/4130) by [justin808](https://github.com/justin808).
+
 - **Abort the in-flight SSR render when the client disconnects (Pro streaming)**: Previously, when an HTTP client disconnected (or a request timed out) mid-stream, the Node renderer kept driving the React render to completion against a consumer that was already gone — wasting CPU and, for RSC/`cache()`-wrapped data fetches, continuing to hit the app's database/APIs. The Pro streaming layer now propagates the consumer-side teardown upstream into ReactDOM's `PipeableStream.abort()`: when the renderer worker detects the client disconnect it destroys the render's output stream, which aborts the in-flight render and releases the request's RSC payload streams. Normal completion is unaffected (the abort only fires when the output is destroyed before it ends, and never when a render error closes the stream). This also establishes the precondition for React 19.2's [`cacheSignal`](https://react.dev/reference/react/cacheSignal), which React settles automatically once a render is aborted (the `cacheSignal`-specific test and docs remain a follow-up). Part of [Issue 3885](https://github.com/shakacode/react_on_rails/issues/3885). [PR 4093](https://github.com/shakacode/react_on_rails/pull/4093) by [justin808](https://github.com/justin808).
 
 #### Added