From 948bcdcfd198dc72070cbc427eaf2c5a6b6a20a5 Mon Sep 17 00:00:00 2001 From: Olivier Benz Date: Wed, 29 Apr 2026 14:56:47 +0200 Subject: [PATCH 1/3] Update Code to 1.118.0 --- lib/vscode | 2 +- patches/clipboard.diff | 2 +- patches/copilot.diff | 2 +- patches/unique-db.diff | 2 +- patches/update-check.diff | 2 +- patches/webview.diff | 13 ++----------- 6 files changed, 7 insertions(+), 16 deletions(-) diff --git a/lib/vscode b/lib/vscode index 10c8e557c8b9..9b8ae15a8cf9 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 10c8e557c8b9f9ed0a87f61f1c9a44bde731c409 +Subproject commit 9b8ae15a8cf95b9bce1b590b42954530f440e816 diff --git a/patches/clipboard.diff b/patches/clipboard.diff index a74a74756fe6..d479070d68f8 100644 --- a/patches/clipboard.diff +++ b/patches/clipboard.diff @@ -78,7 +78,7 @@ Index: code-server/lib/vscode/src/vs/platform/environment/common/argv.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/platform/environment/common/argv.ts +++ code-server/lib/vscode/src/vs/platform/environment/common/argv.ts -@@ -145,6 +145,7 @@ export interface NativeParsedArgs { +@@ -149,6 +149,7 @@ export interface NativeParsedArgs { 'disable-chromium-sandbox'?: boolean; sandbox?: boolean; 'enable-coi'?: boolean; diff --git a/patches/copilot.diff b/patches/copilot.diff index feb61f91713b..e98967525605 100644 --- a/patches/copilot.diff +++ b/patches/copilot.diff @@ -2,7 +2,7 @@ Index: code-server/lib/vscode/build/gulpfile.extensions.ts =================================================================== --- code-server.orig/lib/vscode/build/gulpfile.extensions.ts +++ code-server/lib/vscode/build/gulpfile.extensions.ts -@@ -287,6 +287,29 @@ export const compileCopilotExtensionBuil +@@ -293,6 +293,29 @@ export const compileCopilotExtensionBuil gulp.task(compileCopilotExtensionBuildTask); /** diff --git a/patches/unique-db.diff b/patches/unique-db.diff index abe17ad75a95..9d4f2ae39913 100644 --- a/patches/unique-db.diff +++ b/patches/unique-db.diff @@ -21,7 +21,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/storage/browser/storageS export class BrowserStorageService extends AbstractStorageService { -@@ -300,7 +301,11 @@ export class IndexedDBStorageDatabase ex +@@ -328,7 +329,11 @@ export class IndexedDBStorageDatabase ex } static async createWorkspaceStorage(workspaceId: string, logService: ILogService): Promise { diff --git a/patches/update-check.diff b/patches/update-check.diff index 372719a8e201..dbbb7e31ae95 100644 --- a/patches/update-check.diff +++ b/patches/update-check.diff @@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts readonly version: string; readonly date?: string; -@@ -118,6 +119,7 @@ export interface IProductConfiguration { +@@ -119,6 +120,7 @@ export interface IProductConfiguration { readonly resourceUrlTemplate: string; readonly nlsBaseUrl: string; readonly accessSKUs?: string[]; diff --git a/patches/webview.diff b/patches/webview.diff index f3b825ed3dd8..702d8ef6c89e 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -70,21 +70,12 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index +- content="default-src 'none'; script-src 'sha256-q+WTr+fBXpLLE3++yWNaxT6BTWQtsKscoeIlynBRk4E=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> + content="default-src 'none'; script-src 'sha256-nQZh+9dHKZP2cHbhYlCbWDtqxxJtGjRGBx57zNP2DZM=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> { - /** - * @param {MessageEvent} event -@@ -370,6 +370,12 @@ +@@ -332,6 +332,12 @@ const hostname = location.hostname; From 3b2560811a3bf004f6621545e15499b484f295bc Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 1 May 2026 15:40:00 -0800 Subject: [PATCH 2/3] Update copilot patch --- patches/copilot.diff | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/copilot.diff b/patches/copilot.diff index e98967525605..d30f43d7301a 100644 --- a/patches/copilot.diff +++ b/patches/copilot.diff @@ -40,7 +40,7 @@ Index: code-server/lib/vscode/build/lib/extensions.ts import { type IExtensionDefinition, getExtensionStream } from './builtInExtensions.ts'; import { fetchUrls, fetchGithub } from './fetch.ts'; import { createTsgoStream, spawnTsgo } from './tsgo.ts'; -+import { prepareBuiltInCopilotExtensionShims } from './copilot.ts'; ++import { prepareBuiltInCopilotRipgrepShim } from './copilot.ts'; import vzip from 'gulp-vinyl-zip'; import { createRequire } from 'module'; @@ -148,7 +148,7 @@ Index: code-server/lib/vscode/build/lib/extensions.ts + } + + try { -+ prepareBuiltInCopilotExtensionShims(platform, arch, outputDir, appNodeModulesDir); ++ prepareBuiltInCopilotRipgrepShim(platform, arch, outputDir, appNodeModulesDir); + fancyLog(`[prepareCopilotExtensionNativeShims] Materialized native shims for ${platform}-${arch}`); + } catch (err) { + // Downgrade to a warning for local builds since the extension From 21efa1e6a9222294c949d1bf9b91cad081d1b45d Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 1 May 2026 15:52:14 -0800 Subject: [PATCH 3/3] Update webview hash --- patches/webview.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/webview.diff b/patches/webview.diff index 702d8ef6c89e..ce107779250f 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -71,7 +71,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index -+ content="default-src 'none'; script-src 'sha256-nQZh+9dHKZP2cHbhYlCbWDtqxxJtGjRGBx57zNP2DZM=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> ++ content="default-src 'none'; script-src 'sha256-TRhQKOVfHYg34NwPrDGzFSP3l32HL8sgSHYg4kYl0ho=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">