Skip to content

Commit 0612c68

Browse files
benz0libenz0li
committed
Update Code to 1.101.0
1 parent 1671bf1 commit 0612c68

22 files changed

+57
-73
lines changed

‎.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.19.0
1+
22.15.1

‎lib/vscode

Submodule vscode updated 1423 files

‎package-lock.json

Lines changed: 11 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"@types/express": "^5.0.0",
4848
"@types/http-proxy": "1.17.7",
4949
"@types/js-yaml": "^4.0.6",
50-
"@types/node": "20.x",
50+
"@types/node": "22.x",
5151
"@types/pem": "^1.14.1",
5252
"@types/proxy-from-env": "^1.0.1",
5353
"@types/safe-compare": "^1.1.0",
@@ -90,7 +90,7 @@
9090
"xdg-basedir": "^4.0.0"
9191
},
9292
"resolutions": {
93-
"@types/node": "20.x"
93+
"@types/node": "22.x"
9494
},
9595
"bin": {
9696
"code-server": "out/node/entry.js"
@@ -105,7 +105,7 @@
105105
"remote-development"
106106
],
107107
"engines": {
108-
"node": "20"
108+
"node": "22"
109109
},
110110
"jest": {
111111
"transform": {

‎patches/base-path.diff

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ 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-
@@ -246,7 +246,9 @@ export class WebClientServer {
114+
@@ -245,7 +245,9 @@ export class WebClientServer {
115115
};
116116

117117
// Prefix routes with basePath for clients
@@ -122,7 +122,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
122122

123123
const queryConnectionToken = parsedUrl.query[connectionTokenQueryName];
124124
if (typeof queryConnectionToken === 'string') {
125-
@@ -285,10 +287,14 @@ export class WebClientServer {
125+
@@ -284,10 +286,14 @@ export class WebClientServer {
126126
};
127127

128128
const useTestResolver = (!this._environmentService.isBuilt && this._environmentService.args['use-test-resolver']);
@@ -138,15 +138,15 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
138138
);
139139
if (!remoteAuthority) {
140140
return serveError(req, res, 400, `Bad request.`);
141-
@@ -335,6 +341,7 @@ export class WebClientServer {
141+
@@ -334,6 +340,7 @@ export class WebClientServer {
142142

143143
const productConfiguration: Partial<Mutable<IProductConfiguration>> = {
144144
codeServerVersion: this._productService.codeServerVersion,
145145
+ rootEndpoint: rootBase,
146146
embedderIdentifier: 'server-distro',
147147
extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? {
148148
...this._productService.extensionsGallery,
149-
@@ -388,7 +395,9 @@ export class WebClientServer {
149+
@@ -387,7 +394,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-
@@ -425,7 +434,7 @@ export class WebClientServer {
160+
@@ -424,7 +433,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-
@@ -498,3 +507,70 @@ export class WebClientServer {
169+
@@ -497,3 +506,70 @@ export class WebClientServer {
170170
return void res.end(data);
171171
}
172172
}

‎patches/clipboard.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Index: code-server/lib/vscode/src/vs/platform/environment/common/argv.ts
8585
+ 'stdin-to-clipboard'?: boolean;
8686
'unresponsive-sample-interval'?: string;
8787
'unresponsive-sample-period'?: string;
88-
88+
'enable-rdp-display-tracking'?: boolean;
8989
Index: code-server/lib/vscode/src/vs/platform/environment/node/argv.ts
9090
===================================================================
9191
--- code-server.orig/lib/vscode/src/vs/platform/environment/node/argv.ts

‎patches/disable-builtin-ext-update.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
77
===================================================================
88
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
99
+++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
10-
@@ -332,6 +332,10 @@ export class Extension implements IExten
10+
@@ -340,6 +340,10 @@ export class Extension implements IExten
1111
if (this.type === ExtensionType.System && this.productService.quality === 'stable') {
1212
return false;
1313
}

‎patches/display-language.diff

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,15 +153,15 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
153153
===================================================================
154154
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
155155
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
156-
@@ -26,6 +26,7 @@ import { URI } from '../../base/common/u
156+
@@ -25,6 +25,7 @@ import { URI } from '../../base/common/u
157157
import { streamToBuffer } from '../../base/common/buffer.js';
158158
import { IProductConfiguration } from '../../base/common/product.js';
159159
import { isString, Mutable } from '../../base/common/types.js';
160160
+import { getLocaleFromConfig, getBrowserNLSConfiguration } from './remoteLanguagePacks.js';
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-
@@ -386,14 +387,22 @@ export class WebClientServer {
164+
@@ -385,14 +386,22 @@ export class WebClientServer {
165165
};
166166

167167
const cookies = cookie.parse(req.headers.cookie || '');
@@ -272,7 +272,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
272272
===================================================================
273273
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
274274
+++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
275-
@@ -474,9 +474,6 @@ export class InstallAction extends Exten
275+
@@ -475,9 +475,6 @@ export class InstallAction extends Exten
276276
if (this.extension.isBuiltin) {
277277
return;
278278
}
@@ -282,7 +282,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
282282
if (this.extension.state !== ExtensionState.Uninstalled) {
283283
return;
284284
}
285-
@@ -781,7 +778,7 @@ export abstract class InstallInOtherServ
285+
@@ -782,7 +779,7 @@ export abstract class InstallInOtherServ
286286
}
287287

288288
if (isLanguagePackExtension(this.extension.local.manifest)) {
@@ -291,7 +291,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
291291
}
292292

293293
// Prefers to run on UI
294-
@@ -2071,17 +2068,6 @@ export class SetLanguageAction extends E
294+
@@ -2073,17 +2070,6 @@ export class SetLanguageAction extends E
295295
update(): void {
296296
this.enabled = false;
297297
this.class = SetLanguageAction.DisabledClass;
@@ -309,15 +309,15 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
309309
}
310310

311311
override async run(): Promise<any> {
312-
@@ -2098,7 +2084,6 @@ export class ClearLanguageAction extends
312+
@@ -2100,7 +2086,6 @@ export class ClearLanguageAction extends
313313
private static readonly DisabledClass = `${this.EnabledClass} disabled`;
314314

315315
constructor(
316316
- @IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
317317
@ILocaleService private readonly localeService: ILocaleService,
318318
) {
319319
super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false);
320-
@@ -2108,17 +2093,6 @@ export class ClearLanguageAction extends
320+
@@ -2110,17 +2095,6 @@ export class ClearLanguageAction extends
321321
update(): void {
322322
this.enabled = false;
323323
this.class = ClearLanguageAction.DisabledClass;

‎patches/external-file-actions.diff

Lines changed: 3 additions & 3 deletions
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-
@@ -370,6 +370,8 @@ export class WebClientServer {
115+
@@ -369,6 +369,8 @@ export class WebClientServer {
116116
serverBasePath: basePath,
117117
webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
118118
userDataPath: this._environmentService.userDataPath,
@@ -208,7 +208,7 @@ Index: code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
208208
===================================================================
209209
--- code-server.orig/lib/vscode/src/vs/workbench/common/contextkeys.ts
210210
+++ code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
211-
@@ -40,6 +40,9 @@ export const HasWebFileSystemAccess = ne
211+
@@ -36,6 +36,9 @@ export const HasWebFileSystemAccess = ne
212212

213213
export const EmbedderIdentifierContext = new RawContextKey<string | undefined>('embedderIdentifier', undefined, localize('embedderIdentifier', 'The identifier of the embedder according to the product service, if one is defined'));
214214

@@ -217,7 +217,7 @@ Index: code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
217217
+
218218
//#endregion
219219

220-
220+
//#region < --- Window --- >
221221
Index: code-server/lib/vscode/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
222222
===================================================================
223223
--- code-server.orig/lib/vscode/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts

‎patches/getting-started.diff

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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-
@@ -874,6 +874,72 @@ export class GettingStartedPage extends
31+
@@ -876,6 +876,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-
@@ -909,6 +975,9 @@ export class GettingStartedPage extends
104+
@@ -911,6 +977,9 @@ export class GettingStartedPage extends
105105
recentList.setLimit(5);
106106
reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
107107
}
@@ -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-
@@ -374,6 +374,7 @@ export class WebClientServer {
204+
@@ -373,6 +373,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'],
@@ -234,7 +234,7 @@ Index: code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
234234
===================================================================
235235
--- code-server.orig/lib/vscode/src/vs/workbench/common/contextkeys.ts
236236
+++ code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
237-
@@ -42,6 +42,7 @@ export const EmbedderIdentifierContext =
237+
@@ -38,6 +38,7 @@ export const EmbedderIdentifierContext =
238238

239239
export const IsEnabledFileDownloads = new RawContextKey<boolean>('isEnabledFileDownloads', true, true);
240240
export const IsEnabledFileUploads = new RawContextKey<boolean>('isEnabledFileUploads', true, true);

‎patches/integration.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
269269
===================================================================
270270
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
271271
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
272-
@@ -334,6 +334,7 @@ export class WebClientServer {
272+
@@ -333,6 +333,7 @@ export class WebClientServer {
273273
} : undefined;
274274

275275
const productConfiguration: Partial<Mutable<IProductConfiguration>> = {

‎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-
@@ -365,6 +365,7 @@ export class WebClientServer {
21+
@@ -364,6 +364,7 @@ export class WebClientServer {
2222
remoteAuthority,
2323
serverBasePath: basePath,
2424
webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',

‎patches/logout.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
4040
===================================================================
4141
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
4242
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
43-
@@ -342,6 +342,7 @@ export class WebClientServer {
43+
@@ -341,6 +341,7 @@ export class WebClientServer {
4444
codeServerVersion: this._productService.codeServerVersion,
4545
rootEndpoint: rootBase,
4646
updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined,

‎patches/marketplace.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
4040
===================================================================
4141
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
4242
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
43-
@@ -327,7 +327,6 @@ export class WebClientServer {
43+
@@ -326,7 +326,6 @@ export class WebClientServer {
4444

4545
const staticRoute = posix.join(basePath, this._productPath, STATIC_PATH);
4646
const callbackRoute = posix.join(basePath, this._productPath, CALLBACK_PATH);
4747
- const webExtensionRoute = posix.join(basePath, this._productPath, WEB_EXTENSION_PATH);
4848

49-
const resolveWorkspaceURI = (defaultLocation?: string) => defaultLocation && URI.file(path.resolve(defaultLocation)).with({ scheme: Schemas.vscodeRemote, authority: remoteAuthority });
49+
const resolveWorkspaceURI = (defaultLocation?: string) => defaultLocation && URI.file(resolve(defaultLocation)).with({ scheme: Schemas.vscodeRemote, authority: remoteAuthority });
5050

51-
@@ -343,14 +342,7 @@ export class WebClientServer {
51+
@@ -342,14 +341,7 @@ export class WebClientServer {
5252
codeServerVersion: this._productService.codeServerVersion,
5353
rootEndpoint: rootBase,
5454
embedderIdentifier: 'server-distro',

‎patches/proxy-uri.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
7171
===================================================================
7272
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
7373
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
74-
@@ -343,6 +343,7 @@ export class WebClientServer {
74+
@@ -342,6 +342,7 @@ export class WebClientServer {
7575
rootEndpoint: rootBase,
7676
updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined,
7777
logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? rootBase + '/logout' : undefined,

‎patches/service-worker.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
5454
===================================================================
5555
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
5656
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
57-
@@ -344,6 +344,10 @@ export class WebClientServer {
57+
@@ -343,6 +343,10 @@ export class WebClientServer {
5858
updateEndpoint: !this._environmentService.args['disable-update-check'] ? rootBase + '/update/check' : undefined,
5959
logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? rootBase + '/logout' : undefined,
6060
proxyEndpointTemplate: process.env.VSCODE_PROXY_URI ?? rootBase + '/proxy/{{port}}/',

‎patches/signature-verification.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Index: code-server/lib/vscode/src/vs/platform/extensionManagement/node/extension
2222
@IConfigurationService private readonly configurationService: IConfigurationService,
2323
@IExtensionGalleryManifestService protected readonly extensionGalleryManifestService: IExtensionGalleryManifestService,
2424
@IProductService productService: IProductService,
25-
@@ -331,8 +333,7 @@ export class ExtensionManagementService
25+
@@ -339,8 +341,7 @@ export class ExtensionManagementService
2626

2727
private async downloadExtension(extension: IGalleryExtension, operation: InstallOperation, verifySignature: boolean, clientTargetPlatform?: TargetPlatform): Promise<{ readonly location: URI; readonly verificationStatus: ExtensionSignatureVerificationCode | undefined }> {
2828
if (verifySignature) {

‎patches/store-socket.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extensionHostProcess.ts
9696
import minimist from 'minimist';
9797
import * as nativeWatchdog from 'native-watchdog';
9898
import * as net from 'net';
99-
@@ -423,7 +424,28 @@ async function startExtensionHostProcess
99+
@@ -437,7 +438,28 @@ async function startExtensionHostProcess
100100
);
101101

102102
// rewrite onTerminate-function to be a proper shutdown

‎patches/telemetry.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
134134
===================================================================
135135
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
136136
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
137-
@@ -348,6 +348,8 @@ export class WebClientServer {
137+
@@ -347,6 +347,8 @@ export class WebClientServer {
138138
scope: vscodeBase + '/',
139139
path: rootBase + '/_static/out/browser/serviceWorker.js',
140140
},

0 commit comments

Comments
 (0)