Skip to content

Commit ee31cdb

Browse files
authored
Update Code to 1.144.0 (#8087)
1 parent 2780846 commit ee31cdb

11 files changed

Lines changed: 50 additions & 15 deletions

‎CHANGELOG.md‎

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

2323
## Unreleased
2424

25+
Code v1.144.0
26+
27+
### Changed
28+
29+
- Update to Code 1.144.0
30+
2531
### Fixed
2632

2733
- `--socket-fd` now works: the inherited socket is passed on to the process
2834
that listens, and the address is logged as `fd:<n>`. Previously code-server
2935
failed with `listen EEXIST` or `Server has no address`.
36+
- The cookie domain was not being set against the shared root host of proxy
37+
domains when proxy domains contained template variables like `{{port}}`,
38+
resulting in having to sign in multiple times per domain instead of only once
39+
as originally intended.
40+
- When doing the web socket origin check, if the host does not already contain a
41+
port, fall back to `X-Forwarded-Port`.
42+
- Fix default ports not matching in the web socket origin check (for example
43+
`https://coder.com` will now match `https://coder.com:443`).
3044

3145
## [4.143.1](https://github.com/coder/code-server/releases/tag/v4.143.1) - 2026-10-23
3246

‎ci/build/update-vscode.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,14 @@ function update_csp() {
101101
echo "Calculated hash as $hash"
102102
# Use octothorpe as a delimiter since the hash may contain a slash.
103103
sed -i.bak "s#'sha256-[^']\+'#'sha256-$hash'#" "$file"
104+
# For the web worker extension host iframe, there is a matching sha in the
105+
# web server.
106+
if [[ $file == */webWorkerExtensionHostIframe.html ]] ; then
107+
quilt add ./lib/vscode/src/vs/server/node/webClientServer.ts
108+
sed -i.bak \
109+
"s#webWorkerExtensionHostIframeScriptSHA = 'sha256-[^']\+'#webWorkerExtensionHostIframeScriptSHA = 'sha256-$hash'#" \
110+
./lib/vscode/src/vs/server/node/webClientServer.ts
111+
fi
104112
done
105113

106114
quilt refresh

‎lib/vscode‎

Submodule vscode updated 3510 files

‎patches/base-path.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Index: code-server/lib/vscode/src/vs/base/common/network.ts
1010
===================================================================
1111
--- code-server.orig/lib/vscode/src/vs/base/common/network.ts
1212
+++ code-server/lib/vscode/src/vs/base/common/network.ts
13-
@@ -256,7 +256,9 @@ class RemoteAuthoritiesImpl {
13+
@@ -262,7 +262,9 @@ class RemoteAuthoritiesImpl {
1414
return URI.from({
1515
scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource,
1616
authority: `${host}:${port}`,

‎patches/copilot.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Index: code-server/lib/vscode/build/gulpfile.extensions.ts
22
===================================================================
33
--- code-server.orig/lib/vscode/build/gulpfile.extensions.ts
44
+++ code-server/lib/vscode/build/gulpfile.extensions.ts
5-
@@ -294,6 +294,29 @@ export const compileCopilotExtensionBuil
5+
@@ -283,6 +283,29 @@ export const compileCopilotExtensionBuil
66
task.task(compileCopilotExtensionBuildTask);
77

88
/**

‎patches/csp-hashes.diff‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index
66
<meta charset="UTF-8">
77

88
<meta http-equiv="Content-Security-Policy"
9-
- content="default-src 'none'; script-src 'sha256-7cKy9iQfWRXcgRS74x6I4q5cRDkv8nQz51jecqMmQ5w=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
10-
+ content="default-src 'none'; script-src 'sha256-FYdHnaDkSHwSK3TmWDrs/tT+X4bK+aaoa9yy432BONk=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
9+
- content="default-src 'none'; script-src 'sha256-Q3Tfcw0dGu/YD4dGBrRqBeOnmRMAH8HbKxArK4YSXBc=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
10+
+ content="default-src 'none'; script-src 'sha256-BmcTt6YZr75RujSQ3gF/UQL77e1RrOx62jNeikpwtxc=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
1111

1212
<!-- Disable pinch zooming -->
1313
<meta name="viewport"
@@ -24,3 +24,16 @@ Index: code-server/lib/vscode/src/vs/workbench/services/extensions/worker/webWor
2424
connect-src 'self' https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*;"/>
2525
</head>
2626
<body>
27+
Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
28+
===================================================================
29+
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
30+
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
31+
@@ -114,7 +114,7 @@ const APP_ROOT = dirname(FileAccess.asFi
32+
const STATIC_PATH = `/static`;
33+
const CALLBACK_PATH = `/callback`;
34+
const WEB_EXTENSION_PATH = `/web-extension-resource`;
35+
-const webWorkerExtensionHostIframeScriptSHA = 'sha256-daEgfo2VIXpx2Np71KqCCbkeQwv+68vPrx54XRcbdcs=';
36+
+const webWorkerExtensionHostIframeScriptSHA = 'sha256-gfjiOVjAlxqrivZAfTq2d83mOaz0fnAxbGaFpj5IjD8=';
37+
38+
/**
39+
* Substitutes the `{{...}}` placeholders of a workbench template. Placeholders must only ever

‎patches/getting-started.diff‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
1919
import { renderFormattedText } from '../../../../base/browser/formattedTextRenderer.js';
2020
import { status } from '../../../../base/browser/ui/aria/aria.js';
2121
import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
22-
@@ -55,7 +55,7 @@ import { IRecentFolder, IRecentWorkspace
22+
@@ -56,7 +56,7 @@ import { IRecentFolder, IRecentWorkspace
2323
import { OpenRecentAction } from '../../../browser/actions/windowActions.js';
2424
import { OpenFileFolderAction, OpenFolderAction, OpenFolderViaWorkspaceAction } from '../../../browser/actions/workspaceActions.js';
2525
import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
@@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
2828
import { IEditorOpenContext, IEditorSerializer } from '../../../common/editor.js';
2929
import { IWebviewElement, IWebviewService } from '../../webview/browser/webview.js';
3030
import './gettingStartedColors.js';
31-
@@ -930,6 +930,72 @@ export class GettingStartedPage extends
31+
@@ -944,6 +944,72 @@ export class GettingStartedPage extends
3232
$('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved"))
3333
);
3434

@@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
101101
const leftColumn = $('.categories-column.categories-column-left', {},);
102102
const rightColumn = $('.categories-column.categories-column-right', {},);
103103

104-
@@ -980,6 +1046,9 @@ export class GettingStartedPage extends
104+
@@ -1000,6 +1066,9 @@ export class GettingStartedPage extends
105105
recentList.setLimit(5);
106106
reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
107107
}

‎patches/integration.diff‎

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

‎patches/marketplace.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Index: code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/ext
7777
import { TargetPlatform } from '../../extensions/common/extensions.js';
7878
import { ExtensionGalleryResourceType, getExtensionGalleryManifestResourceUri, IExtensionGalleryManifest, IExtensionGalleryManifestService } from '../../extensionManagement/common/extensionGalleryManifest.js';
7979
import { ILogService } from '../../log/common/log.js';
80-
@@ -163,9 +162,9 @@ export abstract class AbstractExtensionR
80+
@@ -167,9 +166,9 @@ export abstract class AbstractExtensionR
8181
}
8282

8383
protected _isWebExtensionResourceEndPoint(uri: URI): boolean {

‎patches/proposed-api.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/extensions/common/extens
1010
===================================================================
1111
--- code-server.orig/lib/vscode/src/vs/workbench/services/extensions/common/extensions.ts
1212
+++ code-server/lib/vscode/src/vs/workbench/services/extensions/common/extensions.ts
13-
@@ -321,6 +321,10 @@ function extensionDescriptionArrayToMap(
13+
@@ -324,6 +324,10 @@ function extensionDescriptionArrayToMap(
1414
}
1515

1616
export function isProposedApiEnabled(extension: IExtensionDescription, proposal: ApiProposalName): boolean {

0 commit comments

Comments
 (0)