fix: missing welcome assets

CodinGame · Jan 8, 2024 · d85e5a2 · d85e5a2
1 parent a79c3a2
commit d85e5a2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -23,6 +23,7 @@
         "js": "always",
         "mp3": "always",
         "svg": "always",
+        "png": "always",
         "json": "always",
         "contribution": "always", // Hack for vscode .contribution.js files
         "protocol": "always", // Hack for vscode .protocol.js files

diff --git a/scripts/vscode.patch b/scripts/vscode.patch
@@ -2226,14 +2226,14 @@ index b442277e920..481ab494561 100644
  		if (this.element && this._messagePort) {
  			this._messagePort.postMessage({ channel, args: data }, transferable);
 diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts
-index 869f44526b4..0587e08a8ec 100644
+index 869f44526b4..296ac140860 100644
 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts
 +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts
 @@ -17,6 +17,7 @@ import { IFileService } from 'vs/platform/files/common/files';
  import { INotificationService } from 'vs/platform/notification/common/notification';
  import { ILanguageService } from 'vs/editor/common/languages/language';
  import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-+import { FileAccess } from 'vs/base/common/network';
++import { AppResourcePath, FileAccess } from 'vs/base/common/network';
 
 
  export class GettingStartedDetailsRenderer {
@@ -2253,6 +2253,15 @@ index 869f44526b4..0587e08a8ec 100644
  			}
  		} catch { }
 
+@@ -262,7 +260,7 @@ export class GettingStartedDetailsRenderer {
+ }
+
+ const transformUri = (src: string, base: URI) => {
+-	const path = joinPath(base, src);
++	const path = FileAccess.asBrowserUri(joinPath(base, src).fsPath.slice(1) as AppResourcePath);
+ 	return asWebviewUri(path).toString(true);
+ };
+
 diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts
 index f0c08e1b826..e63f4724028 100644
 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts

diff --git a/src/service-override/welcome.ts b/src/service-override/welcome.ts
@@ -8,10 +8,13 @@ import 'vs/workbench/contrib/welcomeViews/common/viewsWelcome.contribution'
 import 'vs/workbench/contrib/welcomeViews/common/newFile.contribution'
 // @ts-ignore
 import svgAssets from 'vs/workbench/contrib/welcomeGettingStarted/common/media/*.svg'
+// @ts-ignore
+import pngAssets from 'vs/workbench/contrib/welcomeGettingStarted/common/media/*.png'
 import { FileAccess } from 'vs/base/common/network'
 import { registerAssets } from '../assets'
 
 registerAssets(svgAssets)
+registerAssets(pngAssets)
 
 FileAccess.registerModuleContentProvider('vs/workbench/contrib/welcomeWalkthrough/browser/editor/vs_code_editor_walkthrough', () => import('vs/workbench/contrib/welcomeWalkthrough/browser/editor/vs_code_editor_walkthrough'))
 FileAccess.registerModuleContentProvider('vs/workbench/contrib/welcomeGettingStarted/common/media/theme_picker', () => import('vs/workbench/contrib/welcomeGettingStarted/common/media/theme_picker'))