fix types

vercel · Feb 23, 2025 · 14c0c2c · 14c0c2c
1 parent e8fc014
commit 14c0c2c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 20 deletions.
diff --git a/packages/next/src/export/index.ts b/packages/next/src/export/index.ts
@@ -381,20 +381,18 @@ async function exportAppImpl(
     strictNextHead: nextConfig.experimental.strictNextHead ?? true,
     deploymentId: nextConfig.deploymentId,
     htmlLimitedBots: nextConfig.htmlLimitedBots.source,
+    streamingMetadata:
+      // Disable streaming metadata when dynamic IO is enabled.
+      // FIXME: remove dynamic IO guard once we fixed the dynamic indicator case.
+      // test/e2e/app-dir/dynamic-io/dynamic-io.test.ts - should not have static indicator on not-found route
+      !nextConfig.experimental.dynamicIO,
     experimental: {
       clientTraceMetadata: nextConfig.experimental.clientTraceMetadata,
       expireTime: nextConfig.expireTime,
       dynamicIO: nextConfig.experimental.dynamicIO ?? false,
       clientSegmentCache: nextConfig.experimental.clientSegmentCache ?? false,
       inlineCss: nextConfig.experimental.inlineCss ?? false,
       authInterrupts: !!nextConfig.experimental.authInterrupts,
-      streamingMetadata:
-        // Disable streaming metadata when dynamic IO is enabled.
-        // FIXME: remove dynamic IO guard once we fixed the dynamic indicator case.
-        // test/e2e/app-dir/dynamic-io/dynamic-io.test.ts - should not have static indicator on not-found route
-        !nextConfig.experimental.dynamicIO &&
-        !!nextConfig.experimental.streamingMetadata,
-      htmlLimitedBots: nextConfig.experimental.htmlLimitedBots,
     },
     reactMaxHeadersLength: nextConfig.reactMaxHeadersLength,
   }

diff --git a/packages/next/src/export/types.ts b/packages/next/src/export/types.ts
@@ -62,6 +62,7 @@ export interface ExportPageInput {
   nextConfigOutput?: NextConfigComplete['output']
   enableExperimentalReact?: boolean
   sriEnabled: boolean
+  streamingMetadata: boolean | undefined
 }
 
 export type ExportRouteResult =

diff --git a/packages/next/src/export/worker.ts b/packages/next/src/export/worker.ts
@@ -429,8 +429,7 @@ export async function exportPages(
               // Disable streaming metadata when dynamic IO is enabled.
               // FIXME: remove dynamic IO guard once we fixed the dynamic indicator case.
               // test/e2e/app-dir/dynamic-io/dynamic-io.test.ts - should not have static indicator on not-found route
-              !nextConfig.experimental.dynamicIO &&
-              !!nextConfig.experimental.streamingMetadata,
+              !nextConfig.experimental.dynamicIO,
           }),
           // If exporting the page takes longer than the timeout, reject the promise.
           new Promise((_, reject) => {

diff --git a/packages/next/src/server/app-render/types.ts b/packages/next/src/server/app-render/types.ts
@@ -205,6 +205,7 @@ export interface RenderOptsPartial {
   params?: ParsedUrlQuery
   isPrefetch?: boolean
   htmlLimitedBots: string | undefined
+  streamingMetadata: boolean
   experimental: {
     /**
      * When true, it indicates that the current page supports partial

diff --git a/packages/next/src/server/base-server.ts b/packages/next/src/server/base-server.ts
@@ -604,6 +604,11 @@ export default abstract class Server<
       isExperimentalCompile: this.nextConfig.experimental.isExperimentalCompile,
       // `htmlLimitedBots` is passed to server as serialized config in string format
       htmlLimitedBots: this.nextConfig.htmlLimitedBots,
+      streamingMetadata:
+        // Disable streaming metadata when dynamic IO is enabled.
+        // FIXME: remove dynamic IO guard once we fixed the dynamic indicator case.
+        // test/e2e/app-dir/dynamic-io/dynamic-io.test.ts - should not have static indicator on not-found route
+        !this.nextConfig.experimental.dynamicIO,
       experimental: {
         expireTime: this.nextConfig.expireTime,
         clientTraceMetadata: this.nextConfig.experimental.clientTraceMetadata,
@@ -612,13 +617,6 @@ export default abstract class Server<
           this.nextConfig.experimental.clientSegmentCache ?? false,
         inlineCss: this.nextConfig.experimental.inlineCss ?? false,
         authInterrupts: !!this.nextConfig.experimental.authInterrupts,
-        streamingMetadata:
-          // Disable streaming metadata when dynamic IO is enabled.
-          // FIXME: remove dynamic IO guard once we fixed the dynamic indicator case.
-          // test/e2e/app-dir/dynamic-io/dynamic-io.test.ts - should not have static indicator on not-found route
-          !this.nextConfig.experimental.dynamicIO &&
-          !!this.nextConfig.experimental.streamingMetadata,
-        htmlLimitedBots: this.nextConfig.experimental.htmlLimitedBots,
       },
       onInstrumentationRequestError:
         this.instrumentationOnRequestError.bind(this),
@@ -1771,10 +1769,11 @@ export default abstract class Server<
         ...this.renderOpts,
         supportsDynamicResponse: !isBotRequest,
         botType: getBotType(ua),
-        serveStreamingMetadata: shouldServeStreamingMetadata(
-          ua,
-          this.renderOpts.htmlLimitedBots
-        ),
+        serveStreamingMetadata: shouldServeStreamingMetadata(ua, {
+          dynamicIO: !!this.nextConfig.experimental.dynamicIO,
+          streamingMetadata: !!this.renderOpts.streamingMetadata,
+          htmlLimitedBots: this.nextConfig.htmlLimitedBots,
+        }),
       },
     }