Merge branch 'canary' into docs-ia-forms-guide

Author: delbaoliveira

.changeset/spotty-hotels-train.md

@@ -0,0 +1,5 @@
+---
+"next": patch
+---
+
+[Segment Cache] Fix: Ensure server references can be prerendered

.eslintrc.json

@@ -48,7 +48,7 @@
         "jest/no-export": "off",
         "jest/no-standalone-expect": [
           "error",
-          { "additionalTestBlockFunctions": ["retry"] }
+          { "additionalTestBlockFunctions": ["retry", "itCI", "itHeaded"] }
         ]
       }
     },

.gitignore

@@ -33,6 +33,7 @@ coverage
 # test output
 test/**/out/*
 test/**/next-env.d.ts
+test/**/.next*
 .DS_Store
 /e2e-tests
 test/tmp/**

Cargo.lock

@@ -297,7 +297,7 @@ turbopack-trace-utils = { path = "turbopack/crates/turbopack-trace-utils" }
 turbopack-wasm = { path = "turbopack/crates/turbopack-wasm" }
 
 # SWC crates
-swc_core = { version = "26.0.0", features = [
+swc_core = { version = "26.0.1", features = [
   "ecma_loader_lru",
   "ecma_loader_parking_lot",
 ] }
@@ -309,7 +309,7 @@ miette = { version = "5.10.0", features = ["fancy"] }
 mdxjs = "1.0.1"
 modularize_imports = { version = "0.86.0" }
 styled_components = { version = "0.114.0" }
-styled_jsx = { version = "0.90.0" }
+styled_jsx = { version = "0.90.1" }
 swc_emotion = { version = "0.90.0" }
 swc_relay = { version = "0.60.0" }
 

Cargo.toml

@@ -38,6 +38,18 @@ impl Visit for Finder {
         if self.found {
             return;
         }
+        if matches!(
+            node,
+            Expr::JSXMember(..)
+                | Expr::JSXNamespacedName(..)
+                | Expr::JSXEmpty(..)
+                | Expr::JSXElement(..)
+                | Expr::JSXFragment(..)
+        ) {
+            self.found = true;
+            return;
+        }
+
         node.visit_children_with(self);
     }
 
@@ -54,7 +66,7 @@ impl Visit for Finder {
     fn visit_fn_expr(&mut self, node: &FnExpr) {
         let old = self.is_interested;
 
-        self.is_interested = node.ident.as_ref().is_some_and(|ident| {
+        self.is_interested |= node.ident.as_ref().is_some_and(|ident| {
             ident.sym.starts_with("use") || ident.sym.starts_with(|c: char| c.is_ascii_uppercase())
         });
 

crates/next-custom-transforms/src/react_compiler.rs

@@ -640,7 +640,7 @@ impl ReactServerComponentValidator {
             invalid_client_imports: vec![Atom::from("server-only"), Atom::from("next/headers")],
 
             invalid_client_lib_apis_mapping: FxHashMap::from_iter([
-                ("next/server", vec!["after"]),
+                ("next/server", vec!["after", "unstable_rootParams"]),
                 (
                     "next/cache",
                     vec![

crates/next-custom-transforms/src/transforms/react_server_components.rs

@@ -0,0 +1,13 @@
+// This is a comment.
+
+'use strict'
+
+/**
+ * This is a comment.
+ */
+
+import { unstable_rootParams } from 'next/server'
+
+export default function () {
+  return null
+}

crates/next-custom-transforms/tests/errors/react-server-components/client-graph/root-params/input.js

@@ -0,0 +1,8 @@
+// This is a comment.
+'use strict';
+/**
+ * This is a comment.
+ */ import { unstable_rootParams } from 'next/server';
+export default function() {
+    return null;
+}

crates/next-custom-transforms/tests/errors/react-server-components/client-graph/root-params/output.js

@@ -0,0 +1,9 @@
+  x You're importing a component that needs "unstable_rootParams". That only works in a Server Component which is not supported in the pages/ directory. Read more: https://nextjs.org/docs/app/
+  | building-your-application/rendering/server-components
+  | 
+  | 
+   ,-[input.js:9:1]
+ 8 | 
+ 9 | import { unstable_rootParams } from 'next/server'
+   :          ^^^^^^^^^^^^^^^^^^^
+   `----