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`.
vercel · Jun 13, 2024 · b2e1cbb · b2e1cbb
1 parent b0532be
commit b2e1cbb
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/packages/next-swc/crates/next-core/src/util.rs b/packages/next-swc/crates/next-core/src/util.rs
@@ -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"],
         }
     }
 }

diff --git a/packages/next/src/build/webpack-config-rules/resolve.ts b/packages/next/src/build/webpack-config-rules/resolve.ts
@@ -6,7 +6,6 @@ import {
 // exports.<conditionName>
 export const edgeConditionNames = [
   'edge-light',
-  'workerd',
   // inherits the default conditions
   '...',
 ]

diff --git a/test/e2e/import-conditions/import-conditions.test.ts b/test/e2e/import-conditions/import-conditions.test.ts
@@ -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',
       },
     })
   })