nx 18.0.6 → 18.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "18.0.6",
+  "version": "18.0.7",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -66,7 +66,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "18.0.6"
+    "@nrwl/tao": "18.0.7"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "18.0.6",
-    "@nx/nx-darwin-arm64": "18.0.6",
-    "@nx/nx-linux-x64-gnu": "18.0.6",
-    "@nx/nx-linux-x64-musl": "18.0.6",
-    "@nx/nx-win32-x64-msvc": "18.0.6",
-    "@nx/nx-linux-arm64-gnu": "18.0.6",
-    "@nx/nx-linux-arm64-musl": "18.0.6",
-    "@nx/nx-linux-arm-gnueabihf": "18.0.6",
-    "@nx/nx-win32-arm64-msvc": "18.0.6",
-    "@nx/nx-freebsd-x64": "18.0.6"
+    "@nx/nx-darwin-x64": "18.0.7",
+    "@nx/nx-darwin-arm64": "18.0.7",
+    "@nx/nx-linux-x64-gnu": "18.0.7",
+    "@nx/nx-linux-x64-musl": "18.0.7",
+    "@nx/nx-win32-x64-msvc": "18.0.7",
+    "@nx/nx-linux-arm64-gnu": "18.0.7",
+    "@nx/nx-linux-arm64-musl": "18.0.7",
+    "@nx/nx-linux-arm-gnueabihf": "18.0.7",
+    "@nx/nx-win32-arm64-msvc": "18.0.7",
+    "@nx/nx-freebsd-x64": "18.0.7"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/devkit-exports.d.ts

@@ -43,7 +43,7 @@ export type { PackageManager } from './utils/package-manager';
 /**
  * @category Package Manager
  */
-export { getPackageManagerCommand, detectPackageManager, getPackageManagerVersion, } from './utils/package-manager';
+export { getPackageManagerCommand, detectPackageManager, getPackageManagerVersion, isWorkspacesEnabled, } from './utils/package-manager';
 /**
  * @category Commands
  */

package/src/devkit-exports.js

@@ -4,7 +4,7 @@
  * Try hard to not add to this API to reduce the surface area we need to maintain.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createProjectFileMapUsingProjectGraph = exports.cacheDir = exports.hashArray = exports.defaultTasksRunner = exports.getOutputsForTargetAndConfiguration = exports.readProjectsConfigurationFromProjectGraph = exports.readCachedProjectGraph = exports.createProjectGraphAsync = exports.reverse = exports.appRootPath = exports.workspaceRoot = exports.normalizePath = exports.joinPathFragments = exports.stripIndents = exports.writeJsonFile = exports.readJsonFile = exports.stripJsonComments = exports.serializeJson = exports.parseJson = exports.updateJson = exports.writeJson = exports.readJson = exports.validateDependency = exports.ProjectGraphBuilder = exports.DependencyType = exports.updateNxJson = exports.readNxJson = exports.glob = exports.getProjects = exports.updateProjectConfiguration = exports.removeProjectConfiguration = exports.readProjectConfiguration = exports.addProjectConfiguration = exports.runExecutor = exports.getPackageManagerVersion = exports.detectPackageManager = exports.getPackageManagerCommand = exports.output = exports.logger = exports.workspaceLayout = exports.Workspaces = void 0;
+exports.createProjectFileMapUsingProjectGraph = exports.cacheDir = exports.hashArray = exports.defaultTasksRunner = exports.getOutputsForTargetAndConfiguration = exports.readProjectsConfigurationFromProjectGraph = exports.readCachedProjectGraph = exports.createProjectGraphAsync = exports.reverse = exports.appRootPath = exports.workspaceRoot = exports.normalizePath = exports.joinPathFragments = exports.stripIndents = exports.writeJsonFile = exports.readJsonFile = exports.stripJsonComments = exports.serializeJson = exports.parseJson = exports.updateJson = exports.writeJson = exports.readJson = exports.validateDependency = exports.ProjectGraphBuilder = exports.DependencyType = exports.updateNxJson = exports.readNxJson = exports.glob = exports.getProjects = exports.updateProjectConfiguration = exports.removeProjectConfiguration = exports.readProjectConfiguration = exports.addProjectConfiguration = exports.runExecutor = exports.isWorkspacesEnabled = exports.getPackageManagerVersion = exports.detectPackageManager = exports.getPackageManagerCommand = exports.output = exports.logger = exports.workspaceLayout = exports.Workspaces = void 0;
 // TODO(v19): Remove this export
 /**
  * @category Workspace
@@ -30,6 +30,7 @@ var package_manager_1 = require("./utils/package-manager");
 Object.defineProperty(exports, "getPackageManagerCommand", { enumerable: true, get: function () { return package_manager_1.getPackageManagerCommand; } });
 Object.defineProperty(exports, "detectPackageManager", { enumerable: true, get: function () { return package_manager_1.detectPackageManager; } });
 Object.defineProperty(exports, "getPackageManagerVersion", { enumerable: true, get: function () { return package_manager_1.getPackageManagerVersion; } });
+Object.defineProperty(exports, "isWorkspacesEnabled", { enumerable: true, get: function () { return package_manager_1.isWorkspacesEnabled; } });
 /**
  * @category Commands
  */

package/src/plugins/target-defaults/target-defaults-plugin.d.ts

@@ -1,11 +1,22 @@
 import { TargetConfiguration } from '../../config/workspace-json-project-json';
 import { NxPluginV2 } from '../../utils/nx-plugin';
 /**
- * This symbol marks that a target provides information which should modify a target already registered
+ * This marks that a target provides information which should modify a target already registered
  * on the project via other plugins. If the target has not already been registered, and this symbol is true,
  * the information provided by it will be discarded.
+ *
+ * NOTE: This cannot be a symbol, as they are not serialized in JSON the communication
+ * between the plugin-worker and the main process.
  */
-export declare const ONLY_MODIFIES_EXISTING_TARGET: unique symbol;
+export declare const ONLY_MODIFIES_EXISTING_TARGET = "NX_ONLY_MODIFIES_EXISTING_TARGET";
+/**
+ * This is used to override the source file for the target defaults plugin.
+ * This allows the plugin to use the project files as the context, but point to nx.json as the source file.
+ *
+ * NOTE: This cannot be a symbol, as they are not serialized in JSON the communication
+ * between the plugin-worker and the main process.
+ */
+export declare const OVERRIDE_SOURCE_FILE = "NX_OVERRIDE_SOURCE_FILE";
 export declare const TargetDefaultsPlugin: NxPluginV2;
 /**
  * This fn gets target info that would make a target uniquely compatible

package/src/plugins/target-defaults/target-defaults-plugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTargetInfo = exports.TargetDefaultsPlugin = exports.ONLY_MODIFIES_EXISTING_TARGET = void 0;
+exports.getTargetInfo = exports.TargetDefaultsPlugin = exports.OVERRIDE_SOURCE_FILE = exports.ONLY_MODIFIES_EXISTING_TARGET = void 0;
 const minimatch_1 = require("minimatch");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
@@ -9,11 +9,22 @@ const globs_1 = require("../../utils/globs");
 const package_json_1 = require("../../utils/package-json");
 const package_json_workspaces_1 = require("../package-json-workspaces");
 /**
- * This symbol marks that a target provides information which should modify a target already registered
+ * This marks that a target provides information which should modify a target already registered
  * on the project via other plugins. If the target has not already been registered, and this symbol is true,
  * the information provided by it will be discarded.
+ *
+ * NOTE: This cannot be a symbol, as they are not serialized in JSON the communication
+ * between the plugin-worker and the main process.
  */
-exports.ONLY_MODIFIES_EXISTING_TARGET = Symbol('ONLY_MODIFIES_EXISTING_TARGET');
+exports.ONLY_MODIFIES_EXISTING_TARGET = 'NX_ONLY_MODIFIES_EXISTING_TARGET';
+/**
+ * This is used to override the source file for the target defaults plugin.
+ * This allows the plugin to use the project files as the context, but point to nx.json as the source file.
+ *
+ * NOTE: This cannot be a symbol, as they are not serialized in JSON the communication
+ * between the plugin-worker and the main process.
+ */
+exports.OVERRIDE_SOURCE_FILE = 'NX_OVERRIDE_SOURCE_FILE';
 exports.TargetDefaultsPlugin = {
     name: 'nx/core/target-defaults',
     createNodes: [
@@ -71,6 +82,7 @@ exports.TargetDefaultsPlugin = {
                         targets: modifiedTargets,
                     },
                 },
+                [exports.OVERRIDE_SOURCE_FILE]: 'nx.json',
             };
         },
     ],
@@ -124,7 +136,7 @@ function getTargetInfo(target, projectJsonTargets, packageJsonTargets) {
             return {
                 executor: 'nx:run-commands',
                 options: {
-                    command: projectJsonTarget.options?.command,
+                    command: targetOptions?.command,
                 },
             };
         }
@@ -158,7 +170,7 @@ function getTargetExecutor(target, projectJsonTargets, packageJsonTargets) {
     const projectJsonTargetConfiguration = projectJsonTargets?.[target];
     const packageJsonTargetConfiguration = packageJsonTargets?.[target];
     if (!projectJsonTargetConfiguration && packageJsonTargetConfiguration) {
-        return packageJsonTargetConfiguration?.executor ?? 'nx:run-script';
+        return packageJsonTargetConfiguration?.executor;
     }
     if (projectJsonTargetConfiguration?.executor) {
         return projectJsonTargetConfiguration.executor;

package/src/project-graph/utils/project-configuration-utils.js

@@ -191,13 +191,17 @@ plugins, root = workspace_root_1.workspaceRoot) {
         const configurationSourceMaps = {};
         for (const result of results.flat()) {
             const { projects: projectNodes, externalNodes: pluginExternalNodes, file, pluginName, } = result;
+            const sourceInfo = [file, pluginName];
+            if (result[target_defaults_plugin_1.OVERRIDE_SOURCE_FILE]) {
+                sourceInfo[0] = result[target_defaults_plugin_1.OVERRIDE_SOURCE_FILE];
+            }
             for (const node in projectNodes) {
                 const project = {
                     root: node,
                     ...projectNodes[node],
                 };
                 try {
-                    mergeProjectConfigurationIntoRootMap(projectRootMap, project, configurationSourceMaps, [file, pluginName]);
+                    mergeProjectConfigurationIntoRootMap(projectRootMap, project, configurationSourceMaps, sourceInfo);
                 }
                 catch (e) {
                     throw new CreateNodesError(`Unable to merge project information for "${project.root}" from ${result.file} using plugin ${result.pluginName}.`, e);

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

@@ -16,6 +16,12 @@ export interface PackageManagerCommands {
  * Detects which package manager is used in the workspace based on the lock file.
  */
 export declare function detectPackageManager(dir?: string): PackageManager;
+/**
+ * Returns true if the workspace is using npm workspaces, yarn workspaces, or pnpm workspaces.
+ * @param packageManager The package manager to use. If not provided, it will be detected based on the lock file.
+ * @param root The directory the commands will be ran inside of. Defaults to the current workspace's root.
+ */
+export declare function isWorkspacesEnabled(packageManager?: PackageManager, root?: string): boolean;
 /**
  * Returns commands for the package manager used in the workspace.
  * By default, the package manager is derived based on the lock file,

package/src/utils/package-manager.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.packageRegistryPack = exports.packageRegistryView = exports.resolvePackageVersionUsingInstallation = exports.resolvePackageVersionUsingRegistry = exports.createTempNpmDirectory = exports.copyPackageManagerConfigurationFiles = exports.modifyYarnRcToFitNewDirectory = exports.modifyYarnRcYmlToFitNewDirectory = exports.findFileInPackageJsonDirectory = exports.getPackageManagerVersion = exports.getPackageManagerCommand = exports.detectPackageManager = void 0;
+exports.packageRegistryPack = exports.packageRegistryView = exports.resolvePackageVersionUsingInstallation = exports.resolvePackageVersionUsingRegistry = exports.createTempNpmDirectory = exports.copyPackageManagerConfigurationFiles = exports.modifyYarnRcToFitNewDirectory = exports.modifyYarnRcYmlToFitNewDirectory = exports.findFileInPackageJsonDirectory = exports.getPackageManagerVersion = exports.getPackageManagerCommand = exports.isWorkspacesEnabled = exports.detectPackageManager = void 0;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const fs_extra_1 = require("fs-extra");
@@ -9,6 +9,7 @@ const semver_1 = require("semver");
 const tmp_1 = require("tmp");
 const util_1 = require("util");
 const configuration_1 = require("../config/configuration");
+const file_utils_1 = require("../project-graph/file-utils");
 const fileutils_1 = require("./fileutils");
 const package_json_1 = require("./package-json");
 const workspace_root_1 = require("./workspace-root");
@@ -26,6 +27,20 @@ function detectPackageManager(dir = '') {
                 : 'npm'));
 }
 exports.detectPackageManager = detectPackageManager;
+/**
+ * Returns true if the workspace is using npm workspaces, yarn workspaces, or pnpm workspaces.
+ * @param packageManager The package manager to use. If not provided, it will be detected based on the lock file.
+ * @param root The directory the commands will be ran inside of. Defaults to the current workspace's root.
+ */
+function isWorkspacesEnabled(packageManager = detectPackageManager(), root = workspace_root_1.workspaceRoot) {
+    if (packageManager === 'pnpm') {
+        return (0, fs_1.existsSync)((0, path_1.join)(root, 'pnpm-workspace.yaml'));
+    }
+    // yarn and pnpm both use the same 'workspaces' property in package.json
+    const packageJson = (0, file_utils_1.readPackageJson)();
+    return !!packageJson?.workspaces;
+}
+exports.isWorkspacesEnabled = isWorkspacesEnabled;
 /**
  * Returns commands for the package manager used in the workspace.
  * By default, the package manager is derived based on the lock file,