fix: review updates

Author: wyattjoh

packages/next/src/build/analysis/get-page-static-info.ts

@@ -437,9 +437,11 @@ function warnAboutExperimentalEdge(apiRoute: string | null) {
   ) {
     return
   }
+
   if (apiRouteWarnings.has(apiRoute)) {
     return
   }
+
   Log.warn(
     apiRoute
       ? `${apiRoute} provided runtime 'experimental-edge'. It can be updated to 'edge' instead.`

packages/next/src/build/app-segments/app-segment-config.ts

@@ -55,7 +55,7 @@ export const AppSegmentConfigSchema = z.object({
   /**
    * The runtime to use for the page.
    */
-  runtime: z.enum(['edge', 'nodejs', 'experimental-edge']).optional(),
+  runtime: z.enum(['edge', 'nodejs']).optional(),
 
   /**
    * The maximum duration for the page in seconds.
@@ -109,7 +109,7 @@ export type AppSegmentConfig = {
   /**
    * The runtime to use for the page.
    */
-  runtime?: 'edge' | 'nodejs' | 'experimental-edge'
+  runtime?: 'edge' | 'nodejs'
 
   /**
    * The maximum duration for the page in seconds.

packages/next/src/build/app-segments/collect-app-segments.ts

@@ -24,20 +24,6 @@ import { getLayoutOrPageModule } from '../../server/lib/app-dir-module'
 
 type GenerateStaticParams = (options: { params?: Params }) => Promise<Params[]>
 
-/**
- * Filters out segments that don't contribute to static generation.
- *
- * @param segments the segments to filter
- * @returns the filtered segments
- */
-function filterSegments(segments: AppSegment[]) {
-  return segments.filter((result) => {
-    return (
-      result.config || result.generateStaticParams || result.isDynamicSegment
-    )
-  })
-}
-
 /**
  * Parses the app config and attaches it to the segment.
  */
@@ -60,6 +46,13 @@ function attach(segment: AppSegment, userland: unknown) {
   ) {
     segment.generateStaticParams =
       userland.generateStaticParams as GenerateStaticParams
+
+    // Validate that `generateStaticParams` makes sense in this context.
+    if (segment.config?.runtime === 'edge') {
+      throw new Error(
+        'Edge runtime is not supported with `generateStaticParams`.'
+      )
+    }
   }
 }
 
@@ -112,7 +105,7 @@ async function collectAppPageSegments(routeModule: AppPageRouteModule) {
     current = parallelRoutes.children
   }
 
-  return filterSegments(segments)
+  return segments
 }
 
 /**
@@ -154,7 +147,7 @@ function collectAppRouteSegments(
   // Extract the segment config from the userland module.
   attach(segment, routeModule.userland)
 
-  return filterSegments(segments)
+  return segments
 }
 
 /**

packages/next/src/build/utils.ts

@@ -76,6 +76,7 @@ import { normalizePagePath } from '../shared/lib/page-path/normalize-page-path'
 import { getRuntimeContext } from '../server/web/sandbox'
 import { isClientReference } from '../lib/client-reference'
 import { withStaticGenerationStore } from '../server/async-storage/with-static-generation-store'
+import type { CacheHandler } from '../server/lib/incremental-cache'
 import { IncrementalCache } from '../server/lib/incremental-cache'
 import { nodeFs } from '../server/lib/node-fs-methods'
 import * as ciEnvironment from '../server/ci-info'
@@ -1240,12 +1241,20 @@ export async function buildAppStaticPaths({
   isAppPPRFallbacksEnabled: boolean | undefined
   buildId: string
 }): Promise<PartialStaticPathsResult> {
-  ComponentMod.patchFetch()
+  if (
+    segments.some((generate) => generate.config?.dynamicParams === true) &&
+    nextConfigOutput === 'export'
+  ) {
+    throw new Error(
+      '"dynamicParams: true" cannot be used with "output: export". See more info here: https://nextjs.org/docs/app/building-your-application/deploying/static-exports'
+    )
+  }
 
-  let CacheHandler: any
+  ComponentMod.patchFetch()
 
+  let CurCacheHandler: typeof CacheHandler | undefined
   if (cacheHandler) {
-    CacheHandler = interopDefault(
+    CurCacheHandler = interopDefault(
       await import(formatDynamicImportPath(dir, cacheHandler)).then(
         (mod) => mod.default || mod
       )
@@ -1267,7 +1276,7 @@ export async function buildAppStaticPaths({
       notFoundRoutes: [],
       preview: null as any, // `preview` is special case read in next-dev-server
     }),
-    CurCacheHandler: CacheHandler,
+    CurCacheHandler,
     requestHeaders,
     minimalMode: ciEnvironment.hasNextSupport,
   })
@@ -1361,15 +1370,6 @@ export async function buildAppStaticPaths({
     }
   )
 
-  if (
-    segments.some((generate) => generate.config?.dynamicParams === true) &&
-    nextConfigOutput === 'export'
-  ) {
-    throw new Error(
-      '"dynamicParams: true" cannot be used with "output: export". See more info here: https://nextjs.org/docs/app/building-your-application/deploying/static-exports'
-    )
-  }
-
   for (const segment of segments) {
     // Check to see if there are any missing params for segments that have
     // dynamicParams set to false.
@@ -1588,7 +1588,14 @@ export async function isPageStatic({
 
         isClientComponent = isClientReference(componentsResult.ComponentMod)
 
-        const segments = await collectSegments(componentsResult)
+        let segments
+        try {
+          segments = await collectSegments(componentsResult)
+        } catch (err) {
+          throw new Error(`Failed to collect configuration for ${page}`, {
+            cause: err,
+          })
+        }
 
         appConfig = reduceAppConfig(await collectSegments(componentsResult))
 

packages/next/src/server/dev/static-paths-worker.ts

@@ -18,6 +18,7 @@ import {
   checkIsRoutePPREnabled,
   type ExperimentalPPRConfig,
 } from '../lib/experimental/ppr'
+import { InvariantError } from '../../shared/lib/invariant-error'
 
 type RuntimeConfig = {
   pprConfig: ExperimentalPPRConfig | undefined
@@ -80,22 +81,14 @@ export async function loadStaticPaths({
     isAppPath,
   })
 
-  if (!components.getStaticPaths && !isAppPath) {
-    // we shouldn't get to this point since the worker should
-    // only be called for SSG pages with getStaticPaths
-    throw new Error(
-      `Invariant: failed to load page with getStaticPaths for ${pathname}`
-    )
-  }
-
   if (isAppPath) {
     const segments = await collectSegments(components)
 
     const isRoutePPREnabled =
       isAppPageRouteModule(components.routeModule) &&
       checkIsRoutePPREnabled(config.pprConfig, reduceAppConfig(segments))
 
-    return await buildAppStaticPaths({
+    return buildAppStaticPaths({
       dir,
       page: pathname,
       dynamicIO: config.dynamicIO,
@@ -113,9 +106,15 @@ export async function loadStaticPaths({
       isAppPPRFallbacksEnabled,
       buildId,
     })
+  } else if (!components.getStaticPaths) {
+    // We shouldn't get to this point since the worker should only be called for
+    // SSG pages with getStaticPaths.
+    throw new InvariantError(
+      `Failed to load page with getStaticPaths for ${pathname}`
+    )
   }
 
-  return await buildStaticPaths({
+  return buildStaticPaths({
     page: pathname,
     getStaticPaths: components.getStaticPaths,
     configFileName: config.configFileName,

test/.stats-app/app/app-edge-ssr/page.js

@@ -2,4 +2,4 @@ export default function page() {
   return 'app-edge-ssr'
 }
 
-export const runtime = 'experimental-edge'
+export const runtime = 'edge'

test/e2e/app-dir/app-css/app/dashboard/page.js

@@ -13,4 +13,4 @@ export default function DashboardPage(props) {
   )
 }
 
-export const runtime = 'experimental-edge'
+export const runtime = 'edge'

test/e2e/app-dir/app-edge-root-layout/app/layout.js

@@ -6,4 +6,4 @@ export default function layout({ children }) {
   )
 }
 
-export const runtime = 'experimental-edge'
+export const runtime = 'edge'

test/e2e/app-dir/app-routes/app/edge/advanced/body/json/route.ts

@@ -1,7 +1,7 @@
 import type { NextRequest } from 'next/server'
 import { withRequestMeta } from '../../../../../helpers'
 
-export const runtime = 'experimental-edge'
+export const runtime = 'edge'
 
 export async function POST(request: NextRequest) {
   const body = await request.json()

test/e2e/app-dir/app-routes/app/edge/advanced/body/streaming/route.ts

@@ -1,6 +1,6 @@
 import type { NextRequest } from 'next/server'
 
-export const runtime = 'experimental-edge'
+export const runtime = 'edge'
 
 export async function POST(request: NextRequest) {
   const reader = request.body?.getReader()