Skip to content

Commit 686654c

Browse files
committed
build: update to use TS 2.6
1 parent 2a25402 commit 686654c

File tree

8 files changed

+170
-89
lines changed

8 files changed

+170
-89
lines changed

package-lock.json

Lines changed: 156 additions & 63 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
"stylus": "^0.54.5",
9393
"stylus-loader": "^3.0.1",
9494
"tree-kill": "^1.0.0",
95-
"typescript": "~2.4.2",
95+
"typescript": "^2.6.2",
9696
"uglifyjs-webpack-plugin": "^1.1.5",
9797
"url-loader": "^0.6.2",
9898
"webpack": "~3.10.0",
@@ -103,10 +103,11 @@
103103
"webpack-subresource-integrity": "^1.0.1"
104104
},
105105
"devDependencies": {
106-
"@angular/compiler": "^5.0.0",
107-
"@angular/compiler-cli": "^5.0.0",
108-
"@angular/core": "^5.0.0",
109-
"@angular/service-worker": "^5.0.0",
106+
"@angular/common": "^5.2.0",
107+
"@angular/compiler": "^5.2.0",
108+
"@angular/compiler-cli": "^5.2.0",
109+
"@angular/core": "^5.2.0",
110+
"@angular/service-worker": "^5.2.0",
110111
"@types/common-tags": "^1.2.4",
111112
"@types/copy-webpack-plugin": "^4.0.0",
112113
"@types/denodeify": "^1.2.30",
@@ -141,8 +142,8 @@
141142
"tar": "^4.1.1",
142143
"temp": "0.8.3",
143144
"through": "^2.3.6",
144-
"ts-node": "^3.2.0",
145-
"tslint": "^5.1.0",
145+
"ts-node": "^4.1.0",
146+
"tslint": "^5.8.0",
146147
"zone.js": "^0.8.20"
147148
},
148149
"optionalDependencies": {

packages/@ngtools/webpack/src/angular_compiler_plugin.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import {
4040
Program,
4141
CompilerOptions,
4242
CompilerHost,
43-
Diagnostics,
43+
Diagnostic,
4444
EmitFlags,
4545
LazyRoute,
4646
createProgram,
@@ -892,7 +892,7 @@ export class AngularCompilerPlugin implements Tapable {
892892
private _emit(sourceFiles: ts.SourceFile[]) {
893893
time('AngularCompilerPlugin._emit');
894894
const program = this._program;
895-
const allDiagnostics: Diagnostics = [];
895+
const allDiagnostics: Array<ts.Diagnostic | Diagnostic> = [];
896896

897897
let emitResult: ts.EmitResult | undefined;
898898
try {

0 commit comments

Comments
 (0)