react_on_rails 17.0.0.rc.5 → 17.0.0.rc.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 483be34de15d43cc71b1f39a384275d9f3af3b90f201c5777785d24e9377cceb
-  data.tar.gz: 2fa0039ba762f2a0e26882c1729c914c252197f99aedfc498b344a341863657f
+  metadata.gz: 9ce16b1a51d89bfe5fbfff93568259f0b49bdde7bed2e8df54a6fead70682112
+  data.tar.gz: b4f8f6b423781b9916807dc0153fa469eda85b9ca3764ebcefb4e168a28945a2
 SHA512:
-  metadata.gz: 2c8e998f636ef7aa1465d12587c7536150b83ec2a9b72a546610cbdc38cc29237cb9bb27e247637b60cf3b58385cca6d2c0dc06d267c1aa0adfc112e2d987abf
-  data.tar.gz: c98e20ac4c306db1faaa0eb49d4155f103057b5fc24baa8f57be7ac7c0325bdd1a2ab8e03f43dbefd01572ef9fbfd53a7c372549d44cb2f15b5072cdb81d155d
+  metadata.gz: 305cf7a49dffa50dd56c3c67f03ee375ed2900e35ec8538bfb02251faa66a13c41323e3f7915722431cd117f6cafff9860abc46609bcc354a68628a0ecbe8adb
+  data.tar.gz: 60f230a7ae4acee7fbe18623e276f48e3e8369179629262c7219a4e066aca0bb87458e92fee061aff74a032c399810ce818816036827f42031e0dfff0be71a1b

data/.rubocop.yml

@@ -12,7 +12,6 @@ AllCops:
   Exclude:
     - 'spec/dummy/bin/*'
     - 'spec/react_on_rails/dummy-for-generators/**/*'  # Generated fixture contains intentionally invalid Ruby
-    - 'spike/**/*'  # Exploratory spike code outside lib/ — not part of the production surface
 
 Naming/FileName:
   Exclude:

data/Gemfile.development_dependencies

@@ -2,7 +2,7 @@
 
 eval_gemfile File.expand_path("../Gemfile.shared_dev_dependencies", __dir__)
 
-gem "shakapacker", "10.1.0"
+gem "shakapacker", "10.3.0"
 gem "bootsnap", require: false
 gem "rails", "~> 7.1.0"
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    react_on_rails (17.0.0.rc.5)
+    react_on_rails (17.0.0.rc.7)
       addressable
       connection_pool
       execjs (~> 2.5)
@@ -97,7 +97,7 @@ GEM
     ast (2.4.2)
     base64 (0.3.0)
     benchmark (0.5.0)
-    bigdecimal (4.0.1)
+    bigdecimal (4.1.2)
     bootsnap (1.18.3)
       msgpack (~> 1.2)
     builder (3.3.0)
@@ -114,12 +114,12 @@ GEM
     capybara-screenshot (1.0.26)
       capybara (>= 1.0, < 4)
       launchy
-    cgi (0.5.1)
+    cgi (0.5.2)
     childprocess (5.0.0)
     coderay (1.1.3)
-    concurrent-ruby (1.3.6)
+    concurrent-ruby (1.3.7)
     connection_pool (3.0.2)
-    crass (1.0.6)
+    crass (1.0.7)
     csv (3.3.5)
     cypress-on-rails (1.20.0)
       rack
@@ -132,7 +132,7 @@ GEM
     drb (2.2.3)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    erb (6.0.2)
+    erb (6.0.4)
     erubi (1.13.1)
     execjs (2.9.1)
     ffi (1.16.3)
@@ -143,11 +143,11 @@ GEM
       railties (>= 3.0.0)
     globalid (1.3.0)
       activesupport (>= 6.1)
-    i18n (1.14.8)
+    i18n (1.15.2)
       concurrent-ruby (~> 1.0)
     interception (0.5)
     io-console (0.8.2)
-    irb (1.17.0)
+    irb (1.18.0)
       pp (>= 0.6.0)
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
@@ -183,7 +183,7 @@ GEM
     method_source (1.1.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (6.0.2)
+    minitest (6.0.6)
       drb (~> 2.0)
       prism (~> 1.5)
     msgpack (1.7.2)
@@ -198,19 +198,19 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.5)
-    nokogiri (1.19.2)
+    nokogiri (1.19.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.19.2-arm64-darwin)
+    nokogiri (1.19.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.2-x86_64-linux-gnu)
+    nokogiri (1.19.4-x86_64-linux-gnu)
       racc (~> 1.4)
     ostruct (0.6.1)
     package_json (0.2.0)
     parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
-    pp (0.6.3)
+    pp (0.6.4)
       prettyprint
     prettyprint (0.2.0)
     prism (1.9.0)
@@ -228,17 +228,17 @@ GEM
     pry-rescue (1.6.0)
       interception (>= 0.5)
       pry (>= 0.12.0)
-    psych (5.3.1)
+    psych (5.4.0)
       date
       stringio
     public_suffix (6.0.2)
     puma (6.6.1)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.2.5)
-    rack-proxy (0.8.2)
+    rack (3.2.6)
+    rack-proxy (0.8.3)
       rack
-    rack-session (2.1.1)
+    rack-session (2.1.2)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
     rack-test (2.2.0)
@@ -277,7 +277,7 @@ GEM
       tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.3.1)
+    rake (13.4.2)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -331,7 +331,7 @@ GEM
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
     semantic_range (3.1.1)
-    shakapacker (10.1.0)
+    shakapacker (10.3.0)
       activesupport (>= 5.2)
       package_json
       rack-proxy (>= 0.6.1)
@@ -402,7 +402,7 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yard (0.9.36)
-    zeitwerk (2.7.5)
+    zeitwerk (2.8.2)
 
 PLATFORMS
   arm64-darwin
@@ -443,7 +443,7 @@ DEPENDENCIES
   sass-rails (~> 6.0)
   sdoc
   selenium-webdriver (= 4.9.0)
-  shakapacker (= 10.1.0)
+  shakapacker (= 10.3.0)
   simplecov (~> 0.16.1)
   spring (~> 4.0)
   sprockets (~> 4.0)

data/Steepfile

@@ -36,13 +36,11 @@ target :lib do
   check "lib/react_on_rails/dev/service_checker.rb"
   check "lib/react_on_rails/git_utils.rb"
   check "lib/react_on_rails/helper.rb"
-  check "lib/react_on_rails/js_code_builder.rb"
   check "lib/react_on_rails/packer_utils.rb"
-  check "lib/react_on_rails/render_request.rb"
-  check "lib/react_on_rails/rendering_strategy.rb"
-  check "lib/react_on_rails/rendering_strategy/exec_js_strategy.rb"
   check "lib/react_on_rails/server_rendering_pool.rb"
   check "lib/react_on_rails/test_helper.rb"
+  check "lib/react_on_rails/typescript_response_types.rb"
+  check "lib/react_on_rails/typescript_response_types/generated_file_writer.rb"
   check "lib/react_on_rails/utils.rb"
   check "lib/react_on_rails/version_checker.rb"
 

data/lib/generators/USAGE

@@ -2,12 +2,6 @@ Description:
 
 The react_on_rails:install generator integrates a React frontend, including SSR, with Rails.
 
-* Redux (Optional)
-
-    Passing the --redux generator option causes the generated Hello World example
-    to integrate the Redux state container framework. The necessary node modules
-    will be automatically included for you.
-
 * Tailwind CSS v4 (Optional)
 
     Passing the --tailwind generator option installs Tailwind CSS v4, configures

data/lib/generators/react_on_rails/base_generator.rb

@@ -17,12 +17,13 @@ module ReactOnRails
       Rails::Generators.hide_namespace(namespace)
       source_root(File.expand_path("templates", __dir__))
 
-      # --redux
+      # Internal hidden legacy Redux plumbing for install_generator.
       class_option :redux,
                    type: :boolean,
                    default: false,
-                   desc: "Install Redux package and Redux version of Hello World Example",
-                   aliases: "-R"
+                   desc: "Internal legacy Redux scaffolding flag",
+                   aliases: "-R",
+                   hide: true
 
       # --rspack / --no-rspack (Rspack is the default on fresh installs; --no-rspack selects Webpack)
       # IMPORTANT: do NOT add a `default:` here. The absence of a default is load-bearing — Thor
@@ -133,8 +134,24 @@ module ReactOnRails
         %w[webpack.config.js]).freeze
       DOCS_REFERENCE_MESSAGE = "// The source code including full typescript support is available at:"
       TEMPLATE_RENDER_FAILED = Object.new.freeze # unique sentinel compared by identity via .equal?
+      REACT_ON_RAILS_DEFAULT_LAYOUT_PATH = "app/views/layouts/react_on_rails_default.html.erb"
+      TAILWIND_LAYOUT_HELPER_LINES = [
+        "<!-- React on Rails injects generated packs here. Tailwind is layout-owned. -->",
+        '<% prepend_javascript_pack_tag "react_on_rails_tailwind" %>',
+        '<%= stylesheet_pack_tag "react_on_rails_tailwind", media: "all" %>',
+        "<%= javascript_pack_tag %>"
+      ].freeze
+      DEFAULT_LAYOUT_EMPTY_PACK_HELPERS_PATTERN = %r{
+        (?<indent>^[ \t]*)
+        <!--\s*Empty\ pack\ tags\ -\ React\ on\ Rails\ injects\ component\ CSS/JS\ here\s*-->\r?\n
+        [ \t]*<%=\s*stylesheet_pack_tag\s*%>\r?\n
+        [ \t]*<%=\s*javascript_pack_tag\s*%>
+      }x
+      CSRF_META_TAG_PATTERN = /^(?<indent>[ \t]*)<%=\s*csrf_meta_tags\s*%>\r?\n/
       private_constant :MANAGED_WEBPACK_FILE_TEMPLATES, :REMOVABLE_WEBPACK_FILES, :TemplateRenderContext,
-                       :DOCS_REFERENCE_MESSAGE, :TEMPLATE_RENDER_FAILED
+                       :DOCS_REFERENCE_MESSAGE, :TEMPLATE_RENDER_FAILED, :REACT_ON_RAILS_DEFAULT_LAYOUT_PATH,
+                       :TAILWIND_LAYOUT_HELPER_LINES, :DEFAULT_LAYOUT_EMPTY_PACK_HELPERS_PATTERN,
+                       :CSRF_META_TAG_PATTERN
 
       def add_root_route
         return unless options.new_app?
@@ -188,11 +205,46 @@ module ReactOnRails
         route "get 'hello_world', to: 'hello_world#index'"
       end
 
+      def copy_packer_config
+        # Rails generator actions run in method definition order.
+        # 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 Thor::Error, "copy_packer_config must run before path-dependent generator actions"
+        end
+
+        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"
+          # 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 use_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?
 
-        empty_directory("app/javascript/src/HelloWorld/ror_components")
+        empty_directory(File.join(example_component_source_directory("HelloWorld"), "ror_components"))
       end
 
       def copy_base_files
@@ -206,16 +258,14 @@ module ReactOnRails
                         .env.example
                         bin/shakapacker-precompile-hook]
 
-        # react_on_rails_default layout provides empty pack tags so React on Rails can
-        # inject generated packs without requiring a hardcoded application.js pack entry.
-        base_files << "app/views/layouts/react_on_rails_default.html.erb"
-
         # HelloWorld controller only when not using RSC (RSC uses HelloServer)
         # Exception: Redux still needs the HelloWorld controller even with RSC
         base_files << "app/controllers/hello_world_controller.rb" unless use_rsc? && !options.redux?
         base_files << "app/controllers/home_controller.rb" if generate_new_app_home_page?
         base_templates = %w[config/initializers/react_on_rails.rb]
         base_files.each { |file| copy_file("#{base_path}#{file}", file) }
+        copy_react_on_rails_default_layout(base_path)
+        warn_existing_hello_world_tailwind_layout
         base_templates.each do |file|
           template("#{base_path}/#{file}.tt", file)
         end
@@ -235,14 +285,15 @@ module ReactOnRails
 
       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
@@ -273,34 +324,10 @@ module ReactOnRails
         return unless use_tailwind?
 
         base_path = "base/tailwind/"
-        copy_file("#{base_path}app/javascript/stylesheets/application.css",
-                  "app/javascript/stylesheets/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
+        template("#{base_path}app/javascript/stylesheets/application.css.tt",
+                 tailwind_stylesheet_path)
+        template("#{base_path}app/javascript/packs/react_on_rails_tailwind.js.tt",
+                 tailwind_pack_path)
       end
 
       def add_base_gems_to_gemfile
@@ -364,6 +391,166 @@ module ReactOnRails
         shakapacker_build_command(env: "RAILS_ENV=test NODE_ENV=test", environment: "test")
       end
 
+      def copy_react_on_rails_default_layout(base_path)
+        # react_on_rails_default layout provides pack tags so React on Rails can
+        # inject generated packs without requiring a hardcoded application.js pack entry.
+        if use_tailwind?
+          copy_or_update_tailwind_layout
+        else
+          copy_file("#{base_path}#{REACT_ON_RAILS_DEFAULT_LAYOUT_PATH}", REACT_ON_RAILS_DEFAULT_LAYOUT_PATH)
+        end
+      end
+
+      def copy_or_update_tailwind_layout
+        tailwind_layout_template = "base/tailwind/#{REACT_ON_RAILS_DEFAULT_LAYOUT_PATH}"
+        layout_full_path = File.join(destination_root, REACT_ON_RAILS_DEFAULT_LAYOUT_PATH)
+
+        unless File.exist?(layout_full_path)
+          copy_file(tailwind_layout_template, REACT_ON_RAILS_DEFAULT_LAYOUT_PATH)
+          return
+        end
+
+        if options[:force]
+          copy_file(tailwind_layout_template, REACT_ON_RAILS_DEFAULT_LAYOUT_PATH, force: true)
+          return
+        end
+
+        content = File.read(layout_full_path)
+        if layout_links_tailwind_pack?(content)
+          say_status :skip, "#{REACT_ON_RAILS_DEFAULT_LAYOUT_PATH} already links #{tailwind_pack_name}", :yellow
+          return
+        end
+
+        if options[:skip]
+          say_status :skip,
+                     "#{REACT_ON_RAILS_DEFAULT_LAYOUT_PATH} exists and was not updated (--skip)",
+                     :yellow
+          return
+        end
+
+        layout_match = content.match(DEFAULT_LAYOUT_EMPTY_PACK_HELPERS_PATTERN)
+        if options[:pretend]
+          pretend_message =
+            if layout_match
+              "Would update #{REACT_ON_RAILS_DEFAULT_LAYOUT_PATH} to link #{tailwind_pack_name}"
+            else
+              "#{REACT_ON_RAILS_DEFAULT_LAYOUT_PATH} is customized and would need the Tailwind pack-tag block " \
+                "added manually"
+            end
+
+          say_status :pretend, pretend_message, :yellow
+          return
+        end
+
+        unless layout_match
+          warn_tailwind_layout_manual_step(REACT_ON_RAILS_DEFAULT_LAYOUT_PATH, reason: "layout is customized")
+          return
+        end
+
+        gsub_file(REACT_ON_RAILS_DEFAULT_LAYOUT_PATH, DEFAULT_LAYOUT_EMPTY_PACK_HELPERS_PATTERN) do
+          tailwind_layout_helper_block(layout_match[:indent])
+        end
+        ensure_generated_layout_head_tags(REACT_ON_RAILS_DEFAULT_LAYOUT_PATH)
+      end
+
+      def warn_existing_hello_world_tailwind_layout
+        return unless use_tailwind?
+
+        controller_path = "app/controllers/hello_world_controller.rb"
+        controller_full_path = File.join(destination_root, controller_path)
+        return unless File.exist?(controller_full_path)
+
+        layout_name = extract_declared_layout_name(File.read(controller_full_path)) || inherited_application_layout_name
+        return if layout_name == File.basename(REACT_ON_RAILS_DEFAULT_LAYOUT_PATH, ".html.erb") && !options[:skip]
+        return if layout_file_links_tailwind_pack?(layout_name)
+
+        GeneratorMessages.add_warning(<<~MSG.strip)
+          #{controller_path} may not use the Tailwind-aware React on Rails layout.
+
+          Merge the Tailwind layout pack tags into app/views/layouts/#{layout_name}.html.erb while
+          preserving any existing app-specific pack names.
+          Keep an existing javascript_pack_tag call if it already renders your app packs; otherwise include the
+          empty javascript_pack_tag flush shown here:
+          #{tailwind_layout_helper_block('  ')}
+        MSG
+      end
+
+      def tailwind_layout_helper_block(indent = "")
+        TAILWIND_LAYOUT_HELPER_LINES.map { |line| "#{indent}#{line}" }.join("\n")
+      end
+
+      def ensure_generated_layout_head_tags(layout_path)
+        layout_full_path = File.join(destination_root, layout_path)
+        content = File.read(layout_full_path)
+
+        content = ensure_generated_layout_viewport_tag(layout_path, layout_full_path, content)
+        ensure_generated_layout_csp_tag(layout_path, content)
+      end
+
+      def ensure_generated_layout_viewport_tag(layout_path, layout_full_path, content)
+        unless content.match?(/<meta\b[^>]*\bname=["']viewport["']/)
+          title_match = content.match(%r{^(?<indent>[ \t]*)<title>React on Rails</title>\r?\n})
+          csrf_match = content.match(CSRF_META_TAG_PATTERN)
+          viewport_tag = '<meta name="viewport" content="width=device-width,initial-scale=1">'
+
+          if title_match
+            insert_into_file(
+              layout_path,
+              %(#{title_match[:indent]}#{viewport_tag}\n),
+              after: title_match[0]
+            )
+            say_status :insert, "Added viewport meta to #{layout_path}", :green
+          elsif csrf_match
+            insert_into_file(
+              layout_path,
+              %(#{csrf_match[:indent]}#{viewport_tag}\n),
+              before: csrf_match[0]
+            )
+            say_status :insert, "Added viewport meta to #{layout_path}", :green
+          else
+            say_status(
+              :warning,
+              "Could not insert viewport meta into #{layout_path}: no title or csrf_meta_tags anchor found. " \
+              "Add #{viewport_tag} manually.",
+              :yellow
+            )
+          end
+
+          content = File.read(layout_full_path) # Re-read after viewport insertion before checking CSP.
+        end
+
+        content
+      end
+
+      def ensure_generated_layout_csp_tag(layout_path, content)
+        csp_tag = "<%= csp_meta_tag %>"
+        return if content.match?(/<%=\s*csp_meta_tag\s*%>/)
+
+        unless (csrf_match = content.match(CSRF_META_TAG_PATTERN))
+          say_status(
+            :warning,
+            "Could not insert csp_meta_tag into #{layout_path}: no csrf_meta_tags anchor found. " \
+            "Add #{csp_tag} manually.",
+            :yellow
+          )
+          return
+        end
+
+        insert_into_file(layout_path, %(#{csrf_match[:indent]}#{csp_tag}\n), after: csrf_match[0])
+        say_status :insert, "Added csp_meta_tag to #{layout_path}", :green
+      end
+
+      def warn_tailwind_layout_manual_step(layout_path, reason:)
+        say_status :warning, "Could not update #{layout_path}: #{reason}.", :yellow
+        say <<~MSG, :yellow
+          Add the Tailwind layout pack tags in the layout head while preserving any existing app-specific pack tags.
+          Keep an existing javascript_pack_tag call if it already renders your app packs; otherwise include the
+          empty javascript_pack_tag flush shown here:
+
+          #{tailwind_layout_helper_block('  ')}
+        MSG
+      end
+
       def generate_new_app_home_page?
         options.new_app? && new_app_root_route_added?
       end
@@ -686,10 +873,10 @@ module ReactOnRails
       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

data/lib/generators/react_on_rails/demo_page_config.rb

@@ -15,13 +15,13 @@ module ReactOnRails
         }
       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 @@ module ReactOnRails
         ]
       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."
           },
           {