Skip to content

Backport fixes to make 14.2.x branch green #24257

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
merged 3 commits into from
Nov 17, 2022
Merged

Backport fixes to make 14.2.x branch green #24257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fd5196
fix(@angular/cli): exclude `@angular/material@7.x` from ng add packag…
clydin Oct 25, 2022
e0e25cc
fix(@angular/cli): exclude `@angular/localize@<10.0.0` from ng add pa…
alan-agius4 Oct 27, 2022
ab6bb1d
test(@angular/cli): fix version specifier test
alan-agius4 Nov 17, 2022
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
15 changes: 10 additions & 5 deletions packages/angular/cli/src/commands/add/cli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { analytics, tags } from '@angular-devkit/core';
import { NodePackageDoesNotSupportSchematics } from '@angular-devkit/schematics/tools';
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 { isPackageNameSafeForAnalytics } from '../../analytics/analytics';
Expand Down Expand Up @@ -47,9 +47,11 @@ 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',
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',
};

export class AddCommandModule
Expand Down Expand Up @@ -187,7 +189,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
5 changes: 0 additions & 5 deletions tests/legacy-cli/e2e/tests/commands/add/version-specifier.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@ export default async function () {
throw new Error('Installation was not skipped');
}

const output2 = await ng('add', '@angular/localize@latest', '--skip-confirmation');
if (output2.stdout.includes('Skipping installation: Package already installed')) {
throw new Error('Installation should not have been skipped');
}

// v12.2.0 has a package.json engine field that supports Node.js v16+
const output3 = await ng('add', '@angular/localize@12.2.0', '--skip-confirmation');
if (output3.stdout.includes('Skipping installation: Package already installed')) {
Expand Down