nx 19.1.0-canary.20240511-f7dcf43 → 19.1.0-canary.20240514-cc9b7f3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.1.0-canary.20240511-f7dcf43",
+  "version": "19.1.0-canary.20240514-cc9b7f3",
   "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": "19.1.0-canary.20240511-f7dcf43"
+    "@nrwl/tao": "19.1.0-canary.20240514-cc9b7f3"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.1.0-canary.20240511-f7dcf43",
-    "@nx/nx-darwin-arm64": "19.1.0-canary.20240511-f7dcf43",
-    "@nx/nx-linux-x64-gnu": "19.1.0-canary.20240511-f7dcf43",
-    "@nx/nx-linux-x64-musl": "19.1.0-canary.20240511-f7dcf43",
-    "@nx/nx-win32-x64-msvc": "19.1.0-canary.20240511-f7dcf43",
-    "@nx/nx-linux-arm64-gnu": "19.1.0-canary.20240511-f7dcf43",
-    "@nx/nx-linux-arm64-musl": "19.1.0-canary.20240511-f7dcf43",
-    "@nx/nx-linux-arm-gnueabihf": "19.1.0-canary.20240511-f7dcf43",
-    "@nx/nx-win32-arm64-msvc": "19.1.0-canary.20240511-f7dcf43",
-    "@nx/nx-freebsd-x64": "19.1.0-canary.20240511-f7dcf43"
+    "@nx/nx-darwin-x64": "19.1.0-canary.20240514-cc9b7f3",
+    "@nx/nx-darwin-arm64": "19.1.0-canary.20240514-cc9b7f3",
+    "@nx/nx-linux-x64-gnu": "19.1.0-canary.20240514-cc9b7f3",
+    "@nx/nx-linux-x64-musl": "19.1.0-canary.20240514-cc9b7f3",
+    "@nx/nx-win32-x64-msvc": "19.1.0-canary.20240514-cc9b7f3",
+    "@nx/nx-linux-arm64-gnu": "19.1.0-canary.20240514-cc9b7f3",
+    "@nx/nx-linux-arm64-musl": "19.1.0-canary.20240514-cc9b7f3",
+    "@nx/nx-linux-arm-gnueabihf": "19.1.0-canary.20240514-cc9b7f3",
+    "@nx/nx-win32-arm64-msvc": "19.1.0-canary.20240514-cc9b7f3",
+    "@nx/nx-freebsd-x64": "19.1.0-canary.20240514-cc9b7f3"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/deprecated/command-objects.d.ts

@@ -0,0 +1,9 @@
+import { CommandModule } from 'yargs';
+/**
+ * @deprecated 'Use `nx graph --affected`, or` nx affected --graph` instead depending on which best suits your use case. The `affected:graph` command will be removed in Nx 19.'
+ */
+export declare const yargsAffectedGraphCommand: CommandModule;
+/**
+ * @deprecated 'Use `nx show --affected`, `nx affected --graph` or `nx graph --affected` depending on which best suits your use case. The `print-affected` command will be removed in Nx 19.'
+ */
+export declare const yargsPrintAffectedCommand: CommandModule;

package/src/command-line/deprecated/command-objects.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.yargsPrintAffectedCommand = exports.yargsAffectedGraphCommand = void 0;
+const params_1 = require("../../utils/params");
+const shared_options_1 = require("../yargs-utils/shared-options");
+const affectedGraphDeprecationMessage = 'Use `nx graph --affected`, or `nx affected --graph` instead depending on which best suits your use case. The `affected:graph` command has been removed in Nx 19.';
+const printAffectedDeprecationMessage = 'Use `nx show projects --affected`, `nx affected --graph -t build` or `nx graph --affected` depending on which best suits your use case. The `print-affected` command has been removed in Nx 19.';
+/**
+ * @deprecated 'Use `nx graph --affected`, or` nx affected --graph` instead depending on which best suits your use case. The `affected:graph` command will be removed in Nx 19.'
+ */
+exports.yargsAffectedGraphCommand = {
+    command: 'affected:graph',
+    describe: false,
+    aliases: ['affected:dep-graph'],
+    builder: (yargs) => (0, shared_options_1.withAffectedOptions)((0, shared_options_1.withDepGraphOptions)(yargs)),
+    handler: (args) => (0, params_1.handleErrors)(false, () => {
+        throw new Error(affectedGraphDeprecationMessage);
+    }),
+    deprecated: affectedGraphDeprecationMessage,
+};
+/**
+ * @deprecated 'Use `nx show --affected`, `nx affected --graph` or `nx graph --affected` depending on which best suits your use case. The `print-affected` command will be removed in Nx 19.'
+ */
+exports.yargsPrintAffectedCommand = {
+    command: 'print-affected',
+    describe: false,
+    builder: (yargs) => (0, shared_options_1.withAffectedOptions)((0, shared_options_1.withTargetAndConfigurationOption)(yargs, false))
+        .option('select', {
+        type: 'string',
+        describe: 'Select the subset of the returned json document (e.g., --select=projects)',
+    })
+        .option('type', {
+        type: 'string',
+        choices: ['app', 'lib'],
+        describe: 'Select the type of projects to be returned (e.g., --type=app)',
+    }),
+    handler: (args) => (0, params_1.handleErrors)(false, () => {
+        throw new Error(printAffectedDeprecationMessage);
+    }),
+    deprecated: printAffectedDeprecationMessage,
+};

package/src/command-line/examples.js

@@ -2,28 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.examples = void 0;
 exports.examples = {
-    'print-affected': [
-        {
-            command: 'print-affected',
-            description: 'Print information about affected projects and the project graph',
-        },
-        {
-            command: 'print-affected --base=main --head=HEAD',
-            description: 'Print information about the projects affected by the changes between main and HEAD (e.g,. PR)',
-        },
-        {
-            command: 'print-affected -t test',
-            description: 'Prints information about the affected projects and a list of tasks to test them',
-        },
-        {
-            command: 'print-affected -t build --select=projects',
-            description: 'Prints the projects property from the print-affected output',
-        },
-        {
-            command: 'print-affected -t build --select=tasks.target.project',
-            description: 'Prints the tasks.target.project property from the print-affected output',
-        },
-    ],
     affected: [
         {
             command: 'affected -t custom-target',
@@ -166,32 +144,6 @@ exports.examples = {
             description: 'Watch for changes to project graph and update in-browser',
         },
     ],
-    'affected:graph': [
-        {
-            command: 'affected:graph --files=libs/mylib/src/index.ts',
-            description: 'Open the project graph of the workspace in the browser, and highlight the projects affected by changing the index.ts file',
-        },
-        {
-            command: 'affected:graph --base=main --head=HEAD',
-            description: 'Open the project graph of the workspace in the browser, and highlight the projects affected by the changes between main and HEAD (e.g., PR)',
-        },
-        {
-            command: 'affected:graph --base=main --head=HEAD --file=output.json',
-            description: 'Save the project graph of the workspace in a json file, and highlight the projects affected by the changes between main and HEAD (e.g., PR)',
-        },
-        {
-            command: 'affected:graph --base=main --head=HEAD --file=output.html',
-            description: 'Generate a static website with project graph data in an html file, highlighting the projects affected by the changes between main and HEAD (e.g., PR)',
-        },
-        {
-            command: 'affected:graph --base=main~1 --head=main',
-            description: 'Open the project graph of the workspace in the browser, and highlight the projects affected by the last commit on main',
-        },
-        {
-            command: 'affected:graph --exclude=project-one,project-two',
-            description: 'Open the project graph of the workspace in the browser, highlight the projects affected, but exclude project-one and project-two',
-        },
-    ],
     list: [
         {
             command: 'list',

package/src/command-line/nx-commands.js

@@ -23,6 +23,7 @@ const command_object_17 = require("./watch/command-object");
 const command_object_18 = require("./reset/command-object");
 const command_object_19 = require("./release/command-object");
 const command_object_20 = require("./add/command-object");
+const command_objects_1 = require("./deprecated/command-objects");
 // Ensure that the output takes up the available width of the terminal.
 yargs.wrap(yargs.terminalWidth());
 exports.parserConfiguration = {
@@ -45,6 +46,7 @@ exports.commandsObject = yargs
     .command(command_object_1.yargsAffectedE2ECommand)
     .command(command_object_1.yargsAffectedLintCommand)
     .command(command_object_1.yargsAffectedTestCommand)
+    .command(command_objects_1.yargsAffectedGraphCommand)
     .command(command_object_2.yargsConnectCommand)
     .command(command_object_3.yargsDaemonCommand)
     .command(command_object_4.yargsDepGraphCommand)
@@ -57,6 +59,7 @@ exports.commandsObject = yargs
     .command(command_object_9.yargsListCommand)
     .command(command_object_10.yargsMigrateCommand)
     .command(command_object_11.yargsNewCommand)
+    .command(command_objects_1.yargsPrintAffectedCommand)
     .command(command_object_19.yargsReleaseCommand)
     .command(command_object_12.yargsRepairCommand)
     .command(command_object_13.yargsReportCommand)

package/src/devkit-internals.d.ts

@@ -4,12 +4,13 @@
  * These may not be available in certain version of Nx, so be sure to check them first.
  */
 export { createTempNpmDirectory } from './utils/package-manager';
+export { deepEquals } from './utils/json-diff';
 export { getExecutorInformation } from './command-line/run/executor-utils';
 export { readNxJson as readNxJsonFromDisk } from './config/nx-json';
 export { calculateDefaultProjectName } from './config/calculate-default-project-name';
 export { retrieveProjectConfigurationsWithAngularProjects } from './project-graph/utils/retrieve-workspace-files';
 export { mergeTargetConfigurations } from './project-graph/utils/project-configuration-utils';
-export { readProjectConfigurationsFromRootMap } from './project-graph/utils/project-configuration-utils';
+export { readProjectConfigurationsFromRootMap, isCompatibleTarget, } from './project-graph/utils/project-configuration-utils';
 export { splitTarget } from './utils/split-target';
 export { combineOptionsForExecutor } from './utils/params';
 export { sortObjectByKeys } from './utils/object-sort';
@@ -20,6 +21,6 @@ export { hashObject } from './hasher/file-hasher';
 export { hashWithWorkspaceContext } from './utils/workspace-context';
 export { createProjectRootMappingsFromProjectConfigurations, findProjectForPath, } from './project-graph/utils/find-project-for-path';
 export { retrieveProjectConfigurations } from './project-graph/utils/retrieve-workspace-files';
-export { LoadedNxPlugin } from './project-graph/plugins/internal-api';
+export { LoadedNxPlugin, loadNxPlugins, } from './project-graph/plugins/internal-api';
 export * from './project-graph/error-types';
 export { registerTsProject } from './plugins/js/utils/register';

package/src/devkit-internals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
+exports.registerTsProject = exports.loadNxPlugins = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.isCompatibleTarget = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.deepEquals = exports.createTempNpmDirectory = void 0;
 const tslib_1 = require("tslib");
 /**
  * Note to developers: STOP! These exports are available via requireNx in @nx/devkit.
@@ -9,6 +9,8 @@ const tslib_1 = require("tslib");
  */
 var package_manager_1 = require("./utils/package-manager");
 Object.defineProperty(exports, "createTempNpmDirectory", { enumerable: true, get: function () { return package_manager_1.createTempNpmDirectory; } });
+var json_diff_1 = require("./utils/json-diff");
+Object.defineProperty(exports, "deepEquals", { enumerable: true, get: function () { return json_diff_1.deepEquals; } });
 var executor_utils_1 = require("./command-line/run/executor-utils");
 Object.defineProperty(exports, "getExecutorInformation", { enumerable: true, get: function () { return executor_utils_1.getExecutorInformation; } });
 var nx_json_1 = require("./config/nx-json");
@@ -21,6 +23,7 @@ var project_configuration_utils_1 = require("./project-graph/utils/project-confi
 Object.defineProperty(exports, "mergeTargetConfigurations", { enumerable: true, get: function () { return project_configuration_utils_1.mergeTargetConfigurations; } });
 var project_configuration_utils_2 = require("./project-graph/utils/project-configuration-utils");
 Object.defineProperty(exports, "readProjectConfigurationsFromRootMap", { enumerable: true, get: function () { return project_configuration_utils_2.readProjectConfigurationsFromRootMap; } });
+Object.defineProperty(exports, "isCompatibleTarget", { enumerable: true, get: function () { return project_configuration_utils_2.isCompatibleTarget; } });
 var split_target_1 = require("./utils/split-target");
 Object.defineProperty(exports, "splitTarget", { enumerable: true, get: function () { return split_target_1.splitTarget; } });
 var params_1 = require("./utils/params");
@@ -44,6 +47,7 @@ var retrieve_workspace_files_2 = require("./project-graph/utils/retrieve-workspa
 Object.defineProperty(exports, "retrieveProjectConfigurations", { enumerable: true, get: function () { return retrieve_workspace_files_2.retrieveProjectConfigurations; } });
 var internal_api_1 = require("./project-graph/plugins/internal-api");
 Object.defineProperty(exports, "LoadedNxPlugin", { enumerable: true, get: function () { return internal_api_1.LoadedNxPlugin; } });
+Object.defineProperty(exports, "loadNxPlugins", { enumerable: true, get: function () { return internal_api_1.loadNxPlugins; } });
 tslib_1.__exportStar(require("./project-graph/error-types"), exports);
 var register_1 = require("./plugins/js/utils/register");
 Object.defineProperty(exports, "registerTsProject", { enumerable: true, get: function () { return register_1.registerTsProject; } });

package/src/migrations/update-16-8-0/escape-dollar-sign-env-variables.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const logger_1 = require("../../utils/logger");
 const project_configuration_1 = require("../../generators/utils/project-configuration");
 /**
  * This function escapes dollar sign in env variables
@@ -41,11 +42,17 @@ function parseEnvFile(tree, envFilePath) {
         return;
     }
     let envFileContent = tree.read(envFilePath, 'utf-8');
+    if (!envFileContent) {
+        // envFileContent is null if we fail to read the file for any reason
+        // e.g. the file is not utf-8 encoded
+        logger_1.logger.info(`Unable to update ${envFilePath}. Nx interpolates environment variables in the form of $VAR_NAME. To escape the dollar sign, use \\$VAR_NAME.`);
+        return;
+    }
     envFileContent = envFileContent
         .split('\n')
         .map((line) => {
         line = line.trim();
-        if (!line.includes('$')) {
+        if (!line || !line.includes('$')) {
             return line;
         }
         const declarations = line.split('=');

package/src/project-graph/plugins/internal-api.d.ts

@@ -25,5 +25,5 @@ export declare const nxPluginCache: Map<unknown, [
     Promise<LoadedNxPlugin>,
     () => void
 ]>;
-export declare function loadNxPlugins(plugins: PluginConfiguration[], root?: string): Promise<[LoadedNxPlugin[], () => void]>;
+export declare function loadNxPlugins(plugins: PluginConfiguration[], root?: string, skipDefaultPlugins?: boolean): Promise<[LoadedNxPlugin[], () => void]>;
 export declare function getDefaultPlugins(root: string): Promise<string[]>;

package/src/project-graph/plugins/internal-api.js

@@ -38,12 +38,14 @@ exports.LoadedNxPlugin = LoadedNxPlugin;
 // Allows loaded plugins to not be reloaded when
 // referenced multiple times.
 exports.nxPluginCache = new Map();
-async function loadNxPlugins(plugins, root = workspace_root_1.workspaceRoot) {
+async function loadNxPlugins(plugins, root = workspace_root_1.workspaceRoot, skipDefaultPlugins = false) {
     const result = [];
     const loadingMethod = process.env.NX_ISOLATE_PLUGINS === 'true'
         ? isolation_1.loadNxPluginInIsolation
         : loader_1.loadNxPlugin;
-    plugins = await normalizePlugins(plugins, root);
+    plugins = skipDefaultPlugins
+        ? plugins ?? []
+        : await normalizePlugins(plugins, root);
     const cleanupFunctions = [];
     for (const plugin of plugins) {
         const [loadedPluginPromise, cleanup] = loadingMethod(plugin, root);

package/src/project-graph/utils/retrieve-workspace-files.d.ts

@@ -9,12 +9,12 @@ import { LoadedNxPlugin } from '../plugins/internal-api';
  * @param nxJson
  */
 export declare function retrieveWorkspaceFiles(workspaceRoot: string, projectRootMap: Record<string, string>): Promise<{
-    allWorkspaceFiles: import("nx/src/devkit-exports").FileData[];
+    allWorkspaceFiles: import("../file-utils").FileData[];
     fileMap: {
         projectFileMap: ProjectFiles;
-        nonProjectFiles: import("nx/src/native").FileData[];
+        nonProjectFiles: import("../../native").FileData[];
     };
-    rustReferences: import("nx/src/native").NxWorkspaceFilesExternals;
+    rustReferences: import("../../native").NxWorkspaceFilesExternals;
 }>;
 /**
  * Walk through the workspace and return `ProjectConfigurations`. Only use this if the projectFileMap is not needed.

package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js

@@ -331,7 +331,7 @@ function writeCompletedTaskResultLine(line) {
 function writeCommandOutputBlock(commandOutput) {
     commandOutput = commandOutput || '';
     commandOutput = commandOutput.trimStart();
-    const lines = commandOutput.split(os_1.EOL);
+    const lines = commandOutput.split(/\r?\n/);
     let totalTrailingEmptyLines = 0;
     for (let i = lines.length - 1; i >= 0; i--) {
         if (lines[i] !== '') {

package/src/utils/find-matching-projects.js

@@ -22,6 +22,15 @@ function findMatchingProjects(patterns = [], projects) {
     }
     const projectNames = Object.keys(projects);
     const matchedProjects = new Set();
+    // If the first pattern is an exclude pattern,
+    // we add a wildcard pattern at the first to select
+    // all projects, except the ones that match the exclude pattern.
+    // e.g. ['!tag:someTag', 'project2'] will match all projects except
+    // the ones with the tag 'someTag', and also match the project 'project2',
+    // regardless of its tags.
+    if (isExcludePattern(patterns[0])) {
+        patterns.unshift('*');
+    }
     for (const stringPattern of patterns) {
         if (!stringPattern.length) {
             continue;
@@ -139,8 +148,11 @@ function addMatchingProjectsByTag(projectNames, projects, pattern, matchedProjec
         }
     }
 }
+function isExcludePattern(pattern) {
+    return pattern.startsWith('!');
+}
 function parseStringPattern(pattern, projects) {
-    const isExclude = pattern.startsWith('!');
+    const isExclude = isExcludePattern(pattern);
     // Support for things like: `!{type}:value`
     if (isExclude) {
         pattern = pattern.substring(1);