Skip to content

Commit

Permalink
feat(angular): upgrade to ~12.2.0 (#6836)
Browse files Browse the repository at this point in the history
* feat(angular): upgrade to ~12.2.0

* fix(angular): adjust nrwl/angular packageJson to pass depCheck

* fix(angular): add @angular/platform-server to migrations

Co-authored-by: Chau Tran <ctran@Chaus-MacBook-Pro.local>
  • Loading branch information
nartc and Chau Tran committed Aug 25, 2021
1 parent e412ff0 commit 5ff55ce
Show file tree
Hide file tree
Showing 7 changed files with 688 additions and 796 deletions.
40 changes: 20 additions & 20 deletions package.json
Expand Up @@ -26,26 +26,26 @@
"prepare": "is-ci || husky install"
},
"devDependencies": {
"@angular-devkit/architect": "~0.1201.0",
"@angular-devkit/build-angular": "~12.1.0",
"@angular-devkit/build-optimizer": "~0.1201.0",
"@angular-devkit/build-webpack": "~0.1201.0",
"@angular-devkit/core": "~12.1.0",
"@angular-devkit/schematics": "~12.1.0",
"@angular-devkit/architect": "~0.1202.0",
"@angular-devkit/build-angular": "~12.2.0",
"@angular-devkit/build-optimizer": "~0.1202.0",
"@angular-devkit/build-webpack": "~0.1202.0",
"@angular-devkit/core": "~12.2.0",
"@angular-devkit/schematics": "~12.2.0",
"@angular-eslint/eslint-plugin": "~12.3.0",
"@angular-eslint/eslint-plugin-template": "~12.3.0",
"@angular-eslint/template-parser": "~12.3.0",
"@angular/cli": "~12.1.0",
"@angular/common": "^12.1.0",
"@angular/compiler": "^12.1.0",
"@angular/compiler-cli": "^12.1.0",
"@angular/core": "^12.1.0",
"@angular/forms": "^12.1.0",
"@angular/platform-browser": "^12.1.0",
"@angular/platform-browser-dynamic": "^12.1.0",
"@angular/router": "^12.1.0",
"@angular/service-worker": "^12.1.0",
"@angular/upgrade": "^12.1.0",
"@angular/cli": "~12.2.0",
"@angular/common": "^12.2.0",
"@angular/compiler": "^12.2.0",
"@angular/compiler-cli": "^12.2.0",
"@angular/core": "^12.2.0",
"@angular/forms": "^12.2.0",
"@angular/platform-browser": "^12.2.0",
"@angular/platform-browser-dynamic": "^12.2.0",
"@angular/router": "^12.2.0",
"@angular/service-worker": "^12.2.0",
"@angular/upgrade": "^12.2.0",
"@babel/helper-create-regexp-features-plugin": "^7.14.5",
"@cypress/webpack-preprocessor": "4.1.5",
"@nestjs/common": "^7.0.0",
Expand Down Expand Up @@ -82,7 +82,7 @@
"@rollup/plugin-image": "^2.1.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^13.0.4",
"@schematics/angular": "~12.1.0",
"@schematics/angular": "~12.2.0",
"@storybook/addon-essentials": "~6.3.0",
"@storybook/addon-knobs": "~6.3.0",
"@storybook/angular": "~6.3.0",
Expand Down Expand Up @@ -161,7 +161,7 @@
"jasmine-spec-reporter": "~4.2.1",
"jest": "27.0.3",
"jest-circus": "27.0.6",
"jest-preset-angular": "9.0.3",
"jest-preset-angular": "9.0.7",
"jsonc-parser": "3.0.0",
"karma": "~4.0.0",
"karma-chrome-launcher": "~2.2.0",
Expand All @@ -180,7 +180,7 @@
"minimatch": "3.0.4",
"next": "11.0.1",
"next-sitemap": "^1.6.108",
"ng-packagr": "~12.1.0",
"ng-packagr": "~12.2.0",
"ngrx-store-freeze": "0.2.4",
"npm-run-all": "^4.1.5",
"open": "^7.4.2",
Expand Down
84 changes: 84 additions & 0 deletions packages/angular/migrations.json
Expand Up @@ -739,6 +739,90 @@
"12.8.0": {
"version": "12.8.0",
"packages": {
"@angular/cli": {
"version": "~12.2.0",
"alwaysAddToPackageJson": false
},
"@angular-devkit/build-angular": {
"version": "~12.2.0",
"alwaysAddToPackageJson": false
},
"@angular-devkit/build-optimizer": {
"version": "^0.1202.0",
"alwaysAddToPackageJson": false
},
"@angular/core": {
"version": "^12.2.0",
"alwaysAddToPackageJson": false
},
"@angular/common": {
"version": "^12.2.0",
"alwaysAddToPackageJson": false
},
"@angular/forms": {
"version": "^12.2.0",
"alwaysAddToPackageJson": false
},
"@angular/elements": {
"version": "^12.2.0",
"alwaysAddToPackageJson": false
},
"@angular/compiler": {
"version": "^12.2.0",
"alwaysAddToPackageJson": false
},
"@angular/compiler-cli": {
"version": "^12.2.0",
"alwaysAddToPackageJson": false
},
"@angular/platform-browser": {
"version": "^12.2.0",
"alwaysAddToPackageJson": false
},
"@angular/platform-browser-dynamic": {
"version": "^12.2.0",
"alwaysAddToPackageJson": false
},
"@angular/platform-server": {
"version": "^12.2.0",
"alwaysAddToPackageJson": false
},
"@angular/router": {
"version": "^12.2.0",
"alwaysAddToPackageJson": false
},
"@angular/upgrade": {
"version": "^12.2.0",
"alwaysAddToPackageJson": false
},
"@angular/language-service": {
"version": "^12.2.0",
"alwaysAddToPackageJson": false
},
"@angular/animations": {
"version": "^12.2.0",
"alwaysAddToPackageJson": false
},
"@angular/service-worker": {
"version": "^12.2.0",
"alwaysAddToPackageJson": false
},
"@angular/material": {
"version": "^12.2.0",
"alwaysAddToPackageJson": false
},
"jest-preset-angular": {
"version": "9.0.7",
"alwaysAddToPackageJson": false
},
"ng-packagr": {
"version": "~12.2.0",
"alwaysAddToPackageJson": false
},
"typescript": {
"version": "~4.3.5",
"alwaysAddToPackageJson": false
},
"@ngrx/store": {
"version": "~12.4.0",
"alwaysAddToPackageJson": false
Expand Down
4 changes: 2 additions & 2 deletions packages/angular/package.json
Expand Up @@ -33,13 +33,13 @@
"migrations": "./migrations.json"
},
"dependencies": {
"@angular-devkit/schematics": "~12.1.0",
"@angular-devkit/schematics": "~12.2.0",
"@nrwl/cypress": "*",
"@nrwl/devkit": "*",
"@nrwl/jest": "*",
"@nrwl/linter": "*",
"@nrwl/storybook": "*",
"@schematics/angular": "~12.1.0",
"@schematics/angular": "~12.2.0",
"@phenomnomnominal/tsquery": "4.1.1",
"ignore": "^5.0.4",
"jasmine-marbles": "~0.8.3",
Expand Down
6 changes: 3 additions & 3 deletions packages/angular/src/utils/versions.ts
@@ -1,8 +1,8 @@
export const nxVersion = '*';
export const angularVersion = '^12.1.0';
export const angularDevkitVersion = '~12.1.0';
export const angularVersion = '^12.2.0';
export const angularDevkitVersion = '~12.2.0';
export const angularJsVersion = '1.7.9';
export const ngrxVersion = '~12.4.0';
export const rxjsVersion = '~6.6.0';
export const jestPresetAngularVersion = '9.0.4';
export const jestPresetAngularVersion = '9.0.7';
export const angularEslintVersion = '~12.3.0';
2 changes: 1 addition & 1 deletion packages/linter/src/utils/versions.ts
Expand Up @@ -2,7 +2,7 @@ export const nxVersion = '*';

export const tslintVersion = '~6.1.0';
export const tslintToEslintConfigVersion = '^2.4.0';
export const buildAngularVersion = '~12.1.0';
export const buildAngularVersion = '~12.2.0';

export const typescriptESLintVersion = '~4.28.3';
export const eslintVersion = '7.22.0';
Expand Down
2 changes: 1 addition & 1 deletion packages/workspace/src/utils/versions.ts
@@ -1,6 +1,6 @@
export const nxVersion = '*';

export const angularCliVersion = '~12.1.0';
export const angularCliVersion = '~12.2.0';
export const typescriptVersion = '~4.3.5';
export const prettierVersion = '^2.3.1';
export const typescriptESLintVersion = '4.19.0';
Expand Down

1 comment on commit 5ff55ce

@vercel
Copy link

@vercel vercel bot commented on 5ff55ce Aug 25, 2021

Choose a reason for hiding this comment

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

Please sign in to comment.