Skip to content

Commit 6e9c890

Browse files
committed
Merge branch 'v2'
2 parents e579e7e + 8029ead commit 6e9c890

23 files changed

+132
-289
lines changed

.browserslistrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,3 @@ last 2 Edge major versions
1414
last 2 Safari major versions
1515
last 2 iOS major versions
1616
Firefox ESR
17-
IE 11 # Angular supports IE 11 only as an opt-in. To opt-out, add the 'not' prefix on this line.

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ indent_size = 2
99
insert_final_newline = true
1010
trim_trailing_whitespace = true
1111

12+
[*.ts]
13+
quote_type = single
14+
1215
[*.md]
1316
max_line_length = off
1417
trim_trailing_whitespace = false

.gitignore

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
# See http://help.github.com/ignore-files/ for more about ignoring files.
22

3-
# compiled output
3+
# Compiled output
44
/dist
55
/tmp
66
/out-tsc
77
# Only exists if Bazel was run
88
/bazel-out
99

10-
# dependencies
10+
# Node
1111
/node_modules
12+
npm-debug.log
13+
yarn-error.log
1214
package-lock.json
1315
yarn.lock
1416

@@ -17,32 +19,31 @@ chrome-profiler-events*.json
1719
speed-measure-plugin*.json
1820

1921
# IDEs and editors
20-
/.idea
22+
.idea/
2123
.project
2224
.classpath
2325
.c9/
2426
*.launch
2527
.settings/
2628
*.sublime-workspace
2729

28-
# IDE - VSCode
30+
# Visual Studio Code
2931
.vscode/*
3032
!.vscode/settings.json
3133
!.vscode/tasks.json
3234
!.vscode/launch.json
3335
!.vscode/extensions.json
3436
.history/*
3537

36-
# misc
37-
/.sass-cache
38+
# Miscellaneous
39+
/.angular/cache
40+
.sass-cache/
3841
/connect.lock
3942
/coverage
4043
/libpeerconnection.log
41-
npm-debug.log
42-
yarn-error.log
4344
testem.log
4445
/typings
4546

46-
# System Files
47+
# System files
4748
.DS_Store
4849
Thumbs.db

CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,32 @@
11
### [@coreui/angular](https://coreui.io/) changelog
22

3+
##### `v2.13.0`
4+
5+
- update to `Angular 13.3`
6+
7+
###### dependencies update
8+
- update `@angular/animations` to `^13.3.0`
9+
- update `@angular/common` to `^13.3.0`
10+
- update `@angular/compiler` to `^13.3.0`
11+
- update `@angular/core` to `^13.3.0`
12+
- update `@angular/forms` to `^13.3.0`
13+
- update `@angular/localize` to `^13.3.0`
14+
- update `@angular/platform-browser` to `^13.3.0`
15+
- update `@angular/platform-browser-dynamic` to `^13.3.0`
16+
- update `@angular/router` to `^13.3.0`
17+
- update `rxjs` to `^7.5.5`
18+
- update `@angular-devkit/build-angular` to `^13.3.0`
19+
- update `@angular/cli` to `^13.3.0`
20+
- update `@angular/compiler-cli` to `^13.3.0`
21+
- update `@angular/language-service` to `^13.3.0`
22+
- update `@types/jasmine` to `^3.10.4`
23+
- update `@types/node` to `^16.11.26`
24+
- update `jasmine-core` to `~4.0.1`
25+
- update `karma-coverage` to `~2.1.1`
26+
- update `ng-packagr` to `^13.3.0`
27+
- update `typescript` to `~4.6.2`
28+
- update `node` to `^14.15.0 || >=16.10.0`
29+
330
##### `v2.12.0`
431

532
- update to `Angular 12.2`

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# [@coreui/angular](https://coreui.io/angular)
22

3-
![angular](https://img.shields.io/badge/angular-^12.2.0-lightgrey.svg?style=flat-square&logo=angular)
3+
![angular](https://img.shields.io/badge/angular-^13.3.0-lightgrey.svg?style=flat-square&logo=angular)
44
[![npm package][npm-coreui-angular-badge-v2]][npm-coreui-angular]
55
[![npm package][npm-coreui-angular-badge-latest]][npm-coreui-angular]
66
[![NPM downloads][npm-coreui-angular-download]][npm-coreui-angular]
@@ -21,7 +21,7 @@
2121
[npm-coreui-badge-v2]: https://img.shields.io/npm/v/@coreui/coreui/v2-lts?style=flat-square
2222
[npm-coreui-download]: https://img.shields.io/npm/dm/@coreui/coreui.svg?style=flat-square
2323

24-
# CoreUI for Angular 12 - 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)
24+
# CoreUI for Angular 13 - 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)
2525

2626
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!
2727

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

5757
###### Node.js
58-
Angular 12 requires `Node.js` version 12.20 or later.
58+
Angular 13 requires `Node.js` version 14.15 or later.
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/).
@@ -66,7 +66,7 @@ Install the Angular CLI globally using a terminal/console window.
6666
npm install -g @angular/cli
6767
```
6868

69-
##### Update to Angular 12
69+
##### Update to Angular 13
7070
see: [https://update.angular.io](https://update.angular.io)
7171

7272
## CoreUI Installation

angular.json

Lines changed: 22 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,28 @@
77
"newProjectRoot": "projects",
88
"projects": {
99
"coreui": {
10+
"projectType": "application",
11+
"schematics": {
12+
"@schematics/angular:component": {
13+
"style": "scss"
14+
},
15+
"@schematics/angular:application": {
16+
"strict": true
17+
}
18+
},
1019
"root": "",
1120
"sourceRoot": "src",
12-
"projectType": "application",
1321
"prefix": "app",
14-
"schematics": {},
1522
"architect": {
1623
"build": {
1724
"builder": "@angular-devkit/build-angular:browser",
1825
"options": {
19-
"outputPath": "dist/@coreui",
26+
"outputPath": "dist/coreui/demo",
2027
"index": "src/index.html",
2128
"main": "src/main.ts",
2229
"polyfills": "src/polyfills.ts",
2330
"tsConfig": "src/tsconfig.app.json",
31+
"inlineStyleLanguage": "scss",
2432
"assets": [
2533
"src/favicon.ico",
2634
"src/assets"
@@ -34,9 +42,15 @@
3442
"configurations": {
3543
"production": {
3644
"budgets": [
45+
{
46+
"type": "initial",
47+
"maximumWarning": "500kb",
48+
"maximumError": "1mb"
49+
},
3750
{
3851
"type": "anyComponentStyle",
39-
"maximumWarning": "6kb"
52+
"maximumWarning": "2kb",
53+
"maximumError": "6kb"
4054
}
4155
],
4256
"fileReplacements": [
@@ -93,18 +107,6 @@
93107
"src/assets"
94108
]
95109
}
96-
},
97-
"lint": {
98-
"builder": "@angular-devkit/build-angular:tslint",
99-
"options": {
100-
"tsConfig": [
101-
"src/tsconfig.app.json",
102-
"src/tsconfig.spec.json"
103-
],
104-
"exclude": [
105-
"**/node_modules/**"
106-
]
107-
}
108110
}
109111
}
110112
},
@@ -118,15 +120,6 @@
118120
"protractorConfig": "e2e/protractor.conf.js",
119121
"devServerTarget": "coreui:serve"
120122
}
121-
},
122-
"lint": {
123-
"builder": "@angular-devkit/build-angular:tslint",
124-
"options": {
125-
"tsConfig": "e2e/tsconfig.e2e.json",
126-
"exclude": [
127-
"**/node_modules/**"
128-
]
129-
}
130123
}
131124
}
132125
},
@@ -139,13 +132,14 @@
139132
"build": {
140133
"builder": "@angular-devkit/build-angular:ng-packagr",
141134
"options": {
142-
"tsConfig": "projects/coreui/angular/tsconfig.lib.json",
143135
"project": "projects/coreui/angular/ng-package.json"
144136
},
145137
"configurations": {
146138
"production": {
147-
"project": "projects/coreui/angular/ng-package.prod.json",
148139
"tsConfig": "projects/coreui/angular/tsconfig.lib.prod.json"
140+
},
141+
"development": {
142+
"tsConfig": "projects/coreui/angular/tsconfig.lib.json"
149143
}
150144
},
151145
"defaultConfiguration": "production"
@@ -157,27 +151,9 @@
157151
"tsConfig": "projects/coreui/angular/tsconfig.spec.json",
158152
"karmaConfig": "projects/coreui/angular/karma.conf.js"
159153
}
160-
},
161-
"lint": {
162-
"builder": "@angular-devkit/build-angular:tslint",
163-
"options": {
164-
"tsConfig": [
165-
"projects/coreui/angular/tsconfig.lib.json",
166-
"projects/coreui/angular/tsconfig.spec.json"
167-
],
168-
"exclude": [
169-
"**/node_modules/**"
170-
]
171-
}
172154
}
173155
}
174156
}
175157
},
176-
"defaultProject": "coreui",
177-
"schematics": {
178-
"@schematics/angular:component": {
179-
"style": "scss"
180-
}
181-
}
182-
158+
"defaultProject": "coreui"
183159
}

package.json

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/angular-dev",
3-
"version": "2.12.0",
3+
"version": "2.13.0",
44
"license": "MIT",
55
"author": {
66
"name": "Łukasz Holeczek",
@@ -30,47 +30,45 @@
3030
},
3131
"private": true,
3232
"dependencies": {
33-
"@angular/animations": "^12.2.16",
34-
"@angular/common": "^12.2.16",
35-
"@angular/compiler": "^12.2.16",
36-
"@angular/core": "^12.2.16",
37-
"@angular/forms": "^12.2.16",
38-
"@angular/localize": "^12.2.16",
39-
"@angular/platform-browser": "^12.2.16",
40-
"@angular/platform-browser-dynamic": "^12.2.16",
41-
"@angular/router": "^12.2.16",
42-
"rxjs": "^6.6.7",
33+
"@angular/animations": "^13.3.0",
34+
"@angular/common": "^13.3.0",
35+
"@angular/compiler": "^13.3.0",
36+
"@angular/core": "^13.3.0",
37+
"@angular/forms": "^13.3.0",
38+
"@angular/localize": "^13.3.0",
39+
"@angular/platform-browser": "^13.3.0",
40+
"@angular/platform-browser-dynamic": "^13.3.0",
41+
"@angular/router": "^13.3.0",
42+
"rxjs": "^7.5.5",
4343
"tslib": "^2.3.1",
4444
"zone.js": "~0.11.4"
4545
},
4646
"devDependencies": {
47-
"@angular-devkit/build-angular": "^12.2.16",
48-
"@angular/cli": "^12.2.16",
49-
"@angular/compiler-cli": "^12.2.16",
50-
"@angular/language-service": "^12.2.16",
47+
"@angular-devkit/build-angular": "^13.3.0",
48+
"@angular/cli": "^13.3.0",
49+
"@angular/compiler-cli": "^13.3.0",
50+
"@angular/language-service": "^13.3.0",
5151
"@coreui/coreui": "^2.1.16",
52-
"@types/jasmine": "^3.6.11",
52+
"@types/jasmine": "^3.10.4",
5353
"@types/jasminewd2": "^2.0.10",
54-
"@types/node": "^14.18.12",
55-
"codelyzer": "^6.0.2",
56-
"jasmine-core": "~3.10.1",
54+
"@types/node": "^16.11.26",
55+
"jasmine-core": "~4.0.1",
5756
"jasmine-spec-reporter": "~7.0.0",
5857
"karma": "^6.3.17",
5958
"karma-chrome-launcher": "~3.1.1",
60-
"karma-coverage": "~2.0.3",
59+
"karma-coverage": "~2.1.1",
6160
"karma-jasmine": "~4.0.1",
6261
"karma-jasmine-html-reporter": "^1.7.0",
63-
"ng-packagr": "^12.2.7",
62+
"ng-packagr": "^13.3.0",
6463
"ngx-perfect-scrollbar": "^10.1.1",
6564
"protractor": "~7.0.0",
6665
"shelljs": "^0.8.5",
6766
"simple-line-icons": "^2.5.5",
6867
"ts-node": "^9.1.1",
69-
"tslint": "~6.1.3",
70-
"typescript": "~4.3.5"
68+
"typescript": "~4.6.2"
7169
},
7270
"engines": {
73-
"node": "^12.20.0 || >=14.0.0",
74-
"npm": ">= 6"
71+
"node": "^14.15.0 || >=16.10.0",
72+
"npm": ">= 8"
7573
}
7674
}
Lines changed: 16 additions & 0 deletions
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/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# [@coreui/angular](https://coreui.io/angular)
22

3-
![angular](https://img.shields.io/badge/angular-^12.2.0-lightgrey.svg?style=flat-square&logo=angular)
3+
![angular](https://img.shields.io/badge/angular-^13.3.0-lightgrey.svg?style=flat-square&logo=angular)
44
[![npm package][npm-coreui-angular-badge-v2]][npm-coreui-angular]
55
[![npm package][npm-coreui-angular-badge-latest]][npm-coreui-angular]
66
[![NPM downloads][npm-coreui-angular-download]][npm-coreui-angular]
@@ -29,18 +29,18 @@
2929
Before you begin, make sure your development environment includes `Node.js®` and an `npm` package manager.
3030

3131
###### Node.js
32-
Angular 12 requires `Node.js` version 12.20 or later.
32+
Angular 13 requires `Node.js` version 14.15 or later.
3333

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

3737
###### Angular CLI
3838
Install the Angular CLI globally using a terminal/console window.
3939
```bash
40-
npm install -g @angular/cli@12
40+
npm install -g @angular/cli@13
4141
```
4242

43-
##### Update to Angular 12
43+
##### Update to Angular 13
4444
see: [https://update.angular.io](https://update.angular.io)
4545

4646
## CoreUI Installation

0 commit comments

Comments
 (0)