diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d22051e2cf4..91188fa6c897 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.143.1 + +### Changed + +- Update to Code 1.143.1 + ## [4.141.1](https://github.com/coder/code-server/releases/tag/v4.141.1) - 2026-10-23 ### Security diff --git a/lib/vscode b/lib/vscode index 2a59476c9bfc..e646868227c3 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 2a59476c9bfcb90b3ddc372c36762471b7dfad1c +Subproject commit e646868227c3e3a9e3f24277c8c7220be42c0be7 diff --git a/patches/copilot.diff b/patches/copilot.diff index 22075a19a478..071d9dc729a6 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 -@@ -291,6 +291,29 @@ export const compileCopilotExtensionBuil +@@ -294,6 +294,29 @@ export const compileCopilotExtensionBuil task.task(compileCopilotExtensionBuildTask); /** diff --git a/patches/csp-hashes.diff b/patches/csp-hashes.diff index 422ca3b61e6e..6eac9f88aff6 100644 --- a/patches/csp-hashes.diff +++ b/patches/csp-hashes.diff @@ -6,8 +6,8 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index -+ content="default-src 'none'; script-src 'sha256-24QqbpzqcqSyIGvg/ZwFRy5pPlhmVBa8CkUREEIUnBw=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> +- content="default-src 'none'; script-src 'sha256-7cKy9iQfWRXcgRS74x6I4q5cRDkv8nQz51jecqMmQ5w=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> ++ content="default-src 'none'; script-src 'sha256-FYdHnaDkSHwSK3TmWDrs/tT+X4bK+aaoa9yy432BONk=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> id.toLowerCase() === this.identifier.id.toLowerCase())) { return false; } diff --git a/patches/display-language.diff b/patches/display-language.diff index ae82f1cab691..e85b43777f00 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts import { ProtocolConstants } from '../../base/parts/ipc/common/ipc.net.js'; import { createRandomIPCHandle } from '../../base/parts/ipc/node/ipc.net.js'; import { IConfigurationService } from '../../platform/configuration/common/configuration.js'; -@@ -418,6 +418,9 @@ export async function setupServerService +@@ -444,6 +444,9 @@ export async function setupServerService socketServer.registerChannel('mcpManagement', new McpManagementChannel(mcpManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority))); diff --git a/patches/external-file-actions.diff b/patches/external-file-actions.diff index 494df5ddc481..ae375ff4ef50 100644 --- a/patches/external-file-actions.diff +++ b/patches/external-file-actions.diff @@ -282,7 +282,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explo =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts +++ code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts -@@ -65,6 +65,7 @@ import { timeout } from '../../../../../ +@@ -62,6 +62,7 @@ import { defaultCountBadgeStyles } from import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js'; import { mainWindow } from '../../../../../base/browser/window.js'; import { IExplorerFileContribution, explorerFileContribRegistry } from '../explorerFileContrib.js'; @@ -290,7 +290,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explo import { WorkbenchCompressibleAsyncDataTree } from '../../../../../platform/list/browser/listService.js'; import { ISearchService, QueryType, getExcludes, ISearchConfiguration, ISearchComplete, IFileQuery } from '../../../../services/search/common/search.js'; import { CancellationToken } from '../../../../../base/common/cancellation.js'; -@@ -1587,7 +1588,8 @@ export class FileDragAndDrop implements +@@ -1515,7 +1516,8 @@ export class FileDragAndDrop implements @IConfigurationService private configurationService: IConfigurationService, @IInstantiationService private instantiationService: IInstantiationService, @IWorkspaceEditingService private workspaceEditingService: IWorkspaceEditingService, @@ -300,7 +300,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explo ) { const updateDropEnablement = (e: IConfigurationChangeEvent | undefined) => { if (!e || e.affectsConfiguration('explorer.enableDragAndDrop')) { -@@ -1812,15 +1814,17 @@ export class FileDragAndDrop implements +@@ -1740,15 +1742,17 @@ export class FileDragAndDrop implements // External file DND (Import/Upload file) if (data instanceof NativeDragAndDropData) { diff --git a/patches/getting-started.diff b/patches/getting-started.diff index dab9d4144957..857db3b8fd93 100644 --- a/patches/getting-started.diff +++ b/patches/getting-started.diff @@ -115,7 +115,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/media/gettingStarted.css +++ code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/media/gettingStarted.css -@@ -60,6 +60,15 @@ +@@ -63,6 +63,15 @@ display: block; } diff --git a/patches/integration.diff b/patches/integration.diff index ae7b16ee472f..92f5e8181256 100644 --- a/patches/integration.diff +++ b/patches/integration.diff @@ -33,7 +33,7 @@ Index: code-server/lib/vscode/src/vs/server/node/server.main.ts -delete process.env[agentHostBridgeConnectionTokenEnvironmentVariable]; - -const REMOTE_DATA_FOLDER = args['server-data-dir'] || process.env['VSCODE_AGENT_FOLDER'] || join(os.homedir(), product.serverDataFolderName || '.vscode-remote'); --const USER_DATA_PATH = join(REMOTE_DATA_FOLDER, 'data'); +-const USER_DATA_PATH = args['user-data-dir'] || join(REMOTE_DATA_FOLDER, 'data'); -const APP_SETTINGS_HOME = join(USER_DATA_PATH, 'User'); -const GLOBAL_STORAGE_HOME = join(APP_SETTINGS_HOME, 'globalStorage'); -const LOCAL_HISTORY_HOME = join(APP_SETTINGS_HOME, 'History'); diff --git a/patches/node-version.diff b/patches/node-version.diff deleted file mode 100644 index a80604a04a4c..000000000000 --- a/patches/node-version.diff +++ /dev/null @@ -1,33 +0,0 @@ -Bump the bundled Node.js version - -Pull in Node.js security fixes (Brotli decoder RCE) ahead of upstream. Drop -this patch once upstream targets this version or newer. - -Index: code-server/lib/vscode/remote/.npmrc -=================================================================== ---- code-server.orig/lib/vscode/remote/.npmrc -+++ code-server/lib/vscode/remote/.npmrc -@@ -1,5 +1,5 @@ - disturl="https://nodejs.org/dist" --target="24.21.0" -+target="24.22.1" - ms_build_id="474716" - runtime="node" - build_from_source="true" -Index: code-server/lib/vscode/build/checksums/nodejs.txt -=================================================================== ---- code-server.orig/lib/vscode/build/checksums/nodejs.txt -+++ code-server/lib/vscode/build/checksums/nodejs.txt -@@ -1,6 +1,6 @@ --bed7eea5325e1108f32ce5228ddd6a5f0f08a499ee42aa7442aea583702f6057 node-v24.21.0-darwin-arm64.tar.gz --1462cb3b3046b815cf8ea436d3da450ec1a9f11dac7e5a46b0ada5305d7e8097 node-v24.21.0-darwin-x64.tar.gz --724282c3b43aec998aa9527380465b45d229e021b58035f5f4f63095eabfe5d5 node-v24.21.0-linux-arm64.tar.gz --6e1db87ef58b8819e5d5402eff1536491b18edd8eb7bee5ef7897876e88dc5ff node-v24.21.0-linux-x64.tar.gz --dff59da18b6ffe1bf1ca99e1d2af4906080c481740619f5b5098c0fca28bd9b7 win-arm64/node.exe --ba4e6d110e8c1592a1ecd390f6b05f3da124b13871a5be62b341a07a853c6c32 win-x64/node.exe -+89c682593d76cd44233fa53b1563264e7de9cbb189cad169135c5b4fadfbc0a7 node-v24.22.1-darwin-arm64.tar.gz -+d132557e7ee2b85af08b0c8c34338e65c6430f2238d01f727728ef42dc83b035 node-v24.22.1-darwin-x64.tar.gz -+33c37be234ba8bee041961047b19160f4d7d0f164e8e246f78bdd10feff148b3 node-v24.22.1-linux-arm64.tar.gz -+eb6728e77c576a35162c122c45ccadf224d89ff00abc8dae46cc2897c6002d7c node-v24.22.1-linux-x64.tar.gz -+8bea91dc437fe01e7d92ef0efc6c9eaf654369aaba9b2d3e9841552ea7b95a00 win-arm64/node.exe -+d702daa815eabbff763c7d3808e235cf031cf2ca70211b56847bc72f51e240e5 win-x64/node.exe diff --git a/patches/remote-storage.diff b/patches/remote-storage.diff index 1011acd1e762..4ceb92d7ed2e 100644 --- a/patches/remote-storage.diff +++ b/patches/remote-storage.diff @@ -104,7 +104,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/server/node/serverServices.ts +++ code-server/lib/vscode/src/vs/server/node/serverServices.ts -@@ -105,6 +105,10 @@ import { McpManagementChannel } from '.. +@@ -106,6 +106,10 @@ import { McpManagementChannel } from '.. import { AllowedMcpServersService } from '../../platform/mcp/common/allowedMcpServersService.js'; import { IMcpGalleryManifestService } from '../../platform/mcp/common/mcpGalleryManifest.js'; import { McpGalleryManifestIPCService } from '../../platform/mcp/common/mcpGalleryManifestServiceIpc.js'; @@ -115,7 +115,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts import { SANDBOX_HELPER_CHANNEL_NAME, SandboxHelperChannel } from '../../platform/sandbox/common/sandboxHelperIpc.js'; import { SandboxHelperService } from '../../platform/sandbox/node/sandboxHelper.js'; -@@ -238,6 +242,21 @@ export async function setupServerService +@@ -244,6 +248,21 @@ export async function setupServerService services.set(IMcpGatewayService, new SyncDescriptor(McpGatewayService)); const instantiationService: IInstantiationService = new InstantiationService(services); @@ -137,7 +137,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts services.set(ILanguagePackService, instantiationService.createInstance(NativeLanguagePackService)); const ptyHostStarter = instantiationService.createInstance( -@@ -420,6 +439,7 @@ export async function setupServerService +@@ -446,6 +465,7 @@ export async function setupServerService const languagePackChannel = ProxyChannel.fromService(accessor.get(ILanguagePackService), disposables); socketServer.registerChannel('languagePacks', languagePackChannel); diff --git a/patches/series b/patches/series index ebbeb794f91e..b102e9d2c5c6 100644 --- a/patches/series +++ b/patches/series @@ -27,4 +27,3 @@ app-name.diff remote-storage.diff remote-secret-storage.diff csp-hashes.diff -node-version.diff diff --git a/patches/telemetry.diff b/patches/telemetry.diff index 5ae394edc972..fcbd196b7c03 100644 --- a/patches/telemetry.diff +++ b/patches/telemetry.diff @@ -20,7 +20,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts import { NullPolicyService } from '../../platform/policy/common/policy.js'; import { OneDataSystemAppender } from '../../platform/telemetry/node/1dsAppender.js'; import { LoggerService } from '../../platform/log/node/loggerService.js'; -@@ -179,11 +180,23 @@ export async function setupServerService +@@ -184,11 +185,23 @@ export async function setupServerService const requestService = new RequestService('remote', configurationService, environmentService, logService); services.set(IRequestService, requestService); diff --git a/patches/unique-db.diff b/patches/unique-db.diff index 10d7d19b2606..cd4b948a586c 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 { -@@ -354,7 +355,11 @@ export class IndexedDBStorageDatabase ex +@@ -365,7 +366,11 @@ export class IndexedDBStorageDatabase ex } static async createWorkspaceStorage(workspaceId: string, logService: ILogService): Promise { diff --git a/patches/webview.diff b/patches/webview.diff index 45a7865a7374..395bf179235f 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -53,7 +53,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html +++ code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html -@@ -253,7 +253,7 @@ +@@ -266,7 +266,7 @@ } const swPath = encodeURI(`service-worker.js?v=${expectedWorkerVersion}&vscode-resource-base-authority=${searchParams.get('vscode-resource-base-authority')}&remoteAuthority=${searchParams.get('remoteAuthority') ?? ''}&platform=${searchParams.get('platform')}`); @@ -62,7 +62,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index .then(async registration => { if (navigator.serviceWorker.controller) { // A previous SW is already controlling. Force an update -@@ -332,6 +332,12 @@ +@@ -345,6 +345,12 @@ const hostname = location.hostname; diff --git a/test/unit/node/i18n.test.ts b/test/unit/node/i18n.test.ts index 8670f55a194c..90b10d04822c 100644 --- a/test/unit/node/i18n.test.ts +++ b/test/unit/node/i18n.test.ts @@ -1,13 +1,9 @@ import { promises as fs } from "fs" import * as os from "os" import * as path from "path" -import i18n, { loadCustomStrings } from "../../../src/node/i18n" +import { loadCustomStrings } from "../../../src/node/i18n" describe("i18n", () => { - it("includes Turkish translations", () => { - expect(i18n.getResource("tr", "translation", "WELCOME")).toBe("{{app}} uygulamasına hoş geldiniz") - }) - let tempDir: string let validJsonFile: string let invalidJsonFile: string