Phase 3: Prepare core package for workspace structure

.github/workflows/lint-js-and-ruby.yml

@@ -45,7 +45,7 @@ jobs:
           yarn install --no-progress --no-emoji --frozen-lockfile
           sudo yarn global add yalc
       - name: yalc publish for react-on-rails
-        run: yalc publish
+        run: cd packages/react-on-rails && yalc publish
       - name: yalc add react-on-rails
         run: cd spec/dummy && yalc add react-on-rails
       - name: Install Node modules with Yarn for dummy app
@@ -81,12 +81,12 @@ jobs:
       - name: Type-check TypeScript
         run: yarn run type-check
       - name: Pack for attw and publint
-        run: yarn pack -f react-on-rails.tgz
+        run: cd packages/react-on-rails && yarn pack -f react-on-rails.tgz
       - name: Lint package types
         # our package is ESM-only
-        run: yarn run attw react-on-rails.tgz --profile esm-only
+        run: yarn run attw packages/react-on-rails/react-on-rails.tgz --profile esm-only
       - name: Lint package publishing
-        run: yarn run publint --strict react-on-rails.tgz
+        run: yarn run publint --strict packages/react-on-rails/react-on-rails.tgz
       # We only download and run Actionlint if there is any difference in GitHub Action workflows
       # https://github.com/rhysd/actionlint/blob/main/docs/usage.md#on-github-actions
       - name: Check GitHub Action changes

.github/workflows/main.yml

@@ -61,7 +61,7 @@ jobs:
           yarn install --no-progress --no-emoji ${{ matrix.dependency-level == 'latest' && '--frozen-lockfile' || '' }}
           sudo yarn global add yalc
       - name: yalc publish for react-on-rails
-        run: yalc publish
+        run: cd packages/react-on-rails && yalc publish
       - name: yalc add react-on-rails
         run: cd spec/dummy && yalc add react-on-rails
       - name: Install Node modules with Yarn for dummy app
@@ -159,7 +159,7 @@ jobs:
           yarn install --no-progress --no-emoji ${{ matrix.dependency-level == 'latest' && '--frozen-lockfile' || '' }}
           sudo yarn global add yalc
       - name: yalc publish for react-on-rails
-        run: yalc publish
+        run: cd packages/react-on-rails && yalc publish
       - name: yalc add react-on-rails
         run: cd spec/dummy && yalc add react-on-rails
       - name: Install Node modules with Yarn for dummy app

.gitignore

@@ -20,7 +20,7 @@ tmp/
 
 node_modules
 
-/node_package/lib
+/packages/*/lib
 
 yarn-debug.*
 yarn-error.*

.prettierignore

@@ -6,7 +6,7 @@ tmp/
 coverage/
 **/app/assets/webpack/
 gen-examples/examples/*
-node_package/lib/*
+packages/*/lib/*
 spec/react_on_rails/dummy-for-generators/app/javascript/bundles/HelloWorld/*
 bundle/
 spec/dummy/lib/bs/**

LICENSE.md

@@ -12,7 +12,7 @@ This repository contains code under two different licenses:
 The following directories and all their contents are licensed under the **MIT License** (see full text below):
 
 - `lib/react_on_rails/` (excluding `lib/react_on_rails/pro/`)
-- `node_package/src/` (excluding `node_package/src/pro/`)
+- `packages/react-on-rails/` (excluding `packages/react-on-rails/src/pro/`)
 - `node_package/lib/` (excluding `node_package/lib/pro/`)
 - All other directories in this repository not explicitly listed as Pro-licensed
 
@@ -21,7 +21,7 @@ The following directories and all their contents are licensed under the **MIT Li
 The following directories and all their contents are licensed under the **React on Rails Pro License**:
 
 - `lib/react_on_rails/pro/`
-- `node_package/src/pro/`
+- `packages/react-on-rails/src/pro/`
 - `node_package/lib/pro/`
 - `react_on_rails_pro/` (entire directory)
 

eslint.config.ts

@@ -19,7 +19,7 @@ const config = tsEslint.config([
   includeIgnoreFile(path.resolve(__dirname, '.gitignore')),
   globalIgnores([
     // compiled code
-    'node_package/lib/',
+    'packages/*/lib/',
     // pro package (has its own linting)
     'react_on_rails_pro/',
     // used for tests only
@@ -145,7 +145,13 @@ const config = tsEslint.config([
     },
   },
   {
-    files: ['node_package/**/*'],
+    files: ['packages/**/*'],
+    rules: {
+      'import/extensions': ['error', 'ignorePackages'],
+    },
+  },
+  {
+    files: ['packages/react-on-rails/src/**/*'],
     rules: {
       'import/extensions': ['error', 'ignorePackages'],
     },
@@ -176,7 +182,7 @@ const config = tsEslint.config([
     languageOptions: {
       parserOptions: {
         projectService: {
-          allowDefaultProject: ['eslint.config.ts', 'knip.ts', 'node_package/tests/*.test.{ts,tsx}'],
+          allowDefaultProject: ['eslint.config.ts', 'knip.ts', 'packages/*/tests/*.test.{ts,tsx}'],
           // Needed because `import * as ... from` instead of `import ... from` doesn't work in this file
           // for some imports.
           defaultProject: 'tsconfig.eslint.json',
@@ -211,7 +217,7 @@ const config = tsEslint.config([
     },
   },
   {
-    files: ['node_package/tests/**', '**/*.test.{js,jsx,ts,tsx}'],
+    files: ['packages/*/tests/**', '**/*.test.{js,jsx,ts,tsx}'],
 
     extends: [
       jest.configs['flat/recommended'],

jest.config.base.js

@@ -0,0 +1,27 @@
+import { createJsWithTsPreset } from 'ts-jest';
+
+// Global Jest configuration for the monorepo
+// Contains common settings that all packages inherit
+export default {
+  // === TypeScript Configuration ===
+  // ts-jest preset with custom TypeScript settings
+  ...createJsWithTsPreset({
+    tsconfig: {
+      // Relative imports in our TS code include `.ts` extensions.
+      // When compiling the package, TS rewrites them to `.js`,
+      // but ts-jest runs on the original code where the `.js` files don't exist,
+      // so this setting needs to be disabled here.
+      rewriteRelativeImportExtensions: false,
+    },
+  }),
+
+  // === Test Environment Configuration ===
+  testEnvironment: 'jsdom',
+
+  // === Common Test Patterns ===
+  // Default test pattern - packages can override this
+  testMatch: ['**/?(*.)+(spec|test).[jt]s?(x)'],
+
+  // === Common Module File Extensions ===
+  moduleFileExtensions: ['js', 'jsx', 'ts', 'tsx', 'json'],
+};

knip.ts

@@ -3,52 +3,18 @@ import type { KnipConfig } from 'knip';
 const config: KnipConfig = {
   // ! at the end means files are used in production
   workspaces: {
+    // Root workspace - manages the monorepo and global tooling
     '.': {
-      entry: [
-        'node_package/src/ReactOnRails.node.ts!',
-        'node_package/src/pro/ReactOnRailsRSC.ts!',
-        'node_package/src/pro/registerServerComponent/client.tsx!',
-        'node_package/src/pro/registerServerComponent/server.tsx!',
-        'node_package/src/pro/registerServerComponent/server.rsc.ts!',
-        'node_package/src/pro/wrapServerComponentRenderer/server.tsx!',
-        'node_package/src/pro/wrapServerComponentRenderer/server.rsc.tsx!',
-        'node_package/src/pro/RSCRoute.tsx!',
-        'node_package/src/pro/ServerComponentFetchError.ts!',
-        'node_package/src/pro/getReactServerComponent.server.ts!',
-        'node_package/src/pro/transformRSCNodeStream.ts!',
-        'node_package/src/loadJsonFile.ts!',
-        'eslint.config.ts',
-      ],
-      project: [
-        'node_package/src/**/*.[jt]s{x,}!',
-        'node_package/tests/**/*.[jt]s{x,}',
-        '!react_on_rails_pro/**',
-      ],
-      babel: {
-        config: ['node_package/babel.config.js'],
-      },
-      ignore: [
-        'node_package/tests/emptyForTesting.js',
-        // Pro features exported for external consumption
-        'node_package/src/pro/streamServerRenderedReactComponent.ts:transformRenderStreamChunksToResultObject',
-        'node_package/src/pro/streamServerRenderedReactComponent.ts:streamServerRenderedComponent',
-        'node_package/src/pro/ServerComponentFetchError.ts:isServerComponentFetchError',
-        'node_package/src/pro/RSCRoute.tsx:RSCRouteProps',
-        'node_package/src/pro/streamServerRenderedReactComponent.ts:StreamingTrackers',
-        // Exclude entire pro directory - it has its own package.json with dependencies
-        'react_on_rails_pro/**',
-      ],
+      entry: ['eslint.config.ts'],
+      project: ['*.{js,mjs,ts}'],
       ignoreBinaries: [
-        // Knip fails to detect it's declared in devDependencies
-        'nps',
-        // local scripts
-        'node_package/scripts/.*',
+        // Has to be installed globally
+        'yalc',
       ],
+      ignore: ['react_on_rails_pro/**'],
       ignoreDependencies: [
         // Required for TypeScript compilation, but we don't depend on Turbolinks itself.
         '@types/turbolinks',
-        // Keep this even though knip doesn't detect usage
-        '@babel/preset-typescript',
         // The Knip ESLint plugin fails to detect these are transitively required by a config,
         // though we don't actually use its rules anywhere.
         '@babel/eslint-parser',
@@ -69,6 +35,39 @@ const config: KnipConfig = {
         'react-on-rails-rsc',
       ],
     },
+
+    // React on Rails core package workspace
+    'packages/react-on-rails': {
+      entry: [
+        'src/ReactOnRails.node.ts!',
+        'src/pro/ReactOnRailsRSC.ts!',
+        'src/pro/registerServerComponent/client.tsx!',
+        'src/pro/registerServerComponent/server.tsx!',
+        'src/pro/registerServerComponent/server.rsc.ts!',
+        'src/pro/wrapServerComponentRenderer/server.tsx!',
+        'src/pro/wrapServerComponentRenderer/server.rsc.tsx!',
+        'src/pro/RSCRoute.tsx!',
+        'src/pro/ServerComponentFetchError.ts!',
+        'src/pro/getReactServerComponent.server.ts!',
+        'src/pro/transformRSCNodeStream.ts!',
+        'src/loadJsonFile.ts!',
+      ],
+      project: ['src/**/*.[jt]s{x,}!', 'tests/**/*.[jt]s{x,}', '!lib/**'],
+      ignore: [
+        'tests/emptyForTesting.js',
+        // Jest setup and test utilities - not detected by Jest plugin in workspace setup
+        'tests/jest.setup.js',
+        'tests/testUtils.js',
+        // Build output directories that should be ignored
+        'lib/**',
+        // Pro features exported for external consumption
+        'src/pro/streamServerRenderedReactComponent.ts:transformRenderStreamChunksToResultObject',
+        'src/pro/streamServerRenderedReactComponent.ts:streamServerRenderedComponent',
+        'src/pro/ServerComponentFetchError.ts:isServerComponentFetchError',
+        'src/pro/RSCRoute.tsx:RSCRouteProps',
+        'src/pro/streamServerRenderedReactComponent.ts:StreamingTrackers',
+      ],
+    },
     'spec/dummy': {
       entry: [
         'app/assets/config/manifest.js!',

package-scripts.yml

@@ -25,9 +25,9 @@ scripts:
       # 3. Check if the project is built now;
       # 4. If it failed, print an error message (still follow https://docs.npmjs.com/cli/v8/using-npm/scripts#best-practices).
       script: >
-        [ -f node_package/lib/ReactOnRails.full.js ] ||
+        [ -f packages/react-on-rails/lib/ReactOnRails.full.js ] ||
           (npm run build >/dev/null 2>&1 || true) &&
-          [ -f node_package/lib/ReactOnRails.full.js ] ||
+          [ -f packages/react-on-rails/lib/ReactOnRails.full.js ] ||
           { echo 'Building react-on-rails seems to have failed!'; }
 
   format:

package.json

@@ -1,30 +1,12 @@
 {
-  "name": "react-on-rails",
+  "name": "react-on-rails-workspace",
   "version": "16.1.1",
-  "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
-  "main": "node_package/lib/ReactOnRails.full.js",
+  "description": "react-on-rails monorepo workspace manager",
+  "private": true,
   "type": "module",
-  "exports": {
-    ".": {
-      "react-server": "./node_package/lib/pro/ReactOnRailsRSC.js",
-      "node": "./node_package/lib/ReactOnRails.node.js",
-      "default": "./node_package/lib/ReactOnRails.full.js"
-    },
-    "./client": "./node_package/lib/ReactOnRails.client.js",
-    "./registerServerComponent/client": "./node_package/lib/pro/registerServerComponent/client.js",
-    "./registerServerComponent/server": {
-      "react-server": "./node_package/lib/pro/registerServerComponent/server.rsc.js",
-      "default": "./node_package/lib/pro/registerServerComponent/server.js"
-    },
-    "./wrapServerComponentRenderer/client": "./node_package/lib/pro/wrapServerComponentRenderer/client.js",
-    "./wrapServerComponentRenderer/server": {
-      "react-server": "./node_package/lib/pro/wrapServerComponentRenderer/server.rsc.js",
-      "default": "./node_package/lib/pro/wrapServerComponentRenderer/server.js"
-    },
-    "./RSCRoute": "./node_package/lib/pro/RSCRoute.js",
-    "./RSCProvider": "./node_package/lib/pro/RSCProvider.js",
-    "./ServerComponentFetchError": "./node_package/lib/pro/ServerComponentFetchError.js"
-  },
+  "workspaces": [
+    "packages/react-on-rails"
+  ],
   "directories": {
     "doc": "docs"
   },
@@ -75,34 +57,21 @@
     "typescript": "^5.8.3",
     "typescript-eslint": "^8.35.0"
   },
-  "peerDependencies": {
-    "react": ">= 16",
-    "react-dom": ">= 16",
-    "react-on-rails-rsc": "19.0.2"
-  },
-  "peerDependenciesMeta": {
-    "react-on-rails-rsc": {
-      "optional": true
-    }
-  },
-  "files": [
-    "node_package/lib"
-  ],
   "scripts": {
-    "test": "jest node_package/tests",
-    "clean": "rm -rf node_package/lib",
-    "start": "nps",
-    "prepack": "nps build.prepack",
-    "prepare": "nps build.prepack",
-    "prepublishOnly": "yarn run build",
-    "build": "yarn run clean && yarn run tsc --declaration",
-    "build-watch": "yarn run clean && yarn run tsc --watch",
+    "test": "yarn workspaces run test",
+    "clean": "yarn workspaces run clean",
+    "start": "yarn workspaces run start",
+    "build": "yarn workspaces run build",
+    "build-watch": "yarn workspaces run build-watch",
     "lint": "nps eslint",
-    "check": "yarn run lint && yarn run test && yarn run type-check",
-    "type-check": "yarn run tsc --noEmit --noErrorTruncation",
-    "release:patch": "node_package/scripts/release patch",
-    "release:minor": "node_package/scripts/release minor",
-    "release:major": "node_package/scripts/release major",
+    "check": "yarn run lint && yarn workspaces run check",
+    "type-check": "yarn workspaces run type-check",
+    "yalc:publish": "yarn workspaces run yalc:publish",
+    "yalc": "yarn workspaces run yalc",
+    "publish": "yarn workspaces run publish",
+    "release:patch": "yarn workspaces run release:patch",
+    "release:minor": "yarn workspaces run release:minor",
+    "release:major": "yarn workspaces run release:major",
     "postinstall": "test -f .lefthook.yml && test -d .git && command -v bundle >/dev/null 2>&1 && bundle exec lefthook install || true"
   },
   "repository": {