next 16.2.11 → 16.2.12

package/dist/docs/01-app/03-api-reference/05-config/01-next-config-js/rewrites.md

@@ -23,7 +23,7 @@ To use rewrites you can use the `rewrites` key in `next.config.js`:
 
 ```js filename="next.config.js"
 module.exports = {
-  async rewrites() {
+  rewrites() {
     return [
       {
         source: '/about',
@@ -36,7 +36,7 @@ module.exports = {
 
 Rewrites are applied to client-side routing. In the example above, navigating to `<Link href="/about">` will serve content from `/` while keeping the URL as `/about`.
 
-`rewrites` is an async function that expects to return either an array or an object of arrays (see below) holding objects with `source` and `destination` properties:
+`rewrites` can be defined as a synchronous or async function. It should return, or resolve to, either an array or an object of arrays (see below) holding objects with `source` and `destination` properties:
 
 - `source`: `String` - is the incoming request path pattern.
 - `destination`: `String` is the path you want to route to.
@@ -49,7 +49,7 @@ When the `rewrites` function returns an array, rewrites are applied after checki
 
 ```js filename="next.config.js"
 module.exports = {
-  async rewrites() {
+  rewrites() {
     return {
       beforeFiles: [
         // These rewrites are checked after headers/redirects
@@ -117,7 +117,7 @@ When using parameters in a rewrite the parameters will be passed in the query by
 
 ```js filename="next.config.js"
 module.exports = {
-  async rewrites() {
+  rewrites() {
     return [
       {
         source: '/old-about/:path*',
@@ -132,7 +132,7 @@ If a parameter is used in the destination none of the parameters will be automat
 
 ```js filename="next.config.js"
 module.exports = {
-  async rewrites() {
+  rewrites() {
     return [
       {
         source: '/docs/:path*',
@@ -147,7 +147,7 @@ You can still pass the parameters manually in the query if one is already used i
 
 ```js filename="next.config.js"
 module.exports = {
-  async rewrites() {
+  rewrites() {
     return [
       {
         source: '/:first/:second',
@@ -169,7 +169,7 @@ Path matches are allowed, for example `/blog/:slug` will match `/blog/first-post
 
 ```js filename="next.config.js"
 module.exports = {
-  async rewrites() {
+  rewrites() {
     return [
       {
         source: '/blog/:slug',
@@ -192,7 +192,7 @@ To match a wildcard path you can use `*` after a parameter, for example `/blog/:
 
 ```js filename="next.config.js"
 module.exports = {
-  async rewrites() {
+  rewrites() {
     return [
       {
         source: '/blog/:slug*',
@@ -209,7 +209,7 @@ To match a regex path you can wrap the regex in parenthesis after a parameter, f
 
 ```js filename="next.config.js"
 module.exports = {
-  async rewrites() {
+  rewrites() {
     return [
       {
         source: '/old-blog/:post(\\d{1,})',
@@ -224,7 +224,7 @@ The following characters `(`, `)`, `{`, `}`, `[`, `]`, `|`, `\`, `^`, `.`, `:`,
 
 ```js filename="next.config.js"
 module.exports = {
-  async rewrites() {
+  rewrites() {
     return [
       {
         // this will match `/english(default)/something` being requested
@@ -248,7 +248,7 @@ To only match a rewrite when header, cookie, or query values also match the `has
 
 ```js filename="next.config.js"
 module.exports = {
-  async rewrites() {
+  rewrites() {
     return [
       // if the header `x-rewrite-me` is present,
       // this rewrite will be applied
@@ -338,7 +338,7 @@ Rewrites allow you to rewrite to an external URL. This is especially useful for
 
 ```js filename="next.config.js"
 module.exports = {
-  async rewrites() {
+  rewrites() {
     return [
       {
         source: '/blog',
@@ -358,7 +358,7 @@ If you're using `trailingSlash: true`, you also need to insert a trailing slash
 ```js filename="next.config.js"
 module.exports = {
   trailingSlash: true,
-  async rewrites() {
+  rewrites() {
     return [
       {
         source: '/blog/',
@@ -381,7 +381,7 @@ This way you don't have to change the rewrites configuration when migrating more
 
 ```js filename="next.config.js"
 module.exports = {
-  async rewrites() {
+  rewrites() {
     return {
       fallback: [
         {
@@ -402,7 +402,7 @@ When leveraging [`basePath` support](/docs/app/api-reference/config/next-config-
 module.exports = {
   basePath: '/docs',
 
-  async rewrites() {
+  rewrites() {
     return [
       {
         source: '/with-basePath', // automatically becomes /docs/with-basePath
@@ -433,7 +433,7 @@ module.exports = {
     defaultLocale: 'en',
   },
 
-  async rewrites() {
+  rewrites() {
     return [
       {
         source: '/with-locale', // automatically handles all locales

package/dist/docs/01-app/03-api-reference/05-config/01-next-config-js/serverActions.md

@@ -1,9 +1,12 @@
 ---
 title: serverActions
 description: Configure Server Actions behavior in your Next.js application.
+related:
+  links:
+    - app/guides/server-actions
 ---
 
-Options for configuring Server Actions behavior in your Next.js application.
+Options for configuring Server Actions behavior in your Next.js application. For how Server Actions work, including the security boundary these options tune, see the [Server Actions guide](/docs/app/guides/server-actions).
 
 ## `allowedOrigins`
 

package/dist/docs/01-app/03-api-reference/05-config/01-next-config-js/useTypeScriptCli.md

@@ -0,0 +1,62 @@
+---
+title: useTypeScriptCli
+description: Run the project-local TypeScript CLI for type checking during production builds.
+version: experimental
+---
+
+The `experimental.useTypeScriptCli` option makes `next build` run the project-local `tsc` command instead of loading the TypeScript JavaScript compiler API. You can use this option with TypeScript 6, and it enables [TypeScript 7](https://devblogs.microsoft.com/typescript/announcing-typescript-7-0/) support while its JavaScript API is unavailable.
+
+Install TypeScript 7 in your project:
+
+```bash package="pnpm"
+pnpm add -D typescript@^7
+```
+
+```bash package="npm"
+npm install -D typescript@^7
+```
+
+```bash package="yarn"
+yarn add -D typescript@^7
+```
+
+```bash package="bun"
+bun add -D typescript@^7
+```
+
+Then, explicitly enable the CLI checker:
+
+```ts filename="next.config.ts" switcher
+import type { NextConfig } from 'next'
+
+const nextConfig: NextConfig = {
+  experimental: {
+    useTypeScriptCli: true,
+  },
+}
+
+export default nextConfig
+```
+
+```js filename="next.config.js" switcher
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+  experimental: {
+    useTypeScriptCli: true,
+  },
+}
+
+module.exports = nextConfig
+```
+
+Next.js does not select the CLI checker automatically. If TypeScript 7 is installed without this option, `next build` exits with instructions to enable it or install a TypeScript version supported by the default checker.
+
+## Behavior
+
+- Next.js continues to generate `next-env.d.ts` and route types and to apply its recommended `tsconfig` settings before running the checker.
+- TypeScript diagnostics are printed directly from `tsc`. Next.js-specific code frames and error rewriting are not applied.
+- The complete project selected by the configured `tsconfig` file is checked, including test files and `.next/dev/types` when included. The [`--debug-build-paths`](/docs/app/api-reference/cli/next#next-build-options) option does not limit this set and produces a warning when combined with the CLI checker.
+- [`typescript.tsconfigPath`](/docs/app/api-reference/config/typescript#custom-tsconfig-path) selects the project passed to `tsc`.
+- [`typescript.ignoreBuildErrors`](/docs/app/api-reference/config/typescript#disabling-typescript-errors-in-production) skips the type-checking step, including the CLI checker.
+
+Learn more about [using TypeScript 7 with Next.js](/docs/app/api-reference/config/typescript#using-typescript-7).

package/dist/docs/01-app/03-api-reference/05-config/02-typescript.md

@@ -11,6 +11,60 @@ To add TypeScript to an existing project, rename a file to `.ts` / `.tsx`. Run `
 
 > **Good to know**: If you already have a `jsconfig.json` file, copy the `paths` compiler option from the old `jsconfig.json` into the new `tsconfig.json` file, and delete the old `jsconfig.json` file.
 
+## Using TypeScript 7
+
+[TypeScript 7](https://devblogs.microsoft.com/typescript/announcing-typescript-7-0/) does not currently provide the JavaScript compiler API that Next.js uses for type checking by default. To use TypeScript 7 during `next build`, install it in your project:
+
+```bash package="pnpm"
+pnpm add -D typescript@^7
+```
+
+```bash package="npm"
+npm install -D typescript@^7
+```
+
+```bash package="yarn"
+yarn add -D typescript@^7
+```
+
+```bash package="bun"
+bun add -D typescript@^7
+```
+
+Then, opt in to running the project-local `tsc` CLI instead of the JavaScript API with [`experimental.useTypeScriptCli`](/docs/app/api-reference/config/next-config-js/useTypeScriptCli):
+
+```ts filename="next.config.ts" switcher
+import type { NextConfig } from 'next'
+
+const nextConfig: NextConfig = {
+  experimental: {
+    useTypeScriptCli: true,
+  },
+}
+
+export default nextConfig
+```
+
+```js filename="next.config.js" switcher
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+  experimental: {
+    useTypeScriptCli: true,
+  },
+}
+
+module.exports = nextConfig
+```
+
+Next.js does not enable this option automatically. If you install TypeScript 7 without enabling `experimental.useTypeScriptCli`, `next build` exits with instructions to enable the option or install a TypeScript version supported by the default checker.
+
+> **Good to know**:
+>
+> - CLI type checking prints the native `tsc` diagnostics. It does not apply Next.js-specific code frames or rewrite errors for routes, pages, layouts, or route handlers.
+> - The CLI checks the complete project selected by your `tsconfig` file. This includes test files and `.next/dev/types` when they are included by that configuration. [`next build --debug-build-paths`](/docs/app/api-reference/cli/next#next-build-options) does not narrow the files that are type checked and produces a warning when used with this option.
+> - [`typescript.tsconfigPath`](#custom-tsconfig-path) continues to select the configuration passed to `tsc`. [`typescript.ignoreBuildErrors`](#disabling-typescript-errors-in-production) skips the type-checking step, including the CLI checker.
+> - `experimental.useTypeScriptCli` is experimental and its behavior may change.
+
 <AppOnly>
 
 ## IDE Plugin
@@ -31,7 +85,7 @@ You can enable the plugin in VS Code by:
   height="637"
 />
 
-Now, when editing files, the custom plugin will be enabled. When running `next build`, the custom type checker will be used.
+Now, when editing files, the custom plugin will be enabled. By default, the custom type checker is used when running `next build`. When [`experimental.useTypeScriptCli`](#using-typescript-7) is enabled, the project-local `tsc` CLI is used instead.
 
 The TypeScript plugin can help with:
 

package/dist/docs/01-app/03-api-reference/07-adapters/05-routing-with-next-routing.md

@@ -5,9 +5,6 @@ description: Use `@next/routing` to apply Next.js route matching behavior in ada
 
 You can use [`@next/routing`](https://www.npmjs.com/package/@next/routing) to reproduce Next.js route matching behavior with data from `onBuildComplete`.
 
-> [!NOTE]
-> `@next/routing` is experimental and will stabilize with the adapters API.
-
 ```typescript
 import { resolveRoutes } from '@next/routing'
 

package/dist/docs/02-pages/02-guides/forms.md

@@ -36,10 +36,10 @@ export default function handler(req, res) {
 Then, call the API Route from the client with an event handler:
 
 ```tsx filename="pages/index.tsx" switcher
-import { FormEvent } from 'react'
+import { SubmitEvent } from 'react'
 
 export default function Page() {
-  async function onSubmit(event: FormEvent<HTMLFormElement>) {
+  async function onSubmit(event: SubmitEvent<HTMLFormElement>) {
     event.preventDefault()
 
     const formData = new FormData(event.currentTarget)
@@ -133,13 +133,13 @@ export default async function handler(req, res) {
 You can use React state to show an error message when a form submission fails:
 
 ```tsx filename="pages/index.tsx" switcher
-import React, { useState, FormEvent } from 'react'
+import React, { useState, SubmitEvent } from 'react'
 
 export default function Page() {
   const [isLoading, setIsLoading] = useState<boolean>(false)
   const [error, setError] = useState<string | null>(null)
 
-  async function onSubmit(event: FormEvent<HTMLFormElement>) {
+  async function onSubmit(event: SubmitEvent<HTMLFormElement>) {
     event.preventDefault()
     setIsLoading(true)
     setError(null) // Clear previous errors when a new request starts
@@ -235,12 +235,12 @@ export default function Page() {
 You can use React state to show a loading state when a form is submitting on the server:
 
 ```tsx filename="pages/index.tsx" switcher
-import React, { useState, FormEvent } from 'react'
+import React, { useState, SubmitEvent } from 'react'
 
 export default function Page() {
   const [isLoading, setIsLoading] = useState<boolean>(false)
 
-  async function onSubmit(event: FormEvent<HTMLFormElement>) {
+  async function onSubmit(event: SubmitEvent<HTMLFormElement>) {
     event.preventDefault()
     setIsLoading(true) // Set loading to true when the request starts
 

package/dist/docs/02-pages/03-building-your-application/01-routing/08-custom-error.md

@@ -9,6 +9,8 @@ A 404 page may be accessed very often. Server-rendering an error page for every
 
 To avoid the above pitfalls, Next.js provides a static 404 page by default without having to add any additional files.
 
+> **Good to know**: The default 404 and 500 pages follow the operating system's color scheme via `prefers-color-scheme` and do not read an app-level theme. Because `pages/404.js` and `pages/500.js` render inside your custom `App`, providing your own files lets your global styles and theme apply.
+
 ### Customizing The 404 Page
 
 To create a custom 404 page you can create a `pages/404.js` file. This file is statically generated at build time.

package/dist/docs/02-pages/04-api-reference/04-config/01-next-config-js/useTypeScriptCli.md

@@ -0,0 +1,8 @@
+---
+title: useTypeScriptCli
+description: Run the project-local TypeScript CLI for type checking during production builds.
+source: app/api-reference/config/next-config-js/useTypeScriptCli
+version: experimental
+---
+
+{/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}

package/dist/esm/build/index.js

@@ -333,7 +333,7 @@ export default async function build(dir, experimentalAnalyze = false, reactProdu
     try {
         const nextBuildSpan = trace('next-build', undefined, {
             buildMode: experimentalBuildMode,
-            version: "16.2.11",
+            version: "16.2.12",
             ...enabledFeatures
         });
         NextBuildContext.nextBuildSpan = nextBuildSpan;
@@ -769,7 +769,7 @@ export default async function build(dir, experimentalAnalyze = false, reactProdu
             // Files outside of the distDir can be "type": "module"
             await writeFileUtf8(path.join(distDir, 'package.json'), '{"type": "commonjs"}');
             // These are written to distDir, so they need to come after creating and cleaning distDr.
-            await recordFrameworkVersion("16.2.11");
+            await recordFrameworkVersion("16.2.12");
             await updateBuildDiagnostics({
                 buildStage: 'start'
             });
@@ -2497,7 +2497,7 @@ export default async function build(dir, experimentalAnalyze = false, reactProdu
                         configOutDir: path.join(dir, configOutDir),
                         staticPages,
                         serverPropsPages,
-                        nextVersion: "16.2.11",
+                        nextVersion: "16.2.12",
                         tracingRoot: outputFileTracingRoot,
                         hasNodeMiddleware,
                         hasInstrumentationHook,

package/dist/esm/build/load-jsconfig.js

@@ -4,8 +4,9 @@ import * as Log from './output/log';
 import { getTypeScriptConfiguration } from '../lib/typescript/getTypeScriptConfiguration';
 import { readFileSync } from 'fs';
 import isError from '../lib/is-error';
-import { hasNecessaryDependencies } from '../lib/has-necessary-dependencies';
 import { codeFrameColumns } from '../shared/lib/errors/code-frame';
+import { getTypeScriptApiMissingError, getTypeScriptConfigurationCli, getTypeScriptPackageInfo, hasNativeTypeScriptPreview } from '../lib/typescript/runTypeScriptCli';
+import { loadTsConfigOptions } from '../lib/typescript/loadTsConfig';
 let TSCONFIG_WARNED = false;
 export function parseJsonFile(filePath) {
     const JSON5 = require('next/dist/compiled/json5');
@@ -36,19 +37,14 @@ export function parseJsonFile(filePath) {
 }
 export default async function loadJsConfig(dir, config) {
     var _jsConfig_compilerOptions;
-    let typeScriptPath;
-    try {
-        const deps = hasNecessaryDependencies(dir, [
-            {
-                pkg: 'typescript',
-                file: 'typescript/lib/typescript.js',
-                exportsRestrict: true
-            }
-        ]);
-        typeScriptPath = deps.resolved.get('typescript');
-    } catch  {}
+    const useTypeScriptCli = Boolean(config.experimental.useTypeScriptCli);
+    const typeScriptPackage = getTypeScriptPackageInfo(dir);
+    const typeScriptPath = useTypeScriptCli ? typeScriptPackage == null ? void 0 : typeScriptPackage.tscPath : typeScriptPackage == null ? void 0 : typeScriptPackage.apiPath;
     const tsConfigFileName = config.typescript.tsconfigPath || 'tsconfig.json';
     const tsConfigPath = path.join(dir, tsConfigFileName);
+    if (!useTypeScriptCli && typeScriptPackage && !typeScriptPackage.apiPath && !hasNativeTypeScriptPreview(dir) && fs.existsSync(tsConfigPath)) {
+        throw getTypeScriptApiMissingError(typeScriptPackage.version);
+    }
     const useTypeScript = Boolean(typeScriptPath && fs.existsSync(tsConfigPath));
     let implicitBaseurl;
     let jsConfig;
@@ -58,11 +54,26 @@ export default async function loadJsConfig(dir, config) {
             TSCONFIG_WARNED = true;
             Log.info(`Using tsconfig file: ${tsConfigFileName}`);
         }
-        const ts = await Promise.resolve(require(typeScriptPath));
-        const tsConfig = await getTypeScriptConfiguration(ts, tsConfigPath, true);
-        jsConfig = {
-            compilerOptions: tsConfig.options
-        };
+        if (useTypeScriptCli) {
+            const tsConfig = await getTypeScriptConfigurationCli({
+                baseDir: dir,
+                tsConfigPath,
+                tscPath: typeScriptPath
+            });
+            const configOrigins = loadTsConfigOptions(tsConfigPath);
+            jsConfig = {
+                compilerOptions: {
+                    ...tsConfig.compilerOptions,
+                    pathsBasePath: configOrigins.pathsBasePath
+                }
+            };
+        } else {
+            const ts = await Promise.resolve(require(typeScriptPath));
+            const tsConfig = await getTypeScriptConfiguration(ts, tsConfigPath, true);
+            jsConfig = {
+                compilerOptions: tsConfig.options
+            };
+        }
         implicitBaseurl = path.dirname(tsConfigPath);
     }
     const jsConfigPath = path.join(dir, 'jsconfig.json');
@@ -73,13 +84,22 @@ export default async function loadJsConfig(dir, config) {
     let resolvedBaseUrl;
     if (jsConfig == null ? void 0 : (_jsConfig_compilerOptions = jsConfig.compilerOptions) == null ? void 0 : _jsConfig_compilerOptions.baseUrl) {
         resolvedBaseUrl = {
-            baseUrl: path.resolve(dir, jsConfig.compilerOptions.baseUrl),
+            baseUrl: path.resolve(implicitBaseurl ?? dir, jsConfig.compilerOptions.baseUrl),
             isImplicit: false
         };
     } else {
-        if (implicitBaseurl) {
+        var _jsConfig_compilerOptions1;
+        // TypeScript 5.0+: `pathsBasePath` is the directory of the tsconfig that
+        // defines `paths`. For paths inherited from an extended base tsconfig (e.g.
+        // a workspace-root tsconfig.base.json for nx monorepo), this is the base
+        // config's directory — not the app tsconfig dir. Using it ensures JsConfigPathsPlugin
+        // joins path-mapping values against the correct base so `baseUrl` is not required
+        // for path aliases to work in webpack.
+        const pathsBasePath = jsConfig == null ? void 0 : (_jsConfig_compilerOptions1 = jsConfig.compilerOptions) == null ? void 0 : _jsConfig_compilerOptions1.pathsBasePath;
+        const effectiveBaseUrl = pathsBasePath ?? implicitBaseurl;
+        if (effectiveBaseUrl) {
             resolvedBaseUrl = {
-                baseUrl: implicitBaseurl,
+                baseUrl: effectiveBaseUrl,
                 isImplicit: true
             };
         }

package/dist/esm/build/load-jsconfig.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/build/load-jsconfig.ts"],"sourcesContent":["import path from 'path'\nimport fs from 'fs'\nimport type { NextConfigComplete } from '../server/config-shared'\nimport * as Log from './output/log'\nimport { getTypeScriptConfiguration } from '../lib/typescript/getTypeScriptConfiguration'\nimport { readFileSync } from 'fs'\nimport isError from '../lib/is-error'\nimport { hasNecessaryDependencies } from '../lib/has-necessary-dependencies'\nimport { codeFrameColumns } from '../shared/lib/errors/code-frame'\n\nlet TSCONFIG_WARNED = false\n\nexport function parseJsonFile(filePath: string) {\n  const JSON5 =\n    require('next/dist/compiled/json5') as typeof import('next/dist/compiled/json5')\n  const contents = readFileSync(filePath, 'utf8')\n\n  // Special case an empty file\n  if (contents.trim() === '') {\n    return {}\n  }\n\n  try {\n    return JSON5.parse(contents)\n  } catch (err) {\n    if (!isError(err)) throw err\n    const codeFrame = codeFrameColumns(\n      String(contents),\n      {\n        start: {\n          line: (err as Error & { lineNumber?: number }).lineNumber || 1,\n          column:\n            (err as Error & { columnNumber?: number }).columnNumber ||\n            undefined,\n        },\n      },\n      { message: err.message, color: true }\n    )\n    throw new Error(\n      `Failed to parse \"${filePath}\":\\n${codeFrame ?? err.message}`\n    )\n  }\n}\n\nexport type ResolvedBaseUrl =\n  | { baseUrl: string; isImplicit: boolean }\n  | undefined\n\nexport type JsConfig = { compilerOptions: Record<string, any> } | undefined\n\nexport default async function loadJsConfig(\n  dir: string,\n  config: NextConfigComplete\n): Promise<{\n  useTypeScript: boolean\n  jsConfig: JsConfig\n  jsConfigPath?: string\n  resolvedBaseUrl: ResolvedBaseUrl\n}> {\n  let typeScriptPath: string | undefined\n  try {\n    const deps = hasNecessaryDependencies(dir, [\n      {\n        pkg: 'typescript',\n        file: 'typescript/lib/typescript.js',\n        exportsRestrict: true,\n      },\n    ])\n    typeScriptPath = deps.resolved.get('typescript')\n  } catch {}\n  const tsConfigFileName = config.typescript.tsconfigPath || 'tsconfig.json'\n  const tsConfigPath = path.join(dir, tsConfigFileName)\n  const useTypeScript = Boolean(typeScriptPath && fs.existsSync(tsConfigPath))\n\n  let implicitBaseurl\n  let jsConfig: { compilerOptions: Record<string, any> } | undefined\n  // jsconfig is a subset of tsconfig\n  if (useTypeScript) {\n    if (tsConfigFileName !== 'tsconfig.json' && TSCONFIG_WARNED === false) {\n      TSCONFIG_WARNED = true\n      Log.info(`Using tsconfig file: ${tsConfigFileName}`)\n    }\n\n    const ts = (await Promise.resolve(\n      require(typeScriptPath!)\n    )) as typeof import('typescript')\n    const tsConfig = await getTypeScriptConfiguration(ts, tsConfigPath, true)\n    jsConfig = { compilerOptions: tsConfig.options }\n    implicitBaseurl = path.dirname(tsConfigPath)\n  }\n\n  const jsConfigPath = path.join(dir, 'jsconfig.json')\n  if (!useTypeScript && fs.existsSync(jsConfigPath)) {\n    jsConfig = parseJsonFile(jsConfigPath)\n    implicitBaseurl = path.dirname(jsConfigPath)\n  }\n\n  let resolvedBaseUrl: ResolvedBaseUrl\n  if (jsConfig?.compilerOptions?.baseUrl) {\n    resolvedBaseUrl = {\n      baseUrl: path.resolve(dir, jsConfig.compilerOptions.baseUrl),\n      isImplicit: false,\n    }\n  } else {\n    if (implicitBaseurl) {\n      resolvedBaseUrl = {\n        baseUrl: implicitBaseurl,\n        isImplicit: true,\n      }\n    }\n  }\n\n  return {\n    useTypeScript,\n    jsConfig,\n    resolvedBaseUrl,\n    jsConfigPath: useTypeScript\n      ? tsConfigPath\n      : fs.existsSync(jsConfigPath)\n        ? jsConfigPath\n        : undefined,\n  }\n}\n"],"names":["path","fs","Log","getTypeScriptConfiguration","readFileSync","isError","hasNecessaryDependencies","codeFrameColumns","TSCONFIG_WARNED","parseJsonFile","filePath","JSON5","require","contents","trim","parse","err","codeFrame","String","start","line","lineNumber","column","columnNumber","undefined","message","color","Error","loadJsConfig","dir","config","jsConfig","typeScriptPath","deps","pkg","file","exportsRestrict","resolved","get","tsConfigFileName","typescript","tsconfigPath","tsConfigPath","join","useTypeScript","Boolean","existsSync","implicitBaseurl","info","ts","Promise","resolve","tsConfig","compilerOptions","options","dirname","jsConfigPath","resolvedBaseUrl","baseUrl","isImplicit"],"mappings":"AAAA,OAAOA,UAAU,OAAM;AACvB,OAAOC,QAAQ,KAAI;AAEnB,YAAYC,SAAS,eAAc;AACnC,SAASC,0BAA0B,QAAQ,+CAA8C;AACzF,SAASC,YAAY,QAAQ,KAAI;AACjC,OAAOC,aAAa,kBAAiB;AACrC,SAASC,wBAAwB,QAAQ,oCAAmC;AAC5E,SAASC,gBAAgB,QAAQ,kCAAiC;AAElE,IAAIC,kBAAkB;AAEtB,OAAO,SAASC,cAAcC,QAAgB;IAC5C,MAAMC,QACJC,QAAQ;IACV,MAAMC,WAAWT,aAAaM,UAAU;IAExC,6BAA6B;IAC7B,IAAIG,SAASC,IAAI,OAAO,IAAI;QAC1B,OAAO,CAAC;IACV;IAEA,IAAI;QACF,OAAOH,MAAMI,KAAK,CAACF;IACrB,EAAE,OAAOG,KAAK;QACZ,IAAI,CAACX,QAAQW,MAAM,MAAMA;QACzB,MAAMC,YAAYV,iBAChBW,OAAOL,WACP;YACEM,OAAO;gBACLC,MAAM,AAACJ,IAAwCK,UAAU,IAAI;gBAC7DC,QACE,AAACN,IAA0CO,YAAY,IACvDC;YACJ;QACF,GACA;YAAEC,SAAST,IAAIS,OAAO;YAAEC,OAAO;QAAK;QAEtC,MAAM,qBAEL,CAFK,IAAIC,MACR,CAAC,iBAAiB,EAAEjB,SAAS,IAAI,EAAEO,aAAaD,IAAIS,OAAO,EAAE,GADzD,qBAAA;mBAAA;wBAAA;0BAAA;QAEN;IACF;AACF;AAQA,eAAe,eAAeG,aAC5BC,GAAW,EACXC,MAA0B;QA8CtBC;IAvCJ,IAAIC;IACJ,IAAI;QACF,MAAMC,OAAO3B,yBAAyBuB,KAAK;YACzC;gBACEK,KAAK;gBACLC,MAAM;gBACNC,iBAAiB;YACnB;SACD;QACDJ,iBAAiBC,KAAKI,QAAQ,CAACC,GAAG,CAAC;IACrC,EAAE,OAAM,CAAC;IACT,MAAMC,mBAAmBT,OAAOU,UAAU,CAACC,YAAY,IAAI;IAC3D,MAAMC,eAAe1C,KAAK2C,IAAI,CAACd,KAAKU;IACpC,MAAMK,gBAAgBC,QAAQb,kBAAkB/B,GAAG6C,UAAU,CAACJ;IAE9D,IAAIK;IACJ,IAAIhB;IACJ,mCAAmC;IACnC,IAAIa,eAAe;QACjB,IAAIL,qBAAqB,mBAAmB/B,oBAAoB,OAAO;YACrEA,kBAAkB;YAClBN,IAAI8C,IAAI,CAAC,CAAC,qBAAqB,EAAET,kBAAkB;QACrD;QAEA,MAAMU,KAAM,MAAMC,QAAQC,OAAO,CAC/BvC,QAAQoB;QAEV,MAAMoB,WAAW,MAAMjD,2BAA2B8C,IAAIP,cAAc;QACpEX,WAAW;YAAEsB,iBAAiBD,SAASE,OAAO;QAAC;QAC/CP,kBAAkB/C,KAAKuD,OAAO,CAACb;IACjC;IAEA,MAAMc,eAAexD,KAAK2C,IAAI,CAACd,KAAK;IACpC,IAAI,CAACe,iBAAiB3C,GAAG6C,UAAU,CAACU,eAAe;QACjDzB,WAAWtB,cAAc+C;QACzBT,kBAAkB/C,KAAKuD,OAAO,CAACC;IACjC;IAEA,IAAIC;IACJ,IAAI1B,6BAAAA,4BAAAA,SAAUsB,eAAe,qBAAzBtB,0BAA2B2B,OAAO,EAAE;QACtCD,kBAAkB;YAChBC,SAAS1D,KAAKmD,OAAO,CAACtB,KAAKE,SAASsB,eAAe,CAACK,OAAO;YAC3DC,YAAY;QACd;IACF,OAAO;QACL,IAAIZ,iBAAiB;YACnBU,kBAAkB;gBAChBC,SAASX;gBACTY,YAAY;YACd;QACF;IACF;IAEA,OAAO;QACLf;QACAb;QACA0B;QACAD,cAAcZ,gBACVF,eACAzC,GAAG6C,UAAU,CAACU,gBACZA,eACAhC;IACR;AACF","ignoreList":[0]}
+{"version":3,"sources":["../../../src/build/load-jsconfig.ts"],"sourcesContent":["import path from 'path'\nimport fs from 'fs'\nimport type { NextConfigComplete } from '../server/config-shared'\nimport * as Log from './output/log'\nimport { getTypeScriptConfiguration } from '../lib/typescript/getTypeScriptConfiguration'\nimport { readFileSync } from 'fs'\nimport isError from '../lib/is-error'\nimport { codeFrameColumns } from '../shared/lib/errors/code-frame'\nimport {\n  getTypeScriptApiMissingError,\n  getTypeScriptConfigurationCli,\n  getTypeScriptPackageInfo,\n  hasNativeTypeScriptPreview,\n} from '../lib/typescript/runTypeScriptCli'\nimport { loadTsConfigOptions } from '../lib/typescript/loadTsConfig'\n\nlet TSCONFIG_WARNED = false\n\nexport function parseJsonFile(filePath: string) {\n  const JSON5 =\n    require('next/dist/compiled/json5') as typeof import('next/dist/compiled/json5')\n  const contents = readFileSync(filePath, 'utf8')\n\n  // Special case an empty file\n  if (contents.trim() === '') {\n    return {}\n  }\n\n  try {\n    return JSON5.parse(contents)\n  } catch (err) {\n    if (!isError(err)) throw err\n    const codeFrame = codeFrameColumns(\n      String(contents),\n      {\n        start: {\n          line: (err as Error & { lineNumber?: number }).lineNumber || 1,\n          column:\n            (err as Error & { columnNumber?: number }).columnNumber ||\n            undefined,\n        },\n      },\n      { message: err.message, color: true }\n    )\n    throw new Error(\n      `Failed to parse \"${filePath}\":\\n${codeFrame ?? err.message}`\n    )\n  }\n}\n\nexport type ResolvedBaseUrl =\n  | { baseUrl: string; isImplicit: boolean }\n  | undefined\n\nexport type JsConfig = { compilerOptions: Record<string, any> } | undefined\n\nexport default async function loadJsConfig(\n  dir: string,\n  config: NextConfigComplete\n): Promise<{\n  useTypeScript: boolean\n  jsConfig: JsConfig\n  jsConfigPath?: string\n  resolvedBaseUrl: ResolvedBaseUrl\n}> {\n  const useTypeScriptCli = Boolean(config.experimental.useTypeScriptCli)\n  const typeScriptPackage = getTypeScriptPackageInfo(dir)\n  const typeScriptPath = useTypeScriptCli\n    ? typeScriptPackage?.tscPath\n    : typeScriptPackage?.apiPath\n  const tsConfigFileName = config.typescript.tsconfigPath || 'tsconfig.json'\n  const tsConfigPath = path.join(dir, tsConfigFileName)\n\n  if (\n    !useTypeScriptCli &&\n    typeScriptPackage &&\n    !typeScriptPackage.apiPath &&\n    !hasNativeTypeScriptPreview(dir) &&\n    fs.existsSync(tsConfigPath)\n  ) {\n    throw getTypeScriptApiMissingError(typeScriptPackage.version)\n  }\n\n  const useTypeScript = Boolean(typeScriptPath && fs.existsSync(tsConfigPath))\n\n  let implicitBaseurl\n  let jsConfig: { compilerOptions: Record<string, any> } | undefined\n  // jsconfig is a subset of tsconfig\n  if (useTypeScript) {\n    if (tsConfigFileName !== 'tsconfig.json' && TSCONFIG_WARNED === false) {\n      TSCONFIG_WARNED = true\n      Log.info(`Using tsconfig file: ${tsConfigFileName}`)\n    }\n\n    if (useTypeScriptCli) {\n      const tsConfig = await getTypeScriptConfigurationCli({\n        baseDir: dir,\n        tsConfigPath,\n        tscPath: typeScriptPath!,\n      })\n      const configOrigins = loadTsConfigOptions(tsConfigPath)\n      jsConfig = {\n        compilerOptions: {\n          ...tsConfig.compilerOptions,\n          pathsBasePath: configOrigins.pathsBasePath,\n        },\n      }\n    } else {\n      const ts = (await Promise.resolve(\n        require(typeScriptPath!)\n      )) as typeof import('typescript')\n      const tsConfig = await getTypeScriptConfiguration(ts, tsConfigPath, true)\n      jsConfig = { compilerOptions: tsConfig.options }\n    }\n    implicitBaseurl = path.dirname(tsConfigPath)\n  }\n\n  const jsConfigPath = path.join(dir, 'jsconfig.json')\n  if (!useTypeScript && fs.existsSync(jsConfigPath)) {\n    jsConfig = parseJsonFile(jsConfigPath)\n    implicitBaseurl = path.dirname(jsConfigPath)\n  }\n\n  let resolvedBaseUrl: ResolvedBaseUrl\n  if (jsConfig?.compilerOptions?.baseUrl) {\n    resolvedBaseUrl = {\n      baseUrl: path.resolve(\n        implicitBaseurl ?? dir,\n        jsConfig.compilerOptions.baseUrl\n      ),\n      isImplicit: false,\n    }\n  } else {\n    // TypeScript 5.0+: `pathsBasePath` is the directory of the tsconfig that\n    // defines `paths`. For paths inherited from an extended base tsconfig (e.g.\n    // a workspace-root tsconfig.base.json for nx monorepo), this is the base\n    // config's directory — not the app tsconfig dir. Using it ensures JsConfigPathsPlugin\n    // joins path-mapping values against the correct base so `baseUrl` is not required\n    // for path aliases to work in webpack.\n    const pathsBasePath: string | undefined =\n      jsConfig?.compilerOptions?.pathsBasePath\n    const effectiveBaseUrl = pathsBasePath ?? implicitBaseurl\n    if (effectiveBaseUrl) {\n      resolvedBaseUrl = {\n        baseUrl: effectiveBaseUrl,\n        isImplicit: true,\n      }\n    }\n  }\n\n  return {\n    useTypeScript,\n    jsConfig,\n    resolvedBaseUrl,\n    jsConfigPath: useTypeScript\n      ? tsConfigPath\n      : fs.existsSync(jsConfigPath)\n        ? jsConfigPath\n        : undefined,\n  }\n}\n"],"names":["path","fs","Log","getTypeScriptConfiguration","readFileSync","isError","codeFrameColumns","getTypeScriptApiMissingError","getTypeScriptConfigurationCli","getTypeScriptPackageInfo","hasNativeTypeScriptPreview","loadTsConfigOptions","TSCONFIG_WARNED","parseJsonFile","filePath","JSON5","require","contents","trim","parse","err","codeFrame","String","start","line","lineNumber","column","columnNumber","undefined","message","color","Error","loadJsConfig","dir","config","jsConfig","useTypeScriptCli","Boolean","experimental","typeScriptPackage","typeScriptPath","tscPath","apiPath","tsConfigFileName","typescript","tsconfigPath","tsConfigPath","join","existsSync","version","useTypeScript","implicitBaseurl","info","tsConfig","baseDir","configOrigins","compilerOptions","pathsBasePath","ts","Promise","resolve","options","dirname","jsConfigPath","resolvedBaseUrl","baseUrl","isImplicit","effectiveBaseUrl"],"mappings":"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","ignoreList":[0]}

package/dist/esm/build/next-config-ts/transpile-config.js

@@ -1,10 +1,10 @@
 import path from 'node:path';
 import { readFileSync, existsSync } from 'node:fs';
 import { pathToFileURL } from 'node:url';
-import * as CommentJson from 'next/dist/compiled/comment-json';
 import { deregisterHook, registerHook, requireFromString } from './require-hook';
 import { warn, warnOnce } from '../output/log';
 import { getNodeOptionsArgs } from '../../server/lib/utils';
+import { loadTsConfigOptions } from '../../lib/typescript/loadTsConfig';
 function resolveSWCOptions(cwd, compilerOptions) {
     var _process_versions, _process;
     return {
@@ -18,7 +18,7 @@ function resolveSWCOptions(cwd, compilerOptions) {
             ...compilerOptions.baseUrl ? {
                 baseUrl: path.resolve(cwd, compilerOptions.baseUrl)
             } : compilerOptions.paths ? {
-                baseUrl: cwd
+                baseUrl: compilerOptions.pathsBasePath ?? cwd
             } : {}
         },
         module: {
@@ -33,76 +33,6 @@ function resolveSWCOptions(cwd, compilerOptions) {
         }
     };
 }
-function resolveExtends(extendsPath, currentConfigDir) {
-    // Relative paths are resolved relative to the current config's directory
-    if (extendsPath.startsWith('./') || extendsPath.startsWith('../') || path.isAbsolute(extendsPath)) {
-        const resolved = path.resolve(currentConfigDir, extendsPath);
-        // TypeScript allows omitting .json extension
-        if (existsSync(resolved)) {
-            return resolved;
-        }
-        if (!resolved.endsWith('.json') && existsSync(resolved + '.json')) {
-            return resolved + '.json';
-        }
-        return resolved;
-    }
-    // Package paths - use require.resolve to find the package
-    try {
-        // Try resolving as a direct path within the package
-        return require.resolve(extendsPath, {
-            paths: [
-                currentConfigDir
-            ]
-        });
-    } catch  {
-        // If that fails, try appending tsconfig.json for package names like "@tsconfig/node18"
-        try {
-            return require.resolve(extendsPath + '/tsconfig.json', {
-                paths: [
-                    currentConfigDir
-                ]
-            });
-        } catch  {
-            // Return the original path and let it fail later with a clear error
-            return path.resolve(currentConfigDir, extendsPath);
-        }
-    }
-}
-function loadTsConfigFile(configPath, visited) {
-    const resolvedPath = path.resolve(configPath);
-    if (visited.has(resolvedPath)) {
-        return {};
-    }
-    visited.add(resolvedPath);
-    if (!existsSync(resolvedPath)) {
-        return {};
-    }
-    const configContent = readFileSync(resolvedPath, 'utf8');
-    const config = CommentJson.parse(configContent);
-    const configDir = path.dirname(resolvedPath);
-    let mergedOptions = {};
-    // Note that config options from `extends` should get overwritten, not merged
-    if (config.extends) {
-        const extendsList = Array.isArray(config.extends) ? config.extends : [
-            config.extends
-        ];
-        for (const extendsPath of extendsList){
-            const parentConfigPath = resolveExtends(extendsPath, configDir);
-            const parentOptions = loadTsConfigFile(parentConfigPath, visited);
-            mergedOptions = {
-                ...mergedOptions,
-                ...parentOptions
-            };
-        }
-    }
-    const currentOptions = config.compilerOptions ?? {};
-    mergedOptions = {
-        ...mergedOptions,
-        paths: currentOptions.paths ?? mergedOptions.paths,
-        baseUrl: currentOptions.baseUrl ?? mergedOptions.baseUrl
-    };
-    return mergedOptions;
-}
 async function loadTsConfig(dir) {
     // NOTE: This doesn't fully cover the edge case for setting
     // "typescript.tsconfigPath" in next config which is currently
@@ -113,7 +43,7 @@ async function loadTsConfig(dir) {
     if (!existsSync(resolvedTsConfigPath)) {
         return {};
     }
-    return loadTsConfigFile(resolvedTsConfigPath, new Set());
+    return loadTsConfigOptions(resolvedTsConfigPath);
 }
 export async function transpileConfig({ nextConfigPath, dir }) {
     try {