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

refactor(@schematics/angular): improve automatic versions

Browse Source 
With this change we improve the versions we set in the users project to be less confusing.  Previously, for both stable and next versions we set the versions of Angular packages to the below;

```
"@angular/animations": "~12.2.0-"
```

This might be problematic as one might not immediately notice that they might depend on a prerelease. The `-` is short character and can be missed when having a large set of dependencies.

With this can we are more explicate by adding `--next` when it's a prerelease and omit the suffix for stable releases.
This commit is contained in:
Alan Agius 2021-07-22 18:41:19 +02:00 committed by Charles
parent 734e396b14
commit c92a381710
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/schematics/angular/utility/latest-versions.ts
View File

@ -7,15 +7,15 @@
*/ */
/** Retrieve the minor version for the provided version string. */ /** Retrieve the minor version for the provided version string. */
function getEarliestMinorVersion(version: string) { function getAngularEarliestMinorVersion(version: string): string {
const versionMatching = version.match(/^(\d+)\.(\d+)\.*/); const versionMatching = version.match(/^(\d+)\.(\d+)\.\d+(-\w+)?/);
if (versionMatching === null) { if (versionMatching === null) {
throw Error('Unable to determine the minor version for the provided version'); throw Error('Unable to determine the minor version for the provided version');
} }
const [_, major, minor] = versionMatching; const [_, major, minor, prerelease = ''] = versionMatching;
return `${major}.${minor}.0`; return `~${major}.${minor}.0${prerelease}`;
} }
export const latestVersions: Record<string, string> & { export const latestVersions: Record<string, string> & {
@ -27,9 +27,7 @@ export const latestVersions: Record<string, string> & {
...require('./latest-versions/package.json')['dependencies'], ...require('./latest-versions/package.json')['dependencies'],
// As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
// Angular CLI minor version with earliest prerelease (appended with `-`) will match the latest Angular: getAngularEarliestMinorVersion(require('../package.json')['version']),
// Angular Framework minor.
Angular: `~${getEarliestMinorVersion(require('../package.json')['version'])}-`,
// Since @angular-devkit/build-angular and @schematics/angular are always // Since @angular-devkit/build-angular and @schematics/angular are always
// published together from the same monorepo, and they are both // published together from the same monorepo, and they are both