From 69afce76506aa1199cae1bd2cd02154cf81325bb Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Fri, 1 Sep 2017 13:52:42 -0700 Subject: [PATCH] Build using TS 2.5 (#33705) * Build using TS 2.5 Fixes #33704 * Remove explicit return type --- build/lib/nls.ts | 2 +- build/monaco/package.json | 2 +- build/package.json | 2 +- extensions/git/src/git.ts | 2 +- package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/lib/nls.ts b/build/lib/nls.ts index fcba7ac6e5e..856470107ec 100644 --- a/build/lib/nls.ts +++ b/build/lib/nls.ts @@ -227,7 +227,7 @@ module nls { // `localize` named imports const allLocalizeImportDeclarations = importDeclarations .filter(d => d.importClause.namedBindings.kind === ts.SyntaxKind.NamedImports) - .map(d => (d.importClause.namedBindings).elements) + .map(d => [].concat((d.importClause.namedBindings).elements)) .flatten(); // `localize` read-only references diff --git a/build/monaco/package.json b/build/monaco/package.json index c31756516c7..4cc3beb09b8 100644 --- a/build/monaco/package.json +++ b/build/monaco/package.json @@ -48,7 +48,7 @@ "sinon": "^1.17.2", "source-map": "^0.4.4", "tslint": "^4.3.1", - "typescript": "2.4.1", + "typescript": "2.5.2", "typescript-formatter": "4.0.1", "underscore": "^1.8.2", "vinyl": "^0.4.5", diff --git a/build/package.json b/build/package.json index cb36cf063de..d94f9aad64a 100644 --- a/build/package.json +++ b/build/package.json @@ -13,7 +13,7 @@ "documentdb": "^1.11.0", "mime": "^1.3.4", "minimist": "^1.2.0", - "typescript": "2.4.1", + "typescript": "2.5.2", "xml2js": "^0.4.17" }, "scripts": { diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts index 92a71b1697a..729f5bd71e5 100644 --- a/extensions/git/src/git.ts +++ b/extensions/git/src/git.ts @@ -82,7 +82,7 @@ function findGitDarwin(): Promise { function getVersion(path: string) { // make sure git executes - cp.exec('git --version', (err, stdout: Buffer) => { + cp.exec('git --version', (err: Error, stdout: any) => { if (err) { return e('git not found'); } diff --git a/package.json b/package.json index 83d7c8955a0..09c0745bbde 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "sinon": "^1.17.2", "source-map": "^0.4.4", "tslint": "^4.3.1", - "typescript": "2.4.1", + "typescript": "^2.5.2", "typescript-formatter": "4.0.1", "uglify-es": "^3.0.18", "underscore": "^1.8.2", -- GitLab