Skip to content
/ coreui-angular Public
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 82613cb

Browse files
xidedixxidedix
committedJul 11, 2022
chore: update to Angular 14
1 parent f867f66 commit 82613cb

File tree

17 files changed

+3023
-2249
lines changed

17 files changed

+3023
-2249
lines changed
 

‎.github/workflows/project-chartjs-check.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ on:
66
- master
77
- main
88
- v4
9+
- v4.1
910
pull_request:
1011
branches:
1112
- master
1213
- main
1314
- v4
15+
- v4.1
1416
jobs:
1517
build:
1618

‎.github/workflows/project-lib-check.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ on:
66
- master
77
- main
88
- v4
9+
- v4.1
910
pull_request:
1011
branches:
1112
- master
1213
- main
1314
- v4
15+
- v4.1
1416
jobs:
1517
build:
1618

‎LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2021 creativeLabs Łukasz Holeczek
3+
Copyright (c) 2022 creativeLabs Łukasz Holeczek
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
21+
SOFTWARE.

‎angular.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
33
"cli": {
44
"analytics": false,
5-
"defaultCollection": "@angular-eslint/schematics"
5+
"schematicCollections": [
6+
"@angular-eslint/schematics"
7+
]
68
},
79
"version": 1,
810
"newProjectRoot": "projects",
@@ -97,6 +99,5 @@
9799
}
98100
}
99101
}
100-
},
101-
"defaultProject": "coreui-angular"
102+
}
102103
}

‎package-lock.json

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

‎package.json

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"watch:lib:dev": "ng build coreui-angular --watch --configuration development",
1010
"build:lib:prod": "ng build coreui-angular",
1111
"test:lib:dev": "ng test coreui-angular",
12-
"test:lib:prod": "ng test coreui-angular --karmaConfig=projects/coreui-angular/karma.conf.github.js",
12+
"test:lib:prod": "ng test coreui-angular --karma-config=projects/coreui-angular/karma.conf.github.js",
1313
"prepublish:lib": "ng lint coreui-angular && ng test coreui-angular --watch=false && ng build coreui-angular",
1414
"publish:lib": "cd dist/coreui-angular/ && npm publish --tag next --dry-run",
1515
"lint:lib": "ng lint coreui-angular",
@@ -18,24 +18,24 @@
1818
"watch:chartjs:dev": "ng build coreui-angular-chartjs --watch --configuration development",
1919
"build:chartjs:prod": "ng build coreui-angular-chartjs",
2020
"test:chartjs:dev": "ng test coreui-angular-chartjs",
21-
"test:chartjs:prod": "ng test coreui-angular-chartjs --karmaConfig=projects/coreui-angular-chartjs/karma.conf.github.js",
21+
"test:chartjs:prod": "ng test coreui-angular-chartjs --karma-config=projects/coreui-angular-chartjs/karma.conf.github.js",
2222
"prepublish:chartjs": "ng lint coreui-angular-chartjs && ng test coreui-angular-chartjs --watch=false && ng build coreui-angular-chartjs",
2323
"publish:chartjs": "cd dist/coreui-angular-chartjs/ && npm publish --tag next --dry-run",
2424
"lint:chartjs": "ng lint coreui-angular-chartjs",
2525
"link:chartjs": "cd dist/coreui-angular-chartjs/ && npm link"
2626
},
2727
"private": true,
2828
"dependencies": {
29-
"@angular/animations": "~13.3.0",
30-
"@angular/cdk": "~13.3.0",
31-
"@angular/common": "~13.3.0",
32-
"@angular/compiler": "~13.3.0",
33-
"@angular/core": "~13.3.0",
34-
"@angular/forms": "~13.3.0",
35-
"@angular/localize": "~13.3.0",
36-
"@angular/platform-browser": "~13.3.0",
37-
"@angular/platform-browser-dynamic": "~13.3.0",
38-
"@angular/router": "~13.3.0",
29+
"@angular/animations": "^14.0.0",
30+
"@angular/cdk": "^14.0.0",
31+
"@angular/common": "^14.0.0",
32+
"@angular/compiler": "^14.0.0",
33+
"@angular/core": "^14.0.0",
34+
"@angular/forms": "^14.0.0",
35+
"@angular/localize": "^14.0.0",
36+
"@angular/platform-browser": "^14.0.0",
37+
"@angular/platform-browser-dynamic": "^14.0.0",
38+
"@angular/router": "^14.0.0",
3939
"@coreui/chartjs": "^3.0.0",
4040
"@coreui/icons-angular": "^3.0.0",
4141
"@popperjs/core": "~2.11.5",
@@ -45,31 +45,31 @@
4545
"zone.js": "~0.11.4"
4646
},
4747
"devDependencies": {
48-
"@angular-devkit/build-angular": "~13.3.0",
49-
"@angular-eslint/builder": "^14.0.2",
50-
"@angular-eslint/eslint-plugin": "^14.0.2",
51-
"@angular-eslint/eslint-plugin-template": "^14.0.2",
52-
"@angular-eslint/schematics": "^14.0.2",
53-
"@angular-eslint/template-parser": "^14.0.2",
54-
"@angular/cli": "~13.3.0",
55-
"@angular/compiler-cli": "~13.3.0",
56-
"@angular/language-service": "~13.3.0",
48+
"@angular-devkit/build-angular": "^14.0.0",
49+
"@angular-eslint/builder": "^14.0.0",
50+
"@angular-eslint/eslint-plugin": "^14.0.0",
51+
"@angular-eslint/eslint-plugin-template": "^14.0.0",
52+
"@angular-eslint/schematics": "^14.0.0",
53+
"@angular-eslint/template-parser": "^14.0.0",
54+
"@angular/cli": "^14.0.0",
55+
"@angular/compiler-cli": "^14.0.0",
56+
"@angular/language-service": "^14.0.0",
5757
"@types/jasmine": "~4.0.0",
5858
"@types/lodash-es": "^4.17.6",
59-
"@types/node": "^16.11.39",
60-
"@typescript-eslint/eslint-plugin": "^5.20.0",
61-
"@typescript-eslint/parser": "^5.20.0",
62-
"eslint": "^8.17.0",
63-
"jasmine-core": "~4.2.0",
64-
"karma": "~6.3.20",
65-
"karma-chrome-launcher": "~3.1.0",
59+
"@types/node": "^16.11.43",
60+
"@typescript-eslint/eslint-plugin": "^5.30.5",
61+
"@typescript-eslint/parser": "^5.30.5",
62+
"eslint": "^8.19.0",
63+
"jasmine-core": "^4.2.0",
64+
"karma": "^6.4.0",
65+
"karma-chrome-launcher": "^3.1.1",
6666
"karma-coverage": "~2.2.0",
67-
"karma-jasmine": "~5.0.0",
68-
"karma-jasmine-html-reporter": "~2.0.0",
67+
"karma-jasmine": "~5.1.0",
68+
"karma-jasmine-html-reporter": "^2.0.0",
6969
"lodash-es": "^4.17.21",
70-
"ng-packagr": "^13.3.0",
71-
"prettier": "^2.6.0",
72-
"typescript": "~4.6.4"
70+
"ng-packagr": "^14.0.0",
71+
"prettier": "^2.7.1",
72+
"typescript": "~4.7.2"
7373
},
7474
"keywords": [
7575
"angular",

‎projects/coreui-angular-chartjs/.eslintrc.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
],
1111
"parserOptions": {
1212
"project": [
13-
"projects/coreui-angular-chartjs/tsconfig.lib.json",
14-
"projects/coreui-angular-chartjs/tsconfig.spec.json"
13+
"./tsconfig.json"
1514
],
1615
"createDefaultProgram": true
1716
},

‎projects/coreui-angular-chartjs/README.md

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
[npm-badge]: https://img.shields.io/npm/v/@coreui/angular-chartjs/latest?style=flat-square
3131
[npm]: https://www.npmjs.com/package/@coreui/angular-chartjs
3232
[npm-download]: https://img.shields.io/npm/dm/@coreui/angular-chartjs.svg?style=flat-square
33-
[angular-badge]: https://img.shields.io/badge/angular-^13.3.0-lightgrey.svg?style=flat-square&logo=angular
33+
[angular-badge]: https://img.shields.io/badge/angular-^14.0.0-lightgrey.svg?style=flat-square&logo=angular
3434

3535
##### install:
3636

@@ -126,3 +126,46 @@ _component_
126126
### See also:
127127
128128
- Chart.js docs [https://www.chartjs.org/docs/](https://www.chartjs.org/docs/)
129+
130+
<!--- StartOpenCollectiveBackers -->
131+
132+
## Support CoreUI Development
133+
134+
CoreUI is an MIT-licensed open source project and is completely free to use. However, the amount of effort needed to maintain and develop new features for the project is not sustainable without proper financial backing. You can support development by buying the [CoreUI PRO](https://coreui.io/pricing/) or by becoming a sponsor via [Open Collective](https://opencollective.com/coreui/).
135+
136+
137+
### Platinum Sponsors
138+
139+
Support this project by [becoming a Platinum Sponsor](https://opencollective.com/coreui/contribute/platinum-sponsor-40959/). A large company logo will be added here with a link to your website.
140+
141+
<a href="https://opencollective.com/coreui/contribute/platinum-sponsor-40959/checkout"><img src="https://opencollective.com/coreui/tiers/platinum-sponsor/0/avatar.svg?avatarHeight=100"></a>
142+
143+
### Gold Sponsors
144+
145+
Support this project by [becoming a Gold Sponsor](https://opencollective.com/coreui/contribute/gold-sponsor-40960/). A big company logo will be added here with a link to your website.
146+
147+
<a href="https://opencollective.com/coreui/contribute/gold-sponsor-40960/checkout"><img src="https://opencollective.com/coreui/tiers/gold-sponsor/0/avatar.svg?avatarHeight=100"></a>
148+
149+
### Silver Sponsors
150+
151+
Support this project by [becoming a Silver Sponsor](https://opencollective.com/coreui/contribute/silver-sponsor-40967/). A medium company logo will be added here with a link to your website.
152+
153+
<a href="https://opencollective.com/coreui/contribute/silver-sponsor-40967/checkout"><img src="https://opencollective.com/coreui/tiers/gold-sponsor/0/avatar.svg?avatarHeight=100"></a>
154+
155+
### Bronze Sponsors
156+
157+
Support this project by [becoming a Bronze Sponsor](https://opencollective.com/coreui/contribute/bronze-sponsor-40966/). The company avatar will show up here with a link to your OpenCollective Profile.
158+
159+
<a href="https://opencollective.com/coreui/contribute/bronze-sponsor-40966/checkout"><img src="https://opencollective.com/coreui/tiers/bronze-sponsor/0/avatar.svg?avatarHeight=100"></a>
160+
161+
### Backers
162+
163+
Thanks to all the backers and sponsors! Support this project by [becoming a backer](https://opencollective.com/coreui/contribute/backer-40965/).
164+
165+
<a href="https://opencollective.com/coreui/contribute/backer-40965/checkout" target="_blank" rel="noopener"><img src="https://opencollective.com/coreui/backers.svg?width=890"></a>
166+
167+
<!--- EndOpenCollectiveBackers -->
168+
169+
## Copyright and license
170+
171+
Copyright 2022 creativeLabs Łukasz Holeczek. Code released under the [MIT License](https://github.com/coreui/coreui-angular/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).

‎projects/coreui-angular-chartjs/ng-package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
33
"dest": "../../dist/coreui-angular-chartjs",
44
"lib": {
5-
"entryFile": "src/public-api.ts",
5+
"entryFile": "src/public-api.ts"
66
},
77
"allowedNonPeerDependencies": [
88
"@coreui/chartjs",

‎projects/coreui-angular-chartjs/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
"license": "MIT",
1414
"author": "The CoreUI Team (https://github.com/orgs/coreui/people)",
1515
"peerDependencies": {
16-
"@angular/cdk": "^13.0.0 || ^14.0.0",
17-
"@angular/common": "^13.0.0 || ^14.0.0",
18-
"@angular/core": "^13.0.0 || ^14.0.0",
16+
"@angular/cdk": "^14.0.0",
17+
"@angular/common": "^14.0.0",
18+
"@angular/core": "^14.0.0",
1919
"@coreui/chartjs": "^3.0.0",
2020
"chart.js": "^3.7.1"
2121
},

‎projects/coreui-angular-chartjs/src/lib/chartjs.component.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { BooleanInput, coerceBooleanProperty, coerceNumberProperty, NumberInput
1717

1818
import { merge } from 'lodash';
1919

20-
import { Chart, ChartConfiguration, ChartType, DefaultDataPoint, registerables } from 'chart.js';
20+
import { Chart, ChartConfiguration, ChartOptions, ChartType, DefaultDataPoint, registerables } from 'chart.js';
2121
import { customTooltips as cuiCustomTooltips } from '@coreui/chartjs';
2222

2323
Chart.register(...registerables);
@@ -165,6 +165,8 @@ export class ChartjsComponent<TType extends ChartType = ChartType, TData = Defau
165165
const config = this.chartConfig();
166166

167167
if (this.options) {
168+
// todo
169+
// @ts-ignore
168170
Object.assign(this.chart.options, config.options);
169171
}
170172

@@ -174,7 +176,11 @@ export class ChartjsComponent<TType extends ChartType = ChartType, TData = Defau
174176
}
175177

176178
if (this.chart) {
179+
// todo
180+
// @ts-ignore
177181
Object.assign(this.chart.config.options, config.options);
182+
// todo
183+
// @ts-ignore
178184
Object.assign(this.chart.config.plugins, config.plugins);
179185
Object.assign(this.chart.config.data, config.data);
180186
}

‎projects/coreui-angular-chartjs/tsconfig.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"files": [],
3+
"references": [
4+
{
5+
"path": "./tsconfig.lib.json"
6+
},
7+
{
8+
"path": "./tsconfig.lib.prod.json"
9+
},
10+
{
11+
"path": "./tsconfig.spec.json"
12+
}
13+
]
14+
}

‎projects/coreui-angular/.eslintrc.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
"parserOptions": {
1212
"project": [
1313
"./tsconfig.json"
14-
// "projects/coreui-angular/tsconfig.lib.json",
15-
// "projects/coreui-angular/tsconfig.spec.json",
16-
// "./tsconfig.lib.json",
17-
// "./tsconfig.spec.json"
1814
],
1915
"createDefaultProgram": true
2016
},

‎projects/coreui-angular/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
[![npm-coreui-angular-next][npm-coreui-angular-badge-latest]][npm-coreui-angular]
2929
[![NPM downloads][npm-coreui-angular-download]][npm-coreui-angular]
30-
![angular](https://img.shields.io/badge/angular-^13.3.0-lightgrey.svg?style=flat-square&logo=angular)
30+
![angular](https://img.shields.io/badge/angular-^14.0.0-lightgrey.svg?style=flat-square&logo=angular)
3131

3232
[npm-coreui-angular-badge-latest]: https://img.shields.io/npm/v/@coreui/angular/latest?style=flat-square&color=red
3333
[npm-coreui-angular]: https://www.npmjs.com/package/@coreui/angular
@@ -55,7 +55,7 @@
5555
Before you begin, make sure your development environment includes `Node.js®` and `npm` package manager.
5656

5757
###### Node.js
58-
[**Angular 13**](https://angular.io/guide/what-is-angular) requires `Node.js` LTS version `^14.15` or `^16.10`.
58+
[**Angular 14**](https://angular.io/guide/what-is-angular) requires `Node.js` LTS version `^14.15` or `^16.10`.
5959

6060
- To check your version, run `node -v` in a terminal/console window.
6161
- To get `Node.js`, go to [nodejs.org](https://nodejs.org/).

‎projects/coreui-angular/karma.conf.github.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ module.exports = function (config) {
3737
colors: true,
3838
logLevel: config.LOG_INFO,
3939
autoWatch: false,
40+
browsers: ['ChromeHeadless'],
4041
singleRun: true,
4142
restartOnFileChange: false,
42-
browsers: ['ChromeHeadless'],
4343
});
4444
};

‎projects/coreui-angular/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
"tslib": "^2.3.0"
2222
},
2323
"peerDependencies": {
24-
"@angular/cdk": "^13.0.0 || ^14.0.0",
25-
"@angular/common": "^13.0.0 || ^14.0.0",
26-
"@angular/core": "^13.0.0 || ^14.0.0",
27-
"@angular/router": "^13.0.0 || ^14.0.0"
24+
"@angular/cdk": "^14.0.0",
25+
"@angular/common": "^14.0.0",
26+
"@angular/core": "^14.0.0",
27+
"@angular/router": "^14.0.0"
2828
},
2929
"repository": {
3030
"type": "git",

‎tsconfig.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,17 @@
55
"baseUrl": "./",
66
"paths": {
77
"coreui-angular": [
8-
"dist/coreui-angular/coreui-angular",
98
"dist/coreui-angular"
109
],
1110
"coreui-angular-chartjs": [
12-
"dist/coreui-angular-chartjs/coreui-angular-chartjs",
1311
"dist/coreui-angular-chartjs"
1412
]
1513
},
1614
"outDir": "./dist/out-tsc",
1715
"forceConsistentCasingInFileNames": true,
1816
"strict": true,
1917
"noImplicitOverride": true,
20-
"noPropertyAccessFromIndexSignature": true,
18+
"noPropertyAccessFromIndexSignature": false,
2119
"noImplicitReturns": true,
2220
"noFallthroughCasesInSwitch": true,
2321
"sourceMap": true,
@@ -26,8 +24,11 @@
2624
"experimentalDecorators": true,
2725
"moduleResolution": "node",
2826
"importHelpers": true,
29-
"target": "es2017",
27+
"target": "es2020",
3028
"module": "es2020",
29+
"typeRoots": [
30+
"node_modules/@types"
31+
],
3132
"lib": [
3233
"es2020",
3334
"dom"

0 commit comments

Comments
 (0)
Please sign in to comment.