remove fields that based on import type

vercel · May 31, 2023 · ca1806a · ca1806a
1 parent 8cd8cee
commit ca1806a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/packages/next-swc/crates/next-core/src/next_edge/context.rs b/packages/next-swc/crates/next-core/src/next_edge/context.rs
@@ -93,10 +93,6 @@ pub async fn get_edge_resolve_options_context(
         custom_conditions: vec![
             "edge-light".to_string(),
             "worker".to_string(),
-            "browser".to_string(),
-            "import".to_string(),
-            "module".to_string(),
-            "default".to_string(),
             "development".to_string(),
         ],
         import_map: Some(next_edge_import_map),

diff --git a/packages/next/src/build/webpack-config.ts b/packages/next/src/build/webpack-config.ts
@@ -98,14 +98,7 @@ const asyncStoragesRegex =
   /next[\\/]dist[\\/]client[\\/]components[\\/](static-generation-async-storage|action-async-storage|request-async-storage)/
 
 // exports.<conditionName>
-const edgeConditionNames = [
-  'edge-light',
-  'worker',
-  'browser',
-  'import',
-  'module',
-  'default',
-]
+const edgeConditionNames = ['edge-light', 'worker', 'browser', 'module']
 
 // packageJson.<mainField>
 const mainFieldsPerCompiler: Record<CompilerNameValues, string[]> = {
@@ -919,7 +912,7 @@ export default async function getBaseWebpackConfig(
 
   const reactServerCondition = [
     'react-server',
-    ...(isEdgeServer ? edgeConditionNames : ['import', 'module', 'default']),
+    ...(isEdgeServer ? edgeConditionNames : ['module']),
   ]
 
   const clientEntries = isClient

diff --git a/test/e2e/app-dir/app-external/app-external.test.ts b/test/e2e/app-dir/app-external/app-external.test.ts
@@ -181,7 +181,7 @@ createNextDescribe(
         expect(html).toContain('CJS package: cjs-lib')
       })
 
-      it('should use the same react in server app', async () => {
+      it('should use the same react in edge server app', async () => {
         const html = await next.render('/esm/edge-server')
 
         const v1 = html.match(/App React Version: ([^<]+)</)[1]