From d99bbafe17d23a1b9821e7bfe0d8f027f9ecbb24 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 28 Jan 2020 11:00:02 -0800 Subject: [PATCH] Pick up new TS version for building VS Code --- build/package.json | 2 +- build/yarn.lock | 8 ++++---- .../src/features/semanticTokens.ts | 2 +- package.json | 2 +- src/vs/workbench/api/common/extHostTunnelService.ts | 2 +- src/vs/workbench/api/common/extHostWorkspace.ts | 2 +- yarn.lock | 8 ++++---- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build/package.json b/build/package.json index 77cfdaf721b..c52a03b2c42 100644 --- a/build/package.json +++ b/build/package.json @@ -43,7 +43,7 @@ "minimist": "^1.2.0", "request": "^2.85.0", "terser": "4.3.8", - "typescript": " 3.8.0-beta", + "typescript": "3.8.0-dev.20200128", "vsce": "1.48.0", "vscode-telemetry-extractor": "^1.5.4", "xml2js": "^0.4.17" diff --git a/build/yarn.lock b/build/yarn.lock index 6b7c3ea0068..61edbef5565 100644 --- a/build/yarn.lock +++ b/build/yarn.lock @@ -2453,10 +2453,10 @@ typed-rest-client@^0.9.0: tunnel "0.0.4" underscore "1.8.3" -"typescript@ 3.8.0-beta": - version "3.8.0-beta" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.0-beta.tgz#acdcaf9f24c7e20b1ff0a6329d1e8d63691e2e13" - integrity sha512-mQEmQUJg0CQBhf/GSVnGscKv/jrKsrLxE01AhdjYmBNoXX2Iah3i38ufxXByXacK6Fc5Nr9oMz7MjpjgddiknA== +typescript@3.8.0-dev.20200128: + version "3.8.0-dev.20200128" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.0-dev.20200128.tgz#4eedbd3547326f2e9cb826c4144800eb93c81866" + integrity sha512-tXJMyrE3xhLDzCN76wZhoV8S1AU5JH40DzrLBAZWfHOgH8X8mCHFwyJ8U6N929vBL78rHmEcowyioUr09/Xvjg== typescript@^3.0.1: version "3.5.3" diff --git a/extensions/typescript-language-features/src/features/semanticTokens.ts b/extensions/typescript-language-features/src/features/semanticTokens.ts index 843fe17e56b..3c3aff06202 100644 --- a/extensions/typescript-language-features/src/features/semanticTokens.ts +++ b/extensions/typescript-language-features/src/features/semanticTokens.ts @@ -5,7 +5,7 @@ import * as vscode from 'vscode'; import { ITypeScriptServiceClient, ExecConfig, ServerResponse } from '../typescriptService'; -import type * as Proto from '../protocol'; +import * as Proto from '../protocol'; import { VersionDependentRegistration } from '../utils/dependentRegistration'; import API from '../utils/api'; diff --git a/package.json b/package.json index be5c947477a..fde05321d20 100644 --- a/package.json +++ b/package.json @@ -144,7 +144,7 @@ "sinon": "^1.17.2", "source-map": "^0.4.4", "ts-loader": "^4.4.2", - "typescript": "3.8.0-beta", + "typescript": "3.8.0-dev.20200128", "typescript-formatter": "7.1.0", "underscore": "^1.8.2", "vinyl": "^2.0.0", diff --git a/src/vs/workbench/api/common/extHostTunnelService.ts b/src/vs/workbench/api/common/extHostTunnelService.ts index 6e5e59dd044..b81fc443758 100644 --- a/src/vs/workbench/api/common/extHostTunnelService.ts +++ b/src/vs/workbench/api/common/extHostTunnelService.ts @@ -5,7 +5,7 @@ import { ExtHostTunnelServiceShape } from 'vs/workbench/api/common/extHost.protocol'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import type * as vscode from 'vscode'; +import * as vscode from 'vscode'; import { RemoteTunnel, TunnelOptions } from 'vs/platform/remote/common/tunnel'; import { IDisposable } from 'vs/base/common/lifecycle'; import { Emitter } from 'vs/base/common/event'; diff --git a/src/vs/workbench/api/common/extHostWorkspace.ts b/src/vs/workbench/api/common/extHostWorkspace.ts index edf45abf307..4b5c0c1301f 100644 --- a/src/vs/workbench/api/common/extHostWorkspace.ts +++ b/src/vs/workbench/api/common/extHostWorkspace.ts @@ -25,7 +25,7 @@ import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService'; import { Range, RelativePattern } from 'vs/workbench/api/common/extHostTypes'; import { ITextQueryBuilderOptions } from 'vs/workbench/contrib/search/common/queryBuilder'; import { IRawFileMatch2, resultIsMatch } from 'vs/workbench/services/search/common/search'; -import type * as vscode from 'vscode'; +import * as vscode from 'vscode'; import { ExtHostWorkspaceShape, IWorkspaceData, MainContext, MainThreadMessageServiceShape, MainThreadWorkspaceShape } from './extHost.protocol'; export interface IExtHostWorkspaceProvider { diff --git a/yarn.lock b/yarn.lock index 54b64c3195c..a98533bad96 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9240,10 +9240,10 @@ typescript-formatter@7.1.0: commandpost "^1.0.0" editorconfig "^0.15.0" -typescript@3.8.0-beta: - version "3.8.0-beta" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.0-beta.tgz#acdcaf9f24c7e20b1ff0a6329d1e8d63691e2e13" - integrity sha512-mQEmQUJg0CQBhf/GSVnGscKv/jrKsrLxE01AhdjYmBNoXX2Iah3i38ufxXByXacK6Fc5Nr9oMz7MjpjgddiknA== +typescript@3.8.0-dev.20200128: + version "3.8.0-dev.20200128" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.0-dev.20200128.tgz#4eedbd3547326f2e9cb826c4144800eb93c81866" + integrity sha512-tXJMyrE3xhLDzCN76wZhoV8S1AU5JH40DzrLBAZWfHOgH8X8mCHFwyJ8U6N929vBL78rHmEcowyioUr09/Xvjg== typescript@^2.6.2: version "2.6.2"