From 86dada3120e5d993d4303ecb6d73dc715f8e7cf9 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 20 Sep 2018 14:00:31 -0700
Subject: [PATCH 1/2] fix(@angular/cli): remove helpJson and help-json mentions

---
 packages/angular/cli/models/architect-command.ts | 2 +-
 packages/angular/cli/models/command.ts           | 1 -
 packages/angular/cli/models/interface.ts         | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index 184dfc8d450a..505dd5321f0a 100644
--- 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
index 6234fb9dc596..793c57ed2528 100644
--- 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
index 940ae85c1fd1..26e88f4beb80 100644
--- 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 {
   /**

From 978ffdb98493cbbaf0874e774237474e8966ecef Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 20 Sep 2018 14:00:41 -0700
Subject: [PATCH 2/2] ci: use proper --help=json for creating snapshot

---
 scripts/snapshots.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/snapshots.ts b/scripts/snapshots.ts
index 7c3f296ff424..31d02311f402 100644
--- 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);
     }