Skip to content

Commit df0bb70

Browse files
committed
chore: update to Angular 7
1 parent 9a91bfe commit df0bb70

File tree

8 files changed

+61
-34
lines changed

8 files changed

+61
-34
lines changed

CHANGELOG.md

+24
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
11
### [@coreui/angular](https://coreui.io/) changelog
22

3+
##### `v2.2.0`
4+
- chore: build with Angular 7
5+
- chore: update Angular to `^7.1.0` see: https://update.angular.io/
6+
- update: `@angular/animations` to `^7.1.1`
7+
- update: `@angular/common` to `^7.1.1`
8+
- update: `@angular/compiler` to `^7.1.1`
9+
- update: `@angular/core` to `^7.1.1`
10+
- update: `@angular/forms` to `^7.1.1`
11+
- update: `@angular/http` to `^7.1.1`
12+
- update: `@angular/platform-browser` to `^7.1.1`
13+
- update: `@angular/platform-browser-dynamic` to `^7.1.1`
14+
- update: `@angular/router` to `^7.1.1`
15+
- update: `@angular-devkit/build-angular` to `~0.11.0`
16+
- update: `@angular-devkit/build-ng-packagr` to `~0.11.0`
17+
- update: `@angular/cli` to `^7.1.0`
18+
- update: `@angular/compiler-cli` to `^7.1.1`
19+
- update: `@angular/language-service` to `^7.1.1`
20+
- update: `@types/jasmine` to `~3.3.0`
21+
- update: `karma` to `^3.1.3`
22+
- update: `karma-jasmine` to `~2.0.1`
23+
- update: `ng-packagr` to `^4.4.5`
24+
- update: `ts-node` to `~7.0.1`
25+
- update: `typescript` to `^3.1.6"
26+
327
##### `v2.1.0`
428
- feat: sidebar nav-link `attributes` - optional JS object with valid JS API naming:
529
- valid attributes: `rel`, `target`, `hidden`, `disabled`, etc...

package.json

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/angular-dev",
3-
"version": "2.1.0",
3+
"version": "2.2.0",
44
"license": "MIT",
55
"author": {
66
"name": "Łukasz Holeczek",
@@ -27,43 +27,43 @@
2727
},
2828
"private": true,
2929
"dependencies": {
30-
"@angular/animations": "^6.1.10",
31-
"@angular/common": "^6.1.10",
32-
"@angular/compiler": "^6.1.10",
33-
"@angular/core": "^6.1.10",
34-
"@angular/forms": "^6.1.10",
35-
"@angular/http": "^6.1.10",
36-
"@angular/platform-browser": "^6.1.10",
37-
"@angular/platform-browser-dynamic": "^6.1.10",
38-
"@angular/router": "^6.1.10",
30+
"@angular/animations": "^7.1.1",
31+
"@angular/common": "^7.1.1",
32+
"@angular/compiler": "^7.1.1",
33+
"@angular/core": "^7.1.1",
34+
"@angular/forms": "^7.1.1",
35+
"@angular/http": "^7.1.1",
36+
"@angular/platform-browser": "^7.1.1",
37+
"@angular/platform-browser-dynamic": "^7.1.1",
38+
"@angular/router": "^7.1.1",
3939
"core-js": "^2.5.7",
4040
"rxjs": "^6.3.3",
4141
"zone.js": "^0.8.26"
4242
},
4343
"devDependencies": {
44-
"@angular-devkit/build-angular": "~0.8.8",
45-
"@angular-devkit/build-ng-packagr": "~0.8.8",
46-
"@angular/cli": "^6.2.8",
47-
"@angular/compiler-cli": "^6.1.10",
48-
"@angular/language-service": "^6.1.10",
49-
"@types/jasmine": "~2.8.12",
44+
"@angular-devkit/build-angular": "~0.11.0",
45+
"@angular-devkit/build-ng-packagr": "~0.11.0",
46+
"@angular/cli": "^7.1.0",
47+
"@angular/compiler-cli": "^7.1.1",
48+
"@angular/language-service": "^7.1.1",
49+
"@types/jasmine": "~3.3.0",
5050
"@types/jasminewd2": "~2.0.6",
51-
"@types/node": "~10.12.10",
51+
"@types/node": "~10.12.11",
5252
"codelyzer": "~4.5.0",
5353
"jasmine-core": "~3.3.0",
5454
"jasmine-spec-reporter": "~4.2.1",
55-
"karma": "^3.1.1",
55+
"karma": "^3.1.3",
5656
"karma-chrome-launcher": "~2.2.0",
5757
"karma-coverage-istanbul-reporter": "~2.0.4",
58-
"karma-jasmine": "~1.1.2",
58+
"karma-jasmine": "~2.0.1",
5959
"karma-jasmine-html-reporter": "^1.4.0",
60-
"ng-packagr": "^3.0.6",
60+
"ng-packagr": "^4.4.5",
6161
"protractor": "~5.4.1",
6262
"shelljs": "^0.8.3",
63-
"ts-node": "~6.2.0",
63+
"ts-node": "~7.0.1",
6464
"tsickle": "^0.34.0",
6565
"tslib": "^1.9.3",
6666
"tslint": "~5.11.0",
67-
"typescript": "~2.9.2"
67+
"typescript": "^3.1.6"
6868
}
6969
}

projects/coreui/angular/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/angular",
3-
"version": "2.1.0",
3+
"version": "2.2.0",
44
"description": "CoreUI Angular Bootstrap 4 components",
55
"license": "MIT",
66
"homepage": "https://coreui.io/angular",
@@ -17,8 +17,8 @@
1717
}
1818
],
1919
"peerDependencies": {
20-
"@angular/common": "^6.1.10",
21-
"@angular/core": "^6.1.10",
20+
"@angular/common": "^7.1.1",
21+
"@angular/core": "^7.1.1",
2222
"@coreui/coreui": "^2.1.3"
2323
},
2424
"repository": {

projects/coreui/angular/src/lib/sidebar/app-sidebar-nav.component.ts

+4-5
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,11 @@ export class AppSidebarNavItemComponent implements OnInit {
153153
[attr.disabled]="true"
154154
[appLinkAttributes]="link.attributes"
155155
href=""
156-
[ngClass]="getClasses()"
157-
>
156+
[ngClass]="getClasses()">
158157
<i *ngIf="isIcon()" class="nav-icon {{ link.icon }}"></i>
159-
{{ link.name }}
160-
<span *ngIf="isBadge()" [ngClass]="'badge badge-' + link.badge.variant">{{ link.badge.text }}</span>
161-
</a>
158+
{{ link.name }}
159+
<span *ngIf="isBadge()" [ngClass]="'badge badge-' + link.badge.variant">{{ link.badge.text }}</span>
160+
</a>
162161
<a *ngSwitchCase="'external'" [ngClass]="getClasses()" href="{{link.url}}" [appLinkAttributes]="link.attributes">
163162
<i *ngIf="isIcon()" class="nav-icon {{ link.icon }}"></i>
164163
{{ link.name }}

projects/coreui/angular/src/lib/sidebar/app-sidebar.module.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { CommonModule } from '@angular/common';
22
import { NgModule} from '@angular/core';
33
import { RouterModule } from '@angular/router';
4-
import { HttpClientModule } from '@angular/common/http';
54
import { LayoutModule } from './../shared/layout/layout.module';
65

76
// App Sidebar Component

projects/coreui/angular/tsconfig.lib.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"types": [],
1515
"lib": [
1616
"dom",
17-
"es2015"
17+
"es2018"
1818
]
1919
},
2020
"angularCompilerOptions": {
@@ -24,7 +24,8 @@
2424
"fullTemplateTypeCheck": true,
2525
"strictInjectionParameters": true,
2626
"flatModuleId": "AUTOGENERATED",
27-
"flatModuleOutFile": "AUTOGENERATED"
27+
"flatModuleOutFile": "AUTOGENERATED",
28+
"enableResourceInlining": true
2829
},
2930
"exclude": [
3031
"src/test.ts",

src/polyfills.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
/** Evergreen browsers require these. **/
4545
// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
46-
import 'core-js/es7/reflect';
46+
4747

4848

4949
/**

tsconfig.json

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"compileOnSave": false,
33
"compilerOptions": {
44
"baseUrl": "./",
5+
"importHelpers": true,
56
"outDir": "./dist/out-tsc",
67
"sourceMap": true,
78
"declaration": false,
@@ -22,6 +23,9 @@
2223
],
2324
"angular": [
2425
"dist/angular"
26+
],
27+
"angular/*": [
28+
"dist/angular/*"
2529
]
2630
}
2731
}

0 commit comments

Comments
 (0)