From f1cc4c70c00ed554abce6f22a87c1728fded7b43 Mon Sep 17 00:00:00 2001
From: Josh Story <story@hey.com>
Date: Wed, 5 Oct 2022 14:27:47 -0700
Subject: [PATCH] Fix latest experimental react and experimental-edge and unpin
 test versions (#41200)

This ensures we don't stub `react-dom` with the `experimental-edge` runtime and also unpins our tests to use the latest experimental release.

Co-authored-by: JJ Kasper <22380829+ijjk@users.noreply.github.com>
---
 packages/next/build/webpack-config.ts     | 1 -
 test/e2e/app-dir/app-alias.test.ts        | 4 ++--
 test/e2e/app-dir/app-edge.test.ts         | 4 ++--
 test/e2e/app-dir/app-static.test.ts       | 4 ++--
 test/e2e/app-dir/asset-prefix.test.ts     | 4 ++--
 test/e2e/app-dir/index.test.ts            | 4 ++--
 test/e2e/app-dir/next-font.test.ts        | 4 ++--
 test/e2e/app-dir/prefetching.test.ts      | 4 ++--
 test/e2e/app-dir/rendering.test.ts        | 4 ++--
 test/e2e/app-dir/root-layout.test.ts      | 4 ++--
 test/e2e/app-dir/rsc-basic.test.ts        | 4 ++--
 test/e2e/app-dir/trailingslash.test.ts    | 4 ++--
 test/e2e/app-dir/vercel-analytics.test.ts | 4 ++--
 test/e2e/app-dir/with-babel.test.ts       | 4 ++--
 test/e2e/switchable-runtime/index.test.ts | 4 ++--
 15 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
index b9bfe119d0501..34e326b0bf485 100644
--- a/packages/next/build/webpack-config.ts
+++ b/packages/next/build/webpack-config.ts
@@ -1217,7 +1217,6 @@ export default async function getBaseWebpackConfig(
                       '{}',
                     './cjs/react-dom-server-legacy.browser.development.js':
                       '{}',
-                    'react-dom': '{}',
                   },
                   handleWebpackExternalForEdgeRuntime,
                 ]
diff --git a/test/e2e/app-dir/app-alias.test.ts b/test/e2e/app-dir/app-alias.test.ts
index f9201cbc7d7bc..e9634fb6ea0f3 100644
--- a/test/e2e/app-dir/app-alias.test.ts
+++ b/test/e2e/app-dir/app-alias.test.ts
@@ -20,8 +20,8 @@ describe('app-dir alias handling', () => {
     next = await createNext({
       files: new FileRef(path.join(__dirname, 'app-alias')),
       dependencies: {
-        react: '0.0.0-experimental-cb5084d1c-20220924',
-        'react-dom': '0.0.0-experimental-cb5084d1c-20220924',
+        react: 'experimental',
+        'react-dom': 'experimental',
         typescript: 'latest',
         '@types/react': 'latest',
         '@types/node': 'latest',
diff --git a/test/e2e/app-dir/app-edge.test.ts b/test/e2e/app-dir/app-edge.test.ts
index fc40aad53209e..3d7dcb496bab0 100644
--- a/test/e2e/app-dir/app-edge.test.ts
+++ b/test/e2e/app-dir/app-edge.test.ts
@@ -20,8 +20,8 @@ describe('app-dir edge SSR', () => {
     next = await createNext({
       files: new FileRef(path.join(__dirname, 'app-edge')),
       dependencies: {
-        react: '0.0.0-experimental-cb5084d1c-20220924',
-        'react-dom': '0.0.0-experimental-cb5084d1c-20220924',
+        react: 'experimental',
+        'react-dom': 'experimental',
         typescript: 'latest',
         '@types/react': 'latest',
         '@types/node': 'latest',
diff --git a/test/e2e/app-dir/app-static.test.ts b/test/e2e/app-dir/app-static.test.ts
index eefeb816668ac..953695f79d3d7 100644
--- a/test/e2e/app-dir/app-static.test.ts
+++ b/test/e2e/app-dir/app-static.test.ts
@@ -24,8 +24,8 @@ describe('app-dir static/dynamic handling', () => {
     next = await createNext({
       files: new FileRef(path.join(__dirname, 'app-static')),
       dependencies: {
-        react: '0.0.0-experimental-cb5084d1c-20220924',
-        'react-dom': '0.0.0-experimental-cb5084d1c-20220924',
+        react: 'experimental',
+        'react-dom': 'experimental',
       },
     })
   })
diff --git a/test/e2e/app-dir/asset-prefix.test.ts b/test/e2e/app-dir/asset-prefix.test.ts
index 317038c81986e..412ade3ce57ea 100644
--- a/test/e2e/app-dir/asset-prefix.test.ts
+++ b/test/e2e/app-dir/asset-prefix.test.ts
@@ -21,8 +21,8 @@ describe('app-dir assetPrefix handling', () => {
     next = await createNext({
       files: new FileRef(path.join(__dirname, 'asset-prefix')),
       dependencies: {
-        react: '0.0.0-experimental-cb5084d1c-20220924',
-        'react-dom': '0.0.0-experimental-cb5084d1c-20220924',
+        react: 'experimental',
+        'react-dom': 'experimental',
       },
       skipStart: true,
     })
diff --git a/test/e2e/app-dir/index.test.ts b/test/e2e/app-dir/index.test.ts
index 631a255ecb8a7..3d473a369f0ac 100644
--- a/test/e2e/app-dir/index.test.ts
+++ b/test/e2e/app-dir/index.test.ts
@@ -25,8 +25,8 @@ describe('app dir', () => {
       next = await createNext({
         files: new FileRef(path.join(__dirname, 'app')),
         dependencies: {
-          react: '0.0.0-experimental-cb5084d1c-20220924',
-          'react-dom': '0.0.0-experimental-cb5084d1c-20220924',
+          react: 'experimental',
+          'react-dom': 'experimental',
         },
         skipStart: true,
       })
diff --git a/test/e2e/app-dir/next-font.test.ts b/test/e2e/app-dir/next-font.test.ts
index 5999bf43a9e96..8aec3a553cd14 100644
--- a/test/e2e/app-dir/next-font.test.ts
+++ b/test/e2e/app-dir/next-font.test.ts
@@ -22,8 +22,8 @@ describe('app dir next-font', () => {
       files: new FileRef(path.join(__dirname, 'next-font')),
       dependencies: {
         '@next/font': 'canary',
-        react: '0.0.0-experimental-cb5084d1c-20220924',
-        'react-dom': '0.0.0-experimental-cb5084d1c-20220924',
+        react: 'experimental',
+        'react-dom': 'experimental',
       },
       skipStart: true,
     })
diff --git a/test/e2e/app-dir/prefetching.test.ts b/test/e2e/app-dir/prefetching.test.ts
index d13581a90b746..fceb94836e9c9 100644
--- a/test/e2e/app-dir/prefetching.test.ts
+++ b/test/e2e/app-dir/prefetching.test.ts
@@ -21,8 +21,8 @@ describe('app dir prefetching', () => {
     next = await createNext({
       files: new FileRef(path.join(__dirname, 'app-prefetch')),
       dependencies: {
-        react: '0.0.0-experimental-cb5084d1c-20220924',
-        'react-dom': '0.0.0-experimental-cb5084d1c-20220924',
+        react: 'experimental',
+        'react-dom': 'experimental',
       },
       skipStart: true,
     })
diff --git a/test/e2e/app-dir/rendering.test.ts b/test/e2e/app-dir/rendering.test.ts
index 530a28cfa20b1..494a8494eadd3 100644
--- a/test/e2e/app-dir/rendering.test.ts
+++ b/test/e2e/app-dir/rendering.test.ts
@@ -22,8 +22,8 @@ describe('app dir rendering', () => {
     next = await createNext({
       files: new FileRef(path.join(__dirname, 'app-rendering')),
       dependencies: {
-        react: '0.0.0-experimental-cb5084d1c-20220924',
-        'react-dom': '0.0.0-experimental-cb5084d1c-20220924',
+        react: 'experimental',
+        'react-dom': 'experimental',
       },
     })
   })
diff --git a/test/e2e/app-dir/root-layout.test.ts b/test/e2e/app-dir/root-layout.test.ts
index 6c74b8f4f020e..19c14c45944a1 100644
--- a/test/e2e/app-dir/root-layout.test.ts
+++ b/test/e2e/app-dir/root-layout.test.ts
@@ -27,8 +27,8 @@ describe('app-dir root layout', () => {
         ),
       },
       dependencies: {
-        react: '0.0.0-experimental-cb5084d1c-20220924',
-        'react-dom': '0.0.0-experimental-cb5084d1c-20220924',
+        react: 'experimental',
+        'react-dom': 'experimental',
       },
     })
   })
diff --git a/test/e2e/app-dir/rsc-basic.test.ts b/test/e2e/app-dir/rsc-basic.test.ts
index 1b1de1a54e4ad..273f6dd1acd66 100644
--- a/test/e2e/app-dir/rsc-basic.test.ts
+++ b/test/e2e/app-dir/rsc-basic.test.ts
@@ -39,8 +39,8 @@ describe('app dir - react server components', () => {
       files: new FileRef(path.join(__dirname, './rsc-basic')),
       dependencies: {
         'styled-components': '6.0.0-beta.2',
-        react: '0.0.0-experimental-cb5084d1c-20220924',
-        'react-dom': '0.0.0-experimental-cb5084d1c-20220924',
+        react: 'experimental',
+        'react-dom': 'experimental',
       },
       packageJson: {
         scripts: {
diff --git a/test/e2e/app-dir/trailingslash.test.ts b/test/e2e/app-dir/trailingslash.test.ts
index 168742722424a..0b8ca82f75532 100644
--- a/test/e2e/app-dir/trailingslash.test.ts
+++ b/test/e2e/app-dir/trailingslash.test.ts
@@ -21,8 +21,8 @@ describe('app-dir trailingSlash handling', () => {
     next = await createNext({
       files: new FileRef(path.join(__dirname, 'trailingslash')),
       dependencies: {
-        react: '0.0.0-experimental-cb5084d1c-20220924',
-        'react-dom': '0.0.0-experimental-cb5084d1c-20220924',
+        react: 'experimental',
+        'react-dom': 'experimental',
       },
       skipStart: true,
     })
diff --git a/test/e2e/app-dir/vercel-analytics.test.ts b/test/e2e/app-dir/vercel-analytics.test.ts
index 81ffa25cadf08..0e6e71d99b963 100644
--- a/test/e2e/app-dir/vercel-analytics.test.ts
+++ b/test/e2e/app-dir/vercel-analytics.test.ts
@@ -23,8 +23,8 @@ describe('vercel analytics', () => {
       next = await createNext({
         files: new FileRef(path.join(__dirname, 'app')),
         dependencies: {
-          react: '0.0.0-experimental-cb5084d1c-20220924',
-          'react-dom': '0.0.0-experimental-cb5084d1c-20220924',
+          react: 'experimental',
+          'react-dom': 'experimental',
         },
         skipStart: true,
         env: {
diff --git a/test/e2e/app-dir/with-babel.test.ts b/test/e2e/app-dir/with-babel.test.ts
index 0e46094cc2de4..6244e00c7ed62 100644
--- a/test/e2e/app-dir/with-babel.test.ts
+++ b/test/e2e/app-dir/with-babel.test.ts
@@ -20,8 +20,8 @@ describe('with babel', () => {
     next = await createNext({
       files: new FileRef(path.join(__dirname, 'with-babel')),
       dependencies: {
-        react: '0.0.0-experimental-cb5084d1c-20220924',
-        'react-dom': '0.0.0-experimental-cb5084d1c-20220924',
+        react: 'experimental',
+        'react-dom': 'experimental',
       },
     })
   })
diff --git a/test/e2e/switchable-runtime/index.test.ts b/test/e2e/switchable-runtime/index.test.ts
index 6bcbbf2a22695..59504dc20b3b1 100644
--- a/test/e2e/switchable-runtime/index.test.ts
+++ b/test/e2e/switchable-runtime/index.test.ts
@@ -52,8 +52,8 @@ describe('Switchable runtime', () => {
         'next.config.js': new FileRef(join(__dirname, './next.config.js')),
       },
       dependencies: {
-        react: '0.0.0-experimental-cb5084d1c-20220924',
-        'react-dom': '0.0.0-experimental-cb5084d1c-20220924',
+        react: 'experimental',
+        'react-dom': 'experimental',
       },
     })
     context = {