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

Fix next/dynamic non ssr in pages when appDir is enabled (#45066)

When `appDir` is enabled, `next/dynamic` with `ssr: false` didn't get
correctly compiled with swc. The `server_components` condition in
next_dynamic transform should respect to the server components
compilation, but it was accidently turned on when server components is
enabled.

This PR fixes it that only turn on the flag when it's in server
components compilation (when `is_server` option is `true`)

reported by @MaxLeiter 

## Bug

- [x] Related issues linked using `fixes #number`
- [x] Integration tests added
- [ ] Errors have a helpful link attached, see
[`contributing.md`](https://github.com/vercel/next.js/blob/canary/contributing.md)
Co-authored-by: 's avatarkodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
parent 0faedd9e
......@@ -189,7 +189,13 @@ where
next_dynamic::next_dynamic(
opts.is_development,
opts.is_server,
opts.server_components.is_some(),
match &opts.server_components {
Some(config) if config.truthy() => match config {
react_server_components::Config::WithOptions(x) => x.is_server,
_ => false,
},
_ => false,
},
file.name.clone(),
opts.pages_dir.clone()
),
......
......@@ -127,9 +127,7 @@ function getBaseSWCOptions({
styledComponents: getStyledComponentsOptions(nextConfig, development),
}),
serverComponents: hasServerComponents
? {
isServer: !!isServerLayer,
}
? { isServer: !!isServerLayer }
: undefined,
}
}
......@@ -220,7 +218,6 @@ export function getLoaderSWCOptions({
filename,
development,
isServer,
isServerLayer,
pagesDir,
isPageFile,
hasReactRefresh,
......@@ -230,6 +227,7 @@ export function getLoaderSWCOptions({
swcCacheDir,
relativeFilePathFromRoot,
hasServerComponents,
isServerLayer,
}: // This is not passed yet as "paths" resolving is handled by webpack currently.
// resolvedBaseUrl,
any) {
......@@ -242,9 +240,9 @@ any) {
jsConfig,
// resolvedBaseUrl,
swcCacheDir,
isServerLayer,
relativeFilePathFromRoot,
hasServerComponents,
isServerLayer,
})
if (nextConfig?.experimental?.fontLoaders && relativeFilePathFromRoot) {
......
......@@ -43,7 +43,6 @@ async function loaderTransform(
const {
isServer,
isServerLayer,
rootDir,
pagesDir,
hasReactRefresh,
......@@ -52,6 +51,7 @@ async function loaderTransform(
supportedBrowsers,
swcCacheDir,
hasServerComponents,
isServerLayer,
} = loaderOptions
const isPageFile = filename.startsWith(pagesDir)
const relativeFilePathFromRoot = path.relative(rootDir, filename)
......@@ -60,7 +60,6 @@ async function loaderTransform(
pagesDir,
filename,
isServer,
isServerLayer,
isPageFile,
development: this.mode === 'development',
hasReactRefresh,
......@@ -70,6 +69,7 @@ async function loaderTransform(
swcCacheDir,
relativeFilePathFromRoot,
hasServerComponents,
isServerLayer,
})
const programmaticOptions = {
......
import { createNextDescribe } from 'e2e-utils'
createNextDescribe(
'app dir - next/dynamic',
{
files: __dirname,
skipDeployment: true,
},
({ next }) => {
it('should handle ssr: false in pages when appDir is enabled', async () => {
const $ = await next.render$('/no-ssr')
expect($.html()).not.toContain('navigator')
const browser = await next.browser('/no-ssr')
expect(
await browser.waitForElementByCss('#pure-client').text()
).toContain('navigator')
})
}
)
module.exports = {
reactStrictMode: true,
experimental: {
appDir: true,
},
}
import dynamic from 'next/dynamic'
const PureClient = dynamic(() => import('../ui/pure-client'), { ssr: false })
export default PureClient
console.log('navigator.userAgent', navigator.userAgent)
export default function PureClient() {
return <p id="pure-client">navigator</p>
}
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