react_on_rails 16.0.1.rc.0 → 16.0.1.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6df96f164d23050adbea7f31bb61ab36a092fbad393d2d1d0e8a307f5c6a41d0
-  data.tar.gz: e6e4b7e5c65175310edc4e1c7a01df8ffdfc8cdb9ca7fc1b5012988db174d360
+  metadata.gz: 447fa3382ac19a61525d8e17f67534ed0d6243cb8352512bae81b002165aef9b
+  data.tar.gz: 26b1a80ba765de1cf379e7fddc7adda75de353c39fea0a8c8965d314099d1b91
 SHA512:
-  metadata.gz: bf0ae04e65fe1225e159154df70a1043a447e15c058fe62a743e99fd4e8ef489b61b64766da0516d93faec781ed4d968e5b3bce85228e560f5c2c3a3646518ee
-  data.tar.gz: e604837b4b5182504ca2c2c38acbcdb8cf2dbea6f8fd94310fcedc28e4e8f4fe072048fdce21bed26317b0147d5712fb4a530a4c1fb3ae9bf52f47c05fa63a00
+  metadata.gz: ee112925a900c99b9b060e4eccf6fa18b5e249d2993b66d1a5b9ead17e989693d3dd512049a2276663616f9edb792b940f23334a600f56a4888deab47ea57ca2
+  data.tar.gz: dc7ba94789cfda1fcfce115d6db988b523810ed146d1db71d72d5942e920c7abf798317f8644ddc2e18dead08c4eacce62fb4b1a8c7ea751caaf63c85f40d35c

data/CHANGELOG.md

@@ -23,6 +23,12 @@ After a release, please make sure to run `bundle exec rake update_changelog`. Th
 
 Changes since the last non-beta release.
 
+#### 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)
+
+### [16.0.1-rc.0] - 2025-09-19
+
 #### Pro License Structure Implementation
 
 **🔐 License Architecture**
@@ -1646,7 +1652,8 @@ 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.0...master
+[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 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
@@ -33,6 +40,31 @@ These requirements are non-negotiable. CI will fail if not followed.
 - **Type checking**: `yarn run type-check`
 - **⚠️ MANDATORY BEFORE GIT PUSH**: `bundle exec rubocop` and fix ALL violations + ensure trailing newlines
 
+## ⚠️ FORMATTING RULES
+
+**Prettier is the SOLE authority for formatting. 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
 
 - **Initial setup**: `bundle && yarn && rake shakapacker_examples:gen_all && rake node_package && rake`

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.0)
       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/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/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "16.0.1.rc.0"
+  VERSION = "16.0.1.rc.2"
 end

data/lib/tasks/doctor.rake

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../../rakelib/task_helpers"
 require_relative "../react_on_rails"
 require_relative "../react_on_rails/doctor"
 
@@ -38,8 +37,6 @@ rescue LoadError
 end
 
 namespace :react_on_rails do
-  include ReactOnRails::TaskHelpers
-
   desc "Diagnose React on Rails setup and configuration"
   task :doctor do
     verbose = ENV["VERBOSE"] == "true"

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "react-on-rails",
-  "version": "16.0.1-rc.0",
+  "version": "16.0.1-rc.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "react-on-rails",
-      "version": "16.0.1-rc.0",
+      "version": "16.0.1-rc.2",
       "license": "MIT",
       "devDependencies": {
         "@arethetypeswrong/cli": "^0.17.4",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 16.0.1.rc.0
+  version: 16.0.1.rc.2
 platform: ruby
 authors:
 - Justin Gordon
@@ -133,6 +133,11 @@ files:
 - SUMMARY.md
 - TODO.md
 - app/helpers/react_on_rails_helper.rb
+- bin/lefthook/check-trailing-newlines
+- bin/lefthook/get-changed-files
+- bin/lefthook/prettier-format
+- bin/lefthook/ruby-autofix
+- bin/lefthook/ruby-lint
 - docker-compose.yml
 - eslint.config.ts
 - knip.ts