Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
Jun 17, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c66851
Set `workerd` condition name instead of `worker`
eps1lon Jun 12, 2024
905a9a7
Stop using edge condition names as main fields
eps1lon Jun 12, 2024
f085c7a
Stop using `workerd`
eps1lon Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/next-swc/crates/next-core/src/util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
}
}
}
Expand Down
7 changes: 1 addition & 6 deletions packages/next/src/build/webpack-config-rules/resolve.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,14 @@ import {
// exports.<conditionName>
export const edgeConditionNames = [
'edge-light',
'worker',
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was originally used as a main field and then moved in a035224#diff-5f441142eb8ba9bcba515aa36fbc420a113307bd191e54a4e9e6c43529fc2613 to a condition. worker is a known main field but edge-light probably never was?

I also removed the usage of edgeConditionNames as mainFields because it's unused and they're different concepts anyway.

// 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'],
}
Expand Down
40 changes: 20 additions & 20 deletions test/e2e/import-conditions/import-conditions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ describe('react version', () => {
}
expect(middlewareHeaders).toEqual({
react: 'react-server',
serverFavoringBrowser: 'worker',
serverFavoringEdge: 'worker',
serverFavoringBrowser: 'browser',
serverFavoringEdge: 'edge-light',
})
})

Expand All @@ -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',
Expand All @@ -59,8 +59,8 @@ describe('react version', () => {
}
expect(middlewareHeaders).toEqual({
react: 'react-server',
serverFavoringBrowser: 'worker',
serverFavoringEdge: 'worker',
serverFavoringBrowser: 'browser',
serverFavoringEdge: 'edge-light',
})
})

Expand Down Expand Up @@ -96,8 +96,8 @@ describe('react version', () => {
}
expect(middlewareHeaders).toEqual({
react: 'react-server',
serverFavoringBrowser: 'worker',
serverFavoringEdge: 'worker',
serverFavoringBrowser: 'browser',
serverFavoringEdge: 'edge-light',
})
})

Expand All @@ -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',
Expand All @@ -121,8 +121,8 @@ describe('react version', () => {
},
action: {
react: 'react-server',
serverFavoringBrowser: 'worker',
serverFavoringEdge: 'worker',
serverFavoringBrowser: 'browser',
serverFavoringEdge: 'edge-light',
},
})
})
Expand All @@ -141,8 +141,8 @@ describe('react version', () => {
}
expect(middlewareHeaders).toEqual({
react: 'react-server',
serverFavoringBrowser: 'worker',
serverFavoringEdge: 'worker',
serverFavoringBrowser: 'browser',
serverFavoringEdge: 'edge-light',
})
})

Expand Down Expand Up @@ -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',
Expand All @@ -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',
},
})
})
Expand Down
Loading