Unverified Commit 9f432cbc authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

Transpile all code on app browser layer (#59569)

parent 490d2380
import { WEBPACK_LAYERS, type WebpackLayerName } from '../../lib/constants'
import type { import type {
NextConfig, NextConfig,
ExperimentalConfig, ExperimentalConfig,
...@@ -9,6 +10,8 @@ import type { ResolvedBaseUrl } from '../load-jsconfig' ...@@ -9,6 +10,8 @@ import type { ResolvedBaseUrl } from '../load-jsconfig'
const nextDistPath = const nextDistPath =
/(next[\\/]dist[\\/]shared[\\/]lib)|(next[\\/]dist[\\/]client)|(next[\\/]dist[\\/]pages)/ /(next[\\/]dist[\\/]shared[\\/]lib)|(next[\\/]dist[\\/]client)|(next[\\/]dist[\\/]pages)/
const nodeModulesPath = /[\\/]node_modules[\\/]/
const regeneratorRuntimePath = require.resolve( const regeneratorRuntimePath = require.resolve(
'next/dist/compiled/regenerator-runtime' 'next/dist/compiled/regenerator-runtime'
) )
...@@ -44,7 +47,7 @@ function getBaseSWCOptions({ ...@@ -44,7 +47,7 @@ function getBaseSWCOptions({
jsConfig, jsConfig,
swcCacheDir, swcCacheDir,
serverComponents, serverComponents,
isReactServerLayer, bundleLayer,
}: { }: {
filename: string filename: string
jest?: boolean jest?: boolean
...@@ -59,8 +62,10 @@ function getBaseSWCOptions({ ...@@ -59,8 +62,10 @@ function getBaseSWCOptions({
jsConfig: any jsConfig: any
swcCacheDir?: string swcCacheDir?: string
serverComponents?: boolean serverComponents?: boolean
isReactServerLayer?: boolean bundleLayer?: WebpackLayerName
}) { }) {
const isReactServerLayer =
bundleLayer === WEBPACK_LAYERS.reactServerComponents
const parserConfig = getParserOptions({ filename, jsConfig }) const parserConfig = getParserOptions({ filename, jsConfig })
const paths = jsConfig?.compilerOptions?.paths const paths = jsConfig?.compilerOptions?.paths
const enableDecorators = Boolean( const enableDecorators = Boolean(
...@@ -177,7 +182,7 @@ function getBaseSWCOptions({ ...@@ -177,7 +182,7 @@ function getBaseSWCOptions({
serverComponents: serverComponents:
serverComponents && !jest serverComponents && !jest
? { ? {
isReactServerLayer: !!isReactServerLayer, isReactServerLayer,
} }
: undefined, : undefined,
serverActions: serverActions:
...@@ -186,7 +191,7 @@ function getBaseSWCOptions({ ...@@ -186,7 +191,7 @@ function getBaseSWCOptions({
// always enable server actions // always enable server actions
// TODO: remove this option // TODO: remove this option
enabled: true, enabled: true,
isReactServerLayer: !!isReactServerLayer, isReactServerLayer,
} }
: undefined, : undefined,
// For app router we prefer to bundle ESM, // For app router we prefer to bundle ESM,
...@@ -295,8 +300,8 @@ export function getJestSWCOptions({ ...@@ -295,8 +300,8 @@ export function getJestSWCOptions({
resolvedBaseUrl, resolvedBaseUrl,
esm, esm,
// Don't apply server layer transformations for Jest // Don't apply server layer transformations for Jest
isReactServerLayer: false,
// Disable server / client graph assertions for Jest // Disable server / client graph assertions for Jest
bundleLayer: undefined,
serverComponents: false, serverComponents: false,
}) })
...@@ -339,7 +344,7 @@ export function getLoaderSWCOptions({ ...@@ -339,7 +344,7 @@ export function getLoaderSWCOptions({
swcCacheDir, swcCacheDir,
relativeFilePathFromRoot, relativeFilePathFromRoot,
serverComponents, serverComponents,
isReactServerLayer, bundleLayer,
esm, esm,
}: { }: {
filename: string filename: string
...@@ -362,7 +367,7 @@ export function getLoaderSWCOptions({ ...@@ -362,7 +367,7 @@ export function getLoaderSWCOptions({
relativeFilePathFromRoot: string relativeFilePathFromRoot: string
esm?: boolean esm?: boolean
serverComponents?: boolean serverComponents?: boolean
isReactServerLayer?: boolean bundleLayer?: WebpackLayerName
}) { }) {
let baseOptions: any = getBaseSWCOptions({ let baseOptions: any = getBaseSWCOptions({
filename, filename,
...@@ -375,7 +380,7 @@ export function getLoaderSWCOptions({ ...@@ -375,7 +380,7 @@ export function getLoaderSWCOptions({
jsConfig, jsConfig,
// resolvedBaseUrl, // resolvedBaseUrl,
swcCacheDir, swcCacheDir,
isReactServerLayer, bundleLayer,
serverComponents, serverComponents,
esm: !!esm, esm: !!esm,
}) })
...@@ -418,9 +423,12 @@ export function getLoaderSWCOptions({ ...@@ -418,9 +423,12 @@ export function getLoaderSWCOptions({
} }
const isNextDist = nextDistPath.test(filename) const isNextDist = nextDistPath.test(filename)
const isNodeModules = nodeModulesPath.test(filename)
const isAppBrowserLayer = bundleLayer === WEBPACK_LAYERS.appPagesBrowser
let options: any
if (isServer) { if (isServer) {
return { options = {
...baseOptions, ...baseOptions,
// Disables getStaticProps/getServerSideProps tree shaking on the server compilation for pages // Disables getStaticProps/getServerSideProps tree shaking on the server compilation for pages
disableNextSsg: true, disableNextSsg: true,
...@@ -440,7 +448,7 @@ export function getLoaderSWCOptions({ ...@@ -440,7 +448,7 @@ export function getLoaderSWCOptions({
...getModuleOptions(esm), ...getModuleOptions(esm),
} }
} else { } else {
const options = { options = {
...baseOptions, ...baseOptions,
// Ensure Next.js internals are output as commonjs modules // Ensure Next.js internals are output as commonjs modules
...(isNextDist ...(isNextDist
...@@ -468,6 +476,17 @@ export function getLoaderSWCOptions({ ...@@ -468,6 +476,17 @@ export function getLoaderSWCOptions({
// Matches default @babel/preset-env behavior // Matches default @babel/preset-env behavior
options.jsc.target = 'es5' options.jsc.target = 'es5'
} }
return options
} }
// For node_modules in app browser layer, we don't need to do any server side transformation.
// Only keep server actions transform to discover server actions from client components.
if (isAppBrowserLayer && isNodeModules) {
options.disableNextSsg = true
options.disablePageConfig = true
options.isPageFile = false
options.optimizeServerReact = undefined
options.cjsRequireOptimizer = undefined
}
return options
} }
...@@ -142,14 +142,14 @@ const devtoolRevertWarning = execOnce( ...@@ -142,14 +142,14 @@ const devtoolRevertWarning = execOnce(
let loggedSwcDisabled = false let loggedSwcDisabled = false
let loggedIgnoredCompilerOptions = false let loggedIgnoredCompilerOptions = false
const reactRefreshLoaderName =
'next/dist/compiled/@next/react-refresh-utils/dist/loader'
export function attachReactRefresh( export function attachReactRefresh(
webpackConfig: webpack.Configuration, webpackConfig: webpack.Configuration,
targetLoader: webpack.RuleSetUseItem targetLoader: webpack.RuleSetUseItem
) { ) {
let injections = 0 let injections = 0
const reactRefreshLoaderName =
'next/dist/compiled/@next/react-refresh-utils/dist/loader'
const reactRefreshLoader = require.resolve(reactRefreshLoaderName) const reactRefreshLoader = require.resolve(reactRefreshLoaderName)
webpackConfig.module?.rules?.forEach((rule) => { webpackConfig.module?.rules?.forEach((rule) => {
if (rule && typeof rule === 'object' && 'use' in rule) { if (rule && typeof rule === 'object' && 'use' in rule) {
...@@ -445,18 +445,22 @@ export default async function getBaseWebpackConfig( ...@@ -445,18 +445,22 @@ export default async function getBaseWebpackConfig(
// RSC loaders, prefer ESM, set `esm` to true // RSC loaders, prefer ESM, set `esm` to true
const swcServerLayerLoader = getSwcLoader({ const swcServerLayerLoader = getSwcLoader({
serverComponents: true, serverComponents: true,
isReactServerLayer: true, bundleLayer: WEBPACK_LAYERS.reactServerComponents,
esm: true, esm: true,
}) })
const swcClientLayerLoader = getSwcLoader({ const swcSSRLayerLoader = getSwcLoader({
serverComponents: true, serverComponents: true,
isReactServerLayer: false, bundleLayer: WEBPACK_LAYERS.serverSideRendering,
esm: true,
})
const swcBrowserLayerLoader = getSwcLoader({
serverComponents: true,
bundleLayer: WEBPACK_LAYERS.appPagesBrowser,
esm: true, esm: true,
}) })
// Default swc loaders for pages doesn't prefer ESM. // Default swc loaders for pages doesn't prefer ESM.
const swcDefaultLoader = getSwcLoader({ const swcDefaultLoader = getSwcLoader({
serverComponents: true, serverComponents: true,
isReactServerLayer: false,
esm: false, esm: false,
}) })
...@@ -475,31 +479,30 @@ export default async function getBaseWebpackConfig( ...@@ -475,31 +479,30 @@ export default async function getBaseWebpackConfig(
].filter(Boolean) ].filter(Boolean)
: [] : []
const swcLoaderForMiddlewareLayer = useSWCLoader const swcLoaderForMiddlewareLayer = [
? getSwcLoader({ // When using Babel, we will have to use SWC to do the optimization
serverComponents: false, // for middleware to tree shake the unused default optimized imports like "next/server".
isReactServerLayer: false, // This will cause some performance overhead but
}) // acceptable as Babel will not be recommended.
: // When using Babel, we will have to use SWC to do the optimization getSwcLoader({
// for middleware to tree shake the unused default optimized imports like "next/server". serverComponents: false,
// This will cause some performance overhead but bundleLayer: WEBPACK_LAYERS.middleware,
// acceptable as Babel will not be recommended. }),
[ babelLoader,
getSwcLoader({ ].filter(Boolean)
serverComponents: false,
isReactServerLayer: false,
}),
]
// client components layers: SSR + browser const reactRefreshLoaders =
const swcLoaderForClientLayer = [ dev && isClient ? [require.resolve(reactRefreshLoaderName)] : []
...(dev && isClient
? [ // client components layers: SSR or browser
require.resolve( const createSwcLoaderForClientLayer = ({
'next/dist/compiled/@next/react-refresh-utils/dist/loader' isBrowserLayer,
), reactRefresh,
] }: {
: []), isBrowserLayer: boolean
reactRefresh: boolean
}) => [
...(reactRefresh ? reactRefreshLoaders : []),
{ {
// This loader handles actions and client entries // This loader handles actions and client entries
// in the client layer. // in the client layer.
...@@ -511,12 +514,22 @@ export default async function getBaseWebpackConfig( ...@@ -511,12 +514,22 @@ export default async function getBaseWebpackConfig(
// as an additional pass to handle RSC correctly. // as an additional pass to handle RSC correctly.
// 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.
swcClientLayerLoader, isBrowserLayer ? swcBrowserLayerLoader : swcSSRLayerLoader,
babelLoader, babelLoader,
].filter(Boolean) ].filter(Boolean)
: []), : []),
] ]
const swcLoaderForBrowserLayer = createSwcLoaderForClientLayer({
isBrowserLayer: true,
// reactRefresh for browser layer is applied conditionally to user-land source
reactRefresh: false,
})
const swcLoaderForSSRLayer = createSwcLoaderForClientLayer({
isBrowserLayer: false,
reactRefresh: true,
})
// 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.
...@@ -524,7 +537,7 @@ export default async function getBaseWebpackConfig( ...@@ -524,7 +537,7 @@ export default async function getBaseWebpackConfig(
hasAppDir && useSWCLoader hasAppDir && useSWCLoader
? getSwcLoader({ ? getSwcLoader({
serverComponents: false, serverComponents: false,
isReactServerLayer: false, bundleLayer: WEBPACK_LAYERS.api,
}) })
: defaultLoaders.babel : defaultLoaders.babel
...@@ -1379,6 +1392,20 @@ export default async function getBaseWebpackConfig( ...@@ -1379,6 +1392,20 @@ export default async function getBaseWebpackConfig(
}, },
] ]
: []), : []),
// Do not apply react-refresh-loader to node_modules for app router browser layer
...(hasAppDir && dev && isClient
? [
{
test: codeCondition.test,
exclude: codeCondition.exclude,
issuerLayer: WEBPACK_LAYERS.appPagesBrowser,
use: reactRefreshLoaders,
resolve: {
mainFields: getMainField(compilerType, true),
},
},
]
: []),
{ {
oneOf: [ oneOf: [
{ {
...@@ -1412,17 +1439,16 @@ export default async function getBaseWebpackConfig( ...@@ -1412,17 +1439,16 @@ export default async function getBaseWebpackConfig(
}, },
{ {
test: codeCondition.test, test: codeCondition.test,
exclude: codeCondition.exclude, issuerLayer: WEBPACK_LAYERS.appPagesBrowser,
issuerLayer: [WEBPACK_LAYERS.appPagesBrowser], use: swcLoaderForBrowserLayer,
use: swcLoaderForClientLayer,
resolve: { resolve: {
mainFields: getMainField(compilerType, true), mainFields: getMainField(compilerType, true),
}, },
}, },
{ {
test: codeCondition.test, test: codeCondition.test,
issuerLayer: [WEBPACK_LAYERS.serverSideRendering], issuerLayer: WEBPACK_LAYERS.serverSideRendering,
use: swcLoaderForClientLayer, use: swcLoaderForSSRLayer,
resolve: { resolve: {
mainFields: getMainField(compilerType, true), mainFields: getMainField(compilerType, true),
}, },
...@@ -1431,18 +1457,11 @@ export default async function getBaseWebpackConfig( ...@@ -1431,18 +1457,11 @@ export default async function getBaseWebpackConfig(
: []), : []),
{ {
...codeCondition, ...codeCondition,
use: use: [...reactRefreshLoaders, defaultLoaders.babel],
dev && isClient
? [
require.resolve(
'next/dist/compiled/@next/react-refresh-utils/dist/loader'
),
defaultLoaders.babel,
]
: defaultLoaders.babel,
}, },
], ],
}, },
...(!config.images.disableStaticImages ...(!config.images.disableStaticImages
? [ ? [
{ {
......
...@@ -27,6 +27,7 @@ DEALINGS IN THE SOFTWARE. ...@@ -27,6 +27,7 @@ DEALINGS IN THE SOFTWARE.
*/ */
import type { NextConfig } from '../../../../types' import type { NextConfig } from '../../../../types'
import type { WebpackLayerName } from '../../../lib/constants'
import { isWasm, transform } from '../../swc' import { isWasm, transform } from '../../swc'
import { getLoaderSWCOptions } from '../../swc/options' import { getLoaderSWCOptions } from '../../swc/options'
import path, { isAbsolute } from 'path' import path, { isAbsolute } from 'path'
...@@ -43,7 +44,7 @@ export interface SWCLoaderOptions { ...@@ -43,7 +44,7 @@ export interface SWCLoaderOptions {
supportedBrowsers: string[] | undefined supportedBrowsers: string[] | undefined
swcCacheDir: string swcCacheDir: string
serverComponents?: boolean serverComponents?: boolean
isReactServerLayer?: boolean bundleLayer?: WebpackLayerName
esm?: boolean esm?: boolean
} }
...@@ -69,7 +70,7 @@ async function loaderTransform( ...@@ -69,7 +70,7 @@ async function loaderTransform(
supportedBrowsers, supportedBrowsers,
swcCacheDir, swcCacheDir,
serverComponents, serverComponents,
isReactServerLayer, bundleLayer,
esm, esm,
} = loaderOptions } = loaderOptions
const isPageFile = filename.startsWith(pagesDir) const isPageFile = filename.startsWith(pagesDir)
...@@ -93,7 +94,7 @@ async function loaderTransform( ...@@ -93,7 +94,7 @@ async function loaderTransform(
swcCacheDir, swcCacheDir,
relativeFilePathFromRoot, relativeFilePathFromRoot,
serverComponents, serverComponents,
isReactServerLayer, bundleLayer,
esm, esm,
}) })
......
...@@ -51,7 +51,7 @@ describe.each(['default', 'turbo'])('ReactRefreshLogBox app %s', () => { ...@@ -51,7 +51,7 @@ describe.each(['default', 'turbo'])('ReactRefreshLogBox app %s', () => {
) )
expect(await session.hasRedbox(true)).toBe(true) expect(await session.hasRedbox(true)).toBe(true)
expect(await session.getRedboxSource()).toMatchInlineSnapshot(` expect(await session.getRedboxSource()).toMatchInlineSnapshot(`
"./node_modules/my-package/index.js:1:0 "./node_modules/my-package/index.js:1:12
Module not found: Can't resolve 'dns' Module not found: Can't resolve 'dns'
https://nextjs.org/docs/messages/module-not-found https://nextjs.org/docs/messages/module-not-found
......
...@@ -251,21 +251,35 @@ createNextDescribe( ...@@ -251,21 +251,35 @@ createNextDescribe(
expect(html).toContain('success') expect(html).toContain('success')
}) })
it('should not prefer to resolve esm over cjs for bundling optout packages', async () => { describe('server actions', () => {
const browser = await next.browser('/optout/action') it('should not prefer to resolve esm over cjs for bundling optout packages', async () => {
expect(await browser.elementByCss('#dual-pkg-outout p').text()).toBe('') const browser = await next.browser('/optout/action')
expect(await browser.elementByCss('#dual-pkg-outout p').text()).toBe('')
browser.elementByCss('#dual-pkg-outout button').click()
await check(async () => { browser.elementByCss('#dual-pkg-outout button').click()
const text = await browser.elementByCss('#dual-pkg-outout p').text() await check(async () => {
if (process.env.TURBOPACK) { const text = await browser.elementByCss('#dual-pkg-outout p').text()
// The prefer esm won't effect turbopack resolving if (process.env.TURBOPACK) {
expect(text).toBe('dual-pkg-optout:mjs') // The prefer esm won't effect turbopack resolving
} else { expect(text).toBe('dual-pkg-optout:mjs')
expect(text).toBe('dual-pkg-optout:cjs') } else {
} expect(text).toBe('dual-pkg-optout:cjs')
return 'success' }
}, /success/) return 'success'
}, /success/)
})
it('should compile server actions from node_modules in client components', async () => {
// before action there's no action log
expect(next.cliOutput).not.toContain('action-log:server:action1')
const browser = await next.browser('/action/client')
await browser.elementByCss('#action').click()
await check(() => {
expect(next.cliOutput).toContain('action-log:server:action1')
return 'success'
}, /success/)
})
}) })
} }
) )
'use client'
import { action1 } from 'server-action-mod'
export default function Page() {
return (
<button
id="action"
onClick={() => {
action1()
}}
>
action
</button>
)
}
'use server'
export async function action1() {
console.log(
`action-log:${typeof window === 'undefined' ? 'server' : 'client'}:action1`
)
}
...@@ -2494,7 +2494,8 @@ ...@@ -2494,7 +2494,8 @@
], ],
"failed": [ "failed": [
"app dir - external dependency should be able to opt-out 3rd party packages being bundled in server components", "app dir - external dependency should be able to opt-out 3rd party packages being bundled in server components",
"app dir - external dependency should have proper tree-shaking for known modules in CJS" "app dir - external dependency should have proper tree-shaking for known modules in CJS",
"app dir - external dependency server actions should compile server actions from node_modules in client components"
], ],
"pending": [], "pending": [],
"flakey": [], "flakey": [],
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