react_on_rails 16.2.0.beta.3 → 16.2.0.beta.8

data/bin/ci-run-failed-specs

@@ -105,6 +105,15 @@ else
     if [[ "$line" =~ rspec[[:space:]]+(\./spec/[^[:space:]]+) ]]; then
       spec="${BASH_REMATCH[1]}"
       SPECS+=("$spec")
+    # Also handle bare spec paths like "spec/foo.rb[1:2:3]" or "./spec/foo.rb[1:2:3]"
+    # Strip trailing % and whitespace
+    elif [[ "$line" =~ (\.?/?spec/[^[:space:]%]+) ]]; then
+      spec="${BASH_REMATCH[1]}"
+      # Normalize to ./spec/ format
+      if [[ ! "$spec" =~ ^\. ]]; then
+        spec="./$spec"
+      fi
+      SPECS+=("$spec")
     fi
   done
 fi
@@ -130,7 +139,7 @@ echo ""
 
 # Determine the working directory (check if we need to be in spec/dummy)
 WORKING_DIR="."
-if [[ "${UNIQUE_SPECS[0]}" == *"spec/system"* ]] || [[ "${UNIQUE_SPECS[0]}" == *"spec/helpers"* ]]; then
+if [ ${#UNIQUE_SPECS[@]} -gt 0 ] && ([[ "${UNIQUE_SPECS[0]}" == *"spec/system"* ]] || [[ "${UNIQUE_SPECS[0]}" == *"spec/helpers"* ]]); then
   if [ -d "spec/dummy" ]; then
     WORKING_DIR="spec/dummy"
     echo -e "${BLUE}Running from spec/dummy directory${NC}"
@@ -153,9 +162,24 @@ echo ""
 
 # Confirm (read from /dev/tty to handle piped input)
 if [ -t 0 ]; then
+  # stdin is a TTY, read directly
   read -p "Run these specs now? [Y/n] " -n 1 -r REPLY
 else
-  read -p "Run these specs now? [Y/n] " -n 1 -r REPLY < /dev/tty
+  # stdin is not a TTY (piped input), try /dev/tty
+  # Check if we can actually open /dev/tty by attempting to use it in a subshell
+  set +e  # Temporarily disable errexit for the check
+  (exec 0</dev/tty) 2>/dev/null
+  TTY_CHECK=$?
+  set -e  # Re-enable errexit
+
+  if [ $TTY_CHECK -eq 0 ]; then
+    # Successfully opened /dev/tty, use it for confirmation
+    read -p "Run these specs now? [Y/n] " -n 1 -r REPLY < /dev/tty
+  else
+    # Cannot open /dev/tty, auto-confirm
+    echo "Run these specs now? [Y/n] Y (auto-confirmed, TTY unavailable)"
+    REPLY="Y"
+  fi
 fi
 echo
 if [[ ! "${REPLY}" =~ ^[Yy]$ ]] && [[ ! -z "${REPLY}" ]]; then

data/bin/ci-switch-config

@@ -39,14 +39,120 @@ check_version_manager() {
     echo "mise"
   elif command -v asdf &> /dev/null; then
     echo "asdf"
+  elif command -v rvm &> /dev/null && command -v nvm &> /dev/null; then
+    echo "rvm+nvm"
+  elif command -v rvm &> /dev/null; then
+    echo "rvm"
+  elif command -v nvm &> /dev/null; then
+    echo "nvm"
   else
-    print_error "No version manager found. Please install mise or asdf:"
+    print_error "No version manager found. Please install one of:"
     echo "  mise (recommended): https://mise.jdx.dev/"
-    echo "  asdf (legacy):      https://asdf-vm.com/"
+    echo "  asdf:               https://asdf-vm.com/"
+    echo "  rvm + nvm:          https://rvm.io/ + https://github.com/nvm-sh/nvm"
     exit 1
   fi
 }
 
+set_ruby_version() {
+  local version="$1"
+  local version_manager="$2"
+
+  case "$version_manager" in
+    mise|asdf)
+      # Handled via .tool-versions
+      ;;
+    rvm|rvm+nvm)
+      print_header "Setting Ruby $version with rvm"
+      # Check if version exists using rvm list rubies for consistent output
+      # Anchor to start of line to avoid false matches (e.g., 3.2.8 shouldn't match 13.2.8)
+      # Allow optional leading whitespace and ruby- prefix, no end anchor to allow patch suffixes
+      if ! rvm list rubies | grep -qE "^[[:space:]]*(ruby-)?${version}"; then
+        print_warning "Ruby $version not installed. Installing..."
+        if ! rvm install "$version"; then
+          print_error "Failed to install Ruby $version with rvm"
+          print_warning "Make sure rvm is properly configured. Try running: source ~/.rvm/scripts/rvm"
+          exit 1
+        fi
+      fi
+      if ! rvm use "$version"; then
+        print_error "Failed to switch to Ruby $version"
+        print_warning "Make sure rvm is properly configured. Try running: source ~/.rvm/scripts/rvm"
+        exit 1
+      fi
+      print_success "Switched to Ruby $version"
+      ;;
+    nvm)
+      print_error "Cannot set Ruby version: nvm doesn't manage Ruby"
+      echo "Please install one of the following to manage Ruby versions:"
+      echo "  - rvm:  https://rvm.io/"
+      echo "  - mise: https://mise.jdx.dev/ (recommended, manages both Ruby and Node)"
+      echo "  - asdf: https://asdf-vm.com/ (manages both Ruby and Node)"
+      exit 1
+      ;;
+  esac
+}
+
+set_node_version() {
+  local version="$1"
+  local version_manager="$2"
+
+  case "$version_manager" in
+    mise|asdf)
+      # Handled via .tool-versions
+      ;;
+    nvm|rvm+nvm)
+      print_header "Setting Node $version with nvm"
+
+      # Source nvm if not already loaded - try multiple common locations
+      if ! command -v nvm &> /dev/null; then
+        # Try standard nvm location
+        if [ -s "$HOME/.nvm/nvm.sh" ]; then
+          export NVM_DIR="$HOME/.nvm"
+          \. "$NVM_DIR/nvm.sh"
+        # Try Homebrew location (macOS)
+        elif [ -s "/opt/homebrew/opt/nvm/nvm.sh" ]; then
+          export NVM_DIR="/opt/homebrew/opt/nvm"
+          \. "/opt/homebrew/opt/nvm/nvm.sh"
+        # Try XDG config location
+        elif [ -s "${XDG_CONFIG_HOME:-$HOME/.config}/nvm/nvm.sh" ]; then
+          export NVM_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/nvm"
+          \. "$NVM_DIR/nvm.sh"
+        else
+          print_error "Could not find nvm installation"
+          print_warning "Tried locations: ~/.nvm, /opt/homebrew/opt/nvm, ~/.config/nvm"
+          echo "Please source nvm manually or install it from: https://github.com/nvm-sh/nvm"
+          exit 1
+        fi
+      fi
+
+      # Check if version is already installed using nvm version for reliability
+      if ! nvm version "$version" &> /dev/null; then
+        print_warning "Node $version not installed. Installing..."
+        if ! nvm install "$version"; then
+          print_error "Failed to install Node $version with nvm"
+          exit 1
+        fi
+      fi
+
+      if ! nvm use "$version"; then
+        print_error "Failed to switch to Node $version"
+        print_warning "Make sure nvm is properly configured. Try running: nvm use $version"
+        exit 1
+      fi
+      print_success "Switched to Node $version"
+      ;;
+    rvm)
+      print_error "Cannot set Node version: rvm doesn't manage Node"
+      echo "Please install one of the following to manage Node versions:"
+      echo "  - nvm:  https://github.com/nvm-sh/nvm"
+      echo "  - mise: https://mise.jdx.dev/ (recommended, manages both Ruby and Node)"
+      echo "  - asdf: https://asdf-vm.com/ (manages both Ruby and Node)"
+      exit 1
+      ;;
+  esac
+}
+
 show_status() {
   print_header "Current Configuration"
   echo ""
@@ -121,14 +227,37 @@ switch_to_minimum() {
   fi
 
   # Set Ruby and Node versions
-  print_header "Setting runtime versions in .tool-versions"
-  cat > "$PROJECT_ROOT/.tool-versions" <<EOF
+  case "$VERSION_MANAGER" in
+    mise|asdf)
+      print_header "Setting runtime versions in .tool-versions"
+      cat > "$PROJECT_ROOT/.tool-versions" <<EOF
 ruby 3.2.8
 nodejs 20.18.1
 EOF
-  print_success "Created .tool-versions with Ruby 3.2.8 and Node 20.18.1"
+      print_success "Created .tool-versions with Ruby 3.2.8 and Node 20.18.1"
+      ;;
+    rvm|rvm+nvm)
+      print_header "Creating .ruby-version for rvm"
+      echo "3.2.8" > "$PROJECT_ROOT/.ruby-version"
+      print_success "Created .ruby-version with Ruby 3.2.8"
+      ;;
+  esac
+
+  case "$VERSION_MANAGER" in
+    nvm|rvm+nvm)
+      print_header "Creating .nvmrc for nvm"
+      echo "20.18.1" > "$PROJECT_ROOT/.nvmrc"
+      print_success "Created .nvmrc with Node 20.18.1"
+      ;;
+  esac
+
+  set_ruby_version "3.2.8" "$VERSION_MANAGER"
+  set_node_version "20.18.1" "$VERSION_MANAGER"
 
   # Run conversion script
+  # NOTE: This uses whatever 'ruby' is in PATH after version manager updates above.
+  # The version manager may not have reloaded yet, so ensure your current Ruby is
+  # compatible with script/convert (Ruby 2.6+ should work).
   print_header "Running script/convert to downgrade dependencies"
   cd "$PROJECT_ROOT"
   ruby script/convert
@@ -158,22 +287,60 @@ EOF
 
   # Reload version manager to pick up new versions
   print_header "Reloading $VERSION_MANAGER to use new versions"
-  if [[ "$VERSION_MANAGER" == "mise" ]]; then
-    # mise will auto-detect .tool-versions on next cd
-    :
-  elif [ -f "$HOME/.asdf/asdf.sh" ]; then
-    source "$HOME/.asdf/asdf.sh"
-  fi
+  case "$VERSION_MANAGER" in
+    mise)
+      # mise will auto-detect .tool-versions on next cd
+      ;;
+    asdf)
+      # Note: This only affects the script's subshell, not the user's current shell
+      if [ -f "$HOME/.asdf/asdf.sh" ]; then
+        source "$HOME/.asdf/asdf.sh"
+      fi
+      ;;
+    rvm|rvm+nvm)
+      # Versions already set via rvm use
+      ;;
+    nvm)
+      # Version already set via nvm use
+      ;;
+  esac
 
   echo ""
   print_success "Switched to MINIMUM configuration"
-  print_warning "Run these commands to reload your shell and verify:"
+
+  case "$VERSION_MANAGER" in
+    rvm+nvm|rvm|nvm)
+      print_warning "IMPORTANT: Version changes in this script don't persist to your current shell."
+      print_warning "The rvm/nvm commands run in a subshell and cannot affect your terminal."
+      echo ""
+      print_warning "Choose one of these options to activate the new versions:"
+      echo "  Option 1 (Recommended): Open a new terminal and cd into the project"
+      echo "  Option 2: Source your shell config:"
+      [ "$VERSION_MANAGER" = "rvm" ] || [ "$VERSION_MANAGER" = "rvm+nvm" ] && echo "    source ~/.rvm/scripts/rvm"
+      [ "$VERSION_MANAGER" = "nvm" ] || [ "$VERSION_MANAGER" = "rvm+nvm" ] && echo "    source \$NVM_DIR/nvm.sh"
+      echo ""
+      ;;
+  esac
+
+  print_warning "After activating versions, verify with:"
   echo "  cd $PROJECT_ROOT"
-  if [[ "$VERSION_MANAGER" == "mise" ]]; then
-    echo "  mise current"
-  else
-    echo "  asdf current"
-  fi
+  case "$VERSION_MANAGER" in
+    mise)
+      echo "  mise current"
+      ;;
+    asdf)
+      echo "  asdf current"
+      ;;
+    rvm+nvm)
+      echo "  rvm current && nvm current"
+      ;;
+    rvm)
+      echo "  rvm current"
+      ;;
+    nvm)
+      echo "  nvm current"
+      ;;
+  esac
   echo ""
   print_warning "Next steps to build and test:"
   echo "  rake node_package"
@@ -201,18 +368,41 @@ restore_to_latest() {
   fi
 
   # Set Ruby and Node versions
-  print_header "Setting runtime versions in .tool-versions"
-  cat > "$PROJECT_ROOT/.tool-versions" <<EOF
+  case "$VERSION_MANAGER" in
+    mise|asdf)
+      print_header "Setting runtime versions in .tool-versions"
+      cat > "$PROJECT_ROOT/.tool-versions" <<EOF
 ruby 3.4.3
 nodejs 22.12.0
 EOF
-  print_success "Created .tool-versions with Ruby 3.4.3 and Node 22.12.0"
+      print_success "Created .tool-versions with Ruby 3.4.3 and Node 22.12.0"
+      ;;
+    rvm|rvm+nvm)
+      print_header "Creating .ruby-version for rvm"
+      echo "3.4.3" > "$PROJECT_ROOT/.ruby-version"
+      print_success "Created .ruby-version with Ruby 3.4.3"
+      ;;
+  esac
+
+  case "$VERSION_MANAGER" in
+    nvm|rvm+nvm)
+      print_header "Creating .nvmrc for nvm"
+      echo "22.12.0" > "$PROJECT_ROOT/.nvmrc"
+      print_success "Created .nvmrc with Node 22.12.0"
+      ;;
+  esac
+
+  set_ruby_version "3.4.3" "$VERSION_MANAGER"
+  set_node_version "22.12.0" "$VERSION_MANAGER"
 
   # Restore files from git
   print_header "Restoring dependency files from git"
   cd "$PROJECT_ROOT"
-  git restore Gemfile.development_dependencies package.json spec/dummy/package.json packages/react-on-rails-pro/package.json 2>/dev/null || true
-  print_success "Files restored from git"
+  if ! git restore Gemfile.development_dependencies package.json spec/dummy/package.json packages/react-on-rails-pro/package.json 2>/dev/null; then
+    print_warning "Some files could not be restored (may not exist in git)"
+  else
+    print_success "Files restored from git"
+  fi
 
   # Clean and reinstall
   print_header "Cleaning node_modules and reinstalling"
@@ -238,22 +428,60 @@ EOF
 
   # Reload version manager to pick up new versions
   print_header "Reloading $VERSION_MANAGER to use new versions"
-  if [[ "$VERSION_MANAGER" == "mise" ]]; then
-    # mise will auto-detect .tool-versions on next cd
-    :
-  elif [ -f "$HOME/.asdf/asdf.sh" ]; then
-    source "$HOME/.asdf/asdf.sh"
-  fi
+  case "$VERSION_MANAGER" in
+    mise)
+      # mise will auto-detect .tool-versions on next cd
+      ;;
+    asdf)
+      # Note: This only affects the script's subshell, not the user's current shell
+      if [ -f "$HOME/.asdf/asdf.sh" ]; then
+        source "$HOME/.asdf/asdf.sh"
+      fi
+      ;;
+    rvm|rvm+nvm)
+      # Versions already set via rvm use
+      ;;
+    nvm)
+      # Version already set via nvm use
+      ;;
+  esac
 
   echo ""
   print_success "Restored to LATEST configuration"
-  print_warning "Run these commands to reload your shell and verify:"
+
+  case "$VERSION_MANAGER" in
+    rvm+nvm|rvm|nvm)
+      print_warning "IMPORTANT: Version changes in this script don't persist to your current shell."
+      print_warning "The rvm/nvm commands run in a subshell and cannot affect your terminal."
+      echo ""
+      print_warning "Choose one of these options to activate the new versions:"
+      echo "  Option 1 (Recommended): Open a new terminal and cd into the project"
+      echo "  Option 2: Source your shell config:"
+      [ "$VERSION_MANAGER" = "rvm" ] || [ "$VERSION_MANAGER" = "rvm+nvm" ] && echo "    source ~/.rvm/scripts/rvm"
+      [ "$VERSION_MANAGER" = "nvm" ] || [ "$VERSION_MANAGER" = "rvm+nvm" ] && echo "    source \$NVM_DIR/nvm.sh"
+      echo ""
+      ;;
+  esac
+
+  print_warning "After activating versions, verify with:"
   echo "  cd $PROJECT_ROOT"
-  if [[ "$VERSION_MANAGER" == "mise" ]]; then
-    echo "  mise current"
-  else
-    echo "  asdf current"
-  fi
+  case "$VERSION_MANAGER" in
+    mise)
+      echo "  mise current"
+      ;;
+    asdf)
+      echo "  asdf current"
+      ;;
+    rvm+nvm)
+      echo "  rvm current && nvm current"
+      ;;
+    rvm)
+      echo "  rvm current"
+      ;;
+    nvm)
+      echo "  nvm current"
+      ;;
+  esac
   echo ""
   print_warning "Next steps to build and test:"
   echo "  rake node_package"

data/bin/lefthook/check-trailing-newlines

@@ -16,23 +16,13 @@ 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"
+      echo "🔧 Adding trailing newline to: $file"
+      echo >> "$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/eslint-lint

@@ -34,11 +34,6 @@ if [ -n "$root_and_packages_pro_files" ]; then
   if ! yarn run eslint $root_and_packages_pro_files --fix; then
     exit_code=1
   fi
-
-  # Re-stage files if running on staged or all-changed context
-  if [ "$CONTEXT" = "staged" ] || [ "$CONTEXT" = "all-changed" ]; then
-    echo $root_and_packages_pro_files | xargs -r git add
-  fi
 fi
 
 # Lint react_on_rails_pro files (using Pro gem's ESLint config)
@@ -56,11 +51,6 @@ if [ -n "$react_on_rails_pro_files" ]; then
   if ! (cd react_on_rails_pro && yarn run eslint $react_on_rails_pro_files_relative --fix); then
     exit_code=1
   fi
-
-  # Re-stage files if running on staged or all-changed context
-  if [ "$CONTEXT" = "staged" ] || [ "$CONTEXT" = "all-changed" ]; then
-    echo $react_on_rails_pro_files | xargs -r git add
-  fi
 fi
 
 if [ $exit_code -eq 0 ]; then

data/bin/lefthook/prettier-format

@@ -24,11 +24,6 @@ if [ -n "$root_files" ]; then
   printf "  %s\n" $root_files
 
   yarn run prettier --write $root_files
-
-  # Re-stage files if running on staged or all-changed context
-  if [ "$CONTEXT" = "staged" ] || [ "$CONTEXT" = "all-changed" ]; then
-    echo $root_files | xargs -r git add
-  fi
 fi
 
 # Format Pro files (using Pro's Prettier config)
@@ -44,11 +39,6 @@ if [ -n "$pro_files" ]; then
   pro_files_relative=$(echo "$pro_files" | sed 's|^react_on_rails_pro/||')
 
   (cd react_on_rails_pro && yarn run prettier --write $pro_files_relative)
-
-  # Re-stage files if running on staged or all-changed context
-  if [ "$CONTEXT" = "staged" ] || [ "$CONTEXT" = "all-changed" ]; then
-    echo $pro_files | xargs -r git add
-  fi
 fi
 
 echo "✅ Prettier formatting complete"

data/bin/lefthook/ruby-autofix

@@ -17,10 +17,7 @@ else
 fi
 printf "  %s\n" $files
 
-bundle exec rake autofix
+# Run RuboCop only on changed files (not the full rake autofix)
+bundle exec rubocop -A --force-exclusion -- $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
+echo "✅ Auto-fix complete (fixed files staged automatically)"

data/knip.ts

@@ -5,13 +5,11 @@ const config: KnipConfig = {
   workspaces: {
     // Root workspace - manages the monorepo and global tooling
     '.': {
-      entry: ['eslint.config.ts'],
+      entry: ['eslint.config.ts', 'jest.config.base.js'],
       project: ['*.{js,mjs,ts}'],
       ignoreBinaries: [
         // Has to be installed globally
         'yalc',
-        // Used in package.json scripts (devDependency, so unlisted in production mode)
-        'nps',
         // Pro package binaries used in Pro workflows
         'playwright',
         'e2e-test',
@@ -41,6 +39,17 @@ const config: KnipConfig = {
         // SWC transpiler dependencies used in dummy apps
         '@swc/core',
         'swc-loader',
+        // Test dependencies used by child workspaces (packages/react-on-rails, packages/react-on-rails-pro)
+        '@testing-library/dom',
+        '@testing-library/jest-dom',
+        '@testing-library/react',
+        '@types/react-dom',
+        'create-react-class',
+        'jest-fetch-mock',
+        'prop-types',
+        'react',
+        'react-dom',
+        'redux',
       ],
     },
 
@@ -89,6 +98,11 @@ const config: KnipConfig = {
         'src/RSCRoute.tsx:RSCRouteProps',
         'src/streamServerRenderedReactComponent.ts:StreamingTrackers',
       ],
+      ignoreDependencies: [
+        // Test dependencies used only in tests
+        '@types/mock-fs',
+        'mock-fs',
+      ],
     },
     'spec/dummy': {
       entry: [
@@ -112,6 +126,12 @@ const config: KnipConfig = {
         '**/app-react16/**/*',
         // Playwright support files and helpers - generated by cypress-on-rails gem
         'e2e/playwright/support/**',
+        // Components and files used dynamically by React on Rails (registered at runtime)
+        'client/app/actions/**',
+        'client/app/components/**',
+        'client/app/routes/**',
+        'client/app/startup/**',
+        'client/app/store/**',
       ],
       project: ['**/*.{js,cjs,mjs,jsx,ts,cts,mts,tsx}!', 'config/webpack/*.js'],
       paths: {
@@ -124,9 +144,6 @@ const config: KnipConfig = {
         'bin/.*',
       ],
       ignoreDependencies: [
-        // Build-time dependencies not detected by Knip in any mode
-        '@babel/runtime',
-        'mini-css-extract-plugin',
         // There's no ReScript plugin for Knip
         '@rescript/react',
         // The Babel plugin fails to detect it
@@ -136,18 +153,27 @@ const config: KnipConfig = {
         'node-libs-browser',
         // The below dependencies are not detected by the Webpack plugin
         // due to the config issue.
-        'css-loader',
         'expose-loader',
         'file-loader',
         'imports-loader',
         'null-loader',
-        'sass',
-        'sass-loader',
         'sass-resources-loader',
         'style-loader',
         'url-loader',
         // Transitive dependency of shakapacker but listed as direct dependency
         'webpack-merge',
+        // Dependencies not detected in production mode
+        '@babel/runtime',
+        'mini-css-extract-plugin',
+        'css-loader',
+        'sass',
+        'sass-loader',
+        // Dependencies used dynamically by React on Rails
+        'create-react-class',
+        'react-helmet',
+        '@types/react-helmet',
+        'react-redux',
+        'react-router-dom',
       ],
     },
   },