@nx/devkit 23.0.0-beta.15 → 23.0.0-beta.16

package/dist/src/generators/to-js.js

@@ -8,21 +8,26 @@ const package_json_1 = require("../utils/package-json");
  */
 function toJS(tree, options) {
     const { JsxEmit, ScriptTarget, transpile, ModuleKind } = (0, package_json_1.ensurePackage)('typescript', versions_1.typescriptVersion);
+    // Match `.ts`, `.mts`, `.cts`, `.tsx`. The optional `[cm]` keeps native
+    // ESM (`.mts`) and CommonJS (`.cts`) TypeScript extensions in the rename
+    // path so `--js` generators that emit `.mts`/`.cts` templates get
+    // converted instead of silently left as TypeScript on disk.
+    const tsExtRegex = /\.([cm]?ts|tsx)$/;
     for (const c of tree.listChanges()) {
-        if ((c.path.endsWith('.ts') || c.path.endsWith('tsx')) &&
-            c.type === 'CREATE') {
+        if (tsExtRegex.test(c.path) && c.type === 'CREATE') {
             tree.write(c.path, transpile(c.content.toString('utf-8'), {
                 allowJs: true,
                 jsx: JsxEmit.Preserve,
                 target: options?.target ?? ScriptTarget.ESNext,
                 module: options?.module ?? ModuleKind.ESNext,
             }));
-            tree.rename(c.path, c.path.replace(/\.ts$/, options?.extension ?? '.js'));
+            const targetExt = options?.extension ?? '.js';
+            tree.rename(c.path, c.path.replace(/\.([cm]?ts)$/, targetExt));
             if (options?.useJsx) {
                 tree.rename(c.path, c.path.replace(/\.tsx$/, '.jsx'));
             }
             else {
-                tree.rename(c.path, c.path.replace(/\.tsx$/, options?.extension ?? '.js'));
+                tree.rename(c.path, c.path.replace(/\.tsx$/, targetExt));
             }
         }
     }

package/dist/src/utils/config-utils.js

@@ -27,16 +27,71 @@ function isTypeScriptFile(extension) {
 }
 async function loadTypeScriptModule(path, extension, tsconfigFileNames) {
     const tsConfigPath = getTypeScriptConfigPath(path, tsconfigFileNames);
-    if (tsConfigPath) {
-        const unregisterTsProject = (0, devkit_internals_1.registerTsProject)(tsConfigPath);
+    if (!tsConfigPath) {
+        return await loadModuleByExtension(path, extension);
+    }
+    // loadTsFile was added in nx@23. @nx/devkit's peer range supports older
+    // nx majors, so fall back to the legacy registerTsProject + require path
+    // when loadTsFile isn't available on the host nx.
+    if (typeof devkit_internals_1.loadTsFile !== 'function') {
+        const cleanup = (0, devkit_internals_1.registerTsProject)(tsConfigPath);
         try {
             return await loadModuleByExtension(path, extension);
         }
         finally {
-            unregisterTsProject();
+            cleanup();
+        }
+    }
+    // Both .ts and .mts go through loadTsFile first. Node 22.12+ supports
+    // require() of synchronous ESM by default, and loadTsFile's lazy fallback
+    // covers swc/ts-node + tsconfig-paths registration when needed (swc-node
+    // hooks .cts/.mts/.ts via Module._extensions). Async-only ESM modules
+    // (top-level await) throw ERR_REQUIRE_ASYNC_MODULE and fall through to
+    // dynamic import(). ERR_REQUIRE_ESM is the legacy code for the same case
+    // - kept for older Node lines.
+    try {
+        return (0, devkit_internals_1.loadTsFile)(path, tsConfigPath);
+    }
+    catch (e) {
+        if (e?.code !== 'ERR_REQUIRE_ESM' &&
+            e?.code !== 'ERR_REQUIRE_ASYNC_MODULE') {
+            throw e;
+        }
+        // The module must be loaded via dynamic import(). Register
+        // tsconfig-paths first so workspace alias imports resolve, then try a
+        // native dynamic import. Node 22.18+ LTS strips TS types on the ESM
+        // path natively, so pure-ESM TLA configs load without any swc/ts-node
+        // ESM loader. Only escalate to forceRegisterEsmLoader (which throws
+        // when neither @swc-node/register nor ts-node is installed) if the
+        // native attempt hits unsupported TS syntax.
+        const cleanup = (0, devkit_internals_1.registerTsProject)(tsConfigPath);
+        try {
+            return await loadESM(path);
+        }
+        catch (esmErr) {
+            if (esmErr?.code !== 'ERR_UNSUPPORTED_TYPESCRIPT_SYNTAX' ||
+                typeof devkit_internals_1.forceRegisterEsmLoader !== 'function') {
+                throw esmErr;
+            }
+            // Module.register is global and one-shot per process. After this
+            // runs, every subsequent ESM import in the process is routed
+            // through the registered loader, forfeiting Node's native TS
+            // stripping for the dynamic-import path. If neither swc-node nor
+            // ts-node is installed, forceRegisterEsmLoader throws - surface the
+            // original ESM error in that case so the user sees the real
+            // problem, not a misleading "loader missing" message.
+            try {
+                (0, devkit_internals_1.forceRegisterEsmLoader)();
+            }
+            catch {
+                throw esmErr;
+            }
+            return await loadESM(path);
+        }
+        finally {
+            cleanup();
         }
     }
-    return await loadModuleByExtension(path, extension);
 }
 function getTypeScriptConfigPath(path, tsconfigFileNames) {
     const siblingFiles = (0, fs_1.readdirSync)((0, path_1.dirname)(path));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "23.0.0-beta.15",
+  "version": "23.0.0-beta.16",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -60,7 +60,7 @@
   },
   "devDependencies": {
     "jest": "30.3.0",
-    "nx": "23.0.0-beta.15"
+    "nx": "23.0.0-beta.16"
   },
   "peerDependencies": {
     "nx": ">= 22 <= 24 || ^23.0.0-0"