[pull] canary from vercel:canary

crates/next-core/src/next_shared/transforms/swc_ecma_transform_plugins.rs

@@ -35,8 +35,8 @@ pub async fn get_swc_ecma_transform_rule_impl(
     plugin_configs: &[(RcStr, serde_json::Value)],
     enable_mdx_rs: bool,
 ) -> Result<Option<ModuleRule>> {
-    use anyhow::{bail, Context};
-    use turbo_tasks::{TryJoinIterExt, Value};
+    use anyhow::bail;
+    use turbo_tasks::{TryFlatJoinIterExt, Value};
     use turbo_tasks_fs::FileContent;
     use turbopack::{resolve_options, resolve_options_context::ResolveOptionsContext};
     use turbopack_core::{
@@ -78,30 +78,34 @@ pub async fn get_swc_ecma_transform_rule_impl(
                 )
                 .as_raw_module_result(),
                 Value::new(ReferenceType::CommonJs(CommonJsReferenceSubType::Undefined)),
+                // TODO proper error location
                 *project_path,
                 request,
                 resolve_options,
                 false,
+                // TODO proper error location
                 None,
             )
             .await?;
-            let plugin_module = plugin_wasm_module_resolve_result
-                .first_module()
-                .await?
-                .context("Expected to find module")?;
 
-            let content = &*plugin_module.content().file_content().await?;
+            let Some(plugin_module) = &*plugin_wasm_module_resolve_result.first_module().await?
+            else {
+                // Ignore unresolveable plugin modules, handle_resolve_error has already emitted an
+                // issue.
+                return Ok(None);
+            };
 
+            let content = &*plugin_module.content().file_content().await?;
             let FileContent::Content(file) = content else {
                 bail!("Expected file content for plugin module");
             };
 
-            Ok((
+            Ok(Some((
                 SwcPluginModule::new(name, file.content().to_bytes()?.to_vec()).resolved_cell(),
                 config.clone(),
-            ))
+            )))
         })
-        .try_join()
+        .try_flat_join()
         .await?;
 
     Ok(Some(get_ecma_transform_rule(

lerna.json

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

packages/create-next-app/package.json

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

packages/eslint-config-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "15.3.1-canary.2",
+  "version": "15.3.1-canary.4",
   "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.3.1-canary.2",
+    "@next/eslint-plugin-next": "15.3.1-canary.4",
     "@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.3.1-canary.2",
+  "version": "15.3.1-canary.4",
   "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.3.1-canary.2",
+  "version": "15.3.1-canary.4",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"

packages/next-bundle-analyzer/package.json

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

packages/next-codemod/package.json

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

packages/next-env/package.json

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

packages/next-mdx/package.json

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

packages/next-plugin-storybook/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "15.3.1-canary.2",
+  "version": "15.3.1-canary.4",
   "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.3.1-canary.2",
+  "version": "15.3.1-canary.4",
   "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.3.1-canary.2",
+  "version": "15.3.1-canary.4",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

packages/next-rspack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-rspack",
-  "version": "15.3.1-canary.2",
+  "version": "15.3.1-canary.4",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-rspack"

packages/next-swc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "15.3.1-canary.2",
+  "version": "15.3.1-canary.4",
   "private": true,
   "files": [
     "native/"

packages/next/package.json

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

packages/next/src/build/index.ts

@@ -3301,6 +3301,16 @@ export default async function build(
                     orig,
                     path.join(distDir, 'server', updatedRelativeDest)
                   )
+
+                  // since the app router not found is prioritized over pages router,
+                  // we have to ensure the app router entries are available for all locales
+                  if (i18n) {
+                    for (const locale of i18n.locales) {
+                      const curPath = `/${locale}/404`
+                      pagesManifest[curPath] = updatedRelativeDest
+                    }
+                  }
+
                   pagesManifest['/404'] = updatedRelativeDest
                 }
               })

packages/next/src/server/config-schema.ts

@@ -390,6 +390,7 @@ export const configSchema: zod.ZodType<NextConfig> = z.lazy(() =>
         prerenderEarlyExit: z.boolean().optional(),
         proxyTimeout: z.number().gte(0).optional(),
         routerBFCache: z.boolean().optional(),
+        removeUncaughtErrorAndRejectionListeners: z.boolean().optional(),
         scrollRestoration: z.boolean().optional(),
         sri: z
           .object({

packages/next/src/server/config-shared.ts

@@ -509,6 +509,16 @@ export interface ExperimentalConfig {
    */
   routerBFCache?: boolean
 
+  /**
+   * Uninstalls all "unhandledRejection" and "uncaughtException" listeners from
+   * the global process so that we can override the behavior, which in some
+   * runtimes is to exit the process.
+   *
+   * This is experimental until we've considered the impact in various
+   * deployment environments.
+   */
+  removeUncaughtErrorAndRejectionListeners?: boolean
+
   serverActions?: {
     /**
      * Allows adjusting body parser size limit for server actions.
@@ -1302,6 +1312,7 @@ export const defaultConfig: NextConfig = {
     useEarlyImport: false,
     viewTransition: false,
     routerBFCache: false,
+    removeUncaughtErrorAndRejectionListeners: false,
     staleTimes: {
       dynamic: 0,
       static: 300,

packages/next/src/server/lib/start-server.ts

@@ -30,7 +30,6 @@ import { CONFIG_FILES } from '../../shared/lib/constants'
 import { getStartServerInfo, logStartInfo } from './app-info-log'
 import { validateTurboNextConfig } from '../../lib/turbopack-warning'
 import { type Span, trace, flushAllTraces } from '../../trace'
-import { isPostpone } from './router-utils/is-postpone'
 import { isIPv6 } from './is-ipv6'
 import { AsyncCallbackSet } from './async-callback-set'
 import type { NextServer } from '../next'
@@ -331,29 +330,13 @@ export async function startServer(
             process.exit(0)
           })()
         }
-        const exception = (err: Error) => {
-          if (isPostpone(err)) {
-            // React postpones that are unhandled might end up logged here but they're
-            // not really errors. They're just part of rendering.
-            return
-          }
 
-          // This is the render worker, we keep the process alive
-          console.error(err)
-        }
         // Make sure commands gracefully respect termination signals (e.g. from Docker)
         // Allow the graceful termination to be manually configurable
         if (!process.env.NEXT_MANUAL_SIG_HANDLE) {
           process.on('SIGINT', cleanup)
           process.on('SIGTERM', cleanup)
         }
-        process.on('rejectionHandled', () => {
-          // It is ok to await a Promise late in Next.js as it allows for better
-          // prefetching patterns to avoid waterfalls. We ignore loggining these.
-          // We should've already errored in anyway unhandledRejection.
-        })
-        process.on('uncaughtException', exception)
-        process.on('unhandledRejection', exception)
 
         const initResult = await getRequestHandlers({
           dir,