Cleaner types

Author: eps1lon

packages/next/src/client/app-index.tsx

@@ -5,8 +5,9 @@ import '../next-devtools/userspace/app/app-dev-overlay-setup'
 
 import ReactDOMClient from 'react-dom/client'
 import React, { use } from 'react'
+// TODO: Explicitly import from client.browser
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { createFromReadableStream } from 'react-server-dom-webpack/client'
+import { createFromReadableStream as createFromReadableStreamBrowser } from 'react-server-dom-webpack/client'
 import { HeadManagerContext } from '../shared/lib/head-manager-context.shared-runtime'
 import { onRecoverableError } from './react-client-callbacks/on-recoverable-error'
 import {
@@ -28,6 +29,9 @@ import { isBot } from '../shared/lib/router/utils/is-bot'
 
 /// <reference types="react-dom/experimental" />
 
+const createFromReadableStream =
+  createFromReadableStreamBrowser as (typeof import('react-server-dom-webpack/client.browser'))['createFromReadableStream']
+
 const appElement: HTMLElement | Document = document
 
 const encoder = new TextEncoder()

packages/next/src/client/components/router-reducer/fetch-server-response.ts

@@ -1,8 +1,8 @@
 'use client'
 
-// @ts-ignore
+// TODO: Explicitly import from client.browser
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { createFromReadableStream } from 'react-server-dom-webpack/client'
+import { createFromReadableStream as createFromReadableStreamBrowser } from 'react-server-dom-webpack/client'
 
 import type {
   FlightRouterState,
@@ -32,6 +32,9 @@ import {
 import { getAppBuildId } from '../../app-build-id'
 import { setCacheBustingSearchParam } from './set-cache-busting-search-param'
 
+const createFromReadableStream =
+  createFromReadableStreamBrowser as (typeof import('react-server-dom-webpack/client.browser'))['createFromReadableStream']
+
 export interface FetchServerResponseOptions {
   readonly flightRouterState: FlightRouterState
   readonly nextUrl: string | null

packages/next/src/client/components/router-reducer/reducers/server-action-reducer.ts

@@ -13,10 +13,10 @@ import {
   RSC_CONTENT_TYPE_HEADER,
 } from '../../app-router-headers'
 
-// Import explicitly from .browser
+// TODO: Explicitly import from client.browser
 // eslint-disable-next-line import/no-extraneous-dependencies
 import {
-  createFromFetch,
+  createFromFetch as createFromFetchBrowser,
   createTemporaryReferenceSet,
   encodeReply,
 } from 'react-server-dom-webpack/client'
@@ -56,6 +56,9 @@ import {
 } from '../../../../shared/lib/server-reference-info'
 import { revalidateEntireCache } from '../../segment-cache'
 
+const createFromFetch =
+  createFromFetchBrowser as (typeof import('react-server-dom-webpack/client.browser'))['createFromFetch']
+
 type FetchServerActionResult = {
   redirectLocation: URL | undefined
   redirectType: RedirectType | undefined

packages/next/types/$$compiled.internal.d.ts

@@ -86,6 +86,36 @@ declare module 'react-server-dom-webpack/client' {
   ): Promise<string | FormData>
 }
 
+declare module 'react-server-dom-webpack/client.browser' {
+  import {
+    createTemporaryReferenceSet,
+    encodeReply,
+    type CallServerCallback,
+    type FindSourceMapURLCallback,
+    type TemporaryReferenceSet,
+  } from 'react-server-dom-webpack/client.edge'
+
+  export { createTemporaryReferenceSet, encodeReply }
+
+  export interface Options {
+    callServer?: CallServerCallback
+    environmentName?: string
+    findSourceMapURL?: FindSourceMapURLCallback
+    replayConsoleLogs?: boolean
+    temporaryReferences?: TemporaryReferenceSet
+  }
+
+  export function createFromFetch<T>(
+    promiseForResponse: Promise<Response>,
+    options?: Options
+  ): Promise<T>
+
+  export function createFromReadableStream<T>(
+    stream: ReadableStream,
+    options?: Options
+  ): Promise<T>
+}
+
 declare module 'react-server-dom-webpack/server.edge' {
   export type ImportManifestEntry = {
     id: string | number
@@ -246,7 +276,7 @@ declare module 'react-server-dom-webpack/static' {
 declare module 'react-server-dom-webpack/client.edge' {
   export interface Options {
     callServer?: CallServerCallback
-    serverConsumerManifest?: ServerConsumerManifest
+    serverConsumerManifest: ServerConsumerManifest
     nonce?: string
     encodeFormAction?: EncodeFormActionCallback
     temporaryReferences?: TemporaryReferenceSet