@nx/devkit 21.3.0-canary.20250710-13551c9 → 21.3.0-canary.20250712-18e5d95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "21.3.0-canary.20250710-13551c9",
+  "version": "21.3.0-canary.20250712-18e5d95",
   "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-canary.20250710-13551c9"
+    "nx": "21.3.0-canary.20250712-18e5d95"
   },
   "publishConfig": {
     "access": "public"

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

@@ -2,11 +2,8 @@ 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?: {
-    /**
-     * 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;
+    sortRootTsconfigPaths?: boolean;
 }): Promise<void>;

package/src/generators/format-files.js

@@ -1,20 +1,15 @@
 "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 = {
-    /**
-     * 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,
-}) {
+async function formatFiles(tree, options = {}) {
     let prettier;
     try {
         prettier = await Promise.resolve().then(() => require('prettier'));
@@ -27,6 +22,12 @@ 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);
     }
@@ -67,13 +68,18 @@ function sortTsConfig(tree) {
         if (!tsConfigPath) {
             return;
         }
-        (0, devkit_exports_1.updateJson)(tree, tsConfigPath, (tsconfig) => ({
+        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, {
             ...tsconfig,
             compilerOptions: {
                 ...tsconfig.compilerOptions,
                 paths: (0, devkit_internals_1.sortObjectByKeys)(tsconfig.compilerOptions.paths),
             },
-        }));
+        });
     }
     catch (e) {
         // catch noop