Skip to content

Commit 8ad756d

Browse files
authored
Merge pull request coreui#14 from damingerdai/develop
build(angular): 升级到angular8
2 parents 6f20eed + 3d9a1c7 commit 8ad756d

File tree

7 files changed

+1591
-2005
lines changed

7 files changed

+1591
-2005
lines changed
File renamed without changes.

package.json

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
},
1515
"private": true,
1616
"dependencies": {
17-
"@angular/animations": "^7.2.15",
18-
"@angular/common": "~7.2.15",
19-
"@angular/compiler": "~7.2.15",
20-
"@angular/core": "~7.2.15",
21-
"@angular/forms": "~7.2.15",
22-
"@angular/platform-browser": "~7.2.15",
23-
"@angular/platform-browser-dynamic": "~7.2.15",
24-
"@angular/router": "~7.2.15",
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",
2525
"@coreui/angular": "^2.2.3",
2626
"@coreui/coreui": "^2.1.6",
2727
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
@@ -37,21 +37,22 @@
3737
"ngx-bootstrap": "^3.1.4",
3838
"ngx-perfect-scrollbar": "^7.2.0",
3939
"ngx-toastr": "^9.1.1",
40-
"rxjs": "~6.5.1",
40+
"rxjs": "~6.5.2",
4141
"simple-line-icons": "^2.4.1",
4242
"tslib": "^1.9.0",
43-
"zone.js": "~0.8.29"
43+
"zone.js": "~0.9.1"
4444
},
4545
"devDependencies": {
46-
"@angular-devkit/build-angular": "~0.12.0",
47-
"@angular/cli": "~7.3.9",
48-
"@angular/compiler-cli": "~7.2.15",
49-
"@angular/language-service": "~7.2.15",
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",
5050
"@types/jasmine": "~2.8.8",
5151
"@types/jasminewd2": "~2.0.3",
5252
"@types/node": "~8.9.4",
5353
"angular-cli-ghpages": "^0.5.3",
54-
"codelyzer": "~4.5.0",
54+
"codelyzer": "^5.0.1",
55+
"husky": "^2.2.0",
5556
"jasmine-core": "~2.99.1",
5657
"jasmine-spec-reporter": "~4.2.1",
5758
"karma": "~3.1.1",
@@ -63,6 +64,6 @@
6364
"sass-lint": "^1.12.1",
6465
"ts-node": "~7.0.0",
6566
"tslint": "~5.11.0",
66-
"typescript": "~3.2.2"
67+
"typescript": "3.4.5"
6768
}
68-
}
69+
}

src/app/routes/routes.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ export const routes = [
1010
},
1111
children: [
1212
{ path: '', redirectTo: 'dashboard', pathMatch: 'full', },
13-
{ path: 'theme', loadChildren: './theme/theme.module#ThemeModule' },
14-
{ path: 'base', loadChildren: './base/base.module#BaseModule' },
15-
{ path: 'dashboard', loadChildren: './dashboard/dashboard.module#DashboardModule' },
16-
{ path: 'buttons', loadChildren: './buttons/buttons.module#ButtonsModule' },
17-
{ path: 'charts', loadChildren: './charts/charts.module#ChartsModule' },
18-
{ path: 'icons', loadChildren: './icons/icons.module#IconsModule' },
19-
{ path: 'notifications', loadChildren: './notifications/notifications.module#NotificationsModule' },
20-
{ path: 'widgets', loadChildren: './widgets/widgets.module#WidgetsModule' },
13+
{ path: 'theme', loadChildren: () => import('./theme/theme.module').then(m => m.ThemeModule) },
14+
{ path: 'base', loadChildren: () => import('./base/base.module').then(m => m.BaseModule) },
15+
{ path: 'dashboard', loadChildren: () => import('./dashboard/dashboard.module').then(m => m.DashboardModule) },
16+
{ path: 'buttons', loadChildren: () => import('./buttons/buttons.module').then(m => m.ButtonsModule) },
17+
{ path: 'charts', loadChildren: () => import('./charts/charts.module').then(m => m.ChartsModule) },
18+
{ path: 'icons', loadChildren: () => import('./icons/icons.module').then(m => m.IconsModule) },
19+
{ path: 'notifications', loadChildren: () => import('./notifications/notifications.module').then(m => m.NotificationsModule) },
20+
{ path: 'widgets', loadChildren: () => import('./widgets/widgets.module').then(m => m.WidgetsModule) },
2121
]
2222
},
23-
{ path: 'pages', loadChildren: './pages/pages.module#PagesModule' },
23+
{ path: 'pages', loadChildren: () => import('./pages/pages.module').then(m => m.PagesModule) },
2424
// Not found
2525
{ path: '**', redirectTo: 'home' }
2626

src/polyfills.ts

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,9 @@
1515
*/
1616

1717
/***************************************************************************************************
18-
* BROWSER POLYFILLS
19-
*/
20-
21-
/** IE9, IE10, IE11, and Chrome <55 requires all of the following polyfills.
22-
* This also includes Android Emulators with older versions of Chrome and Google Search/Googlebot
23-
*/
18+
* BROWSER POLYFILLS
19+
*/
2420

25-
import 'core-js/es6/symbol';
26-
import 'core-js/es6/object';
27-
import 'core-js/es6/function';
28-
import 'core-js/es6/parse-int';
29-
import 'core-js/es6/parse-float';
30-
import 'core-js/es6/number';
31-
import 'core-js/es6/math';
32-
import 'core-js/es6/string';
33-
import 'core-js/es6/date';
34-
import 'core-js/es6/array';
35-
import 'core-js/es6/regexp';
36-
import 'core-js/es6/map';
37-
import 'core-js/es6/weak-map';
38-
import 'core-js/es6/set';
3921

4022
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
4123
// import 'classlist.js'; // Run `npm install --save classlist.js`.

tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"outDir": "./dist/out-tsc",
66
"sourceMap": true,
77
"declaration": false,
8-
"module": "es2015",
8+
"module": "esnext",
99
"moduleResolution": "node",
1010
"emitDecoratorMetadata": true,
1111
"experimentalDecorators": true,
1212
"importHelpers": true,
13-
"target": "es5",
13+
"target": "es2015",
1414
"typeRoots": [
1515
"node_modules/@types"
1616
],

tslint.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,12 @@
118118
"check-type"
119119
],
120120
"no-output-on-prefix": true,
121-
"use-input-property-decorator": true,
122-
"use-output-property-decorator": true,
123-
"use-host-property-decorator": true,
121+
"no-inputs-metadata-property": true,
122+
"no-outputs-metadata-property": true,
123+
"no-host-metadata-property": true,
124124
"no-input-rename": true,
125125
"no-output-rename": true,
126-
"use-life-cycle-interface": true,
126+
"use-lifecycle-interface": true,
127127
"use-pipe-transform-interface": true,
128128
"component-class-suffix": true,
129129
"directive-class-suffix": true

0 commit comments

Comments
 (0)