Skip to content

Commit e87da6b

Browse files
authored
build: upgrade angular9 (coreui#33)
1 parent 916d333 commit e87da6b

File tree

6 files changed

+3869
-1224
lines changed

6 files changed

+3869
-1224
lines changed

angular.json

+10-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
"prefix": "app",
1111
"schematics": {
1212
"@schematics/angular:component": {
13-
"styleext": "scss"
13+
"style": "scss"
1414
}
1515
},
1616
"architect": {
1717
"build": {
1818
"builder": "@angular-devkit/build-angular:browser",
1919
"options": {
20+
"aot": true,
2021
"outputPath": "dist/daming-core-ui",
2122
"index": "src/index.html",
2223
"main": "src/main.ts",
@@ -53,6 +54,10 @@
5354
"type": "initial",
5455
"maximumWarning": "2mb",
5556
"maximumError": "5mb"
57+
},
58+
{
59+
"type": "anyComponentStyle",
60+
"maximumWarning": "6kb"
5661
}
5762
]
5863
}
@@ -135,5 +140,8 @@
135140
}
136141
}
137142
},
138-
"defaultProject": "daming-core-ui"
143+
"defaultProject": "daming-core-ui",
144+
"cli": {
145+
"analytics": "887bb0b9-1d66-4afa-a5d7-f6955203066e"
146+
}
139147
}

package.json

+32-30
Original file line numberDiff line numberDiff line change
@@ -10,48 +10,50 @@
1010
"e2e": "ng e2e",
1111
"precommit": "ng lint daming-core-ui && sass-lint -v -q",
1212
"sass": "sass-lint -v -q",
13-
"push": "ng build --prod --base-href ./ && npx angular-cli-ghpages --dir=dist/daming-core-ui "
13+
"push": "ng build --prod --base-href ./ && npx angular-cli-ghpages --dir=dist/daming-core-ui",
14+
"postinstall": "ngcc --properties es2015 browser module main --first-only"
1415
},
1516
"private": true,
1617
"dependencies": {
17-
"@angular/animations": "^8.0.0",
18-
"@angular/common": "~8.0.0",
19-
"@angular/compiler": "~8.0.0",
20-
"@angular/core": "~8.0.0",
21-
"@angular/forms": "~8.0.0",
22-
"@angular/platform-browser": "~8.0.0",
23-
"@angular/platform-browser-dynamic": "~8.0.0",
24-
"@angular/router": "~8.0.0",
25-
"@coreui/angular": "^2.2.3",
18+
"@angular/animations": "^9.1.13",
19+
"@angular/common": "~9.1.13",
20+
"@angular/compiler": "~9.1.13",
21+
"@angular/core": "~9.1.13",
22+
"@angular/forms": "~9.1.13",
23+
"@angular/platform-browser": "~9.1.13",
24+
"@angular/platform-browser-dynamic": "~9.1.13",
25+
"@angular/router": "~9.1.13",
26+
"@coreui/angular": "^2.9.6",
2627
"@coreui/coreui": "^2.1.6",
27-
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
28-
"angular2-toaster": "^7.0.0",
29-
"bootstrap": "^4.2.1",
28+
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.3.1",
29+
"angular2-toaster": "^10.0.0",
30+
"bootstrap": "^4.5.0",
3031
"chart.js": "^2.9.4",
31-
"core-js": "^2.5.4",
32+
"core-js": "^3.6.5",
3233
"flag-icon-css": "^3.2.1",
3334
"font-awesome": "^4.7.0",
3435
"moment": "^2.24.0",
3536
"mutationobserver-shim": "^0.3.3",
36-
"ng2-charts": "^1.6.0",
37-
"ngx-bootstrap": "^3.1.4",
38-
"ngx-perfect-scrollbar": "^7.2.0",
39-
"ngx-toastr": "^9.1.1",
40-
"rxjs": "~6.5.2",
41-
"simple-line-icons": "^2.4.1",
42-
"tslib": "^1.9.0",
43-
"zone.js": "~0.9.1"
37+
"ng2-charts": "^2.3.2",
38+
"ngx-bootstrap": "^5.6.1",
39+
"ngx-perfect-scrollbar": "^9.0.0",
40+
"ngx-toastr": "^12.1.0",
41+
"rxjs": "~6.6.7",
42+
"simple-line-icons": "^2.5.2",
43+
"tslib": "^1.10.0",
44+
"web-animations-js": "^2.3.2",
45+
"zone.js": "~0.10.2"
4446
},
4547
"devDependencies": {
46-
"@angular-devkit/build-angular": "~0.800.0",
47-
"@angular/cli": "~8.0.1",
48-
"@angular/compiler-cli": "~8.0.0",
49-
"@angular/language-service": "~8.0.0",
48+
"@angular-devkit/build-angular": "~0.901.15",
49+
"@angular/cli": "~9.1.15",
50+
"@angular/compiler-cli": "~9.1.13",
51+
"@angular/language-service": "~9.1.13",
5052
"@types/jasmine": "~2.8.8",
5153
"@types/jasminewd2": "~2.0.3",
52-
"@types/node": "~8.9.4",
54+
"@types/node": "^12.11.1",
5355
"angular-cli-ghpages": "^0.5.3",
54-
"codelyzer": "^5.0.1",
56+
"codelyzer": "^5.1.2",
5557
"husky": "^2.2.0",
5658
"jasmine-core": "~2.99.1",
5759
"jasmine-spec-reporter": "~4.2.1",
@@ -64,6 +66,6 @@
6466
"sass-lint": "^1.12.1",
6567
"ts-node": "~7.0.0",
6668
"tslint": "~5.11.0",
67-
"typescript": "3.4.5"
69+
"typescript": "3.8.3"
6870
}
69-
}
71+
}

src/app/shared/shared.module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
33
import { ReactiveFormsModule, FormsModule } from '@angular/forms';
44
import { RouterModule } from '@angular/router';
55
import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
6-
import { ChartsModule } from 'ng2-charts/ng2-charts';
6+
import { ChartsModule } from 'ng2-charts';
77
import { ToastrModule } from 'ngx-toastr';
88
import { ToasterModule } from 'angular2-toaster';
99
import { SharedBootstrapModule } from './shared.bootstrap.module';
@@ -34,7 +34,7 @@ import { SharedBootstrapModule } from './shared.bootstrap.module';
3434
})
3535
export class SharedModule {
3636

37-
static forRoot(): ModuleWithProviders {
37+
static forRoot(): ModuleWithProviders<SharedModule> {
3838
return {
3939
ngModule: SharedModule
4040
};

src/styles.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// regular style toast
99
// @import '~ngx-toastr/toastr.css';
10-
@import '~angular2-toaster/src/toaster';
10+
@import '~angular2-toaster/toaster.scss';
1111

1212
// bootstrap style toast
1313
// or import a bootstrap 4 alert styled design (SASS ONLY)

src/tsconfig.app.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
"outDir": "../out-tsc/app",
55
"types": []
66
},
7-
"exclude": [
8-
"test.ts",
9-
"**/*.spec.ts"
7+
"files": [
8+
"main.ts",
9+
"polyfills.ts"
10+
],
11+
"include": [
12+
"src/**/*.d.ts"
1013
]
1114
}

0 commit comments

Comments
 (0)