fix: resolve rebase conflicts

Author: bgub

packages/next/src/cli/next-typegen.ts

@@ -66,10 +66,11 @@ const nextTypegen = async (
 
   let pageRoutes: RouteInfo[] = []
   let appRoutes: RouteInfo[] = []
+  let appRouteHandlers: RouteInfo[] = []
   let layoutRoutes: RouteInfo[] = []
   let slots: SlotInfo[] = []
 
-  let _pageApiRoutes: RouteInfo[] = []
+  let pageApiRoutes: RouteInfo[] = []
 
   let mappedPages: { [page: string]: string } = {}
   let mappedAppPages: { [page: string]: string } = {}
@@ -100,7 +101,7 @@ const nextTypegen = async (
     // Process pages routes
     const processedPages = processPageRoutes(mappedPages, baseDir)
     pageRoutes = processedPages.pageRoutes
-    _pageApiRoutes = processedPages.pageApiRoutes
+    pageApiRoutes = processedPages.pageApiRoutes
   }
 
   // Build app routes
@@ -116,7 +117,9 @@ const nextTypegen = async (
 
     // Process app routes and extract slots
     slots = extractSlotsFromAppRoutes(mappedAppPages)
-    appRoutes = processAppRoutes(mappedAppPages, baseDir)
+    const result = processAppRoutes(mappedAppPages, validFileMatcher)
+    appRoutes = result.appRoutes
+    appRouteHandlers = result.appRouteHandlers
 
     // Process layout routes
     layoutRoutes = processLayoutRoutes(mappedAppLayouts, baseDir)
@@ -126,6 +129,8 @@ const nextTypegen = async (
     dir: baseDir,
     pageRoutes,
     appRoutes,
+    appRouteHandlers,
+    pageApiRoutes,
     layoutRoutes,
     slots,
     redirects: nextConfig.redirects,

packages/next/src/server/lib/router-utils/route-types-utils.ts

@@ -297,7 +297,7 @@ export async function writeValidatorFile(
   const dirname = path.dirname(filePath)
 
   if (!fs.existsSync(dirname)) {
-    await mkdir(dirname, { recursive: true })
+    await fs.promises.mkdir(dirname, { recursive: true })
   }
 
   await fs.promises.writeFile(filePath, generateValidatorFile(manifest))