run config deprecation checks only on user-provided configuration

Author: ztanner

packages/next/src/server/config.ts

@@ -89,6 +89,84 @@ export function warnOptionHasBeenDeprecated(
   return hasWarned
 }
 
+function checkDeprecations(
+  userConfig: NextConfig,
+  configFileName: string,
+  silent: boolean,
+  dir: string
+) {
+  warnOptionHasBeenDeprecated(
+    userConfig,
+    'amp',
+    `Built-in amp support is deprecated and the \`amp\` configuration option will be removed in Next.js 16.`,
+    silent
+  )
+
+  warnOptionHasBeenDeprecated(
+    userConfig,
+    'experimental.amp',
+    `Built-in amp support is deprecated and the \`experimental.amp\` configuration option will be removed in Next.js 16.`,
+    silent
+  )
+
+  if (userConfig.experimental?.dynamicIO !== undefined) {
+    warnOptionHasBeenDeprecated(
+      userConfig,
+      'experimental.dynamicIO',
+      `\`experimental.dynamicIO\` has been renamed to \`experimental.cacheComponents\`. Please update your ${configFileName} file accordingly.`,
+      silent
+    )
+  }
+
+  warnOptionHasBeenDeprecated(
+    userConfig,
+    'experimental.instrumentationHook',
+    `\`experimental.instrumentationHook\` is no longer needed, because \`instrumentation.js\` is available by default. You can remove it from ${configFileName}.`,
+    silent
+  )
+
+  warnOptionHasBeenDeprecated(
+    userConfig,
+    'experimental.after',
+    `\`experimental.after\` is no longer needed, because \`after\` is available by default. You can remove it from ${configFileName}.`,
+    silent
+  )
+
+  warnOptionHasBeenDeprecated(
+    userConfig,
+    'devIndicators.appIsrStatus',
+    `\`devIndicators.appIsrStatus\` is deprecated and no longer configurable. Please remove it from ${configFileName}.`,
+    silent
+  )
+
+  warnOptionHasBeenDeprecated(
+    userConfig,
+    'devIndicators.buildActivity',
+    `\`devIndicators.buildActivity\` is deprecated and no longer configurable. Please remove it from ${configFileName}.`,
+    silent
+  )
+
+  warnOptionHasBeenDeprecated(
+    userConfig,
+    'devIndicators.buildActivityPosition',
+    `\`devIndicators.buildActivityPosition\` has been renamed to \`devIndicators.position\`. Please update your ${configFileName} file accordingly.`,
+    silent
+  )
+
+  // i18n deprecation for App Router
+  if (userConfig.i18n) {
+    const hasAppDir = Boolean(findDir(dir, 'app'))
+    if (hasAppDir) {
+      warnOptionHasBeenDeprecated(
+        userConfig,
+        'i18n',
+        `i18n configuration in ${configFileName} is unsupported in App Router.\nLearn more about internationalization in App Router: https://nextjs.org/docs/app/building-your-application/routing/internationalization`,
+        silent
+      )
+    }
+  }
+}
+
 export function warnOptionHasBeenMovedOutOfExperimental(
   config: NextConfig,
   oldExperimentalKey: string,
@@ -161,35 +239,8 @@ function assignDefaults(
     delete userConfig.exportTrailingSlash
   }
 
-  // There are a good amount of test fixtures that have amp enabled
-  // that also assert on stderr output being empty, so we're gating the
-  // warning to be skipped when running in Next.js tests until we fully
-  // remove the feature.
-  if (!process.env.__NEXT_TEST_MODE) {
-    warnOptionHasBeenDeprecated(
-      userConfig,
-      'amp',
-      `Built-in amp support is deprecated and the \`amp\` configuration option will be removed in Next.js 16.`,
-      silent
-    )
-
-    warnOptionHasBeenDeprecated(
-      userConfig,
-      'experimental.amp',
-      `Built-in amp support is deprecated and the \`experimental.amp\` configuration option will be removed in Next.js 16.`,
-      silent
-    )
-  }
-
-  // Handle deprecation of experimental.dynamicIO and migrate to experimental.cacheComponents
+  // Handle migration of experimental.dynamicIO to experimental.cacheComponents
   if (userConfig.experimental?.dynamicIO !== undefined) {
-    warnOptionHasBeenDeprecated(
-      userConfig,
-      'experimental.dynamicIO',
-      `\`experimental.dynamicIO\` has been renamed to \`experimental.cacheComponents\`. Please update your ${configFileName} file accordingly.`,
-      silent
-    )
-
     // If cacheComponents was not explicitly set by the user (i.e., it's still the default value),
     // use the dynamicIO value. We check against the user config, not the merged result.
     if (userConfig.experimental?.cacheComponents === undefined) {
@@ -532,49 +583,17 @@ function assignDefaults(
     silent
   )
 
-  warnOptionHasBeenDeprecated(
-    result,
-    'experimental.instrumentationHook',
-    `\`experimental.instrumentationHook\` is no longer needed, because \`instrumentation.js\` is available by default. You can remove it from ${configFileName}.`,
-    silent
-  )
-
-  warnOptionHasBeenDeprecated(
-    result,
-    'experimental.after',
-    `\`experimental.after\` is no longer needed, because \`after\` is available by default. You can remove it from ${configFileName}.`,
-    silent
-  )
-
-  warnOptionHasBeenDeprecated(
-    result,
-    'devIndicators.appIsrStatus',
-    `\`devIndicators.appIsrStatus\` is deprecated and no longer configurable. Please remove it from ${configFileName}.`,
-    silent
-  )
-
-  warnOptionHasBeenDeprecated(
-    result,
-    'devIndicators.buildActivity',
-    `\`devIndicators.buildActivity\` is deprecated and no longer configurable. Please remove it from ${configFileName}.`,
-    silent
-  )
-
-  const hasWarnedBuildActivityPosition = warnOptionHasBeenDeprecated(
-    result,
-    'devIndicators.buildActivityPosition',
-    `\`devIndicators.buildActivityPosition\` has been renamed to \`devIndicators.position\`. Please update your ${configFileName} file accordingly.`,
-    silent
-  )
+  // Handle buildActivityPosition migration (needs to be done after merging with defaults)
   if (
-    hasWarnedBuildActivityPosition &&
     result.devIndicators !== false &&
     'buildActivityPosition' in result.devIndicators &&
     result.devIndicators.buildActivityPosition !== result.devIndicators.position
   ) {
-    Log.warnOnce(
-      `The \`devIndicators\` option \`buildActivityPosition\` ("${result.devIndicators.buildActivityPosition}") conflicts with \`position\` ("${result.devIndicators.position}"). Using \`buildActivityPosition\` ("${result.devIndicators.buildActivityPosition}") for backward compatibility.`
-    )
+    if (!silent) {
+      Log.warnOnce(
+        `The \`devIndicators\` option \`buildActivityPosition\` ("${result.devIndicators.buildActivityPosition}") conflicts with \`position\` ("${result.devIndicators.position}"). Using \`buildActivityPosition\` ("${result.devIndicators.buildActivityPosition}") for backward compatibility.`
+      )
+    }
     result.devIndicators.position = result.devIndicators.buildActivityPosition
   }
 
@@ -743,17 +762,6 @@ function assignDefaults(
   setHttpClientAndAgentOptions(result || defaultConfig)
 
   if (result.i18n) {
-    const hasAppDir = Boolean(findDir(dir, 'app'))
-
-    if (hasAppDir) {
-      warnOptionHasBeenDeprecated(
-        result,
-        'i18n',
-        `i18n configuration in ${configFileName} is unsupported in App Router.\nLearn more about internationalization in App Router: https://nextjs.org/docs/app/building-your-application/routing/internationalization`,
-        silent
-      )
-    }
-
     const { i18n } = result
     const i18nType = typeof i18n
 
@@ -1401,6 +1409,9 @@ export default async function loadConfig(
     // Clone a new userConfig each time to avoid mutating the original
     const userConfig = cloneObject(loadedConfig) as NextConfig
 
+    // Check deprecation warnings on the actual user config before merging with defaults
+    checkDeprecations(userConfig, configFileName, silent, dir)
+
     // Always validate the config against schema in non minimal mode.
     // Only validate once in the root Next.js process, not in forked processes.
     const isRootProcess = typeof process.send !== 'function'