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

Fix react packages are not bundled for metadata routes (#55579)

`isAppLayer` condition was missing `app-metadata-route` layer, made it
as a util now like other webpack layer utils, add metadata route layer
to the group. Then `React.cache` can be available there.

Also update regex to be compatible across platform

Fixes #55561 
Closes NEXT-1635
parent bad53655
...@@ -2131,3 +2131,9 @@ export function isWebpackDefaultLayer( ...@@ -2131,3 +2131,9 @@ export function isWebpackDefaultLayer(
): boolean { ): boolean {
return layer === null || layer === undefined return layer === null || layer === undefined
} }
export function isWebpackAppLayer(
layer: WebpackLayerName | null | undefined
): boolean {
return Boolean(layer && WEBPACK_LAYERS.GROUP.app.includes(layer as any))
}
...@@ -19,7 +19,11 @@ import { ...@@ -19,7 +19,11 @@ import {
WEBPACK_RESOURCE_QUERIES, WEBPACK_RESOURCE_QUERIES,
WebpackLayerName, WebpackLayerName,
} from '../lib/constants' } from '../lib/constants'
import { isWebpackDefaultLayer, isWebpackServerLayer } from './utils' import {
isWebpackAppLayer,
isWebpackDefaultLayer,
isWebpackServerLayer,
} from './utils'
import { CustomRoutes } from '../lib/load-custom-routes.js' import { CustomRoutes } from '../lib/load-custom-routes.js'
import { isEdgeRuntime } from '../lib/is-edge-runtime' import { isEdgeRuntime } from '../lib/is-edge-runtime'
import { import {
...@@ -412,7 +416,7 @@ function createRSCAliases( ...@@ -412,7 +416,7 @@ function createRSCAliases(
} }
if (!opts.isEdgeServer) { if (!opts.isEdgeServer) {
if (opts.layer === 'ssr') { if (opts.layer === WEBPACK_LAYERS.serverSideRendering) {
alias = Object.assign(alias, { alias = Object.assign(alias, {
'react/jsx-runtime$': `next/dist/server/future/route-modules/app-page/vendored/shared/react-jsx-runtime`, 'react/jsx-runtime$': `next/dist/server/future/route-modules/app-page/vendored/shared/react-jsx-runtime`,
'react/jsx-dev-runtime$': `next/dist/server/future/route-modules/app-page/vendored/shared/react-jsx-dev-runtime`, 'react/jsx-dev-runtime$': `next/dist/server/future/route-modules/app-page/vendored/shared/react-jsx-dev-runtime`,
...@@ -421,7 +425,7 @@ function createRSCAliases( ...@@ -421,7 +425,7 @@ function createRSCAliases(
'react-dom/server.edge$': `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react-dom-server-edge`, 'react-dom/server.edge$': `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react-dom-server-edge`,
'react-server-dom-webpack/client.edge$': `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react-server-dom-webpack-client-edge`, 'react-server-dom-webpack/client.edge$': `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react-server-dom-webpack-client-edge`,
}) })
} else if (opts.layer === 'rsc') { } else if (opts.layer === WEBPACK_LAYERS.reactServerComponents) {
alias = Object.assign(alias, { alias = Object.assign(alias, {
'react/jsx-runtime$': `next/dist/server/future/route-modules/app-page/vendored/shared/react-jsx-runtime`, 'react/jsx-runtime$': `next/dist/server/future/route-modules/app-page/vendored/shared/react-jsx-runtime`,
'react/jsx-dev-runtime$': `next/dist/server/future/route-modules/app-page/vendored/shared/react-jsx-dev-runtime`, 'react/jsx-dev-runtime$': `next/dist/server/future/route-modules/app-page/vendored/shared/react-jsx-dev-runtime`,
...@@ -434,7 +438,7 @@ function createRSCAliases( ...@@ -434,7 +438,7 @@ function createRSCAliases(
} }
if (opts.isEdgeServer) { if (opts.isEdgeServer) {
if (opts.layer === 'rsc') { if (opts.layer === WEBPACK_LAYERS.reactServerComponents) {
alias[ alias[
'react$' 'react$'
] = `next/dist/compiled/react${bundledReactChannel}/react.shared-subset` ] = `next/dist/compiled/react${bundledReactChannel}/react.shared-subset`
...@@ -1383,15 +1387,7 @@ export default async function getBaseWebpackConfig( ...@@ -1383,15 +1387,7 @@ export default async function getBaseWebpackConfig(
return `commonjs next/dist/lib/import-next-warning` return `commonjs next/dist/lib/import-next-warning`
} }
const isAppLayer = ( const isAppLayer = isWebpackAppLayer(layer)
[
WEBPACK_LAYERS.reactServerComponents,
WEBPACK_LAYERS.serverSideRendering,
WEBPACK_LAYERS.appPagesBrowser,
WEBPACK_LAYERS.actionBrowser,
WEBPACK_LAYERS.appRouteHandler,
] as WebpackLayerName[]
).includes(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.
...@@ -1461,25 +1457,30 @@ export default async function getBaseWebpackConfig( ...@@ -1461,25 +1457,30 @@ export default async function getBaseWebpackConfig(
// Specific Next.js imports that should remain external // Specific Next.js imports that should remain external
// TODO-APP: Investigate if we can remove this. // TODO-APP: Investigate if we can remove this.
if (request.startsWith('next/dist/')) { if (request.startsWith('next/dist/')) {
// Non external that needs to be transpiled
// Image loader needs to be transpiled // Image loader needs to be transpiled
if (/^next\/dist\/shared\/lib\/image-loader/.test(request)) { if (/^next[\\/]dist[\\/]shared[\\/]lib[\\/]image-loader/.test(request)) {
return return
} }
if (/^next\/dist\/compiled\/next-server/.test(request)) { if (/^next[\\/]dist[\\/]compiled[\\/]next-server/.test(request)) {
return `commonjs ${request}` return `commonjs ${request}`
} }
if ( if (
/^next\/dist\/shared\/(?!lib\/router\/router)/.test(request) || /^next[\\/]dist[\\/]shared[\\/](?!lib[\\/]router[\\/]router)/.test(
/^next\/dist\/compiled\/.*\.c?js$/.test(request) request
) ||
/^next[\\/]dist[\\/]compiled[\\/].*\.c?js$/.test(request)
) { ) {
return `commonjs ${request}` return `commonjs ${request}`
} }
if ( if (
/^next\/dist\/esm\/shared\/(?!lib\/router\/router)/.test(request) || /^next[\\/]dist[\\/]esm[\\/]shared[\\/](?!lib[\\/]router[\\/]router)/.test(
/^next\/dist\/compiled\/.*\.mjs$/.test(request) request
) ||
/^next[\\/]dist[\\/]compiled[\\/].*\.mjs$/.test(request)
) { ) {
return `module ${request}` return `module ${request}`
} }
......
...@@ -107,7 +107,7 @@ const WEBPACK_LAYERS_NAMES = { ...@@ -107,7 +107,7 @@ const WEBPACK_LAYERS_NAMES = {
*/ */
reactServerComponents: 'rsc', reactServerComponents: 'rsc',
/** /**
* Server Side Rendering layer (ssr). * Server Side Rendering layer for app (ssr).
*/ */
serverSideRendering: 'ssr', serverSideRendering: 'ssr',
/** /**
...@@ -157,6 +157,14 @@ const WEBPACK_LAYERS = { ...@@ -157,6 +157,14 @@ const WEBPACK_LAYERS = {
WEBPACK_LAYERS_NAMES.middleware, WEBPACK_LAYERS_NAMES.middleware,
WEBPACK_LAYERS_NAMES.api, WEBPACK_LAYERS_NAMES.api,
], ],
app: [
WEBPACK_LAYERS_NAMES.reactServerComponents,
WEBPACK_LAYERS_NAMES.actionBrowser,
WEBPACK_LAYERS_NAMES.appMetadataRoute,
WEBPACK_LAYERS_NAMES.appRouteHandler,
WEBPACK_LAYERS_NAMES.serverSideRendering,
WEBPACK_LAYERS_NAMES.appPagesBrowser,
],
}, },
} }
......
'use client'
import React from 'react'
function ClientComponent() {
const [state] = React.useState('component')
return <div>{`client-` + state}</div>
}
export const clientRef = <ClientComponent />
import React from 'react'
import { clientRef } from './client-component'
export const contentType = 'image/png'
const cachedNoop = React.cache(() => null)
function noopCall(value) {
return value
}
export default function sitemap() {
// keep the variable from being tree-shaken
noopCall(clientRef)
cachedNoop()
return []
}
...@@ -66,6 +66,13 @@ createNextDescribe( ...@@ -66,6 +66,13 @@ createNextDescribe(
" "
`) `)
}) })
it('should not throw if client components are imported but not used', async () => {
const { status } = await next.fetch(
'/client-ref-dependency/sitemap.xml'
)
expect(status).toBe(200)
})
}) })
describe('social image routes', () => { describe('social image routes', () => {
......
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