diff --git a/packages/next/src/build/webpack-config-rules/resolve.ts b/packages/next/src/build/webpack-config-rules/resolve.ts index ba70766248d40c..b9c546bc6ad789 100644 --- 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. 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 index 753cc8082cb831..1b3e2d0234d7d2 100644 --- 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', }, }) })