chore(deps): react 19 stable (#151)

hi-ogawa · Dec 10, 2024 · f8624d7 · f8624d7
1 parent 3cbed11
commit f8624d7
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 71 deletions.
diff --git a/examples/child-process/src/entry-ssr.tsx b/examples/child-process/src/entry-ssr.tsx
@@ -26,7 +26,7 @@ export default async function handler(request: Request): Promise<Response> {
   const rscPromise = ReactClient.createFromReadableStream<StreamData>(
     rscStream1,
     {
-      ssrManifest: {},
+      serverConsumerManifest: {},
     },
   );
 

diff --git a/examples/child-process/tsconfig.json b/examples/child-process/tsconfig.json
@@ -10,7 +10,7 @@
     "module": "ESNext",
     "target": "ESNext",
     "lib": ["ESNext", "DOM"],
-    "types": ["vite/client", "react/experimental", "@types/bun"],
+    "types": ["vite/client", "@types/bun"],
     "jsx": "react-jsx"
   }
 }
diff --git a/examples/react-server/src/entry-browser.tsx b/examples/react-server/src/entry-browser.tsx
@@ -85,7 +85,7 @@ async function main() {
     ReactDOMClient.createRoot(document).render(reactRootEl);
   } else {
     // TODO: can we avoid await? (separate script stream?)
-    const formState = (await initialStreamData).actionResult;
+    const formState = (await initialStreamData).actionResult as any;
     React.startTransition(() => {
       ReactDOMClient.hydrateRoot(document, reactRootEl, {
         formState,

diff --git a/examples/react-server/src/entry-ssr.tsx b/examples/react-server/src/entry-ssr.tsx
@@ -31,9 +31,8 @@ async function renderHtml(request: Request, result: ReactServerHandlerResult) {
   const rscPromise = ReactClient.createFromReadableStream<StreamData>(
     rscStream1,
     {
-      ssrManifest: {
+      serverConsumerManifest: {
         moduleMap: createModuleMap(),
-        moduleLoading: null,
       },
     },
   );

diff --git a/examples/react-server/src/features/router/client.tsx b/examples/react-server/src/features/router/client.tsx
@@ -6,9 +6,9 @@ export function Link({
   activeProps,
   pendingProps,
   ...props
-}: JSX.IntrinsicElements["a"] & {
-  activeProps?: JSX.IntrinsicElements["a"];
-  pendingProps?: JSX.IntrinsicElements["a"];
+}: React.JSX.IntrinsicElements["a"] & {
+  activeProps?: React.JSX.IntrinsicElements["a"];
+  pendingProps?: React.JSX.IntrinsicElements["a"];
 }) {
   const { isPending, pathname } = useRouter();
 

diff --git a/examples/react-server/src/types/index.ts b/examples/react-server/src/types/index.ts
@@ -20,10 +20,11 @@ export type ModuleMap = {
   };
 };
 
-export interface SsrManifest {
+export interface ServerConsumerManifest {
   moduleMap: ModuleMap;
   // TODO
-  moduleLoading: null;
+  serverModuleMap?: unknown;
+  moduleLoading?: unknown;
 }
 
 export type WebpackRequire = (id: string) => Promise<unknown>;

diff --git a/examples/react-server/src/types/react-modules.d.ts b/examples/react-server/src/types/react-modules.d.ts
@@ -35,7 +35,7 @@ declare module "react-server-dom-webpack/server.edge" {
     actionResult: unknown,
     body: FormData,
     serverManifest?: unknown,
-  ): Promise<unknown>;
+  ): Promise<import("react-dom/client").ReactFormState | null>;
 }
 
 // https://github.com/facebook/react/blob/89021fb4ec9aa82194b0788566e736a4cedfc0e4/packages/react-server-dom-webpack/src/ReactFlightDOMClientEdge.js
@@ -48,7 +48,7 @@ declare module "react-server-dom-webpack/client.edge" {
   export function createFromReadableStream<T>(
     stream: ReadableStream<Uint8Array>,
     options: {
-      ssrManifest: import(".").SsrManifest;
+      serverConsumerManifest: import(".").ServerConsumerManifest;
     },
   ): Promise<T>;
 }

diff --git a/examples/react-server/src/types/react.ts b/examples/react-server/src/types/react.ts
@@ -6,13 +6,3 @@ declare module "react-dom/server" {
     formState: unknown;
   }
 }
-
-declare module "react-dom/client" {
-  interface HydrationOptions {
-    formState: unknown;
-  }
-
-  interface DO_NOT_USE_OR_YOU_WILL_BE_FIRED_EXPERIMENTAL_CREATE_ROOT_CONTAINERS {
-    Document: Document;
-  }
-}
diff --git a/examples/react-server/tsconfig.json b/examples/react-server/tsconfig.json
@@ -16,7 +16,7 @@
     "module": "ESNext",
     "target": "ESNext",
     "lib": ["ESNext", "DOM"],
-    "types": ["vite/client", "react/experimental"],
+    "types": ["vite/client"],
     "jsx": "react-jsx"
   }
 }
diff --git a/examples/web-worker-rsc/tsconfig.json b/examples/web-worker-rsc/tsconfig.json
@@ -9,7 +9,7 @@
     "module": "ESNext",
     "target": "ESNext",
     "lib": ["ESNext", "DOM"],
-    "types": ["vite/client", "react/experimental"],
+    "types": ["vite/client"],
     "jsx": "react-jsx"
   }
 }
diff --git a/package.json b/package.json
@@ -20,15 +20,15 @@
     "@playwright/test": "^1.45.2",
     "@tsconfig/strictest": "^2.0.5",
     "@types/node": "^20.14.11",
-    "@types/react": "^18.3.10",
-    "@types/react-dom": "^18.3.0",
+    "@types/react": "^19.0.1",
+    "@types/react-dom": "^19.0.2",
     "@vitejs/plugin-react": "^4.3.1",
     "esbuild": "^0.23.0",
     "magic-string": "^0.30.10",
     "miniflare": "^3.20240925.0",
-    "react": "19.0.0-rc-eb3ad065-20240822",
-    "react-dom": "19.0.0-rc-eb3ad065-20240822",
-    "react-server-dom-webpack": "19.0.0-rc-eb3ad065-20240822",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "react-server-dom-webpack": "^19.0.0",
     "tsup": "^8.1.2",
     "tsx": "^4.16.2",
     "typescript": "^5.5.3",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml