[pull] canary from vercel:canary

Cargo.toml

@@ -151,12 +151,12 @@ indoc = "2.0.0"
 itertools = "0.10.5"
 lazy_static = "1.4.0"
 log = "0.4.17"
-lightningcss = { version = "1.0.0-alpha.61", features = [
+lightningcss = { version = "1.0.0-alpha.63", features = [
   "serde",
   "visitor",
   "into_owned",
 ] }
-lightningcss-napi = { version = "0.4.0", default-features = false, features = [
+lightningcss-napi = { version = "0.4.3", default-features = false, features = [
   "visitor"
 ]}
 markdown = "1.0.0-alpha.18"
@@ -165,7 +165,7 @@ nohash-hasher = "0.2.0"
 notify = "6.1.1"
 once_cell = "1.17.1"
 owo-colors = "3.5.0"
-parcel_selectors = "0.28.0"
+parcel_selectors = "0.28.1"
 parking_lot = "0.12.1"
 pathdiff = "0.2.1"
 petgraph = "0.6.3"

lerna.json

@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "15.2.0-canary.2"
+  "version": "15.2.0-canary.3"
 }

packages/create-next-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "15.2.0-canary.2",
+  "version": "15.2.0-canary.3",
   "keywords": [
     "react",
     "next",

packages/eslint-config-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "15.2.0-canary.2",
+  "version": "15.2.0-canary.3",
   "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.2.0-canary.2",
+    "@next/eslint-plugin-next": "15.2.0-canary.3",
     "@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",

packages/eslint-plugin-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "15.2.0-canary.2",
+  "version": "15.2.0-canary.3",
   "description": "ESLint plugin for Next.js.",
   "main": "dist/index.js",
   "license": "MIT",

packages/font/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@next/font",
   "private": true,
-  "version": "15.2.0-canary.2",
+  "version": "15.2.0-canary.3",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"

packages/next-bundle-analyzer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "15.2.0-canary.2",
+  "version": "15.2.0-canary.3",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",

packages/next-codemod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "15.2.0-canary.2",
+  "version": "15.2.0-canary.3",
   "license": "MIT",
   "repository": {
     "type": "git",

packages/next-env/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "15.2.0-canary.2",
+  "version": "15.2.0-canary.3",
   "keywords": [
     "react",
     "next",

packages/next-mdx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "15.2.0-canary.2",
+  "version": "15.2.0-canary.3",
   "main": "index.js",
   "license": "MIT",
   "repository": {

packages/next-plugin-storybook/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "15.2.0-canary.2",
+  "version": "15.2.0-canary.3",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

packages/next-polyfill-module/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "15.2.0-canary.2",
+  "version": "15.2.0-canary.3",
   "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",

packages/next-polyfill-nomodule/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "15.2.0-canary.2",
+  "version": "15.2.0-canary.3",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

packages/next-swc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "15.2.0-canary.2",
+  "version": "15.2.0-canary.3",
   "private": true,
   "scripts": {
     "clean": "node ../../scripts/rm.mjs native",

packages/next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "15.2.0-canary.2",
+  "version": "15.2.0-canary.3",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -99,7 +99,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "15.2.0-canary.2",
+    "@next/env": "15.2.0-canary.3",
     "@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.2.0-canary.2",
-    "@next/polyfill-module": "15.2.0-canary.2",
-    "@next/polyfill-nomodule": "15.2.0-canary.2",
-    "@next/react-refresh-utils": "15.2.0-canary.2",
-    "@next/swc": "15.2.0-canary.2",
+    "@next/font": "15.2.0-canary.3",
+    "@next/polyfill-module": "15.2.0-canary.3",
+    "@next/polyfill-nomodule": "15.2.0-canary.3",
+    "@next/react-refresh-utils": "15.2.0-canary.3",
+    "@next/swc": "15.2.0-canary.3",
     "@opentelemetry/api": "1.6.0",
     "@playwright/test": "1.41.2",
     "@storybook/addon-essentials": "^8.4.7",

packages/next/src/client/components/react-dev-overlay/internal/helpers/attach-hydration-error-state.ts → packages/next/src/client/components/errors/attach-hydration-error-state.ts

@@ -1,7 +1,7 @@
 import {
   isHydrationError,
   getDefaultHydrationErrorMessage,
-} from '../../../is-hydration-error'
+} from '../is-hydration-error'
 import {
   hydrationErrorState,
   getReactHydrationDiffSegments,

packages/next/src/client/components/react-dev-overlay/internal/helpers/enqueue-client-error.ts → packages/next/src/client/components/errors/enqueue-client-error.ts

@@ -1,4 +1,4 @@
-import { isHydrationError } from '../../../is-hydration-error'
+import { isHydrationError } from '../is-hydration-error'
 
 // Dedupe the two consecutive errors: If the previous one is same as current one, ignore the current one.
 export function enqueueConsecutiveDedupedError(

packages/next/src/client/components/react-dev-overlay/internal/helpers/hydration-error-info.ts → packages/next/src/client/components/errors/hydration-error-info.ts

@@ -1,4 +1,4 @@
-import { getHydrationErrorStackInfo } from '../../../is-hydration-error'
+import { getHydrationErrorStackInfo } from '../is-hydration-error'
 
 export type HydrationErrorState = {
   // Hydration warning template format: <message> <serverContent> <clientContent>

packages/next/src/client/components/react-dev-overlay/internal/helpers/stitched-error.ts → packages/next/src/client/components/errors/stitched-error.ts

@@ -1,5 +1,5 @@
 import React from 'react'
-import isError from '../../../../../lib/is-error'
+import isError from '../../../lib/is-error'
 
 const REACT_ERROR_STACK_BOTTOM_FRAME = 'react-stack-bottom-frame'
 const REACT_ERROR_STACK_BOTTOM_FRAME_REGEX = new RegExp(

packages/next/src/client/components/react-dev-overlay/internal/helpers/use-error-handler.ts → packages/next/src/client/components/errors/use-error-handler.ts

@@ -1,12 +1,12 @@
 import { useEffect } from 'react'
 import { attachHydrationErrorState } from './attach-hydration-error-state'
-import { isNextRouterError } from '../../../is-next-router-error'
+import { isNextRouterError } from '../is-next-router-error'
 import { storeHydrationErrorStateFromConsoleArgs } from './hydration-error-info'
-import { formatConsoleArgs } from '../../../../lib/console'
-import isError from '../../../../../lib/is-error'
+import { formatConsoleArgs } from '../../lib/console'
+import isError from '../../../lib/is-error'
 import { createUnhandledError } from './console-error'
 import { enqueueConsecutiveDedupedError } from './enqueue-client-error'
-import { getReactStitchedError } from './stitched-error'
+import { getReactStitchedError } from '../errors/stitched-error'
 
 const queueMicroTask =
   globalThis.queueMicrotask || ((cb: () => void) => Promise.resolve().then(cb))

packages/next/src/client/components/globals/handle-global-errors.ts

@@ -1,3 +1,3 @@
-import { handleGlobalErrors } from '../react-dev-overlay/internal/helpers/use-error-handler'
+import { handleGlobalErrors } from '../errors/use-error-handler'
 
 handleGlobalErrors()

packages/next/src/client/components/globals/intercept-console-error.ts

@@ -1,6 +1,6 @@
 import isError from '../../../lib/is-error'
 import { isNextRouterError } from '../is-next-router-error'
-import { handleClientError } from '../react-dev-overlay/internal/helpers/use-error-handler'
+import { handleClientError } from '../errors/use-error-handler'
 
 export const originConsoleError = window.console.error
 

packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/Errors.tsx

@@ -18,11 +18,11 @@ import { PseudoHtmlDiff } from './RuntimeError/component-stack-pseudo-html'
 import {
   type HydrationErrorState,
   getHydrationWarningType,
-} from '../helpers/hydration-error-info'
+} from '../../../../errors/hydration-error-info'
 import {
   getUnhandledErrorType,
   isUnhandledConsoleOrRejection,
-} from '../helpers/console-error'
+} from '../../../../errors/console-error'
 import { extractNextErrorCode } from '../../../../../../lib/error-telemetry-utils'
 import { DevToolsIndicator } from '../components/Errors/dev-tools-indicator/dev-tools-indicator'
 import { ErrorOverlayLayout } from '../components/Errors/error-overlay-layout/error-overlay-layout'