Merge branch 'main' into michalpiechowiak/frb-1360-v15-canary-dynamic-routes-with-fallback-true-are-failing

Author: pieh

package-lock.json

@@ -55,7 +55,7 @@
     "@netlify/edge-functions": "^2.11.0",
     "@netlify/eslint-config-node": "^7.0.1",
     "@netlify/functions": "^2.8.2",
-    "@netlify/serverless-functions-api": "^1.29.0",
+    "@netlify/serverless-functions-api": "^1.29.1",
     "@netlify/zip-it-and-ship-it": "^9.40.0",
     "@opentelemetry/api": "^1.8.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.51.0",

package.json

@@ -36,27 +36,46 @@ interface ApiBackgroundConfig {
 type ApiConfig = ApiStandardConfig | ApiScheduledConfig | ApiBackgroundConfig
 
 export async function getAPIRoutesConfigs(ctx: PluginContext) {
+  const uniqueApiRoutes = new Set<string>()
+
   const functionsConfigManifestPath = join(
     ctx.publishDir,
     'server',
     'functions-config-manifest.json',
   )
-  if (!existsSync(functionsConfigManifestPath)) {
+  if (existsSync(functionsConfigManifestPath)) {
     // before https://github.com/vercel/next.js/pull/60163 this file might not have been produced if there were no API routes at all
-    return []
+    const functionsConfigManifest = JSON.parse(
+      await readFile(functionsConfigManifestPath, 'utf-8'),
+    ) as FunctionsConfigManifest
+
+    for (const apiRoute of Object.keys(functionsConfigManifest.functions)) {
+      uniqueApiRoutes.add(apiRoute)
+    }
+  }
+
+  const pagesManifestPath = join(ctx.publishDir, 'server', 'pages-manifest.json')
+  if (existsSync(pagesManifestPath)) {
+    const pagesManifest = JSON.parse(await readFile(pagesManifestPath, 'utf-8'))
+    for (const route of Object.keys(pagesManifest)) {
+      if (route.startsWith('/api/')) {
+        uniqueApiRoutes.add(route)
+      }
+    }
   }
 
-  const functionsConfigManifest = JSON.parse(
-    await readFile(functionsConfigManifestPath, 'utf-8'),
-  ) as FunctionsConfigManifest
+  // no routes to analyze
+  if (uniqueApiRoutes.size === 0) {
+    return []
+  }
 
   const appDir = ctx.resolveFromSiteDir('.')
   const pagesDir = join(appDir, 'pages')
   const srcPagesDir = join(appDir, 'src', 'pages')
   const { pageExtensions } = ctx.requiredServerFiles.config
 
   return Promise.all(
-    Object.keys(functionsConfigManifest.functions).map(async (apiRoute) => {
+    [...uniqueApiRoutes].map(async (apiRoute) => {
       const filePath = getSourceFileForPage(apiRoute, [pagesDir, srcPagesDir], pageExtensions)
 
       const sharedFields = {