react_on_rails 16.0.1.rc.0 → 16.0.1.rc.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6df96f164d23050adbea7f31bb61ab36a092fbad393d2d1d0e8a307f5c6a41d0
-  data.tar.gz: e6e4b7e5c65175310edc4e1c7a01df8ffdfc8cdb9ca7fc1b5012988db174d360
+  metadata.gz: 1866bb608bf6b62df70e1ebb9e708596b59f620d08311ea8116e534bdb1180be
+  data.tar.gz: bc7ad5c8cca569395d3da1db1e3ee3d9a0f3a986ac8777eadae28b06d8514e6a
 SHA512:
-  metadata.gz: bf0ae04e65fe1225e159154df70a1043a447e15c058fe62a743e99fd4e8ef489b61b64766da0516d93faec781ed4d968e5b3bce85228e560f5c2c3a3646518ee
-  data.tar.gz: e604837b4b5182504ca2c2c38acbcdb8cf2dbea6f8fd94310fcedc28e4e8f4fe072048fdce21bed26317b0147d5712fb4a530a4c1fb3ae9bf52f47c05fa63a00
+  metadata.gz: 5d5651560869dc69bb9a7ce4f1d5666b7cc10c3fa84827087aa9c1c2c7afb20100eee674ca2b906ca3fec49ca4558af111c38558104976ad49290e07a0751b9a
+  data.tar.gz: 1cabd8aea0ef8545861f325494c6c051550a463ec73d9e206dfb8548060db0c8fe78bde5359e1ce921d787c9d99ad3961858e9a5ab81d7ae9e490b150ed32cd2

data/CHANGELOG.md

@@ -23,6 +23,62 @@ After a release, please make sure to run `bundle exec rake update_changelog`. Th
 
 Changes since the last non-beta release.
 
+#### Breaking Changes
+
+- **Removed `generated_assets_dirs` configuration**: The legacy `config.generated_assets_dirs` option is no longer supported and will raise an error if used. Since Shakapacker is now required, asset paths are automatically determined from `shakapacker.yml` configuration. Remove any `config.generated_assets_dirs` from your `config/initializers/react_on_rails.rb` file. Use `public_output_path` in `config/shakapacker.yml` to customize asset output location instead. [PR 1798](https://github.com/shakacode/react_on_rails/pull/1798)
+
+#### New Features
+
+- **Server Bundle Security**: Added new configuration options for enhanced server bundle security and organization:
+
+  - `server_bundle_output_path`: Configurable directory (relative to the Rails root) for server bundle output (default: "ssr-generated"). If set to `nil`, the server bundle will be loaded from the same public directory as client bundles.
+  - `enforce_private_server_bundles`: When enabled, ensures server bundles are only loaded from private directories outside the public folder (default: false for backward compatibility)
+
+- **Improved Bundle Path Resolution**: Bundle path resolution for server bundles now works as follows:
+  - If `server_bundle_output_path` is set, the server bundle is loaded from that directory.
+  - If `server_bundle_output_path` is not set, the server bundle falls back to the client bundle directory (typically the public output path).
+  - If `enforce_private_server_bundles` is enabled:
+    - The server bundle will only be loaded from the private directory specified by `server_bundle_output_path`.
+    - If the bundle is not found there, it will _not_ fall back to the public directory.
+  - If `enforce_private_server_bundles` is not enabled and the bundle is not found in the private directory, it will fall back to the public directory.
+  - This logic ensures that, when strict enforcement is enabled, server bundles are never loaded from public directories, improving security and clarity of bundle resolution.
+
+#### API Improvements
+
+- **Method Naming Clarification**: Added `public_bundles_full_path` method to clarify bundle path handling:
+  - `public_bundles_full_path`: New method specifically for webpack bundles in public directories
+  - `generated_assets_full_path`: Now deprecated (backwards-compatible alias)
+  - This eliminates confusion between webpack bundles and general Rails public assets
+
+#### Security Enhancements
+
+- **Private Server Bundle Enforcement**: When `enforce_private_server_bundles` is enabled, server bundles bypass public directory fallbacks and are only loaded from designated private locations
+- **Path Validation**: Added validation to ensure `server_bundle_output_path` points to private directories when enforcement is enabled
+
+#### Bug Fixes
+
+- **Non-Packer Environment Compatibility**: Fixed potential NoMethodError when using bundle path resolution in environments without Shakapacker
+- **Shakapacker version requirements**: Fixed inconsistent version requirements between basic pack generation (6.5.1+) and advanced auto-bundling features (7.0.0+). Added backward compatibility for users on Shakapacker 6.5.1-6.9.x while providing clear upgrade guidance for advanced features. Added new constants `MINIMUM_SHAKAPACKER_VERSION_FOR_AUTO_BUNDLING` and improved version checking performance with caching. [PR 1798](https://github.com/shakacode/react_on_rails/pull/1798)
+
+### [16.0.1-rc.2] - 2025-09-20
+
+#### Bug Fixes
+
+- **Packs generator**: Fixed error when `server_bundle_js_file` configuration is empty (default). Added safety check to prevent attempting operations on invalid file paths when server-side rendering is not configured. [PR 1802](https://github.com/shakacode/react_on_rails/pull/1802)
+
+### [16.0.1-rc.2] - 2025-09-20
+
+#### Bug Fixes
+
+- **Doctor rake task**: Fixed LoadError in `rake react_on_rails:doctor` when using packaged gem. The task was trying to require excluded `rakelib/task_helpers` file. [PR 1795](https://github.com/shakacode/react_on_rails/pull/1795)
+- **Shakapacker version requirements**: Fixed inconsistent version requirements between basic pack generation (6.5.1+) and advanced auto-registration features (7.0.0+). Added backward compatibility for users on Shakapacker 6.5.1-6.9.x while providing clear upgrade guidance for advanced features. Added new constants `MINIMUM_SHAKAPACKER_VERSION_FOR_AUTO_REGISTRATION` and improved version checking performance with caching. [PR 1798](https://github.com/shakacode/react_on_rails/pull/1798)
+
+#### Code Cleanup
+
+- **PackerUtils abstraction removal**: Removed unnecessary `PackerUtils.packer` abstraction method and replaced all calls with direct `::Shakapacker` usage. This simplifies the codebase by eliminating an abstraction layer that was originally created to support multiple webpack tools but is no longer needed since we only support Shakapacker. All tests updated accordingly. [PR 1798](https://github.com/shakacode/react_on_rails/pull/1798) by [claude-code](https://claude.ai/code)
+
+### [16.0.1-rc.0] - 2025-09-19
+
 #### Pro License Structure Implementation
 
 **🔐 License Architecture**
@@ -1646,7 +1702,9 @@ such as:
 
 - Fix several generator-related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/16.0.0...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/16.0.1-rc.2...master
+[16.0.1-rc.2]: https://github.com/shakacode/react_on_rails/compare/16.0.1-rc.0...16.0.1-rc.2
+[16.0.1-rc.0]: https://github.com/shakacode/react_on_rails/compare/16.0.0...16.0.1-rc.0
 [16.0.0]: https://github.com/shakacode/react_on_rails/compare/14.2.0...16.0.0
 [14.2.0]: https://github.com/shakacode/react_on_rails/compare/14.1.1...14.2.0
 [14.1.1]: https://github.com/shakacode/react_on_rails/compare/14.1.0...14.1.1

data/CLAUDE.md

@@ -9,9 +9,16 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 1. **ALWAYS run `bundle exec rubocop` and fix ALL violations**
 2. **ALWAYS ensure files end with a newline character**
 3. **NEVER push without running full lint check first**
+4. **ALWAYS let Prettier and RuboCop handle ALL formatting - never manually format**
 
 These requirements are non-negotiable. CI will fail if not followed.
 
+**🚀 AUTOMATIC: Git hooks are installed automatically during setup**
+
+Git hooks will automatically run linting on **all changed files (staged + unstaged + untracked)** before each commit - making it fast while preventing CI failures!
+
+**Note:** Git hooks are for React on Rails gem developers only, not for users who install the gem.
+
 ## Development Commands
 
 ### Essential Commands
@@ -32,6 +39,32 @@ These requirements are non-negotiable. CI will fail if not followed.
 - **Build**: `yarn run build` (compiles TypeScript to JavaScript in node_package/lib)
 - **Type checking**: `yarn run type-check`
 - **⚠️ MANDATORY BEFORE GIT PUSH**: `bundle exec rubocop` and fix ALL violations + ensure trailing newlines
+- Never run `npm` commands, only equivalent Yarn Classic ones
+
+## ⚠️ FORMATTING RULES
+
+**Prettier is the SOLE authority for formatting non-Ruby files, and RuboCop for formatting Ruby files. NEVER manually format code.**
+
+### Standard Workflow
+1. Make code changes
+2. Run `rake autofix` or `yarn start format`
+3. Commit changes
+
+### Merge Conflict Resolution Workflow
+**CRITICAL**: When resolving merge conflicts, follow this exact sequence:
+
+1. **Resolve logical conflicts only** - don't worry about formatting
+2. **Add resolved files**: `git add .` (or specific files)
+3. **Auto-fix everything**: `rake autofix`
+4. **Add any formatting changes**: `git add .`
+5. **Continue rebase/merge**: `git rebase --continue` or `git commit`
+
+**❌ NEVER manually format during conflict resolution** - this causes formatting wars between tools.
+
+### Debugging Formatting Issues
+- Check current formatting: `yarn start format.listDifferent`
+- Fix all formatting: `rake autofix`
+- If CI fails on formatting, always run automated fixes, never manual fixes
 
 ### Development Setup Commands
 
@@ -88,10 +121,10 @@ This project maintains both a Ruby gem and an NPM package:
 ## Important Notes
 
 - Use `yalc` for local development when testing with external apps
-- The project supports both Webpacker and Shakapacker
 - Server-side rendering uses isolated Node.js processes
 - React Server Components support available in Pro version
 - Generated examples are in `gen-examples/` (ignored by git)
+- Only use `yarn` as the JS package manager, never `npm`
 
 ## IDE Configuration
 

data/CODING_AGENTS.md

@@ -30,6 +30,7 @@ cd spec/dummy && foreman start       # Start dummy app with webpack
 - [ ] No trailing whitespace
 - [ ] Line length ≤120 characters
 - [ ] Security violations properly scoped with disable comments
+- [ ] No `package-lock.json` or other non-Yarn lock files (except `Gemfile.lock`)
 
 ## Development Patterns for AI Contributors
 

data/CONTRIBUTING.md

@@ -7,6 +7,10 @@
 ## Prerequisites
 
 - [Yalc](https://github.com/whitecolor/yalc) must be installed globally for most local development.
+- **Git hooks setup** (automatic during normal setup):
+
+Git hooks are installed automatically when you run the standard setup commands. They will run automatic linting on **all changed files (staged + unstaged + untracked)** - making commits fast while preventing CI failures.
+
 - After updating code via Git, to prepare all examples:
 
 ```sh
@@ -457,7 +461,9 @@ This approach:
 
 ## Pre-Commit Requirements
 
-**CRITICAL**: Before committing any changes, always run the following commands to ensure code quality:
+**AUTOMATED**: If you've set up Lefthook (see Prerequisites), linting runs automatically on changed files before each commit.
+
+**MANUAL OPTION**: If you need to run linting manually:
 
 ```bash
 # Navigate to the main react_on_rails directory
@@ -476,14 +482,14 @@ rake lint:rubocop
 rake lint
 ```
 
-**Automated checks:**
+**Git hooks automatically run:**
 
-- Format all JavaScript/TypeScript files with Prettier
+- Format JavaScript/TypeScript files with Prettier (on changed files only)
 - Check and fix linting issues with ESLint
-- Check and fix Ruby style issues with RuboCop
-- Ensure all tests pass before pushing
+- Check and fix Ruby style issues with RuboCop (on all changed files)
+- Ensure trailing newlines on all files
 
-**Tip**: Set up your IDE to run these automatically on save to catch issues early.
+**Setup**: Automatic during normal development setup
 
 ## 🤖 Best Practices for AI Coding Agents
 

data/Gemfile.development_dependencies

@@ -38,6 +38,7 @@ group :development, :test do
   gem "rubocop-rspec", "~>2.26", require: false
   gem "scss_lint", require: false
   gem "spring", "~> 4.0"
+  gem "lefthook", require: false
 end
 
 group :test do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    react_on_rails (16.0.0)
+    react_on_rails (16.0.1.rc.4)
       addressable
       connection_pool
       execjs (~> 2.5)
@@ -156,6 +156,7 @@ GEM
     launchy (3.0.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
+    lefthook (1.13.1)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -412,6 +413,7 @@ DEPENDENCIES
   jbuilder
   jquery-rails
   launchy
+  lefthook
   listen
   package_json
   pry

data/NEWS.md

@@ -21,7 +21,7 @@ _A history of the news. A few bullets at the top will also show on the [README.m
 - 2017-04-09: 8.0.0 beta work to include webpacker_lite gem has begun. See [#786](https://github.com/shakacode/react_on_rails/issues/786).
 - 2017-04-03: 6.9.3 Released! Props rendered in JSON script tag. Page size is smaller now due to less escaping!
 - 2017-03-06: Updated to Webpack v2!
-- 2017-03-02: Demo of internationalization (i18n) is live at [reactrails.com](https://www.reactrails.com/). Docs [here](docs/guides/i18n.md).
+- 2017-03-02: Demo of internationalization (i18n) is live at [reactrails.com](https://reactrails.com/). Docs [here](docs/guides/i18n.md).
 - 2017-02-28: See [discussions here on Webpacker](https://github.com/rails/webpacker/issues/139) regarding how Webpacker will allow React on Rails to avoid using the asset pipeline in the near future.
 - 2017-02-28: Upgrade to Webpack v2 or use the `--bail` option in your Webpack script for test and production builds. See the discussion on [PR #730](https://github.com/shakacode/react_on_rails/pull/730).
 - 2016-11-03: Spoke at [LA Ruby: "React on Rails: Why, What, and How?"](http://www.meetup.com/laruby/events/234825187/). [Video and pictures in this article](https://blog.shakacode.com/my-react-on-rails-talk-at-the-la-ruby-rails-meetup-november-10-2016-eaaa83aff800#.ej6h4eglp).

data/README.md

@@ -140,16 +140,21 @@ _Requires creating a free account._
 - Node.js >= 20 (CI tested: 20 - 22)
 - A JavaScript package manager (npm, yarn, pnpm, or bun)
 
-# Support
+# 🆘 Get Help & Support
 
-- [Click to join **React + Rails Slack**](https://join.slack.com/t/reactrails/shared_invite/zt-38oicm9d0-OO0V~bdg4aYNuZuUbRFSXg).
+**Need immediate help?** Here are your options, ordered by response time:
 
-- [**Subscribe**](https://app.mailerlite.com/webforms/landing/l1d9x5) for announcements of new releases of React on Rails and of our latest [blog articles](https://blog.shakacode.com) and tutorials.
-- [Discussions](https://github.com/shakacode/react_on_rails/discussions): Post your questions regarding React on Rails
-- **[forum.shakacode.com](https://forum.shakacode.com)**: Other discussions
-- **[@railsonmaui on Twitter](https://twitter.com/railsonmaui)**
-- _See [NEWS.md](https://github.com/shakacode/react_on_rails/tree/master/NEWS.md) for more notes over time._
-- See [Projects](https://github.com/shakacode/react_on_rails/tree/master/PROJECTS.md) using and [KUDOS](https://github.com/shakacode/react_on_rails/tree/master/KUDOS.md) for React on Rails. Please submit yours! Please edit either page or [email us](mailto:contact@shakacode.com) and we'll add your info. We also **love stars** as it helps us attract new users and contributors.
+- 🚀 **Professional Support**: [react_on_rails@shakacode.com](mailto:react_on_rails@shakacode.com) - Fastest resolution for bugs, upgrades, and consulting
+- 💬 **React + Rails Slack**: [Join our community](https://invite.reactrails.com) - Chat with other developers
+- 🆓 **GitHub Issues**: [Report bugs](https://github.com/shakacode/react_on_rails/issues) - Community support
+- 📖 **Discussions**: [Ask questions](https://github.com/shakacode/react_on_rails/discussions) - General help
+
+**Additional Resources:**
+
+- [**Subscribe**](https://app.mailerlite.com/webforms/landing/l1d9x5) for announcements of new releases and tutorials
+- **[forum.shakacode.com](https://forum.shakacode.com)** - Development discussions
+- **[@railsonmaui on Twitter](https://twitter.com/railsonmaui)** - Updates and tips
+- [Projects using React on Rails](https://github.com/shakacode/react_on_rails/tree/master/PROJECTS.md) - Submit yours!
 
 ## Contributing
 
@@ -163,6 +168,8 @@ ShakaCode is **[hiring passionate software engineers](http://www.shakacode.com/c
 
 The gem is available as open source under the terms of the [MIT License](https://github.com/shakacode/react_on_rails/tree/master/LICENSE.md).
 
+Note, some features are available only with a React on Rails Pro subscription. See [React on Rails Pro](https://www.shakacode.com/react-on-rails-pro/) for more information.
+
 # Supporters
 
 The following companies support our open-source projects, and ShakaCode uses their products!

data/bin/lefthook/check-trailing-newlines

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# Check for trailing newlines on all changed files
+set -euo pipefail
+
+CONTEXT="${1:-staged}"
+files="$(bin/lefthook/get-changed-files "$CONTEXT" '.*')"
+
+if [ -z "$files" ]; then
+  echo "✅ No files to check for trailing newlines"
+  exit 0
+fi
+
+if [ "$CONTEXT" = "all-changed" ]; then
+  echo "🔍 Checking trailing newlines on all changed files..."
+else
+  echo "🔍 Checking trailing newlines on $CONTEXT files..."
+fi
+
+failed_files=""
+for file in $files; do
+  if [ -f "$file" ] && [ -s "$file" ]; then
+    if ! tail -c 1 "$file" | grep -q '^$'; then
+      echo "❌ Missing trailing newline: $file"
+      failed_files="$failed_files $file"
+    fi
+  fi
+done
+
+if [ -n "$failed_files" ]; then
+  echo ""
+  echo "❌ Trailing newline check failed!"
+  echo "💡 Add trailing newlines to:$failed_files"
+  echo "🔧 Quick fix: for file in$failed_files; do echo >> \"\$file\"; done"
+  echo "🚫 Skip hook: git commit --no-verify"
+  exit 1
+fi
+
+echo "✅ All files have proper trailing newlines"

data/bin/lefthook/get-changed-files

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+# Get changed files based on context (staged, branch, or all)
+set -euo pipefail
+
+CONTEXT="${1:-staged}"
+PATTERN="${2:-.*}"
+
+case "$CONTEXT" in
+  staged)
+    git diff --cached --name-only --diff-filter=ACM | grep -E "$PATTERN" || true
+    ;;
+  all-changed)
+    # Get all changed files (staged + unstaged + untracked) vs working directory
+    (git diff --cached --name-only --diff-filter=ACM; git diff --name-only --diff-filter=ACM; git ls-files --others --exclude-standard) | sort -u | grep -E "$PATTERN" || true
+    ;;
+  branch)
+    # Find base branch (prefer main over master)
+    base="origin/main"
+    git rev-parse --verify --quiet "$base" >/dev/null || base="origin/master"
+    git diff --name-only --diff-filter=ACM "$base"...HEAD | grep -E "$PATTERN" || true
+    ;;
+  *)
+    echo "Usage: $0 {staged|all-changed|branch} [pattern]" >&2
+    exit 1
+    ;;
+esac

data/bin/lefthook/prettier-format

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+# Format JS/TS/JSON/MD files with Prettier
+set -euo pipefail
+
+CONTEXT="${1:-staged}"
+files="$(bin/lefthook/get-changed-files "$CONTEXT" '\.(js|jsx|ts|tsx|json|md|yml|yaml)$')"
+
+if [ -z "$files" ]; then
+  echo "✅ No files to format with Prettier"
+  exit 0
+fi
+
+if [ "$CONTEXT" = "all-changed" ]; then
+  echo "💅 Prettier on all changed files:"
+else
+  echo "💅 Prettier on $CONTEXT files:"
+fi
+printf "  %s\n" $files
+
+yarn run prettier --write $files
+
+# Re-stage files if running on staged or all-changed context
+if [ "$CONTEXT" = "staged" ] || [ "$CONTEXT" = "all-changed" ]; then
+  echo $files | xargs -r git add
+  echo "✅ Re-staged formatted files"
+fi

data/bin/lefthook/ruby-autofix

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+# Auto-fix Ruby files using rake autofix
+set -euo pipefail
+
+CONTEXT="${1:-staged}"
+files="$(bin/lefthook/get-changed-files "$CONTEXT" '\.(rb|rake|ru)$')"
+
+if [ -z "$files" ]; then
+  echo "✅ No Ruby files to autofix"
+  exit 0
+fi
+
+if [ "$CONTEXT" = "all-changed" ]; then
+  echo "🎨 Autofix on all changed Ruby files:"
+else
+  echo "🎨 Autofix on $CONTEXT Ruby files:"
+fi
+printf "  %s\n" $files
+
+bundle exec rake autofix
+
+# Re-stage files if running on staged or all-changed context
+if [ "$CONTEXT" = "staged" ] || [ "$CONTEXT" = "all-changed" ]; then
+  echo $files | xargs -r git add
+  echo "✅ Re-staged formatted files"
+fi

data/bin/lefthook/ruby-lint

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+# Lint Ruby files with RuboCop
+set -euo pipefail
+
+CONTEXT="${1:-staged}"
+files="$(bin/lefthook/get-changed-files "$CONTEXT" '\.(rb|rake|ru)$')"
+
+if [ -z "$files" ]; then
+  echo "✅ No Ruby files to lint"
+  exit 0
+fi
+
+if [ "$CONTEXT" = "all-changed" ]; then
+  echo "🔍 RuboCop on all changed Ruby files:"
+else
+  echo "🔍 RuboCop on $CONTEXT Ruby files:"
+fi
+printf "  %s\n" $files
+
+if ! bundle exec rubocop --force-exclusion --display-cop-names -- $files; then
+  echo ""
+  echo "❌ RuboCop check failed!"
+  echo "💡 Auto-fix: bundle exec rubocop --auto-correct --force-exclusion -- $files"
+  echo "🚫 Skip hook: git commit --no-verify"
+  exit 1
+fi
+echo "✅ RuboCop checks passed for Ruby files"

data/eslint.config.ts

@@ -159,6 +159,13 @@ const config = tsEslint.config([
       'react/prop-types': 'off',
     },
   },
+  {
+    files: ['spec/dummy/**/*'],
+    rules: {
+      // The dummy app dependencies are managed separately and may not be installed
+      'import/no-unresolved': 'off',
+    },
+  },
   {
     files: ['**/*.ts{x,}', '**/*.[cm]ts'],
 

data/lib/generators/react_on_rails/base_generator.rb

@@ -24,7 +24,7 @@ module ReactOnRails
       end
 
       def create_react_directories
-        # Create auto-registration directory structure for non-Redux components only
+        # Create auto-bundling directory structure for non-Redux components only
         # Redux components handle their own directory structure
         return if options.redux?
 
@@ -41,7 +41,7 @@ module ReactOnRails
         base_templates = %w[config/initializers/react_on_rails.rb]
         base_files.each { |file| copy_file("#{base_path}#{file}", file) }
         base_templates.each do |file|
-          template("#{base_path}/#{file}.tt", file, { packer_type: ReactOnRails::PackerUtils.packer_type })
+          template("#{base_path}/#{file}.tt", file)
         end
       end
 
@@ -95,55 +95,22 @@ module ReactOnRails
         run "bundle"
       end
 
-      def add_js_dependencies
-        add_react_on_rails_package
-        add_react_dependencies
-        add_css_dependencies
-        add_dev_dependencies
-      end
-
-      def install_js_dependencies
-        # Detect which package manager to use
-        success = if File.exist?(File.join(destination_root, "yarn.lock"))
-                    system("yarn", "install")
-                  elsif File.exist?(File.join(destination_root, "pnpm-lock.yaml"))
-                    system("pnpm", "install")
-                  elsif File.exist?(File.join(destination_root, "package-lock.json")) ||
-                        File.exist?(File.join(destination_root, "package.json"))
-                    # Use npm for package-lock.json or as default fallback
-                    system("npm", "install")
-                  else
-                    true # No package manager detected, skip
-                  end
-
-        unless success
-          GeneratorMessages.add_warning(<<~MSG.strip)
-            ⚠️  JavaScript dependencies installation failed.
-
-            This could be due to network issues or missing package manager.
-            You can install dependencies manually later by running:
-            • npm install (if using npm)
-            • yarn install (if using yarn)
-            • pnpm install (if using pnpm)
-          MSG
-        end
-
-        success
-      end
-
       def update_gitignore_for_auto_registration
         gitignore_path = File.join(destination_root, ".gitignore")
         return unless File.exist?(gitignore_path)
 
         gitignore_content = File.read(gitignore_path)
-        return if gitignore_content.include?("**/generated/**")
 
-        append_to_file ".gitignore" do
-          <<~GITIGNORE
+        additions = []
+        additions << "**/generated/**" unless gitignore_content.include?("**/generated/**")
+        additions << "ssr-generated" unless gitignore_content.include?("ssr-generated")
+
+        return if additions.empty?
 
-            # Generated React on Rails packs
-            **/generated/**
-          GITIGNORE
+        append_to_file ".gitignore" do
+          lines = ["\n# Generated React on Rails packs"]
+          lines.concat(additions)
+          "#{lines.join("\n")}\n"
         end
       end
 
@@ -157,6 +124,28 @@ module ReactOnRails
         end
       end
 
+      CONFIGURE_RSPEC_TO_COMPILE_ASSETS = <<-STR.strip_heredoc
+        RSpec.configure do |config|
+          # Ensure that if we are running js tests, we are using latest webpack assets
+          # This will use the defaults of :js and :server_rendering meta tags
+          ReactOnRails::TestHelper.configure_rspec_to_compile_assets(config)
+        end
+      STR
+
+      private
+
+      def setup_js_dependencies
+        add_js_dependencies
+        install_js_dependencies
+      end
+
+      def add_js_dependencies
+        add_react_on_rails_package
+        add_react_dependencies
+        add_css_dependencies
+        add_dev_dependencies
+      end
+
       def add_react_on_rails_package
         major_minor_patch_only = /\A\d+\.\d+\.\d+\z/
 
@@ -219,15 +208,34 @@ module ReactOnRails
         handle_npm_failure("development dependencies", dev_deps, dev: true) unless success
       end
 
-      CONFIGURE_RSPEC_TO_COMPILE_ASSETS = <<-STR.strip_heredoc
-        RSpec.configure do |config|
-          # Ensure that if we are running js tests, we are using latest webpack assets
-          # This will use the defaults of :js and :server_rendering meta tags
-          ReactOnRails::TestHelper.configure_rspec_to_compile_assets(config)
+      def install_js_dependencies
+        # Detect which package manager to use
+        success = if File.exist?(File.join(destination_root, "yarn.lock"))
+                    system("yarn", "install")
+                  elsif File.exist?(File.join(destination_root, "pnpm-lock.yaml"))
+                    system("pnpm", "install")
+                  elsif File.exist?(File.join(destination_root, "package-lock.json")) ||
+                        File.exist?(File.join(destination_root, "package.json"))
+                    # Use npm for package-lock.json or as default fallback
+                    system("npm", "install")
+                  else
+                    true # No package manager detected, skip
+                  end
+
+        unless success
+          GeneratorMessages.add_warning(<<~MSG.strip)
+            ⚠️  JavaScript dependencies installation failed.
+
+            This could be due to network issues or missing package manager.
+            You can install dependencies manually later by running:
+            • npm install (if using npm)
+            • yarn install (if using yarn)
+            • pnpm install (if using pnpm)
+          MSG
         end
-      STR
 
-      private
+        success
+      end
 
       def handle_npm_failure(dependency_type, packages, dev: false)
         install_command = dev ? "npm install --save-dev" : "npm install"