Skip to content

Commit

Permalink
Merge pull request #5567 from abpframework/feat/5389
Browse files Browse the repository at this point in the history
Upgraded the Angular packages of the templates to the v10.1.2
  • Loading branch information
mehmet-erim authored Sep 23, 2020
2 parents 1285726 + a467f35 commit e80e7cf
Show file tree
Hide file tree
Showing 25 changed files with 5,178 additions and 4,878 deletions.
2 changes: 1 addition & 1 deletion npm/ng-packs/apps/dev-app/tsconfig.dev.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/app",
"types": []
Expand Down
2 changes: 1 addition & 1 deletion npm/ng-packs/apps/dev-app/tsconfig.spec.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/spec",
"types": ["node", "jest"]
Expand Down
40 changes: 18 additions & 22 deletions npm/ng-packs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"ci:test": "ng test --coverage=false --silent",
"ci:build": "cd scripts && yarn install && yarn build:prod",
"lerna": "lerna",
"compile:ivy": "yarn ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points --tsconfig './tsconfig.prod.json' --source node_modules --async false",
"compile:ivy": "yarn ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points --tsconfig './tsconfig.prod.json' --source node_modules",
"postinstall": "npm run compile:ivy"
},
"devDependencies": {
Expand All @@ -37,21 +37,21 @@
"@abp/ng.theme.shared": "~3.2.0-rc.2",
"@abp/utils": "^3.2.0-rc.2",
"@angular-builders/jest": "^10.0.0",
"@angular-devkit/build-angular": "~0.1000.6",
"@angular-devkit/build-ng-packagr": "~0.1000.6",
"@angular-devkit/build-angular": "~0.1001.2",
"@angular-devkit/build-ng-packagr": "~0.1001.2",
"@angular-devkit/schematics-cli": "^0.1001.1",
"@angular/animations": "~10.0.10",
"@angular/cli": "~10.0.6",
"@angular/common": "~10.0.10",
"@angular/compiler": "10.0.0",
"@angular/compiler-cli": "10.0.0",
"@angular/core": "~10.0.10",
"@angular/forms": "~10.0.10",
"@angular/language-service": "~10.0.10",
"@angular/localize": "~10.0.10",
"@angular/platform-browser": "~10.0.10",
"@angular/platform-browser-dynamic": "~10.0.10",
"@angular/router": "~10.0.10",
"@angular/animations": "~10.1.2",
"@angular/cli": "~10.1.2",
"@angular/common": "~10.1.2",
"@angular/compiler": "10.1.2",
"@angular/compiler-cli": "10.1.2",
"@angular/core": "~10.1.2",
"@angular/forms": "~10.1.2",
"@angular/language-service": "~10.1.2",
"@angular/localize": "~10.1.2",
"@angular/platform-browser": "~10.1.2",
"@angular/platform-browser-dynamic": "~10.1.2",
"@angular/router": "~10.1.2",
"@fortawesome/fontawesome-free": "^5.14.0",
"@ng-bootstrap/ng-bootstrap": "^7.0.0",
"@ngneat/spectator": "^5.13.0",
Expand All @@ -68,7 +68,7 @@
"angular-oauth2-oidc": "^10.0.3",
"bootstrap": "^4.5.0",
"chart.js": "^2.9.3",
"codelyzer": "^5.1.2",
"codelyzer": "^6.0.0",
"conventional-changelog-cli": "^2.0.31",
"cz-conventional-changelog": "3.0.2",
"font-awesome": "^4.7.0",
Expand All @@ -91,18 +91,14 @@
"symlink-manager": "^1.5.0",
"ts-node": "~7.0.0",
"ts-toolbelt": "6.15.4",
"tsickle": "^0.38.1",
"tsickle": "^0.39.1",
"tslint": "~6.1.0",
"typescript": "~3.9.5",
"typescript": "~4.0.3",
"zone.js": "~0.10.2"
},
"dependencies": {
"tslib": "^2.0.0"
},
"resolutions": {
"@angular/compiler": "10.0.0",
"@angular/compiler-cli": "10.0.0"
},
"config": {
"commitizen": {
"path": "cz-conventional-changelog"
Expand Down
1 change: 0 additions & 1 deletion npm/ng-packs/packages/account/src/lib/models/user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ export interface RegisterResponse {
emailConfirmed: boolean;
phoneNumber: string;
phoneNumberConfirmed: boolean;
twoFactorEnabled: boolean;
lockoutEnabled: boolean;
lockoutEnd: string;
concurrencyStamp: string;
Expand Down
Loading

0 comments on commit e80e7cf

Please sign in to comment.