Merge branch 'canary' into ijjk/fix-not-found-tags

vercel · Jan 7, 2025 · 6245a8d · 6245a8d
2 parents 471fc46 + 5a8d117
commit 6245a8d
Show file tree

Hide file tree

Showing 132 changed files with 1,084 additions and 799 deletions.
diff --git a/.github/workflows/test_e2e_deploy_release.yml b/.github/workflows/test_e2e_deploy_release.yml
@@ -46,7 +46,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        group: [1/5, 2/5, 3/5, 4/5, 5/5, 6/6]
+        group: [1/6, 2/6, 3/6, 4/6, 5/6, 6/6]
     with:
       afterBuild: npm i -g vercel@latest && NEXT_E2E_TEST_TIMEOUT=240000 NEXT_TEST_MODE=deploy NEXT_EXTERNAL_TESTS_FILTERS="test/deploy-tests-manifest.json" node run-tests.js --timings -g ${{ matrix.group }} -c 2 --type e2e
       skipNativeBuild: 'yes'

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -190,7 +190,7 @@ serde_path_to_error = "0.1.9"
 serde_qs = "0.11.0"
 serde_with = "2.3.2"
 serde_yaml = "0.9.17"
-shadow-rs = { version = "0.35.0", default-features = false, features = [
+shadow-rs = { version = "0.37.0", default-features = false, features = [
   "tzdb",
 ] }
 smallvec = { version = "1.13.1", features = [

diff --git a/crates/napi/build.rs b/crates/napi/build.rs
@@ -1,10 +1,19 @@
+use std::fs;
+
 extern crate napi_build;
 
 fn main() {
     // Generates, stores build-time information as static values.
     // There are some places relying on correct values for this (i.e telemetry),
     // So failing build if this fails.
-    shadow_rs::new().expect("Should able to generate build time information");
+    shadow_rs::ShadowBuilder::builder()
+        .build()
+        .expect("Should able to generate build time information");
+
+    let git_head = fs::read_to_string("../../.git/HEAD").unwrap_or_default();
+    if !git_head.is_empty() && !git_head.starts_with("ref: ") {
+        println!("cargo:warning=git version {}", git_head);
+    }
 
     #[cfg(not(all(target_os = "macos", target_arch = "aarch64")))]
     napi_build::setup();

diff --git a/crates/next-api/build.rs b/crates/next-api/build.rs
@@ -4,7 +4,10 @@ fn main() {
     // Generates, stores build-time information as static values.
     // There are some places relying on correct values for this (i.e telemetry),
     // So failing build if this fails.
-    shadow_rs::new().expect("Should able to generate build time information");
+    shadow_rs::ShadowBuilder::builder()
+        .build_pattern(shadow_rs::BuildPattern::Lazy)
+        .build()
+        .expect("Should able to generate build time information");
 
     generate_register();
 }
diff --git a/..._client_reference/ecmascript_client_reference/ecmascript_client_reference_proxy_module.rs b/..._client_reference/ecmascript_client_reference/ecmascript_client_reference_proxy_module.rs
@@ -70,11 +70,13 @@ impl EcmascriptClientReferenceProxyModule {
     #[turbo_tasks::function]
     async fn proxy_module(&self) -> Result<Vc<Box<dyn EcmascriptChunkPlaceable>>> {
         let mut code = CodeBuilder::default();
+        let is_esm: bool;
 
         let server_module_path = &*self.server_module_ident.to_string().await?;
 
         // Adapted from https://github.com/facebook/react/blob/c5b9375767e2c4102d7e5559d383523736f1c902/packages/react-server-dom-webpack/src/ReactFlightWebpackNodeLoader.js#L323-L354
         if let EcmascriptExports::EsmExports(exports) = &*self.client_module.get_exports().await? {
+            is_esm = true;
             let exports = exports.expand_exports().await?;
 
             if !exports.dynamic_exports.is_empty() {
@@ -130,6 +132,7 @@ impl EcmascriptClientReferenceProxyModule {
                 }
             }
         } else {
+            is_esm = false;
             writedoc!(
                 code,
                 r#"
@@ -146,7 +149,13 @@ impl EcmascriptClientReferenceProxyModule {
             AssetContent::file(File::from(code.source_code().clone()).into());
 
         let proxy_source = VirtualSource::new(
-            self.server_module_ident.path().join("proxy.js".into()),
+            self.server_module_ident.path().join(
+                // Depending on the original format, we call the file `proxy.mjs` or `proxy.cjs`.
+                // This is because we're placing the virtual module next to the original code, so
+                // its parsing will be affected by `type` fields in package.json --
+                // a bare `proxy.js` may end up being unexpectedly parsed as the wrong format.
+                format!("proxy.{}", if is_esm { "mjs" } else { "cjs" }).into(),
+            ),
             proxy_module_content,
         );
 

diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "15.1.1-canary.26"
+  "version": "15.1.1-canary.27"
 }
diff --git a/package.json b/package.json
@@ -211,16 +211,16 @@
     "pretty-ms": "7.0.0",
     "random-seed": "0.3.0",
     "react": "19.0.0",
-    "react-builtin": "npm:react@19.1.0-canary-3b009b4c-20250102",
+    "react-builtin": "npm:react@19.1.0-canary-3ce77d55-20250106",
     "react-dom": "19.0.0",
-    "react-dom-builtin": "npm:react-dom@19.1.0-canary-3b009b4c-20250102",
-    "react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-3b009b4c-20250102",
-    "react-experimental-builtin": "npm:react@0.0.0-experimental-3b009b4c-20250102",
-    "react-is-builtin": "npm:react-is@19.1.0-canary-3b009b4c-20250102",
-    "react-server-dom-turbopack": "19.1.0-canary-3b009b4c-20250102",
-    "react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-3b009b4c-20250102",
-    "react-server-dom-webpack": "19.1.0-canary-3b009b4c-20250102",
-    "react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-3b009b4c-20250102",
+    "react-dom-builtin": "npm:react-dom@19.1.0-canary-3ce77d55-20250106",
+    "react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-3ce77d55-20250106",
+    "react-experimental-builtin": "npm:react@0.0.0-experimental-3ce77d55-20250106",
+    "react-is-builtin": "npm:react-is@19.1.0-canary-3ce77d55-20250106",
+    "react-server-dom-turbopack": "19.1.0-canary-3ce77d55-20250106",
+    "react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-3ce77d55-20250106",
+    "react-server-dom-webpack": "19.1.0-canary-3ce77d55-20250106",
+    "react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-3ce77d55-20250106",
     "react-ssr-prepass": "1.0.8",
     "react-virtualized": "9.22.3",
     "relay-compiler": "13.0.2",
@@ -230,8 +230,8 @@
     "resolve-from": "5.0.0",
     "sass": "1.54.0",
     "satori": "0.10.9",
-    "scheduler-builtin": "npm:scheduler@0.26.0-canary-3b009b4c-20250102",
-    "scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-3b009b4c-20250102",
+    "scheduler-builtin": "npm:scheduler@0.26.0-canary-3ce77d55-20250106",
+    "scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-3ce77d55-20250106",
     "seedrandom": "3.0.5",
     "semver": "7.3.7",
     "shell-quote": "1.7.3",
@@ -272,10 +272,10 @@
       "@types/react": "19.0.0",
       "@types/react-dom": "19.0.0",
       "jest-snapshot": "30.0.0-alpha.6",
-      "react": "19.1.0-canary-3b009b4c-20250102",
-      "react-dom": "19.1.0-canary-3b009b4c-20250102",
-      "react-is": "19.1.0-canary-3b009b4c-20250102",
-      "scheduler": "0.26.0-canary-3b009b4c-20250102"
+      "react": "19.1.0-canary-3ce77d55-20250106",
+      "react-dom": "19.1.0-canary-3ce77d55-20250106",
+      "react-is": "19.1.0-canary-3ce77d55-20250106",
+      "scheduler": "0.26.0-canary-3ce77d55-20250106"
     },
     "patchedDependencies": {
       "webpack-sources@3.2.3": "patches/webpack-sources@3.2.3.patch",

diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "15.1.1-canary.26",
+  "version": "15.1.1-canary.27",
   "keywords": [
     "react",
     "next",

diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "15.1.1-canary.26",
+  "version": "15.1.1-canary.27",
   "description": "ESLint configuration used by Next.js.",
   "main": "index.js",
   "license": "MIT",
@@ -10,7 +10,7 @@
   },
   "homepage": "https://nextjs.org/docs/app/api-reference/config/eslint",
   "dependencies": {
-    "@next/eslint-plugin-next": "15.1.1-canary.26",
+    "@next/eslint-plugin-next": "15.1.1-canary.27",
     "@rushstack/eslint-patch": "^1.10.3",
     "@typescript-eslint/eslint-plugin": "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0",
     "@typescript-eslint/parser": "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0",

diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "15.1.1-canary.26",
+  "version": "15.1.1-canary.27",
   "description": "ESLint plugin for Next.js.",
   "main": "dist/index.js",
   "license": "MIT",

diff --git a/packages/font/package.json b/packages/font/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@next/font",
   "private": true,
-  "version": "15.1.1-canary.26",
+  "version": "15.1.1-canary.27",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"

diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "15.1.1-canary.26",
+  "version": "15.1.1-canary.27",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",

diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "15.1.1-canary.26",
+  "version": "15.1.1-canary.27",
   "license": "MIT",
   "repository": {
     "type": "git",

diff --git a/packages/next-env/package.json b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "15.1.1-canary.26",
+  "version": "15.1.1-canary.27",
   "keywords": [
     "react",
     "next",

diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "15.1.1-canary.26",
+  "version": "15.1.1-canary.27",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "15.1.1-canary.26",
+  "version": "15.1.1-canary.27",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "15.1.1-canary.26",
+  "version": "15.1.1-canary.27",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",

diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "15.1.1-canary.26",
+  "version": "15.1.1-canary.27",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "15.1.1-canary.26",
+  "version": "15.1.1-canary.27",
   "private": true,
   "scripts": {
     "clean": "node ../../scripts/rm.mjs native",

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "15.1.1-canary.26",
+  "version": "15.1.1-canary.27",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -99,7 +99,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "15.1.1-canary.26",
+    "@next/env": "15.1.1-canary.27",
     "@swc/counter": "0.1.3",
     "@swc/helpers": "0.5.15",
     "busboy": "1.6.0",
@@ -164,11 +164,11 @@
     "@jest/types": "29.5.0",
     "@mswjs/interceptors": "0.23.0",
     "@napi-rs/triples": "1.2.0",
-    "@next/font": "15.1.1-canary.26",
-    "@next/polyfill-module": "15.1.1-canary.26",
-    "@next/polyfill-nomodule": "15.1.1-canary.26",
-    "@next/react-refresh-utils": "15.1.1-canary.26",
-    "@next/swc": "15.1.1-canary.26",
+    "@next/font": "15.1.1-canary.27",
+    "@next/polyfill-module": "15.1.1-canary.27",
+    "@next/polyfill-nomodule": "15.1.1-canary.27",
+    "@next/react-refresh-utils": "15.1.1-canary.27",
+    "@next/swc": "15.1.1-canary.27",
     "@opentelemetry/api": "1.6.0",
     "@playwright/test": "1.41.2",
     "@storybook/addon-essentials": "^8.4.7",

diff --git a/packages/next/src/build/webpack/loaders/next-app-loader/index.ts b/packages/next/src/build/webpack/loaders/next-app-loader/index.ts
@@ -754,6 +754,7 @@ const nextAppLoader: AppLoader = async function nextAppLoader() {
       tree: treeCodeResult.treeCode,
       pages: treeCodeResult.pages,
       __next_app_require__: '__webpack_require__',
+      // all modules are in the entry chunk, so we never actually need to load chunks in webpack
       __next_app_load_chunk__: '() => Promise.resolve()',
     }
   )

diff --git a/packages/next/src/client/components/app-router.tsx b/packages/next/src/client/components/app-router.tsx
@@ -145,7 +145,7 @@ export function createEmptyCacheNode(): CacheNode {
     lazyData: null,
     rsc: null,
     prefetchRsc: null,
-    head: [null, null],
+    head: null,
     prefetchHead: null,
     parallelRoutes: new Map(),
     loading: null,

diff --git a/packages/next/src/client/components/layout-router.tsx b/packages/next/src/client/components/layout-router.tsx
@@ -549,7 +549,7 @@ export default function OuterLayoutRouter({
       lazyData: null,
       rsc: null,
       prefetchRsc: null,
-      head: [null, null],
+      head: null,
       prefetchHead: null,
       parallelRoutes: new Map(),
       loading: null,

diff --git a/...ay/_experimental/internal/components/Errors/error-overlay-layout/error-overlay-layout.tsx b/...ay/_experimental/internal/components/Errors/error-overlay-layout/error-overlay-layout.tsx
@@ -13,7 +13,10 @@ import {
 } from '../../Dialog'
 import { Overlay } from '../../Overlay'
 import { ErrorPagination } from '../ErrorPagination/ErrorPagination'
-import { ToolButtonsGroup } from '../../ToolButtonsGroup/ToolButtonsGroup'
+import {
+  ErrorOverlayToolbar,
+  styles as toolbarStyles,
+} from '../error-overlay-toolbar/error-overlay-toolbar'
 import { VersionStalenessInfo } from '../../VersionStalenessInfo'
 import { ErrorOverlayBottomStacks } from '../error-overlay-bottom-stacks/error-overlay-bottom-stacks'
 import { ErrorOverlayFooter } from '../error-overlay-footer/error-overlay-footer'
@@ -81,7 +84,7 @@ export function ErrorOverlayLayout({
               data-nextjs-error-code={errorCode}
             >
               <ErrorTypeLabel errorType={errorType} />
-              <ToolButtonsGroup error={error} debugInfo={debugInfo} />
+              <ErrorOverlayToolbar error={error} debugInfo={debugInfo} />
             </div>
             <VersionStalenessInfo versionInfo={versionInfo} />
             <ErrorMessage errorMessage={errorMessage} />
@@ -109,4 +112,5 @@ export function ErrorOverlayLayout({
 export const styles = css`
   ${errorTypeLabelStyles}
   ${errorMessageStyles}
+  ${toolbarStyles}
 `