Skip to content

Commit 31c1e0d

Browse files
authored
Merge pull request #601 from aspnetboilerplate/pr/6169
Upgrade to Angular version 12
2 parents 93c4d7d + 539d9e7 commit 31c1e0d

File tree

7 files changed

+3402
-4532
lines changed

7 files changed

+3402
-4532
lines changed

angular/angular.json

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"build": {
1212
"builder": "@angular-devkit/build-angular:browser",
1313
"options": {
14-
"aot": true,
1514
"outputPath": "dist",
1615
"index": "src/index.html",
1716
"main": "src/main.ts",
@@ -49,7 +48,13 @@
4948
"src/assets/abp-web-resources/abp.sweet-alert.js",
5049
"src/assets/abp-web-resources/abp.freeze-ui.js",
5150
"node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.moment.js"
52-
]
51+
],
52+
"vendorChunk": true,
53+
"extractLicenses": false,
54+
"buildOptimizer": false,
55+
"sourceMap": true,
56+
"optimization": false,
57+
"namedChunks": true
5358
},
5459
"configurations": {
5560
"production": {
@@ -63,7 +68,6 @@
6368
"outputHashing": "all",
6469
"sourceMap": false,
6570
"namedChunks": false,
66-
"aot": true,
6771
"extractLicenses": true,
6872
"vendorChunk": false,
6973
"buildOptimizer": true,
@@ -88,7 +92,8 @@
8892
}
8993
]
9094
}
91-
}
95+
},
96+
"defaultConfiguration": ""
9297
},
9398
"serve": {
9499
"builder": "@angular-devkit/build-angular:dev-server",

angular/e2e/tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"compileOnSave": false,
33
"compilerOptions": {
44
"declaration": false,
5-
"emitDecoratorMetadata": true,
65
"experimentalDecorators": true,
76
"lib": [
87
"es2016"

angular/package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
"test": "ng test"
1414
},
1515
"dependencies": {
16-
"@angular/animations": "^11.0.2",
17-
"@angular/common": "^11.0.2",
18-
"@angular/compiler": "^11.0.2",
19-
"@angular/core": "^11.0.2",
20-
"@angular/forms": "^11.0.2",
21-
"@angular/platform-browser": "^11.0.2",
22-
"@angular/platform-browser-dynamic": "^11.0.2",
23-
"@angular/router": "^11.0.2",
16+
"@angular/animations": "^12.0.5",
17+
"@angular/common": "^12.0.5",
18+
"@angular/compiler": "^12.0.5",
19+
"@angular/core": "^12.0.5",
20+
"@angular/forms": "^12.0.5",
21+
"@angular/platform-browser": "^12.0.5",
22+
"@angular/platform-browser-dynamic": "^12.0.5",
23+
"@angular/router": "^12.0.5",
2424
"@aspnet/signalr": "^1.1.4",
2525
"@fortawesome/fontawesome-free": "^5.15.3",
2626
"abp-ng2-module": "^6.2.0",
@@ -30,7 +30,7 @@
3030
"famfamfam-flags": "^1.0.0",
3131
"lodash-es": "^4.17.15",
3232
"moment": "2.24.0",
33-
"moment-timezone": "^0.5.28",
33+
"moment-timezone": "0.5.33",
3434
"ngx-bootstrap": "^5.6.1",
3535
"ngx-pagination": "^5.0.0",
3636
"push.js": "1.0.12",
@@ -39,21 +39,21 @@
3939
"ts-helpers": "^1.1.2",
4040
"tslib": "^2.0.0",
4141
"web-animations-js": "^2.3.2",
42-
"zone.js": "~0.10.2"
42+
"zone.js": "~0.11.4"
4343
},
4444
"devDependencies": {
45-
"@angular-devkit/build-angular": "~0.1100.2",
46-
"@angular/cli": "^11.0.2",
47-
"@angular/compiler-cli": "^11.0.2",
45+
"@angular-devkit/build-angular": "~12.0.5",
46+
"@angular/cli": "^12.0.5",
47+
"@angular/compiler-cli": "^12.0.5",
4848
"@angularclass/hmr": "^2.1.3",
4949
"@types/jasmine": "~3.6.0",
5050
"@types/lodash-es": "^4.17.3",
51-
"@types/moment-timezone": "^0.5.12",
51+
"@types/moment-timezone": "^0.5.30",
5252
"@types/node": "^13.13.4",
5353
"codelyzer": "^6.0.0",
5454
"jasmine-core": "~3.6.0",
5555
"jasmine-spec-reporter": "~5.0.0",
56-
"karma": "~5.1.1",
56+
"karma": "~6.3.4",
5757
"karma-chrome-launcher": "~3.1.0",
5858
"karma-cli": "^2.0.0",
5959
"karma-coverage-istanbul-reporter": "~3.0.2",
@@ -63,7 +63,7 @@
6363
"protractor": "~7.0.0",
6464
"ts-node": "^8.10.1",
6565
"tslint": "~6.1.0",
66-
"typescript": "4.0.5",
66+
"typescript": "4.2.4",
6767
"webpack-bundle-analyzer": "^3.7.0"
6868
},
6969
"angular-cli": {}

angular/src/app-initializer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Injectable, Injector } from '@angular/core';
22
import { PlatformLocation, registerLocaleData } from '@angular/common';
33
import { HttpClient } from '@angular/common/http';
4-
import * as moment from 'moment';
4+
import * as moment from 'moment-timezone';
55
import { filter as _filter, merge as _merge } from 'lodash-es';
66
import { AppConsts } from '@shared/AppConsts';
77
import { AppSessionService } from '@shared/session/app-session.service';

angular/src/polyfills.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ import 'core-js/es/string';
1616
import 'core-js/es/symbol';
1717
import 'core-js/es/reflect';
1818
import { finalize } from 'rxjs/operators';
19-
import 'zone.js/dist/zone';
19+
import 'zone.js';

angular/src/tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"compilerOptions": {
33
"declaration": false,
44
"downlevelIteration": true,
5-
"emitDecoratorMetadata": true,
65
"experimentalDecorators": true,
76
"lib": [ "es6", "dom" ],
87
"mapRoot": "./",

0 commit comments

Comments
 (0)