@nx/js 23.1.0-rc.1 → 23.1.0-rc.3

package/dist/src/migrations/update-23-1-0/set-tsconfig-root-dir-for-ts6.d.ts

@@ -16,15 +16,21 @@ import { type Tree } from '@nx/devkit';
  * when the inferred directory already equals the tsconfig directory: inference
  * is per-program, and tools like ts-jest's `isolatedModules` compile single
  * files against the same config, collapsing the common directory below the
- * config dir and failing with TS5011. Only composite configs are exempt — their
- * `rootDir` defaults to the tsconfig directory in both versions regardless of
- * the file set.
+ * config dir and failing with TS5011.
+ *
+ * Composite configs are pinned too, to the tsconfig's own directory. Under `tsc`
+ * a composite `rootDir` already defaults there (for any file subset), so `"."`
+ * is a no-op — but ts-jest strips `composite` for its per-file transpile, and
+ * TypeScript 6 only exempts genuinely-composite programs from the containment
+ * check (`!options.composite`), so a composite spec config compiled by ts-jest
+ * hits TS5011 all the same. The explicit `"."` survives the strip. Pinning the
+ * own directory (not a deeper file-derived value) keeps a real composite build's
+ * emit layout unchanged.
  *
  * Each config is written on its own; nothing is written to a shared `extends`
- * base, so a config never inherits a `rootDir` computed for a sibling. The one
- * case that needs care is a config that both needs a `rootDir` and is itself an
- * `extends` base: a composite child would inherit the new value and shift its
- * emit layout, so each such child is pinned to its own directory to block it.
- * Runs only on TypeScript 6 workspaces (gated by `requires`).
+ * base, so a config never inherits a `rootDir` computed for a sibling — and
+ * because every config that emits is given its own explicit `rootDir`, none
+ * inherits a value pinned on a base. Runs only on TypeScript 6 workspaces
+ * (gated by `requires`).
  */
 export default function (tree: Tree): Promise<void>;

package/dist/src/migrations/update-23-1-0/set-tsconfig-root-dir-for-ts6.js

@@ -26,16 +26,22 @@ let tsModule;
  * when the inferred directory already equals the tsconfig directory: inference
  * is per-program, and tools like ts-jest's `isolatedModules` compile single
  * files against the same config, collapsing the common directory below the
- * config dir and failing with TS5011. Only composite configs are exempt — their
- * `rootDir` defaults to the tsconfig directory in both versions regardless of
- * the file set.
+ * config dir and failing with TS5011.
+ *
+ * Composite configs are pinned too, to the tsconfig's own directory. Under `tsc`
+ * a composite `rootDir` already defaults there (for any file subset), so `"."`
+ * is a no-op — but ts-jest strips `composite` for its per-file transpile, and
+ * TypeScript 6 only exempts genuinely-composite programs from the containment
+ * check (`!options.composite`), so a composite spec config compiled by ts-jest
+ * hits TS5011 all the same. The explicit `"."` survives the strip. Pinning the
+ * own directory (not a deeper file-derived value) keeps a real composite build's
+ * emit layout unchanged.
  *
  * Each config is written on its own; nothing is written to a shared `extends`
- * base, so a config never inherits a `rootDir` computed for a sibling. The one
- * case that needs care is a config that both needs a `rootDir` and is itself an
- * `extends` base: a composite child would inherit the new value and shift its
- * emit layout, so each such child is pinned to its own directory to block it.
- * Runs only on TypeScript 6 workspaces (gated by `requires`).
+ * base, so a config never inherits a `rootDir` computed for a sibling — and
+ * because every config that emits is given its own explicit `rootDir`, none
+ * inherits a value pinned on a base. Runs only on TypeScript 6 workspaces
+ * (gated by `requires`).
  */
 async function default_1(tree) {
     tsModule ??= (0, ensure_typescript_1.ensureTypescript)();
@@ -54,7 +60,10 @@ async function default_1(tree) {
             analysis: analyze(ts, absPath, parseConfigHost),
         };
     });
-    // Phase 2: pin each config that needs a `rootDir` on its own.
+    // Phase 2: pin each config that needs a `rootDir` on its own. Every config
+    // that emits is given its own explicit value here — including composites,
+    // pinned to their own directory — so none is left to inherit a `rootDir` this
+    // migration pins on a base.
     let changed = 0;
     for (const c of candidates) {
         if (c.analysis.kind === 'write') {
@@ -64,36 +73,6 @@ async function default_1(tree) {
             }
         }
     }
-    // Phase 3: shield composite configs that now inherit a pinned `rootDir` from
-    // a base. Re-parse each from the tree (so Phase 2's writes are visible); when
-    // TypeScript reports an inherited `rootDir` where there was none, pin the
-    // config to its own directory so its emit layout does not shift. Repeat until
-    // stable, since shielding one config can turn it into a base for another. The
-    // tree-backed host lets TypeScript resolve `extends`; the `readDirectory`
-    // no-op skips the unused file scan.
-    const readFile = (filePath) => tree.read(filePath, 'utf-8') ?? undefined;
-    const treeParseHost = {
-        ...ts.sys,
-        readFile,
-        readDirectory: () => [],
-    };
-    const shielded = new Set();
-    let added = true;
-    while (added) {
-        added = false;
-        for (const c of candidates) {
-            if (c.analysis.kind !== 'composite' || shielded.has(c.relPath)) {
-                continue;
-            }
-            if (inheritsRootDir(ts, treeParseHost, readFile, c.relPath)) {
-                if (setRootDir(tree, c.relPath, '.')) {
-                    changed++;
-                }
-                shielded.add(c.relPath);
-                added = true;
-            }
-        }
-    }
     if (changed > 0) {
         await (0, devkit_1.formatFiles)(tree);
     }
@@ -110,12 +89,14 @@ function analyze(ts, absPath, parseConfigHost) {
     if (!setsEmitGate(options) || fileNames.length === 0) {
         return { kind: 'inert' };
     }
-    // Composite already defaults `rootDir` to the tsconfig's own directory in both
-    // 5.x and 6.0, so the 6.0 change leaves it alone. Never pin a file-derived
-    // value; only shield it from a `rootDir` this migration pins on an `extends`
-    // base.
+    // Composite: pin the tsconfig's own directory, not a file-derived value.
+    // `rootDir` already defaults there under `tsc`, so `"."` preserves a real
+    // composite build's emit layout — but ts-jest strips `composite` for its
+    // per-file transpile, and TS6 only skips the containment check for genuinely
+    // composite programs, so an unpinned composite spec config still fails with
+    // TS5011 under ts-jest. The explicit pin survives the strip.
     if (options.composite) {
-        return { kind: 'composite' };
+        return { kind: 'write', dirAbs: toPosix((0, node_path_1.dirname)(absPath)) };
     }
     const commonDir = computeCommonSourceDirectory(ts, fileNames, options, projectReferences);
     if (!commonDir) {
@@ -128,18 +109,6 @@ function analyze(ts, absPath, parseConfigHost) {
     // fails with TS5011.
     return { kind: 'write', dirAbs: toPosix(commonDir).replace(/\/+$/, '') };
 }
-// True when TypeScript resolves an inherited `rootDir` for the config. A
-// composite config sets none of its own (or it would be `has-rootDir`), so any
-// `rootDir` reported here comes from a base this migration just pinned, and
-// inheriting it would shift the config's emit layout.
-function inheritsRootDir(ts, parseHost, readFile, relPath) {
-    const config = ts.readConfigFile(relPath, readFile).config;
-    if (!config) {
-        return false;
-    }
-    const { options } = ts.parseJsonConfigFileContent(config, parseHost, (0, node_path_1.dirname)(relPath));
-    return options.rootDir != null;
-}
 // Any of these makes TypeScript run the source-file containment / common-source
 // computation that emits TS5011 / TS6059 when `rootDir` is absent.
 function setsEmitGate(o) {

package/dist/src/migrations/update-23-1-0/set-tsconfig-root-dir-for-ts6.md

@@ -2,9 +2,11 @@
 
 Before TypeScript 6, a tsconfig that did not set `rootDir` had it inferred as the common directory of the program's non-declaration input files. TypeScript 6 changed that default to the tsconfig's own directory. A program whose files resolve outside that directory (most commonly a spec or e2e tsconfig that imports another project's source through a `paths` alias) now hard-fails with `TS5011` or `TS6059` because a file falls outside the assumed root.
 
-For every project `tsconfig*.json` that does not already set `rootDir` (directly or through `extends`), this migration pins `rootDir` to exactly the directory TypeScript 5 would have inferred, so both compilation and emit layout stay the same under TypeScript 6. The value is computed by the TypeScript compiler itself, so it matches `tsc` exactly, including project-reference redirects. The pin is written even when the inferred directory already equals the tsconfig directory: inference is per-program, and a tool that compiles a subset of the config's files — ts-jest with `isolatedModules` builds a program per test file — re-infers a deeper common directory from that subset and fails with `TS5011`. Configs that cannot hit the error are skipped: ones without an output option (`outDir`, `outFile`, `sourceRoot`, `mapRoot`, or `declaration` + `declarationDir`), ones with no input files, and composite projects (whose `rootDir` defaults to the tsconfig directory in both versions, for any file subset). The migration only runs when the workspace is on TypeScript 6.
+For every project `tsconfig*.json` that does not already set `rootDir` (directly or through `extends`), this migration pins `rootDir` to exactly the directory TypeScript 5 would have inferred, so both compilation and emit layout stay the same under TypeScript 6. The value is computed by the TypeScript compiler itself, so it matches `tsc` exactly, including project-reference redirects. The pin is written even when the inferred directory already equals the tsconfig directory: inference is per-program, and a tool that compiles a subset of the config's files — ts-jest with `isolatedModules` builds a program per test file — re-infers a deeper common directory from that subset and fails with `TS5011`. Configs that cannot hit the error are skipped: ones without an output option (`outDir`, `outFile`, `sourceRoot`, `mapRoot`, or `declaration` + `declarationDir`), and ones with no input files. The migration only runs when the workspace is on TypeScript 6.
 
-Each config is updated on its own; the migration never writes `rootDir` to a shared `extends` base, so a config never inherits a value computed for a sibling. The one case that needs care is a config that both needs a `rootDir` and is itself an `extends` base: a composite child would inherit the new value and emit to the wrong place, so each such child is pinned to its own directory to keep the default it had.
+Composite projects are pinned to their own directory (`"."`). Under `tsc` a composite `rootDir` already defaults there, so the pin is a no-op for a real composite build — but ts-jest strips `composite` for its per-file transpile, and TypeScript 6 only exempts genuinely-composite programs from the containment check, so a composite spec config compiled by ts-jest still fails with `TS5011` without an explicit `rootDir`. Pinning the own directory (rather than a deeper file-derived value) keeps the composite build's emit layout unchanged while fixing the ts-jest case.
+
+Each config is updated on its own; the migration never writes `rootDir` to a shared `extends` base, so a config never inherits a value computed for a sibling. Because every config that emits is given its own explicit `rootDir`, none is left to inherit a value pinned on a base.
 
 #### Sample Code Changes
 

package/dist/src/utils/versions.d.ts

@@ -1,7 +1,7 @@
 export declare const nxVersion: any;
 export declare const esbuildVersion = "^0.27.0";
 export declare const prettierVersion = "~3.6.2";
-export declare const swcCliVersion = "~0.8.0";
+export declare const swcCliVersion = "~0.8.1";
 export declare const swcCoreVersion = "~1.15.5";
 export declare const swcHelpersVersion = "~0.5.18";
 export declare const swcNodeVersion = "~1.11.1";

package/dist/src/utils/versions.js

@@ -5,7 +5,7 @@ const path_1 = require("path");
 exports.nxVersion = require((0, path_1.join)('@nx/js', 'package.json')).version;
 exports.esbuildVersion = '^0.27.0';
 exports.prettierVersion = '~3.6.2';
-exports.swcCliVersion = '~0.8.0';
+exports.swcCliVersion = '~0.8.1';
 exports.swcCoreVersion = '~1.15.5';
 exports.swcHelpersVersion = '~0.5.18';
 exports.swcNodeVersion = '~1.11.1';

package/migrations.json

@@ -39,8 +39,8 @@
       "documentation": "./dist/src/migrations/update-23-1-0/add-ignore-deprecations-for-ts6.md"
     },
     "23-1-0-set-tsconfig-root-dir-for-ts6": {
-      "version": "23.1.0-rc.1",
-      "description": "Sets an explicit `rootDir` on project `tsconfig*.json` files that lack one, pinned to the source directory TypeScript 5 inferred implicitly, so programs keep compiling and emitting the same layout under TypeScript 6, which otherwise hard-fails with TS5011 or TS6059 (for example a spec tsconfig importing another project's source through a `paths` alias). The pin is written even when the inferred directory already equals the tsconfig directory, because tools like ts-jest with `isolatedModules` compile a program per file and re-infer a deeper directory from that subset. The value is computed by the compiler, so emit layout is unchanged. Each config is written on its own; the migration never writes to a shared `extends` base, so a config never inherits a value computed for a sibling. Composite projects are not given an inferred `rootDir`, since it already defaults to the tsconfig directory in both versions; a composite that extends a base receiving a pinned `rootDir` is itself pinned to its own directory to preserve that default.",
+      "version": "23.1.0-rc.2",
+      "description": "Sets an explicit `rootDir` on project `tsconfig*.json` files that lack one, pinned to the source directory TypeScript 5 inferred implicitly, so programs keep compiling and emitting the same layout under TypeScript 6, which otherwise hard-fails with TS5011 or TS6059 (for example a spec tsconfig importing another project's source through a `paths` alias). The pin is written even when the inferred directory already equals the tsconfig directory, because tools like ts-jest with `isolatedModules` compile a program per file and re-infer a deeper directory from that subset. The value is computed by the compiler, so emit layout is unchanged. Each config is written on its own; the migration never writes to a shared `extends` base, so a config never inherits a value computed for a sibling. Composite projects are pinned to their own directory: `rootDir` already defaults there under `tsc` so it is a no-op for a real composite build, but ts-jest strips `composite` for its per-file transpile and the explicit value is needed to avoid TS5011 there.",
       "requires": {
         "typescript": ">=6.0.0"
       },
@@ -139,6 +139,18 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "23.1.0-swc-cli": {
+      "version": "23.1.0-rc.3",
+      "requires": {
+        "@swc/cli": ">=0.8.0 <0.8.1"
+      },
+      "packages": {
+        "@swc/cli": {
+          "version": "~0.8.1",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "23.1.0-rc.1",
+  "version": "23.1.0-rc.3",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -144,11 +144,11 @@
     "source-map-support": "0.5.19",
     "tinyglobby": "^0.2.12",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.1.0-rc.1",
-    "@nx/workspace": "23.1.0-rc.1"
+    "@nx/devkit": "23.1.0-rc.3",
+    "@nx/workspace": "23.1.0-rc.3"
   },
   "devDependencies": {
-    "nx": "23.1.0-rc.1"
+    "nx": "23.1.0-rc.3"
   },
   "peerDependencies": {
     "@swc/cli": ">=0.6.0 <0.9.0",