Skip to content

Commit db13d5a

Browse files
committed
Stop using workerd
Vercel Edge Functions don't necessarily implement the same APIs as CF Workers. If a library supports both, the library has to provide entries for each in `exports`.
1 parent bad9862 commit db13d5a

File tree

3 files changed

+21
-22
lines changed

3 files changed

+21
-22
lines changed

packages/next-swc/crates/next-core/src/util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ impl NextRuntime {
150150
pub fn conditions(&self) -> &'static [&'static str] {
151151
match self {
152152
NextRuntime::NodeJs => &["node"],
153-
NextRuntime::Edge => &["edge-light", "worker"],
153+
NextRuntime::Edge => &["edge-light"],
154154
}
155155
}
156156
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {
66
// exports.<conditionName>
77
export const edgeConditionNames = [
88
'edge-light',
9-
'workerd',
109
// inherits the default conditions
1110
'...',
1211
]

test/e2e/import-conditions/import-conditions.test.ts

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ describe('react version', () => {
2222
}
2323
expect(middlewareHeaders).toEqual({
2424
react: 'react-server',
25-
serverFavoringBrowser: 'worker',
26-
serverFavoringEdge: 'worker',
25+
serverFavoringBrowser: 'browser',
26+
serverFavoringEdge: 'edge-light',
2727
})
2828
})
2929

@@ -34,8 +34,8 @@ describe('react version', () => {
3434
expect(JSON.parse(json)).toEqual({
3535
server: {
3636
react: 'default',
37-
serverFavoringBrowser: 'worker',
38-
serverFavoringEdge: 'worker',
37+
serverFavoringBrowser: 'browser',
38+
serverFavoringEdge: 'edge-light',
3939
},
4040
client: {
4141
react: 'default',
@@ -59,8 +59,8 @@ describe('react version', () => {
5959
}
6060
expect(middlewareHeaders).toEqual({
6161
react: 'react-server',
62-
serverFavoringBrowser: 'worker',
63-
serverFavoringEdge: 'worker',
62+
serverFavoringBrowser: 'browser',
63+
serverFavoringEdge: 'edge-light',
6464
})
6565
})
6666

@@ -96,8 +96,8 @@ describe('react version', () => {
9696
}
9797
expect(middlewareHeaders).toEqual({
9898
react: 'react-server',
99-
serverFavoringBrowser: 'worker',
100-
serverFavoringEdge: 'worker',
99+
serverFavoringBrowser: 'browser',
100+
serverFavoringEdge: 'edge-light',
101101
})
102102
})
103103

@@ -111,8 +111,8 @@ describe('react version', () => {
111111
expect(JSON.parse(json)).toEqual({
112112
server: {
113113
react: 'react-server',
114-
serverFavoringBrowser: 'worker',
115-
serverFavoringEdge: 'worker',
114+
serverFavoringBrowser: 'browser',
115+
serverFavoringEdge: 'edge-light',
116116
},
117117
client: {
118118
react: 'default',
@@ -121,8 +121,8 @@ describe('react version', () => {
121121
},
122122
action: {
123123
react: 'react-server',
124-
serverFavoringBrowser: 'worker',
125-
serverFavoringEdge: 'worker',
124+
serverFavoringBrowser: 'browser',
125+
serverFavoringEdge: 'edge-light',
126126
},
127127
})
128128
})
@@ -141,8 +141,8 @@ describe('react version', () => {
141141
}
142142
expect(middlewareHeaders).toEqual({
143143
react: 'react-server',
144-
serverFavoringBrowser: 'worker',
145-
serverFavoringEdge: 'worker',
144+
serverFavoringBrowser: 'browser',
145+
serverFavoringEdge: 'edge-light',
146146
})
147147
})
148148

@@ -188,8 +188,8 @@ describe('react version', () => {
188188
expect({ middlewareHeaders, data }).toEqual({
189189
middlewareHeaders: {
190190
react: 'react-server',
191-
serverFavoringBrowser: 'worker',
192-
serverFavoringEdge: 'worker',
191+
serverFavoringBrowser: 'browser',
192+
serverFavoringEdge: 'edge-light',
193193
},
194194
data: {
195195
react: 'react-server',
@@ -215,13 +215,13 @@ describe('react version', () => {
215215
expect({ middlewareHeaders, data }).toEqual({
216216
middlewareHeaders: {
217217
react: 'react-server',
218-
serverFavoringBrowser: 'worker',
219-
serverFavoringEdge: 'worker',
218+
serverFavoringBrowser: 'browser',
219+
serverFavoringEdge: 'edge-light',
220220
},
221221
data: {
222222
react: 'react-server',
223-
serverFavoringBrowser: 'worker',
224-
serverFavoringEdge: 'worker',
223+
serverFavoringBrowser: 'browser',
224+
serverFavoringEdge: 'edge-light',
225225
},
226226
})
227227
})

0 commit comments

Comments
 (0)