Unverified Commit 11dd1de6 authored by Shu Ding's avatar Shu Ding Committed by GitHub

Remove unnecessary experimental flag (#40766)

`config.experimental.serverComponents` is currently required to be
enabled or disabled together with `config.experimental.appDir` (which
means `serverComponents === appDir` otherwise it will throw) so there is
no reason to keep both of them. This PR removes `serverComponents` from
Next.js and only rely on `appDir` instead.

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have a helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the
feature request has been accepted for implementation before opening a
PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have a helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The "examples guidelines" are followed from [our contributing
doc](https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md)
parent 6d4f2631
...@@ -270,11 +270,7 @@ export default async function build( ...@@ -270,11 +270,7 @@ export default async function build(
setGlobal('phase', PHASE_PRODUCTION_BUILD) setGlobal('phase', PHASE_PRODUCTION_BUILD)
setGlobal('distDir', distDir) setGlobal('distDir', distDir)
// We enable concurrent features (Fizz-related rendering architecture) when
// using React 18 or experimental.
const hasReactRoot = !!process.env.__NEXT_REACT_ROOT const hasReactRoot = !!process.env.__NEXT_REACT_ROOT
const hasServerComponents =
hasReactRoot && !!config.experimental.serverComponents
const { target } = config const { target } = config
const buildId: string = await nextBuildSpan const buildId: string = await nextBuildSpan
...@@ -814,7 +810,7 @@ export default async function build( ...@@ -814,7 +810,7 @@ export default async function build(
BUILD_MANIFEST, BUILD_MANIFEST,
PRERENDER_MANIFEST, PRERENDER_MANIFEST,
path.join(SERVER_DIRECTORY, MIDDLEWARE_MANIFEST), path.join(SERVER_DIRECTORY, MIDDLEWARE_MANIFEST),
...(hasServerComponents ...(appDir
? [ ? [
path.join(SERVER_DIRECTORY, FLIGHT_MANIFEST + '.js'), path.join(SERVER_DIRECTORY, FLIGHT_MANIFEST + '.js'),
path.join(SERVER_DIRECTORY, FLIGHT_MANIFEST + '.json'), path.join(SERVER_DIRECTORY, FLIGHT_MANIFEST + '.json'),
...@@ -912,10 +908,8 @@ export default async function build( ...@@ -912,10 +908,8 @@ export default async function build(
let edgeServerResult: SingleCompilerResult | null = null let edgeServerResult: SingleCompilerResult | null = null
if (isLikeServerless) { if (isLikeServerless) {
if (config.experimental.serverComponents) { if (appDir) {
throw new Error( throw new Error('`appDir` is not supported in serverless mode.')
'Server Components are not supported in serverless mode.'
)
} }
// Build client first // Build client first
...@@ -1357,7 +1351,7 @@ export default async function build( ...@@ -1357,7 +1351,7 @@ export default async function build(
pageRuntime, pageRuntime,
edgeInfo, edgeInfo,
pageType, pageType,
hasServerComponents, hasServerComponents: !!appDir,
}) })
} }
) )
......
...@@ -118,7 +118,7 @@ function getBaseSWCOptions({ ...@@ -118,7 +118,7 @@ function getBaseSWCOptions({
modularizeImports: nextConfig?.experimental?.modularizeImports, modularizeImports: nextConfig?.experimental?.modularizeImports,
relay: nextConfig?.compiler?.relay, relay: nextConfig?.compiler?.relay,
emotion: getEmotionOptions(nextConfig, development), emotion: getEmotionOptions(nextConfig, development),
serverComponents: nextConfig?.experimental?.serverComponents serverComponents: nextConfig?.experimental?.appDir
? { ? {
isServer: !!isServerLayer, isServer: !!isServerLayer,
} }
......
...@@ -544,22 +544,16 @@ export default async function getBaseWebpackConfig( ...@@ -544,22 +544,16 @@ export default async function getBaseWebpackConfig(
'`experimental.runtime` requires React 18 to be installed.' '`experimental.runtime` requires React 18 to be installed.'
) )
} }
if (config.experimental.serverComponents) { if (config.experimental.appDir) {
throw new Error( throw new Error(
'`experimental.serverComponents` requires React 18 to be installed.' '`experimental.appDir` requires React 18 to be installed.'
) )
} }
} }
if (!config.experimental.appDir && config.experimental.serverComponents) {
throw new Error(
'`experimental.serverComponents` requires experimental.appDir to be enabled.'
)
}
} }
const hasConcurrentFeatures = hasReactRoot const hasConcurrentFeatures = hasReactRoot
const hasServerComponents = const hasServerComponents = !!config.experimental.appDir
hasConcurrentFeatures && !!config.experimental.serverComponents
const disableOptimizedLoading = hasConcurrentFeatures const disableOptimizedLoading = hasConcurrentFeatures
? true ? true
: config.experimental.disableOptimizedLoading : config.experimental.disableOptimizedLoading
...@@ -1812,7 +1806,7 @@ export default async function getBaseWebpackConfig( ...@@ -1812,7 +1806,7 @@ export default async function getBaseWebpackConfig(
} = require('./webpack/plugins/nextjs-require-cache-hot-reloader') } = require('./webpack/plugins/nextjs-require-cache-hot-reloader')
const devPlugins = [ const devPlugins = [
new NextJsRequireCacheHotReloader({ new NextJsRequireCacheHotReloader({
hasServerComponents: config.experimental.serverComponents, hasServerComponents,
}), }),
] ]
...@@ -1881,11 +1875,9 @@ export default async function getBaseWebpackConfig( ...@@ -1881,11 +1875,9 @@ export default async function getBaseWebpackConfig(
}, },
}), }),
!!config.experimental.appDir && !!config.experimental.appDir &&
hasServerComponents &&
isClient && isClient &&
new AppBuildManifestPlugin({ dev }), new AppBuildManifestPlugin({ dev }),
hasServerComponents && hasServerComponents &&
!!config.experimental.appDir &&
(isClient (isClient
? new FlightManifestPlugin({ ? new FlightManifestPlugin({
dev, dev,
......
...@@ -388,7 +388,7 @@ export default async function exportApp( ...@@ -388,7 +388,7 @@ export default async function exportApp(
nextScriptWorkers: nextConfig.experimental.nextScriptWorkers, nextScriptWorkers: nextConfig.experimental.nextScriptWorkers,
optimizeFonts: nextConfig.optimizeFonts as FontConfig, optimizeFonts: nextConfig.optimizeFonts as FontConfig,
largePageDataBytes: nextConfig.experimental.largePageDataBytes, largePageDataBytes: nextConfig.experimental.largePageDataBytes,
serverComponents: nextConfig.experimental.serverComponents, serverComponents: !!nextConfig.experimental.appDir,
} }
const { serverRuntimeConfig, publicRuntimeConfig } = nextConfig const { serverRuntimeConfig, publicRuntimeConfig } = nextConfig
...@@ -613,7 +613,7 @@ export default async function exportApp( ...@@ -613,7 +613,7 @@ export default async function exportApp(
nextConfig.experimental.disableOptimizedLoading, nextConfig.experimental.disableOptimizedLoading,
parentSpanId: pageExportSpan.id, parentSpanId: pageExportSpan.id,
httpAgentOptions: nextConfig.httpAgentOptions, httpAgentOptions: nextConfig.httpAgentOptions,
serverComponents: nextConfig.experimental.serverComponents, serverComponents: !!nextConfig.experimental.appDir,
appPaths: options.appPaths || [], appPaths: options.appPaths || [],
}) })
......
...@@ -363,7 +363,7 @@ export default abstract class Server<ServerOptions extends Options = Options> { ...@@ -363,7 +363,7 @@ export default abstract class Server<ServerOptions extends Options = Options> {
this.buildId = this.getBuildId() this.buildId = this.getBuildId()
this.minimalMode = minimalMode || !!process.env.NEXT_PRIVATE_MINIMAL_MODE this.minimalMode = minimalMode || !!process.env.NEXT_PRIVATE_MINIMAL_MODE
const serverComponents = this.nextConfig.experimental.serverComponents const serverComponents = !!this.nextConfig.experimental.appDir
this.serverComponentManifest = serverComponents this.serverComponentManifest = serverComponents
? this.getServerComponentManifest() ? this.getServerComponentManifest()
: undefined : undefined
......
...@@ -342,9 +342,6 @@ const configSchema = { ...@@ -342,9 +342,6 @@ const configSchema = {
scrollRestoration: { scrollRestoration: {
type: 'boolean', type: 'boolean',
}, },
serverComponents: {
type: 'boolean',
},
sharedPool: { sharedPool: {
type: 'boolean', type: 'boolean',
}, },
......
...@@ -114,7 +114,6 @@ export interface ExperimentalConfig { ...@@ -114,7 +114,6 @@ export interface ExperimentalConfig {
esmExternals?: boolean | 'loose' esmExternals?: boolean | 'loose'
isrMemoryCacheSize?: number isrMemoryCacheSize?: number
runtime?: Exclude<ServerRuntime, undefined> runtime?: Exclude<ServerRuntime, undefined>
serverComponents?: boolean
fullySpecified?: boolean fullySpecified?: boolean
urlImports?: NonNullable<webpack.Configuration['experiments']>['buildHttp'] urlImports?: NonNullable<webpack.Configuration['experiments']>['buildHttp']
outputFileTracingRoot?: string outputFileTracingRoot?: string
...@@ -570,7 +569,6 @@ export const defaultConfig: NextConfig = { ...@@ -570,7 +569,6 @@ export const defaultConfig: NextConfig = {
// default to 50MB limit // default to 50MB limit
isrMemoryCacheSize: 50 * 1024 * 1024, isrMemoryCacheSize: 50 * 1024 * 1024,
incrementalCacheHandlerPath: undefined, incrementalCacheHandlerPath: undefined,
serverComponents: false,
fullySpecified: false, fullySpecified: false,
outputFileTracingRoot: process.env.NEXT_PRIVATE_OUTPUT_TRACE_ROOT || '', outputFileTracingRoot: process.env.NEXT_PRIVATE_OUTPUT_TRACE_ROOT || '',
swcTraceProfiling: false, swcTraceProfiling: false,
......
...@@ -217,8 +217,7 @@ export default class HotReloader { ...@@ -217,8 +217,7 @@ export default class HotReloader {
this.config = config this.config = config
this.hasReactRoot = !!process.env.__NEXT_REACT_ROOT this.hasReactRoot = !!process.env.__NEXT_REACT_ROOT
this.hasServerComponents = this.hasServerComponents = this.hasReactRoot && !!config.experimental.appDir
this.hasReactRoot && !!config.experimental.serverComponents
this.previewProps = previewProps this.previewProps = previewProps
this.rewrites = rewrites this.rewrites = rewrites
this.hotReloaderSpan = trace('hot-reloader', undefined, { this.hotReloaderSpan = trace('hot-reloader', undefined, {
......
...@@ -1347,11 +1347,9 @@ export default class DevServer extends Server { ...@@ -1347,11 +1347,9 @@ export default class DevServer extends Server {
clientOnly: false, clientOnly: false,
}) })
const serverComponents = this.nextConfig.experimental.serverComponents
// When the new page is compiled, we need to reload the server component // When the new page is compiled, we need to reload the server component
// manifest. // manifest.
if (serverComponents) { if (this.nextConfig.experimental.appDir) {
this.serverComponentManifest = super.getServerComponentManifest() this.serverComponentManifest = super.getServerComponentManifest()
this.serverCSSManifest = super.getServerCSSManifest() this.serverCSSManifest = super.getServerCSSManifest()
} }
......
...@@ -1003,12 +1003,12 @@ export default class NextNodeServer extends BaseServer { ...@@ -1003,12 +1003,12 @@ export default class NextNodeServer extends BaseServer {
} }
protected getServerComponentManifest() { protected getServerComponentManifest() {
if (!this.nextConfig.experimental.serverComponents) return undefined if (!this.nextConfig.experimental.appDir) return undefined
return require(join(this.distDir, 'server', FLIGHT_MANIFEST + '.json')) return require(join(this.distDir, 'server', FLIGHT_MANIFEST + '.json'))
} }
protected getServerCSSManifest() { protected getServerCSSManifest() {
if (!this.nextConfig.experimental.serverComponents) return undefined if (!this.nextConfig.experimental.appDir) return undefined
return require(join( return require(join(
this.distDir, this.distDir,
'server', 'server',
......
module.exports = { module.exports = {
experimental: { experimental: {
appDir: true, appDir: true,
serverComponents: true,
legacyBrowsers: false, legacyBrowsers: false,
browsersListForSwc: true, browsersListForSwc: true,
}, },
......
module.exports = { module.exports = {
experimental: { experimental: {
appDir: true, appDir: true,
serverComponents: true,
legacyBrowsers: false, legacyBrowsers: false,
browsersListForSwc: true, browsersListForSwc: true,
}, },
......
module.exports = { module.exports = {
experimental: { experimental: {
appDir: true, appDir: true,
serverComponents: true,
}, },
} }
module.exports = { module.exports = {
experimental: { experimental: {
appDir: true, appDir: true,
serverComponents: true,
legacyBrowsers: false, legacyBrowsers: false,
browsersListForSwc: true, browsersListForSwc: true,
}, },
......
module.exports = { module.exports = {
experimental: { experimental: {
appDir: true, appDir: true,
serverComponents: true,
legacyBrowsers: false, legacyBrowsers: false,
browsersListForSwc: true, browsersListForSwc: true,
sri: { sri: {
......
module.exports = { module.exports = {
experimental: { experimental: {
appDir: true, appDir: true,
serverComponents: true,
legacyBrowsers: false, legacyBrowsers: false,
browsersListForSwc: true, browsersListForSwc: true,
}, },
......
...@@ -5,7 +5,6 @@ module.exports = { ...@@ -5,7 +5,6 @@ module.exports = {
}, },
experimental: { experimental: {
appDir: true, appDir: true,
serverComponents: true,
}, },
rewrites: async () => { rewrites: async () => {
return { return {
......
module.exports = { module.exports = {
experimental: { experimental: {
appDir: true, appDir: true,
serverComponents: true,
legacyBrowsers: false, legacyBrowsers: false,
browsersListForSwc: true, browsersListForSwc: true,
}, },
......
...@@ -3,7 +3,6 @@ module.exports = { ...@@ -3,7 +3,6 @@ module.exports = {
reactStrictMode: true, reactStrictMode: true,
experimental: { experimental: {
appDir: true, appDir: true,
serverComponents: true,
}, },
async rewrites() { async rewrites() {
return { return {
......
...@@ -5,7 +5,6 @@ module.exports = { ...@@ -5,7 +5,6 @@ module.exports = {
// }, // },
// pageExtensions: ['js', 'ts', 'jsx'], // .tsx won't be treat as page, // pageExtensions: ['js', 'ts', 'jsx'], // .tsx won't be treat as page,
experimental: { experimental: {
// serverComponents: true,
runtime: 'nodejs', runtime: 'nodejs',
}, },
} }
module.exports = { module.exports = {
experimental: { experimental: {},
serverComponents: true,
},
} }
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