diff --git a/packages/next/src/build/shims/ReactDOMServerEdgeIfAvailable.d.ts b/packages/next/src/build/shims/ReactDOMServerEdgeIfAvailable.d.ts deleted file mode 100644 index 4d4f000bdf487..0000000000000 --- a/packages/next/src/build/shims/ReactDOMServerEdgeIfAvailable.d.ts +++ /dev/null @@ -1 +0,0 @@ -export * from 'react-dom/server.edge' diff --git a/packages/next/src/build/shims/ReactDOMServerEdgeIfAvailable.js b/packages/next/src/build/shims/ReactDOMServerEdgeIfAvailable.js deleted file mode 100644 index cbe329c9e4cb3..0000000000000 --- a/packages/next/src/build/shims/ReactDOMServerEdgeIfAvailable.js +++ /dev/null @@ -1,18 +0,0 @@ -let ReactDOMServer - -try { - ReactDOMServer = require('react-dom/server.edge') -} catch (error) { - if ( - // TODO: copilot suggestion. Does this code actually exist? - error.code !== 'MODULE_NOT_FOUND' && - // TODO: actually encountered that - error.code !== 'ERR_PACKAGE_PATH_NOT_EXPORTED' - ) { - throw error - } - // TOOD: Ensure App Router does not bundle this - ReactDOMServer = require('react-dom/server.browser') -} - -module.exports = ReactDOMServer diff --git a/packages/next/src/server/render.tsx b/packages/next/src/server/render.tsx index ce6c46cd61cdc..cd6bc2db0324e 100644 --- a/packages/next/src/server/render.tsx +++ b/packages/next/src/server/render.tsx @@ -40,7 +40,7 @@ import type { Revalidate, SwrDelta } from './lib/revalidate' import type { COMPILER_NAMES } from '../shared/lib/constants' import React, { type JSX } from 'react' -import ReactDOMServerEdge from '../build/shims/ReactDOMServerEdgeIfAvailable' +import ReactDOMServerBrowser from 'react-dom/server.browser' import { StyleRegistry, createStyleRegistry } from 'styled-jsx' import { GSP_NO_RETURNED_VALUE, @@ -127,7 +127,8 @@ function noRouter() { } async function renderToString(element: React.ReactElement) { - const renderStream = await ReactDOMServerEdge.renderToReadableStream(element) + const renderStream = + await ReactDOMServerBrowser.renderToReadableStream(element) await renderStream.allReady return streamToString(renderStream) } @@ -1322,7 +1323,7 @@ export async function renderToHTMLImpl( ) => { const content = renderContent(EnhancedApp, EnhancedComponent) return await renderToInitialFizzStream({ - ReactDOMServer: ReactDOMServerEdge, + ReactDOMServer: ReactDOMServerBrowser, element: content, }) } diff --git a/packages/next/types/react-dom.d.ts b/packages/next/types/react-dom.d.ts index 9b811922e4d55..7c11484f3bb36 100644 --- a/packages/next/types/react-dom.d.ts +++ b/packages/next/types/react-dom.d.ts @@ -70,6 +70,10 @@ declare module 'react-dom/server.edge' { > } +declare module 'react-dom/server.browser' { + export * from 'react-dom/server.edge' +} + declare module 'react-dom/static.edge' { import type { JSX } from 'react' /**