Merge branch 'canary' into revert-84526-revert-84376-sokra/avoid-double-invalidation

Author: sokra

crates/next-api/src/project.rs

@@ -1073,6 +1073,7 @@ impl Project {
             turbo_source_maps: self.next_config().server_source_maps(),
             no_mangling: self.no_mangling(),
             scope_hoisting: self.next_config().turbo_scope_hoisting(self.next_mode()),
+            debug_ids: self.next_config().turbopack_debug_ids(),
         };
         Ok(if client_assets {
             get_server_chunking_context_with_client_assets(

crates/next-core/src/next_server/context.rs

@@ -993,6 +993,7 @@ pub struct ServerChunkingContextOptions {
     pub turbo_source_maps: Vc<bool>,
     pub no_mangling: Vc<bool>,
     pub scope_hoisting: Vc<bool>,
+    pub debug_ids: Vc<bool>,
 }
 
 #[turbo_tasks::function]
@@ -1013,6 +1014,7 @@ pub async fn get_server_chunking_context_with_client_assets(
         turbo_source_maps,
         no_mangling,
         scope_hoisting,
+        debug_ids,
     } = options;
 
     let next_mode = mode.await?;
@@ -1045,7 +1047,8 @@ pub async fn get_server_chunking_context_with_client_assets(
     })
     .module_id_strategy(module_id_strategy.to_resolved().await?)
     .export_usage(*export_usage.await?)
-    .file_tracing(next_mode.is_production());
+    .file_tracing(next_mode.is_production())
+    .debug_ids(*debug_ids.await?);
 
     if next_mode.is_development() {
         builder = builder.use_file_source_map_uris();
@@ -1089,6 +1092,7 @@ pub async fn get_server_chunking_context(
         turbo_source_maps,
         no_mangling,
         scope_hoisting,
+        debug_ids,
     } = options;
     let next_mode = mode.await?;
     // TODO(alexkirsz) This should return a trait that can be implemented by the
@@ -1118,7 +1122,8 @@ pub async fn get_server_chunking_context(
     })
     .module_id_strategy(module_id_strategy.to_resolved().await?)
     .export_usage(*export_usage.await?)
-    .file_tracing(next_mode.is_production());
+    .file_tracing(next_mode.is_production())
+    .debug_ids(*debug_ids.await?);
 
     if next_mode.is_development() {
         builder = builder.use_file_source_map_uris()

errors/invalid-prefetch-configuration.mdx

@@ -0,0 +1,31 @@
+---
+title: Invalid Prefetch Configuration
+---
+
+## Why This Message Occurred
+
+You provided an invalid configuration for `export const unstable_prefetch` in a Layout or Page file.
+
+### Example of Correct Usage
+
+#### Static Prefetching
+
+```tsx filename="app/.../layout.tsx"
+export const unstable_prefetch = {
+  mode: 'static',
+}
+```
+
+#### Runtime Prefetching
+
+```tsx filename="app/[slug]/page.tsx"
+export const unstable_prefetch = {
+  mode: 'runtime',
+  samples: [
+    {
+      cookies: [{ name: 'experiment', value: 'A' }],
+      params: { slug: 'example' },
+    },
+  ],
+}
+```

package.json

@@ -199,7 +199,7 @@
     "eslint-plugin-jsdoc": "48.0.4",
     "eslint-plugin-mdx": "3.1.5",
     "eslint-plugin-react": "7.35.0",
-    "eslint-plugin-react-hooks": "0.0.0-experimental-85c427d8-20251003",
+    "eslint-plugin-react-hooks": "0.0.0-experimental-4fdf7cf2-20251003",
     "eslint-v8": "npm:eslint@^8.57.0",
     "event-stream": "4.0.1",
     "execa": "2.0.3",
@@ -259,16 +259,16 @@
     "pretty-ms": "7.0.0",
     "random-seed": "0.3.0",
     "react": "19.0.0",
-    "react-builtin": "npm:[email protected]85c427d8-20251003",
+    "react-builtin": "npm:[email protected]4fdf7cf2-20251003",
     "react-dom": "19.0.0",
-    "react-dom-builtin": "npm:[email protected]85c427d8-20251003",
-    "react-dom-experimental-builtin": "npm:[email protected]85c427d8-20251003",
-    "react-experimental-builtin": "npm:[email protected]85c427d8-20251003",
-    "react-is-builtin": "npm:[email protected]85c427d8-20251003",
-    "react-server-dom-turbopack": "19.3.0-canary-85c427d8-20251003",
-    "react-server-dom-turbopack-experimental": "npm:[email protected]85c427d8-20251003",
-    "react-server-dom-webpack": "19.3.0-canary-85c427d8-20251003",
-    "react-server-dom-webpack-experimental": "npm:[email protected]85c427d8-20251003",
+    "react-dom-builtin": "npm:[email protected]4fdf7cf2-20251003",
+    "react-dom-experimental-builtin": "npm:[email protected]4fdf7cf2-20251003",
+    "react-experimental-builtin": "npm:[email protected]4fdf7cf2-20251003",
+    "react-is-builtin": "npm:[email protected]4fdf7cf2-20251003",
+    "react-server-dom-turbopack": "19.3.0-canary-4fdf7cf2-20251003",
+    "react-server-dom-turbopack-experimental": "npm:[email protected]4fdf7cf2-20251003",
+    "react-server-dom-webpack": "19.3.0-canary-4fdf7cf2-20251003",
+    "react-server-dom-webpack-experimental": "npm:[email protected]4fdf7cf2-20251003",
     "react-ssr-prepass": "1.0.8",
     "react-virtualized": "9.22.3",
     "relay-compiler": "13.0.2",
@@ -278,8 +278,8 @@
     "resolve-from": "5.0.0",
     "sass": "1.54.0",
     "satori": "0.15.2",
-    "scheduler-builtin": "npm:[email protected]85c427d8-20251003",
-    "scheduler-experimental-builtin": "npm:[email protected]85c427d8-20251003",
+    "scheduler-builtin": "npm:[email protected]4fdf7cf2-20251003",
+    "scheduler-experimental-builtin": "npm:[email protected]4fdf7cf2-20251003",
     "seedrandom": "3.0.5",
     "semver": "7.3.7",
     "serve-handler": "6.1.6",
@@ -323,10 +323,10 @@
       "@types/react-dom": "19.1.10",
       "@types/retry": "0.12.0",
       "jest-snapshot": "30.0.0-alpha.6",
-      "react": "19.3.0-canary-85c427d8-20251003",
-      "react-dom": "19.3.0-canary-85c427d8-20251003",
-      "react-is": "19.3.0-canary-85c427d8-20251003",
-      "scheduler": "0.28.0-canary-85c427d8-20251003"
+      "react": "19.3.0-canary-4fdf7cf2-20251003",
+      "react-dom": "19.3.0-canary-4fdf7cf2-20251003",
+      "react-is": "19.3.0-canary-4fdf7cf2-20251003",
+      "scheduler": "0.28.0-canary-4fdf7cf2-20251003"
     },
     "packageExtensions": {
       "[email protected]": {

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

@@ -1,6 +1,91 @@
 import { z } from 'next/dist/compiled/zod'
 import { formatZodError } from '../../../shared/lib/zod'
 
+const CookieSchema = z
+  .object({
+    name: z.string(),
+    value: z.string(),
+    httpOnly: z.boolean().optional(),
+    path: z.string().optional(),
+  })
+  .strict()
+
+const RuntimeSampleSchema = z
+  .object({
+    cookies: z.array(CookieSchema).optional(),
+    headers: z.array(z.tuple([z.string(), z.string()])).optional(),
+    params: z.record(z.union([z.string(), z.array(z.string())])).optional(),
+    searchParams: z
+      .record(z.union([z.string(), z.array(z.string()), z.undefined()]))
+      .optional(),
+  })
+  .strict()
+
+const StaticPrefetchSchema = z
+  .object({
+    mode: z.literal('static'),
+    from: z.array(z.string()).optional(),
+    expectUnableToVerify: z.boolean().optional(),
+  })
+  .strict()
+
+const RuntimePrefetchSchema = z
+  .object({
+    mode: z.literal('runtime'),
+    samples: z.array(RuntimeSampleSchema).min(1),
+    from: z.array(z.string()).optional(),
+    expectUnableToVerify: z.boolean().optional(),
+  })
+  .strict()
+
+const PrefetchSchema = z.discriminatedUnion('mode', [
+  StaticPrefetchSchema,
+  RuntimePrefetchSchema,
+])
+
+export type Prefetch = StaticPrefetch | RuntimePrefetch
+export type PrefetchForTypeCheckInternal = __GenericPrefetch | Prefetch
+// the __GenericPrefetch type is used to avoid type widening issues with
+// our choice to make exports the medium for programming a Next.js application
+// With exports the type is controlled by the module and all we can do is assert on it
+// from a consumer. However with string literals in objects these are by default typed widely
+// and thus cannot match the discriminated union type. If we figure out a better way we should
+// delete the __GenericPrefetch member.
+interface __GenericPrefetch {
+  mode: string
+  samples?: Array<WideRuntimeSample>
+  from?: string[]
+  expectUnableToVerify?: boolean
+}
+interface StaticPrefetch {
+  mode: 'static'
+  from?: string[]
+  expectUnableToVerify?: boolean
+}
+interface RuntimePrefetch {
+  mode: 'runtime'
+  samples: Array<RuntimeSample>
+  from?: string[]
+  expectUnableToVerify?: boolean
+}
+type WideRuntimeSample = {
+  cookies?: RuntimeSample['cookies']
+  headers?: Array<string[]>
+  params?: RuntimeSample['params']
+  searchParams?: RuntimeSample['searchParams']
+}
+type RuntimeSample = {
+  cookies?: Array<{
+    name: string
+    value: string
+    httpOnly?: boolean
+    path?: string
+  }>
+  headers?: Array<[string, string]>
+  params?: { [key: string]: string | string[] }
+  searchParams?: { [key: string]: string | string[] | undefined }
+}
+
 /**
  * The schema for configuration for a page.
  */
@@ -43,7 +128,7 @@ const AppSegmentConfigSchema = z.object({
    * How this segment should be prefetched.
    * (only applicable when `clientSegmentCache` is enabled)
    */
-  unstable_prefetch: z.enum(['unstable_static', 'unstable_runtime']).optional(),
+  unstable_prefetch: PrefetchSchema.optional(),
 
   /**
    * The preferred region for the page.
@@ -80,11 +165,22 @@ export function parseAppSegmentConfig(
 ): AppSegmentConfig {
   const parsed = AppSegmentConfigSchema.safeParse(data, {
     errorMap: (issue, ctx) => {
-      if (issue.path.length === 1 && issue.path[0] === 'revalidate') {
-        return {
-          message: `Invalid revalidate value ${JSON.stringify(
-            ctx.data
-          )} on "${route}", must be a non-negative number or false`,
+      if (issue.path.length === 1) {
+        switch (issue.path[0]) {
+          case 'revalidate': {
+            return {
+              message: `Invalid revalidate value ${JSON.stringify(
+                ctx.data
+              )} on "${route}", must be a non-negative number or false`,
+            }
+          }
+          case 'unstable_prefetch': {
+            return {
+              // @TODO replace this link with a link to the docs when they are written
+              message: `Invalid unstable_prefetch value ${JSON.stringify(ctx.data)} on "${route}", must be an object with a mode of "static" or "runtime". Read more at https://nextjs.org/docs/messages/invalid-prefetch-configuration`,
+            }
+          }
+          default:
         }
       }
 
@@ -137,7 +233,7 @@ export type AppSegmentConfig = {
    * How this segment should be prefetched.
    * (only applicable when `clientSegmentCache` is enabled)
    */
-  unstable_prefetch?: 'unstable_static' | 'unstable_runtime'
+  unstable_prefetch?: Prefetch
 
   /**
    * The preferred region for the page.

packages/next/src/build/webpack/plugins/next-types-plugin/index.ts

@@ -52,6 +52,8 @@ ${
     : `import type { ResolvingMetadata, ResolvingViewport } from 'next/dist/lib/metadata/types/metadata-interface.js'`
 }
 
+import type { PrefetchForTypeCheckInternal } from 'next/dist/build/segment-config/app/app-segment-config.js'
+
 type TEntry = typeof import('${relativePath}.js')
 
 type SegmentParams<T extends Object = any> = T extends Record<string, any>
@@ -67,7 +69,7 @@ checkFields<Diff<{
   }
   config?: {}
   generateStaticParams?: Function
-  unstable_prefetch?: 'unstable_static' | 'unstable_runtime'
+  unstable_prefetch?: PrefetchForTypeCheckInternal
   revalidate?: RevalidateRange<TEntry> | false
   dynamic?: 'auto' | 'force-dynamic' | 'error' | 'force-static'
   dynamicParams?: boolean

packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.development.js

@@ -32277,11 +32277,11 @@
     };
     (function () {
       var isomorphicReactPackageVersion = React.version;
-      if ("19.3.0-experimental-85c427d8-20251003" !== isomorphicReactPackageVersion)
+      if ("19.3.0-experimental-4fdf7cf2-20251003" !== isomorphicReactPackageVersion)
         throw Error(
           'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n  - react:      ' +
             (isomorphicReactPackageVersion +
-              "\n  - react-dom:  19.3.0-experimental-85c427d8-20251003\nLearn more: https://react.dev/warnings/version-mismatch")
+              "\n  - react-dom:  19.3.0-experimental-4fdf7cf2-20251003\nLearn more: https://react.dev/warnings/version-mismatch")
         );
     })();
     ("function" === typeof Map &&
@@ -32318,10 +32318,10 @@
       !(function () {
         var internals = {
           bundleType: 1,
-          version: "19.3.0-experimental-85c427d8-20251003",
+          version: "19.3.0-experimental-4fdf7cf2-20251003",
           rendererPackageName: "react-dom",
           currentDispatcherRef: ReactSharedInternals,
-          reconcilerVersion: "19.3.0-experimental-85c427d8-20251003"
+          reconcilerVersion: "19.3.0-experimental-4fdf7cf2-20251003"
         };
         internals.overrideHookState = overrideHookState;
         internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -32469,7 +32469,7 @@
       listenToAllSupportedEvents(container);
       return new ReactDOMHydrationRoot(initialChildren);
     };
-    exports.version = "19.3.0-experimental-85c427d8-20251003";
+    exports.version = "19.3.0-experimental-4fdf7cf2-20251003";
     "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
       "function" ===
         typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.production.js

@@ -19570,14 +19570,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
 };
 var isomorphicReactPackageVersion$jscomp$inline_2217 = React.version;
 if (
-  "19.3.0-experimental-85c427d8-20251003" !==
+  "19.3.0-experimental-4fdf7cf2-20251003" !==
   isomorphicReactPackageVersion$jscomp$inline_2217
 )
   throw Error(
     formatProdErrorMessage(
       527,
       isomorphicReactPackageVersion$jscomp$inline_2217,
-      "19.3.0-experimental-85c427d8-20251003"
+      "19.3.0-experimental-4fdf7cf2-20251003"
     )
   );
 ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -19599,10 +19599,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
 };
 var internals$jscomp$inline_2914 = {
   bundleType: 0,
-  version: "19.3.0-experimental-85c427d8-20251003",
+  version: "19.3.0-experimental-4fdf7cf2-20251003",
   rendererPackageName: "react-dom",
   currentDispatcherRef: ReactSharedInternals,
-  reconcilerVersion: "19.3.0-experimental-85c427d8-20251003"
+  reconcilerVersion: "19.3.0-experimental-4fdf7cf2-20251003"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
   var hook$jscomp$inline_2915 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -19709,4 +19709,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
   listenToAllSupportedEvents(container);
   return new ReactDOMHydrationRoot(initialChildren);
 };
-exports.version = "19.3.0-experimental-85c427d8-20251003";
+exports.version = "19.3.0-experimental-4fdf7cf2-20251003";