fix(@angular/cli): show a simpler command for ng update

And use validate instead of run() ot change the options which is more correct.
angular · Apr 28, 2018 · 2d34128 · 2d34128
1 parent 9274ca7
commit 2d34128
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 10 deletions.
diff --git a/packages/@angular/cli/bin/ng-update-message.js b/packages/@angular/cli/bin/ng-update-message.js
@@ -38,7 +38,7 @@ if (found) {
     The Angular CLI configuration format has been changed, and your existing configuration can
     be updated automatically by running the following command:
 
-      ng update @angular/cli --migrate-only --from=1
+      ng update @angular/cli
     ${'='.repeat(80)}
     \u001b[39m`.replace(/^ {4}/gm, ''));
 }
diff --git a/packages/@angular/cli/commands/update.ts b/packages/@angular/cli/commands/update.ts
@@ -1,5 +1,7 @@
+import { normalize } from '@angular-devkit/core';
 import { CommandScope, Option } from '../models/command';
 import { SchematicCommand, CoreSchematicOptions } from '../models/schematic-command';
+import { findUp } from '../utilities/find-up';
 
 export interface UpdateOptions extends CoreSchematicOptions {
   next: boolean;
@@ -38,19 +40,34 @@ export default class UpdateCommand extends SchematicCommand {
     this.arguments = this.arguments.concat(schematicOptions.arguments.map(a => a.name));
   }
 
-  public async run(options: UpdateOptions) {
-    const schematicOptions: any = { ...options };
-    if (schematicOptions._[0] == '@angular/cli'
-        && !schematicOptions.migrateOnly
-        && !schematicOptions.from) {
-      schematicOptions.migrateOnly = true;
-      schematicOptions.from = '1.0.0';
+  async validate(options: any) {
+    if (options._[0] == '@angular/cli'
+        && options.migrateOnly === undefined
+        && options.from === undefined) {
+      // Check for a 1.7 angular-cli.json file.
+      const oldConfigFileNames = [
+        normalize('.angular-cli.json'),
+        normalize('angular-cli.json'),
+      ];
+      const oldConfigFilePath =
+        findUp(oldConfigFileNames, process.cwd())
+        || findUp(oldConfigFileNames, __dirname);
+
+      if (oldConfigFilePath) {
+        options.migrateOnly = true;
+        options.from = '1.0.0';
+      }
     }
 
+    return super.validate(options);
+  }
+
+
+  public async run(options: UpdateOptions) {
     return this.runSchematic({
       collectionName: this.collectionName,
       schematicName: this.schematicName,
-      schematicOptions,
+      schematicOptions: options,
       dryRun: options.dryRun,
       force: false,
       showNothingDone: false,

diff --git a/packages/@angular/cli/models/command-runner.ts b/packages/@angular/cli/models/command-runner.ts
@@ -312,7 +312,7 @@ function verifyWorkspace(
         The Angular CLI configuration format has been changed, and your existing configuration can
         be updated automatically by running the following command:
 
-          ng update @angular/cli --migrate-only --from=1
+          ng update @angular/cli
       `;
 
       if (!logger) {