Development: Clarify TypescriptStatus in watcher

timneutkens · timneutkens · commit 586026fcb2a4 · 2025-09-16T22:22:19.000+02:00
diff --git a/packages/next/src/server/lib/router-utils/setup-dev-bundler.ts b/packages/next/src/server/lib/router-utils/setup-dev-bundler.ts
@@ -133,7 +133,6 @@ export type ServerFields = {
 }
 
 async function verifyTypeScript(opts: SetupOpts) {
-  let usingTypeScript = false
   const verifyResult = await verifyTypeScriptSetup({
     dir: opts.dir,
     distDir: opts.nextConfig.distDir,
@@ -146,9 +145,9 @@ async function verifyTypeScript(opts: SetupOpts) {
   })
 
   if (verifyResult.version) {
-    usingTypeScript = true
+    return true
   }
-  return usingTypeScript
+  return false
 }
 
 export async function propagateServerField(
@@ -242,8 +241,6 @@ async function startWatcher(
     opts.nextConfig
   )
 
-  const usingTypeScript = await verifyTypeScript(opts)
-
   const routesManifestPath = path.join(distDir, ROUTES_MANIFEST)
   const routesManifest: DevRoutesManifest = {
     version: 3,
@@ -348,14 +345,15 @@ async function startWatcher(
       },
     })
     const fileWatchTimes = new Map()
-    let enabledTypeScript = usingTypeScript
+    let enabledTypeScript = await verifyTypeScript(opts)
     let previousClientRouterFilters: any
     let previousConflictingPagePaths: Set<string> = new Set()
 
     const routeTypesFilePath = path.join(distDir, 'types', 'routes.d.ts')
     const validatorFilePath = path.join(distDir, 'types', 'validator.ts')
 
     wp.on('aggregated', async () => {
+      let typescriptStatusFromLastAggregation = enabledTypeScript
       let middlewareMatchers: MiddlewareMatcher[] | undefined
       const routedPages: string[] = []
       const knownFiles = wp.getTimeInfoEntries()
@@ -728,7 +726,8 @@ async function startWatcher(
         }
       }
 
-      if (!usingTypeScript && enabledTypeScript) {
+      // Using === false to make the check clearer.
+      if (typescriptStatusFromLastAggregation === false && enabledTypeScript) {
         // we tolerate the error here as this is best effort
         // and the manual install command will be shown
         await verifyTypeScript(opts)
@@ -753,7 +752,7 @@ async function startWatcher(
             }
           )
 
-          if (usingTypeScript && nextConfig.experimental?.typedEnv) {
+          if (enabledTypeScript && nextConfig.experimental?.typedEnv) {
             // do not await, this is not essential for further process
             createEnvDefinitions({
               distDir,
@@ -1091,7 +1090,7 @@ async function startWatcher(
         }
         prevSortedRoutes = sortedRoutes
 
-        if (usingTypeScript) {
+        if (enabledTypeScript) {
           const routeTypesManifest = await createRouteTypesManifest({
             dir,
             pageRoutes,
