chore: fix types

hi-ogawa · Dec 10, 2024 · c743266 · c743266
1 parent e8b6a7c
commit c743266
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 19 deletions.
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
@@ -23,7 +23,8 @@ export type ModuleMap = {
 export interface SsrManifest {
   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(".").SsrManifest;
     },
   ): 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;
-  }
-}