Skip to content

Commit e5bfd2e

Browse files
committed
chore: update to Angular 10 and TypeScript 3.9
1 parent 6cd7a01 commit e5bfd2e

File tree

5 files changed

+53
-54
lines changed

5 files changed

+53
-54
lines changed

angular.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@
3131
"./node_modules"
3232
]
3333
},
34-
"scripts": [
35-
"node_modules/chart.js/dist/Chart.min.js"
34+
"scripts": [],
35+
"allowedCommonJsDependencies": [
36+
"chart.js",
37+
"classnames"
3638
]
3739
},
3840
"configurations": {
@@ -85,10 +87,9 @@
8587
"karmaConfig": "./karma.conf.js",
8688
"polyfills": "src/polyfills.ts",
8789
"tsConfig": "src/tsconfig.spec.json",
88-
"scripts": [
89-
"node_modules/chart.js/dist/Chart.min.js"
90-
],
90+
"scripts": [],
9191
"styles": [
92+
"node_modules/@coreui/icons/css/free.css",
9293
"node_modules/flag-icon-css/css/flag-icon.css",
9394
"node_modules/font-awesome/css/font-awesome.css",
9495
"node_modules/simple-line-icons/dist/styles/simple-line-icons.css",
@@ -149,7 +150,7 @@
149150
"schematics": {
150151
"@schematics/angular:component": {
151152
"prefix": "app",
152-
"styleext": "scss"
153+
"style": "scss"
153154
},
154155
"@schematics/angular:directive": {
155156
"prefix": "app"

package.json

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -28,56 +28,58 @@
2828
},
2929
"private": true,
3030
"dependencies": {
31-
"@angular/animations": "^9.1.13",
32-
"@angular/cdk": "^9.2.4",
33-
"@angular/common": "^9.1.13",
34-
"@angular/compiler": "^9.1.13",
35-
"@angular/core": "^9.1.13",
36-
"@angular/forms": "^9.1.13",
37-
"@angular/platform-browser": "^9.1.13",
38-
"@angular/platform-browser-dynamic": "^9.1.13",
39-
"@angular/router": "^9.1.13",
40-
"@coreui/angular": "~2.9.6",
31+
"@angular/animations": "^10.2.4",
32+
"@angular/cdk": "^10.2.7",
33+
"@angular/common": "^10.2.4",
34+
"@angular/compiler": "^10.2.4",
35+
"@angular/core": "^10.2.4",
36+
"@angular/forms": "^10.2.4",
37+
"@angular/localize": "^10.2.4",
38+
"@angular/platform-browser": "^10.2.4",
39+
"@angular/platform-browser-dynamic": "^10.2.4",
40+
"@angular/router": "^10.2.4",
41+
"@coreui/angular": "~2.10.0",
4142
"@coreui/coreui": "^2.1.16",
4243
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.3.1",
4344
"@coreui/icons": "^2.0.0-rc.0",
4445
"@coreui/icons-angular": "1.0.0-alpha.3",
4546
"bootstrap": "^4.5.3",
4647
"chart.js": "^2.9.4",
48+
"classlist.js": "^1.1.20150312",
4749
"core-js": "^3.8.2",
4850
"flag-icon-css": "^3.5.0",
4951
"font-awesome": "^4.7.0",
5052
"mutationobserver-shim": "^0.3.7",
51-
"ng2-charts": "~2.3.3",
52-
"ngx-bootstrap": "^5.6.2",
53-
"ngx-perfect-scrollbar": "^9.0.0",
53+
"ng2-charts": "^2.4.2",
54+
"ngx-bootstrap": "^6.2.0",
55+
"ngx-perfect-scrollbar": "^10.1.0",
5456
"rxjs": "^6.6.3",
5557
"simple-line-icons": "^2.5.5",
5658
"ts-helpers": "^1.1.2",
57-
"tslib": "^1.14.1",
59+
"tslib": "^2.0.0",
5860
"web-animations-js": "^2.3.2",
5961
"zone.js": "~0.10.3"
6062
},
6163
"devDependencies": {
62-
"@angular-devkit/build-angular": "^0.901.13",
63-
"@angular/cli": "^9.1.13",
64-
"@angular/compiler-cli": "^9.1.13",
65-
"@angular/language-service": "^9.1.13",
64+
"@angular-devkit/build-angular": "^0.1002.1",
65+
"@angular/cli": "^10.2.1",
66+
"@angular/compiler-cli": "^10.2.4",
67+
"@angular/language-service": "^10.2.4",
6668
"@types/jasmine": "^3.6.2",
6769
"@types/jasminewd2": "^2.0.8",
6870
"@types/node": "^14.14.20",
6971
"codelyzer": "^5.2.2",
70-
"jasmine-core": "^3.6.0",
71-
"jasmine-spec-reporter": "^5.0.2",
72-
"karma": "^5.2.3",
73-
"karma-chrome-launcher": "^3.1.0",
74-
"karma-coverage-istanbul-reporter": "^3.0.3",
75-
"karma-jasmine": "^3.3.1",
76-
"karma-jasmine-html-reporter": "^1.5.4",
77-
"protractor": "^7.0.0",
72+
"jasmine-core": "~3.6.0",
73+
"jasmine-spec-reporter": "~5.0.0",
74+
"karma": "~5.2.0",
75+
"karma-chrome-launcher": "~3.1.0",
76+
"karma-coverage-istanbul-reporter": "~3.0.2",
77+
"karma-jasmine": "~4.0.0",
78+
"karma-jasmine-html-reporter": "^1.5.0",
79+
"protractor": "~7.0.0",
7880
"ts-node": "^8.10.2",
79-
"tslint": "^6.1.3",
80-
"typescript": "~3.7.5"
81+
"tslint": "~6.1.0",
82+
"typescript": "^3.9.7"
8183
},
8284
"engines": {
8385
"node": ">= 10.13",

src/polyfills.ts

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/***************************************************************************************************
2+
* Load `$localize` onto the global scope - used if i18n tags appear in Angular templates.
3+
*/
4+
import '@angular/localize/init';
15
/**
26
* This file includes polyfills needed by Angular and is loaded before the app.
37
* You can add your own extra polyfills to this file.
@@ -19,21 +23,7 @@
1923
*/
2024

2125
/** IE9, IE10 and IE11 requires all of the following polyfills. **/
22-
import 'core-js/es/symbol';
23-
import 'core-js/es/object';
24-
import 'core-js/es/function';
25-
import 'core-js/es/parse-int';
26-
import 'core-js/es/parse-float';
27-
import 'core-js/es/number';
28-
import 'core-js/es/math';
29-
import 'core-js/es/string';
30-
import 'core-js/es/date';
31-
import 'core-js/es/array';
32-
import 'core-js/es/regexp';
33-
import 'core-js/es/map';
34-
import 'core-js/es/weak-map';
35-
import 'core-js/es/set';
36-
import 'core-js/es/array';
26+
import 'core-js';
3727

3828
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
3929
// import 'classlist.js'; // Run `npm install --save classlist.js`.

src/tsconfig.app.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"compilerOptions": {
44
"outDir": "../out-tsc/app",
55
"baseUrl": "./",
6-
"module": "esnext",
7-
"target": "es5",
6+
"module": "es2020",
7+
"target": "es2015",
88
"types": [],
99
"paths": {
1010
"@angular/*": [
@@ -13,13 +13,19 @@
1313
}
1414
},
1515
"angularCompilerOptions": {
16-
"enableIvy": false
16+
"enableIvy": true,
17+
"importHelpers": true
1718
},
1819
"files": [
1920
"main.ts",
2021
"polyfills.ts"
2122
],
2223
"include": [
2324
"**/*.d.ts"
25+
],
26+
"exclude": [
27+
"src/**/*.spec.ts",
28+
"src/test.ts",
29+
"src/environments/environment.prod.ts"
2430
]
2531
}

tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"moduleResolution": "node",
99
"emitDecoratorMetadata": true,
1010
"experimentalDecorators": true,
11-
"module": "esnext",
12-
"target": "es5",
11+
"module": "es2020",
12+
"target": "es2015",
1313
"typeRoots": [
1414
"node_modules/@types"
1515
],

0 commit comments

Comments
 (0)