feat: support server, cache, root params types

Author: bgub

packages/next/src/build/index.ts

@@ -223,6 +223,8 @@ import {
   createRouteTypesManifest,
   writeRouteTypesManifest,
   writeValidatorFile,
+  writeServerTypesFile,
+  writeCacheLifeTypesFile,
 } from '../server/lib/router-utils/route-types-utils'
 
 type Fallback = null | boolean | string
@@ -1340,6 +1342,34 @@ export default async function build(
             layoutRoutes = processLayoutRoutes(mappedAppLayouts, dir)
           }
 
+          // Collect layout parameters for root params extraction
+          // Find the root layout (shortest path with dynamic segments)
+          const collectedRootParams: Record<string, string[]> = {}
+
+          // Find layouts that could be root layouts (have dynamic segments)
+          const layoutsWithParams = layoutRoutes
+            .map(({ route }) => {
+              const foundParams = Array.from(
+                route.matchAll(/\[(.*?)\]/g),
+                (match) => match[1]
+              )
+              return { route, params: foundParams }
+            })
+            .filter(({ params }) => params.length > 0)
+
+          // Sort by path depth (ascending) to find the shallowest layout with params
+          layoutsWithParams.sort((a, b) => {
+            const aDepth = a.route.split('/').length
+            const bDepth = b.route.split('/').length
+            return aDepth - bDepth
+          })
+
+          // The root layout is the shallowest layout with dynamic segments
+          if (layoutsWithParams.length > 0) {
+            const rootLayout = layoutsWithParams[0]
+            collectedRootParams[rootLayout.route] = rootLayout.params
+          }
+
           const routeTypesManifest = await createRouteTypesManifest({
             dir,
             pageRoutes,
@@ -1352,8 +1382,35 @@ export default async function build(
             rewrites: config.rewrites,
           })
 
+          // Add collected root params and cache life config to manifest
+          routeTypesManifest.collectedRootParams = collectedRootParams
+          routeTypesManifest.cacheLifeConfig = config.experimental?.cacheLife
+
           await writeRouteTypesManifest(routeTypesManifest, routeTypesFilePath)
           await writeValidatorFile(routeTypesManifest, validatorFilePath)
+
+          // Generate server types if we have root params
+          if (Object.keys(collectedRootParams).length > 0) {
+            const serverTypesFilePath = path.join(
+              distDir,
+              'types',
+              'server.d.ts'
+            )
+            await writeServerTypesFile(routeTypesManifest, serverTypesFilePath)
+          }
+
+          // Generate cache life types if we have cache life config
+          if (config.experimental?.cacheLife) {
+            const cacheLifeTypesFilePath = path.join(
+              distDir,
+              'types',
+              'cache-life.d.ts'
+            )
+            await writeCacheLifeTypesFile(
+              routeTypesManifest,
+              cacheLifeTypesFilePath
+            )
+          }
         })
 
       // Turbopack already handles conflicting app and page routes.

packages/next/src/build/webpack-config.ts

@@ -51,7 +51,6 @@ import { CopyFilePlugin } from './webpack/plugins/copy-file-plugin'
 import { ClientReferenceManifestPlugin } from './webpack/plugins/flight-manifest-plugin'
 import { FlightClientEntryPlugin as NextFlightClientEntryPlugin } from './webpack/plugins/flight-client-entry-plugin'
 import { RspackFlightClientEntryPlugin } from './webpack/plugins/rspack-flight-client-entry-plugin'
-import { NextTypesPlugin } from './webpack/plugins/next-types-plugin'
 import type {
   Feature,
   SWC_TARGET_TRIPLE,
@@ -319,8 +318,6 @@ export default async function getBaseWebpackConfig(
     pagesDir,
     reactProductionProfiling = false,
     rewrites,
-    originalRewrites,
-    originalRedirects,
     runWebpackSpan,
     appDir,
     middlewareMatchers,
@@ -389,7 +386,6 @@ export default async function getBaseWebpackConfig(
 
   const hasAppDir = !!appDir
   const disableOptimizedLoading = true
-  const enableTypedRoutes = !!config.experimental.typedRoutes && hasAppDir
   const bundledReactChannel = needsExperimentalReact(config)
     ? '-experimental'
     : ''
@@ -2143,20 +2139,6 @@ export default async function getBaseWebpackConfig(
               isEdgeServer,
               encryptionKey,
             })),
-      hasAppDir &&
-        !isClient &&
-        new NextTypesPlugin({
-          dir,
-          distDir: config.distDir,
-          appDir,
-          dev,
-          isEdgeServer,
-          pageExtensions: config.pageExtensions,
-          typedRoutes: enableTypedRoutes,
-          cacheLifeConfig: config.experimental.cacheLife,
-          originalRewrites,
-          originalRedirects,
-        }),
       !dev &&
         isClient &&
         !!config.experimental.sri?.algorithm &&