@nx/devkit 21.3.0-beta.5 → 21.3.0-canary.20250613-18155f4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "21.3.0-beta.5",
+  "version": "21.3.0-canary.20250613-18155f4",
   "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.3.0-beta.5"
+    "nx": "21.3.0-canary.20250613-18155f4"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/format-files.d.ts

@@ -2,8 +2,11 @@ import { Tree } from 'nx/src/devkit-exports';
 /**
  * Formats all the created or updated files using Prettier
  * @param tree - the file system tree
- * @param options - options for the formatFiles function
  */
 export declare function formatFiles(tree: Tree, options?: {
-    sortRootTsconfigPaths?: boolean;
+    /**
+     * TODO(v21): Stop sorting tsconfig paths by default, paths are now less common/important
+     * in Nx workspace setups, and the sorting causes comments to be lost.
+     */
+    sortRootTsconfigPaths: boolean;
 }): Promise<void>;

package/src/generators/format-files.js

@@ -1,15 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatFiles = formatFiles;
+const path = require("path");
 const devkit_exports_1 = require("nx/src/devkit-exports");
 const devkit_internals_1 = require("nx/src/devkit-internals");
-const path = require("path");
 /**
  * Formats all the created or updated files using Prettier
  * @param tree - the file system tree
- * @param options - options for the formatFiles function
  */
-async function formatFiles(tree, options = {}) {
+async function formatFiles(tree, options = {
+    /**
+     * TODO(v21): Stop sorting tsconfig paths by default, paths are now less common/important
+     * in Nx workspace setups, and the sorting causes comments to be lost.
+     */
+    sortRootTsconfigPaths: true,
+}) {
     let prettier;
     try {
         prettier = await Promise.resolve().then(() => require('prettier'));
@@ -22,12 +27,6 @@ async function formatFiles(tree, options = {}) {
         }
     }
     catch { }
-    /**
-     * TODO(v22): Stop sorting tsconfig paths by default, paths are now less common/important
-     * in Nx workspace setups, and the sorting causes comments to be lost.
-     */
-    options.sortRootTsconfigPaths ??=
-        process.env.NX_FORMAT_SORT_TSCONFIG_PATHS !== 'false';
     if (options.sortRootTsconfigPaths) {
         sortTsConfig(tree);
     }
@@ -68,18 +67,13 @@ function sortTsConfig(tree) {
         if (!tsConfigPath) {
             return;
         }
-        const tsconfig = (0, devkit_exports_1.readJson)(tree, tsConfigPath);
-        if (!tsconfig.compilerOptions?.paths) {
-            // no paths to sort
-            return;
-        }
-        (0, devkit_exports_1.writeJson)(tree, tsConfigPath, {
+        (0, devkit_exports_1.updateJson)(tree, tsConfigPath, (tsconfig) => ({
             ...tsconfig,
             compilerOptions: {
                 ...tsconfig.compilerOptions,
                 paths: (0, devkit_internals_1.sortObjectByKeys)(tsconfig.compilerOptions.paths),
             },
-        });
+        }));
     }
     catch (e) {
         // catch noop

package/src/utils/config-utils.d.ts

@@ -1,5 +1,5 @@
 export declare let dynamicImport: Function;
-export declare function loadConfigFile<T extends object = any>(configFilePath: string, tsconfigFileNames?: string[]): Promise<T>;
+export declare function loadConfigFile<T extends object = any>(configFilePath: string): Promise<T>;
 export declare function getRootTsConfigPath(): string | null;
 export declare function getRootTsConfigFileName(): string | null;
 export declare function clearRequireCache(): void;

package/src/utils/config-utils.js

@@ -11,22 +11,22 @@ 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, tsconfigFileNames) {
+async function loadConfigFile(configFilePath) {
     const extension = (0, path_1.extname)(configFilePath);
-    const module = await loadModule(configFilePath, extension, tsconfigFileNames);
+    const module = await loadModule(configFilePath, extension);
     return module.default ?? module;
 }
-async function loadModule(path, extension, tsconfigFileNames) {
+async function loadModule(path, extension) {
     if (isTypeScriptFile(extension)) {
-        return await loadTypeScriptModule(path, extension, tsconfigFileNames);
+        return await loadTypeScriptModule(path, extension);
     }
     return await loadJavaScriptModule(path, extension);
 }
 function isTypeScriptFile(extension) {
     return extension.endsWith('ts');
 }
-async function loadTypeScriptModule(path, extension, tsconfigFileNames) {
-    const tsConfigPath = getTypeScriptConfigPath(path, tsconfigFileNames);
+async function loadTypeScriptModule(path, extension) {
+    const tsConfigPath = getTypeScriptConfigPath(path);
     if (tsConfigPath) {
         const unregisterTsProject = (0, devkit_internals_1.registerTsProject)(tsConfigPath);
         try {
@@ -38,11 +38,10 @@ async function loadTypeScriptModule(path, extension, tsconfigFileNames) {
     }
     return await loadModuleByExtension(path, extension);
 }
-function getTypeScriptConfigPath(path, tsconfigFileNames) {
+function getTypeScriptConfigPath(path) {
     const siblingFiles = (0, fs_1.readdirSync)((0, path_1.dirname)(path));
-    const tsConfigFileName = (tsconfigFileNames ?? ['tsconfig.json']).find((name) => siblingFiles.includes(name));
-    return tsConfigFileName
-        ? (0, path_1.join)((0, path_1.dirname)(path), tsConfigFileName)
+    return siblingFiles.includes('tsconfig.json')
+        ? (0, path_1.join)((0, path_1.dirname)(path), 'tsconfig.json')
         : getRootTsConfigPath();
 }
 async function loadJavaScriptModule(path, extension) {