From 7874d47d1ac97eef0d3a4f31283a644462a48332 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 11 Apr 2023 10:34:00 -0700 Subject: [PATCH 1/3] Pick up TS 5.0.4 (#179617) Fixes #179616 --- extensions/package.json | 2 +- extensions/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extensions/package.json b/extensions/package.json index 1bc7e39d12b35..e71a73bf8b5ec 100644 --- a/extensions/package.json +++ b/extensions/package.json @@ -4,7 +4,7 @@ "license": "MIT", "description": "Dependencies shared by all extensions", "dependencies": { - "typescript": "5.0.2" + "typescript": "5.0.4" }, "scripts": { "postinstall": "node ./postinstall.mjs" diff --git a/extensions/yarn.lock b/extensions/yarn.lock index ef51562d37379..60728c4547c02 100644 --- a/extensions/yarn.lock +++ b/extensions/yarn.lock @@ -228,10 +228,10 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -typescript@5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.2.tgz#891e1a90c5189d8506af64b9ef929fca99ba1ee5" - integrity sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw== +typescript@5.0.4: + version "5.0.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.4.tgz#b217fd20119bd61a94d4011274e0ab369058da3b" + integrity sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw== vscode-grammar-updater@^1.1.0: version "1.1.0" From 7830ea62db224f634ff0d482d7454d6cb204c337 Mon Sep 17 00:00:00 2001 From: Bhavya U Date: Tue, 11 Apr 2023 10:38:25 -0700 Subject: [PATCH 2/3] [Backport] Fix built-in walkthroughs rendering (#179335) Fix built-in walkthroughs rendering --- .../contrib/welcomeGettingStarted/browser/gettingStarted.ts | 1 + .../welcomeGettingStarted/browser/gettingStartedService.ts | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts index 1b409409e61a4..3b18b5a7e6fc1 100644 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts @@ -242,6 +242,7 @@ export class GettingStartedPage extends EditorPane { } })); + this._register(this.gettingStartedService.onDidAddBuiltInWalkthrough(rerender)); this._register(this.gettingStartedService.onDidAddWalkthrough(rerender)); this._register(this.gettingStartedService.onDidRemoveWalkthrough(rerender)); diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts index e2b36756483a6..1908c1a35f232 100644 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts @@ -97,6 +97,7 @@ export interface IWalkthroughsService { readonly onDidRemoveWalkthrough: Event; readonly onDidChangeWalkthrough: Event; readonly onDidProgressStep: Event; + readonly onDidAddBuiltInWalkthrough: Event; readonly installedExtensionsRegistered: Promise; @@ -134,6 +135,9 @@ export class WalkthroughsService extends Disposable implements IWalkthroughsServ private readonly _onDidProgressStep = new Emitter(); readonly onDidProgressStep: Event = this._onDidProgressStep.event; + private readonly _onDidAddBuiltInWalkthrough = new Emitter(); + readonly onDidAddBuiltInWalkthrough: Event = this._onDidAddBuiltInWalkthrough.event; + private memento: Memento; private stepProgress: Record; @@ -255,6 +259,8 @@ export class WalkthroughsService extends Disposable implements IWalkthroughsServ }) }); }); + + this._onDidAddBuiltInWalkthrough.fire(); } private updateWalkthroughContent(walkthrough: BuiltinGettingStartedCategory, experimentTreatment: WalkthroughTreatment): BuiltinGettingStartedCategory { From ba360bf05d6a76b416ca72d6867c932502ee41e5 Mon Sep 17 00:00:00 2001 From: Tyler James Leonhardt Date: Tue, 11 Apr 2023 11:14:22 -0700 Subject: [PATCH 3/3] Bump Recovery Version (#179705) bump recovery version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4b1f3640ea629..cd9c3fcadaa8c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "code-oss-dev", - "version": "1.77.2", + "version": "1.77.3", "distro": "9b27f67c15920833310305fce2d42cf2426f34ee", "author": { "name": "Microsoft Corporation"