From 7805532aeb5ddcfe8a442a56946cbc2b07af5da0 Mon Sep 17 00:00:00 2001
From: Shu Ding <g@shud.in>
Date: Fri, 17 Feb 2023 22:08:08 +0100
Subject: [PATCH 1/3] fix conditions

---
 packages/next/src/build/webpack-config.ts | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/next/src/build/webpack-config.ts b/packages/next/src/build/webpack-config.ts
index 9f03654422687..e54455a24af9b 100644
--- a/packages/next/src/build/webpack-config.ts
+++ b/packages/next/src/build/webpack-config.ts
@@ -903,7 +903,13 @@ export default async function getBaseWebpackConfig(
   const mainFieldsPerCompiler: Record<typeof compilerType, string[]> = {
     [COMPILER_NAMES.server]: ['main', 'module'],
     [COMPILER_NAMES.client]: ['browser', 'module', 'main'],
-    [COMPILER_NAMES.edgeServer]: ['edge-light', 'browser', 'module', 'main'],
+    [COMPILER_NAMES.edgeServer]: [
+      'edge-light',
+      'browser',
+      'worker',
+      'module',
+      'main',
+    ],
   }
 
   const reactDir = path.dirname(require.resolve('react/package.json'))
@@ -1022,7 +1028,9 @@ export default async function getBaseWebpackConfig(
         }
       : undefined),
     mainFields: mainFieldsPerCompiler[compilerType],
-    ...(isEdgeServer && { conditionNames: ['edge-light', 'import', 'node'] }),
+    ...(isEdgeServer && {
+      conditionNames: mainFieldsPerCompiler[COMPILER_NAMES.edgeServer],
+    }),
     plugins: [],
   }
 
@@ -1724,7 +1732,11 @@ export default async function getBaseWebpackConfig(
                 resolve: {
                   conditionNames: [
                     'react-server',
-                    ...(!isEdgeServer ? [] : ['edge-light']),
+                    ...mainFieldsPerCompiler[
+                      isEdgeServer
+                        ? COMPILER_NAMES.edgeServer
+                        : COMPILER_NAMES.server
+                    ],
                     'node',
                     'import',
                     'require',

From c8991e275e2f9dfdbbe52427c3a49fa28cc4b181 Mon Sep 17 00:00:00 2001
From: Shu Ding <g@shud.in>
Date: Fri, 17 Feb 2023 22:37:05 +0100
Subject: [PATCH 2/3] Apply suggestions from code review

---
 packages/next/src/build/webpack-config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/next/src/build/webpack-config.ts b/packages/next/src/build/webpack-config.ts
index e54455a24af9b..45d3644db8423 100644
--- a/packages/next/src/build/webpack-config.ts
+++ b/packages/next/src/build/webpack-config.ts
@@ -905,8 +905,8 @@ export default async function getBaseWebpackConfig(
     [COMPILER_NAMES.client]: ['browser', 'module', 'main'],
     [COMPILER_NAMES.edgeServer]: [
       'edge-light',
-      'browser',
       'worker',
+      'browser',
       'module',
       'main',
     ],

From 36e6ba0bbd9064de7cab125a912bcc33d6fddb40 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Fri, 17 Feb 2023 21:54:13 -0800
Subject: [PATCH 3/3] fix condition names

---
 packages/next/src/build/webpack-config.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/next/src/build/webpack-config.ts b/packages/next/src/build/webpack-config.ts
index 7af17005f6aba..562799750e8f9 100644
--- a/packages/next/src/build/webpack-config.ts
+++ b/packages/next/src/build/webpack-config.ts
@@ -1028,7 +1028,11 @@ export default async function getBaseWebpackConfig(
       : undefined),
     mainFields: mainFieldsPerCompiler[compilerType],
     ...(isEdgeServer && {
-      conditionNames: mainFieldsPerCompiler[COMPILER_NAMES.edgeServer],
+      conditionNames: [
+        ...mainFieldsPerCompiler[COMPILER_NAMES.edgeServer],
+        'import',
+        'node',
+      ],
     }),
     plugins: [],
   }