Skip to content

Commit a8f1fed

Browse files
committed
Update to latest TS 4.0 for building VS Code
Also removes an unused export that was causing compile issues
1 parent b46b525 commit a8f1fed

6 files changed

Lines changed: 13 additions & 12 deletions

File tree

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,6 @@
7676
"[typescript]": {
7777
"editor.defaultFormatter": "vscode.typescript-language-features"
7878
},
79-
"typescript.tsc.autoDetect": "off"
79+
"typescript.tsc.autoDetect": "off",
80+
"typescript.tsserver.useSeparateSyntaxServer": "dynamic"
8081
}

build/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"minimist": "^1.2.3",
4545
"request": "^2.85.0",
4646
"terser": "4.3.8",
47-
"typescript": "^4.0.0-dev.20200615",
47+
"typescript": "^4.0.0-dev.20200622",
4848
"vsce": "1.48.0",
4949
"vscode-telemetry-extractor": "^1.6.0",
5050
"xml2js": "^0.4.17"

build/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2530,10 +2530,10 @@ typescript@^3.0.1:
25302530
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
25312531
integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
25322532

2533-
typescript@^4.0.0-dev.20200615:
2534-
version "4.0.0-dev.20200615"
2535-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200615.tgz#5c06a0d5f25a29a018767970c6531fbbed7240e3"
2536-
integrity sha512-OD7KRTLimUwW5E1xHsAqXNjw0O0Krk9CgRVFYkqANv4fZisaN1LJI06u30D5QiNnHBzm2nBSzZIAhjj4MUqaRA==
2533+
typescript@^4.0.0-dev.20200622:
2534+
version "4.0.0-dev.20200622"
2535+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200622.tgz#33e0ffaf880b1f16bde5bc4eeb1863e52c4d7f75"
2536+
integrity sha512-KWXppG2OKfq5cDAEkc0wA7uemXnF/Af4v0j08plUCKk20rt9wYU2rU9EB53/XlVeZgV2hwpbH9hIFyeB4dWvdg==
25372537

25382538
typical@^4.0.0:
25392539
version "4.0.0"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
"source-map": "^0.4.4",
153153
"style-loader": "^1.0.0",
154154
"ts-loader": "^4.4.2",
155-
"typescript": "^4.0.0-dev.20200615",
155+
"typescript": "^4.0.0-dev.20200622",
156156
"typescript-formatter": "7.1.0",
157157
"underscore": "^1.8.2",
158158
"vinyl": "^2.0.0",

src/vs/base/browser/ui/grid/grid.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { tail2 as tail, equals } from 'vs/base/common/arrays';
1010
import { orthogonal, IView as IGridViewView, GridView, Sizing as GridViewSizing, Box, IGridViewStyles, IViewSize, IGridViewOptions, IBoundarySashes } from './gridview';
1111
import { Event } from 'vs/base/common/event';
1212

13-
export { Orientation, Sizing as GridViewSizing, IViewSize, orthogonal, LayoutPriority } from './gridview';
13+
export { Orientation, IViewSize, orthogonal, LayoutPriority } from './gridview';
1414

1515
export const enum Direction {
1616
Up,

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9102,10 +9102,10 @@ typescript@^2.6.2:
91029102
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
91039103
integrity sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=
91049104

9105-
typescript@^4.0.0-dev.20200615:
9106-
version "4.0.0-dev.20200615"
9107-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200615.tgz#5c06a0d5f25a29a018767970c6531fbbed7240e3"
9108-
integrity sha512-OD7KRTLimUwW5E1xHsAqXNjw0O0Krk9CgRVFYkqANv4fZisaN1LJI06u30D5QiNnHBzm2nBSzZIAhjj4MUqaRA==
9105+
typescript@^4.0.0-dev.20200622:
9106+
version "4.0.0-dev.20200622"
9107+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200622.tgz#33e0ffaf880b1f16bde5bc4eeb1863e52c4d7f75"
9108+
integrity sha512-KWXppG2OKfq5cDAEkc0wA7uemXnF/Af4v0j08plUCKk20rt9wYU2rU9EB53/XlVeZgV2hwpbH9hIFyeB4dWvdg==
91099109

91109110
uc.micro@^1.0.1, uc.micro@^1.0.3:
91119111
version "1.0.3"

0 commit comments

Comments
 (0)