Skip to content

Commit ac36cc6

Browse files
xidedixxidedix
committed
chore: update to Angular 13 and TypeScript 4.4
1 parent 70a74c6 commit ac36cc6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+143
-132
lines changed

‎.editorconfig

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# Editor configuration, see https://editorconfig.org
2-
32
root = true
43

54
[*]
@@ -10,7 +9,9 @@ indent_size = 2
109
insert_final_newline = true
1110
trim_trailing_whitespace = true
1211

12+
[*.ts]
13+
quote_type = single
14+
1315
[*.md]
1416
max_line_length = off
1517
trim_trailing_whitespace = false
16-

‎.eslintrc.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
"error",
2424
{
2525
"type": "attribute",
26-
"prefix": "app",
26+
"prefix": "c",
2727
"style": "camelCase"
2828
}
2929
],
3030
"@angular-eslint/component-selector": [
3131
"error",
3232
{
3333
"type": "element",
34-
"prefix": "app",
34+
"prefix": "c",
3535
"style": "kebab-case"
3636
}
3737
],

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
node-version: [14.x]
15+
node-version: [16.x]
1616
os: [ubuntu-latest, windows-latest, macOS-latest]
1717

1818
steps:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
strategy:
2020
matrix:
21-
node-version: [14.x]
21+
node-version: [16.x]
2222
os: [ubuntu-latest, windows-latest, macOS-latest]
2323

2424
steps:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
strategy:
2020
matrix:
21-
node-version: [14.x]
21+
node-version: [16.x]
2222
os: [ubuntu-latest, windows-latest, macOS-latest]
2323

2424
steps:

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ speed-measure-plugin*.json
3333
.history/*
3434

3535
# misc
36+
/.angular/cache
3637
/.sass-cache
3738
/connect.lock
3839
/coverage

‎.prettierrc

-12
This file was deleted.

‎CLI.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# @coreui/angular v4
22

3-
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 12.2.0.
3+
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 13.0.4.
44

55
## Development server
66

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
Before you begin, make sure your development environment includes `Node.js®` and `npm` package manager.
4444

4545
###### Node.js
46-
Angular 12 requires `Node.js` version `^12.20` or `^14`.
46+
[**Angular 13**](https://angular.io/guide/what-is-angular) requires `Node.js` LTS version `^12.20`, `^14` or `^16`.
4747

4848
- To check your version, run `node -v` in a terminal/console window.
4949
- To get `Node.js`, go to [nodejs.org](https://nodejs.org/).
@@ -91,7 +91,7 @@ npm install bootstrap
9191

9292
[![npm-coreui-angular-next][npm-coreui-angular-badge-next]][npm-coreui-angular]
9393
[![NPM downloads][npm-coreui-angular-download]][npm-coreui-angular]
94-
![angular](https://img.shields.io/badge/angular-^12.2.0-lightgrey.svg?style=flat-square&logo=angular)
94+
![angular](https://img.shields.io/badge/angular-^13.0.0-lightgrey.svg?style=flat-square&logo=angular)
9595

9696
[npm-coreui-angular-badge-next]: https://img.shields.io/npm/v/@coreui/angular/next?style=flat-square&color=red
9797
[npm-coreui-angular]: https://www.npmjs.com/package/@coreui/angular

‎package.json

+36-37
Original file line numberDiff line numberDiff line change
@@ -26,50 +26,49 @@
2626
},
2727
"private": true,
2828
"dependencies": {
29-
"@angular/animations": "~12.2.13",
30-
"@angular/cdk": "~12.2.13",
31-
"@angular/common": "~12.2.13",
32-
"@angular/compiler": "~12.2.13",
33-
"@angular/core": "~12.2.13",
34-
"@angular/forms": "~12.2.13",
35-
"@angular/localize": "~12.2.13",
36-
"@angular/platform-browser": "~12.2.13",
37-
"@angular/platform-browser-dynamic": "~12.2.13",
38-
"@angular/router": "~12.2.13",
29+
"@angular/animations": "~13.0.0",
30+
"@angular/cdk": "~13.0.0",
31+
"@angular/common": "~13.0.0",
32+
"@angular/compiler": "~13.0.0",
33+
"@angular/core": "~13.0.0",
34+
"@angular/forms": "~13.0.0",
35+
"@angular/localize": "~13.0.0",
36+
"@angular/platform-browser": "~13.0.0",
37+
"@angular/platform-browser-dynamic": "~13.0.0",
38+
"@angular/router": "~13.0.0",
3939
"@coreui/chartjs": "^3.0.0",
40-
"@coreui/icons-angular": "^3.0.0-alpha.3",
41-
"@popperjs/core": "^2.10.2",
40+
"@coreui/icons-angular": "^3.0.0-alpha.4",
41+
"@popperjs/core": "^2.11.0",
4242
"chart.js": "^3.6.0",
43-
"rxjs": "~6.6.7",
44-
"tslib": "^2.3.1",
43+
"rxjs": "~7.4.0",
44+
"tslib": "^2.3.0",
4545
"zone.js": "~0.11.4"
4646
},
4747
"devDependencies": {
48-
"@angular-devkit/build-angular": "~12.2.13",
49-
"@angular-eslint/builder": "~12.6.1",
50-
"@angular-eslint/eslint-plugin": "~12.6.1",
51-
"@angular-eslint/eslint-plugin-template": "~12.6.1",
52-
"@angular-eslint/schematics": "~12.6.1",
53-
"@angular-eslint/template-parser": "~12.6.1",
54-
"@angular/cli": "~12.2.13",
55-
"@angular/compiler-cli": "~12.2.13",
56-
"@angular/language-service": "~12.2.13",
57-
"@types/jasmine": "~3.8.2",
48+
"@angular-devkit/build-angular": "~13.0.4",
49+
"@angular-eslint/builder": "~13.0.1",
50+
"@angular-eslint/eslint-plugin": "~13.0.1",
51+
"@angular-eslint/eslint-plugin-template": "~13.0.1",
52+
"@angular-eslint/schematics": "~13.0.1",
53+
"@angular-eslint/template-parser": "~13.0.1",
54+
"@angular/cli": "~13.0.4",
55+
"@angular/compiler-cli": "~13.0.0",
56+
"@angular/language-service": "~13.0.0",
57+
"@types/jasmine": "~3.10.0",
5858
"@types/lodash-es": "^4.17.5",
59-
"@types/node": "^16.11.9",
60-
"@typescript-eslint/eslint-plugin": "~4.33.0",
61-
"@typescript-eslint/parser": "~4.33.0",
62-
"eslint": "^7.32.0",
63-
"jasmine-core": "~3.8.0",
64-
"karma": "~6.3.9",
59+
"@types/node": "^16.11.11",
60+
"@typescript-eslint/eslint-plugin": "~5.3.0",
61+
"@typescript-eslint/parser": "~5.3.0",
62+
"eslint": "^8.2.0",
63+
"jasmine-core": "~3.10.0",
64+
"karma": "~6.3.0",
6565
"karma-chrome-launcher": "~3.1.0",
6666
"karma-coverage": "~2.0.3",
67-
"karma-jasmine": "~4.0.1",
68-
"karma-jasmine-html-reporter": "^1.7.0",
67+
"karma-jasmine": "~4.0.0",
68+
"karma-jasmine-html-reporter": "~1.7.0",
6969
"lodash-es": "^4.17.21",
70-
"ng-packagr": "~12.2.5",
71-
"prettier": "^2.4.1",
72-
"typescript": "~4.3.5"
70+
"ng-packagr": "^13.0.0",
71+
"typescript": "~4.4.3"
7372
},
7473
"keywords": [
7574
"angular",
@@ -95,7 +94,7 @@
9594
"version_short": "4.0"
9695
},
9796
"engines": {
98-
"node": ">= 12.20",
99-
"npm": ">= 6"
97+
"node": "^12.20.0 || ^14.15.0 || >=16.10.0",
98+
"npm": ">=6"
10099
}
101100
}

‎projects/coreui-angular-chartjs/.browserslistrc

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
2+
# For additional information regarding the format and rule options, please see:
3+
# https://github.com/browserslist/browserslist#queries
4+
5+
# For the full list of supported browsers by the Angular framework, please see:
6+
# https://angular.io/guide/browser-support
7+
8+
# You can see what browsers were selected by your queries by running:
9+
# npx browserslist
10+
11+
last 1 Chrome version
12+
last 1 Firefox version
13+
last 2 Edge major versions
14+
last 2 Safari major versions
15+
last 2 iOS major versions
16+
Firefox ESR

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
],
1111
"parserOptions": {
1212
"project": [
13-
"./projects/coreui-angular-chartjs/tsconfig.lib.json",
14-
"./projects/coreui-angular-chartjs/tsconfig.spec.json"
13+
"projects/coreui-angular-chartjs/tsconfig.lib.json",
14+
"projects/coreui-angular-chartjs/tsconfig.spec.json"
1515
],
1616
"createDefaultProgram": true
1717
},

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

+2
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@
2525

2626
[![npm package][npm-badge]][npm]
2727
[![NPM downloads][npm-download]][npm]
28+
![angular][angular-badge]
2829

2930
[npm-badge]: https://img.shields.io/npm/v/@coreui/angular-chartjs/latest?style=flat-square
3031
[npm]: https://www.npmjs.com/package/@coreui/angular-chartjs
3132
[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.0.0-lightgrey.svg?style=flat-square&logo=angular
3234

3335
##### install:
3436

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

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
"dest": "../../dist/coreui-angular-chartjs",
44
"lib": {
55
"entryFile": "src/public-api.ts",
6-
"umdModuleIds": {
7-
"@coreui/chartjs": "coreui.chartjs",
8-
"chart.js": "chart.js",
9-
"lodash": "lodash"
10-
}
116
},
127
"allowedNonPeerDependencies": [
138
"@coreui/chartjs",

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@coreui/angular-chartjs",
33
"description": "Angular wrapper component for Chart.js",
4-
"version": "2.0.0-alpha.5",
4+
"version": "2.0.0-alpha.6",
55
"homepage": "https://coreui.io/angular/docs/",
66
"bugs": {
77
"url": "https://github.com/coreui/coreui-angular/issues"
@@ -13,14 +13,14 @@
1313
"license": "MIT",
1414
"author": "The CoreUI Team (https://github.com/orgs/coreui/people)",
1515
"peerDependencies": {
16-
"@angular/cdk": "^12.2.0",
17-
"@angular/common": "^12.2.0",
18-
"@angular/core": "^12.2.0",
16+
"@angular/cdk": "^13.0.0",
17+
"@angular/common": "^13.0.0",
18+
"@angular/core": "^13.0.0",
1919
"@coreui/chartjs": "^3.0.0",
2020
"chart.js": "^3.6.0"
2121
},
2222
"dependencies": {
23-
"lodash-es": "^4.17.15",
23+
"lodash-es": "^4.17.21",
2424
"tslib": "^2.3.0"
2525
}
2626
}

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,11 @@ describe('ChartjsComponent', () => {
3030

3131
await TestBed.configureTestingModule({
3232
declarations: [ChartjsComponent]
33-
}).compileComponents();
33+
})
34+
.compileComponents();
35+
});
3436

37+
beforeEach(() => {
3538
// @ts-ignore
3639
fixture = TestBed.createComponent(ChartjsComponent);
3740
component = fixture.componentInstance;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ export class ChartjsComponent<TType extends ChartType = ChartType, TData = Defau
109109
}
110110

111111
ngOnChanges(changes: SimpleChanges): void {
112-
if (changes.data && !changes.data.firstChange) {
112+
if (changes['data'] && !changes['data'].firstChange) {
113113
this.chartUpdate();
114114
}
115115
}

‎projects/coreui-angular-chartjs/src/test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import {
1010

1111
declare const require: {
1212
context(path: string, deep?: boolean, filter?: RegExp): {
13-
keys(): string[];
1413
<T>(id: string): T;
14+
keys(): string[];
1515
};
1616
};
1717

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,10 @@
33
"extends": "../../tsconfig.json",
44
"compilerOptions": {
55
"outDir": "../../out-tsc/lib",
6-
"target": "es2015",
76
"declaration": true,
87
"declarationMap": true,
98
"inlineSources": true,
10-
"types": [],
11-
"lib": [
12-
"dom",
13-
"es2018"
14-
],
15-
"allowSyntheticDefaultImports": true
9+
"types": []
1610
},
1711
"exclude": [
1812
"src/test.ts",

‎projects/coreui-angular/.browserslistrc

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
2+
# For additional information regarding the format and rule options, please see:
3+
# https://github.com/browserslist/browserslist#queries
4+
5+
# For the full list of supported browsers by the Angular framework, please see:
6+
# https://angular.io/guide/browser-support
7+
8+
# You can see what browsers were selected by your queries by running:
9+
# npx browserslist
10+
11+
last 1 Chrome version
12+
last 1 Firefox version
13+
last 2 Edge major versions
14+
last 2 Safari major versions
15+
last 2 iOS major versions
16+
Firefox ESR

‎projects/coreui-angular/.eslintrc.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
],
1111
"parserOptions": {
1212
"project": [
13-
"./projects/coreui-angular/tsconfig.lib.json",
14-
"./projects/coreui-angular/tsconfig.spec.json"
13+
"projects/coreui-angular/tsconfig.lib.json",
14+
"projects/coreui-angular/tsconfig.spec.json"
1515
],
1616
"createDefaultProgram": true
1717
},

‎projects/coreui-angular/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
Before you begin, make sure your development environment includes `Node.js®` and `npm` package manager.
4444

4545
###### Node.js
46-
Angular 12 requires `Node.js` version `^12.20` or `^14`.
46+
[**Angular 13**](https://angular.io/guide/what-is-angular) requires `Node.js` LTS version `^12.20`, `^14` or `^16`.
4747

4848
- To check your version, run `node -v` in a terminal/console window.
4949
- To get `Node.js`, go to [nodejs.org](https://nodejs.org/).
@@ -91,7 +91,7 @@ npm install bootstrap
9191

9292
[![npm-coreui-angular-next][npm-coreui-angular-badge-next]][npm-coreui-angular]
9393
[![NPM downloads][npm-coreui-angular-download]][npm-coreui-angular]
94-
![angular](https://img.shields.io/badge/angular-^12.2.0-lightgrey.svg?style=flat-square&logo=angular)
94+
![angular](https://img.shields.io/badge/angular-^13.0.0-lightgrey.svg?style=flat-square&logo=angular)
9595

9696
[npm-coreui-angular-badge-next]: https://img.shields.io/npm/v/@coreui/angular/next?style=flat-square&color=red
9797
[npm-coreui-angular]: https://www.npmjs.com/package/@coreui/angular

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

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
33
"dest": "../../dist/coreui-angular",
44
"lib": {
5-
"entryFile": "src/public-api.ts",
6-
"umdModuleIds": {
7-
"@coreui/icons-angular": "coreui.icons-angular",
8-
"@popperjs/core": "popperjs.core"
9-
}
5+
"entryFile": "src/public-api.ts"
106
},
117
"allowedNonPeerDependencies": [
128
"@popperjs/core"

0 commit comments

Comments
 (0)