Skip to content

Commit ec3282c

Browse files
authored
feat: update to Angular 10 (#5747)
1 parent c2ce881 commit ec3282c

10 files changed

+6284
-5234
lines changed

browserslist .browserslistrc

File renamed without changes.

angular.json

+8
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@
5151
"node_modules/echarts/dist/echarts.min.js",
5252
"node_modules/echarts/dist/extension/bmap.min.js",
5353
"node_modules/chart.js/dist/Chart.min.js"
54+
],
55+
"allowedCommonJsDependencies": [
56+
"angular2-chartjs",
57+
"echarts",
58+
"lodash",
59+
"zrender/lib/svg/svg",
60+
"zrender/lib/vml/vml",
61+
"style-loader!leaflet/dist/leaflet.css"
5462
]
5563
},
5664
"configurations": {

e2e/tsconfig.e2e.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../tsconfig.json",
2+
"extends": "../tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/e2e",
55
"baseUrl": "./",

package-lock.json

+6,194-5,170
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+34-34
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,26 @@
2727
"docs:serve": "compodoc -p src/tsconfig.app.json -d docs -s",
2828
"prepush": "npm run lint:ci",
2929
"release:changelog": "npm run conventional-changelog -- -p angular -i CHANGELOG.md -s",
30-
"postinstall": "ngcc --properties es2015 es5 browser module main --first-only --create-ivy-entry-points"
30+
"postinstall": "ngcc --properties es2015 es5 browser module main --first-only --create-ivy-entry-points --tsconfig \"./src/tsconfig.app.json\""
3131
},
3232
"dependencies": {
3333
"@akveo/ng2-completer": "^9.0.1",
34-
"@angular/animations": "^9.0.4",
35-
"@angular/cdk": "^9.1.2",
36-
"@angular/common": "^9.0.4",
37-
"@angular/compiler": "^9.0.4",
38-
"@angular/core": "^9.0.4",
39-
"@angular/forms": "^9.0.4",
40-
"@angular/google-maps": "^9.1.0",
41-
"@angular/platform-browser": "^9.0.4",
42-
"@angular/platform-browser-dynamic": "^9.0.4",
43-
"@angular/router": "^9.0.4",
34+
"@angular/animations": "^10.0.10",
35+
"@angular/cdk": "^10.1.3",
36+
"@angular/common": "^10.0.10",
37+
"@angular/compiler": "^10.0.10",
38+
"@angular/core": "^10.0.10",
39+
"@angular/forms": "^10.0.10",
40+
"@angular/google-maps": "^10.1.3",
41+
"@angular/platform-browser": "^10.0.10",
42+
"@angular/platform-browser-dynamic": "^10.0.10",
43+
"@angular/router": "^10.0.10",
4444
"@asymmetrik/ngx-leaflet": "3.0.1",
45-
"@nebular/auth": "5.0.0",
46-
"@nebular/eva-icons": "5.0.0",
47-
"@nebular/security": "5.0.0",
48-
"@nebular/theme": "5.0.0",
49-
"@swimlane/ngx-charts": "^13.0.2",
45+
"@nebular/auth": "6.0.0",
46+
"@nebular/eva-icons": "6.0.0",
47+
"@nebular/security": "6.0.0",
48+
"@nebular/theme": "6.0.0",
49+
"@swimlane/ngx-charts": "^14.0.0",
5050
"angular2-chartjs": "0.4.1",
5151
"bootstrap": "4.3.1",
5252
"chart.js": "2.7.1",
@@ -59,28 +59,28 @@
5959
"ionicons": "2.0.1",
6060
"leaflet": "1.2.0",
6161
"nebular-icons": "1.1.0",
62-
"ng2-ckeditor": "^1.2.2",
62+
"ng2-ckeditor": "^1.2.9",
6363
"ng2-smart-table": "^1.6.0",
6464
"ngx-echarts": "^4.2.2",
6565
"node-sass": "^4.12.0",
6666
"normalize.css": "6.0.0",
6767
"pace-js": "1.0.2",
6868
"roboto-fontface": "0.8.0",
69-
"rxjs": "6.5.4",
69+
"rxjs": "6.6.2",
7070
"rxjs-compat": "6.3.0",
7171
"socicon": "3.0.5",
7272
"style-loader": "^1.1.3",
7373
"tinymce": "4.5.7",
74-
"tslib": "^1.10.0",
74+
"tslib": "^2.0.0",
7575
"typeface-exo": "0.0.22",
7676
"web-animations-js": "^2.3.2",
7777
"zone.js": "~0.10.2"
7878
},
7979
"devDependencies": {
80-
"@angular-devkit/build-angular": "~0.900.4",
81-
"@angular/cli": "^9.0.4",
82-
"@angular/compiler-cli": "^9.0.4",
83-
"@angular/language-service": "9.0.4",
80+
"@angular-devkit/build-angular": "~0.1000.6",
81+
"@angular/cli": "^10.0.6",
82+
"@angular/compiler-cli": "^10.0.10",
83+
"@angular/language-service": "10.0.10",
8484
"@compodoc/compodoc": "1.0.1",
8585
"@fortawesome/fontawesome-free": "^5.2.0",
8686
"@types/d3-color": "1.0.5",
@@ -89,24 +89,24 @@
8989
"@types/jasminewd2": "2.0.3",
9090
"@types/leaflet": "1.2.3",
9191
"@types/node": "^12.11.1",
92-
"codelyzer": "^5.1.2",
92+
"codelyzer": "^6.0.0",
9393
"conventional-changelog-cli": "1.3.4",
9494
"husky": "0.13.3",
95-
"jasmine-core": "2.6.4",
96-
"jasmine-spec-reporter": "4.1.1",
97-
"karma": "1.7.1",
98-
"karma-chrome-launcher": "2.1.1",
95+
"jasmine-core": "~3.5.0",
96+
"jasmine-spec-reporter": "~5.0.0",
97+
"karma": "~5.0.0",
98+
"karma-chrome-launcher": "~3.1.0",
9999
"karma-cli": "1.0.1",
100-
"karma-coverage-istanbul-reporter": "1.3.0",
101-
"karma-jasmine": "1.1.0",
102-
"karma-jasmine-html-reporter": "0.2.2",
100+
"karma-coverage-istanbul-reporter": "~3.0.2",
101+
"karma-jasmine": "~3.3.0",
102+
"karma-jasmine-html-reporter": "^1.5.0",
103103
"npm-run-all": "4.0.2",
104-
"protractor": "5.1.2",
104+
"protractor": "~7.0.0",
105105
"rimraf": "2.6.1",
106106
"stylelint": "7.13.0",
107107
"ts-node": "3.2.2",
108-
"tslint": "^5.7.0",
108+
"tslint": "~6.1.0",
109109
"tslint-language-service": "^0.9.9",
110-
"typescript": "3.7.5"
110+
"typescript": "3.9.7"
111111
}
112112
}

src/tsconfig.app.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../tsconfig.json",
2+
"extends": "../tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/app",
55
"baseUrl": "./"

src/tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../tsconfig.json",
2+
"extends": "../tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/spec",
55
"baseUrl": "./",

tsconfig.base.json

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"compileOnSave": false,
3+
"compilerOptions": {
4+
"importHelpers": true,
5+
"module": "es2020",
6+
"outDir": "./dist/out-tsc",
7+
"sourceMap": true,
8+
"declaration": false,
9+
"moduleResolution": "node",
10+
"emitDecoratorMetadata": true,
11+
"experimentalDecorators": true,
12+
"target": "es2015",
13+
"typeRoots": [
14+
"node_modules/@types"
15+
],
16+
"lib": [
17+
"es2017",
18+
"dom"
19+
],
20+
"plugins": [
21+
{ "name": "tslint-language-service"}
22+
]
23+
}
24+
}

tsconfig.json

+16-23
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,17 @@
1+
/*
2+
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
3+
It is not intended to be used to perform a compilation.
4+
5+
To learn more about this file see: https://angular.io/config/solution-tsconfig.
6+
*/
17
{
2-
"compileOnSave": false,
3-
"compilerOptions": {
4-
"importHelpers": true,
5-
"module": "esnext",
6-
"outDir": "./dist/out-tsc",
7-
"sourceMap": true,
8-
"declaration": false,
9-
"moduleResolution": "node",
10-
"emitDecoratorMetadata": true,
11-
"experimentalDecorators": true,
12-
"target": "es2015",
13-
"typeRoots": [
14-
"node_modules/@types"
15-
],
16-
"lib": [
17-
"es2017",
18-
"dom"
19-
],
20-
"plugins": [
21-
{ "name": "tslint-language-service"}
22-
]
23-
}
24-
}
8+
"files": [],
9+
"references": [
10+
{
11+
"path": "./src/tsconfig.app.json"
12+
},
13+
{
14+
"path": "./src/tsconfig.spec.json"
15+
}
16+
]
17+
}

tslint.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
"node_modules/codelyzer"
44
],
55
"rules": {
6+
"deprecation": {
7+
"severity": "warning"
8+
},
69
"trailing-comma": [
710
true,
811
{
@@ -57,7 +60,6 @@
5760
"no-switch-case-fall-through": true,
5861
"no-trailing-whitespace": true,
5962
"no-unnecessary-initializer": true,
60-
"no-use-before-declare": true,
6163
"no-var-keyword": true,
6264
"object-literal-sort-keys": false,
6365
"one-line": [
@@ -130,7 +132,6 @@
130132
"use-lifecycle-interface": true,
131133
"use-pipe-transform-interface": true,
132134
"component-class-suffix": true,
133-
"directive-class-suffix": true,
134-
"no-unused-variable": true
135-
}
135+
"directive-class-suffix": true
136+
}
136137
}

0 commit comments

Comments
 (0)