npm - @mouryaamit/nx-polystack - Versions diffs - 1.0.3 → 1.1.1 - Mend

@mouryaamit/nx-polystack 1.0.3 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/USER-MANUAL.md +33 -11
package/dist/src/cli/commands/update.d.ts +5 -0
package/dist/src/cli/commands/update.js +21 -2
package/dist/src/cli/commands/update.js.map +1 -1
package/dist/src/cli/help.js +3 -2
package/dist/src/cli/help.js.map +1 -1
package/dist/src/generators/migrate/adapters/external.d.ts +10 -1
package/dist/src/generators/migrate/adapters/external.js +235 -21
package/dist/src/generators/migrate/adapters/external.js.map +1 -1
package/dist/src/generators/migrate/generator.js +102 -13
package/dist/src/generators/migrate/generator.js.map +1 -1
package/dist/src/generators/migrate/imports/rewrite.d.ts +17 -1
package/dist/src/generators/migrate/imports/rewrite.js +198 -20
package/dist/src/generators/migrate/imports/rewrite.js.map +1 -1
package/dist/src/generators/migrate/report.js +9 -0
package/dist/src/generators/migrate/report.js.map +1 -1
package/package.json +1 -1

package/USER-MANUAL.md CHANGED Viewed

@@ -143,7 +143,8 @@ OPTIONS — new / preset
   --force                      new only — allow creating inside another Nx workspace
 OPTIONS — update
-  --to=<version>               Target version (default: this CLI's version)
+  --to=<version>               Target version, also as "pstack update <version>"
+                               (default: this CLI's version)
   --allow-dirty                Run with uncommitted changes
   --force                      Allow downgrading
@@ -263,13 +264,14 @@ pstack new <dir> [--npmScope=<scope>] [--baseBranch=<branch>] [--infra=…] [--c
 ## 3b. pstack update — upgrade a workspace
 ```bash
-pstack update [--to=<version>] [--dry-run] [--allow-dirty] [--force]
+pstack update [<version> | --to=<version>] [--dry-run] [--allow-dirty] [--force]
 ```
 1. Reads the pinned version of `@mouryaamit/nx-polystack` from `package.json` (`1.2.0`, or the installed
    version for a range such as `^1.2.0`). Any other spec (a git tag, a tarball, `latest`) uses the installed
    version, and is rewritten to a normal pin.
-2. Target is `--to`, else the global CLI's version. Downgrades need `--force`. If the global CLI is older than the
+2. Target is the version argument or `--to` (`pstack update 1.2.0` is `pstack update --to=1.2.0`), else the
+   global CLI's version. Downgrades need `--force`. If the global CLI is older than the
    workspace pin, `update` tells you to upgrade the global CLI first (or pass `--force`).
 3. Needs a clean git tree unless `--allow-dirty`. The check covers only the workspace folder.
 4. Installs with `npm install @mouryaamit/nx-polystack@<to> --save-dev --save-exact` (`--save-prod` if the plugin
@@ -1189,8 +1191,22 @@ The source is never changed, and `--rollback` removes the rewritten copies with
   workspace does not declare yet.
 - **SCSS:** relative `@use`, `@import` and `@forward` paths that reach into another moved project
   are corrected; paths into the source's root `node_modules` point at the workspace's.
+- **Angular resources (1.1.0):** relative `templateUrl`, `styleUrl` and `styleUrls` entries that
+  reach into another moved project become the corrected relative path (Angular needs a path, not
+  an alias).
+- **Sass load paths (1.1.0):** a bare `@use 'theme'` is resolved the way Sass does it: next to the
+  stylesheet, then through the source `stylePreprocessorOptions.includePaths` of the project that
+  owns it (`angular.json` or its `project.json`). If the workspace project's own `includePaths` no
+  longer reach the same copied file first, it becomes a relative path. A load-path file that was
+  not imported, and an `includePaths` entry that does not exist in the workspace, are listed.
+  `sass:` modules, `~` paths, URLs, plain `.css` imports, `with (...)` values and anything found in
+  `node_modules` are left alone.
 - **Library subpaths** (npm, Yarn and pnpm imports): `@acme/utils/x` resolves through an added
   `@acme/utils/*` alias to the package folder.
+- **Between `--config` entries (1.1.0):** an import into a project an earlier entry brought in is
+  rewritten like any other. Imports into a project a later entry brings in are fixed after the
+  last entry, in its tree: its report lists them under "Resolved in earlier entries", the earlier
+  reports are updated, and `--rollback` of the last entry puts them back.
 Code files are `.ts`, `.tsx`, `.mts`, `.cts`, `.js`, `.jsx`, `.mjs` and `.cjs` (not `.d.ts`); the
 rewritten forms are `import`/`export … from`, `import()`, side-effect imports, `require()` and
@@ -1218,14 +1234,20 @@ with a Jest spec and `tools/migrate/jest.config.js`, and lists it in `nx.json`:
 }
 ```
-Entries are workspace-relative `.js`/`.ts` files or installed package names. A module exports one
-adapter or a list (`default`, `adapters`, `adapter`, or `module.exports`).
-- **TypeScript:** `.ts` files are transpiled with the workspace's `typescript` and its
-  `tsconfig.base.json` options (no ts-node needed). `paths` aliases are not resolved, and
-  `.mts`/`.cts` files are not supported.
-- **Adapter packages:** must be CommonJS, and should list nx-polystack as a peer dependency so
-  they use the workspace's copy.
+Entries are workspace-relative `.js`/`.mjs`/`.cjs`/`.ts`/`.mts`/`.cts` files or installed package
+names. A module exports one adapter or a list (`default`, `adapters`, `adapter`, or
+`module.exports`).
+- **TypeScript:** `.ts`, `.mts` and `.cts` files are transpiled to CommonJS with the workspace's
+  `typescript` and its `tsconfig.base.json` options (no ts-node needed). `paths` aliases resolve
+  while the adapter runs (1.1.0). `import.meta` and top-level `await` are not supported in
+  TypeScript adapters.
+- **ES modules (1.1.0):** `.mjs` files, `.js` files in a `"type": "module"` package and ESM-only
+  packages (resolved through their `exports`) load through Node's own `require`, which needs Node
+  20.19+ or 22.12+. An ES module with top-level `await` cannot be loaded (adapters load
+  synchronously).
+- **Adapter packages:** CommonJS or ESM; list nx-polystack as a peer dependency so they use the
+  workspace's copy.
 - **Trust:** listed adapters run as code on `pstack migrate`, `--detect` included. List only
   adapters you trust, as with Nx plugins.

package/dist/src/cli/commands/update.d.ts CHANGED Viewed

@@ -8,4 +8,9 @@ export interface UpdateDeps {
 }
 /** Arguments for the child `_migrate` process. */
 export declare function migrateArgs(from: string, to: string, verbose?: boolean): string[];
+/**
+ * The target version asked for: `pstack update 1.2.0` or `--to=1.2.0` (both may be given if they
+ * agree), or undefined for the global CLI's own version.
+ */
+export declare function requestedVersion(positionals: string[], toFlag: string | undefined): string | undefined;
 export declare function runUpdate(ctx: CommandContext, deps?: UpdateDeps): Promise<number>;

package/dist/src/cli/commands/update.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runUpdate = exports.migrateArgs = void 0;
+exports.runUpdate = exports.requestedVersion = exports.migrateArgs = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs"));
 const path = tslib_1.__importStar(require("path"));
@@ -17,6 +17,24 @@ function migrateArgs(from, to, verbose = false) {
     return ['_migrate', `--from=${from}`, `--to=${to}`, ...(verbose ? ['--verbose'] : [])];
 }
 exports.migrateArgs = migrateArgs;
+/**
+ * The target version asked for: `pstack update 1.2.0` or `--to=1.2.0` (both may be given if they
+ * agree), or undefined for the global CLI's own version.
+ */
+function requestedVersion(positionals, toFlag) {
+    if (positionals.length > 1) {
+        throw new types_1.CliError(`pstack update takes one version, got: ${positionals.join(' ')}`);
+    }
+    const arg = positionals[0];
+    if (arg === undefined)
+        return toFlag;
+    const version = (0, versions_1.normalizeVersion)(arg);
+    if (toFlag !== undefined && (0, versions_1.normalizeVersion)(toFlag) !== version) {
+        throw new types_1.CliError(`"${arg}" and --to=${toFlag} name different versions; give one.`);
+    }
+    return version;
+}
+exports.requestedVersion = requestedVersion;
 const defaultDeps = {
     exec: exec_1.execOrThrow,
     gitStatus: exec_1.gitStatus,
@@ -34,6 +52,7 @@ async function runUpdate(ctx, deps = defaultDeps) {
     if (ctx.flags['to'] === true) {
         throw new types_1.CliError('--to requires a version, e.g. --to=0.3.0');
     }
+    const toVersion = requestedVersion(ctx.positionals, (0, args_1.flagString)(ctx.flags, 'to'));
     const pkgText = fs.readFileSync(pkgPath, 'utf8');
     const installedVersion = (0, context_1.resolveLocalPlugin)(root)?.version;
     const pin = (0, update_plan_1.findPluginPin)(JSON.parse(pkgText.replace(/^\uFEFF/, '')), ctx.selfVersion, installedVersion);
@@ -49,7 +68,7 @@ async function runUpdate(ctx, deps = defaultDeps) {
             pin.version = installed;
         }
     }
-    const target = (0, update_plan_1.resolveTarget)(pin.version, (0, args_1.flagString)(ctx.flags, 'to'), ctx.selfVersion, !!ctx.flags['force']);
+    const target = (0, update_plan_1.resolveTarget)(pin.version, toVersion, ctx.selfVersion, !!ctx.flags['force']);
     // An unreadable pin on the current version is still rewritten to a normal pin.
     if (target.action === 'noop' && !pin.fromInstalled) {
         console.log(`Already on nx-polystack v${target.to}.`);

package/dist/src/cli/commands/update.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/cli/commands/update.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,mDAA6B;AAE7B,kCAAqC;AACrC,wCAAmE;AACnE,kCAAiD;AACjD,sDAAkD;AAClD,0CAAuC;AACvC,oCAAoD;AACpD,gDAA8D;AAC9D,~~0CAA8F~~;~~AAgB9F~~,kDAAkD;AAClD,SAAgB,WAAW,CAAC,IAAY,EAAE,EAAU,EAAE,OAAO,GAAG,KAAK;IACnE,OAAO,CAAC,UAAU,EAAE,UAAU,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACzF,CAAC;AAFD,kCAEC;AAED,MAAM,WAAW,GAAe;IAC9B,IAAI,EAAE,kBAAW;IACjB,SAAS,EAAT,gBAAS;IACT,eAAe,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,CACnD,IAAA,mBAAQ,EAAC,OAAO,EAAE,WAAW,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC;CACzD,CAAC;AAEK,KAAK,UAAU,SAAS,CAC7B,GAAmB,EACnB,OAAmB,WAAW;IAE9B,MAAM,IAAI,GAAG,IAAA,2BAAiB,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACxC,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,gBAAQ,CAChB,2FAA2F,CAC5F,CAAC;KACH;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;IACtD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;QAAE,MAAM,IAAI,gBAAQ,CAAC,sBAAsB,IAAI,EAAE,CAAC,CAAC;IAC9E,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;QAC5B,MAAM,IAAI,gBAAQ,CAAC,0CAA0C,CAAC,CAAC;KAChE;IACD,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACjD,MAAM,gBAAgB,GAAG,IAAA,4BAAkB,EAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IAC3D,MAAM,GAAG,GAAG,IAAA,2BAAa,EACvB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,EAC1C,GAAG,CAAC,WAAW,EACf,gBAAgB,CACjB,CAAC;IACF,IAAI,GAAG,CAAC,aAAa,EAAE;QACrB,OAAO,CAAC,GAAG,CACT,GAAG,GAAG,CAAC,KAAK,MAAM,GAAG,CAAC,IAAI,yDAAyD,GAAG,CAAC,OAAO,GAAG,CAClG,CAAC;KACH;IACD,IAAI,GAAG,CAAC,KAAK,EAAE;QACb,6EAA6E;QAC7E,MAAM,SAAS,GAAG,gBAAgB,CAAC;QACnC,IACE,SAAS;YACT,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC;YACjC,IAAA,0BAAe,EAAC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAC3C;YACA,GAAG,CAAC,OAAO,GAAG,SAAS,CAAC;SACzB;KACF;IACD,MAAM,MAAM,GAAG,IAAA,2BAAa,~~EAC1B~~,GAAG,CAAC,OAAO,~~EACX~~,~~IAAA~~,~~iBAAU,EAAC,GAAG,CAAC,KAAK,~~EAAE,~~IAAI,CAAC,EAC3B,~~GAAG,CAAC,WAAW,~~EACf~~,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,~~CACrB~~,CAAC;~~IAEF~~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~~AAtID~~,~~8BAsIC~~;AAED,0EAA0E;AAC1E,SAAS,eAAe,CAAC,IAAY;IACnC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IACpD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IACnC,OAAO,EAAE;SACN,WAAW,CAAC,GAAG,CAAC;SAChB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;SACnF,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;AAC1C,CAAC"}
1	+ {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/cli/commands/update.ts"],"names":[],"mappings":"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"}

package/dist/src/cli/help.js CHANGED Viewed

@@ -59,7 +59,8 @@ OPTIONS — new / preset
   --force                      new only — allow creating inside another Nx workspace
 OPTIONS — update
-  --to=<version>               Target version (default: this CLI's version)
+  --to=<version>               Target version, also as "pstack update <version>"
+                               (default: this CLI's version)
   --allow-dirty                Run with uncommitted changes
   --force                      Allow downgrading
@@ -284,7 +285,7 @@ EXAMPLES
   pstack hardening --app=portal
   pstack hardening --app=portal --configuration=uat --obfuscate=light --sri
   pstack update
-  pstack update --to=0.3.0 --dry-run
+  pstack update 0.3.0 --dry-run
 `.trimStart();
 }
 exports.helpText = helpText;

package/dist/src/cli/help.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"help.js","sourceRoot":"","sources":["../../../src/cli/help.ts"],"names":[],"mappings":";;;AAAA,qDAAiD;AACjD,yCAAkD;AAElD,SAAgB,QAAQ,CAAC,OAAe;IACtC,OAAO;yCACgC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SA2O5C,IAAA,8BAAa,GAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,mDAAmD,CAAC,CAAC,CAAC,EAC5F;IACE,IAAA,+BAAoB,EAAC,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6ChC,CAAC,SAAS,EAAE,CAAC;AACd,CAAC;~~AA7RD~~,~~4BA6RC~~"}
1	+ {"version":3,"file":"help.js","sourceRoot":"","sources":["../../../src/cli/help.ts"],"names":[],"mappings":";;;AAAA,qDAAiD;AACjD,yCAAkD;AAElD,SAAgB,QAAQ,CAAC,OAAe;IACtC,OAAO;yCACgC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SA4O5C,IAAA,8BAAa,GAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,mDAAmD,CAAC,CAAC,CAAC,EAC5F;IACE,IAAA,+BAAoB,EAAC,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6ChC,CAAC,SAAS,EAAE,CAAC;AACd,CAAC;AA9RD,4BA8RC"}

package/dist/src/generators/migrate/adapters/external.d.ts CHANGED Viewed

@@ -15,8 +15,17 @@ export declare function adapterEntries(nxJson: NxJsonWithPstack | undefined): st
 type TsModule = typeof import('typescript');
 /** A require hook that transpiles a .ts module to CommonJS with `ts` (exported for tests). */
 export declare function typeScriptHook(ts: TsModule, base?: import('typescript').CompilerOptions): (mod: {
-    _compile(code: string, file: string): void;
+    _compile(code: string, file: string, format?: string): void;
 }, file: string) => void;
+/**
+ * tsconfig `paths` of the workspace: request → absolute candidates, in order (`*` wildcard; the
+ * longest matching prefix wins, as in TypeScript). Undefined when no key matches.
+ */
+export declare function pathsResolver(options: {
+    paths?: Record<string, string[]>;
+    baseUrl?: string;
+    pathsBasePath?: unknown;
+}, root: string): (request: string) => string[] | undefined;
 /** Reads nx.json for the adapter list: undefined when missing; throws when it is not JSON. */
 export declare function parseNxJson(text: string | null | undefined): NxJsonWithPstack | undefined;
 /** Loads and checks the workspace's external adapters. Throws, naming the entry, on any problem. */

package/dist/src/generators/migrate/adapters/external.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadExternalAdapters = exports.parseNxJson = exports.typeScriptHook = exports.adapterEntries = exports.MIGRATE_API_VERSION = void 0;
+exports.loadExternalAdapters = exports.parseNxJson = exports.pathsResolver = exports.typeScriptHook = exports.adapterEntries = exports.MIGRATE_API_VERSION = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs"));
 const Module = tslib_1.__importStar(require("module"));
@@ -25,6 +25,10 @@ function adapterEntries(nxJson) {
     return list.map((e) => e.trim());
 }
 exports.adapterEntries = adapterEntries;
+const nodeModule = (process.getBuiltinModule?.('module') ?? Module);
+/** Node's require, which loads ES modules synchronously on Node 20.19+ and 22.12+. */
+const nativeRequire = nodeModule.createRequire(__filename);
+const TS_FILE = /\.(ts|mts|cts)$/;
 function loadTypeScript(root, entry) {
     try {
         // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -36,7 +40,7 @@ function loadTypeScript(root, entry) {
 }
 /**
  * The workspace tsconfig.base.json compilerOptions (decorators, jsx, …) for transpiling adapters;
- * module and target are always CommonJS / ES2020. `paths` aliases are not resolved.
+ * module and target are always CommonJS / ES2020. `paths` are resolved by tsScope (NX-63).
  */
 function workspaceCompilerOptions(ts, root) {
     const file = ['tsconfig.base.json', 'tsconfig.json']
@@ -54,7 +58,8 @@ function typeScriptHook(ts, base = {}) {
     return (mod, file) => {
         const source = fs.readFileSync(file, 'utf8');
         const out = ts.transpileModule(source, {
-            fileName: file,
+            // TypeScript always emits ESM for an .mts name; as .ts it follows `module: CommonJS`.
+            fileName: file.replace(/\.[mc]ts$/, '.ts'),
             compilerOptions: {
                 ...base,
                 module: ts.ModuleKind.CommonJS,
@@ -69,7 +74,8 @@ function typeScriptHook(ts, base = {}) {
                 verbatimModuleSyntax: false,
             },
         });
-        mod._compile(out.outputText, file);
+        // The output is CommonJS; the format keeps Node from treating an .mts name as ESM.
+        mod._compile(out.outputText, file, 'commonjs');
     };
 }
 exports.typeScriptHook = typeScriptHook;
@@ -79,29 +85,143 @@ exports.typeScriptHook = typeScriptHook;
  * they load later (a lazy require or `import()`) transpile the same way.
  */
 function tsScope(root, entry, file) {
-    if (!file.endsWith('.ts'))
+    if (!TS_FILE.test(file))
         return (fn) => fn();
     const ts = loadTypeScript(root, entry);
-    const hook = typeScriptHook(ts, workspaceCompilerOptions(ts, root));
+    const options = workspaceCompilerOptions(ts, root);
+    const hook = typeScriptHook(ts, options);
+    const resolvePaths = pathsResolver(options, root);
     return (fn) => {
-        const extensions = Module._extensions;
-        const previous = extensions['.ts'];
-        extensions['.ts'] = hook;
+        const previous = new Map();
+        for (const ext of ['.ts', '.mts', '.cts']) {
+            previous.set(ext, nodeModule._extensions[ext]);
+            nodeModule._extensions[ext] = hook;
+        }
+        const resolveFilename = nodeModule._resolveFilename;
+        nodeModule._resolveFilename = function (request, parent, ...rest) {
+            const from = parent?.filename;
+            const mapped = from && !from.split(path.sep).includes('node_modules') ? resolvePaths(request) : undefined;
+            if (mapped) {
+                for (const candidate of mapped) {
+                    try {
+                        return resolveFilename.call(this, candidate, parent, ...rest);
+                    }
+                    catch {
+                        // try the next target
+                    }
+                }
+            }
+            return resolveFilename.call(this, request, parent, ...rest);
+        };
         try {
             return fn();
         }
         finally {
-            if (previous === undefined)
-                delete extensions['.ts'];
-            else
-                extensions['.ts'] = previous;
+            nodeModule._resolveFilename = resolveFilename;
+            for (const [ext, h] of previous) {
+                if (h === undefined)
+                    delete nodeModule._extensions[ext];
+                else
+                    nodeModule._extensions[ext] = h;
+            }
         }
     };
 }
+/**
+ * tsconfig `paths` of the workspace: request → absolute candidates, in order (`*` wildcard; the
+ * longest matching prefix wins, as in TypeScript). Undefined when no key matches.
+ */
+function pathsResolver(options, root) {
+    const paths = options.paths ?? {};
+    const base = options.baseUrl ?? (typeof options.pathsBasePath === 'string' ? options.pathsBasePath : root);
+    const keys = Object.keys(paths).sort((a, b) => b.replace(/\*.*$/, '').length - a.replace(/\*.*$/, '').length);
+    return (request) => {
+        if (request.startsWith('.') || path.isAbsolute(request))
+            return undefined;
+        for (const key of keys) {
+            const star = key.indexOf('*');
+            let rest;
+            if (star < 0)
+                rest = request === key ? '' : undefined;
+            else {
+                const pre = key.slice(0, star);
+                const post = key.slice(star + 1);
+                if (request.startsWith(pre) && request.endsWith(post) && request.length >= key.length - 1) {
+                    rest = request.slice(pre.length, request.length - post.length);
+                }
+            }
+            if (rest === undefined)
+                continue;
+            return (paths[key] ?? []).map((t) => path.resolve(base, t.replace('*', () => rest)));
+        }
+        return undefined;
+    };
+}
+exports.pathsResolver = pathsResolver;
+/**
+ * An .mts / .cts file compiled with the TypeScript hook installed by tsScope (to CommonJS). Not
+ * through require: recent Node sends .mts to its own ES module loader, which skips the hook.
+ */
+function compileTs(file) {
+    const Ctor = nodeModule;
+    const mod = new Ctor(file);
+    mod.filename = file;
+    mod.paths = Ctor._nodeModulePaths(path.dirname(file));
+    nodeModule._extensions['.ts'](mod, file);
+    mod.loaded = true;
+    return mod.exports;
+}
+/** ES module by extension or by the nearest package.json `"type": "module"`. */
+function isEsmFile(file) {
+    if (file.endsWith('.mjs'))
+        return true;
+    if (!file.endsWith('.js'))
+        return false;
+    for (let dir = path.dirname(file);; dir = path.dirname(dir)) {
+        const pkg = path.join(dir, 'package.json');
+        if (fs.existsSync(pkg)) {
+            try {
+                return JSON.parse(fs.readFileSync(pkg, 'utf8')).type === 'module';
+            }
+            catch {
+                return false;
+            }
+        }
+        if (path.dirname(dir) === dir)
+            return false;
+    }
+}
+/**
+ * Loads an adapter module: ES modules, `.mts` and `.cts` through Node's own require (which
+ * loads ES modules synchronously on Node 20.19+ / 22.12+), others through the plugin's require.
+ */
+function loadModule(entry, file, scope) {
+    try {
+        if (/\.(mts|cts)$/.test(file))
+            return scope(() => compileTs(file));
+        return scope(() => (isEsmFile(file) ? nativeRequire(file) : require(file)));
+    }
+    catch (err) {
+        const code = err?.code;
+        if (code === 'ERR_REQUIRE_ASYNC_MODULE') {
+            return fail(entry, 'is an ES module with top-level await; adapters are loaded synchronously, so move the ' +
+                'await into the adapter functions.');
+        }
+        if (code === 'ERR_REQUIRE_ESM') {
+            return fail(entry, `is an ES module; loading it needs Node 20.19+ or 22.12+ (this is Node ${process.versions.node}).`);
+        }
+        throw err;
+    }
+}
 function resolveEntry(root, entry) {
     if (entry.startsWith('.') || path.isAbsolute(entry)) {
         const file = path.resolve(root, entry);
-        for (const candidate of [file, `${file}.ts`, `${file}.js`, path.join(file, 'index.js')]) {
+        const candidates = [
+            file,
+            ...['.ts', '.js', '.mts', '.cts', '.mjs', '.cjs'].map((ext) => `${file}${ext}`),
+            ...['index.js', 'index.mjs', 'index.ts'].map((f) => path.join(file, f)),
+        ];
+        for (const candidate of candidates) {
             if (fs.existsSync(candidate) && fs.statSync(candidate).isFile())
                 return candidate;
         }
@@ -111,7 +231,92 @@ function resolveEntry(root, entry) {
         return require.resolve(entry, { paths: [root] });
     }
     catch {
-        return fail(entry, 'the package is not installed in the workspace.');
+        // An ESM-only package has no `require` export: resolve it through its exports (NX-63).
+        return (resolveEsmPackage(root, entry) ??
+            fail(entry, 'the package is not installed in the workspace.'));
+    }
+}
+const CONDITIONS = new Set(['node', 'require', 'import', 'module', 'default']);
+/** One target of a package `exports` value for the conditions above (object order wins). */
+function exportTarget(value) {
+    if (typeof value === 'string')
+        return value;
+    if (Array.isArray(value)) {
+        for (const v of value) {
+            const t = exportTarget(v);
+            if (t)
+                return t;
+        }
+        return undefined;
+    }
+    if (!value || typeof value !== 'object')
+        return undefined;
+    for (const [key, v] of Object.entries(value)) {
+        if (CONDITIONS.has(key)) {
+            const t = exportTarget(v);
+            if (t)
+                return t;
+        }
+    }
+    return undefined;
+}
+/** `<name>[/<subpath>]` of an installed package, read from its package.json `exports`/`module`/`main`. */
+function resolveEsmPackage(root, entry) {
+    const parts = entry.split('/');
+    const nameLength = entry.startsWith('@') ? 2 : 1;
+    const name = parts.slice(0, nameLength).join('/');
+    const sub = parts.slice(nameLength).join('/');
+    for (let dir = root;; dir = path.dirname(dir)) {
+        const pkgDir = path.join(dir, 'node_modules', name);
+        const pkgFile = path.join(pkgDir, 'package.json');
+        if (fs.existsSync(pkgFile)) {
+            let pkg;
+            try {
+                pkg = JSON.parse(fs.readFileSync(pkgFile, 'utf8'));
+            }
+            catch {
+                return undefined;
+            }
+            const key = sub ? `./${sub}` : '.';
+            let target;
+            const ex = pkg.exports;
+            if (ex !== undefined) {
+                const map = ex &&
+                    typeof ex === 'object' &&
+                    !Array.isArray(ex) &&
+                    Object.keys(ex).some((k) => k.startsWith('.'))
+                    ? ex
+                    : { '.': ex };
+                if (map[key] !== undefined)
+                    target = exportTarget(map[key]);
+                else {
+                    // Subpath patterns: "./*" → "./dist/*.js".
+                    for (const [k, v] of Object.entries(map)) {
+                        const star = k.indexOf('*');
+                        if (star < 0)
+                            continue;
+                        const pre = k.slice(0, star);
+                        const post = k.slice(star + 1);
+                        if (key.startsWith(pre) && key.endsWith(post) && key.length >= k.length - 1) {
+                            const hit = exportTarget(v);
+                            const part = key.slice(pre.length, key.length - post.length);
+                            target = hit?.replace(/\*/g, () => part);
+                            break;
+                        }
+                    }
+                }
+            }
+            else if (!sub)
+                target = pkg.module ?? pkg.main ?? 'index.js';
+            else
+                target = sub;
+            if (!target)
+                return undefined;
+            const file = path.resolve(pkgDir, target);
+            return fs.existsSync(file) ? file : undefined;
+        }
+        if (path.dirname(dir) === dir)
+            return undefined;
     }
 }
 function adaptersOf(mod) {
@@ -178,10 +383,20 @@ function guarded(entry, a, scope) {
     for (const k of ['detect', 'defaultName', 'preflight', 'migrate']) {
         const fn = a[k];
         if (typeof fn === 'function') {
-            Object.defineProperty(copy, k, {
-                value: wrap(fn),
-                enumerable: true,
-            });
+            let value = wrap(fn);
+            if (k === 'migrate') {
+                // The install task runs later: keep the TypeScript hook and paths around it too.
+                const migrate = value;
+                value = (...args) => {
+                    const data = migrate(...args);
+                    const task = data?.installTask;
+                    if (data && typeof task === 'function') {
+                        data.installTask = () => scope(() => task.call(data));
+                    }
+                    return data;
+                };
+            }
+            Object.defineProperty(copy, k, { value, enumerable: true });
         }
     }
     return copy;
@@ -210,8 +425,7 @@ function loadExternalAdapters(root, nxJson) {
         const scope = tsScope(root, entry, file);
         let mod;
         try {
-            // eslint-disable-next-line @typescript-eslint/no-var-requires
-            mod = scope(() => require(file));
+            mod = loadModule(entry, file, scope);
         }
         catch (err) {
             if (err instanceof Error && err.message.startsWith('migrate: nx.json'))

package/dist/src/generators/migrate/adapters/external.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"external.js","sourceRoot":"","sources":["../../../../../src/generators/migrate/adapters/external.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"external.js","sourceRoot":"","sources":["../../../../../src/generators/migrate/adapters/external.ts"],"names":[],"mappings":"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"}