fix: upgrade react-server-dom-webpack

packages/runtime/render/package.json

@@ -29,7 +29,8 @@
   "dependencies": {
     "@modern-js/types": "workspace:*",
     "@modern-js/utils": "workspace:*",
-    "@swc/helpers": "^0.5.17"
+    "@swc/helpers": "^0.5.17",
+    "react-server-dom-webpack": "19.0.1"
   },
   "devDependencies": {
     "@rslib/core": "0.18.2",

packages/runtime/render/src/client/callServer.ts

@@ -1,8 +1,8 @@
-import type { ReactServerValue } from '@modern-js/utils/react-server-dom-webpack';
+import type { ReactServerValue } from 'react-server-dom-webpack';
 import {
   createFromFetch,
   encodeReply,
-} from '@modern-js/utils/react-server-dom-webpack/client.browser';
+} from 'react-server-dom-webpack/client.browser';
 
 class CallServerError extends Error {
   readonly #statusCode: number;

packages/runtime/render/src/client/index.tsx

@@ -1,13 +1,13 @@
+import React from 'react';
+import { type ReactNode, createContext, useState } from 'react';
 import {
   createFromReadableStream,
   createServerReference,
-} from '@modern-js/utils/react-server-dom-webpack/client.browser';
-import React from 'react';
-import { type ReactNode, createContext, useState } from 'react';
+} from 'react-server-dom-webpack/client.browser';
 export { rscStream } from '../rsc-html-stream/client';
 export { createFromReadableStream, createServerReference };
 export { callServer } from './callServer';
-export { createFromFetch } from '@modern-js/utils/react-server-dom-webpack/client.browser';
+export { createFromFetch } from 'react-server-dom-webpack/client.browser';
 
 declare global {
   interface Window {

packages/runtime/render/src/server/rsc/rsc.tsx

@@ -1,12 +1,12 @@
-export { renderToReadableStream } from '@modern-js/utils/react-server-dom-webpack/server.edge';
+export { renderToReadableStream } from 'react-server-dom-webpack/server.edge';
 import type { ClientManifest } from '@modern-js/types/server';
-import { renderToReadableStream } from '@modern-js/utils/react-server-dom-webpack/server.edge';
-import { decodeReply } from '@modern-js/utils/react-server-dom-webpack/server.edge';
-export { createFromReadableStream } from '@modern-js/utils/react-server-dom-webpack/client.edge';
+import { renderToReadableStream } from 'react-server-dom-webpack/server.edge';
+import { decodeReply } from 'react-server-dom-webpack/server.edge';
+export { createFromReadableStream } from 'react-server-dom-webpack/client.edge';
 export {
   registerClientReference,
   registerServerReference,
-} from '@modern-js/utils/react-server-dom-webpack/server';
+} from 'react-server-dom-webpack/server';
 
 declare const __webpack_require__: (path: string) => any;
 

packages/runtime/render/src/server/ssr/ssr.tsx

@@ -42,7 +42,7 @@ export const renderSSRStream = async (
     const [{ renderRsc }, { createFromReadableStream }, { injectRSCPayload }] =
       await Promise.all([
         import('../rsc'),
-        import('@modern-js/utils/react-server-dom-webpack/client.edge'),
+        import('react-server-dom-webpack/client.edge'),
         import('../../rsc-html-stream/server'),
       ]);
 

packages/runtime/render/src/types.d.ts

@@ -13,7 +13,7 @@ declare module 'react-dom/server.edge' {
   } from 'react-dom/server';
 }
 
-declare module '@modern-js/utils/react-server-dom-webpack' {
+declare module 'react-server-dom-webpack' {
   export type ReactServerValue =
     // References are passed by their value
     | ServerReference
@@ -31,23 +31,23 @@ declare module '@modern-js/utils/react-server-dom-webpack' {
     | Promise<ReactServerValue>;
 }
 
-declare module '@modern-js/utils/react-server-dom-webpack/server.edge' {
+declare module 'react-server-dom-webpack/server.edge' {
   export * from '@modern-js/types/server/rsc';
 }
-declare module '@modern-js/utils/react-server-dom-webpack/client.browser' {
+declare module 'react-server-dom-webpack/client.browser' {
   export * from '@modern-js/types/server/rsc';
 }
 
-declare module '@modern-js/utils/react-server-dom-webpack/client.edge' {
+declare module 'react-server-dom-webpack/client.edge' {
   export * from '@modern-js/types/server/rsc';
 }
 
-declare module '@modern-js/utils/react-server-dom-webpack/server' {
+declare module 'react-server-dom-webpack/server' {
   export * from '@modern-js/types/server/rsc';
 }
 
 // https://github.com/facebook/react/blob/2283d7204cfc200aa78b674d086a481c9a983007/packages/react-server-dom-esm/src/client/ReactFlightDOMClientBrowser.js
-declare module '@modern-js/utils/react-server-dom-webpack/client.browser' {
+declare module 'react-server-dom-webpack/client.browser' {
   import type { Thenable } from 'react';
 
   type CallServerCallback<A, T> = (id: string, args: A) => Promise<T>;
@@ -74,3 +74,70 @@ declare module '@modern-js/utils/react-server-dom-webpack/client.browser' {
     callServer: CallServerCallback,
   ): (...args: unknown[]) => Promise<unknown>;
 }
+
+declare module 'react-server-dom-webpack/server' {
+  export const registerClientReference: <T>(
+    proxyImplementation: any,
+    id: string,
+    exportName: string,
+  ) => ClientReference[];
+
+  export const registerServerReference: <T>(
+    proxyImplementation: any,
+    id: string,
+    exportName: string,
+  ) => ServerReference[];
+}
+
+declare module 'react-server-dom-webpack/server.edge' {
+  type Options = {
+    environmentName?: string;
+    identifierPrefix?: string;
+    signal?: AbortSignal;
+    temporaryReferences?: TemporaryReferenceSet;
+    onError?: ((error: unknown) => void) | undefined;
+    onPostpone?: ((reason: string) => void) | undefined;
+  };
+
+  export function renderToReadableStream(
+    model: ReactClientValue,
+    webpackMap: ClientManifest,
+    options?: Options,
+  ): ReadableStream;
+  export function decodeReply<T>(
+    body: string | FormData,
+    webpackMap?: ServerManifest,
+  ): Promise<T>;
+}
+
+declare module 'react-server-dom-webpack/client' {
+  type CallServerCallback = <T, A extends unknown[] = unknown[]>(
+    string,
+    args: A,
+  ) => Promise<T>;
+
+  type Options<T> = {
+    callServer?: CallServerCallback<T>;
+    temporaryReferences?: TemporaryReferenceSet;
+  };
+
+  export function createFromFetch<T>(
+    promiseForResponse: Promise<Response>,
+    options?: Options<T>,
+  ): Promise<T>;
+  export function encodeReply(
+    value: ReactServerValue,
+    options?: { temporaryReferences?: TemporaryReferenceSet },
+  ): Promise<string | URLSearchParams | FormData>;
+}
+
+declare module 'react-server-dom-webpack/client.edge' {
+  export type Options = {
+    ssrManifest: SSRManifest;
+    nonce?: string;
+  };
+  export function createFromReadableStream<T>(
+    stream: ReadableStream,
+    options: Options<T>,
+  ): Promise<T>;
+}

packages/toolkit/types/server/rsc.d.ts

@@ -52,70 +52,3 @@ export type ServerManifest = {
 export type ClientManifest = {
   [id: string]: ImportManifestEntry;
 };
-
-declare module '@modern-js/utils/react-server-dom-webpack/server' {
-  export const registerClientReference: <T>(
-    proxyImplementation: any,
-    id: string,
-    exportName: string,
-  ) => ClientReference[];
-
-  export const registerServerReference: <T>(
-    proxyImplementation: any,
-    id: string,
-    exportName: string,
-  ) => ServerReference[];
-}
-
-declare module '@modern-js/utils/react-server-dom-webpack/server.edge' {
-  type Options = {
-    environmentName?: string;
-    identifierPrefix?: string;
-    signal?: AbortSignal;
-    temporaryReferences?: TemporaryReferenceSet;
-    onError?: ((error: unknown) => void) | undefined;
-    onPostpone?: ((reason: string) => void) | undefined;
-  };
-
-  export function renderToReadableStream(
-    model: ReactClientValue,
-    webpackMap: ClientManifest,
-    options?: Options,
-  ): ReadableStream;
-  export function decodeReply<T>(
-    body: string | FormData,
-    webpackMap?: ServerManifest,
-  ): Promise<T>;
-}
-
-declare module '@modern-js/utils/react-server-dom-webpack/client' {
-  type CallServerCallback = <T, A extends unknown[] = unknown[]>(
-    string,
-    args: A,
-  ) => Promise<T>;
-
-  type Options<T> = {
-    callServer?: CallServerCallback<T>;
-    temporaryReferences?: TemporaryReferenceSet;
-  };
-
-  export function createFromFetch<T>(
-    promiseForResponse: Promise<Response>,
-    options?: Options<T>,
-  ): Promise<T>;
-  export function encodeReply(
-    value: ReactServerValue,
-    options?: { temporaryReferences?: TemporaryReferenceSet },
-  ): Promise<string | URLSearchParams | FormData>;
-}
-
-declare module '@modern-js/utils/react-server-dom-webpack/client.edge' {
-  export type Options = {
-    ssrManifest: SSRManifest;
-    nonce?: string;
-  };
-  export function createFromReadableStream<T>(
-    stream: ReadableStream,
-    options: Options<T>,
-  ): Promise<T>;
-}