diff --git a/lib/vscode b/lib/vscode index 1b6a188127ee..3a03d6f72d62 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 1b6a188127eeaf9194f945eb6eb89a657e93c54c +Subproject commit 3a03d6f72d628a7741c29f456b4ddbb5ae68502c diff --git a/patches/base-path.diff b/patches/base-path.diff index 9191effe8ed5..2daa529c6080 100644 --- a/patches/base-path.diff +++ b/patches/base-path.diff @@ -144,9 +144,9 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts codeServerVersion: this._productService.codeServerVersion, + rootEndpoint: rootBase, embedderIdentifier: 'server-distro', + voiceWsUrl: this._productService.voiceWsUrl, extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? { - ...this._productService.extensionsGallery, -@@ -401,7 +408,9 @@ export class WebClientServer { +@@ -402,7 +409,9 @@ export class WebClientServer { WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '', WORKBENCH_WEB_BASE_URL: staticRoute, WORKBENCH_NLS_URL, @@ -157,7 +157,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts }; // DEV --------------------------------------------------------------------------------------- -@@ -438,7 +447,7 @@ export class WebClientServer { +@@ -439,7 +448,7 @@ export class WebClientServer { 'default-src \'self\';', 'img-src \'self\' https: data: blob:;', 'media-src \'self\';', @@ -166,7 +166,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts 'child-src \'self\';', `frame-src 'self' https://*.vscode-cdn.net data:;`, 'worker-src \'self\' data: blob:;', -@@ -511,3 +520,70 @@ export class WebClientServer { +@@ -512,3 +521,70 @@ export class WebClientServer { return void res.end(data); } } @@ -241,7 +241,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -85,6 +85,7 @@ export interface IAgentSdkProductConfig +@@ -98,6 +98,7 @@ export interface IDictationRuntimeProduc export interface IProductConfiguration { readonly codeServerVersion?: string diff --git a/patches/integration.diff b/patches/integration.diff index 2d4507fe2bd2..954987aa4102 100644 --- a/patches/integration.diff +++ b/patches/integration.diff @@ -186,7 +186,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/base/common/product.ts +++ code-server/lib/vscode/src/vs/base/common/product.ts -@@ -84,6 +84,8 @@ export interface IAgentSdkProductConfig +@@ -97,6 +97,8 @@ export interface IDictationRuntimeProduc } export interface IProductConfiguration { @@ -257,8 +257,8 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts const productConfiguration: Partial> = { + codeServerVersion: this._productService.codeServerVersion, embedderIdentifier: 'server-distro', + voiceWsUrl: this._productService.voiceWsUrl, extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? { - ...this._productService.extensionsGallery, Index: code-server/lib/vscode/src/server-main.ts =================================================================== --- code-server.orig/lib/vscode/src/server-main.ts diff --git a/patches/series b/patches/series index 5b548e3900dd..6f438da313bf 100644 --- a/patches/series +++ b/patches/series @@ -24,4 +24,3 @@ trusted-domains.diff signature-verification.diff copilot.diff app-name.diff -csp-hashes.diff