Skip to content

Commit 3b8812c

Browse files
cdrcicode-asher
cdrci
authored and
code-asher
committed
Update Code to 1.136.1
1 parent 2b2f8b3 commit 3b8812c

17 files changed

Lines changed: 97 additions & 85 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.136.1
26+
27+
### Changed
28+
29+
- Update to Code 1.136.1
30+
2531
## [4.135.0](https://github.com/coder/code-server/releases/tag/v4.135.0) - 2026-08-27
2632

2733
Code v1.135.0

‎lib/vscode‎

Submodule vscode updated 1804 files

‎patches/app-name.diff‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
1212
===================================================================
1313
--- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
1414
+++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
15-
@@ -24,6 +24,7 @@ export const serverOptions: OptionDescri
15+
@@ -40,6 +40,7 @@ export const serverOptions: OptionDescri
1616
'disable-getting-started-override': { type: 'boolean' },
1717
'locale': { type: 'string' },
1818
'link-protection-trusted-domains': { type: 'string[]' },
1919
+ 'app-name': { type: 'string' },
2020

2121
/* ----- server setup ----- */
2222

23-
@@ -124,6 +125,7 @@ export interface ServerParsedArgs {
23+
@@ -140,6 +141,7 @@ export interface ServerParsedArgs {
2424
'disable-getting-started-override'?: boolean,
2525
'locale'?: string
2626
'link-protection-trusted-domains'?: string[],
@@ -32,7 +32,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
3232
===================================================================
3333
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
3434
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
35-
@@ -362,8 +362,11 @@ export class WebClientServer {
35+
@@ -407,8 +407,11 @@ export class WebClientServer {
3636
linkProtectionTrustedDomains.push(...this._productService.linkProtectionTrustedDomains);
3737
}
3838

‎patches/base-path.diff‎

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench-dev.html
3636

3737
<!-- Disable pinch zooming -->
3838
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
39-
@@ -27,9 +27,9 @@
40-
<meta id="vscode-workbench-builtin-extensions" data-settings="{{WORKBENCH_BUILTIN_EXTENSIONS}}">
39+
@@ -29,9 +29,9 @@
40+
<meta id="vscode-workbench-css-modules" data-settings="{{WORKBENCH_DEV_CSS_MODULES}}">
4141

4242
<!-- Workbench Icon/Manifest/CSS -->
4343
- <link rel="icon" href="/_static/src/browser/media/favicon-dark-support.svg" />
@@ -49,15 +49,15 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench-dev.html
4949
<style id="vscode-css-modules" type="text/css" media="screen"></style>
5050

5151
</head>
52-
@@ -39,7 +39,7 @@
52+
@@ -41,7 +41,7 @@
5353

5454
<!-- Startup (do not modify order of script tags!) -->
55-
<script>
56-
- const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location.origin).toString();
57-
+ const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location).toString();
55+
<script nonce="{{WORKBENCH_SCRIPT_NONCE}}">
56+
- const baseUrl = new URL(document.getElementById('vscode-workbench-web-base-url').getAttribute('data-settings'), window.location.origin).toString();
57+
+ const baseUrl = new URL(document.getElementById('vscode-workbench-web-base-url').getAttribute('data-settings'), window.location).toString();
5858
globalThis._VSCODE_FILE_ROOT = baseUrl + '/out/';
5959
</script>
60-
<script>
60+
<script nonce="{{WORKBENCH_SCRIPT_NONCE}}">
6161
Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.html
6262
===================================================================
6363
--- code-server.orig/lib/vscode/src/vs/code/browser/workbench/workbench.html
@@ -73,7 +73,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.html
7373

7474
<!-- Disable pinch zooming -->
7575
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
76-
@@ -24,9 +24,9 @@
76+
@@ -25,9 +25,9 @@
7777
<meta id="vscode-workbench-auth-session" data-settings="{{WORKBENCH_AUTH_SESSION}}">
7878

7979
<!-- Workbench Icon/Manifest/CSS -->
@@ -86,15 +86,15 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.html
8686
<link rel="stylesheet" href="{{WORKBENCH_WEB_BASE_URL}}/out/vs/code/browser/workbench/workbench.css">
8787

8888
</head>
89-
@@ -36,7 +36,7 @@
89+
@@ -37,7 +37,7 @@
9090

9191
<!-- Startup (do not modify order of script tags!) -->
92-
<script>
93-
- const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location.origin).toString();
94-
+ const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location).toString();
92+
<script nonce="{{WORKBENCH_SCRIPT_NONCE}}">
93+
- const baseUrl = new URL(document.getElementById('vscode-workbench-web-base-url').getAttribute('data-settings'), window.location.origin).toString();
94+
+ const baseUrl = new URL(document.getElementById('vscode-workbench-web-base-url').getAttribute('data-settings'), window.location).toString();
9595
globalThis._VSCODE_FILE_ROOT = baseUrl + '/out/';
9696
</script>
97-
<script>
97+
<script nonce="{{WORKBENCH_SCRIPT_NONCE}}">
9898
Index: code-server/lib/vscode/src/vs/platform/remote/browser/browserSocketFactory.ts
9999
===================================================================
100100
--- code-server.orig/lib/vscode/src/vs/platform/remote/browser/browserSocketFactory.ts
@@ -111,21 +111,31 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
111111
===================================================================
112112
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
113113
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
114-
@@ -263,7 +263,9 @@ export class WebClientServer {
114+
@@ -146,7 +146,7 @@ export function createWorkbenchContentSe
115+
'default-src \'self\';',
116+
'img-src \'self\' https: data: blob:;',
117+
'media-src \'self\';',
118+
- `script-src 'self' 'unsafe-eval' ${nlsBaseUrl ?? ''} blob: 'nonce-${scriptNonce}' '${webWorkerExtensionHostIframeScriptSHA}' 'sha256-/r7rqQ+yrxt57sxLuQ6AMYcy/lUpvAIzHjIJt/OeLWU=' ${useTestResolver ? '' : `http://${remoteAuthority}`};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
119+
+ `script-src 'self' 'unsafe-eval' ${nlsBaseUrl ?? ''} blob: 'nonce-${scriptNonce}' '${webWorkerExtensionHostIframeScriptSHA}' 'sha256-/r7rqQ+yrxt57sxLuQ6AMYcy/lUpvAIzHjIJt/OeLWU=' ${useTestResolver ? '' : ``};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
120+
'child-src \'self\';',
121+
`frame-src 'self' https://*.vscode-cdn.net data:;`,
122+
'worker-src \'self\' data: blob:;',
123+
@@ -307,8 +307,10 @@ export class WebClientServer {
115124
};
116125

117126
// Prefix routes with basePath for clients
118-
- const basePath = getFirstHeader('x-forwarded-prefix') || this._basePath;
119127
+ const rootBase = relativeRoot(getOriginalUrl(req))
120128
+ const vscodeBase = relativePath(getOriginalUrl(req))
121-
+ const basePath = vscodeBase || getFirstHeader('x-forwarded-prefix') || this._basePath;
129+
const forwardedPrefix = getFirstHeader('x-forwarded-prefix');
130+
- const basePath = forwardedPrefix && isSafeBasePath(forwardedPrefix) ? forwardedPrefix : this._basePath;
131+
+ const basePath = vscodeBase || (forwardedPrefix && isSafeBasePath(forwardedPrefix) ? forwardedPrefix : this._basePath);
122132

123133
const queryConnectionTokens = parsedUrl.searchParams.getAll(connectionTokenQueryName);
124134
if (queryConnectionTokens.length === 1) {
125-
@@ -300,10 +302,14 @@ export class WebClientServer {
135+
@@ -345,10 +347,14 @@ export class WebClientServer {
126136
};
127137

128-
const useTestResolver = (!this._environmentService.isBuilt && this._environmentService.args['use-test-resolver']);
138+
const useTestResolver = (!this._environmentService.isBuilt && !!this._environmentService.args['use-test-resolver']);
129139
+ // For now we are getting the remote authority from the client to avoid
130140
+ // needing specific configuration for reverse proxies to work. Set this to
131141
+ // something invalid to make sure we catch code that is using this value
@@ -138,35 +148,26 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
138148
);
139149
if (!remoteAuthority) {
140150
return serveError(req, res, 400, `Bad request.`);
141-
@@ -350,6 +356,7 @@ export class WebClientServer {
151+
@@ -395,6 +401,7 @@ export class WebClientServer {
142152

143153
const productConfiguration: Partial<Mutable<IProductConfiguration>> = {
144154
codeServerVersion: this._productService.codeServerVersion,
145155
+ rootEndpoint: rootBase,
146156
embedderIdentifier: 'server-distro',
147157
voiceWsUrl: this._productService.voiceWsUrl,
148158
extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? {
149-
@@ -399,7 +406,9 @@ export class WebClientServer {
150-
WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '',
159+
@@ -446,7 +453,9 @@ export class WebClientServer {
151160
WORKBENCH_WEB_BASE_URL: staticRoute,
152161
WORKBENCH_NLS_URL,
153-
- WORKBENCH_NLS_FALLBACK_URL: `${staticRoute}/out/nls.messages.js`
154-
+ WORKBENCH_NLS_FALLBACK_URL: `${staticRoute}/out/nls.messages.js`,
162+
WORKBENCH_NLS_FALLBACK_URL: `${staticRoute}/out/nls.messages.js`,
163+
- WORKBENCH_SCRIPT_NONCE: scriptNonce
164+
+ WORKBENCH_SCRIPT_NONCE: scriptNonce,
155165
+ BASE: rootBase,
156166
+ VS_BASE: basePath,
157167
};
158168

159169
// DEV ---------------------------------------------------------------------------------------
160-
@@ -436,7 +445,7 @@ export class WebClientServer {
161-
'default-src \'self\';',
162-
'img-src \'self\' https: data: blob:;',
163-
'media-src \'self\';',
164-
- `script-src 'self' 'unsafe-eval' ${WORKBENCH_NLS_BASE_URL ?? ''} blob: 'nonce-1nline-m4p' ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' 'sha256-/r7rqQ+yrxt57sxLuQ6AMYcy/lUpvAIzHjIJt/OeLWU=' ${useTestResolver ? '' : `http://${remoteAuthority}`};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
165-
+ `script-src 'self' 'unsafe-eval' ${WORKBENCH_NLS_BASE_URL ?? ''} blob: 'nonce-1nline-m4p' ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' 'sha256-/r7rqQ+yrxt57sxLuQ6AMYcy/lUpvAIzHjIJt/OeLWU=' ${useTestResolver ? '' : ``};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
166-
'child-src \'self\';',
167-
`frame-src 'self' https://*.vscode-cdn.net data:;`,
168-
'worker-src \'self\' data: blob:;',
169-
@@ -509,3 +518,70 @@ export class WebClientServer {
170+
@@ -542,3 +551,70 @@ export class WebClientServer {
170171
return void res.end(data);
171172
}
172173
}

‎patches/display-language.diff‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
1818
import { ProtocolConstants } from '../../base/parts/ipc/common/ipc.net.js';
1919
import { createRandomIPCHandle } from '../../base/parts/ipc/node/ipc.net.js';
2020
import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
21-
@@ -417,6 +417,9 @@ export async function setupServerService
21+
@@ -418,6 +418,9 @@ export async function setupServerService
2222

2323
socketServer.registerChannel('mcpManagement', new McpManagementChannel(mcpManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)));
2424

@@ -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-
@@ -397,14 +398,22 @@ export class WebClientServer {
164+
@@ -442,14 +443,22 @@ export class WebClientServer {
165165
};
166166

167167
const cookies = cookie.parse(req.headers.cookie || '');
@@ -171,7 +171,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
171171
let WORKBENCH_NLS_URL: string;
172172
if (!locale.startsWith('en') && this._productService.nlsCoreBaseUrl) {
173173
WORKBENCH_NLS_BASE_URL = this._productService.nlsCoreBaseUrl;
174-
WORKBENCH_NLS_URL = `${WORKBENCH_NLS_BASE_URL}${this._productService.commit}/${this._productService.version}/${locale}/nls.messages.js`;
174+
WORKBENCH_NLS_URL = createNlsUrl(WORKBENCH_NLS_BASE_URL, this._productService.commit, this._productService.version, locale);
175175
} else {
176176
- WORKBENCH_NLS_URL = ''; // fallback will apply
177177
+ try {
@@ -181,24 +181,24 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
181181
+ : '';
182182
+ } catch (error) {
183183
+ console.error("Failed to generate translations", error);
184-
+ WORKBENCH_NLS_URL = '';
184+
+ WORKBENCH_NLS_URL = ''; // fallback will apply
185185
+ }
186186
}
187187

188-
const values: { [key: string]: string } = {
188+
const scriptNonce = createScriptNonce();
189189
Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
190190
===================================================================
191191
--- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
192192
+++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
193-
@@ -22,6 +22,7 @@ export const serverOptions: OptionDescri
193+
@@ -38,6 +38,7 @@ export const serverOptions: OptionDescri
194194
'disable-file-downloads': { type: 'boolean' },
195195
'disable-file-uploads': { type: 'boolean' },
196196
'disable-getting-started-override': { type: 'boolean' },
197197
+ 'locale': { type: 'string' },
198198

199199
/* ----- server setup ----- */
200200

201-
@@ -120,6 +121,7 @@ export interface ServerParsedArgs {
201+
@@ -136,6 +137,7 @@ export interface ServerParsedArgs {
202202
'disable-file-downloads'?: boolean;
203203
'disable-file-uploads'?: boolean;
204204
'disable-getting-started-override'?: boolean,

‎patches/external-file-actions.diff‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
9090
===================================================================
9191
--- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
9292
+++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
93-
@@ -19,6 +19,8 @@ export const serverOptions: OptionDescri
93+
@@ -35,6 +35,8 @@ export const serverOptions: OptionDescri
9494
/* ----- code-server ----- */
9595
'disable-update-check': { type: 'boolean' },
9696
'auth': { type: 'string' },
@@ -99,7 +99,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
9999

100100
/* ----- server setup ----- */
101101

102-
@@ -114,6 +116,8 @@ export interface ServerParsedArgs {
102+
@@ -130,6 +132,8 @@ export interface ServerParsedArgs {
103103
/* ----- code-server ----- */
104104
'disable-update-check'?: boolean;
105105
'auth'?: string;
@@ -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-
@@ -380,6 +380,8 @@ export class WebClientServer {
115+
@@ -425,6 +425,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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,15 +181,15 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
181181
===================================================================
182182
--- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
183183
+++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
184-
@@ -21,6 +21,7 @@ export const serverOptions: OptionDescri
184+
@@ -37,6 +37,7 @@ export const serverOptions: OptionDescri
185185
'auth': { type: 'string' },
186186
'disable-file-downloads': { type: 'boolean' },
187187
'disable-file-uploads': { type: 'boolean' },
188188
+ 'disable-getting-started-override': { type: 'boolean' },
189189

190190
/* ----- server setup ----- */
191191

192-
@@ -118,6 +119,7 @@ export interface ServerParsedArgs {
192+
@@ -134,6 +135,7 @@ export interface ServerParsedArgs {
193193
'auth'?: string;
194194
'disable-file-downloads'?: boolean;
195195
'disable-file-uploads'?: boolean;
@@ -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-
@@ -384,6 +384,7 @@ export class WebClientServer {
204+
@@ -429,6 +429,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'],

0 commit comments

Comments
 (0)