Skip to content

Commit 92112f1

Browse files
update the merge plan
1 parent 4b49bfd commit 92112f1

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

docs/MONOREPO_MERGER_PLAN.md

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -352,35 +352,39 @@ After the initial merge, the following CI adjustments may be needed:
352352

353353
**Tasks:**
354354

355-
- [ ] Extract pro JS features from `packages/react-on-rails/src/pro/` to `packages/react-on-rails-pro/src/`
356-
- [ ] Create `packages/react-on-rails-pro/package.json` with `"license": "UNLICENSED"`
357-
- [ ] Move pro JS tests from `packages/react-on-rails/tests/` to `packages/react-on-rails-pro/tests/`
358-
- [ ] Update root workspace to include `packages/react-on-rails-pro`
359-
- [ ] Setup proper dependencies between core and pro packages
360-
- [ ] Update build configurations (pro package output will be at `packages/react-on-rails-pro/lib/`)
361-
- [ ] Update TypeScript configurations for both packages
362-
- [ ] Remove pro/ directory from `packages/react-on-rails/src/`
355+
- [x] Extract pro JS features from `packages/react-on-rails/src/pro/` to `packages/react-on-rails-pro/src/`
356+
- [x] Create `packages/react-on-rails-pro/package.json` with `"license": "UNLICENSED"`
357+
- [x] Move pro JS tests from `packages/react-on-rails/tests/` to `packages/react-on-rails-pro/tests/`
358+
- [x] Update root workspace to include `packages/react-on-rails-pro`
359+
- [x] Setup proper dependencies between core and pro packages
360+
- [x] Update build configurations (pro package output will be at `packages/react-on-rails-pro/lib/`)
361+
- [x] Update TypeScript configurations for both packages
362+
- [x] Remove pro/ directory from `packages/react-on-rails/src/`
363+
- [x] Update CHANGELOG.md with breaking changes about Pro package separation
364+
- [x] Configure CI to exclude internal exports (reactApis, ReactDOMServer) from type checking
365+
- [x] Implement type system improvements to remove excessive `any` types
366+
- [x] Fix formatting issues with Prettier
363367

364368
**License Compliance:**
365369

366-
- [ ] **CRITICAL: Update LICENSE.md to remove pro code from MIT package:**
370+
- [x] **CRITICAL: Update LICENSE.md to remove pro code from MIT package:**
367371

368372
```md
369373
## MIT License applies to:
370374

371-
- `lib/react_on_rails/` (including specs)
372-
- `packages/react-on-rails/` (including tests) - NOW EXCLUDES pro/ subdirectory
375+
- `lib/react_on_rails/` (excluding `lib/react_on_rails/pro/`)
376+
- `packages/react-on-rails/` (entire package)
373377

374378
## React on Rails Pro License applies to:
375379

376-
- `lib/react_on_rails_pro/` (including specs)
377-
- `packages/react-on-rails-pro/` (including tests) (NEW)
378-
- `react_on_rails_pro/` (remaining files)
380+
- `lib/react_on_rails/pro/`
381+
- `packages/react-on-rails-pro/` (entire package)
382+
- `react_on_rails_pro/` (entire directory)
379383
```
380384

381-
- [ ] Add Pro license headers to moved files
382-
- [ ] Verify react-on-rails-pro package has `"license": "UNLICENSED"` in package.json
383-
- [ ] Verify react-on-rails package no longer contains pro code
385+
- [x] Add Pro license headers to moved files
386+
- [x] Verify react-on-rails-pro package has `"license": "UNLICENSED"` in package.json
387+
- [x] Verify react-on-rails package no longer contains pro code
384388

385389
**Success Criteria:** ✅ All CI checks pass + Pro JS code cleanly separated + License boundaries established + Both NPM packages build independently
386390

docs/MONOREPO_MERGER_PLAN_REF.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ This plan outlines the 8-phase implementation for merging the `react_on_rails` a
1111
- Complete git history preservation
1212
- CI integrity at every step
1313

14-
**Status:** Phase 3 - Prepare Core Package for Workspace Structure (Complete) ✅
14+
**Status:** Phase 3 - PR #4: Split JS Pro Code to Separate Package (Complete) ✅
1515

1616
For implementation details, progress tracking, and specific tasks, refer to the main plan document.

0 commit comments

Comments
 (0)