From 8b4924d755613f5bba1364f88a57c824e67205e0 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Fri, 7 Dec 2018 13:01:02 -0800 Subject: [PATCH] Build VS Code using TS 3.2 Fixes #64631 --- build/package.json | 2 +- build/yarn.lock | 8 ++++---- .../typescript-language-features/src/utils/arrays.ts | 2 +- package.json | 2 +- yarn.lock | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build/package.json b/build/package.json index 7e096ee9bab..64c0f9277b0 100644 --- a/build/package.json +++ b/build/package.json @@ -38,7 +38,7 @@ "minimist": "^1.2.0", "request": "^2.85.0", "tslint": "^5.9.1", - "typescript": "3.1.4", + "typescript": "3.2.2", "vsce": "1.48.0", "xml2js": "^0.4.17" }, diff --git a/build/yarn.lock b/build/yarn.lock index 45a09657223..4d2a53c8ee7 100644 --- a/build/yarn.lock +++ b/build/yarn.lock @@ -1894,10 +1894,10 @@ typed-rest-client@^0.9.0: tunnel "0.0.4" underscore "1.8.3" -typescript@3.1.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.4.tgz#c74ef7b3c2da65beff548b903022cb8c3cd997ed" - integrity sha512-JZHJtA6ZL15+Q3Dqkbh8iCUmvxD3iJ7ujXS+fVkKnwIVAdHc5BJTDNM0aTrnr2luKulFjU7W+SRhDZvi66Ru7Q== +typescript@3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.2.tgz#fe8101c46aa123f8353523ebdcf5730c2ae493e5" + integrity sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg== uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.5" diff --git a/extensions/typescript-language-features/src/utils/arrays.ts b/extensions/typescript-language-features/src/utils/arrays.ts index e8aa98a7582..bf403c3afeb 100644 --- a/extensions/typescript-language-features/src/utils/arrays.ts +++ b/extensions/typescript-language-features/src/utils/arrays.ts @@ -16,6 +16,6 @@ export function equals(one: ReadonlyArray, other: ReadonlyArray, itemEq return true; } -export function flatten(arr: ReadonlyArray>): T[] { +export function flatten(arr: ReadonlyArray[]): T[] { return ([] as T[]).concat.apply([], arr); } \ No newline at end of file diff --git a/package.json b/package.json index c4b850d6342..8fbbfd3e7b1 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,7 @@ "source-map": "^0.4.4", "ts-loader": "^4.4.2", "tslint": "^5.11.0", - "typescript": "3.1.4", + "typescript": "3.2.2", "typescript-formatter": "7.1.0", "typescript-tslint-plugin": "^0.0.7", "uglify-es": "^3.0.18", diff --git a/yarn.lock b/yarn.lock index e8682b9320c..231e608ea25 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8823,10 +8823,10 @@ typescript-tslint-plugin@^0.0.7: minimatch "^3.0.4" vscode-languageserver "^5.1.0" -typescript@3.1.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.4.tgz#c74ef7b3c2da65beff548b903022cb8c3cd997ed" - integrity sha512-JZHJtA6ZL15+Q3Dqkbh8iCUmvxD3iJ7ujXS+fVkKnwIVAdHc5BJTDNM0aTrnr2luKulFjU7W+SRhDZvi66Ru7Q== +typescript@3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.2.tgz#fe8101c46aa123f8353523ebdcf5730c2ae493e5" + integrity sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg== typescript@^2.6.2: version "2.6.2" -- GitLab