archive/rsnext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Sebastian Silbermann 2024-06-17 18:00:23 +02:00 committed by GitHub
parent aa54867e4e
commit 6282423fd7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 22 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/next-swc/crates/next-core/src/util.rs
View file

@ -150,7 +150,7 @@ impl NextRuntime {
pub fn conditions(&self) -> &'static [&'static str] {
match self {
NextRuntime::NodeJs => &["node"],
NextRuntime::Edge => &["edge-light", "worker"],
NextRuntime::Edge => &["edge-light"],
}
}
}

7
packages/next/src/build/webpack-config-rules/resolve.ts
View file

@ -6,19 +6,14 @@ import {
// exports.<conditionName>
export const edgeConditionNames = [
'edge-light',
'worker',
// inherits the default conditions
'...',
]
const mainFieldsPerCompiler: Record<
CompilerNameValues | 'server-esm',
string[]
> = {
const mainFieldsPerCompiler = {
// For default case, prefer CJS over ESM on server side. e.g. pages dir SSR
[COMPILER_NAMES.server]: ['main', 'module'],
[COMPILER_NAMES.client]: ['browser', 'module', 'main'],
[COMPILER_NAMES.edgeServer]: edgeConditionNames,
// For bundling-all strategy, prefer ESM over CJS
'server-esm': ['module', 'main'],
}

40
test/e2e/import-conditions/import-conditions.test.ts
View file

@ -22,8 +22,8 @@ describe('react version', () => {
}
expect(middlewareHeaders).toEqual({
react: 'react-server',
serverFavoringBrowser: 'worker',
serverFavoringEdge: 'worker',
serverFavoringBrowser: 'browser',
serverFavoringEdge: 'edge-light',
})
})
@ -34,8 +34,8 @@ describe('react version', () => {
expect(JSON.parse(json)).toEqual({
server: {
react: 'default',
serverFavoringBrowser: 'worker',
serverFavoringEdge: 'worker',
serverFavoringBrowser: 'browser',
serverFavoringEdge: 'edge-light',
},
client: {
react: 'default',
@ -59,8 +59,8 @@ describe('react version', () => {
}
expect(middlewareHeaders).toEqual({
react: 'react-server',
serverFavoringBrowser: 'worker',
serverFavoringEdge: 'worker',
serverFavoringBrowser: 'browser',
serverFavoringEdge: 'edge-light',
})
})
@ -96,8 +96,8 @@ describe('react version', () => {
}
expect(middlewareHeaders).toEqual({
react: 'react-server',
serverFavoringBrowser: 'worker',
serverFavoringEdge: 'worker',
serverFavoringBrowser: 'browser',
serverFavoringEdge: 'edge-light',
})
})
@ -111,8 +111,8 @@ describe('react version', () => {
expect(JSON.parse(json)).toEqual({
server: {
react: 'react-server',
serverFavoringBrowser: 'worker',
serverFavoringEdge: 'worker',
serverFavoringBrowser: 'browser',
serverFavoringEdge: 'edge-light',
},
client: {
react: 'default',
@ -121,8 +121,8 @@ describe('react version', () => {
},
action: {
react: 'react-server',
serverFavoringBrowser: 'worker',
serverFavoringEdge: 'worker',
serverFavoringBrowser: 'browser',
serverFavoringEdge: 'edge-light',
},
})
})
@ -141,8 +141,8 @@ describe('react version', () => {
}
expect(middlewareHeaders).toEqual({
react: 'react-server',
serverFavoringBrowser: 'worker',
serverFavoringEdge: 'worker',
serverFavoringBrowser: 'browser',
serverFavoringEdge: 'edge-light',
})
})
@ -188,8 +188,8 @@ describe('react version', () => {
expect({ middlewareHeaders, data }).toEqual({
middlewareHeaders: {
react: 'react-server',
serverFavoringBrowser: 'worker',
serverFavoringEdge: 'worker',
serverFavoringBrowser: 'browser',
serverFavoringEdge: 'edge-light',
},
data: {
react: 'react-server',
@ -215,13 +215,13 @@ describe('react version', () => {
expect({ middlewareHeaders, data }).toEqual({
middlewareHeaders: {
react: 'react-server',
serverFavoringBrowser: 'worker',
serverFavoringEdge: 'worker',
serverFavoringBrowser: 'browser',
serverFavoringEdge: 'edge-light',
},
data: {
react: 'react-server',
serverFavoringBrowser: 'worker',
serverFavoringEdge: 'worker',
serverFavoringBrowser: 'browser',
serverFavoringEdge: 'edge-light',
},
})
})