Skip to content

Commit ebe1810

Browse files
authored
feat: update to Angular 11 (#5826)
1 parent 98166c5 commit ebe1810

File tree

10 files changed

+2982
-3386
lines changed

10 files changed

+2982
-3386
lines changed

angular.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"options": {
1414
"aot": true,
1515
"preserveSymlinks": true,
16-
"rebaseRootRelativeCssUrls": true,
1716
"outputPath": "dist",
1817
"index": "src/index.html",
1918
"main": "src/main.ts",
@@ -72,7 +71,6 @@
7271
"optimization": true,
7372
"outputHashing": "all",
7473
"sourceMap": false,
75-
"extractCss": true,
7674
"namedChunks": false,
7775
"aot": true,
7876
"extractLicenses": true,

e2e/tsconfig.e2e.json

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

package-lock.json

Lines changed: 2926 additions & 3308 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,21 @@
3131
},
3232
"dependencies": {
3333
"@akveo/ng2-completer": "^9.0.1",
34-
"@angular/animations": "^10.0.10",
35-
"@angular/cdk": "10.1.1",
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",
34+
"@angular/animations": "^11.0.9",
35+
"@angular/cdk": "11.0.4",
36+
"@angular/common": "^11.0.9",
37+
"@angular/compiler": "^11.0.9",
38+
"@angular/core": "^11.0.9",
39+
"@angular/forms": "^11.0.9",
40+
"@angular/google-maps": "^11.0.4",
41+
"@angular/platform-browser": "^11.0.9",
42+
"@angular/platform-browser-dynamic": "^11.0.9",
43+
"@angular/router": "^11.0.9",
4444
"@asymmetrik/ngx-leaflet": "3.0.1",
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",
45+
"@nebular/auth": "7.0.0",
46+
"@nebular/eva-icons": "7.0.0",
47+
"@nebular/security": "7.0.0",
48+
"@nebular/theme": "7.0.0",
4949
"@swimlane/ngx-charts": "^14.0.0",
5050
"angular2-chartjs": "0.4.1",
5151
"bootstrap": "4.3.1",
@@ -74,31 +74,31 @@
7474
"tslib": "^2.0.0",
7575
"typeface-exo": "0.0.22",
7676
"web-animations-js": "^2.3.2",
77-
"zone.js": "~0.10.2"
77+
"zone.js": "~0.10.3"
7878
},
7979
"devDependencies": {
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",
80+
"@angular-devkit/build-angular": "~0.1100.7",
81+
"@angular/cli": "^11.0.7",
82+
"@angular/compiler-cli": "^11.0.9",
83+
"@angular/language-service": "11.0.9",
8484
"@compodoc/compodoc": "1.0.1",
8585
"@fortawesome/fontawesome-free": "^5.2.0",
8686
"@types/d3-color": "1.0.5",
8787
"@types/googlemaps": "^3.39.3",
88-
"@types/jasmine": "2.5.54",
88+
"@types/jasmine": "^3.3.0",
8989
"@types/jasminewd2": "2.0.3",
9090
"@types/leaflet": "1.2.3",
9191
"@types/node": "^12.11.1",
9292
"codelyzer": "^6.0.0",
9393
"conventional-changelog-cli": "1.3.4",
9494
"husky": "0.13.3",
95-
"jasmine-core": "~3.5.0",
95+
"jasmine-core": "~3.6.0",
9696
"jasmine-spec-reporter": "~5.0.0",
97-
"karma": "~5.0.0",
97+
"karma": "~5.1.1",
9898
"karma-chrome-launcher": "~3.1.0",
9999
"karma-cli": "1.0.1",
100100
"karma-coverage-istanbul-reporter": "~3.0.2",
101-
"karma-jasmine": "~3.3.0",
101+
"karma-jasmine": "~4.0.0",
102102
"karma-jasmine-html-reporter": "^1.5.0",
103103
"npm-run-all": "4.0.2",
104104
"protractor": "~7.0.0",
@@ -107,6 +107,6 @@
107107
"ts-node": "3.2.2",
108108
"tslint": "~6.1.0",
109109
"tslint-language-service": "^0.9.9",
110-
"typescript": "3.9.7"
110+
"typescript": "4.0.5"
111111
}
112112
}

src/app/@theme/styles/styles.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
// framework component themes (styles tied to theme variables)
77
@import '~@nebular/theme/styles/globals';
8-
@import '~@nebular/auth/styles/all';
8+
@import '~@nebular/auth/styles/globals';
99

1010
@import '~bootstrap/scss/functions';
1111
@import '~bootstrap/scss/variables';

src/app/pages/forms/form-inputs/form-inputs.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<nb-card-body class="checkbox-radio">
5555
<div class="demo-items">
5656
<nb-checkbox>Checkbox 1</nb-checkbox>
57-
<nb-checkbox [value]="true">Checkbox 2</nb-checkbox>
57+
<nb-checkbox checked>Checkbox 2</nb-checkbox>
5858
</div>
5959
<div class="demo-items">
6060
<nb-radio-group [(value)]="radioGroupValue">

src/tsconfig.app.json

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
{
2-
"extends": "../tsconfig.base.json",
2+
"extends": "../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/app",
55
"baseUrl": "./"
66
},
7-
"exclude": [
8-
"test.ts",
9-
"**/*.spec.ts",
10-
"../node_modules/@nebular/**/*.spec.ts"
7+
"files": [
8+
"main.ts",
9+
"polyfills.ts"
1110
],
1211
"include": [
13-
"../src/*.ts",
14-
"../src/**/*.ts",
15-
"../node_modules/@nebular/**/*.ts"
12+
"**/*.d.ts"
1613
]
1714
}

src/tsconfig.spec.json

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

tsconfig.base.json

Lines changed: 0 additions & 24 deletions
This file was deleted.

tsconfig.json

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
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-
*/
71
{
8-
"files": [],
9-
"references": [
10-
{
11-
"path": "./src/tsconfig.app.json"
12-
},
13-
{
14-
"path": "./src/tsconfig.spec.json"
15-
}
16-
]
17-
}
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+
}

0 commit comments

Comments
 (0)