Skip to content

Commit 2c06497

Browse files
authored
Update Code to 1.126.0 (#7868)
1 parent 9ccf763 commit 2c06497

11 files changed

Lines changed: 19 additions & 13 deletions

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ Code v99.99.999
2222

2323
## Unreleased
2424

25+
Code v1.126.0
26+
27+
### Changed
28+
29+
- Update to Code 1.126.0
30+
2531
## [4.125.0](https://github.com/coder/code-server/releases/tag/v4.125.0) - 2026-06-18
2632

2733
Code v1.125.0

lib/vscode

Submodule vscode updated 1159 files

patches/base-path.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
146146
embedderIdentifier: 'server-distro',
147147
extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? {
148148
...this._productService.extensionsGallery,
149-
@@ -407,7 +414,9 @@ export class WebClientServer {
149+
@@ -401,7 +408,9 @@ export class WebClientServer {
150150
WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '',
151151
WORKBENCH_WEB_BASE_URL: staticRoute,
152152
WORKBENCH_NLS_URL,
@@ -157,7 +157,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
157157
};
158158

159159
// DEV ---------------------------------------------------------------------------------------
160-
@@ -444,7 +453,7 @@ export class WebClientServer {
160+
@@ -438,7 +447,7 @@ export class WebClientServer {
161161
'default-src \'self\';',
162162
'img-src \'self\' https: data: blob:;',
163163
'media-src \'self\';',
@@ -166,7 +166,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
166166
'child-src \'self\';',
167167
`frame-src 'self' https://*.vscode-cdn.net data:;`,
168168
'worker-src \'self\' data: blob:;',
169-
@@ -517,3 +526,70 @@ export class WebClientServer {
169+
@@ -511,3 +520,70 @@ export class WebClientServer {
170170
return void res.end(data);
171171
}
172172
}

patches/display-language.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
161161
import { CharCode } from '../../base/common/charCode.js';
162162
import { IExtensionManifest } from '../../platform/extensions/common/extensions.js';
163163
import { ICSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js';
164-
@@ -405,14 +406,22 @@ export class WebClientServer {
164+
@@ -399,14 +400,22 @@ export class WebClientServer {
165165
};
166166

167167
const cookies = cookie.parse(req.headers.cookie || '');

patches/external-file-actions.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
112112
===================================================================
113113
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
114114
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
115-
@@ -389,6 +389,8 @@ export class WebClientServer {
115+
@@ -383,6 +383,8 @@ export class WebClientServer {
116116
serverBasePath: basePath,
117117
webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
118118
userDataPath: this._environmentService.userDataPath,

patches/getting-started.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
201201
===================================================================
202202
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
203203
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
204-
@@ -393,6 +393,7 @@ export class WebClientServer {
204+
@@ -387,6 +387,7 @@ export class WebClientServer {
205205
userDataPath: this._environmentService.userDataPath,
206206
isEnabledFileDownloads: !this._environmentService.args['disable-file-downloads'],
207207
isEnabledFileUploads: !this._environmentService.args['disable-file-uploads'],

patches/integration.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,15 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
164164
===================================================================
165165
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.main.ts
166166
+++ code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
167-
@@ -65,6 +65,7 @@ import { IOpenerService } from '../../pl
167+
@@ -64,6 +64,7 @@ import { IOpenerService } from '../../pl
168168
import { mixin, safeStringify } from '../../base/common/objects.js';
169169
import { IndexedDB } from '../../base/browser/indexedDB.js';
170170
import { WebFileSystemAccess } from '../../platform/files/browser/webFileSystemAccess.js';
171171
+import { CodeServerClient } from '../../workbench/browser/client.js';
172172
import { IProgressService } from '../../platform/progress/common/progress.js';
173173
import { DelayedLogChannel } from '../services/output/common/delayedLogChannel.js';
174174
import { dirname, joinPath } from '../../base/common/resources.js';
175-
@@ -140,6 +141,9 @@ export class BrowserMain extends Disposa
175+
@@ -139,6 +140,9 @@ export class BrowserMain extends Disposa
176176
// Startup
177177
const instantiationService = workbench.startup();
178178

patches/local-storage.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
1818
===================================================================
1919
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
2020
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
21-
@@ -384,6 +384,7 @@ export class WebClientServer {
21+
@@ -378,6 +378,7 @@ export class WebClientServer {
2222
remoteAuthority,
2323
serverBasePath: basePath,
2424
webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',

patches/marketplace.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
6464
+ extensionsGallery: this._productService.extensionsGallery,
6565
};
6666

67-
const proposedApi = this._environmentService.args['enable-proposed-api'];
67+
if (!this._environmentService.isBuilt) {
6868
Index: code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
6969
===================================================================
7070
--- code-server.orig/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts

patches/trusted-domains.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
4646
+ linkProtectionTrustedDomains,
4747
};
4848

49-
const proposedApi = this._environmentService.args['enable-proposed-api'];
49+
if (!this._environmentService.isBuilt) {

0 commit comments

Comments
 (0)