fix(core): remove invalid --plain flags from affected commands

Hotell · vsavkin · commit c275dcdd4a87 · 2020-09-01T11:45:48.000-04:00
ISSUES CLOSED: 2720
diff --git a/docs/angular/cli/affected-build.md b/docs/angular/cli/affected-build.md
@@ -110,10 +110,6 @@ Default: `false`
 
 Parallelize the command
 
-### plain
-
-Produces a plain output for affected:apps and affected:libs
-
 ### runner
 
 This is the name of the tasks runner configured in nx.json
diff --git a/docs/angular/cli/affected-dep-graph.md b/docs/angular/cli/affected-dep-graph.md
@@ -102,10 +102,6 @@ Default: `false`
 
 Isolate projects which previously failed
 
-### plain
-
-Produces a plain output for affected:apps and affected:libs
-
 ### runner
 
 This is the name of the tasks runner configured in nx.json
diff --git a/docs/angular/cli/affected-e2e.md b/docs/angular/cli/affected-e2e.md
@@ -98,10 +98,6 @@ Default: `false`
 
 Parallelize the command
 
-### plain
-
-Produces a plain output for affected:apps and affected:libs
-
 ### runner
 
 This is the name of the tasks runner configured in nx.json
diff --git a/docs/angular/cli/affected-lint.md b/docs/angular/cli/affected-lint.md
@@ -98,10 +98,6 @@ Default: `false`
 
 Parallelize the command
 
-### plain
-
-Produces a plain output for affected:apps and affected:libs
-
 ### runner
 
 This is the name of the tasks runner configured in nx.json
diff --git a/docs/angular/cli/affected-test.md b/docs/angular/cli/affected-test.md
@@ -98,10 +98,6 @@ Default: `false`
 
 Parallelize the command
 
-### plain
-
-Produces a plain output for affected:apps and affected:libs
-
 ### runner
 
 This is the name of the tasks runner configured in nx.json
diff --git a/docs/angular/cli/affected.md b/docs/angular/cli/affected.md
@@ -116,10 +116,6 @@ Default: `false`
 
 Parallelize the command
 
-### plain
-
-Produces a plain output for affected:apps and affected:libs
-
 ### runner
 
 This is the name of the tasks runner configured in nx.json
diff --git a/docs/angular/cli/format-check.md b/docs/angular/cli/format-check.md
@@ -50,10 +50,6 @@ Default: `false`
 
 Isolate projects which previously failed
 
-### plain
-
-Produces a plain output for affected:apps and affected:libs
-
 ### runner
 
 This is the name of the tasks runner configured in nx.json
diff --git a/docs/angular/cli/format-write.md b/docs/angular/cli/format-write.md
@@ -50,10 +50,6 @@ Default: `false`
 
 Isolate projects which previously failed
 
-### plain
-
-Produces a plain output for affected:apps and affected:libs
-
 ### runner
 
 This is the name of the tasks runner configured in nx.json
diff --git a/docs/angular/cli/print-affected.md b/docs/angular/cli/print-affected.md
@@ -86,10 +86,6 @@ Default: `false`
 
 Isolate projects which previously failed
 
-### plain
-
-Produces a plain output for affected:apps and affected:libs
-
 ### runner
 
 This is the name of the tasks runner configured in nx.json
diff --git a/docs/react/cli/affected-build.md b/docs/react/cli/affected-build.md
@@ -110,10 +110,6 @@ Default: `false`
 
 Parallelize the command
 
-### plain
-
-Produces a plain output for affected:apps and affected:libs
-
 ### runner
 
 This is the name of the tasks runner configured in nx.json
diff --git a/docs/react/cli/affected-dep-graph.md b/docs/react/cli/affected-dep-graph.md
@@ -102,10 +102,6 @@ Default: `false`
 
 Isolate projects which previously failed
 
-### plain
-
-Produces a plain output for affected:apps and affected:libs
-
 ### runner
 
 This is the name of the tasks runner configured in nx.json
diff --git a/docs/react/cli/affected-e2e.md b/docs/react/cli/affected-e2e.md
@@ -98,10 +98,6 @@ Default: `false`
 
 Parallelize the command
 
-### plain
-
-Produces a plain output for affected:apps and affected:libs
-
 ### runner
 
 This is the name of the tasks runner configured in nx.json
diff --git a/docs/react/cli/affected-lint.md b/docs/react/cli/affected-lint.md
@@ -98,10 +98,6 @@ Default: `false`
 
 Parallelize the command
 
-### plain
-
-Produces a plain output for affected:apps and affected:libs
-
 ### runner
 
 This is the name of the tasks runner configured in nx.json
diff --git a/docs/react/cli/affected-test.md b/docs/react/cli/affected-test.md
@@ -98,10 +98,6 @@ Default: `false`
 
 Parallelize the command
 
-### plain
-
-Produces a plain output for affected:apps and affected:libs
-
 ### runner
 
 This is the name of the tasks runner configured in nx.json
diff --git a/docs/react/cli/affected.md b/docs/react/cli/affected.md
@@ -116,10 +116,6 @@ Default: `false`
 
 Parallelize the command
 
-### plain
-
-Produces a plain output for affected:apps and affected:libs
-
 ### runner
 
 This is the name of the tasks runner configured in nx.json
diff --git a/docs/react/cli/format-check.md b/docs/react/cli/format-check.md
@@ -50,10 +50,6 @@ Default: `false`
 
 Isolate projects which previously failed
 
-### plain
-
-Produces a plain output for affected:apps and affected:libs
-
 ### runner
 
 This is the name of the tasks runner configured in nx.json
diff --git a/docs/react/cli/format-write.md b/docs/react/cli/format-write.md
@@ -50,10 +50,6 @@ Default: `false`
 
 Isolate projects which previously failed
 
-### plain
-
-Produces a plain output for affected:apps and affected:libs
-
 ### runner
 
 This is the name of the tasks runner configured in nx.json
diff --git a/docs/react/cli/print-affected.md b/docs/react/cli/print-affected.md
@@ -86,10 +86,6 @@ Default: `false`
 
 Isolate projects which previously failed
 
-### plain
-
-Produces a plain output for affected:apps and affected:libs
-
 ### runner
 
 This is the name of the tasks runner configured in nx.json
diff --git a/packages/workspace/src/command-line/affected.ts b/packages/workspace/src/command-line/affected.ts
@@ -3,7 +3,7 @@ import { generateGraph } from './dep-graph';
 import { output } from '../utils/output';
 import { parseFiles } from './shared';
 import { runCommand } from '../tasks-runner/run-command';
-import { NxArgs, splitArgsIntoNxArgsAndOverrides } from './utils';
+import { NxArgs, splitArgsIntoNxArgsAndOverrides, RawNxArgs } from './utils';
 import { filterAffected } from '../core/affected-project-graph';
 import {
   createProjectGraph,
@@ -17,7 +17,10 @@ import { printAffected } from './print-affected';
 import { projectHasTarget } from '../utils/project-graph-utils';
 import { DefaultReporter } from '../tasks-runner/default-reporter';
 
-export function affected(command: string, parsedArgs: yargs.Arguments): void {
+export function affected(
+  command: 'apps' | 'libs' | 'dep-graph' | 'print-affected' | 'affected',
+  parsedArgs: yargs.Arguments & RawNxArgs
+): void {
   const { nxArgs, overrides } = splitArgsIntoNxArgsAndOverrides(
     parsedArgs,
     'affected',
diff --git a/packages/workspace/src/command-line/nx-commands.ts b/packages/workspace/src/command-line/nx-commands.ts
@@ -55,13 +55,13 @@ export const commandsObject = yargs
   .command(
     'affected:apps',
     'Print applications affected by changes',
-    withAffectedOptions,
+    (yargs) => withAffectedOptions(withPlainOption(yargs)),
     (args) => affected('apps', { ...args })
   )
   .command(
     'affected:libs',
     'Print libraries affected by changes',
-    withAffectedOptions,
+    (yargs) => withAffectedOptions(withPlainOption(yargs)),
     (args) =>
       affected('libs', {
         ...args,
@@ -205,6 +205,11 @@ function withPrintAffectedOptions(yargs: yargs.Argv): yargs.Argv {
   return yargs.option('select', { type: 'string' });
 }
 
+function withPlainOption(yargs: yargs.Argv): yargs.Argv {
+  return yargs.option('plain', {
+    describe: 'Produces a plain output for affected:apps and affected:libs',
+  });
+}
 function withAffectedOptions(yargs: yargs.Argv): yargs.Argv {
   return yargs
     .option('files', {
@@ -269,9 +274,6 @@ function withAffectedOptions(yargs: yargs.Argv): yargs.Argv {
     .option('verbose', {
       describe: 'Print additional error stack trace on failure',
     })
-    .option('plain', {
-      describe: 'Produces a plain output for affected:apps and affected:libs',
-    })
     .conflicts({
       files: ['uncommitted', 'untracked', 'base', 'head', 'all'],
       untracked: ['uncommitted', 'files', 'base', 'head', 'all'],
diff --git a/packages/workspace/src/command-line/utils.ts b/packages/workspace/src/command-line/utils.ts
@@ -40,6 +40,10 @@ const runAffected = [
   'select',
 ];
 
+export interface RawNxArgs extends NxArgs {
+  prod?: boolean;
+}
+
 export interface NxArgs {
   target?: string;
   configuration?: string;
@@ -80,12 +84,12 @@ export function splitArgsIntoNxArgsAndOverrides(
   const nxSpecific =
     mode === 'run-one' ? runOne : mode === 'run-many' ? runMany : runAffected;
 
-  const nxArgs: any = {};
+  const nxArgs: RawNxArgs = {};
   const overrides = yargsParser(args._);
   delete overrides._;
 
   Object.entries(args).forEach(([key, value]) => {
-    if (nxSpecific.includes(key as any)) {
+    if (nxSpecific.includes(key)) {
       nxArgs[key] = value;
     } else if (!ignoreArgs.includes(key)) {
       overrides[key] = value;
