nx 20.7.0-canary.20250320-2a0d89d → 20.7.0-canary.20250321-cad4d26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "20.7.0-canary.20250320-2a0d89d",
+  "version": "20.7.0-canary.20250321-cad4d26",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -82,16 +82,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "20.7.0-canary.20250320-2a0d89d",
-    "@nx/nx-darwin-x64": "20.7.0-canary.20250320-2a0d89d",
-    "@nx/nx-freebsd-x64": "20.7.0-canary.20250320-2a0d89d",
-    "@nx/nx-linux-arm-gnueabihf": "20.7.0-canary.20250320-2a0d89d",
-    "@nx/nx-linux-arm64-gnu": "20.7.0-canary.20250320-2a0d89d",
-    "@nx/nx-linux-arm64-musl": "20.7.0-canary.20250320-2a0d89d",
-    "@nx/nx-linux-x64-gnu": "20.7.0-canary.20250320-2a0d89d",
-    "@nx/nx-linux-x64-musl": "20.7.0-canary.20250320-2a0d89d",
-    "@nx/nx-win32-arm64-msvc": "20.7.0-canary.20250320-2a0d89d",
-    "@nx/nx-win32-x64-msvc": "20.7.0-canary.20250320-2a0d89d"
+    "@nx/nx-darwin-arm64": "20.7.0-canary.20250321-cad4d26",
+    "@nx/nx-darwin-x64": "20.7.0-canary.20250321-cad4d26",
+    "@nx/nx-freebsd-x64": "20.7.0-canary.20250321-cad4d26",
+    "@nx/nx-linux-arm-gnueabihf": "20.7.0-canary.20250321-cad4d26",
+    "@nx/nx-linux-arm64-gnu": "20.7.0-canary.20250321-cad4d26",
+    "@nx/nx-linux-arm64-musl": "20.7.0-canary.20250321-cad4d26",
+    "@nx/nx-linux-x64-gnu": "20.7.0-canary.20250321-cad4d26",
+    "@nx/nx-linux-x64-musl": "20.7.0-canary.20250321-cad4d26",
+    "@nx/nx-win32-arm64-msvc": "20.7.0-canary.20250321-cad4d26",
+    "@nx/nx-win32-x64-msvc": "20.7.0-canary.20250321-cad4d26"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/devkit-internals.d.ts

@@ -25,3 +25,4 @@ export * from './project-graph/error-types';
 export { registerTsProject } from './plugins/js/utils/register';
 export { interpolate } from './tasks-runner/utils';
 export { isCI } from './utils/is-ci';
+export { isUsingPrettierInTree } from './utils/is-using-prettier';

package/src/devkit-internals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isCI = exports.interpolate = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashMultiGlobWithWorkspaceContext = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.findMatchingConfigFiles = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
+exports.isUsingPrettierInTree = exports.isCI = exports.interpolate = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashMultiGlobWithWorkspaceContext = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.findMatchingConfigFiles = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
 const tslib_1 = require("tslib");
 /**
  * Note to developers: STOP! These exports are available via requireNx in @nx/devkit.
@@ -53,3 +53,5 @@ var utils_1 = require("./tasks-runner/utils");
 Object.defineProperty(exports, "interpolate", { enumerable: true, get: function () { return utils_1.interpolate; } });
 var is_ci_1 = require("./utils/is-ci");
 Object.defineProperty(exports, "isCI", { enumerable: true, get: function () { return is_ci_1.isCI; } });
+var is_using_prettier_1 = require("./utils/is-using-prettier");
+Object.defineProperty(exports, "isUsingPrettierInTree", { enumerable: true, get: function () { return is_using_prettier_1.isUsingPrettierInTree; } });

package/src/generators/internal-utils/format-changed-files-with-prettier-if-available.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatChangedFilesWithPrettierIfAvailable = formatChangedFilesWithPrettierIfAvailable;
 exports.formatFilesWithPrettierIfAvailable = formatFilesWithPrettierIfAvailable;
 const path = require("path");
+const is_using_prettier_1 = require("../../utils/is-using-prettier");
 /**
  * Formats all the created or updated files using Prettier
  * @param tree - the file system tree
@@ -19,6 +20,13 @@ async function formatFilesWithPrettierIfAvailable(files, root, options) {
     let prettier;
     try {
         prettier = await Promise.resolve().then(() => require('prettier'));
+        /**
+         * Even after we discovered prettier in node_modules, we need to be sure that the user is intentionally using prettier
+         * before proceeding to format with it.
+         */
+        if (!(0, is_using_prettier_1.isUsingPrettier)(root)) {
+            return results;
+        }
     }
     catch { }
     if (!prettier) {

package/src/generators/testing-utils/create-tree.js

@@ -6,5 +6,9 @@ const tree_1 = require("../tree");
  * Creates a host for testing.
  */
 function createTree() {
-    return new tree_1.FsTree('/virtual', false);
+    const tree = new tree_1.FsTree('/virtual', false);
+    // Allow prettier formatting to be applied to the tree for backwards compatibility within v20
+    // TODO: Decouple formatFiles and other formatting utilities from prettier to avoid this
+    tree.write('.prettierrc', '{}');
+    return tree;
 }

package/src/tasks-runner/task-orchestrator.js

@@ -134,8 +134,8 @@ class TaskOrchestrator {
         const shouldCopyOutputsFromCache = 
         // No output files to restore
         !!outputs.length &&
-            // Remote caches are restored to output dirs when applied
-            !cachedResult.remote &&
+            // Remote caches are restored to output dirs when applied and using db cache
+            (!cachedResult.remote || !(0, cache_1.dbCacheEnabled)(this.nxJson)) &&
             // Output files have not been touched since last run
             (await this.shouldCopyOutputsFromCache(outputs, task.hash));
         if (shouldCopyOutputsFromCache) {

package/src/utils/is-using-prettier.d.ts

@@ -0,0 +1,3 @@
+import type { Tree } from '../generators/tree';
+export declare function isUsingPrettier(root: string): boolean;
+export declare function isUsingPrettierInTree(tree: Tree): boolean;

package/src/utils/is-using-prettier.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isUsingPrettier = isUsingPrettier;
+exports.isUsingPrettierInTree = isUsingPrettierInTree;
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
+const json_1 = require("../generators/utils/json");
+const fileutils_1 = require("./fileutils");
+/**
+ * Possible configuration files are taken from https://prettier.io/docs/configuration
+ */
+const configFiles = [
+    '.prettierrc',
+    '.prettierrc.json',
+    '.prettierrc.yml',
+    '.prettierrc.yaml',
+    '.prettierrc.json5',
+    '.prettierrc.js',
+    'prettier.config.js',
+    '.prettierrc.ts',
+    'prettier.config.ts',
+    '.prettierrc.mjs',
+    'prettier.config.mjs',
+    '.prettierrc.mts',
+    'prettier.config.mts',
+    '.prettierrc.cjs',
+    'prettier.config.cjs',
+    '.prettierrc.cts',
+    'prettier.config.cts',
+    '.prettierrc.toml',
+];
+function isUsingPrettier(root) {
+    for (const file of configFiles) {
+        if ((0, node_fs_1.existsSync)(file)) {
+            return true;
+        }
+    }
+    // Even if no file is present, it is possible the user is configuring prettier via their package.json
+    const packageJsonPath = (0, node_path_1.join)(root, 'package.json');
+    if ((0, node_fs_1.existsSync)(packageJsonPath)) {
+        const packageJson = (0, fileutils_1.readJsonFile)(packageJsonPath);
+        if (packageJson.prettier) {
+            return true;
+        }
+    }
+    return false;
+}
+function isUsingPrettierInTree(tree) {
+    for (const file of configFiles) {
+        if (tree.exists(file)) {
+            return true;
+        }
+    }
+    // Even if no file is present, it is possible the user is configuring prettier via their package.json
+    if (tree.exists('package.json')) {
+        const packageJson = (0, json_1.readJson)(tree, 'package.json');
+        if (packageJson.prettier) {
+            return true;
+        }
+    }
+    return false;
+}