Skip to content

Commit

Permalink
feat(angular): support angular v14.0.0-rc.3 (#10543)
Browse files Browse the repository at this point in the history
  • Loading branch information
@leosvelperez
leosvelperez committed Jun 1, 2022
1 parent 5ec5497 commit 26edb49
Show file tree
Hide file tree
Showing 11 changed files with 142 additions and 138 deletions.
32 changes: 16 additions & 16 deletions package.json
View file
Expand Up @@ -25,24 +25,24 @@
"prepare": "is-ci || husky install"
},
"devDependencies": {
"@angular-devkit/architect": "~0.1400.0-rc.2",
"@angular-devkit/build-angular": "~14.0.0-rc.2",
"@angular-devkit/core": "~14.0.0-rc.2",
"@angular-devkit/schematics": "~14.0.0-rc.2",
"@angular-devkit/architect": "~0.1400.0-rc.3",
"@angular-devkit/build-angular": "~14.0.0-rc.3",
"@angular-devkit/core": "~14.0.0-rc.3",
"@angular-devkit/schematics": "~14.0.0-rc.3",
"@angular-eslint/eslint-plugin": "~13.2.1",
"@angular-eslint/eslint-plugin-template": "~13.2.1",
"@angular-eslint/template-parser": "~13.2.1",
"@angular/cli": "~14.0.0-rc.2",
"@angular/common": "~14.0.0-rc.2",
"@angular/compiler": "~14.0.0-rc.2",
"@angular/compiler-cli": "~14.0.0-rc.2",
"@angular/core": "~14.0.0-rc.2",
"@angular/forms": "~14.0.0-rc.2",
"@angular/platform-browser": "~14.0.0-rc.2",
"@angular/platform-browser-dynamic": "~14.0.0-rc.2",
"@angular/router": "~14.0.0-rc.2",
"@angular/service-worker": "~14.0.0-rc.2",
"@angular/upgrade": "~14.0.0-rc.2",
"@angular/cli": "~14.0.0-rc.3",
"@angular/common": "~14.0.0-rc.3",
"@angular/compiler": "~14.0.0-rc.3",
"@angular/compiler-cli": "~14.0.0-rc.3",
"@angular/core": "~14.0.0-rc.3",
"@angular/forms": "~14.0.0-rc.3",
"@angular/platform-browser": "~14.0.0-rc.3",
"@angular/platform-browser-dynamic": "~14.0.0-rc.3",
"@angular/router": "~14.0.0-rc.3",
"@angular/service-worker": "~14.0.0-rc.3",
"@angular/upgrade": "~14.0.0-rc.3",
"@babel/helper-create-regexp-features-plugin": "^7.14.5",
"@cypress/webpack-preprocessor": "^5.9.1",
"@nestjs/common": "^8.0.0",
Expand Down Expand Up @@ -74,7 +74,7 @@
"@rollup/plugin-image": "^2.1.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^13.0.4",
"@schematics/angular": "~14.0.0-rc.2",
"@schematics/angular": "~14.0.0-rc.3",
"@storybook/addon-essentials": "~6.5.4",
"@storybook/addon-knobs": "~6.3.0",
"@storybook/angular": "~6.5.4",
Expand Down
48 changes: 24 additions & 24 deletions packages/angular/migrations.json
View file
Expand Up @@ -1119,95 +1119,95 @@
}
}
},
"14.2.0-beta.1": {
"version": "14.2.0-beta.1",
"14.2.0-beta.4": {
"version": "14.2.0-beta.4",
"packages": {
"@angular-devkit/architect": {
"version": "~0.1400.0-rc.2",
"version": "~0.1400.0-rc.3",
"alwaysAddToPackageJson": false
},
"@angular-devkit/build-angular": {
"version": "~14.0.0-rc.2",
"version": "~14.0.0-rc.3",
"alwaysAddToPackageJson": false
},
"@angular-devkit/build-webpack": {
"version": "~0.1400.0-rc.2",
"version": "~0.1400.0-rc.3",
"alwaysAddToPackageJson": false
},
"@angular-devkit/core": {
"version": "~14.0.0-rc.2",
"version": "~14.0.0-rc.3",
"alwaysAddToPackageJson": false
},
"@angular-devkit/schematics": {
"version": "~14.0.0-rc.2",
"version": "~14.0.0-rc.3",
"alwaysAddToPackageJson": false
},
"@angular/core": {
"version": "~14.0.0-rc.2",
"version": "~14.0.0-rc.3",
"alwaysAddToPackageJson": true
},
"@angular/common": {
"version": "~14.0.0-rc.2",
"version": "~14.0.0-rc.3",
"alwaysAddToPackageJson": false
},
"@angular/forms": {
"version": "~14.0.0-rc.2",
"version": "~14.0.0-rc.3",
"alwaysAddToPackageJson": false
},
"@angular/elements": {
"version": "~14.0.0-rc.2",
"version": "~14.0.0-rc.3",
"alwaysAddToPackageJson": false
},
"@angular/compiler": {
"version": "~14.0.0-rc.2",
"version": "~14.0.0-rc.3",
"alwaysAddToPackageJson": false
},
"@angular/compiler-cli": {
"version": "~14.0.0-rc.2",
"version": "~14.0.0-rc.3",
"alwaysAddToPackageJson": false
},
"@angular/localize": {
"version": "~14.0.0-rc.2",
"version": "~14.0.0-rc.3",
"alwaysAddToPackageJson": false
},
"@angular/platform-browser": {
"version": "~14.0.0-rc.2",
"version": "~14.0.0-rc.3",
"alwaysAddToPackageJson": false
},
"@angular/platform-browser-dynamic": {
"version": "~14.0.0-rc.2",
"version": "~14.0.0-rc.3",
"alwaysAddToPackageJson": false
},
"@angular/platform-server": {
"version": "~14.0.0-rc.2",
"version": "~14.0.0-rc.3",
"alwaysAddToPackageJson": false
},
"@angular/router": {
"version": "~14.0.0-rc.2",
"version": "~14.0.0-rc.3",
"alwaysAddToPackageJson": false
},
"@angular/upgrade": {
"version": "~14.0.0-rc.2",
"version": "~14.0.0-rc.3",
"alwaysAddToPackageJson": false
},
"@angular/language-service": {
"version": "~14.0.0-rc.2",
"version": "~14.0.0-rc.3",
"alwaysAddToPackageJson": false
},
"@angular/animations": {
"version": "~14.0.0-rc.2",
"version": "~14.0.0-rc.3",
"alwaysAddToPackageJson": false
},
"@angular/service-worker": {
"version": "~14.0.0-rc.2",
"version": "~14.0.0-rc.3",
"alwaysAddToPackageJson": false
},
"@angular/material": {
"version": "~14.0.0-rc.1",
"version": "~14.0.0-rc.2",
"alwaysAddToPackageJson": false
},
"@angular/cdk": {
"version": "~14.0.0-rc.1",
"version": "~14.0.0-rc.2",
"alwaysAddToPackageJson": false
},
"ng-packagr": {
Expand Down
4 changes: 2 additions & 2 deletions packages/angular/package.json
View file
Expand Up @@ -37,15 +37,15 @@
"migrations": "./migrations.json"
},
"dependencies": {
"@angular-devkit/schematics": "~14.0.0-rc.2",
"@angular-devkit/schematics": "~14.0.0-rc.3",
"@nrwl/cypress": "file:../cypress",
"@nrwl/devkit": "file:../devkit",
"@nrwl/jest": "file:../jest",
"@nrwl/linter": "file:../linter",
"@nrwl/storybook": "file:../storybook",
"@nrwl/workspace": "file:../workspace",
"@phenomnomnominal/tsquery": "4.1.1",
"@schematics/angular": "~14.0.0-rc.2",
"@schematics/angular": "~14.0.0-rc.3",
"chalk": "4.1.0",
"chokidar": "^3.5.1",
"http-server": "^14.1.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/angular/src/migrations/update-14-2-0/update-angular-cli.spec.ts
View file
Expand Up @@ -17,7 +17,7 @@ describe('update-angular-cli migration', () => {
await updateAngularCli(tree);

const { devDependencies } = readJson(tree, 'package.json');
expect(devDependencies['@angular/cli']).toEqual('~14.0.0-rc.2');
expect(devDependencies['@angular/cli']).toEqual('~14.0.0-rc.3');
});

it('should update @angular/cli version when defined as a dependency', async () => {
Expand All @@ -28,7 +28,7 @@ describe('update-angular-cli migration', () => {
await updateAngularCli(tree);

const { dependencies } = readJson(tree, 'package.json');
expect(dependencies['@angular/cli']).toEqual('~14.0.0-rc.2');
expect(dependencies['@angular/cli']).toEqual('~14.0.0-rc.3');
});

it('should add @angular/cli to package.json when it is not set', async () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/angular/src/migrations/update-14-2-0/update-angular-cli.ts
View file
Expand Up @@ -5,10 +5,10 @@ export default async function (tree: Tree) {

updateJson(tree, 'package.json', (json) => {
if (json.devDependencies?.['@angular/cli']) {
json.devDependencies['@angular/cli'] = '~14.0.0-rc.2';
json.devDependencies['@angular/cli'] = '~14.0.0-rc.3';
shouldFormat = true;
} else if (json.dependencies?.['@angular/cli']) {
json.dependencies['@angular/cli'] = '~14.0.0-rc.2';
json.dependencies['@angular/cli'] = '~14.0.0-rc.3';
shouldFormat = true;
}

Expand Down
4 changes: 2 additions & 2 deletions packages/angular/src/utils/versions.ts
View file
@@ -1,6 +1,6 @@
export const nxVersion = require('../../package.json').version;
export const angularVersion = '~14.0.0-rc.2';
export const angularDevkitVersion = '~14.0.0-rc.2';
export const angularVersion = '~14.0.0-rc.3';
export const angularDevkitVersion = '~14.0.0-rc.3';
export const ngPackagrVersion = '~14.0.0-rc.0';
export const angularJsVersion = '1.7.9';
export const ngrxVersion = '~13.2.0';
Expand Down
2 changes: 1 addition & 1 deletion packages/linter/src/utils/versions.ts
View file
Expand Up @@ -2,7 +2,7 @@ export const nxVersion = require('../../package.json').version;

export const tslintVersion = '~6.1.0';
export const tslintToEslintConfigVersion = '^2.4.0';
export const buildAngularVersion = '~14.0.0-rc.2';
export const buildAngularVersion = '~14.0.0-rc.3';

export const typescriptESLintVersion = '~5.24.0';
export const eslintVersion = '~8.15.0';
Expand Down
8 changes: 6 additions & 2 deletions packages/make-angular-cli-faster/src/utilities/migration.ts
View file
Expand Up @@ -20,7 +20,8 @@ const latestVersionWithOldFlag = '13.8.3';
// versions and the max version of the range if there's a bigger major version that
// is already supported
const nxAngularVersionMap: Record<number, { range: string; max?: string }> = {
13: { range: '>= 13.2.0' },
13: { range: '>= 13.2.0 < 14.2.0', max: '^13.10.0' },
14: { range: '>= 14.2.0-beta.4' },
};
// latest major version of Angular that is compatible with Nx, based on the map above
const latestCompatibleAngularMajorVersion = Math.max(
Expand Down Expand Up @@ -147,7 +148,10 @@ async function getNxVersionBasedOnInstalledAngularVersion(
}
if (nxAngularVersionMap[majorAngularVersion]?.max) {
// use the max of the range
return nxAngularVersionMap[majorAngularVersion].max;
return await resolvePackageVersion(
'@nrwl/angular',
nxAngularVersionMap[majorAngularVersion].max
);
}
if (majorAngularVersion > latestCompatibleAngularMajorVersion) {
// installed Angular version is not supported yet, we can't @nrwl/angular:ng-add,
Expand Down
2 changes: 1 addition & 1 deletion packages/nx/src/utils/versions.ts
View file
@@ -1,6 +1,6 @@
export const nxVersion = require('../../package.json').version;

export const angularCliVersion = '~14.0.0-rc.2';
export const angularCliVersion = '~14.0.0-rc.3';
export const typescriptVersion = '~4.6.2';
export const prettierVersion = '^2.5.1';
export const tslintVersion = '~6.1.0';
Expand Down
2 changes: 1 addition & 1 deletion packages/workspace/src/utils/versions.ts
View file
@@ -1,6 +1,6 @@
export const nxVersion = require('../../package.json').version;

export const angularCliVersion = '~14.0.0-rc.2';
export const angularCliVersion = '~14.0.0-rc.3';
export const typescriptVersion = '~4.6.2';
export const prettierVersion = '^2.5.1';
export const tslintVersion = '~6.1.0';
Expand Down

1 comment on commit 26edb49

@vercel
Copy link

@vercel vercel bot commented on 26edb49 Jun 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

nx-dev – ./

nx-dev-git-master-nrwl.vercel.app
nx-five.vercel.app
nx-dev-nrwl.vercel.app
nx.dev

Please sign in to comment.