Skip to content

Commit 065889e

Browse files
sheikalthafllorenspujol
authored andcommitted
feat: update angular to 14
lib peerDependency minimum version to 14
1 parent 39de8a5 commit 065889e

File tree

8 files changed

+21396
-1553
lines changed

8 files changed

+21396
-1553
lines changed

angular.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,8 @@
176176
},
177177
"cli": {
178178
"analytics": false,
179-
"defaultCollection": "@angular-eslint/schematics"
180-
},
181-
"defaultProject": "demo-app"
179+
"schematicCollections": [
180+
"@angular-eslint/schematics"
181+
]
182+
}
182183
}

package-lock.json

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

package.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,30 +22,30 @@
2222
},
2323
"private": true,
2424
"dependencies": {
25-
"@angular/animations": "~13.3.2",
26-
"@angular/cdk": "~13.3.2",
27-
"@angular/common": "~13.3.2",
28-
"@angular/compiler": "~13.3.2",
29-
"@angular/core": "~13.3.2",
30-
"@angular/forms": "~13.3.2",
31-
"@angular/material": "~13.3.2",
32-
"@angular/platform-browser": "~13.3.2",
33-
"@angular/platform-browser-dynamic": "~13.3.2",
34-
"@angular/router": "~13.3.2",
35-
"@swimlane/ngx-charts": "~17.0.0",
25+
"@angular/animations": "^14.0.1",
26+
"@angular/cdk": "^14.0.1",
27+
"@angular/common": "^14.0.1",
28+
"@angular/compiler": "^14.0.1",
29+
"@angular/core": "^14.0.1",
30+
"@angular/forms": "^14.0.1",
31+
"@angular/material": "^14.0.1",
32+
"@angular/platform-browser": "^14.0.1",
33+
"@angular/platform-browser-dynamic": "^14.0.1",
34+
"@angular/router": "^14.0.1",
35+
"@swimlane/ngx-charts": "~20.1.0",
3636
"rxjs": "~6.6.0",
3737
"tslib": "^2.3.1",
3838
"zone.js": "~0.11.4"
3939
},
4040
"devDependencies": {
41-
"@angular-devkit/build-angular": "~13.3.2",
42-
"@angular-eslint/builder": "~13.2.0",
43-
"@angular-eslint/eslint-plugin": "~13.2.0",
44-
"@angular-eslint/eslint-plugin-template": "~13.2.0",
45-
"@angular-eslint/schematics": "~13.2.0",
46-
"@angular-eslint/template-parser": "~13.2.0",
47-
"@angular/cli": "~13.3.2",
48-
"@angular/compiler-cli": "~13.3.2",
41+
"@angular-devkit/build-angular": "^14.0.1",
42+
"@angular-eslint/builder": "~13.4.0",
43+
"@angular-eslint/eslint-plugin": "~13.4.0",
44+
"@angular-eslint/eslint-plugin-template": "~13.4.0",
45+
"@angular-eslint/schematics": "~13.4.0",
46+
"@angular-eslint/template-parser": "~13.4.0",
47+
"@angular/cli": "^14.0.1",
48+
"@angular/compiler-cli": "^14.0.1",
4949
"@commitlint/cli": "~11.0.0",
5050
"@commitlint/config-angular": "~11.0.0",
5151
"@commitlint/config-conventional": "~11.0.0",
@@ -66,11 +66,11 @@
6666
"karma-coverage": "~2.0.3",
6767
"karma-jasmine": "~4.0.0",
6868
"karma-jasmine-html-reporter": "^1.5.0",
69-
"ng-packagr": "~13.3.0",
69+
"ng-packagr": "^14.0.2",
7070
"protractor": "~7.0.0",
7171
"standard-version": "~9.1.0",
7272
"ts-node": "~8.3.0",
73-
"typescript": "~4.5.5"
73+
"typescript": "~4.7.3"
7474
},
7575
"config": {
7676
"commitizen": {

projects/angular-grid-layout/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"angular-layout"
2121
],
2222
"peerDependencies": {
23-
"@angular/common": ">=12.0.0",
24-
"@angular/core": ">=12.0.0"
23+
"@angular/common": ">=14.0.0",
24+
"@angular/core": ">=14.0.0"
2525
},
2626
"dependencies": {
2727
"tslib": "^2.3.1"

projects/angular-grid-layout/tsconfig.lib.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"extends": "../../tsconfig.json",
44
"compilerOptions": {
55
"outDir": "../../out-tsc/lib",
6-
"target": "es2015",
6+
"target": "es2020",
77
"declaration": true,
88
"declarationMap": true,
99
"inlineSources": true,

projects/demo-app/src/app/real-life-example/real-life-example.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
<ngx-charts-bar-horizontal-2d
2727
[view]="layoutSizes['1']"
2828
[scheme]="colorSchemeGradientLinear"
29-
[schemeType]="'linear'"
29+
[schemeType]="schemeType"
3030
[results]="countriesPopulationByYear"
3131
[gradient]="false"
3232
[xAxis]="xAxis"
3333
[yAxis]="yAxis"
3434
[legend]="false"
35-
[legendPosition]="'below'"
35+
[legendPosition]="legendBelow"
3636
[showXAxisLabel]="showXAxisLabel"
3737
[showYAxisLabel]="showYAxisLabel"
3838
[xAxisLabel]="yAxisLabel"

projects/demo-app/src/app/real-life-example/real-life-example.component.ts

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { KtdGridComponent, KtdGridLayout, ktdTrackById } from '@katoid/angular-g
33
import { fromEvent, merge, Subscription } from 'rxjs';
44
import { debounceTime } from 'rxjs/operators';
55
import { countriesPopulation, countriesPopulationByYear } from './data/countries-population.data';
6-
import { AreaChartStackedComponent } from '@swimlane/ngx-charts';
6+
import { AreaChartStackedComponent, Color, ScaleType, LegendPosition } from '@swimlane/ngx-charts';
77
import { DOCUMENT } from '@angular/common';
88

99
@Component({
@@ -46,18 +46,30 @@ export class KtdRealLifeExampleComponent implements OnInit, OnDestroy {
4646
yAxisLabel: string = 'Population';
4747
timeline: boolean = true;
4848

49-
colorScheme = {
50-
domain: ['#5AA454', '#E44D25', '#CFC0BB', '#7aa3e5', '#a8385d', '#aae3f5']
49+
colorScheme: Color = {
50+
domain: ['#5AA454', '#E44D25', '#CFC0BB', '#7aa3e5', '#a8385d', '#aae3f5'],
51+
group: ScaleType.Ordinal,
52+
selectable: true,
53+
name: 'Customer Usage'
5154
};
5255

53-
colorScheme2 = {
54-
domain: ['#4e79a7', '#f28e2c', '#e15759', '#76b7b2', '#59a14f', '#edc949', '#af7aa1']
56+
colorScheme2: Color = {
57+
domain: ['#4e79a7', '#f28e2c', '#e15759', '#76b7b2', '#59a14f', '#edc949', '#af7aa1'],
58+
group: ScaleType.Ordinal,
59+
selectable: true,
60+
name: 'vertical stacked'
5561
};
5662

57-
colorSchemeGradientLinear = {
58-
domain: ['#4e79a7', '#f28e2c', '#e15759']
63+
colorSchemeGradientLinear: Color = {
64+
domain: ['#4e79a7', '#f28e2c', '#e15759'],
65+
group: ScaleType.Ordinal,
66+
selectable: true,
67+
name: 'color gradient'
5968
};
6069

70+
legendBelow = LegendPosition.Below;
71+
schemeType = ScaleType.Linear;
72+
6173

6274
private resizeSubscription: Subscription;
6375

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"experimentalDecorators": true,
1313
"moduleResolution": "node",
1414
"importHelpers": true,
15-
"target": "es2015",
15+
"target": "es2020",
1616
"module": "es2020",
1717
"strictNullChecks": true,
1818
"lib": [

0 commit comments

Comments
 (0)