Merge branch 'release/1.77' into merogge/click

microsoft · Apr 11, 2023 · ce11640 · ce11640
2 parents e2d46ee + ba360bf
commit ce11640
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git 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
@@ -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"

diff --git 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"

diff --git 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
@@ -97,6 +97,7 @@ export interface IWalkthroughsService {
 	readonly onDidRemoveWalkthrough: Event<string>;
 	readonly onDidChangeWalkthrough: Event<IResolvedWalkthrough>;
 	readonly onDidProgressStep: Event<IResolvedWalkthroughStep>;
+	readonly onDidAddBuiltInWalkthrough: Event<void>;
 
 	readonly installedExtensionsRegistered: Promise<void>;
 
@@ -134,6 +135,9 @@ export class WalkthroughsService extends Disposable implements IWalkthroughsServ
 	private readonly _onDidProgressStep = new Emitter<IResolvedWalkthroughStep>();
 	readonly onDidProgressStep: Event<IResolvedWalkthroughStep> = this._onDidProgressStep.event;
 
+	private readonly _onDidAddBuiltInWalkthrough = new Emitter<void>();
+	readonly onDidAddBuiltInWalkthrough: Event<void> = this._onDidAddBuiltInWalkthrough.event;
+
 	private memento: Memento;
 	private stepProgress: Record<string, StepProgress | undefined>;
 
@@ -255,6 +259,8 @@ export class WalkthroughsService extends Disposable implements IWalkthroughsServ
 					})
 			});
 		});
+
+		this._onDidAddBuiltInWalkthrough.fire();
 	}
 
 	private updateWalkthroughContent(walkthrough: BuiltinGettingStartedCategory, experimentTreatment: WalkthroughTreatment): BuiltinGettingStartedCategory {
-Original file line number
+Diff line change
@@ Expand Up / @@ -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));
@@ Expand Down @@