Replace react-server-dom-webpack with @shakacode-tools/react-on-rails-rsc

Author: AbanoubGhadban

jest.config.js

@@ -9,7 +9,7 @@ module.exports = {
   moduleNameMapper:
     nodeVersion < 18
       ? {
-          'react-server-dom-webpack/client': '<rootDir>/node_package/tests/emptyForTesting.js',
+          '@shakacode-tools/react-on-rails-rsc/client': '<rootDir>/node_package/tests/emptyForTesting.js',
           '^@testing-library/dom$': '<rootDir>/node_package/tests/emptyForTesting.js',
           '^@testing-library/react$': '<rootDir>/node_package/tests/emptyForTesting.js',
         }

knip.ts

@@ -8,8 +8,6 @@ const config: KnipConfig = {
         'node_package/src/ReactOnRails.ts!',
         'node_package/src/ReactOnRails.node.ts!',
         'node_package/src/ReactOnRailsRSC.ts!',
-        'node_package/src/RSCWebpackLoader.ts!',
-        'node_package/src/RSCWebpackPlugin.ts!',
         'node_package/src/registerServerComponent/client.ts!',
         'node_package/src/registerServerComponent/server.ts!',
         'node_package/src/RSCClientRoot.ts!',

node_package/src/RSCClientRoot.ts

@@ -2,7 +2,7 @@
 
 import * as React from 'react';
 import ReactDOMClient from 'react-dom/client';
-import RSDWClient from 'react-server-dom-webpack/client';
+import { createFromReadableStream } from '@shakacode-tools/react-on-rails-rsc/client';
 import { fetch } from './utils';
 import transformRSCStreamAndReplayConsoleLogs from './transformRSCStreamAndReplayConsoleLogs';
 import { RailsContext, RenderFunction } from './types';
@@ -26,7 +26,7 @@ const createFromFetch = async (fetchPromise: Promise<Response>) => {
     throw new Error('No stream found in response');
   }
   const transformedStream = transformRSCStreamAndReplayConsoleLogs(stream);
-  return RSDWClient.createFromReadableStream<React.ReactNode>(transformedStream);
+  return createFromReadableStream<React.ReactNode>(transformedStream);
 }
 
 const fetchRSC = ({ componentName, rscPayloadGenerationUrlPath, componentProps }: RSCClientRootProps) => {
@@ -46,7 +46,7 @@ const fetchRSC = ({ componentName, rscPayloadGenerationUrlPath, componentProps }
  * 4. Uses React.use() to handle the async data fetching
  *
  * @requires React 19+
- * @requires react-server-dom-webpack/client
+ * @requires @shakacode-tools/react-on-rails-rsc
  */
 const RSCClientRoot: RenderFunction = async ({
   componentName,

node_package/src/RSCWebpackLoader.ts

@@ -1,4 +1,4 @@
-import { renderToPipeableStream } from 'react-server-dom-webpack/server.node';
+import { renderToPipeableStream } from '@shakacode-tools/react-on-rails-rsc/server.node';
 import { PassThrough, Readable } from 'stream';
 import type { ReactElement } from 'react';
 

node_package/src/RSCWebpackPlugin.ts

@@ -8,8 +8,6 @@
       "node": "./node_package/lib/ReactOnRails.node.js",
       "default": "./node_package/lib/ReactOnRails.js"
     },
-    "./RSCWebpackLoader": "./node_package/lib/RSCWebpackLoader.js",
-    "./RSCWebpackPlugin": "./node_package/lib/RSCWebpackPlugin.js",
     "./registerServerComponent/client": "./node_package/lib/registerServerComponent/client.js",
     "./registerServerComponent/server": "./node_package/lib/registerServerComponent/server.js"
   },
@@ -48,15 +46,11 @@
     "prop-types": "^15.8.1",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "react-server-dom-webpack": "^19.0.0",
     "redux": "^4.2.1",
     "ts-jest": "^29.2.5",
     "typescript": "^5.6.2",
     "webpack": "^5.97.1"
   },
-  "dependencies": {
-    "react-server-dom-webpack": "^19.0.0"
-  },
   "peerDependencies": {
     "react": ">= 16",
     "react-dom": ">= 16"
@@ -99,5 +93,8 @@
     "url": "https://github.com/shakacode/react_on_rails/issues"
   },
   "homepage": "https://github.com/shakacode/react_on_rails#readme",
-  "packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+  "packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e",
+  "dependencies": {
+    "@shakacode-tools/react-on-rails-rsc": "git+https://github.com/shakacode/react_on_rails_rsc.git#main"
+  }
 }

node_package/src/ReactOnRailsRSC.ts

@@ -3,14 +3,23 @@
     "allowJs": true,
     "esModuleInterop": true,
     "jsx": "react-jsx",
-    "lib": ["dom", "es2015"],
-    "module": "CommonJS",
+    "lib": ["dom", "es2020"],
+    "module": "es2020",
+    "moduleResolution": "bundler",
     "noImplicitAny": true,
     "outDir": "node_package/lib",
     "strict": true,
     "incremental": true,
-    "target": "es5",
-    "typeRoots": ["./node_modules/@types", "./node_package/types"]
+    "target": "es2020",
+    "typeRoots": [
+      "./node_modules/@types",
+      "./node_modules/@shakacode-tools/react-on-rails-rsc/types",
+      "./node_package/types"
+    ]
   },
-  "include": ["node_package/src/**/*", "node_package/types/**/*"]
+  "include": [
+    "node_package/src/**/*",
+    "node_modules/@shakacode-tools/react-on-rails-rsc/types",
+    "node_package/types/**/*"
+  ]
 }

node_package/types/react-server-dom-webpack.d.ts

@@ -1580,6 +1580,12 @@
     "@nodelib/fs.scandir" "2.1.3"
     fastq "^1.6.0"
 
+"@shakacode-tools/react-on-rails-rsc@git+https://github.com/shakacode/react_on_rails_rsc.git#main":
+  version "19.0.0"
+  resolved "git+https://github.com/shakacode/react_on_rails_rsc.git#085be3967430c9a4fc941ff8356982dca1ff3b06"
+  dependencies:
+    react-server-dom-webpack "^19.0.0"
+
 "@sinclair/typebox@^0.27.8":
   version "0.27.8"
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
@@ -2078,12 +2084,7 @@ acorn@^8.1.0, acorn@^8.8.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
   integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
 
-acorn@^8.11.0:
-  version "8.12.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
-  integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
-
-acorn@^8.14.0, acorn@^8.8.2:
+acorn@^8.11.0, acorn@^8.14.0, acorn@^8.8.2:
   version "8.14.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0"
   integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==