Unverified Commit 7c8d0062 authored by Shu Ding's avatar Shu Ding Committed by GitHub

Move `modularizeImports` out of experimental (#44240)

parent 9ee4c0cd
......@@ -115,7 +115,7 @@ function getBaseSWCOptions({
reactRemoveProperties: jest
? false
: nextConfig?.compiler?.reactRemoveProperties,
modularizeImports: nextConfig?.experimental?.modularizeImports,
modularizeImports: nextConfig?.modularizeImports,
relay: nextConfig?.compiler?.relay,
// Always transform styled-jsx and error when `client-only` condition is triggered
styledJsx: true,
......
......@@ -2155,6 +2155,7 @@ export default async function getBaseWebpackConfig(
!!config.skipMiddlewareUrlNormalize,
],
['skipTrailingSlashRedirect', !!config.skipTrailingSlashRedirect],
['modularizeImports', !!config.modularizeImports],
SWCBinaryTarget,
].filter<[Feature, boolean]>(Boolean as any)
)
......@@ -2304,7 +2305,7 @@ export default async function getBaseWebpackConfig(
styledComponents: config.compiler?.styledComponents,
relay: config.compiler?.relay,
emotion: config.compiler?.emotion,
modularizeImports: config.experimental?.modularizeImports,
modularizeImports: config.modularizeImports,
legacyBrowsers: config.experimental?.legacyBrowsers,
imageLoaderFile: config.images.loaderFile,
})
......
......@@ -40,6 +40,7 @@ export type Feature =
| 'transpilePackages'
| 'skipMiddlewareUrlNormalize'
| 'skipTrailingSlashRedirect'
| 'modularizeImports'
interface FeatureUsage {
featureName: Feature
......@@ -102,6 +103,7 @@ const BUILD_FEATURES: Array<Feature> = [
'transpilePackages',
'skipMiddlewareUrlNormalize',
'skipTrailingSlashRedirect',
'modularizeImports',
]
const ELIMINATED_PACKAGES = new Set<string>()
......
......@@ -310,9 +310,6 @@ const configSchema = {
enum: ['strict', 'flexible'] as any,
type: 'string',
},
modularizeImports: {
type: 'object',
},
newNextLinkBehavior: {
type: 'boolean',
},
......@@ -629,6 +626,9 @@ const configSchema = {
},
type: 'object',
},
modularizeImports: {
type: 'object',
},
onDemandEntries: {
additionalProperties: false,
properties: {
......
......@@ -120,14 +120,6 @@ export interface ExperimentalConfig {
urlImports?: NonNullable<webpack.Configuration['experiments']>['buildHttp']
outputFileTracingRoot?: string
outputFileTracingIgnores?: string[]
modularizeImports?: Record<
string,
{
transform: string
preventFullImport?: boolean
skipDefaultConversion?: boolean
}
>
swcTraceProfiling?: boolean
forceSwcTransforms?: boolean
......@@ -508,6 +500,15 @@ export interface NextConfig extends Record<string, any> {
skipTrailingSlashRedirect?: boolean
modularizeImports?: Record<
string,
{
transform: string
preventFullImport?: boolean
skipDefaultConversion?: boolean
}
>
/**
* Enable experimental features. Note that all experimental features are subject to breaking changes in the future.
*/
......@@ -566,6 +567,7 @@ export const defaultConfig: NextConfig = {
staticPageGenerationTimeout: 60,
swcMinify: true,
output: !!process.env.NEXT_PRIVATE_STANDALONE ? 'standalone' : undefined,
modularizeImports: undefined,
experimental: {
fetchCache: false,
middlewarePrefetch: 'flexible',
......@@ -608,7 +610,6 @@ export const defaultConfig: NextConfig = {
disablePostcssPresetEnv: undefined,
amp: undefined,
urlImports: undefined,
modularizeImports: undefined,
enableUndici: false,
adjustFontFallbacks: false,
adjustFontFallbacksWithSizeAdjust: false,
......
......@@ -169,6 +169,7 @@ export type EventBuildFeatureUsage = {
| 'transpilePackages'
| 'skipMiddlewareUrlNormalize'
| 'skipTrailingSlashRedirect'
| 'modularizeImports'
invocationCount: number
}
export function eventBuildFeatureUsage(
......
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