From a8f1fedaf682f9b03671fc4088dd79f9a283ce68 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 22 Jun 2020 15:02:40 -0700
Subject: [PATCH] Update to latest TS 4.0  for building VS Code

Also removes an unused export that was causing compile issues
---
 .vscode/settings.json               | 3 ++-
 build/package.json                  | 2 +-
 build/yarn.lock                     | 8 ++++----
 package.json                        | 2 +-
 src/vs/base/browser/ui/grid/grid.ts | 2 +-
 yarn.lock                           | 8 ++++----
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 9239eae0d4d..b5251d42db0 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -76,5 +76,6 @@
 	"[typescript]": {
 		"editor.defaultFormatter": "vscode.typescript-language-features"
 	},
-	"typescript.tsc.autoDetect": "off"
+	"typescript.tsc.autoDetect": "off",
+	"typescript.tsserver.useSeparateSyntaxServer": "dynamic"
 }
diff --git a/build/package.json b/build/package.json
index 859637456ff..e89ba75a597 100644
--- a/build/package.json
+++ b/build/package.json
@@ -44,7 +44,7 @@
     "minimist": "^1.2.3",
     "request": "^2.85.0",
     "terser": "4.3.8",
-    "typescript": "^4.0.0-dev.20200615",
+    "typescript": "^4.0.0-dev.20200622",
     "vsce": "1.48.0",
     "vscode-telemetry-extractor": "^1.6.0",
     "xml2js": "^0.4.17"
diff --git a/build/yarn.lock b/build/yarn.lock
index 8fdc6ac49eb..1686573f5e7 100644
--- a/build/yarn.lock
+++ b/build/yarn.lock
@@ -2530,10 +2530,10 @@ typescript@^3.0.1:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
   integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
 
-typescript@^4.0.0-dev.20200615:
-  version "4.0.0-dev.20200615"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200615.tgz#5c06a0d5f25a29a018767970c6531fbbed7240e3"
-  integrity sha512-OD7KRTLimUwW5E1xHsAqXNjw0O0Krk9CgRVFYkqANv4fZisaN1LJI06u30D5QiNnHBzm2nBSzZIAhjj4MUqaRA==
+typescript@^4.0.0-dev.20200622:
+  version "4.0.0-dev.20200622"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200622.tgz#33e0ffaf880b1f16bde5bc4eeb1863e52c4d7f75"
+  integrity sha512-KWXppG2OKfq5cDAEkc0wA7uemXnF/Af4v0j08plUCKk20rt9wYU2rU9EB53/XlVeZgV2hwpbH9hIFyeB4dWvdg==
 
 typical@^4.0.0:
   version "4.0.0"
diff --git a/package.json b/package.json
index 73b410cc0ef..84fde389450 100644
--- a/package.json
+++ b/package.json
@@ -152,7 +152,7 @@
     "source-map": "^0.4.4",
     "style-loader": "^1.0.0",
     "ts-loader": "^4.4.2",
-    "typescript": "^4.0.0-dev.20200615",
+    "typescript": "^4.0.0-dev.20200622",
     "typescript-formatter": "7.1.0",
     "underscore": "^1.8.2",
     "vinyl": "^2.0.0",
diff --git a/src/vs/base/browser/ui/grid/grid.ts b/src/vs/base/browser/ui/grid/grid.ts
index a8105574ac3..db736d5da23 100644
--- a/src/vs/base/browser/ui/grid/grid.ts
+++ b/src/vs/base/browser/ui/grid/grid.ts
@@ -10,7 +10,7 @@ import { tail2 as tail, equals } from 'vs/base/common/arrays';
 import { orthogonal, IView as IGridViewView, GridView, Sizing as GridViewSizing, Box, IGridViewStyles, IViewSize, IGridViewOptions, IBoundarySashes } from './gridview';
 import { Event } from 'vs/base/common/event';
 
-export { Orientation, Sizing as GridViewSizing, IViewSize, orthogonal, LayoutPriority } from './gridview';
+export { Orientation, IViewSize, orthogonal, LayoutPriority } from './gridview';
 
 export const enum Direction {
 	Up,
diff --git a/yarn.lock b/yarn.lock
index 11bddedb357..c803695e4e8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9102,10 +9102,10 @@ typescript@^2.6.2:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
   integrity sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=
 
-typescript@^4.0.0-dev.20200615:
-  version "4.0.0-dev.20200615"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200615.tgz#5c06a0d5f25a29a018767970c6531fbbed7240e3"
-  integrity sha512-OD7KRTLimUwW5E1xHsAqXNjw0O0Krk9CgRVFYkqANv4fZisaN1LJI06u30D5QiNnHBzm2nBSzZIAhjj4MUqaRA==
+typescript@^4.0.0-dev.20200622:
+  version "4.0.0-dev.20200622"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200622.tgz#33e0ffaf880b1f16bde5bc4eeb1863e52c4d7f75"
+  integrity sha512-KWXppG2OKfq5cDAEkc0wA7uemXnF/Af4v0j08plUCKk20rt9wYU2rU9EB53/XlVeZgV2hwpbH9hIFyeB4dWvdg==
 
 uc.micro@^1.0.1, uc.micro@^1.0.3:
   version "1.0.3"
-- 
GitLab