Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hansl merged 1 commit into from
Apr 24, 2018
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions packages/@angular/cli/models/command-runner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,12 @@ export async function runCommand(commandMap: CommandMap,
return await runHelp(command, options);
} else {
verifyCommandInScope(command, executionScope);
if (!command.allowMissingWorkspace) {
verifyWorkspace(command, executionScope, context.project.root);
}
verifyWorkspace(
command,
executionScope,
context.project.root,
command.allowMissingWorkspace ? logger : null,
);
delete options.h;
delete options.help;
return await validateAndRunCommand(command, options);
Expand Down Expand Up @@ -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) {
return;
}
Expand All @@ -312,12 +320,19 @@ function verifyWorkspace(command: Command, executionScope: CommandScope, root: s
// ------------------------------------------------------------------------------------------
// If changing this message, please update the same message in
// `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
be updated automatically by running the following command:

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.
Expand Down