diff --git a/CHANGELOG.md b/CHANGELOG.md index dd51a086500c..1123e72c75be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.135.0 + +### Changed + +- Update to Code 1.135.0 + ## [4.134.0](https://github.com/coder/code-server/releases/tag/v4.134.0) - 2026-08-24 Code v1.134.0 diff --git a/lib/vscode b/lib/vscode index 474a349ad5b7..08d4889f9ec4 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 474a349ad5b745e512ef86b864d1c74f7264dd7a +Subproject commit 08d4889f9ec4a1685d257b9b95de036c8e1ce1e5 diff --git a/patches/app-name.diff b/patches/app-name.diff index cb292b8baef9..49ad18e64d58 100644 --- a/patches/app-name.diff +++ b/patches/app-name.diff @@ -32,7 +32,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -363,8 +363,11 @@ export class WebClientServer { +@@ -362,8 +362,11 @@ export class WebClientServer { linkProtectionTrustedDomains.push(...this._productService.linkProtectionTrustedDomains); } diff --git a/patches/base-path.diff b/patches/base-path.diff index 8ad6c7a5ba57..dc8cd7b38df1 100644 --- a/patches/base-path.diff +++ b/patches/base-path.diff @@ -111,7 +111,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -264,7 +264,9 @@ export class WebClientServer { +@@ -263,7 +263,9 @@ export class WebClientServer { }; // Prefix routes with basePath for clients @@ -122,7 +122,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts const queryConnectionTokens = parsedUrl.searchParams.getAll(connectionTokenQueryName); if (queryConnectionTokens.length === 1) { -@@ -301,10 +303,14 @@ export class WebClientServer { +@@ -300,10 +302,14 @@ export class WebClientServer { }; const useTestResolver = (!this._environmentService.isBuilt && this._environmentService.args['use-test-resolver']); @@ -138,7 +138,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts ); if (!remoteAuthority) { return serveError(req, res, 400, `Bad request.`); -@@ -351,6 +357,7 @@ export class WebClientServer { +@@ -350,6 +356,7 @@ export class WebClientServer { const productConfiguration: Partial> = { codeServerVersion: this._productService.codeServerVersion, @@ -146,7 +146,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts embedderIdentifier: 'server-distro', voiceWsUrl: this._productService.voiceWsUrl, extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? { -@@ -400,7 +407,9 @@ export class WebClientServer { +@@ -399,7 +406,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 --------------------------------------------------------------------------------------- -@@ -437,7 +446,7 @@ export class WebClientServer { +@@ -436,7 +445,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:;', -@@ -510,3 +519,70 @@ export class WebClientServer { +@@ -509,3 +518,70 @@ export class WebClientServer { return void res.end(data); } } diff --git a/patches/clipboard.diff b/patches/clipboard.diff index 0b37edd057b5..9fcaa3b26cdb 100644 --- a/patches/clipboard.diff +++ b/patches/clipboard.diff @@ -102,7 +102,7 @@ Index: code-server/lib/vscode/src/vs/server/node/server.cli.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/server.cli.ts +++ code-server/lib/vscode/src/vs/server/node/server.cli.ts -@@ -77,6 +77,7 @@ const isSupportedForPipe = (optionId: ke +@@ -78,6 +78,7 @@ const isSupportedForPipe = (optionId: ke case 'verbose': case 'remote': case 'locate-shell-integration-path': @@ -110,7 +110,7 @@ Index: code-server/lib/vscode/src/vs/server/node/server.cli.ts return true; default: return false; -@@ -300,6 +301,22 @@ export async function main(desc: Product +@@ -307,6 +308,22 @@ export async function main(desc: Product } } } else { diff --git a/patches/display-language.diff b/patches/display-language.diff index 446e9e699273..ce8720699a2d 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -161,7 +161,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts import { CharCode } from '../../base/common/charCode.js'; import { IExtensionManifest } from '../../platform/extensions/common/extensions.js'; import { ICSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js'; -@@ -398,14 +399,22 @@ export class WebClientServer { +@@ -397,14 +398,22 @@ export class WebClientServer { }; const cookies = cookie.parse(req.headers.cookie || ''); diff --git a/patches/external-file-actions.diff b/patches/external-file-actions.diff index b917b4367518..a726263d4916 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -112,7 +112,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -381,6 +381,8 @@ export class WebClientServer { +@@ -380,6 +380,8 @@ export class WebClientServer { serverBasePath: basePath, webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre', userDataPath: this._environmentService.userDataPath, diff --git a/patches/getting-started.diff b/patches/getting-started.diff index 5baf31b5a79c..fe3ca8d89f05 100644 --- a/patches/getting-started.diff +++ b/patches/getting-started.diff @@ -201,7 +201,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -385,6 +385,7 @@ export class WebClientServer { +@@ -384,6 +384,7 @@ export class WebClientServer { userDataPath: this._environmentService.userDataPath, isEnabledFileDownloads: !this._environmentService.args['disable-file-downloads'], isEnabledFileUploads: !this._environmentService.args['disable-file-uploads'], diff --git a/patches/integration.diff b/patches/integration.diff index d2c6eb54f89f..e25b68ded811 100644 --- a/patches/integration.diff +++ b/patches/integration.diff @@ -251,7 +251,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -350,6 +350,7 @@ export class WebClientServer { +@@ -349,6 +349,7 @@ export class WebClientServer { } : undefined; const productConfiguration: Partial> = { diff --git a/patches/local-storage.diff b/patches/local-storage.diff index 95406a39d6a2..84f1f5953721 100644 --- a/patches/local-storage.diff +++ b/patches/local-storage.diff @@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -376,6 +376,7 @@ export class WebClientServer { +@@ -375,6 +375,7 @@ export class WebClientServer { remoteAuthority, serverBasePath: basePath, webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre', diff --git a/patches/logout.diff b/patches/logout.diff index 1be5886bf722..35fdd0121585 100644 --- a/patches/logout.diff +++ b/patches/logout.diff @@ -40,7 +40,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -358,6 +358,7 @@ export class WebClientServer { +@@ -357,6 +357,7 @@ export class WebClientServer { codeServerVersion: this._productService.codeServerVersion, rootEndpoint: rootBase, updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined, diff --git a/patches/marketplace.diff b/patches/marketplace.diff index a859bc4857d8..77aac5c15833 100644 --- a/patches/marketplace.diff +++ b/patches/marketplace.diff @@ -41,7 +41,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -343,7 +343,6 @@ export class WebClientServer { +@@ -342,7 +342,6 @@ export class WebClientServer { const staticRoute = posix.join(basePath, this._productPath, STATIC_PATH); const callbackRoute = posix.join(basePath, this._productPath, CALLBACK_PATH); @@ -49,7 +49,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts const resolveWorkspaceURI = (defaultLocation?: string) => defaultLocation && URI.file(resolve(defaultLocation)).with({ scheme: Schemas.vscodeRemote, authority: remoteAuthority }); -@@ -360,14 +359,7 @@ export class WebClientServer { +@@ -359,14 +358,7 @@ export class WebClientServer { rootEndpoint: rootBase, embedderIdentifier: 'server-distro', voiceWsUrl: this._productService.voiceWsUrl, diff --git a/patches/proxy-uri.diff b/patches/proxy-uri.diff index 3836339a2797..6f9dfa9ea615 100644 --- a/patches/proxy-uri.diff +++ b/patches/proxy-uri.diff @@ -71,7 +71,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -359,6 +359,7 @@ export class WebClientServer { +@@ -358,6 +358,7 @@ export class WebClientServer { rootEndpoint: rootBase, updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined, logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? rootBase + '/logout' : undefined, diff --git a/patches/service-worker.diff b/patches/service-worker.diff index c8ad4e97a82a..931b34d4a2d2 100644 --- a/patches/service-worker.diff +++ b/patches/service-worker.diff @@ -54,7 +54,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -360,6 +360,10 @@ export class WebClientServer { +@@ -359,6 +359,10 @@ export class WebClientServer { updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined, logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? rootBase + '/logout' : undefined, proxyEndpointTemplate: process.env.VSCODE_PROXY_URI ?? rootBase + '/proxy/{{port}}/', diff --git a/patches/telemetry.diff b/patches/telemetry.diff index f34893cb75e0..6ef0c2fc414f 100644 --- a/patches/telemetry.diff +++ b/patches/telemetry.diff @@ -126,7 +126,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -364,6 +364,8 @@ export class WebClientServer { +@@ -363,6 +363,8 @@ export class WebClientServer { scope: vscodeBase + '/', path: rootBase + '/_static/out/browser/serviceWorker.js', }, diff --git a/patches/trusted-domains.diff b/patches/trusted-domains.diff index efed9f155150..4ec5b785b229 100644 --- a/patches/trusted-domains.diff +++ b/patches/trusted-domains.diff @@ -24,7 +24,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -355,6 +355,14 @@ export class WebClientServer { +@@ -354,6 +354,14 @@ export class WebClientServer { scopes: [['user:email'], ['repo']] } : undefined; @@ -39,7 +39,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts const productConfiguration: Partial> = { codeServerVersion: this._productService.codeServerVersion, rootEndpoint: rootBase, -@@ -370,6 +378,7 @@ export class WebClientServer { +@@ -369,6 +377,7 @@ export class WebClientServer { embedderIdentifier: 'server-distro', voiceWsUrl: this._productService.voiceWsUrl, extensionsGallery: this._productService.extensionsGallery, diff --git a/patches/update-check.diff b/patches/update-check.diff index 2ead1c86bd06..4a63b24f38fe 100644 --- a/patches/update-check.diff +++ b/patches/update-check.diff @@ -113,7 +113,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -357,6 +357,7 @@ export class WebClientServer { +@@ -356,6 +356,7 @@ export class WebClientServer { const productConfiguration: Partial> = { codeServerVersion: this._productService.codeServerVersion, rootEndpoint: rootBase, diff --git a/patches/webview.diff b/patches/webview.diff index fc81d6ab62e3..881497219308 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -41,7 +41,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts -@@ -372,6 +372,7 @@ export class WebClientServer { +@@ -371,6 +371,7 @@ export class WebClientServer { const workbenchWebConfiguration = { remoteAuthority, serverBasePath: basePath,