Skip to content

Commit 2a104ce

Browse files
committed
chore: update to Angular 11 and TypeScript 4
1 parent d709717 commit 2a104ce

15 files changed

+136
-102
lines changed

.browserslistrc

+14-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
1-
# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
1+
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
22
# For additional information regarding the format and rule options, please see:
33
# https://github.com/browserslist/browserslist#queries
4-
# For IE 9-11 support, please uncomment the last line of the file and adjust as needed
5-
> 0.5%
6-
last 2 versions
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
716
Firefox ESR
8-
not dead
9-
IE 10-11
10-
# IE 9-11
17+
IE 11 # Angular supports IE 11 only as an opt-in. To opt-out, add the 'not' prefix on this line.

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
[![npm package][npm-coreui-angular-badge-latest]][npm-coreui-angular]
44
[![NPM downloads][npm-coreui-angular-download]][npm-coreui-angular]
5+
![angular](https://img.shields.io/badge/angular-^11.0.9-lightgrey.svg?style=flat-square&logo=angular)
56
[![npm-coreui-angular-next][npm-coreui-angular-badge-next]][npm-coreui-angular]
67
[![@coreui coreui](https://img.shields.io/badge/@coreui%20-coreui-lightgrey.svg?style=flat-square)](https://github.com/coreui/coreui)
78
[![npm package][npm-coreui-badge]][npm-coreui]
89
[![NPM downloads][npm-coreui-download]][npm-coreui]
9-
![angular](https://img.shields.io/badge/angular-^10.2.0-lightgrey.svg?style=flat-square&logo=angular)
1010

1111
[npm-coreui-angular]: https://www.npmjs.com/package/@coreui/angular
1212
[npm-coreui-angular-badge-latest]: https://img.shields.io/npm/v/@coreui/angular/latest?style=flat-square&color=red
@@ -17,7 +17,7 @@
1717
[npm-coreui-badge]: https://img.shields.io/npm/v/@coreui/coreui.png?style=flat-square
1818
[npm-coreui-download]: https://img.shields.io/npm/dm/@coreui/coreui.svg?style=flat-square
1919

20-
# CoreUI for Angular 10 - Free WebApp UI Kit built on top of Bootstrap 4 [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/intent/tweet?text=CoreUI%20-%20Free%20Bootstrap%204%20Admin%20Template%20&url=https://coreui.io&hashtags=,admin,template,dashboard,panel,free,angular,react,vue)
20+
# CoreUI for Angular 11 - Free WebApp UI Kit built on top of Bootstrap 4 [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/intent/tweet?text=CoreUI%20-%20Free%20Bootstrap%204%20Admin%20Template%20&url=https://coreui.io&hashtags=,admin,template,dashboard,panel,free,angular,react,vue)
2121

2222
Please help us on [Product Hunt](https://www.producthunt.com/posts/coreui-open-source-bootstrap-4-admin-template-with-angular-2-react-js-vue-js-support) and [Designer News](https://www.designernews.co/stories/81127). Thanks in advance!
2323

@@ -56,7 +56,7 @@ CoreUI is an Open Source UI Kit built on top of Bootstrap 4. CoreUI is the faste
5656
Before you begin, make sure your development environment includes `Node.js®` and an `npm` package manager.
5757

5858
###### Node.js
59-
Angular 10 requires `Node.js` version 10.13 or later.
59+
Angular 11 requires `Node.js` version 10.13 or later.
6060

6161
- To check your version, run `node -v` in a terminal/console window.
6262
- To get `Node.js`, go to [nodejs.org](https://nodejs.org/).
@@ -67,7 +67,7 @@ Install the Angular CLI globally using a terminal/console window.
6767
npm install -g @angular/cli
6868
```
6969

70-
##### Update to Angular 10
70+
##### Update to Angular 11
7171
see: [https://update.angular.io](https://update.angular.io)
7272

7373
## CoreUI Installation

angular.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
"optimization": true,
4646
"outputHashing": "all",
4747
"sourceMap": false,
48-
"extractCss": true,
4948
"namedChunks": false,
5049
"aot": true,
5150
"extractLicenses": true,
@@ -131,7 +130,7 @@
131130
"prefix": "lib",
132131
"architect": {
133132
"build": {
134-
"builder": "@angular-devkit/build-ng-packagr:build",
133+
"builder": "@angular-devkit/build-angular:ng-packagr",
135134
"options": {
136135
"tsConfig": "projects/coreui/angular/tsconfig.lib.json",
137136
"project": "projects/coreui/angular/ng-package.json"

e2e/src/app.e2e-spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ describe('CoreUI template', () => {
1515
// page.navigateTo();
1616
// });
1717

18-
it('should display CoreUI Dashboard', () => {
19-
expect(page.getParagraphText()).toEqual('CoreUI Dashboard');
18+
it('should display CoreUI Dashboard', async () => {
19+
expect(await page.getParagraphText()).toEqual('CoreUI Dashboard');
2020
});
2121

2222
it('should toggle `sidebar-minimized` body.class on `sidebar-minimizer` click', () => {

package.json

+22-24
Original file line numberDiff line numberDiff line change
@@ -33,45 +33,43 @@
3333
},
3434
"private": true,
3535
"dependencies": {
36-
"@angular/animations": "^10.2.4",
37-
"@angular/common": "^10.2.4",
38-
"@angular/compiler": "^10.2.4",
39-
"@angular/core": "^10.2.4",
40-
"@angular/forms": "^10.2.4",
41-
"@angular/localize": "^10.2.4",
42-
"@angular/platform-browser": "^10.2.4",
43-
"@angular/platform-browser-dynamic": "^10.2.4",
44-
"@angular/router": "^10.2.4",
36+
"@angular/animations": "^11.0.9",
37+
"@angular/common": "^11.0.9",
38+
"@angular/compiler": "^11.0.9",
39+
"@angular/core": "^11.0.9",
40+
"@angular/forms": "^11.0.9",
41+
"@angular/localize": "^11.0.9",
42+
"@angular/platform-browser": "^11.0.9",
43+
"@angular/platform-browser-dynamic": "^11.0.9",
44+
"@angular/router": "^11.0.9",
4545
"rxjs": "^6.6.3",
4646
"tslib": "^2.0.0",
47-
"zone.js": "^0.10.3"
47+
"zone.js": "^0.11.3"
4848
},
4949
"devDependencies": {
50-
"@angular-devkit/build-angular": "^0.1002.1",
51-
"@angular-devkit/build-ng-packagr": "^0.1002.1",
52-
"@angular/cli": "^10.2.1",
53-
"@angular/compiler-cli": "^10.2.4",
54-
"@angular/language-service": "^10.2.4",
50+
"@angular-devkit/build-angular": "^0.1100.7",
51+
"@angular/cli": "^11.0.7",
52+
"@angular/compiler-cli": "^11.0.9",
53+
"@angular/language-service": "^11.0.9",
5554
"@coreui/coreui": "^2.1.16",
56-
"@types/jasmine": "^3.6.2",
57-
"@types/jasminewd2": "~2.0.8",
55+
"@types/jasmine": "~3.6.0",
5856
"@types/node": "^14.14.20",
59-
"codelyzer": "^6.0.1",
60-
"jasmine-core": "~3.5.0",
57+
"codelyzer": "^6.0.0",
58+
"jasmine-core": "~3.6.0",
6159
"jasmine-spec-reporter": "~5.0.0",
62-
"karma": "~5.0.0",
60+
"karma": "^5.2.3",
6361
"karma-chrome-launcher": "~3.1.0",
64-
"karma-coverage-istanbul-reporter": "~3.0.2",
62+
"karma-coverage": "~2.0.3",
6563
"karma-jasmine": "~4.0.0",
6664
"karma-jasmine-html-reporter": "^1.5.0",
67-
"ng-packagr": "^10.1.0",
65+
"ng-packagr": "^11.0.3",
6866
"ngx-perfect-scrollbar": "^10.1.0",
6967
"protractor": "~7.0.0",
7068
"shelljs": "^0.8.4",
7169
"simple-line-icons": "^2.5.5",
72-
"ts-node": "^8.10.2",
70+
"ts-node": "^9.1.1",
7371
"tslint": "~6.1.0",
74-
"typescript": "~3.9.7"
72+
"typescript": "~4.0.5"
7573
},
7674
"engines": {
7775
"node": ">= 10.13",

projects/coreui/angular/README.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
[![npm package][npm-coreui-angular-badge-latest]][npm-coreui-angular]
44
[![NPM downloads][npm-coreui-angular-download]][npm-coreui-angular]
5+
![angular](https://img.shields.io/badge/angular-^11.0.9-lightgrey.svg?style=flat-square&logo=angular)
56
[![npm-coreui-angular-next][npm-coreui-angular-badge-next]][npm-coreui-angular]
67
[![@coreui coreui](https://img.shields.io/badge/@coreui%20-coreui-lightgrey.svg?style=flat-square)](https://github.com/coreui/coreui)
78
[![npm package][npm-coreui-badge]][npm-coreui]
89
[![NPM downloads][npm-coreui-download]][npm-coreui]
9-
![angular](https://img.shields.io/badge/angular-^10.2.0-lightgrey.svg?style=flat-square&logo=angular)
10+
1011

1112
[npm-coreui-angular]: https://www.npmjs.com/package/@coreui/angular
1213
[npm-coreui-angular-badge-latest]: https://img.shields.io/npm/v/@coreui/angular/latest?style=flat-square&color=red
@@ -25,7 +26,7 @@
2526
Before you begin, make sure your development environment includes `Node.js®` and an `npm` package manager.
2627

2728
###### Node.js
28-
Angular 10 requires `Node.js` version 10.13 or later.
29+
Angular 11 requires `Node.js` version 10.13 or later.
2930

3031
- To check your version, run `node -v` in a terminal/console window.
3132
- To get `Node.js`, go to [nodejs.org](https://nodejs.org/).
@@ -36,7 +37,7 @@ Install the Angular CLI globally using a terminal/console window.
3637
npm install -g @angular/cli
3738
```
3839

39-
##### Update to Angular 10
40+
##### Update to Angular 11
4041
see: [https://update.angular.io](https://update.angular.io)
4142

4243
## CoreUI Installation

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

+17-5
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,28 @@ module.exports = function (config) {
99
require('karma-jasmine'),
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
12-
require('karma-coverage-istanbul-reporter'),
12+
require('karma-coverage'),
1313
require('@angular-devkit/build-angular/plugins/karma')
1414
],
1515
client: {
16+
jasmine: {
17+
// you can add configuration options for Jasmine here
18+
// the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
19+
// for example, you can disable the random execution with `random: false`
20+
// or set a specific seed with `seed: 4321`
21+
},
1622
clearContext: false // leave Jasmine Spec Runner output visible in browser
1723
},
18-
coverageIstanbulReporter: {
19-
dir: require('path').join(__dirname, '../../../coverage/coreui/angular'),
20-
reports: ['html', 'lcovonly', 'text-summary'],
21-
fixWebpackSourcePaths: true
24+
jasmineHtmlReporter: {
25+
suppressAll: true // removes the duplicated traces
26+
},
27+
coverageReporter: {
28+
dir: require('path').join(__dirname, '../../../coverage/coreui-angular'),
29+
subdir: '.',
30+
reporters: [
31+
{ type: 'html' },
32+
{ type: 'text-summary' }
33+
]
2234
},
2335
reporters: ['progress', 'kjhtml'],
2436
port: 9876,

projects/coreui/angular/karma.conf.js

+17-5
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,28 @@ module.exports = function (config) {
99
require('karma-jasmine'),
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
12-
require('karma-coverage-istanbul-reporter'),
12+
require('karma-coverage'),
1313
require('@angular-devkit/build-angular/plugins/karma')
1414
],
1515
client: {
16+
jasmine: {
17+
// you can add configuration options for Jasmine here
18+
// the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
19+
// for example, you can disable the random execution with `random: false`
20+
// or set a specific seed with `seed: 4321`
21+
},
1622
clearContext: false // leave Jasmine Spec Runner output visible in browser
1723
},
18-
coverageIstanbulReporter: {
19-
dir: require('path').join(__dirname, '../../../coverage/coreui/angular'),
20-
reports: ['html', 'lcovonly', 'text-summary'],
21-
fixWebpackSourcePaths: true
24+
jasmineHtmlReporter: {
25+
suppressAll: true // removes the duplicated traces
26+
},
27+
coverageReporter: {
28+
dir: require('path').join(__dirname, '../../../coverage/coreui-angular'),
29+
subdir: '.',
30+
reporters: [
31+
{ type: 'html' },
32+
{ type: 'text-summary' }
33+
]
2234
},
2335
reporters: ['progress', 'kjhtml'],
2436
port: 9876,
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
33
"dest": "../../../dist/@coreui/angular",
4+
"deleteDestPath": true,
45
"lib": {
56
"entryFile": "src/public-api.ts"
67
}
7-
}
8+
}

projects/coreui/angular/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
"tslib": "^2.0.0"
2121
},
2222
"peerDependencies": {
23-
"@angular/common": "^10.2.0",
24-
"@angular/core": "^10.2.0",
25-
"@angular/router": "^10.2.0",
23+
"@angular/common": "^11.0.0",
24+
"@angular/core": "^11.0.0",
25+
"@angular/router": "^11.0.0",
2626
"@coreui/coreui": "^2.1.16"
2727
},
2828
"repository": {

projects/coreui/angular/tsconfig.lib.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
/* To learn more about this file see: https://angular.io/config/tsconfig. */
12
{
23
"extends": "../../../tsconfig.json",
34
"compilerOptions": {
45
"outDir": "../../../out-tsc/lib",
56
"declarationMap": true,
67
"target": "es2015",
78
"declaration": true,
8-
"sourceMap": true,
99
"inlineSources": true,
1010
"types": [],
1111
"lib": [

projects/coreui/angular/tsconfig.lib.prod.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* To learn more about this file see: https://angular.io/config/tsconfig. */
12
{
23
"extends": "./tsconfig.lib.json",
34
"compilerOptions": {

src/app/app.routing.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const routes: Routes = [
2727
];
2828

2929
@NgModule({
30-
imports: [ RouterModule.forRoot(routes) ],
30+
imports: [ RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' }) ],
3131
exports: [ RouterModule ]
3232
})
3333
export class AppRoutingModule {}

src/karma.conf.js

+20-7
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,36 @@ module.exports = function (config) {
99
require('karma-jasmine'),
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
12-
require('karma-coverage-istanbul-reporter'),
12+
require('karma-coverage'),
1313
require('@angular-devkit/build-angular/plugins/karma')
1414
],
1515
client: {
16+
jasmine: {
17+
// you can add configuration options for Jasmine here
18+
// the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
19+
// for example, you can disable the random execution with `random: false`
20+
// or set a specific seed with `seed: 4321`
21+
},
1622
clearContext: false // leave Jasmine Spec Runner output visible in browser
1723
},
18-
coverageIstanbulReporter: {
19-
dir: require('path').join(__dirname, '../coverage'),
20-
reports: ['html', 'lcovonly'],
21-
fixWebpackSourcePaths: true
24+
jasmineHtmlReporter: {
25+
suppressAll: true // removes the duplicated traces
26+
},
27+
coverageReporter: {
28+
dir: require('path').join(__dirname, '../coverage/coreui-test'),
29+
subdir: '.',
30+
reporters: [
31+
{ type: 'html' },
32+
{ type: 'text-summary' }
33+
]
2234
},
2335
reporters: ['progress', 'kjhtml'],
2436
port: 9876,
2537
colors: true,
2638
logLevel: config.LOG_INFO,
2739
autoWatch: true,
2840
browsers: ['Chrome'],
29-
singleRun: false
41+
singleRun: false,
42+
restartOnFileChange: true
3043
});
31-
};
44+
};

0 commit comments

Comments
 (0)