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 · 62882fd · 62882fd
1 parent d898b77
commit 62882fd
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
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
@@ -3,6 +3,9 @@ import { nextTestSetup } from 'e2e-utils'
 describe('react version', () => {
   const { next } = nextTestSetup({
     files: __dirname,
+    dependencies: {
+      'library-with-exports': 'link:./library-with-exports',
+    },
   })
 
   it('Pages Router page headers with edge runtime', async () => {
@@ -19,8 +22,8 @@ describe('react version', () => {
     }
     expect(middlewareHeaders).toEqual({
       react: 'react-server',
-      serverFavoringBrowser: 'worker',
-      serverFavoringEdge: 'worker',
+      serverFavoringBrowser: 'browser',
+      serverFavoringEdge: 'edge-light',
     })
   })
 
@@ -31,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',
@@ -56,8 +59,8 @@ describe('react version', () => {
     }
     expect(middlewareHeaders).toEqual({
       react: 'react-server',
-      serverFavoringBrowser: 'worker',
-      serverFavoringEdge: 'worker',
+      serverFavoringBrowser: 'browser',
+      serverFavoringEdge: 'edge-light',
     })
   })
 
@@ -93,8 +96,8 @@ describe('react version', () => {
     }
     expect(middlewareHeaders).toEqual({
       react: 'react-server',
-      serverFavoringBrowser: 'worker',
-      serverFavoringEdge: 'worker',
+      serverFavoringBrowser: 'browser',
+      serverFavoringEdge: 'edge-light',
     })
   })
 
@@ -105,8 +108,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',
@@ -130,8 +133,8 @@ describe('react version', () => {
     }
     expect(middlewareHeaders).toEqual({
       react: 'react-server',
-      serverFavoringBrowser: 'worker',
-      serverFavoringEdge: 'worker',
+      serverFavoringBrowser: 'browser',
+      serverFavoringEdge: 'edge-light',
     })
   })
 
@@ -169,8 +172,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',
@@ -196,13 +199,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',
       },
     })
   })