Fix release script after pnpm monorepo restructure (#2173)

## Summary
- Adds root Rakefile to enable running rake tasks from monorepo root
(fixes "No Rakefile found" error)
- Fixes path references in release.rake that were incorrectly using
`gem_root` instead of `monorepo_root`

Fixes #2158

## Details

After the recent pnpm/directory restructure:
1. Running `rake release[...]` from the monorepo root failed because
there was no Rakefile at the root level
2. The release.rake script had incorrect paths for package.json files
and npm publish directories

### Changes:
1. **New Rakefile at monorepo root**: Delegates to
`react_on_rails/Rakefile` and loads all `*.rake` files from
`react_on_rails/rakelib/` (same pattern as root Gemfile)

2. **Fixed release.rake paths**: Changed `gem_root` to `monorepo_root`
for:
- package.json files (root, packages/react-on-rails,
packages/react-on-rails-pro)
   - react_on_rails_pro/spec/dummy path
   - pnpm publish directories for npm packages

## Test plan
- [x] Verified `rake -T` shows release task from monorepo root
- [x] Tested `rake release[16.2.0.beta.13,true,npm,skip_push]` dry-run
completes successfully
- [x] All package.json files at correct paths are updated
- [x] RuboCop passes on all changed files

Author: justin808

Rakefile

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+# Root Rakefile for monorepo development
+#
+# This file enables running rake tasks from the monorepo root directory.
+# It loads:
+#   1. Monorepo-level tasks from ./rakelib/ (e.g., release task for both gems)
+#   2. The react_on_rails gem's Rakefile
+#   3. The react_on_rails gem's rakelib tasks
+#
+# Usage: bundle exec rake -T (from monorepo root)
+#
+# Note: This is for development only. When the gem is installed in a Rails app,
+# Rails::Engine handles rake task loading automatically from lib/tasks/.
+
+# Define gem_root helper for use by rake tasks
+def gem_root
+  File.expand_path("react_on_rails", __dir__)
+end
+
+# Load the open-source gem's Rakefile
+load File.expand_path("Rakefile", gem_root)
+
+# Load all rake tasks from the gem's rakelib directory
+# Rake only auto-loads from ./rakelib in the current working directory,
+# so we must explicitly load from the subdirectory.
+Dir[File.join(gem_root, "rakelib", "*.rake")].each { |rake_file| load rake_file }
+
+# NOTE: Monorepo-level rake tasks from ./rakelib/ are auto-loaded by Rake.
+# Do NOT explicitly load them here, as that would cause tasks to be defined twice
+# and their bodies would run twice (Rake appends duplicate task definitions).

react_on_rails/rakelib/release.rake rakelib/release.rakereact_on_rails/rakelib/release.rake renamed to rakelib/release.rake

@@ -61,6 +61,9 @@ Version argument can be:
   - Explicit version: '16.2.0'
   - Pre-release version: '16.2.0.beta.1' (rubygem format with dots, converted to 16.2.0-beta.1 for NPM)
 
+Note: Pre-release versions (containing .test., .beta., .alpha., .rc., or .pre.) automatically
+skip git branch checks, allowing releases from non-master branches.
+
 This will update and release:
   PUBLIC (npmjs.org + rubygems.org):
     - react-on-rails NPM package
@@ -123,7 +126,9 @@ task :release, %i[version dry_run registry skip_push] do |_t, args|
 
   skip_push = skip_push_value == "skip_push"
 
+  # Detect if this is a test/pre-release version (contains test, beta, alpha, rc, etc.)
   version_input = args_hash.fetch(:version, "")
+  is_prerelease = version_input.match?(/\.(test|beta|alpha|rc|pre)\./i)
 
   if version_input.strip.empty?
     raise ArgumentError,
@@ -168,7 +173,6 @@ task :release, %i[version dry_run registry skip_push] do |_t, args|
 
   # Update react_on_rails_pro gem version to match
   puts "\nUpdating react_on_rails_pro gem version to #{actual_gem_version}..."
-  pro_gem_root = File.join(monorepo_root, "react_on_rails_pro")
   pro_version_file = File.join(pro_gem_root, "lib", "react_on_rails_pro", "version.rb")
   pro_version_content = File.read(pro_version_file)
   # We use gsub instead of `gem bump` here because the git tree is already dirty
@@ -181,12 +185,12 @@ task :release, %i[version dry_run registry skip_push] do |_t, args|
 
   puts "\nUpdating package.json files to version #{actual_npm_version}..."
 
-  # Update all package.json files
+  # Update all package.json files (only publishable packages)
   package_json_files = [
-    File.join(gem_root, "package.json"),
-    File.join(gem_root, "packages", "react-on-rails", "package.json"),
-    File.join(gem_root, "packages", "react-on-rails-pro", "package.json"),
-    File.join(gem_root, "react_on_rails_pro", "package.json")
+    File.join(monorepo_root, "package.json"),
+    File.join(monorepo_root, "packages", "react-on-rails", "package.json"),
+    File.join(monorepo_root, "packages", "react-on-rails-pro", "package.json"),
+    File.join(monorepo_root, "packages", "react-on-rails-pro-node-renderer", "package.json")
   ]
 
   package_json_files.each do |file|
@@ -209,7 +213,6 @@ task :release, %i[version dry_run registry skip_push] do |_t, args|
   # Update all Gemfile.lock files
   unbundled_sh_in_dir(gem_root, "bundle install#{bundle_quiet_flag}")
   unbundled_sh_in_dir(dummy_app_dir, "bundle install#{bundle_quiet_flag}")
-  pro_dummy_app_dir = File.join(gem_root, "react_on_rails_pro", "spec", "dummy")
   unbundled_sh_in_dir(pro_dummy_app_dir, "bundle install#{bundle_quiet_flag}") if Dir.exist?(pro_dummy_app_dir)
   unbundled_sh_in_dir(pro_gem_root, "bundle install#{bundle_quiet_flag}")
 
@@ -232,10 +235,23 @@ task :release, %i[version dry_run registry skip_push] do |_t, args|
   unless is_dry_run
     # Commit all version changes (skip git hooks to save time)
     sh_in_dir(monorepo_root, "LEFTHOOK=0 git add -A")
-    sh_in_dir(monorepo_root, "LEFTHOOK=0 git commit -m 'Bump version to #{actual_gem_version}'")
 
-    # Create git tag
-    sh_in_dir(monorepo_root, "git tag v#{actual_gem_version}")
+    # Only commit if there are staged changes (version might already be set)
+    git_status = `cd #{monorepo_root} && git diff --cached --quiet; echo $?`.strip
+    if git_status == "0"
+      puts "No version changes to commit (version already set to #{actual_gem_version})"
+    else
+      sh_in_dir(monorepo_root, "LEFTHOOK=0 git commit -m 'Bump version to #{actual_gem_version}'")
+    end
+
+    # Create git tag (skip if it already exists)
+    tag_name = "v#{actual_gem_version}"
+    tag_exists = system("cd #{monorepo_root} && git rev-parse #{tag_name} >/dev/null 2>&1")
+    if tag_exists
+      puts "Git tag #{tag_name} already exists, skipping tag creation"
+    else
+      sh_in_dir(monorepo_root, "git tag #{tag_name}")
+    end
 
     # Push commits and tags (skip git hooks)
     unless skip_push
@@ -256,25 +272,30 @@ task :release, %i[version dry_run registry skip_push] do |_t, args|
       puts "TIP: Set NPM_OTP environment variable to avoid repeated prompts."
     end
 
+    # For pre-release versions, skip git branch checks (allows releasing from non-master branches)
+    if is_prerelease
+      npm_publish_args += " --no-git-checks"
+      puts "Pre-release version detected - skipping git branch checks for NPM publish"
+    end
+
     # Publish react-on-rails NPM package
     puts "\nPublishing react-on-rails@#{actual_npm_version}..."
-    sh_in_dir(File.join(gem_root, "packages", "react-on-rails"), "pnpm publish #{npm_publish_args}")
+    sh_in_dir(File.join(monorepo_root, "packages", "react-on-rails"), "pnpm publish #{npm_publish_args}")
 
     # Publish react-on-rails-pro NPM package
     puts "\nPublishing react-on-rails-pro@#{actual_npm_version}..."
-    sh_in_dir(File.join(gem_root, "packages", "react-on-rails-pro"), "pnpm publish #{npm_publish_args}")
+    sh_in_dir(File.join(monorepo_root, "packages", "react-on-rails-pro"), "pnpm publish #{npm_publish_args}")
 
     # Publish node-renderer NPM package (PUBLIC on npmjs.org)
     puts "\n#{'=' * 80}"
     puts "Publishing PUBLIC node-renderer to #{use_verdaccio ? 'Verdaccio (local)' : 'npmjs.org'}..."
     puts "=" * 80
 
     # Publish react-on-rails-pro-node-renderer NPM package
-    # Note: Uses plain `pnpm publish` because the node-renderer
-    # package.json is in react_on_rails_pro/ which is not defined as a workspace
     node_renderer_name = "react-on-rails-pro-node-renderer"
+    node_renderer_dir = File.join(monorepo_root, "packages", "react-on-rails-pro-node-renderer")
     puts "\nPublishing #{node_renderer_name}@#{actual_npm_version}..."
-    sh_in_dir(pro_gem_root, "pnpm publish --no-git-checks #{npm_publish_args}")
+    sh_in_dir(node_renderer_dir, "pnpm publish #{npm_publish_args}")
 
     if use_verdaccio
       puts "\nSkipping Ruby gem publication (Verdaccio is NPM-only)"
@@ -320,7 +341,7 @@ task :release, %i[version dry_run registry skip_push] do |_t, args|
     puts "  - package.json (root)"
     puts "  - packages/react-on-rails/package.json"
     puts "  - packages/react-on-rails-pro/package.json (version + dependency)"
-    puts "  - react_on_rails_pro/package.json (node-renderer)"
+    puts "  - packages/react-on-rails-pro-node-renderer/package.json"
     puts "  - Gemfile.lock files (root, dummy apps, pro)"
     puts "\nAuto-synced (no write needed):"
     puts "  - react_on_rails_pro/react_on_rails_pro.gemspec (uses ReactOnRails::VERSION)"

rakelib/task_helpers.rb

@@ -0,0 +1,143 @@
+# frozen_string_literal: true
+
+require "English"
+
+module ReactOnRails
+  module TaskHelpers
+    # Returns the root folder of the monorepo
+    def monorepo_root
+      File.expand_path("..", __dir__)
+    end
+
+    # Returns the root folder of the react_on_rails gem
+    def gem_root
+      File.join(monorepo_root, "react_on_rails")
+    end
+
+    # Returns the root folder of the react_on_rails_pro gem
+    def pro_gem_root
+      File.join(monorepo_root, "react_on_rails_pro")
+    end
+
+    # Returns the folder where examples are located
+    def examples_dir
+      File.join(monorepo_root, "gen-examples", "examples")
+    end
+
+    def dummy_app_dir
+      File.join(gem_root, "spec/dummy")
+    end
+
+    def pro_dummy_app_dir
+      File.join(pro_gem_root, "spec", "dummy")
+    end
+
+    # Executes a string or an array of strings in a shell in the given directory in an unbundled environment
+    def sh_in_dir(dir, *shell_commands)
+      shell_commands.flatten.each { |shell_command| sh %(cd #{dir} && #{shell_command.strip}) }
+    end
+
+    # Executes a string or an array of strings in a shell in the given directory
+    def unbundled_sh_in_dir(dir, *shell_commands)
+      Dir.chdir(dir) do
+        # Without `with_unbundled_env`, running bundle in the child directories won't correctly
+        # update the Gemfile.lock
+        Bundler.with_unbundled_env do
+          shell_commands.flatten.each do |shell_command|
+            sh(shell_command.strip)
+          end
+        end
+      end
+    end
+
+    def bundle_install_in(dir)
+      required_version = detect_bundler_ruby_version(dir)
+
+      if required_version && required_version != RUBY_VERSION
+        puts "  Switching Ruby version: #{RUBY_VERSION} → #{required_version}"
+        # Run version switch and bundle install in the same shell context
+        bundle_install_with_ruby_version(dir, required_version)
+      else
+        unbundled_sh_in_dir(dir, "bundle install")
+      end
+    end
+
+    private
+
+    # Runs bundle install with the specified Ruby version in the same shell context
+    def bundle_install_with_ruby_version(dir, version)
+      version_manager = ENV.fetch("RUBY_VERSION_MANAGER", "rvm")
+
+      command = case version_manager
+                when "rvm"
+                  "rvm #{version} do bundle install"
+                when "rbenv"
+                  "RBENV_VERSION=#{version} bundle install"
+                when "asdf"
+                  "asdf shell ruby #{version} && bundle install"
+                else
+                  # TODO: add support for chruby
+                  puts "  ⚠️  Unknown RUBY_VERSION_MANAGER: #{version_manager}"
+                  puts "  Supported values: rvm, rbenv, asdf"
+                  raise "Ruby version #{version} required. Current: #{RUBY_VERSION}"
+                end
+
+      unbundled_sh_in_dir(dir, command)
+    rescue StandardError => e
+      puts "  ⚠️  Failed to switch Ruby version and run bundle install: #{e.message}"
+      puts "  Please manually switch to Ruby #{version} and try again"
+      raise
+    end
+
+    # Detects the required Ruby version using Bundler
+    def detect_bundler_ruby_version(dir)
+      output = nil
+      exit_status = nil
+
+      # Run in unbundled environment to avoid conflicts with parent Bundler context
+      Bundler.with_unbundled_env do
+        Dir.chdir(dir) do
+          output = `bundle platform --ruby 2>&1`
+          exit_status = $CHILD_STATUS.exitstatus
+        end
+      end
+
+      unless exit_status.zero?
+        puts "  ⚠️  Failed to detect Ruby version in #{dir}"
+        puts "  Error: #{output.strip}" unless output.strip.empty?
+        return nil
+      end
+
+      # Parse "ruby 3.3.7" or "ruby 3.3.7-rc1" or "ruby 3.4.0-preview1"
+      # Regex matches: digits.dots followed by optional -prerelease
+      match = output.strip.match(/ruby\s+([\d.]+(?:-[a-zA-Z0-9.]+)?)/)
+      match ? match[1] : nil
+    rescue StandardError => e
+      puts "  ⚠️  Error detecting Ruby version: #{e.message}"
+      nil
+    end
+
+    public
+
+    def bundle_install_in_no_turbolinks(dir)
+      sh_in_dir(dir, "DISABLE_TURBOLINKS=TRUE bundle install")
+    end
+
+    # Runs bundle exec using that directory's Gemfile
+    def bundle_exec(dir: nil, args: nil, env_vars: "")
+      sh_in_dir(dir, "#{env_vars} bundle exec #{args}")
+    end
+
+    def generators_source_dir
+      File.join(gem_root, "lib/generators/react_on_rails")
+    end
+
+    def symbolize_keys(hash)
+      hash.each_with_object({}) do |(key, value), new_hash|
+        new_key = key.is_a?(String) ? key.to_sym : key
+        new_value = value.is_a?(Hash) ? symbolize_keys(value) : value
+        new_hash[new_key] = new_value
+      end
+    end
+  end
+end

react_on_rails/rakelib/example_type.rb

@@ -3,6 +3,7 @@
 require "rake"
 
 require_relative "task_helpers"
+require_relative File.join(__dir__, "..", "lib", "react_on_rails", "utils")
 
 # Defines the ExampleType class, where each object represents a unique type of example
 # app that we can generate.

react_on_rails/rakelib/run_rspec.rake

@@ -3,6 +3,7 @@
 require "coveralls/rake/task" if ENV["USE_COVERALLS"] == "TRUE"
 
 require "pathname"
+require "yaml"
 
 require_relative "task_helpers"
 require_relative "example_type"
@@ -115,7 +116,7 @@ task :js_tests do
   sh "pnpm run test"
 end
 
-msg = <<-DESC.strip_heredoc
+msg = <<~DESC
   Runs all tests, run `rake -D run_rspec` to see all available test options.
   "rake run_rspec:example_basic" is a good way to run only one generator test.
 DESC

react_on_rails/spec/dummy/Gemfile.lock

@@ -345,7 +345,7 @@ GEM
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
     semantic_range (3.1.0)
-    shakapacker (9.3.0)
+    shakapacker (9.4.0)
       activesupport (>= 5.2)
       package_json
       rack-proxy (>= 0.6.1)
@@ -461,7 +461,7 @@ DEPENDENCIES
   sass-rails (~> 6.0)
   sdoc
   selenium-webdriver (= 4.9.0)
-  shakapacker (= 9.3.0)
+  shakapacker (= 9.4.0)
   spring (~> 4.0)
   sprockets (~> 4.0)
   sqlite3 (~> 1.6)