remove react dom legacy

vercel · Sep 27, 2023 · 9f8b4d8 · 9f8b4d8
1 parent 2ef5704
commit 9f8b4d8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/packages/next/src/build/noop-react-dom-server-legacy.ts b/packages/next/src/build/noop-react-dom-server-legacy.ts
@@ -0,0 +1,11 @@
+export function renderToString() {
+  throw new Error(
+    `renderToString() is not supported when importing 'react-dom/server.edge' or 'react-dom/server.browser', use 'react-dom/server' instead.`
+  )
+}
+
+export function renderToStaticMarkup() {
+  throw new Error(
+    `renderToStaticMarkup() is not supported when importing 'react-dom/server.edge' or 'react-dom/server.browser', use 'react-dom/server' instead.`
+  )
+}
diff --git a/packages/next/src/build/webpack-config.ts b/packages/next/src/build/webpack-config.ts
@@ -213,6 +213,9 @@ function createRSCAliases(
     'react-server-dom-webpack/client.edge$': `next/dist/compiled/react-server-dom-webpack${bundledReactChannel}/client.edge`,
     'react-server-dom-webpack/server.edge$': `next/dist/compiled/react-server-dom-webpack${bundledReactChannel}/server.edge`,
     'react-server-dom-webpack/server.node$': `next/dist/compiled/react-server-dom-webpack${bundledReactChannel}/server.node`,
+    // optimisations to ignore the legacy build of react-dom/server
+    './cjs/react-dom-server-legacy.browser.production.min.js': `next/dist/build/noop-react-dom-server-legacy`,
+    './cjs/react-dom-server-legacy.browser.development.js': `next/dist/build/noop-react-dom-server-legacy`,
   }
 
   if (!opts.isEdgeServer) {

diff --git a/packages/next/webpack.config.js b/packages/next/webpack.config.js
@@ -21,7 +21,7 @@ const pagesExternals = [
 ]
 
 function makeAppAliases(reactChannel = '') {
-  const alias = {
+  return {
     react$: `next/dist/compiled/react${reactChannel}`,
     'react/shared-subset$': `next/dist/compiled/react${reactChannel}/react.shared-subset`,
     'react-dom/server-rendering-stub$': `next/dist/compiled/react-dom${reactChannel}/server-rendering-stub`,
@@ -36,9 +36,10 @@ function makeAppAliases(reactChannel = '') {
     'react-server-dom-webpack/client.edge$': `next/dist/compiled/react-server-dom-webpack${reactChannel}/client.edge`,
     'react-server-dom-webpack/server.edge$': `next/dist/compiled/react-server-dom-webpack${reactChannel}/server.edge`,
     'react-server-dom-webpack/server.node$': `next/dist/compiled/react-server-dom-webpack${reactChannel}/server.node`,
+    // optimisations to ignore the legacy build of react-dom/server
+    './cjs/react-dom-server-legacy.browser.production.min.js': `next/dist/build/noop-react-dom-server-legacy`,
+    './cjs/react-dom-server-legacy.browser.development.js': `next/dist/build/noop-react-dom-server-legacy`,
   }
-
-  return alias
 }
 
 const appAliases = makeAppAliases()