Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-22 15:02:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(@angular/cli): show the ng update message even on ng update

Browse Source 
All commands that allow a missing workspace will show the message if the
angular workspace isnt up to date. It will not stop the process though.

Fix #10250
This commit is contained in:
Hans Larsen 2018-04-18 14:35:15 -06:00 committed by Hans
parent 2b24391722
commit 08623d5fe7
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packages/@angular/cli/models/command-runner.ts
View File

@ -129,9 +129,12 @@ export async function runCommand(commandMap: CommandMap,
return await runHelp(command, options); return await runHelp(command, options);
} else { } else {
verifyCommandInScope(command, executionScope); verifyCommandInScope(command, executionScope);
if (!command.allowMissingWorkspace) { verifyWorkspace(
verifyWorkspace(command, executionScope, context.project.root); command,
} executionScope,
context.project.root,
command.allowMissingWorkspace ? logger : null,
);
delete options.h; delete options.h;
delete options.help; delete options.help;
return await validateAndRunCommand(command, options); return await validateAndRunCommand(command, options);
@ -286,7 +289,12 @@ function verifyCommandInScope(command: Command, scope = CommandScope.everywhere)
} }
} }
function verifyWorkspace(command: Command, executionScope: CommandScope, root: string): void { function verifyWorkspace(
command: Command,
executionScope: CommandScope,
root: string,
logger: logging.Logger | null = null,
): void {
if (command.scope === CommandScope.everywhere) { if (command.scope === CommandScope.everywhere) {
return; return;
} }
@ -312,12 +320,19 @@ function verifyWorkspace(command: Command, executionScope: CommandScope, root: s
// ------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------
// If changing this message, please update the same message in // If changing this message, please update the same message in
// `packages/@angular/cli/bin/ng-update-message.js` // `packages/@angular/cli/bin/ng-update-message.js`
throw new SilentError(tags.stripIndent` const message = tags.stripIndent`
The Angular CLI configuration format has been changed, and your existing configuration can The Angular CLI configuration format has been changed, and your existing configuration can
be updated automatically by running the following command: be updated automatically by running the following command:
ng update @angular/cli --migrate-only --from=1 ng update @angular/cli --migrate-only --from=1
`); `;
if (!logger) {
throw new SilentError(message);
} else {
logger.warn(message);
return;
}
} }
// If no configuration file is found (old or new), throw an exception. // If no configuration file is found (old or new), throw an exception.