Merge pull request #541 from CodinGame/fix-yaml-extension

Fixes for redhat yaml extension
CodinGame · Dec 12, 2024 · 2c59c3b · 2c59c3b · github-actions · Dec 12, 2024
2 parents 55ec1ff + 7e44d32
commit 2c59c3b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/extensions.ts b/src/extensions.ts
@@ -158,7 +158,7 @@ export function registerExtension(
 export function registerExtension(
   manifest: IExtensionManifest,
   extHostKind?: ExtensionHostKind,
-  { path = '/', system = false, readmePath, changelogPath }: RegisterExtensionParams = {}
+  { path = '/extension', system = false, readmePath, changelogPath }: RegisterExtensionParams = {}
 ): RegisterExtensionResult {
   const id = getExtensionId(manifest.publisher, manifest.name)
   const location = URI.from({ scheme: CustomSchemas.extensionFile, authority: id, path })

diff --git a/vscode-paches/0052-fix-allow-data-urls-in-extension-host-worker.patch b/vscode-paches/0052-fix-allow-data-urls-in-extension-host-worker.patch
@@ -4,19 +4,21 @@ Date: Thu, 17 Oct 2024 16:24:45 +0200
 Subject: [PATCH] fix: allow data urls in extension host worker
 
 ---
- .../extensions/worker/webWorkerExtensionHostIframe.html         | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ .../extensions/worker/webWorkerExtensionHostIframe.html       | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html b/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
-index 88407e89f16..b5619cac823 100644
+index 88407e89f16..eff43dcde6c 100644
 --- a/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
 +++ b/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
-@@ -5,7 +5,7 @@
+@@ -4,8 +4,8 @@
+ 		<meta http-equiv="Content-Security-Policy" content="
  			default-src 'none';
  			child-src 'self' data: blob:;
- 			script-src 'self' 'unsafe-eval' 'sha256-xM2KVDKIoeb8vVxk4ezEUsxdTZh5wFnKO3YmFhy9tkk=' https: http://localhost:* blob:;
+-			script-src 'self' 'unsafe-eval' 'sha256-xM2KVDKIoeb8vVxk4ezEUsxdTZh5wFnKO3YmFhy9tkk=' https: http://localhost:* blob:;
 -			connect-src 'self' https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*;"/>
-+			connect-src 'self' data: https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*;"/>
++			script-src 'self' 'unsafe-eval' 'sha256-xM2KVDKIoeb8vVxk4ezEUsxdTZh5wFnKO3YmFhy9tkk=' data: extension-file: https: http://localhost:* blob:;
++			connect-src 'self' data: extension-file: https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*;"/>
  	</head>
  	<body>
  	<script>