Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
6282423f
Unverified
Commit
6282423f
authored
Jun 17, 2024
by
Sebastian Silbermann
Committed by
GitHub
Jun 17, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove `worker` condition name when resolving files in the Edge runtime (#66808)
parent
aa54867e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
27 deletions
+22
-27
util.rs
packages/next-swc/crates/next-core/src/util.rs
+1
-1
resolve.ts
packages/next/src/build/webpack-config-rules/resolve.ts
+1
-6
import-conditions.test.ts
test/e2e/import-conditions/import-conditions.test.ts
+20
-20
No files found.
packages/next-swc/crates/next-core/src/util.rs
View file @
6282423f
...
...
@@ -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"
],
}
}
}
...
...
packages/next/src/build/webpack-config-rules/resolve.ts
View file @
6282423f
...
...
@@ -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'
],
}
...
...
test/e2e/import-conditions/import-conditions.test.ts
View file @
6282423f
...
...
@@ -22,8 +22,8 @@ describe('react version', () => {
}
expect
(
middlewareHeaders
).
toEqual
({
react
:
'react-server'
,
serverFavoringBrowser
:
'
work
er'
,
serverFavoringEdge
:
'
worker
'
,
serverFavoringBrowser
:
'
brows
er'
,
serverFavoringEdge
:
'
edge-light
'
,
})
})
...
...
@@ -34,8 +34,8 @@ describe('react version', () => {
expect
(
JSON
.
parse
(
json
)).
toEqual
({
server
:
{
react
:
'default'
,
serverFavoringBrowser
:
'
work
er'
,
serverFavoringEdge
:
'
worker
'
,
serverFavoringBrowser
:
'
brows
er'
,
serverFavoringEdge
:
'
edge-light
'
,
},
client
:
{
react
:
'default'
,
...
...
@@ -59,8 +59,8 @@ describe('react version', () => {
}
expect
(
middlewareHeaders
).
toEqual
({
react
:
'react-server'
,
serverFavoringBrowser
:
'
work
er'
,
serverFavoringEdge
:
'
worker
'
,
serverFavoringBrowser
:
'
brows
er'
,
serverFavoringEdge
:
'
edge-light
'
,
})
})
...
...
@@ -96,8 +96,8 @@ describe('react version', () => {
}
expect
(
middlewareHeaders
).
toEqual
({
react
:
'react-server'
,
serverFavoringBrowser
:
'
work
er'
,
serverFavoringEdge
:
'
worker
'
,
serverFavoringBrowser
:
'
brows
er'
,
serverFavoringEdge
:
'
edge-light
'
,
})
})
...
...
@@ -111,8 +111,8 @@ describe('react version', () => {
expect
(
JSON
.
parse
(
json
)).
toEqual
({
server
:
{
react
:
'react-server'
,
serverFavoringBrowser
:
'
work
er'
,
serverFavoringEdge
:
'
worker
'
,
serverFavoringBrowser
:
'
brows
er'
,
serverFavoringEdge
:
'
edge-light
'
,
},
client
:
{
react
:
'default'
,
...
...
@@ -121,8 +121,8 @@ describe('react version', () => {
},
action
:
{
react
:
'react-server'
,
serverFavoringBrowser
:
'
work
er'
,
serverFavoringEdge
:
'
worker
'
,
serverFavoringBrowser
:
'
brows
er'
,
serverFavoringEdge
:
'
edge-light
'
,
},
})
})
...
...
@@ -141,8 +141,8 @@ describe('react version', () => {
}
expect
(
middlewareHeaders
).
toEqual
({
react
:
'react-server'
,
serverFavoringBrowser
:
'
work
er'
,
serverFavoringEdge
:
'
worker
'
,
serverFavoringBrowser
:
'
brows
er'
,
serverFavoringEdge
:
'
edge-light
'
,
})
})
...
...
@@ -188,8 +188,8 @@ describe('react version', () => {
expect
({
middlewareHeaders
,
data
}).
toEqual
({
middlewareHeaders
:
{
react
:
'react-server'
,
serverFavoringBrowser
:
'
work
er'
,
serverFavoringEdge
:
'
worker
'
,
serverFavoringBrowser
:
'
brows
er'
,
serverFavoringEdge
:
'
edge-light
'
,
},
data
:
{
react
:
'react-server'
,
...
...
@@ -215,13 +215,13 @@ describe('react version', () => {
expect
({
middlewareHeaders
,
data
}).
toEqual
({
middlewareHeaders
:
{
react
:
'react-server'
,
serverFavoringBrowser
:
'
work
er'
,
serverFavoringEdge
:
'
worker
'
,
serverFavoringBrowser
:
'
brows
er'
,
serverFavoringEdge
:
'
edge-light
'
,
},
data
:
{
react
:
'react-server'
,
serverFavoringBrowser
:
'
work
er'
,
serverFavoringEdge
:
'
worker
'
,
serverFavoringBrowser
:
'
brows
er'
,
serverFavoringEdge
:
'
edge-light
'
,
},
})
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment