Skip to content

Commit 787681f

Browse files
committed
Update tests, workflows, and documentation for parameter order fix
This commit includes follow-up changes after fixing buildConsoleReplay parameter order: 1. **Update test files for new parameter order**: - packages/react-on-rails/tests/buildConsoleReplay.test.js - Updated all test calls to use new signature: (numberOfMessagesToSkip, consoleHistory, nonce) 2. **Sanitize test fixtures**: - packages/react-on-rails-pro-node-renderer/tests/fixtures/ - Replaced real personal info with generic test data - Changed user IDs, emails, names, addresses to test values 3. **Fix Pro package CI workflows**: - .github/workflows/pro-lint.yml: Build only Pro package instead of all - .github/workflows/pro-test-package-and-gem.yml: Fix yarn.lock cache path 4. **Update migration analysis docs**: - .claude/docs/analysis/INDEX.md - .claude/docs/analysis/MONOREPO_MIGRATION_ANALYSIS.md - Mark Phase 5 as complete, update status and timeline All changes verified locally.
1 parent 851d5ee commit 787681f

File tree

6 files changed

+58
-42
lines changed

6 files changed

+58
-42
lines changed

.claude/docs/analysis/INDEX.md

Lines changed: 33 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,14 @@ Suggested improvements for developer experience in monorepo context.
9494

9595
## Key Facts at a Glance
9696

97-
**Current Phase**: Phase 2 (Git Merger) - COMPLETE
98-
**Next Phase**: Phase 3 (Pre-Monorepo Structure Preparation)
99-
**Estimated Timeline**: 4-5 weeks total (across 7 phases)
97+
**Current Phase**: Phase 5 (Pro Node Renderer Package) - COMPLETE
98+
**Next Phase**: Phase 6 (Documentation & Polish)
99+
**Estimated Timeline**: Phases 1-5 complete, Phases 6-7 remaining
100100

101101
**Directory Structures**:
102102

103-
- Master: `node_package/` (backward compatible)
104-
- Target: `packages/` (workspace structure)
103+
- Surabaya-v1: `packages/` workspaces (fully implemented)
104+
- Three packages: react-on-rails, react-on-rails-pro, react-on-rails-pro-node-renderer
105105

106106
**Critical Risk**: Path validation for yalc publish
107107

@@ -179,27 +179,41 @@ Updates to analysis:
179179
- New issues/findings during implementation
180180
- Success criteria validation
181181

182-
## Future Phases
182+
## Completed Phases
183+
184+
**Phase 3**: ✅ Pre-Monorepo Structure Preparation (Completed)
185+
186+
- Validated surabaya-v1 state
187+
- Updated all paths
188+
- Tested workspace commands
189+
190+
**Phase 4**: ✅ Final Monorepo Restructuring (Completed)
183191

184-
**Phase 3**: Pre-Monorepo Structure Preparation
192+
- Consolidated Pro package
193+
- Merged CI systems
194+
- Updated publishing process
185195

186-
- Validate surabaya-v1 state
187-
- Update all paths
188-
- Test workspace commands
196+
**Phase 5**: ✅ Pro Node Renderer Package Extraction (Completed - PR #2069)
197+
198+
- Extracted node-renderer as separate workspace package
199+
- Updated build and publishing workflows
200+
- Verified CI/CD integration
201+
202+
## Future Phases
189203

190-
**Phase 4**: Final Monorepo Restructuring
204+
**Phase 6**: ⏳ Documentation & Polish (Planned)
191205

192-
- Consolidate Pro package
193-
- Merge CI systems
194-
- Update publishing process
206+
- Documentation consolidation
207+
- Developer experience improvements
208+
- Final polish and refinements
195209

196-
**Phases 5-7**: Unification, Polish, and Cleanup
210+
**Phase 7**: ⏳ Post-Migration Cleanup & Deprecation (Planned)
197211

198-
- Full CI/CD consolidation
199-
- Documentation updates
200212
- Legacy structure removal
213+
- Deprecation notices
214+
- Migration guide finalization
201215

202216
---
203217

204-
Last Updated: 2025-11-19
205-
Status: Ready for Phase 3 Planning
218+
Last Updated: 2025-11-20
219+
Status: Phase 5 Complete - Ready for Phase 6 Planning

.claude/docs/analysis/MONOREPO_MIGRATION_ANALYSIS.md

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,18 @@
22

33
## Executive Summary
44

5-
The React on Rails monorepo migration is currently in **Phase 2 (Git Merger) - COMPLETE** with the following status:
5+
The React on Rails monorepo migration is currently in **Phase 5 (Pro Node Renderer Package) - COMPLETE** with the following status:
66

7-
- Git repository merger completed successfully
8-
- Both open-source and Pro packages now exist in a single repository
9-
- Monorepo workspace structure partially migrated (conductor/surabaya-v1 branch shows full migration)
10-
- Main repository still uses legacy node_package structure
11-
- YALC publishing working in both configurations
12-
- CI/CD systems implemented for monorepo
7+
- Git repository merger completed successfully (Phase 2)
8+
- Pre-monorepo structure preparation completed (Phase 3)
9+
- Final monorepo restructuring completed (Phase 4)
10+
- Pro node-renderer package extracted as separate workspace (Phase 5)
11+
- Both open-source and Pro packages now exist in a single repository with workspace structure
12+
- Monorepo workspace structure fully implemented (conductor/surabaya-v1 branch)
13+
- YALC publishing working for all workspace packages
14+
- CI/CD systems implemented and optimized for monorepo
1315

14-
**Current State**: The master branch maintains backward compatibility with `node_package/` while conductor branches show the target monorepo structure with `packages/` workspace.
16+
**Current State**: The surabaya-v1 branch has the complete monorepo structure with `packages/` workspaces for react-on-rails, react-on-rails-pro, and react-on-rails-pro-node-renderer.
1517

1618
---
1719

@@ -215,15 +217,15 @@ task node_package: "node_package:build"
215217
### Monorepo Migration Plan
216218

217219
- **File**: `/docs/MONOREPO_MERGER_PLAN.md`
218-
- **Status**: Phase 2 - Git Merger (COMPLETE)
220+
- **Status**: Phase 5 - Pro Node Renderer Package (COMPLETE)
219221
- **Phases**:
220222
1. ✅ Pre-Merger Preparation (License Cleanup)
221223
2. ✅ Git Repository Merger (Completed - PR #1824)
222-
3. 🔄 Pre-Monorepo Structure Preparation (In Progress)
223-
4. Final Monorepo Restructuring
224-
5. ⏳ CI/CD & Tooling Unification
225-
6. ⏳ Documentation & Polish
226-
7. ⏳ Post-Migration Cleanup & Deprecation
224+
3. Pre-Monorepo Structure Preparation (COMPLETE)
225+
4. Final Monorepo Restructuring (COMPLETE)
226+
5. ✅ Pro Node Renderer Package (COMPLETE - PR #2069)
227+
6. ⏳ Documentation & Polish (PLANNED)
228+
7. ⏳ Post-Migration Cleanup & Deprecation (PLANNED)
227229

228230
### Related Documentation
229231

.github/workflows/pro-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ jobs:
163163

164164
- name: Build react-on-rails package (required for Pro eslint import resolution)
165165
working-directory: .
166-
run: yarn build
166+
run: yarn workspace react-on-rails-pro build
167167

168168
- name: Lint Ruby
169169
run: bundle exec rubocop --ignore-parent-exclusion

.github/workflows/pro-test-package-and-gem.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
# https://github.com/nodejs/node/issues/56010
100100
node-version: '22.11.0'
101101
cache: yarn
102-
cache-dependency-path: 'react_on_rails_pro/**/yarn.lock'
102+
cache-dependency-path: '**/yarn.lock'
103103

104104
- name: Print system information
105105
run: |
@@ -202,7 +202,7 @@ jobs:
202202
# https://github.com/nodejs/node/issues/56010
203203
node-version: '22.11.0'
204204
cache: yarn
205-
cache-dependency-path: 'react_on_rails_pro/**/yarn.lock'
205+
cache-dependency-path: '**/yarn.lock'
206206

207207
- name: Print system information
208208
run: |

0 commit comments

Comments
 (0)