fix(@angular/cli): allow update to work without workspace

angular · Apr 3, 2018 · 702dd5b · 702dd5b
1 parent 36b2dae
commit 702dd5b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/packages/@angular/cli/commands/update.ts b/packages/@angular/cli/commands/update.ts
@@ -16,6 +16,7 @@ export default class UpdateCommand extends SchematicCommand {
   public readonly options: Option[] = [
     ...this.coreOptions,
   ];
+  public readonly allowMissingWorkspace = true;
 
   public async run(options: UpdateOptions) {
     const collectionName = '@schematics/update';

diff --git a/packages/@angular/cli/models/command-runner.ts b/packages/@angular/cli/models/command-runner.ts
@@ -76,7 +76,9 @@ export async function runCommand(commandMap: CommandMap,
     return await runHelp(command, options);
   } else {
     verifyCommandInScope(command, executionScope);
-    verifyWorkspace(command, executionScope, context.project.root);
+    if (!command.allowMissingWorkspace) {
+      verifyWorkspace(command, executionScope, context.project.root);
+    }
     delete options.h;
     delete options.help;
     return await validateAndRunCommand(command, options);

diff --git a/packages/@angular/cli/models/command.ts b/packages/@angular/cli/models/command.ts
@@ -20,6 +20,7 @@ export enum ArgumentStrategy {
 
 export abstract class Command {
   protected _rawArgs: string[];
+  public allowMissingWorkspace = false;
 
   constructor(context: CommandContext, logger: logging.Logger) {
     this.logger = logger;

diff --git a/packages/@angular/cli/models/schematic-command.ts b/packages/@angular/cli/models/schematic-command.ts
@@ -299,8 +299,23 @@ export abstract class SchematicCommand extends Command {
     }
     const workspaceLoader = new WorkspaceLoader(this._host);
 
-    workspaceLoader.loadWorkspace().pipe(take(1))
-      .subscribe((workspace: experimental.workspace.Workspace) => this._workspace = workspace);
+    try {
+      workspaceLoader.loadWorkspace().pipe(take(1))
+        .subscribe(
+          (workspace: experimental.workspace.Workspace) => this._workspace = workspace,
+          (err: Error) => {
+            if (!this.allowMissingWorkspace) {
+              // Ignore missing workspace
+              throw err;
+            }
+          }
+        );
+    } catch (err) {
+      if (!this.allowMissingWorkspace) {
+        // Ignore missing workspace
+        throw err;
+      }
+    }
   }
 
   private readDefaults(collectionName: string, schematicName: string, options: any): any {