* fix(@angular/cli): remove helpJson and help-json mentions (angular#12331)

hansl · vikerman · commit 0b959d123381 · 2018-09-20T14:45:09.000-07:00
* fix(@angular/cli): remove helpJson and help-json mentions

* ci: use proper --help=json for creating snapshot
diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
@@ -93,7 +93,7 @@ export abstract class ArchitectCommand<
     }
 
     if ((!targetSpec.project || !targetSpec.target) && !this.multiTarget) {
-      if (options.help || options.helpJson) {
+      if (options.help) {
         // This is a special case where we just return.
         return;
       }
diff --git a/packages/angular/cli/models/command.ts b/packages/angular/cli/models/command.ts
@@ -21,7 +21,6 @@ import {
 
 export interface BaseCommandOptions {
   help?: boolean | string;
-  helpJson?: boolean;
 }
 
 export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions> {
diff --git a/packages/angular/cli/models/interface.ts b/packages/angular/cli/models/interface.ts
@@ -71,7 +71,7 @@ export enum OptionType {
 }
 
 /**
- * An option description. This is exposed when using `ng --help-json`.
+ * An option description. This is exposed when using `ng --help=json`.
  */
 export interface Option {
   /**
diff --git a/scripts/snapshots.ts b/scripts/snapshots.ts
@@ -96,7 +96,7 @@ export default async function(opts: SnapshotsOptions, logger: logging.Logger) {
   for (const commandName of Object.keys(commands)) {
     const options = { cwd: newProjectRoot };
     const childLogger = logger.createChild(commandName);
-    const stdout = _exec(ngPath, [commandName, '--help-json'], options, childLogger);
+    const stdout = _exec(ngPath, [commandName, '--help=json'], options, childLogger);
     if (stdout.trim()) {
       fs.writeFileSync(path.join(helpOutputRoot, commandName + '.json'), stdout);
     }

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ export abstract class ArchitectCommand<`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`if ((!targetSpec.project \|\| !targetSpec.target) && !this.multiTarget) {`
`96`		`- if (options.help \|\| options.helpJson) {`
	`96`	`+ if (options.help) {`
`97`	`97`	`// This is a special case where we just return.`
`98`	`98`	`return;`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ import {`
`21`	`21`
`22`	`22`	`export interface BaseCommandOptions {`
`23`	`23`	`help?: boolean \| string;`
`24`		`- helpJson?: boolean;`
`25`	`24`	`}`
`26`	`25`
`27`	`26`	`export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions> {`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ export enum OptionType {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`/**`
`74`		- * An option description. This is exposed when using `ng --help-json`.
	`74`	+ * An option description. This is exposed when using `ng --help=json`.
`75`	`75`	`*/`
`76`	`76`	`export interface Option {`
`77`	`77`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ export default async function(opts: SnapshotsOptions, logger: logging.Logger) {`
`96`	`96`	`for (const commandName of Object.keys(commands)) {`
`97`	`97`	`const options = { cwd: newProjectRoot };`
`98`	`98`	`const childLogger = logger.createChild(commandName);`
`99`		`- const stdout = _exec(ngPath, [commandName, '--help-json'], options, childLogger);`
	`99`	`+ const stdout = _exec(ngPath, [commandName, '--help=json'], options, childLogger);`
`100`	`100`	`if (stdout.trim()) {`
`101`	`101`	`fs.writeFileSync(path.join(helpOutputRoot, commandName + '.json'), stdout);`
`102`	`102`	`}`