@nx/devkit 21.1.0-beta.1 → 21.1.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "21.1.0-beta.1",
+  "version": "21.1.0-beta.2",
   "private": false,
   "description": "The Nx Devkit is used to customize Nx for different technologies and use cases. It contains many utility functions for reading and writing files, updating configuration, working with Abstract Syntax Trees(ASTs), and more. Learn more about [extending Nx by leveraging the Nx Devkit](https://nx.dev/extending-nx/intro/getting-started) on our docs.",
   "repository": {
@@ -38,7 +38,7 @@
     "enquirer": "~2.3.6"
   },
   "peerDependencies": {
-    "nx": "21.1.0-beta.1"
+    "nx": "21.1.0-beta.2"
   },
   "publishConfig": {
     "access": "public"

package/src/utils/config-utils.js

@@ -5,37 +5,59 @@ exports.loadConfigFile = loadConfigFile;
 exports.getRootTsConfigPath = getRootTsConfigPath;
 exports.getRootTsConfigFileName = getRootTsConfigFileName;
 exports.clearRequireCache = clearRequireCache;
-const path_1 = require("path");
 const fs_1 = require("fs");
 const node_url_1 = require("node:url");
 const devkit_exports_1 = require("nx/src/devkit-exports");
 const devkit_internals_1 = require("nx/src/devkit-internals");
+const path_1 = require("path");
 exports.dynamicImport = new Function('modulePath', 'return import(modulePath);');
 async function loadConfigFile(configFilePath) {
-    {
-        let module;
-        if ((0, path_1.extname)(configFilePath) === '.ts') {
-            const siblingFiles = (0, fs_1.readdirSync)((0, path_1.dirname)(configFilePath));
-            const tsConfigPath = siblingFiles.includes('tsconfig.json')
-                ? (0, path_1.join)((0, path_1.dirname)(configFilePath), 'tsconfig.json')
-                : getRootTsConfigPath();
-            if (tsConfigPath) {
-                const unregisterTsProject = (0, devkit_internals_1.registerTsProject)(tsConfigPath);
-                try {
-                    module = await load(configFilePath);
-                }
-                finally {
-                    unregisterTsProject();
-                }
-            }
-            else {
-                module = await load(configFilePath);
-            }
+    const extension = (0, path_1.extname)(configFilePath);
+    const module = await loadModule(configFilePath, extension);
+    return module.default ?? module;
+}
+async function loadModule(path, extension) {
+    if (isTypeScriptFile(extension)) {
+        return await loadTypeScriptModule(path, extension);
+    }
+    return await loadJavaScriptModule(path, extension);
+}
+function isTypeScriptFile(extension) {
+    return extension.endsWith('ts');
+}
+async function loadTypeScriptModule(path, extension) {
+    const tsConfigPath = getTypeScriptConfigPath(path);
+    if (tsConfigPath) {
+        const unregisterTsProject = (0, devkit_internals_1.registerTsProject)(tsConfigPath);
+        try {
+            return await loadModuleByExtension(path, extension);
         }
-        else {
-            module = await load(configFilePath);
+        finally {
+            unregisterTsProject();
         }
-        return module.default ?? module;
+    }
+    return await loadModuleByExtension(path, extension);
+}
+function getTypeScriptConfigPath(path) {
+    const siblingFiles = (0, fs_1.readdirSync)((0, path_1.dirname)(path));
+    return siblingFiles.includes('tsconfig.json')
+        ? (0, path_1.join)((0, path_1.dirname)(path), 'tsconfig.json')
+        : getRootTsConfigPath();
+}
+async function loadJavaScriptModule(path, extension) {
+    return await loadModuleByExtension(path, extension);
+}
+async function loadModuleByExtension(path, extension) {
+    switch (extension) {
+        case '.cts':
+        case '.cjs':
+            return await loadCommonJS(path);
+        case '.mjs':
+            return await loadESM(path);
+        default:
+            // For both .ts and .mts files, try to load them as CommonJS first, then try ESM.
+            // It's possible that the file is written like ESM (e.g. using `import`) but uses CJS features like `__dirname` or `__filename`.
+            return await load(path);
     }
 }
 function getRootTsConfigPath() {
@@ -62,26 +84,32 @@ function clearRequireCache() {
         }
     }
 }
-/**
- * Load the module after ensuring that the require cache is cleared.
- */
 async function load(path) {
-    // Clear cache if the path is in the cache
-    if (require.cache[path]) {
-        clearRequireCache();
-    }
     try {
         // Try using `require` first, which works for CJS modules.
         // Modules are CJS unless it is named `.mjs` or `package.json` sets type to "module".
-        return require(path);
+        return loadCommonJS(path);
     }
     catch (e) {
         if (e.code === 'ERR_REQUIRE_ESM') {
             // If `require` fails to load ESM, try dynamic `import()`. ESM requires file url protocol for handling absolute paths.
-            const pathAsFileUrl = (0, node_url_1.pathToFileURL)(path).pathname;
-            return await (0, exports.dynamicImport)(`${pathAsFileUrl}?t=${Date.now()}`);
+            return loadESM(path);
         }
         // Re-throw all other errors
         throw e;
     }
 }
+/**
+ * Load the module after ensuring that the require cache is cleared.
+ */
+async function loadCommonJS(path) {
+    // Clear cache if the path is in the cache
+    if (require.cache[path]) {
+        clearRequireCache();
+    }
+    return require(path);
+}
+async function loadESM(path) {
+    const pathAsFileUrl = (0, node_url_1.pathToFileURL)(path).pathname;
+    return await (0, exports.dynamicImport)(`${pathAsFileUrl}?t=${Date.now()}`);
+}