Skip to content

Commit ea54f48

Browse files
mjbvzmjbvz
committed
Update TS 3.8.1-rc
Updates to build VS Code using TS 3.8.1 (which require fixing a newly caught type error) Also updates our shipped JS/TS version to 3.8.1-rc
1 parent d40fcf3 commit ea54f48

8 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎build/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"minimist": "^1.2.0",
4444
"request": "^2.85.0",
4545
"terser": "4.3.8",
46-
"typescript": "3.8.0-dev.20200128",
46+
"typescript": "^3.8.1-rc",
4747
"vsce": "1.48.0",
4848
"vscode-telemetry-extractor": "^1.5.4",
4949
"xml2js": "^0.4.17"

‎build/yarn.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2453,16 +2453,16 @@ typed-rest-client@^0.9.0:
24532453
tunnel "0.0.4"
24542454
underscore "1.8.3"
24552455

2456-
typescript@3.8.0-dev.20200128:
2457-
version "3.8.0-dev.20200128"
2458-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.0-dev.20200128.tgz#4eedbd3547326f2e9cb826c4144800eb93c81866"
2459-
integrity sha512-tXJMyrE3xhLDzCN76wZhoV8S1AU5JH40DzrLBAZWfHOgH8X8mCHFwyJ8U6N929vBL78rHmEcowyioUr09/Xvjg==
2460-
24612456
typescript@^3.0.1:
24622457
version "3.5.3"
24632458
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
24642459
integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
24652460

2461+
typescript@^3.8.1-rc:
2462+
version "3.8.1-rc"
2463+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.1-rc.tgz#f94333c14da70927ccd887be2e91be652a9a09f6"
2464+
integrity sha512-aOIe066DyZn2uYIiND6fXMUUJ70nxwu/lKhA92QuQzXyC86fr0ywo1qvO8l2m0EnDcfjprYPuFRgNgDj7U2GlQ==
2465+
24662466
typical@^4.0.0:
24672467
version "4.0.0"
24682468
resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4"

‎extensions/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.1",
44
"description": "Dependencies shared by all extensions",
55
"dependencies": {
6-
"typescript": "^3.8.0-dev.20200201"
6+
"typescript": "^3.8.1-rc"
77
},
88
"scripts": {
99
"postinstall": "node ./postinstall"

‎extensions/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# yarn lockfile v1
33

44

5-
typescript@^3.8.0-dev.20200201:
6-
version "3.8.0-dev.20200201"
7-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.0-dev.20200201.tgz#e03210f5c7915f89cb77bd38793d12a69933a1a6"
8-
integrity sha512-KhaK6J3dIg6p9t24UVhBLcBIav4MpMExlD6nf18cVwp9LELuqhWu0NDmnLdSN0ovsrbcIJNmobQ1xC7vLN21eg==
5+
typescript@^3.8.1-rc:
6+
version "3.8.1-rc"
7+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.1-rc.tgz#f94333c14da70927ccd887be2e91be652a9a09f6"
8+
integrity sha512-aOIe066DyZn2uYIiND6fXMUUJ70nxwu/lKhA92QuQzXyC86fr0ywo1qvO8l2m0EnDcfjprYPuFRgNgDj7U2GlQ==

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
"sinon": "^1.17.2",
148148
"source-map": "^0.4.4",
149149
"ts-loader": "^4.4.2",
150-
"typescript": "3.8.0-dev.20200128",
150+
"typescript": "^3.8.1-rc",
151151
"typescript-formatter": "7.1.0",
152152
"underscore": "^1.8.2",
153153
"vinyl": "^2.0.0",

‎src/vs/platform/progress/common/progress.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export interface IProgressService {
1717

1818
_serviceBrand: undefined;
1919

20-
withProgress<R = any>(options: IProgressOptions | IProgressNotificationOptions | IProgressWindowOptions | IProgressCompositeOptions, task: (progress: IProgress<IProgressStep>) => Promise<R>, onDidCancel?: () => void): Promise<R>;
20+
withProgress<R = any>(options: IProgressOptions | IProgressNotificationOptions | IProgressWindowOptions | IProgressCompositeOptions, task: (progress: IProgress<IProgressStep>) => Promise<R>, onDidCancel?: (choice?: number) => void): Promise<R>;
2121
}
2222

2323
export interface IProgressIndicator {

‎src/vs/workbench/contrib/remote/browser/remote.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ class RemoteAgentConnectionStatusListener implements IWorkbenchContribution {
636636
(progress) => { if (progressReporter) { progressReporter.currentProgress = progress; } return promise; },
637637
(choice?) => {
638638
// Handle choice from dialog
639-
if (buttons[choice]) {
639+
if (typeof choice !== 'undefined' && buttons[choice]) {
640640
buttons[choice].callback();
641641
} else {
642642
showProgress(ProgressLocation.Notification, buttons);
@@ -651,7 +651,7 @@ class RemoteAgentConnectionStatusListener implements IWorkbenchContribution {
651651
(progress) => { if (progressReporter) { progressReporter.currentProgress = progress; } return promise; },
652652
(choice?) => {
653653
// Handle choice from dialog
654-
if (buttons[choice]) {
654+
if (typeof choice !== 'undefined' && buttons[choice]) {
655655
buttons[choice].callback();
656656
} else {
657657
hideProgress();

‎yarn.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9104,16 +9104,16 @@ typescript-formatter@7.1.0:
91049104
commandpost "^1.0.0"
91059105
editorconfig "^0.15.0"
91069106

9107-
typescript@3.8.0-dev.20200128:
9108-
version "3.8.0-dev.20200128"
9109-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.0-dev.20200128.tgz#4eedbd3547326f2e9cb826c4144800eb93c81866"
9110-
integrity sha512-tXJMyrE3xhLDzCN76wZhoV8S1AU5JH40DzrLBAZWfHOgH8X8mCHFwyJ8U6N929vBL78rHmEcowyioUr09/Xvjg==
9111-
91129107
typescript@^2.6.2:
91139108
version "2.6.2"
91149109
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
91159110
integrity sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=
91169111

9112+
typescript@^3.8.1-rc:
9113+
version "3.8.1-rc"
9114+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.1-rc.tgz#f94333c14da70927ccd887be2e91be652a9a09f6"
9115+
integrity sha512-aOIe066DyZn2uYIiND6fXMUUJ70nxwu/lKhA92QuQzXyC86fr0ywo1qvO8l2m0EnDcfjprYPuFRgNgDj7U2GlQ==
9116+
91179117
uc.micro@^1.0.1, uc.micro@^1.0.3:
91189118
version "1.0.3"
91199119
resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"

0 commit comments

Comments
 (0)