nx 19.7.0-beta.1 → 19.7.0-beta.2

package/.eslintrc.json

@@ -100,7 +100,18 @@
               "events", // This is coming from @storybook/builder-manager since it uses the browser polyfill
               "process", // This is coming from @storybook/builder-manager since it uses the browser polyfill
               "prettier", // This is coming from @storybook/builder-manager since it uses the browser polyfill
-              "util" // This is coming from @storybook/builder-manager since it uses the browser polyfill
+              "util", // This is coming from @storybook/builder-manager since it uses the browser polyfill
+              // The native modules are optional and only one of them will ever be installed on a given machine
+              "@nx/nx-darwin-x64",
+              "@nx/nx-darwin-arm64",
+              "@nx/nx-linux-x64-gnu",
+              "@nx/nx-linux-x64-musl",
+              "@nx/nx-win32-x64-msvc",
+              "@nx/nx-linux-arm64-gnu",
+              "@nx/nx-linux-arm64-musl",
+              "@nx/nx-linux-arm-gnueabihf",
+              "@nx/nx-win32-arm64-msvc",
+              "@nx/nx-freebsd-x64"
             ]
           }
         ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.7.0-beta.1",
+  "version": "19.7.0-beta.2",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -56,7 +56,7 @@
     "ignore": "^5.0.4",
     "jest-diff": "^29.4.1",
     "jsonc-parser": "3.2.0",
-    "lines-and-columns": "~2.0.3",
+    "lines-and-columns": "2.0.3",
     "minimatch": "9.0.3",
     "npm-run-path": "^4.0.1",
     "open": "^8.4.0",
@@ -71,7 +71,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.7.0-beta.1"
+    "@nrwl/tao": "19.7.0-beta.2"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -86,16 +86,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.7.0-beta.1",
-    "@nx/nx-darwin-arm64": "19.7.0-beta.1",
-    "@nx/nx-linux-x64-gnu": "19.7.0-beta.1",
-    "@nx/nx-linux-x64-musl": "19.7.0-beta.1",
-    "@nx/nx-win32-x64-msvc": "19.7.0-beta.1",
-    "@nx/nx-linux-arm64-gnu": "19.7.0-beta.1",
-    "@nx/nx-linux-arm64-musl": "19.7.0-beta.1",
-    "@nx/nx-linux-arm-gnueabihf": "19.7.0-beta.1",
-    "@nx/nx-win32-arm64-msvc": "19.7.0-beta.1",
-    "@nx/nx-freebsd-x64": "19.7.0-beta.1"
+    "@nx/nx-darwin-x64": "19.7.0-beta.2",
+    "@nx/nx-darwin-arm64": "19.7.0-beta.2",
+    "@nx/nx-linux-x64-gnu": "19.7.0-beta.2",
+    "@nx/nx-linux-x64-musl": "19.7.0-beta.2",
+    "@nx/nx-win32-x64-msvc": "19.7.0-beta.2",
+    "@nx/nx-linux-arm64-gnu": "19.7.0-beta.2",
+    "@nx/nx-linux-arm64-musl": "19.7.0-beta.2",
+    "@nx/nx-linux-arm-gnueabihf": "19.7.0-beta.2",
+    "@nx/nx-win32-arm64-msvc": "19.7.0-beta.2",
+    "@nx/nx-freebsd-x64": "19.7.0-beta.2"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/connect/connect-to-nx-cloud.js

@@ -60,18 +60,19 @@ async function connectToNxCloudCommand(command) {
         ? 'nx-console'
         : 'nx-connect';
     if ((0, nx_cloud_utils_1.isNxCloudUsed)(nxJson)) {
-        const token = process.env.NX_CLOUD_ACCESS_TOKEN || nxJson.nxCloudAccessToken;
+        const token = process.env.NX_CLOUD_ACCESS_TOKEN ||
+            nxJson.nxCloudAccessToken ||
+            nxJson.nxCloudId;
         if (!token) {
-            throw new Error(`Unable to authenticate. Either define accessToken in nx.json or set the NX_CLOUD_ACCESS_TOKEN env variable.`);
+            throw new Error(`Unable to authenticate. If you are connecting to Nx Cloud locally, set Nx Cloud ID in nx.json. If you are connecting in a CI context, either define accessToken in nx.json or set the NX_CLOUD_ACCESS_TOKEN env variable.`);
         }
         const connectCloudUrl = await (0, url_shorten_1.createNxCloudOnboardingURL)(installationSource, token);
         output_1.output.log({
             title: '✔ This workspace already has Nx Cloud set up',
             bodyLines: [
-                'If you have not done so already, connect your workspace to your Nx Cloud account:',
-                `- Connect with Nx Cloud at: 
-      
-        ${connectCloudUrl}`,
+                'If you have not done so already, connect your workspace to your Nx Cloud account with the following URL:',
+                '',
+                `${connectCloudUrl}`,
             ],
         });
         return false;

package/src/command-line/graph/graph.d.ts

@@ -1,4 +1,4 @@
-import { ProjectFileMap, ProjectGraphDependency, ProjectGraphProjectNode } from '../../config/project-graph';
+import { ProjectFileMap, ProjectGraph, ProjectGraphDependency, ProjectGraphProjectNode } from '../../config/project-graph';
 import { TaskGraph } from '../../config/task-graph';
 export interface GraphError {
     message: string;
@@ -48,3 +48,20 @@ export declare function generateGraph(args: {
     exclude?: string[];
     affected?: boolean;
 }, affectedProjects: string[]): Promise<void>;
+/**
+ * The data type that `nx graph --file graph.json` or `nx build --graph graph.json` contains
+ */
+export interface GraphJson {
+    /**
+     * A graph of tasks populated with `nx build --graph`
+     */
+    tasks?: TaskGraph;
+    /**
+     * The plans for hashing a task in the task graph
+     */
+    taskPlans?: Record<string, string[]>;
+    /**
+     * The project graph
+     */
+    graph: ProjectGraph;
+}

package/src/command-line/graph/graph.js

@@ -675,8 +675,10 @@ function expandInputs(inputs, project, allWorkspaceFiles, depGraphClientResponse
     const externalInputs = [];
     const otherInputs = [];
     inputs.forEach((input) => {
-        if (input.startsWith('{workspaceRoot}')) {
-            workspaceRootInputs.push(input);
+        // grouped workspace inputs look like workspace:[pattern,otherPattern]
+        if (input.startsWith('workspace:[')) {
+            const inputs = input.substring(11, input.length - 1).split(',');
+            workspaceRootInputs.push(...inputs);
             return;
         }
         const maybeProjectName = input.split(':')[0];
@@ -696,22 +698,7 @@ function expandInputs(inputs, project, allWorkspaceFiles, depGraphClientResponse
             return;
         }
     });
-    const workspaceRootsExpanded = workspaceRootInputs.flatMap((input) => {
-        const matches = [];
-        const withoutWorkspaceRoot = input.substring(16);
-        const matchingFile = allWorkspaceFiles.find((t) => t.file === withoutWorkspaceRoot);
-        if (matchingFile) {
-            matches.push(matchingFile.file);
-        }
-        else {
-            allWorkspaceFiles
-                .filter((f) => (0, minimatch_1.minimatch)(f.file, withoutWorkspaceRoot))
-                .forEach((f) => {
-                matches.push(f.file);
-            });
-        }
-        return matches;
-    });
+    const workspaceRootsExpanded = getExpandedWorkspaceRoots(workspaceRootInputs, allWorkspaceFiles);
     const otherInputsExpanded = otherInputs.map((input) => {
         if (input === 'TsConfig') {
             return (0, path_1.relative)(workspace_root_1.workspaceRoot, (0, typescript_1.getRootTsConfigPath)());
@@ -744,6 +731,36 @@ function expandInputs(inputs, project, allWorkspaceFiles, depGraphClientResponse
         external: externalInputs,
     };
 }
+function getExpandedWorkspaceRoots(workspaceRootInputs, allWorkspaceFiles) {
+    const workspaceRootsExpanded = [];
+    const negativeWRPatterns = [];
+    const positiveWRPatterns = [];
+    for (const fileset of workspaceRootInputs) {
+        if (fileset.startsWith('!')) {
+            negativeWRPatterns.push(fileset.substring(17));
+        }
+        else {
+            positiveWRPatterns.push(fileset.substring(16));
+        }
+    }
+    for (const pattern of positiveWRPatterns) {
+        const matchingFile = allWorkspaceFiles.find((t) => t.file === pattern);
+        if (matchingFile &&
+            !negativeWRPatterns.some((p) => (0, minimatch_1.minimatch)(matchingFile.file, p))) {
+            workspaceRootsExpanded.push(matchingFile.file);
+        }
+        else {
+            allWorkspaceFiles
+                .filter((f) => (0, minimatch_1.minimatch)(f.file, pattern) &&
+                !negativeWRPatterns.some((p) => (0, minimatch_1.minimatch)(f.file, p)))
+                .forEach((f) => {
+                workspaceRootsExpanded.push(f.file);
+            });
+        }
+    }
+    workspaceRootsExpanded.sort();
+    return workspaceRootsExpanded;
+}
 async function createJsonOutput(prunedGraph, rawGraph, projects, targets) {
     const response = {
         graph: prunedGraph,

package/src/command-line/login/command-object.d.ts

@@ -0,0 +1,2 @@
+import { CommandModule } from 'yargs';
+export declare const yargsLoginCommand: CommandModule;

package/src/command-line/login/command-object.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.yargsLoginCommand = void 0;
+const shared_options_1 = require("../../command-line/yargs-utils/shared-options");
+exports.yargsLoginCommand = {
+    command: 'login [nxCloudUrl]',
+    describe: 'Login to Nx Cloud',
+    builder: (yargs) => (0, shared_options_1.withVerbose)(yargs.positional('nxCloudUrl', {
+        describe: 'The Nx Cloud URL of the instance you are trying to connect to. If no positional argument is provided, this command will connect to https://cloud.nx.app.',
+        type: 'string',
+        required: false,
+    })),
+    handler: async (args) => {
+        process.exit(await (await Promise.resolve().then(() => require('./login'))).loginHandler(args));
+    },
+};

package/src/command-line/login/login.d.ts

@@ -0,0 +1,5 @@
+export interface LoginArgs {
+    nxCloudUrl?: string;
+    verbose?: boolean;
+}
+export declare function loginHandler(args: LoginArgs): Promise<number>;

package/src/command-line/login/login.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loginHandler = loginHandler;
+const update_manager_1 = require("../../nx-cloud/update-manager");
+const get_cloud_options_1 = require("../../nx-cloud/utilities/get-cloud-options");
+const params_1 = require("../../utils/params");
+function loginHandler(args) {
+    if (args.nxCloudUrl) {
+        process.env.NX_CLOUD_API = args.nxCloudUrl;
+    }
+    return (0, params_1.handleErrors)(args.verbose, async () => {
+        const nxCloudClient = (await (0, update_manager_1.verifyOrUpdateNxCloudClient)((0, get_cloud_options_1.getCloudOptions)()))
+            .nxCloudClient;
+        await nxCloudClient.commands.login();
+    });
+}

package/src/command-line/logout/command-object.d.ts

@@ -0,0 +1,2 @@
+import { CommandModule } from 'yargs';
+export declare const yargsLogoutCommand: CommandModule;

package/src/command-line/logout/command-object.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.yargsLogoutCommand = void 0;
+const shared_options_1 = require("../../command-line/yargs-utils/shared-options");
+exports.yargsLogoutCommand = {
+    command: 'logout',
+    describe: 'Logout from Nx Cloud',
+    builder: (yargs) => (0, shared_options_1.withVerbose)(yargs),
+    handler: async (args) => {
+        process.exit(await (await Promise.resolve().then(() => require('./logout'))).logoutHandler(args));
+    },
+};

package/src/command-line/logout/logout.d.ts

@@ -0,0 +1,4 @@
+export interface LogoutArgs {
+    verbose?: boolean;
+}
+export declare function logoutHandler(args: LogoutArgs): Promise<number>;

package/src/command-line/logout/logout.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.logoutHandler = logoutHandler;
+const update_manager_1 = require("../../nx-cloud/update-manager");
+const get_cloud_options_1 = require("../../nx-cloud/utilities/get-cloud-options");
+const params_1 = require("../../utils/params");
+function logoutHandler(args) {
+    return (0, params_1.handleErrors)(args.verbose, async () => {
+        const nxCloudClient = (await (0, update_manager_1.verifyOrUpdateNxCloudClient)((0, get_cloud_options_1.getCloudOptions)()))
+            .nxCloudClient;
+        await nxCloudClient.commands.logout();
+    });
+}

package/src/command-line/migrate/migrate.js

@@ -1079,55 +1079,24 @@ function getImplementationPath(collection, collectionPath, name) {
     }
     return { path: implPath, fnSymbol };
 }
-// TODO (v17): This should just become something like:
-// ```
-// return !collection.generators[name] && collection.schematics[name]
-// ```
+// TODO (v21): Remove CLI determination of Angular Migration
 function isAngularMigration(collection, collectionPath, name) {
     const entry = collection.generators?.[name] || collection.schematics?.[name];
-    // In the future we will determine this based on the location of the entry in the collection.
-    // If the entry is under `schematics`, it will be assumed to be an angular cli migration.
-    // If the entry is under `generators`, it will be assumed to be an nx migration.
-    // For now, we will continue to obey the cli property, if it exists.
-    // If it doesn't exist, we will check if the implementation references @angular/devkit.
     const shouldBeNx = !!collection.generators?.[name];
     const shouldBeNg = !!collection.schematics?.[name];
-    let useAngularDevkitToRunMigration = false;
-    const { path: implementationPath } = getImplementationPath(collection, collectionPath, name);
-    const implStringContents = (0, fs_1.readFileSync)(implementationPath, 'utf-8');
-    // TODO (v17): Remove this check and the cli property access - it is only here for backwards compatibility.
-    if (['@angular/material', '@angular/cdk'].includes(collection.name) ||
-        [
-            "import('@angular-devkit",
-            'import("@angular-devkit',
-            "require('@angular-devkit",
-            'require("@angular-devkit',
-            "from '@angular-devkit",
-            'from "@angular-devkit',
-        ].some((s) => implStringContents.includes(s))) {
-        useAngularDevkitToRunMigration = true;
-    }
-    if (useAngularDevkitToRunMigration && shouldBeNx) {
+    if (entry.cli && entry.cli !== 'nx' && collection.generators?.[name]) {
         output_1.output.warn({
             title: `The migration '${collection.name}:${name}' appears to be an Angular CLI migration, but is located in the 'generators' section of migrations.json.`,
             bodyLines: [
-                'In Nx 17, migrations inside `generators` will be treated as Angular Devkit migrations.',
-                "Please open an issue on the plugin's repository if you believe this is an error.",
-            ],
-        });
-    }
-    if (!useAngularDevkitToRunMigration && entry.cli === 'nx' && shouldBeNg) {
-        output_1.output.warn({
-            title: `The migration '${collection.name}:${name}' appears to be an Nx migration, but is located in the 'schematics' section of migrations.json.`,
-            bodyLines: [
-                'In Nx 17, migrations inside `generators` will be treated as nx devkit migrations.',
+                'In Nx 21, migrations inside `generators` will be treated as Nx Devkit migrations and therefore may not run correctly if they are using Angular Devkit.',
+                'If the migration should be run with Angular Devkit, please place the migration inside `schematics` instead.',
                 "Please open an issue on the plugin's repository if you believe this is an error.",
             ],
         });
     }
     // Currently, if the cli property exists we listen to it. If its nx, its not an ng cli migration.
     // If the property is not set, we will fall back to our intuition.
-    return entry.cli ? entry.cli !== 'nx' : useAngularDevkitToRunMigration;
+    return entry.cli ? entry.cli !== 'nx' : !shouldBeNx && shouldBeNg;
 }
 const getNgCompatLayer = (() => {
     let _ngCliAdapter;

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

@@ -24,8 +24,10 @@ const command_object_18 = require("./watch/command-object");
 const command_object_19 = require("./reset/command-object");
 const command_object_20 = require("./release/command-object");
 const command_object_21 = require("./add/command-object");
+const command_object_22 = require("./login/command-object");
+const command_object_23 = require("./logout/command-object");
 const command_objects_1 = require("./deprecated/command-objects");
-const command_object_22 = require("./sync/command-object");
+const command_object_24 = require("./sync/command-object");
 // Ensure that the output takes up the available width of the terminal.
 yargs.wrap(yargs.terminalWidth());
 exports.parserConfiguration = {
@@ -70,11 +72,13 @@ exports.commandsObject = yargs
     .command(command_object_15.yargsRunCommand)
     .command(command_object_16.yargsRunManyCommand)
     .command(command_object_17.yargsShowCommand)
-    .command(command_object_22.yargsSyncCommand)
-    .command(command_object_22.yargsSyncCheckCommand)
+    .command(command_object_24.yargsSyncCommand)
+    .command(command_object_24.yargsSyncCheckCommand)
     .command(command_object_2.yargsViewLogsCommand)
     .command(command_object_18.yargsWatchCommand)
     .command(command_object_15.yargsNxInfixCommand)
+    .command(command_object_22.yargsLoginCommand)
+    .command(command_object_23.yargsLogoutCommand)
     .scriptName('nx')
     .help()
     // NOTE: we handle --version in nx.ts, this just tells yargs that the option exists

package/src/command-line/yargs-utils/shared-options.d.ts

@@ -1,7 +1,8 @@
-import { Argv } from 'yargs';
+import { Argv, ParserConfigurationOptions } from 'yargs';
 interface ExcludeOptions {
     exclude: string[];
 }
+export declare const defaultYargsParserConfiguration: Partial<ParserConfigurationOptions>;
 export declare function withExcludeOption(yargs: Argv): Argv<ExcludeOptions>;
 export interface RunOptions {
     exclude: string;

package/src/command-line/yargs-utils/shared-options.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.defaultYargsParserConfiguration = void 0;
 exports.withExcludeOption = withExcludeOption;
 exports.withRunOptions = withRunOptions;
 exports.withTargetAndConfigurationOption = withTargetAndConfigurationOption;
@@ -12,6 +13,13 @@ exports.withOverrides = withOverrides;
 exports.withOutputStyleOption = withOutputStyleOption;
 exports.withRunOneOptions = withRunOneOptions;
 exports.parseCSV = parseCSV;
+exports.defaultYargsParserConfiguration = {
+    'strip-dashed': true,
+    'unknown-options-as-args': true,
+    'populate--': true,
+    'parse-numbers': false,
+    'parse-positional-numbers': false,
+};
 function withExcludeOption(yargs) {
     return yargs.option('exclude', {
         describe: 'Exclude certain projects from being processed',
@@ -128,11 +136,7 @@ function withBatch(yargs) {
 }
 function withAffectedOptions(yargs) {
     return withExcludeOption(yargs)
-        .parserConfiguration({
-        'strip-dashed': true,
-        'unknown-options-as-args': true,
-        'populate--': true,
-    })
+        .parserConfiguration(exports.defaultYargsParserConfiguration)
         .option('files', {
         describe: 'Change the way Nx is calculating the affected command by providing directly changed files, list of files delimited by commas or spaces',
         type: 'string',
@@ -169,11 +173,7 @@ function withAffectedOptions(yargs) {
 }
 function withRunManyOptions(yargs) {
     return withRunOptions(yargs)
-        .parserConfiguration({
-        'strip-dashed': true,
-        'unknown-options-as-args': true,
-        'populate--': true,
-    })
+        .parserConfiguration(exports.defaultYargsParserConfiguration)
         .option('projects', {
         type: 'string',
         alias: 'p',
@@ -225,11 +225,7 @@ function withOutputStyleOption(yargs, choices = [
 function withRunOneOptions(yargs) {
     const executorShouldShowHelp = !(process.argv[2] === 'run' && process.argv[3] === '--help');
     const res = withRunOptions(withOutputStyleOption(withConfiguration(yargs), allOutputStyles))
-        .parserConfiguration({
-        'strip-dashed': true,
-        'unknown-options-as-args': true,
-        'populate--': true,
-    })
+        .parserConfiguration(exports.defaultYargsParserConfiguration)
         .option('project', {
         describe: 'Target project',
         type: 'string',