react_on_rails 17.0.0.rc.6 → 17.0.0.rc.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60603cec3dbd4b84deedfe50bc3abcee226363d53fb0250e175f4b9af3f88492
-  data.tar.gz: 2a72fffbf70d1b840aeedfed0f7eafa2e378684e8688bef5c1b0b750749a4654
+  metadata.gz: 9ce16b1a51d89bfe5fbfff93568259f0b49bdde7bed2e8df54a6fead70682112
+  data.tar.gz: b4f8f6b423781b9916807dc0153fa469eda85b9ca3764ebcefb4e168a28945a2
 SHA512:
-  metadata.gz: f0dfddc3d2db936834d1d03f2c69c491359b482d1849d53cb08c6cbc07a052a96a73619ac6deccee5263cb8a72d03770ff9da8217309447330fde064f586a5c6
-  data.tar.gz: 525a931c6f9999180a3b388cd09f0cafabad9864b64adf5bb3fd824757c8f1c0511be22b6b0214d3d4c79ba9ef0c4ea5302e58378e659b9b478aae53979040c4
+  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.6)
+    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?
@@ -241,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
@@ -309,8 +324,10 @@ module ReactOnRails
         return unless use_tailwind?
 
         base_path = "base/tailwind/"
-        copy_file("#{base_path}app/javascript/stylesheets/application.css",
-                  shakapacker_stylesheet_path("application.css"))
+        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
@@ -374,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

data/lib/generators/react_on_rails/generator_helper.rb

@@ -10,7 +10,28 @@ 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
+  TAILWIND_PACK_NAME = "react_on_rails_tailwind"
+  TAILWIND_STYLESHEET_NAME = "application.css"
+  RAILS_APP_SOURCE_PATH = "app"
+  TAILWIND_LAYOUT_PACK_HELPER_BLOCK_PATTERN = /
+    ^[ \t]*<%\s*prepend_javascript_pack_tag(?:\s|\()
+    \s*["']react_on_rails_tailwind["'][^\n]*%>(?:\r?\n[ \t]*)*
+    ^[ \t]*<%=\s*stylesheet_pack_tag(?:\s|\()
+    \s*["']react_on_rails_tailwind["'][^\n]*%>(?:\r?\n[ \t]*)*
+    ^[ \t]*<%=\s*javascript_pack_tag(?:
+      \s*%> |
+      \s*\(\s*\)\s*%> |
+      \s+(?:\*\*[A-Za-z_]\w*|[a-z_]\w*\s*:)[^\n]*%> |
+      \(\s*(?:\*\*[A-Za-z_]\w*|[a-z_]\w*\s*:)[^\n]*\)\s*%>
+    )
+  /x
+  HTML_COMMENT_PATTERN = /<!--[\s\S]*?-->/
+  CONTROLLER_LAYOUT_DECLARATION_PATTERN =
+    /^\s*layout(?:\s+|\s*\(\s*)(?:"([^"]+)"|'([^']+)')(?=\s*(?:\)|,|#|$))/
+  private_constant :DEFAULT_SHAKAPACKER_SOURCE_PATH, :DEFAULT_SHAKAPACKER_SOURCE_ENTRY_PATH,
+                   :TAILWIND_PACK_NAME, :TAILWIND_STYLESHEET_NAME, :RAILS_APP_SOURCE_PATH,
+                   :TAILWIND_LAYOUT_PACK_HELPER_BLOCK_PATTERN, :HTML_COMMENT_PATTERN,
+                   :CONTROLLER_LAYOUT_DECLARATION_PATTERN
 
   def package_json
     # Lazy load package_json gem only when actually needed for dependency management
@@ -107,15 +128,87 @@ module GeneratorHelper
     File.join(shakapacker_source_path, "stylesheets", 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.
-    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?
+  def tailwind_pack_name
+    TAILWIND_PACK_NAME
+  end
+
+  def tailwind_pack_filename
+    "#{tailwind_pack_name}.js"
+  end
+
+  def tailwind_pack_path
+    shakapacker_entrypoint_path(tailwind_pack_filename)
+  end
+
+  def tailwind_stylesheet_path
+    shakapacker_stylesheet_path(TAILWIND_STYLESHEET_NAME)
+  end
+
+  def relative_tailwind_stylesheet_import_path
+    javascript_relative_import_path(tailwind_pack_path, tailwind_stylesheet_path)
+  end
+
+  def tailwind_css_source_directives
+    stylesheet_dir = absolute_generator_path(tailwind_stylesheet_path).dirname
+    rails_app_source = absolute_generator_path(RAILS_APP_SOURCE_PATH)
+    shakapacker_source = absolute_generator_path(shakapacker_source_path)
+
+    if path_inside_or_equal?(shakapacker_source, rails_app_source)
+      rails_app_relative_source = stylesheet_dir_relative_path(stylesheet_dir, rails_app_source)
+      tailwind_import_statement(source: rails_app_relative_source)
+    else
+      sources = [shakapacker_source, rails_app_source].uniq.map do |source_path|
+        tailwind_source_statement(stylesheet_dir_relative_path(stylesheet_dir, source_path))
+      end
+
+      [tailwind_import_statement(source: "none"), *sources].join("\n")
+    end
+  end
+
+  def layout_links_tailwind_pack?(content)
+    comment_ranges = html_comment_ranges(content)
+    return content.match?(TAILWIND_LAYOUT_PACK_HELPER_BLOCK_PATTERN) if comment_ranges.empty?
+
+    content.to_enum(:scan, TAILWIND_LAYOUT_PACK_HELPER_BLOCK_PATTERN).any? do
+      helper_match = Regexp.last_match
+
+      !range_overlaps_any?(helper_match.begin(0)...helper_match.end(0), comment_ranges)
+    end
+  end
+
+  def html_comment_ranges(content)
+    content.to_enum(:scan, HTML_COMMENT_PATTERN).map do
+      comment_match = Regexp.last_match
+
+      comment_match.begin(0)...comment_match.end(0)
+    end
+  end
+
+  def range_overlaps_any?(range, ranges)
+    ranges.any? { |candidate| range.begin < candidate.end && candidate.begin < range.end }
+  end
+
+  def extract_declared_layout_name(controller_content)
+    match = controller_content.match(CONTROLLER_LAYOUT_DECLARATION_PATTERN)
+    match&.captures&.compact&.first
+  end
+
+  def inherited_application_layout_name
+    application_controller_path = File.join(destination_root, "app/controllers/application_controller.rb")
+    return "application" unless File.exist?(application_controller_path)
+
+    extract_declared_layout_name(File.read(application_controller_path)) || "application"
+  end
+
+  def layout_destination_path(layout_name)
+    "app/views/layouts/#{layout_name}.html.erb"
+  end
 
-    entry_dir = Pathname.new(File.join(destination_root, safe_entry_path)).dirname
-    stylesheet = Pathname.new(File.join(destination_root, shakapacker_stylesheet_path(filename)))
+  def layout_file_links_tailwind_pack?(layout_name)
+    layout_full_path = File.join(destination_root, layout_destination_path(layout_name))
+    return false unless File.exist?(layout_full_path)
 
-    stylesheet.relative_path_from(entry_dir).to_s
+    layout_links_tailwind_pack?(File.read(layout_full_path))
   end
 
   def example_component_source_directory(component_name)
@@ -178,6 +271,48 @@ module GeneratorHelper
     nil # Signals the caller to fall back to the default path.
   end
 
+  def absolute_generator_path(relative_path)
+    Pathname.new(File.join(destination_root, relative_path)).cleanpath
+  end
+
+  def stylesheet_dir_relative_path(stylesheet_dir, source_path)
+    source_path.relative_path_from(stylesheet_dir).to_s
+  end
+
+  def javascript_relative_import_path(from_file, to_file)
+    from_dir = absolute_generator_path(from_file).dirname
+    relative_path = absolute_generator_path(to_file).relative_path_from(from_dir).to_s
+
+    relative_path.start_with?(".") ? relative_path : "./#{relative_path}"
+  end
+
+  def path_inside_or_equal?(child_path, parent_path)
+    relative_path = child_path.relative_path_from(parent_path).to_s
+    relative_path == "." || (relative_path != ".." && !relative_path.start_with?("../"))
+  rescue ArgumentError
+    false
+  end
+
+  def tailwind_import_statement(source:)
+    css_source = source == "none" ? "none" : tailwind_css_string(source)
+
+    %( @import "tailwindcss" source(#{css_source});).strip
+  end
+
+  def tailwind_source_statement(source)
+    %( @source #{tailwind_css_string(source)};).strip
+  end
+
+  def tailwind_css_string(value)
+    css_string = value.to_s
+    if css_string.match?(/[[:cntrl:]\u2028\u2029]/)
+      raise ArgumentError, "Tailwind source paths cannot contain control characters"
+    end
+
+    # JSON quoting keeps CSS punctuation inside the string literal.
+    JSON.generate(css_string)
+  end
+
   def unsafe_generator_destination_path?(path)
     path.nil? || path == "." || path == ".." || path.start_with?("../")
   end

data/lib/generators/react_on_rails/generator_messages.rb

@@ -56,7 +56,7 @@ module GeneratorMessages
 
     def helpful_message_after_installation(component_name: "HelloWorld", route: "hello_world", pro: false,
                                            rsc: false, shakapacker_just_installed: false, landing_page: false,
-                                           ci_workflow_generated: false, app_root: Dir.pwd)
+                                           ci_workflow_generated: false, tailwind: false, app_root: Dir.pwd)
       process_manager_section = build_process_manager_section
       testing_section = build_testing_section(app_root:)
       ci_section = build_ci_section(app_root:, ci_workflow_generated:)
@@ -65,6 +65,7 @@ module GeneratorMessages
                                                             app_root:)
       render_example = build_render_example(component_name:, route:, rsc:)
       render_label = build_render_label(route:, rsc:)
+      layout_pack_tags = build_layout_pack_tags(tailwind:)
       normalized_route = route.to_s.sub(%r{\A/+}, "")
       visit_url = if landing_page || normalized_route.empty?
                     "http://localhost:3000"
@@ -99,9 +100,7 @@ module GeneratorMessages
         4. Visit: #{Rainbow(visit_url).cyan.underline}#{landing_page_hint}
         ✨ KEY FEATURES:
         ─────────────────────────────────────────────────────────────────────────
-        • Auto-registration enabled - Your layout only needs:
-          <%= javascript_pack_tag %>
-          <%= stylesheet_pack_tag %>
+        #{layout_pack_tags}
 
         #{render_label}
           #{render_example}
@@ -117,6 +116,23 @@ module GeneratorMessages
 
     private
 
+    def build_layout_pack_tags(tailwind:)
+      if tailwind
+        <<~MSG.chomp
+          • Auto-registration enabled - Tailwind is declared from your layout:
+            <% prepend_javascript_pack_tag "react_on_rails_tailwind" %>
+            <%= stylesheet_pack_tag "react_on_rails_tailwind", media: "all" %>
+            <%= javascript_pack_tag %>
+        MSG
+      else
+        <<~MSG.chomp
+          • Auto-registration enabled - Your layout only needs:
+            <%= javascript_pack_tag %>
+            <%= stylesheet_pack_tag %>
+        MSG
+      end
+    end
+
     def build_render_example(component_name:, route:, rsc:)
       if rsc
         "<%= stream_react_component(\"#{component_name}\", props: @#{route}_props) %>"