From 460768a452221ee8595dcc15114b285a09f4f9cf Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 9 Aug 2022 11:26:24 -0700 Subject: [PATCH] Update TS versions (#157550) * Update TS versions Update the bundled TS and build TS version * Add explicit annotations * Recompile JS --- build/lib/eslint/vscode-dts-provider-naming.js | 2 +- extensions/package.json | 2 +- extensions/yarn.lock | 8 ++++---- package.json | 2 +- .../common/extensionManagementIpc.ts | 10 +++++----- yarn.lock | 8 ++++---- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build/lib/eslint/vscode-dts-provider-naming.js b/build/lib/eslint/vscode-dts-provider-naming.js index 0d94a8a9223..44c2ddd5568 100644 --- a/build/lib/eslint/vscode-dts-provider-naming.js +++ b/build/lib/eslint/vscode-dts-provider-naming.js @@ -17,7 +17,7 @@ module.exports = new (_a = class ApiProviderNaming { const allowed = new Set(config.allowed); return { ['TSInterfaceDeclaration[id.name=/.+Provider/] TSMethodSignature']: (node) => { - const interfaceName = node.parent?.parent.id.name; + const interfaceName = (node.parent?.parent).id.name; if (allowed.has(interfaceName)) { // allowed return; diff --git a/extensions/package.json b/extensions/package.json index 5419d4e4291..07dd14afb27 100644 --- a/extensions/package.json +++ b/extensions/package.json @@ -4,7 +4,7 @@ "license": "MIT", "description": "Dependencies shared by all extensions", "dependencies": { - "typescript": "^4.8.0-dev.20220801" + "typescript": "^4.8.0-dev.20220808" }, "scripts": { "postinstall": "node ./postinstall.mjs" diff --git a/extensions/yarn.lock b/extensions/yarn.lock index 10a2696374a..634d2ef6b57 100644 --- a/extensions/yarn.lock +++ b/extensions/yarn.lock @@ -42,10 +42,10 @@ node-gyp-build@^4.3.0: resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3" integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q== -typescript@^4.8.0-dev.20220801: - version "4.8.0-dev.20220801" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.0-dev.20220801.tgz#547ae7fea513fde4058f6715afa673b388e73129" - integrity sha512-idPY4geCSbS6npeHcr4m4nITkxz0/w4LmLSAao0UGvaWoHGFfkThJZhCXWFAx9TxQV1zZUWgXmngJBjfTm3otw== +typescript@^4.8.0-dev.20220808: + version "4.8.0-dev.20220808" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.0-dev.20220808.tgz#cff17ca0c513c5069311e855a9c5c751065042ba" + integrity sha512-afg7R/XsBD3mkS0orQD4Vy3dxHEijC0uqp46+i51lf5yfvvQRuhLQDY2F/OMOxD0U1ZwP3pliGs2U4UrqNHJ6g== vscode-grammar-updater@^1.1.0: version "1.1.0" diff --git a/package.json b/package.json index 6343e687539..f5bb7de8c03 100644 --- a/package.json +++ b/package.json @@ -201,7 +201,7 @@ "style-loader": "^1.3.0", "ts-loader": "^9.2.7", "tsec": "0.1.4", - "typescript": "^4.8.0-dev.20220801", + "typescript": "^4.8.0-dev.20220808", "typescript-formatter": "7.1.0", "underscore": "^1.12.1", "util": "^0.12.4", diff --git a/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts b/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts index 9636a4291b3..9c05c43c5f1 100644 --- a/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts +++ b/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts @@ -127,11 +127,11 @@ export class ExtensionManagementChannelClient extends Disposable implements IExt } zip(extension: ILocalExtension): Promise { - return Promise.resolve(this.channel.call('zip', [extension]).then(result => URI.revive(result))); + return Promise.resolve(this.channel.call('zip', [extension]).then(result => URI.revive(result))); } unzip(zipLocation: URI): Promise { - return Promise.resolve(this.channel.call('unzip', [zipLocation])); + return Promise.resolve(this.channel.call('unzip', [zipLocation])); } install(vsix: URI, options?: ServerInstallVSIXOptions): Promise { @@ -147,11 +147,11 @@ export class ExtensionManagementChannelClient extends Disposable implements IExt } uninstall(extension: ILocalExtension, options?: ServerUninstallOptions): Promise { - return Promise.resolve(this.channel.call('uninstall', [extension!, options])); + return Promise.resolve(this.channel.call('uninstall', [extension!, options])); } reinstallFromGallery(extension: ILocalExtension): Promise { - return Promise.resolve(this.channel.call('reinstallFromGallery', [extension])); + return Promise.resolve(this.channel.call('reinstallFromGallery', [extension])); } getInstalled(type: ExtensionType | null = null, extensionsProfileResource?: URI): Promise { @@ -174,7 +174,7 @@ export class ExtensionManagementChannelClient extends Disposable implements IExt } getExtensionsControlManifest(): Promise { - return Promise.resolve(this.channel.call('getExtensionsControlManifest')); + return Promise.resolve(this.channel.call('getExtensionsControlManifest')); } registerParticipant() { throw new Error('Not Supported'); } diff --git a/yarn.lock b/yarn.lock index f53cbf6caf3..b5a60ae1bf6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10559,10 +10559,10 @@ typescript@^2.6.2: resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4" integrity sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q= -typescript@^4.8.0-dev.20220801: - version "4.8.0-dev.20220801" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.0-dev.20220801.tgz#547ae7fea513fde4058f6715afa673b388e73129" - integrity sha512-idPY4geCSbS6npeHcr4m4nITkxz0/w4LmLSAao0UGvaWoHGFfkThJZhCXWFAx9TxQV1zZUWgXmngJBjfTm3otw== +typescript@^4.8.0-dev.20220808: + version "4.8.0-dev.20220808" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.0-dev.20220808.tgz#cff17ca0c513c5069311e855a9c5c751065042ba" + integrity sha512-afg7R/XsBD3mkS0orQD4Vy3dxHEijC0uqp46+i51lf5yfvvQRuhLQDY2F/OMOxD0U1ZwP3pliGs2U4UrqNHJ6g== typical@^4.0.0: version "4.0.0"