Async Storage Cleanup

packages/next/src/build/webpack/loaders/next-edge-app-route-loader/handle.ts

@@ -30,7 +30,7 @@ export function getHandle({ page, mod }: any) {
       extendedReq,
       extendedRes,
       // TODO: pass incrementalCache here
-      {},
+      { supportsDynamicHTML: true },
       request
     )
 

packages/next/src/client/components/static-generation-async-storage.ts

@@ -8,7 +8,7 @@ export interface StaticGenerationStore {
   readonly isRevalidate?: boolean
 
   forceDynamic?: boolean
-  revalidate?: boolean | number
+  revalidate?: false | number
   forceStatic?: boolean
   dynamicShouldError?: boolean
   pendingRevalidates?: Promise<any>[]

packages/next/src/server/app-render.tsx

@@ -45,8 +45,8 @@ import type { StaticGenerationAsyncStorage } from '../client/components/static-g
 import type { RequestAsyncStorage } from '../client/components/request-async-storage'
 import { formatServerError } from '../lib/format-server-error'
 import { MetadataTree } from '../lib/metadata/metadata'
-import { runWithRequestAsyncStorage } from './run-with-request-async-storage'
-import { runWithStaticGenerationAsyncStorage } from './run-with-static-generation-async-storage'
+import { RequestAsyncStorageWrapper } from './async-storage/request-async-storage-wrapper'
+import { StaticGenerationAsyncStorageWrapper } from './async-storage/static-generation-async-storage-wrapper'
 import { collectMetadata } from '../lib/metadata/resolve-metadata'
 import type { MetadataItems } from '../lib/metadata/resolve-metadata'
 import { isClientReference } from '../build/is-client-reference'
@@ -184,7 +184,7 @@ export type RenderOptsPartial = {
   dev?: boolean
   serverComponentManifest?: FlightManifest
   serverCSSManifest?: FlightCSSManifest
-  supportsDynamicHTML?: boolean
+  supportsDynamicHTML: boolean
   runtime?: ServerRuntime
   serverComponents?: boolean
   assetPrefix?: string
@@ -2001,11 +2001,11 @@ export async function renderToHTMLOrFlight(
     return renderResult
   }
 
-  return runWithRequestAsyncStorage(
+  return RequestAsyncStorageWrapper.wrap(
     requestAsyncStorage,
     { req, res, renderOpts },
     () =>
-      runWithStaticGenerationAsyncStorage(
+      StaticGenerationAsyncStorageWrapper.wrap(
         staticGenerationAsyncStorage,
         { pathname, renderOpts },
         () => wrappedRender()

packages/next/src/server/async-storage/static-generation-async-storage-wrapper.ts

@@ -7,7 +7,7 @@ export type RequestContext = {
   pathname: string
   renderOpts: {
     incrementalCache?: IncrementalCache
-    supportsDynamicHTML?: boolean
+    supportsDynamicHTML: boolean
     isRevalidate?: boolean
     isBot?: boolean
   }
@@ -45,11 +45,8 @@ export class StaticGenerationAsyncStorageWrapper
      * These rules help ensure that other existing features like request caching,
      * coalescing, and ISR continue working as intended.
      */
-    const supportsDynamicHTML =
-      typeof renderOpts.supportsDynamicHTML !== 'boolean' ||
-      renderOpts.supportsDynamicHTML
-
-    const isStaticGeneration = !supportsDynamicHTML && !renderOpts.isBot
+    const isStaticGeneration =
+      !renderOpts.supportsDynamicHTML && !renderOpts.isBot
 
     const store: StaticGenerationStore = {
       isStaticGeneration,

packages/next/src/server/future/route-handlers/app-route-route-handler.ts

@@ -93,7 +93,7 @@ export type AppRouteModule = {
 
 export type StaticGenerationContext = {
   incrementalCache?: IncrementalCache
-  supportsDynamicHTML?: boolean
+  supportsDynamicHTML: boolean
 }
 
 /**
@@ -309,23 +309,25 @@ export class AppRouteRouteHandler implements RouteHandler<AppRouteRouteMatch> {
           staticGenerationAsyncStorage,
           {
             pathname: definition.pathname,
-            renderOpts: context || {},
+            renderOpts: context ?? {
+              supportsDynamicHTML: false,
+            },
           },
           () => {
             const _req = (request ? request : wrapRequest(req)) as NextRequest
 
             // We can currently only statically optimize if only GET/HEAD
             // are used as a Prerender can't be used conditionally based
             // on the method currently
-            const nonStaticHandlers = [
+            const nonStaticHandlers: ReadonlyArray<HTTP_METHOD> = [
               'OPTIONS',
               'POST',
               'PUT',
               'DELETE',
               'PATCH',
             ]
             const usedNonStaticHandlers = nonStaticHandlers.filter(
-              (name) => !!(module.handlers as any)[name]
+              (name) => name in module.handlers
             )
 
             if (usedNonStaticHandlers.length > 0) {

packages/next/src/server/render.tsx

@@ -254,7 +254,7 @@ export type RenderOptsPartial = {
   defaultLocale?: string
   domainLocales?: DomainLocale[]
   disableOptimizedLoading?: boolean
-  supportsDynamicHTML?: boolean
+  supportsDynamicHTML: boolean
   isBot?: boolean
   runtime?: ServerRuntime
   serverComponents?: boolean