Unverified Commit 14156098 authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

Reland bunling webpack middleware changes (#66049) (#66052)

Revert the revert in #66049 

It was erroring in pages api with importing `react-dom/server` as this
is disallowed in app but shouldn't be in pages. It's caused by we're
validating middleware layer as server components but edge pages api is
still bundled in the same layer, where we shouldn't apply the check.

* Separate the api in api layers, and while handling middleware
warnings, checking api layer as well
* No need to check layers while handling externals in edge compiler
* Found a bug that we shouldn't check if `config.transpilePackages` is
defined then we enable `externalDir`, removed that condition. It fails
the telemetry tests case build with code change from this PR.


Add more tests for pages dir and middleware

|  | `react` condition | `react-dom/server` condition |
| ---- | ---- | ---- |
| middleware (edge) | react-server | not allowed, failed with dev/build
checks |
| pages/api edge | default condition | default condition |
| pages/api node | default condition | default condition |
parent 1c83394d
...@@ -812,11 +812,14 @@ export function finalizeEntrypoint({ ...@@ -812,11 +812,14 @@ export function finalizeEntrypoint({
} }
} }
case COMPILER_NAMES.edgeServer: { case COMPILER_NAMES.edgeServer: {
const layer = isApi
? WEBPACK_LAYERS.api
: isMiddlewareFilename(name) || isInstrumentation
? WEBPACK_LAYERS.middleware
: undefined
return { return {
layer: layer,
isMiddlewareFilename(name) || isApi || isInstrumentation
? WEBPACK_LAYERS.middleware
: undefined,
library: { name: ['_ENTRIES', `middleware_[name]`], type: 'assign' }, library: { name: ['_ENTRIES', `middleware_[name]`], type: 'assign' },
runtime: EDGE_RUNTIME_WEBPACK, runtime: EDGE_RUNTIME_WEBPACK,
asyncChunks: false, asyncChunks: false,
......
...@@ -10,7 +10,7 @@ import { ...@@ -10,7 +10,7 @@ import {
NODE_ESM_RESOLVE_OPTIONS, NODE_ESM_RESOLVE_OPTIONS,
NODE_RESOLVE_OPTIONS, NODE_RESOLVE_OPTIONS,
} from './webpack-config' } from './webpack-config'
import { isWebpackAppLayer, isWebpackServerOnlyLayer } from './utils' import { isWebpackBundledLayer, isWebpackServerOnlyLayer } from './utils'
import { normalizePathSep } from '../shared/lib/page-path/normalize-path-sep' import { normalizePathSep } from '../shared/lib/page-path/normalize-path-sep'
const reactPackagesRegex = /^(react|react-dom|react-server-dom-webpack)($|\/)/ const reactPackagesRegex = /^(react|react-dom|react-server-dom-webpack)($|\/)/
...@@ -174,7 +174,7 @@ export function makeExternalHandler({ ...@@ -174,7 +174,7 @@ export function makeExternalHandler({
return `commonjs next/dist/lib/import-next-warning` return `commonjs next/dist/lib/import-next-warning`
} }
const isAppLayer = isWebpackAppLayer(layer) const isAppLayer = isWebpackBundledLayer(layer)
// Relative requires don't need custom resolution, because they // Relative requires don't need custom resolution, because they
// are relative to requests we've already resolved here. // are relative to requests we've already resolved here.
......
...@@ -2256,6 +2256,15 @@ export function getSupportedBrowsers( ...@@ -2256,6 +2256,15 @@ export function getSupportedBrowsers(
return MODERN_BROWSERSLIST_TARGET return MODERN_BROWSERSLIST_TARGET
} }
// Use next/dist/compiled/react packages instead of installed react
export function isWebpackBuiltinReactLayer(
layer: WebpackLayerName | null | undefined
): boolean {
return Boolean(
layer && WEBPACK_LAYERS.GROUP.builtinReact.includes(layer as any)
)
}
export function isWebpackServerOnlyLayer( export function isWebpackServerOnlyLayer(
layer: WebpackLayerName | null | undefined layer: WebpackLayerName | null | undefined
): boolean { ): boolean {
...@@ -2278,8 +2287,8 @@ export function isWebpackDefaultLayer( ...@@ -2278,8 +2287,8 @@ export function isWebpackDefaultLayer(
return layer === null || layer === undefined return layer === null || layer === undefined
} }
export function isWebpackAppLayer( export function isWebpackBundledLayer(
layer: WebpackLayerName | null | undefined layer: WebpackLayerName | null | undefined
): boolean { ): boolean {
return Boolean(layer && WEBPACK_LAYERS.GROUP.app.includes(layer as any)) return Boolean(layer && WEBPACK_LAYERS.GROUP.bundled.includes(layer as any))
} }
...@@ -9,7 +9,8 @@ import { escapeStringRegexp } from '../shared/lib/escape-regexp' ...@@ -9,7 +9,8 @@ import { escapeStringRegexp } from '../shared/lib/escape-regexp'
import { WEBPACK_LAYERS, WEBPACK_RESOURCE_QUERIES } from '../lib/constants' import { WEBPACK_LAYERS, WEBPACK_RESOURCE_QUERIES } from '../lib/constants'
import type { WebpackLayerName } from '../lib/constants' import type { WebpackLayerName } from '../lib/constants'
import { import {
isWebpackAppLayer, isWebpackBuiltinReactLayer,
isWebpackBundledLayer,
isWebpackClientOnlyLayer, isWebpackClientOnlyLayer,
isWebpackDefaultLayer, isWebpackDefaultLayer,
isWebpackServerOnlyLayer, isWebpackServerOnlyLayer,
...@@ -409,8 +410,7 @@ export default async function getBaseWebpackConfig( ...@@ -409,8 +410,7 @@ export default async function getBaseWebpackConfig(
loggedIgnoredCompilerOptions = true loggedIgnoredCompilerOptions = true
} }
const shouldIncludeExternalDirs = const shouldIncludeExternalDirs = config.experimental.externalDir
config.experimental.externalDir || !!config.transpilePackages
const codeCondition = { const codeCondition = {
test: { or: [/\.(tsx|ts|js|cjs|mjs|jsx)$/, /__barrel_optimize__/] }, test: { or: [/\.(tsx|ts|js|cjs|mjs|jsx)$/, /__barrel_optimize__/] },
...(shouldIncludeExternalDirs ...(shouldIncludeExternalDirs
...@@ -543,7 +543,7 @@ export default async function getBaseWebpackConfig( ...@@ -543,7 +543,7 @@ export default async function getBaseWebpackConfig(
// This will cause some performance overhead but // This will cause some performance overhead but
// acceptable as Babel will not be recommended. // acceptable as Babel will not be recommended.
getSwcLoader({ getSwcLoader({
serverComponents: false, serverComponents: true,
bundleLayer: WEBPACK_LAYERS.middleware, bundleLayer: WEBPACK_LAYERS.middleware,
}), }),
babelLoader, babelLoader,
...@@ -592,13 +592,12 @@ export default async function getBaseWebpackConfig( ...@@ -592,13 +592,12 @@ export default async function getBaseWebpackConfig(
// Loader for API routes needs to be differently configured as it shouldn't // Loader for API routes needs to be differently configured as it shouldn't
// have RSC transpiler enabled, so syntax checks such as invalid imports won't // have RSC transpiler enabled, so syntax checks such as invalid imports won't
// be performed. // be performed.
const apiRoutesLayerLoaders = const apiRoutesLayerLoaders = useSWCLoader
hasAppDir && useSWCLoader ? getSwcLoader({
? getSwcLoader({ serverComponents: false,
serverComponents: false, bundleLayer: WEBPACK_LAYERS.api,
bundleLayer: WEBPACK_LAYERS.api, })
}) : defaultLoaders.babel
: defaultLoaders.babel
const pageExtensions = config.pageExtensions const pageExtensions = config.pageExtensions
...@@ -1304,7 +1303,7 @@ export default async function getBaseWebpackConfig( ...@@ -1304,7 +1303,7 @@ export default async function getBaseWebpackConfig(
test: /next[\\/]dist[\\/](esm[\\/])?server[\\/]future[\\/]route-modules[\\/]app-page[\\/]module/, test: /next[\\/]dist[\\/](esm[\\/])?server[\\/]future[\\/]route-modules[\\/]app-page[\\/]module/,
}, },
{ {
issuerLayer: isWebpackAppLayer, issuerLayer: isWebpackBundledLayer,
resolve: { resolve: {
alias: createNextApiEsmAliases(), alias: createNextApiEsmAliases(),
}, },
...@@ -1326,7 +1325,7 @@ export default async function getBaseWebpackConfig( ...@@ -1326,7 +1325,7 @@ export default async function getBaseWebpackConfig(
...(hasAppDir && !isClient ...(hasAppDir && !isClient
? [ ? [
{ {
issuerLayer: isWebpackServerOnlyLayer, issuerLayer: isWebpackBuiltinReactLayer,
test: { test: {
// Resolve it if it is a source code file, and it has NOT been // Resolve it if it is a source code file, and it has NOT been
// opted out of bundling. // opted out of bundling.
...@@ -1388,7 +1387,7 @@ export default async function getBaseWebpackConfig( ...@@ -1388,7 +1387,7 @@ export default async function getBaseWebpackConfig(
// Alias react for switching between default set and share subset. // Alias react for switching between default set and share subset.
oneOf: [ oneOf: [
{ {
issuerLayer: isWebpackServerOnlyLayer, issuerLayer: isWebpackBuiltinReactLayer,
test: { test: {
// Resolve it if it is a source code file, and it has NOT been // Resolve it if it is a source code file, and it has NOT been
// opted out of bundling. // opted out of bundling.
...@@ -1469,11 +1468,17 @@ export default async function getBaseWebpackConfig( ...@@ -1469,11 +1468,17 @@ export default async function getBaseWebpackConfig(
test: codeCondition.test, test: codeCondition.test,
issuerLayer: WEBPACK_LAYERS.middleware, issuerLayer: WEBPACK_LAYERS.middleware,
use: middlewareLayerLoaders, use: middlewareLayerLoaders,
resolve: {
conditionNames: reactServerCondition,
},
}, },
{ {
test: codeCondition.test, test: codeCondition.test,
issuerLayer: WEBPACK_LAYERS.instrument, issuerLayer: WEBPACK_LAYERS.instrument,
use: instrumentLayerLoaders, use: instrumentLayerLoaders,
resolve: {
conditionNames: reactServerCondition,
},
}, },
...(hasAppDir ...(hasAppDir
? [ ? [
......
...@@ -28,7 +28,10 @@ import type { Telemetry } from '../../../telemetry/storage' ...@@ -28,7 +28,10 @@ import type { Telemetry } from '../../../telemetry/storage'
import { traceGlobals } from '../../../trace/shared' import { traceGlobals } from '../../../trace/shared'
import { EVENT_BUILD_FEATURE_USAGE } from '../../../telemetry/events' import { EVENT_BUILD_FEATURE_USAGE } from '../../../telemetry/events'
import { normalizeAppPath } from '../../../shared/lib/router/utils/app-paths' import { normalizeAppPath } from '../../../shared/lib/router/utils/app-paths'
import { INSTRUMENTATION_HOOK_FILENAME } from '../../../lib/constants' import {
INSTRUMENTATION_HOOK_FILENAME,
WEBPACK_LAYERS,
} from '../../../lib/constants'
import type { CustomRoutes } from '../../../lib/load-custom-routes' import type { CustomRoutes } from '../../../lib/load-custom-routes'
import { isInterceptionRouteRewrite } from '../../../lib/generate-interception-routes-rewrites' import { isInterceptionRouteRewrite } from '../../../lib/generate-interception-routes-rewrites'
import { getDynamicCodeEvaluationError } from './wellknown-errors-plugin/parse-dynamic-code-evaluation-error' import { getDynamicCodeEvaluationError } from './wellknown-errors-plugin/parse-dynamic-code-evaluation-error'
...@@ -272,7 +275,8 @@ function buildWebpackError({ ...@@ -272,7 +275,8 @@ function buildWebpackError({
} }
function isInMiddlewareLayer(parser: webpack.javascript.JavascriptParser) { function isInMiddlewareLayer(parser: webpack.javascript.JavascriptParser) {
return parser.state.module?.layer === 'middleware' const layer = parser.state.module?.layer
return layer === WEBPACK_LAYERS.middleware || layer === WEBPACK_LAYERS.api
} }
function isNodeJsModule(moduleName: string) { function isNodeJsModule(moduleName: string) {
...@@ -849,7 +853,8 @@ export async function handleWebpackExternalForEdgeRuntime({ ...@@ -849,7 +853,8 @@ export async function handleWebpackExternalForEdgeRuntime({
getResolve: () => any getResolve: () => any
}) { }) {
if ( if (
contextInfo.issuerLayer === 'middleware' && (contextInfo.issuerLayer === WEBPACK_LAYERS.middleware ||
contextInfo.issuerLayer === WEBPACK_LAYERS.api) &&
isNodeJsModule(request) && isNodeJsModule(request) &&
!supportedEdgePolyfills.has(request) !supportedEdgePolyfills.has(request)
) { ) {
......
...@@ -159,6 +159,11 @@ export type WebpackLayerName = ...@@ -159,6 +159,11 @@ export type WebpackLayerName =
const WEBPACK_LAYERS = { const WEBPACK_LAYERS = {
...WEBPACK_LAYERS_NAMES, ...WEBPACK_LAYERS_NAMES,
GROUP: { GROUP: {
builtinReact: [
WEBPACK_LAYERS_NAMES.reactServerComponents,
WEBPACK_LAYERS_NAMES.actionBrowser,
WEBPACK_LAYERS_NAMES.appMetadataRoute,
],
serverOnly: [ serverOnly: [
WEBPACK_LAYERS_NAMES.reactServerComponents, WEBPACK_LAYERS_NAMES.reactServerComponents,
WEBPACK_LAYERS_NAMES.actionBrowser, WEBPACK_LAYERS_NAMES.actionBrowser,
...@@ -174,7 +179,7 @@ const WEBPACK_LAYERS = { ...@@ -174,7 +179,7 @@ const WEBPACK_LAYERS = {
WEBPACK_LAYERS_NAMES.serverSideRendering, WEBPACK_LAYERS_NAMES.serverSideRendering,
WEBPACK_LAYERS_NAMES.appPagesBrowser, WEBPACK_LAYERS_NAMES.appPagesBrowser,
], ],
app: [ bundled: [
WEBPACK_LAYERS_NAMES.reactServerComponents, WEBPACK_LAYERS_NAMES.reactServerComponents,
WEBPACK_LAYERS_NAMES.actionBrowser, WEBPACK_LAYERS_NAMES.actionBrowser,
WEBPACK_LAYERS_NAMES.appMetadataRoute, WEBPACK_LAYERS_NAMES.appMetadataRoute,
......
import 'server-only' import 'server-only'
import React from 'react' import * as React from 'react'
import { NextResponse } from 'next/server' import { NextResponse } from 'next/server'
// import './lib/mixed-lib' // import './lib/mixed-lib'
export function middleware(request) { export function middleware(request) {
if (React.useState) { // To avoid webpack ESM exports checking warning
const ReactObject = Object(React)
if (ReactObject.useState) {
throw new Error('React.useState should not be defined in server layer') throw new Error('React.useState should not be defined in server layer')
} }
if (request.nextUrl.pathname === '/react-version') {
return Response.json({
React: Object.keys(ReactObject),
})
}
return NextResponse.next() return NextResponse.next()
} }
...@@ -4,6 +4,10 @@ import { getRedboxSource, hasRedbox, retry } from 'next-test-utils' ...@@ -4,6 +4,10 @@ import { getRedboxSource, hasRedbox, retry } from 'next-test-utils'
describe('module layer', () => { describe('module layer', () => {
const { next, isNextStart, isNextDev, isTurbopack } = nextTestSetup({ const { next, isNextStart, isNextDev, isTurbopack } = nextTestSetup({
files: __dirname, files: __dirname,
dependencies: {
react: '19.0.0-rc-915b914b3a-20240515',
'react-dom': '19.0.0-rc-915b914b3a-20240515',
},
}) })
function runTests() { function runTests() {
...@@ -18,8 +22,10 @@ describe('module layer', () => { ...@@ -18,8 +22,10 @@ describe('module layer', () => {
'/app/route', '/app/route',
'/app/route-edge', '/app/route-edge',
// pages/api // pages/api
'/api/hello', '/api/default',
'/api/hello-edge', '/api/default-edge',
'/api/server-only',
'/api/server-only-edge',
'/api/mixed', '/api/mixed',
] ]
...@@ -30,6 +36,35 @@ describe('module layer', () => { ...@@ -30,6 +36,35 @@ describe('module layer', () => {
}) })
} }
it('should render installed react-server condition for middleware', async () => {
const json = await next.fetch('/react-version').then((res) => res.json())
expect(json.React).toContain('version') // basic react-server export
expect(json.React).not.toContain('useEffect') // no client api export
})
// This is for backward compatibility, don't change react usage in existing pages/api
it('should contain client react exports for pages api', async () => {
async function verifyReactExports(route, isEdge) {
const json = await next.fetch(route).then((res) => res.json())
// contain all react-server and default condition exports
expect(json.React).toContain('version')
expect(json.React).toContain('useEffect')
// contain react-dom-server default condition exports
expect(json.ReactDomServer).toContain('version')
expect(json.ReactDomServer).toContain('renderToString')
expect(json.ReactDomServer).toContain('renderToStaticMarkup')
expect(json.ReactDomServer).toContain(
isEdge ? 'renderToReadableStream' : 'renderToPipeableStream'
)
}
await verifyReactExports('/api/default', false)
await verifyReactExports('/api/default-edge', true)
await verifyReactExports('/api/server-only', false)
await verifyReactExports('/api/server-only-edge', true)
})
if (isNextStart) { if (isNextStart) {
it('should log the build info properly', async () => { it('should log the build info properly', async () => {
const cliOutput = next.cliOutput const cliOutput = next.cliOutput
...@@ -40,7 +75,8 @@ describe('module layer', () => { ...@@ -40,7 +75,8 @@ describe('module layer', () => {
) )
expect(functionsManifest.functions).toContainKeys([ expect(functionsManifest.functions).toContainKeys([
'/app/route-edge', '/app/route-edge',
'/api/hello-edge', '/api/default-edge',
'/api/server-only-edge',
'/app/client-edge', '/app/client-edge',
'/app/server-edge', '/app/server-edge',
]) ])
...@@ -52,9 +88,10 @@ describe('module layer', () => { ...@@ -52,9 +88,10 @@ describe('module layer', () => {
) )
expect(middlewareManifest.middleware).toBeTruthy() expect(middlewareManifest.middleware).toBeTruthy()
expect(pagesManifest).toContainKeys([ expect(pagesManifest).toContainKeys([
'/api/hello-edge', '/api/default-edge',
'/pages-ssr', '/pages-ssr',
'/api/hello', '/api/default',
'/api/server-only',
]) ])
}) })
} }
...@@ -81,22 +118,15 @@ describe('module layer', () => { ...@@ -81,22 +118,15 @@ describe('module layer', () => {
.replace("// import './lib/mixed-lib'", "import './lib/mixed-lib'") .replace("// import './lib/mixed-lib'", "import './lib/mixed-lib'")
) )
const existingCliOutputLength = next.cliOutput.length
await retry(async () => { await retry(async () => {
expect(await hasRedbox(browser)).toBe(true) expect(await hasRedbox(browser)).toBe(true)
const source = await getRedboxSource(browser) const source = await getRedboxSource(browser)
expect(source).toContain( expect(source).toContain(
`'client-only' cannot be imported from a Server Component module. It should only be used from a Client Component.` isTurbopack
? `'client-only' cannot be imported from a Server Component module. It should only be used from a Client Component.`
: `You're importing a component that imports client-only. It only works in a Client Component but none of its parents are marked with "use client"`
) )
}) })
if (!isTurbopack) {
const newCliOutput = next.cliOutput.slice(existingCliOutputLength)
expect(newCliOutput).toContain('./middleware.js')
expect(newCliOutput).toContain(
`'client-only' cannot be imported from a Server Component module. It should only be used from a Client Component`
)
}
}) })
}) })
} }
......
import * as ReactDomServer from 'react-dom/server'
import * as React from 'react'
export default async (_req) => {
return Response.json({
React: Object.keys(Object(React)),
ReactDomServer: Object.keys(Object(ReactDomServer)),
})
}
export const runtime = 'edge'
import * as ReactDomServer from 'react-dom/server'
import * as React from 'react'
export default async (_req, res) => {
return res.json({
React: Object.keys(Object(React)),
ReactDomServer: Object.keys(Object(ReactDomServer)),
})
}
import 'server-only'
export default function handler() {
return new Response('pages/api/hello-edge.js:')
}
export const runtime = 'edge'
import 'server-only'
export default function handler(req, res) {
return res.send('pages/api/hello.js')
}
import 'server-only'
import * as ReactDomServer from 'react-dom/server'
import * as React from 'react'
export default async (_req) => {
return Response.json({
React: Object.keys(Object(React)),
ReactDomServer: Object.keys(Object(ReactDomServer)),
})
}
export const runtime = 'edge'
import 'server-only'
import * as ReactDomServer from 'react-dom/server'
import * as React from 'react'
export default async (_req, res) => {
return res.json({
React: Object.keys(Object(React)),
ReactDomServer: Object.keys(Object(ReactDomServer)),
})
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment