Skip to content

fix(@angular/cli): during an update only use package manager force option with npm 7+ #23500

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.

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
merged 1 commit into from
Jul 6, 2022
Merged
Changes from all commits
Commits
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
53 changes: 30 additions & 23 deletions packages/angular/cli/src/commands/update/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,7 @@ export class UpdateCommandModule extends CommandModule<UpdateCommandArgs> {
array: true,
})
.option('force', {
description:
'Ignore peer dependency version mismatches. ' +
`Passes the '--force' flag to the package manager when installing packages.`,
description: 'Ignore peer dependency version mismatches.',
type: 'boolean',
default: false,
})
Expand Down Expand Up @@ -227,7 +225,7 @@ export class UpdateCommandModule extends CommandModule<UpdateCommandArgs> {

const workflow = new NodeWorkflow(this.context.root, {
packageManager: packageManager.name,
packageManagerForce: options.force,
packageManagerForce: this.packageManagerForce(options.verbose),
// __dirname -> favor @schematics/update from this package
// Otherwise, use packages from the active workspace (migrations)
resolvePaths: [__dirname, this.context.root],
Expand Down Expand Up @@ -693,26 +691,8 @@ export class UpdateCommandModule extends CommandModule<UpdateCommandArgs> {
});
} catch {}

let forceInstall = false;
// npm 7+ can fail due to it incorrectly resolving peer dependencies that have valid SemVer
// ranges during an update. Update will set correct versions of dependencies within the
// package.json file. The force option is set to workaround these errors.
// Example error:
// npm ERR! Conflicting peer dependency: @angular/[email protected]
// npm ERR! node_modules/@angular/compiler-cli
// npm ERR! peer @angular/compiler-cli@"^14.0.0 || ^14.0.0-rc" from @angular-devkit/[email protected]
// npm ERR! node_modules/@angular-devkit/build-angular
// npm ERR! dev @angular-devkit/build-angular@"~14.0.0-rc.0" from the root project
if (
this.context.packageManager.name === PackageManager.Npm &&
this.context.packageManager.version &&
semver.gte(this.context.packageManager.version, '7.0.0', { includePrerelease: true })
) {
logVerbose('NPM 7+ detected -- enabling force option for package installation');
forceInstall = true;
}
const installationSuccess = await this.context.packageManager.installAll(
forceInstall ? ['--force'] : [],
this.packageManagerForce(options.verbose) ? ['--force'] : [],
this.context.root,
);

Expand Down Expand Up @@ -992,6 +972,33 @@ export class UpdateCommandModule extends CommandModule<UpdateCommandArgs> {

return status ?? 0;
}

private packageManagerForce(verbose: boolean): boolean {
// npm 7+ can fail due to it incorrectly resolving peer dependencies that have valid SemVer
// ranges during an update. Update will set correct versions of dependencies within the
// package.json file. The force option is set to workaround these errors.
// Example error:
// npm ERR! Conflicting peer dependency: @angular/[email protected]
// npm ERR! node_modules/@angular/compiler-cli
// npm ERR! peer @angular/compiler-cli@"^14.0.0 || ^14.0.0-rc" from @angular-devkit/[email protected]
// npm ERR! node_modules/@angular-devkit/build-angular
// npm ERR! dev @angular-devkit/build-angular@"~14.0.0-rc.0" from the root project
if (
this.context.packageManager.name === PackageManager.Npm &&
this.context.packageManager.version &&
semver.gte(this.context.packageManager.version, '7.0.0', { includePrerelease: true })
) {
if (verbose) {
this.context.logger.info(
'NPM 7+ detected -- enabling force option for package installation',
);
}

return true;
}

return false;
}
}

/**
Expand Down