Unverified Commit 6282423f authored by Sebastian Silbermann's avatar Sebastian Silbermann Committed by GitHub

Remove `worker` condition name when resolving files in the Edge runtime (#66808)

parent aa54867e
...@@ -150,7 +150,7 @@ impl NextRuntime { ...@@ -150,7 +150,7 @@ impl NextRuntime {
pub fn conditions(&self) -> &'static [&'static str] { pub fn conditions(&self) -> &'static [&'static str] {
match self { match self {
NextRuntime::NodeJs => &["node"], NextRuntime::NodeJs => &["node"],
NextRuntime::Edge => &["edge-light", "worker"], NextRuntime::Edge => &["edge-light"],
} }
} }
} }
......
...@@ -6,19 +6,14 @@ import { ...@@ -6,19 +6,14 @@ import {
// exports.<conditionName> // exports.<conditionName>
export const edgeConditionNames = [ export const edgeConditionNames = [
'edge-light', 'edge-light',
'worker',
// inherits the default conditions // inherits the default conditions
'...', '...',
] ]
const mainFieldsPerCompiler: Record< const mainFieldsPerCompiler = {
CompilerNameValues | 'server-esm',
string[]
> = {
// For default case, prefer CJS over ESM on server side. e.g. pages dir SSR // For default case, prefer CJS over ESM on server side. e.g. pages dir SSR
[COMPILER_NAMES.server]: ['main', 'module'], [COMPILER_NAMES.server]: ['main', 'module'],
[COMPILER_NAMES.client]: ['browser', 'module', 'main'], [COMPILER_NAMES.client]: ['browser', 'module', 'main'],
[COMPILER_NAMES.edgeServer]: edgeConditionNames,
// For bundling-all strategy, prefer ESM over CJS // For bundling-all strategy, prefer ESM over CJS
'server-esm': ['module', 'main'], 'server-esm': ['module', 'main'],
} }
......
...@@ -22,8 +22,8 @@ describe('react version', () => { ...@@ -22,8 +22,8 @@ describe('react version', () => {
} }
expect(middlewareHeaders).toEqual({ expect(middlewareHeaders).toEqual({
react: 'react-server', react: 'react-server',
serverFavoringBrowser: 'worker', serverFavoringBrowser: 'browser',
serverFavoringEdge: 'worker', serverFavoringEdge: 'edge-light',
}) })
}) })
...@@ -34,8 +34,8 @@ describe('react version', () => { ...@@ -34,8 +34,8 @@ describe('react version', () => {
expect(JSON.parse(json)).toEqual({ expect(JSON.parse(json)).toEqual({
server: { server: {
react: 'default', react: 'default',
serverFavoringBrowser: 'worker', serverFavoringBrowser: 'browser',
serverFavoringEdge: 'worker', serverFavoringEdge: 'edge-light',
}, },
client: { client: {
react: 'default', react: 'default',
...@@ -59,8 +59,8 @@ describe('react version', () => { ...@@ -59,8 +59,8 @@ describe('react version', () => {
} }
expect(middlewareHeaders).toEqual({ expect(middlewareHeaders).toEqual({
react: 'react-server', react: 'react-server',
serverFavoringBrowser: 'worker', serverFavoringBrowser: 'browser',
serverFavoringEdge: 'worker', serverFavoringEdge: 'edge-light',
}) })
}) })
...@@ -96,8 +96,8 @@ describe('react version', () => { ...@@ -96,8 +96,8 @@ describe('react version', () => {
} }
expect(middlewareHeaders).toEqual({ expect(middlewareHeaders).toEqual({
react: 'react-server', react: 'react-server',
serverFavoringBrowser: 'worker', serverFavoringBrowser: 'browser',
serverFavoringEdge: 'worker', serverFavoringEdge: 'edge-light',
}) })
}) })
...@@ -111,8 +111,8 @@ describe('react version', () => { ...@@ -111,8 +111,8 @@ describe('react version', () => {
expect(JSON.parse(json)).toEqual({ expect(JSON.parse(json)).toEqual({
server: { server: {
react: 'react-server', react: 'react-server',
serverFavoringBrowser: 'worker', serverFavoringBrowser: 'browser',
serverFavoringEdge: 'worker', serverFavoringEdge: 'edge-light',
}, },
client: { client: {
react: 'default', react: 'default',
...@@ -121,8 +121,8 @@ describe('react version', () => { ...@@ -121,8 +121,8 @@ describe('react version', () => {
}, },
action: { action: {
react: 'react-server', react: 'react-server',
serverFavoringBrowser: 'worker', serverFavoringBrowser: 'browser',
serverFavoringEdge: 'worker', serverFavoringEdge: 'edge-light',
}, },
}) })
}) })
...@@ -141,8 +141,8 @@ describe('react version', () => { ...@@ -141,8 +141,8 @@ describe('react version', () => {
} }
expect(middlewareHeaders).toEqual({ expect(middlewareHeaders).toEqual({
react: 'react-server', react: 'react-server',
serverFavoringBrowser: 'worker', serverFavoringBrowser: 'browser',
serverFavoringEdge: 'worker', serverFavoringEdge: 'edge-light',
}) })
}) })
...@@ -188,8 +188,8 @@ describe('react version', () => { ...@@ -188,8 +188,8 @@ describe('react version', () => {
expect({ middlewareHeaders, data }).toEqual({ expect({ middlewareHeaders, data }).toEqual({
middlewareHeaders: { middlewareHeaders: {
react: 'react-server', react: 'react-server',
serverFavoringBrowser: 'worker', serverFavoringBrowser: 'browser',
serverFavoringEdge: 'worker', serverFavoringEdge: 'edge-light',
}, },
data: { data: {
react: 'react-server', react: 'react-server',
...@@ -215,13 +215,13 @@ describe('react version', () => { ...@@ -215,13 +215,13 @@ describe('react version', () => {
expect({ middlewareHeaders, data }).toEqual({ expect({ middlewareHeaders, data }).toEqual({
middlewareHeaders: { middlewareHeaders: {
react: 'react-server', react: 'react-server',
serverFavoringBrowser: 'worker', serverFavoringBrowser: 'browser',
serverFavoringEdge: 'worker', serverFavoringEdge: 'edge-light',
}, },
data: { data: {
react: 'react-server', react: 'react-server',
serverFavoringBrowser: 'worker', serverFavoringBrowser: 'browser',
serverFavoringEdge: 'worker', serverFavoringEdge: 'edge-light',
}, },
}) })
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment