Skip to content
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

Jump to bottom

fix(@angular/cli): exclude @angular/localize@<10.0.0 from ng add pa… #24152

Merged
merged 2 commits into from Oct 27, 2022
Merged

fix(@angular/cli): exclude @angular/localize@<10.0.0 from ng add pa… #24152

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79dc44e
fix(@angular/cli): exclude `@angular/localize@<10.0.0` from ng add pa…
alan-agius4 Oct 27, 2022
5d6c45b
fixup! fix(@angular/cli): exclude `@angular/localize@<10.0.0` from ng…
alan-agius4 Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 9 additions & 6 deletions packages/angular/cli/src/commands/add/cli.ts
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ import { NodePackageDoesNotSupportSchematics } from '@angular-devkit/schematics/
import { createRequire } from 'module';
import npa from 'npm-package-arg';
import { dirname, join } from 'path';
import { compare, intersects, prerelease, satisfies, valid } from 'semver';
import { Range, compare, intersects, prerelease, satisfies, valid } from 'semver';
import { Argv } from 'yargs';
import { PackageManager } from '../../../lib/config/workspace-schema';
import {
Expand Down Expand Up @@ -48,10 +48,10 @@ interface AddCommandArgs extends SchematicsCommandArgs {
* when attempting to find a compatible version for a package.
* The key is a package name and the value is a SemVer range of versions to exclude.
*/
const packageVersionExclusions: Record<string, string | undefined> = {
// @angular/localize@9.x versions do not have peer dependencies setup
'@angular/localize': '9.x',
// @angular/material@7.x versions have unbounded peer dependency ranges (>=7.0.0)
const packageVersionExclusions: Record<string, string | Range> = {
// @angular/localize@9.x and earlier versions as well as @angular/localize@10.0 prereleases do not have peer dependencies setup.
'@angular/localize': '<10.0.0',
// @angular/material@7.x versions have unbounded peer dependency ranges (>=7.0.0).
'@angular/material': '7.x',
};

Expand Down Expand Up @@ -195,7 +195,10 @@ export class AddCommandModule
return false;
}
// Excluded package versions should not be considered
if (versionExclusions && satisfies(value.version, versionExclusions)) {
if (
versionExclusions &&
satisfies(value.version, versionExclusions, { includePrerelease: true })
) {
return false;
}

Expand Down