nx 18.0.0-beta.1 → 18.0.0-beta.2

package/bin/init-local.js

@@ -54,8 +54,7 @@ function initLocal(workspace) {
             }
         }
         else {
-            const newArgs = rewritePositionalArguments(process.argv);
-            nx_commands_1.commandsObject.parse(newArgs);
+            nx_commands_1.commandsObject.parse(process.argv.slice(2));
         }
     }
     catch (e) {
@@ -95,38 +94,6 @@ function rewriteTargetsAndProjects(args) {
     return newArgs;
 }
 exports.rewriteTargetsAndProjects = rewriteTargetsAndProjects;
-function rewritePositionalArguments(args) {
-    const relevantPositionalArgs = [];
-    const rest = [];
-    for (let i = 2; i < args.length; i++) {
-        if (args[i] === '--') {
-            rest.push(...args.slice(i + 1));
-            break;
-        }
-        else if (!args[i].startsWith('-')) {
-            relevantPositionalArgs.push(args[i]);
-            if (relevantPositionalArgs.length === 2) {
-                rest.push(...args.slice(i + 1));
-                break;
-            }
-        }
-        else {
-            rest.push(args[i]);
-        }
-    }
-    if (relevantPositionalArgs.length === 1) {
-        return [
-            'run',
-            `${wrapIntoQuotesIfNeeded(relevantPositionalArgs[0])}`,
-            ...rest,
-        ];
-    }
-    return [
-        'run',
-        `${relevantPositionalArgs[1]}:${wrapIntoQuotesIfNeeded(relevantPositionalArgs[0])}`,
-        ...rest,
-    ];
-}
 function wrapIntoQuotesIfNeeded(arg) {
     return arg.indexOf(':') > -1 ? `"${arg}"` : arg;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "18.0.0-beta.1",
+  "version": "18.0.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": {
@@ -66,7 +66,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "18.0.0-beta.1"
+    "@nrwl/tao": "18.0.0-beta.2"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.6.7",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "18.0.0-beta.1",
-    "@nx/nx-darwin-arm64": "18.0.0-beta.1",
-    "@nx/nx-linux-x64-gnu": "18.0.0-beta.1",
-    "@nx/nx-linux-x64-musl": "18.0.0-beta.1",
-    "@nx/nx-win32-x64-msvc": "18.0.0-beta.1",
-    "@nx/nx-linux-arm64-gnu": "18.0.0-beta.1",
-    "@nx/nx-linux-arm64-musl": "18.0.0-beta.1",
-    "@nx/nx-linux-arm-gnueabihf": "18.0.0-beta.1",
-    "@nx/nx-win32-arm64-msvc": "18.0.0-beta.1",
-    "@nx/nx-freebsd-x64": "18.0.0-beta.1"
+    "@nx/nx-darwin-x64": "18.0.0-beta.2",
+    "@nx/nx-darwin-arm64": "18.0.0-beta.2",
+    "@nx/nx-linux-x64-gnu": "18.0.0-beta.2",
+    "@nx/nx-linux-x64-musl": "18.0.0-beta.2",
+    "@nx/nx-win32-x64-msvc": "18.0.0-beta.2",
+    "@nx/nx-linux-arm64-gnu": "18.0.0-beta.2",
+    "@nx/nx-linux-arm64-musl": "18.0.0-beta.2",
+    "@nx/nx-linux-arm-gnueabihf": "18.0.0-beta.2",
+    "@nx/nx-win32-arm64-msvc": "18.0.0-beta.2",
+    "@nx/nx-freebsd-x64": "18.0.0-beta.2"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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

@@ -97,7 +97,8 @@ async function initializePlugin(pkgName, options) {
         }
         else {
             updatePackageScripts =
-                process.env.NX_PCV3 === 'true' && coreNxPlugins.includes(pkgName);
+                process.env.NX_ADD_PLUGINS !== 'false' &&
+                    coreNxPlugins.includes(pkgName);
         }
         await (0, child_process_2.runNxAsync)(`g ${pkgName}:${initGenerator} --keepExistingVersions${updatePackageScripts ? ' --updatePackageScripts' : ''}`);
     }

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

@@ -11,7 +11,7 @@ exports.yargsAddCommand = {
     })
         .option('updatePackageScripts', {
         type: 'boolean',
-        description: 'Update `package.json` scripts with inferred targets. Defaults to `true` when `NX_PCV3=true` and the package is a core Nx plugin',
+        description: 'Update `package.json` scripts with inferred targets. Defaults to `true` when the package is a core Nx plugin',
     })
         .option('verbose', {
         type: 'boolean',

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

@@ -41,7 +41,7 @@ async function connectToNxCloudCommand() {
     const nxJson = (0, configuration_1.readNxJson)();
     if ((0, nx_cloud_utils_1.isNxCloudUsed)(nxJson)) {
         output_1.output.log({
-            title: '✔ This workspace has already Nx Cloud set up',
+            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:',
                 `- Login at ${(0, nx_cloud_utils_1.getNxCloudUrl)(nxJson)} to connect your repository`,

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

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsInitCommand = void 0;
 const shared_options_1 = require("../yargs-utils/shared-options");
-const isPCv3 = process.env['NX_PCV3'] === 'true';
+const useV2 = process.env['NX_ADD_PLUGINS'] !== 'false';
 exports.yargsInitCommand = {
     command: 'init',
     describe: 'Adds Nx to any type of workspace. It installs nx, creates an nx.json configuration file and optionally sets up remote caching. For more info, check https://nx.dev/recipes/adopting-nx.',
     builder: (yargs) => withInitOptions(yargs),
     handler: async (args) => {
-        if (isPCv3) {
+        if (useV2) {
             await require('./init-v2').initHandler(args);
         }
         else {
@@ -18,7 +18,7 @@ exports.yargsInitCommand = {
     },
 };
 function withInitOptions(yargs) {
-    if (isPCv3) {
+    if (useV2) {
         return yargs
             .option('nxCloud', {
             type: 'boolean',

package/src/command-line/init/init-v1.js

@@ -114,5 +114,5 @@ function setupDotNxInstallation(version) {
     }
     (0, add_nx_scripts_1.generateDotNxSetup)(version);
     // invokes the wrapper, thus invoking the initial installation process
-    (0, child_process_2.runNxSync)('');
+    (0, child_process_2.runNxSync)('--version');
 }

package/src/command-line/init/init-v2.js

@@ -32,7 +32,7 @@ async function initHandler(options) {
         (0, child_process_1.runNxSync)('');
         return;
     }
-    // TODO(jack): Remove this Angular logic once `@nx/plugin` is compatible with PCv3.
+    // TODO(jack): Remove this Angular logic once `@nx/angular` is compatible with inferred targets.
     if ((0, fs_1.existsSync)('angular.json')) {
         await (0, angular_1.addNxToAngularCliRepo)({
             ...options,
@@ -64,7 +64,7 @@ async function initHandler(options) {
     }
     if (useNxCloud) {
         output_1.output.log({ title: '🛠️ Setting up Nx Cloud' });
-        (0, child_process_2.execSync)(`${pmc.exec} nx g nx:connect-to-nx-cloud --installationSource=nx-init-pcv3 --quiet --hideFormatLogs --no-interactive`, {
+        (0, child_process_2.execSync)(`${pmc.exec} nx g nx:connect-to-nx-cloud --installationSource=nx-init --quiet --hideFormatLogs --no-interactive`, {
             stdio: [0, 1, 2],
             cwd: repoRoot,
         });

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

@@ -68,6 +68,7 @@ exports.commandsObject = yargs
     .command(command_object_16.yargsShowCommand)
     .command(command_object_2.yargsViewLogsCommand)
     .command(command_object_17.yargsWatchCommand)
+    .command(command_object_14.yargsNxInfixCommand)
     .scriptName('nx')
     .help()
     // NOTE: we handle --version in nx.ts, this just tells yargs that the option exists

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

@@ -1,2 +1,6 @@
 import { CommandModule } from 'yargs';
 export declare const yargsRunCommand: CommandModule;
+/**
+ * Handles the infix notation for running a target.
+ */
+export declare const yargsNxInfixCommand: CommandModule;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.yargsRunCommand = void 0;
+exports.yargsNxInfixCommand = exports.yargsRunCommand = void 0;
 const shared_options_1 = require("../yargs-utils/shared-options");
 exports.yargsRunCommand = {
     command: 'run [project][:target][:configuration] [_..]',
@@ -14,3 +14,12 @@ exports.yargsRunCommand = {
     builder: (yargs) => (0, shared_options_1.withRunOneOptions)((0, shared_options_1.withBatch)(yargs)),
     handler: async (args) => (await Promise.resolve().then(() => require('./run-one'))).runOne(process.cwd(), (0, shared_options_1.withOverrides)(args)),
 };
+/**
+ * Handles the infix notation for running a target.
+ */
+exports.yargsNxInfixCommand = {
+    ...exports.yargsRunCommand,
+    command: '$0 <target> [project] [_..]',
+    describe: 'Run a target for a project',
+    handler: async (args) => (await Promise.resolve().then(() => require('./run-one'))).runOne(process.cwd(), (0, shared_options_1.withOverrides)(args, 0)),
+};

package/src/command-line/run/run-one.js

@@ -77,7 +77,7 @@ function parseRunOneOptions(cwd, parsedArgs, projectGraph, nxJson) {
     let project;
     let target;
     let configuration;
-    if (parsedArgs['project:target:configuration'].indexOf(':') > -1) {
+    if (parsedArgs['project:target:configuration']?.indexOf(':') > -1) {
         // run case
         [project, target, configuration] = (0, split_target_1.splitTarget)(parsedArgs['project:target:configuration'], projectGraph);
         // this is to account for "nx npmsript:dev"
@@ -87,7 +87,7 @@ function parseRunOneOptions(cwd, parsedArgs, projectGraph, nxJson) {
         }
     }
     else {
-        target = parsedArgs['project:target:configuration'];
+        target = parsedArgs.target ?? parsedArgs['project:target:configuration'];
     }
     if (parsedArgs.project) {
         project = parsedArgs.project;

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

@@ -17,6 +17,7 @@ export interface RunOptions {
     cloud: boolean;
     dte: boolean;
     batch: boolean;
+    useAgents: boolean;
 }
 export declare function withRunOptions<T>(yargs: Argv<T>): Argv<T & RunOptions>;
 export declare function withTargetAndConfigurationOption(yargs: Argv, demandOption?: boolean): Argv<{

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

@@ -68,6 +68,11 @@ function withRunOptions(yargs) {
         .options('dte', {
         type: 'boolean',
         hidden: true,
+    })
+        .options('useAgents', {
+        type: 'boolean',
+        hidden: true,
+        alias: 'agents',
     });
 }
 exports.withRunOptions = withRunOptions;
@@ -273,7 +278,10 @@ function parseCSV(args) {
         return [];
     }
     if (Array.isArray(args)) {
-        return args;
+        // If parseCSV is used on `type: 'array'`, the first option may be something like ['a,b,c'].
+        return args.length === 1 && args[0].includes(',')
+            ? parseCSV(args[0])
+            : args;
     }
     const items = args.split(',');
     return items.map((i) => i.startsWith('"') && i.endsWith('"') ? i.slice(1, -1) : i);