Skip to content

Commit 768ef0b

Browse files
benz0liyiliang114
benz0li
authored and
yiliang114
committed
Update Code to 1.93.1 (coder#6984)
1 parent ee5b580 commit 768ef0b

22 files changed

+72
-72
lines changed

‎.node-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.11.1
1+
20.15.1

‎lib/vscode

Submodule vscode updated 1109 files

‎patches/base-path.diff

+13-11
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-
@@ -212,7 +212,9 @@ class RemoteAuthoritiesImpl {
13+
@@ -215,7 +215,9 @@ class RemoteAuthoritiesImpl {
1414
return URI.from({
1515
scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource,
1616
authority: `${host}:${port}`,
@@ -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-
@@ -269,16 +269,15 @@ export class WebClientServer {
114+
@@ -272,16 +272,15 @@ export class WebClientServer {
115115
return void res.end();
116116
}
117117

@@ -133,7 +133,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
133133
);
134134
if (!remoteAuthority) {
135135
return serveError(req, res, 400, `Bad request.`);
136-
@@ -305,8 +304,12 @@ export class WebClientServer {
136+
@@ -308,8 +307,12 @@ export class WebClientServer {
137137
scopes: [['user:email'], ['repo']]
138138
} : undefined;
139139

@@ -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-
@@ -335,7 +338,7 @@ export class WebClientServer {
149+
@@ -338,7 +341,7 @@ export class WebClientServer {
150150
folderUri: resolveWorkspaceURI(this._environmentService.args['default-folder']),
151151
workspaceUri: resolveWorkspaceURI(this._environmentService.args['default-workspace']),
152152
productConfiguration,
@@ -155,7 +155,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
155155
};
156156

157157
const cookies = cookie.parse(req.headers.cookie || '');
158-
@@ -352,9 +355,11 @@ export class WebClientServer {
158+
@@ -355,9 +358,11 @@ export class WebClientServer {
159159
const values: { [key: string]: string } = {
160160
WORKBENCH_WEB_CONFIGURATION: asJSON(workbenchWebConfiguration),
161161
WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '',
@@ -168,17 +168,19 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
168168
+ VS_BASE: vscodeBase,
169169
};
170170

171-
if (useTestResolver) {
172-
@@ -381,7 +386,7 @@ export class WebClientServer {
173-
'default-src \'self\';',
171+
// DEV ---------------------------------------------------------------------------------------
172+
@@ -395,8 +400,8 @@ export class WebClientServer {
174173
'img-src \'self\' https: data: blob:;',
175174
'media-src \'self\';',
176-
- `script-src 'self' 'unsafe-eval' ${WORKBENCH_NLS_BASE_URL ?? ''} ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' ${useTestResolver ? '' : `http://${remoteAuthority}`};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
177-
+ `script-src 'self' 'unsafe-eval' ${WORKBENCH_NLS_BASE_URL ?? ''} ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' ${useTestResolver ? '' : ``};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
175+
isESM ?
176+
- `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.esm.html
177+
- `script-src 'self' 'unsafe-eval' ${WORKBENCH_NLS_BASE_URL ?? ''} ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' ${useTestResolver ? '' : `http://${remoteAuthority}`};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
178+
+ `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.esm.html
179+
+ `script-src 'self' 'unsafe-eval' ${WORKBENCH_NLS_BASE_URL ?? ''} ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' ${useTestResolver ? '' : ``};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
178180
'child-src \'self\';',
179181
`frame-src 'self' https://*.vscode-cdn.net data:;`,
180182
'worker-src \'self\' data: blob:;',
181-
@@ -454,3 +459,70 @@ export class WebClientServer {
183+
@@ -469,3 +474,70 @@ export class WebClientServer {
182184
return void res.end(data);
183185
}
184186
}

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

+1-1
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-
@@ -299,6 +299,10 @@ export class Extension implements IExten
10+
@@ -314,6 +314,10 @@ export class Extension implements IExten
1111
if (this.type === ExtensionType.System && this.productService.quality === 'stable') {
1212
return false;
1313
}

‎patches/display-language.diff

+6-6
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 'vs/base/parts/ipc/common/ipc.net';
1919
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
2020
import { ConfigurationService } from 'vs/platform/configuration/common/configurationService';
21-
@@ -239,6 +239,9 @@ export async function setupServerService
21+
@@ -243,6 +243,9 @@ export async function setupServerService
2222
const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority));
2323
socketServer.registerChannel('extensions', channel);
2424

@@ -160,24 +160,24 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
160160
+import { getLocaleFromConfig, getBrowserNLSConfiguration } from 'vs/server/node/remoteLanguagePacks';
161161
import { CharCode } from 'vs/base/common/charCode';
162162
import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
163-
164-
@@ -97,6 +98,7 @@ export class WebClientServer {
163+
import { isESM } from 'vs/base/common/amd';
164+
@@ -99,6 +100,7 @@ export class WebClientServer {
165165
private readonly _webExtensionResourceUrlTemplate: URI | undefined;
166166

167167
private readonly _staticRoute: string;
168168
+ private readonly _serverRoot: string;
169169
private readonly _callbackRoute: string;
170170
private readonly _webExtensionRoute: string;
171171

172-
@@ -111,6 +113,7 @@ export class WebClientServer {
172+
@@ -114,6 +116,7 @@ export class WebClientServer {
173173
) {
174174
this._webExtensionResourceUrlTemplate = this._productService.extensionsGallery?.resourceUrlTemplate ? URI.parse(this._productService.extensionsGallery.resourceUrlTemplate) : undefined;
175175

176176
+ this._serverRoot = serverRootPath;
177177
this._staticRoute = `${serverRootPath}/static`;
178178
this._callbackRoute = `${serverRootPath}/callback`;
179179
this._webExtensionRoute = `/web-extension-resource`;
180-
@@ -349,14 +352,22 @@ export class WebClientServer {
180+
@@ -352,14 +355,22 @@ export class WebClientServer {
181181
};
182182

183183
const cookies = cookie.parse(req.headers.cookie || '');
@@ -380,7 +380,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js
380380
===================================================================
381381
--- code-server.orig/lib/vscode/build/gulpfile.reh.js
382382
+++ code-server/lib/vscode/build/gulpfile.reh.js
383-
@@ -56,6 +56,7 @@ const serverResources = [
383+
@@ -59,6 +59,7 @@ const serverResourceIncludes = [
384384

385385
// NLS
386386
'out-build/nls.messages.json',

‎patches/external-file-actions.diff

+5-5
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-
@@ -333,6 +333,8 @@ export class WebClientServer {
115+
@@ -336,6 +336,8 @@ export class WebClientServer {
116116
serverBasePath: this._basePath,
117117
webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
118118
userDataPath: this._environmentService.userDataPath,
@@ -172,7 +172,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions
172172
import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
173173
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
174174
import { ThemeIcon } from 'vs/base/common/themables';
175-
@@ -561,13 +561,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo
175+
@@ -566,13 +566,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo
176176
id: DOWNLOAD_COMMAND_ID,
177177
title: DOWNLOAD_LABEL
178178
},
@@ -196,7 +196,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions
196196
)
197197
}));
198198

199-
@@ -579,6 +582,7 @@ MenuRegistry.appendMenuItem(MenuId.Explo
199+
@@ -584,6 +587,7 @@ MenuRegistry.appendMenuItem(MenuId.Explo
200200
title: UPLOAD_LABEL,
201201
},
202202
when: ContextKeyExpr.and(
@@ -289,7 +289,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explo
289289

290290
export class ExplorerDelegate implements IListVirtualDelegate<ExplorerItem> {
291291

292-
@@ -1001,7 +1002,8 @@ export class FileDragAndDrop implements
292+
@@ -1005,7 +1006,8 @@ export class FileDragAndDrop implements
293293
@IConfigurationService private configurationService: IConfigurationService,
294294
@IInstantiationService private instantiationService: IInstantiationService,
295295
@IWorkspaceEditingService private workspaceEditingService: IWorkspaceEditingService,
@@ -299,7 +299,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/views/explo
299299
) {
300300
const updateDropEnablement = (e: IConfigurationChangeEvent | undefined) => {
301301
if (!e || e.affectsConfiguration('explorer.enableDragAndDrop')) {
302-
@@ -1226,15 +1228,17 @@ export class FileDragAndDrop implements
302+
@@ -1230,15 +1232,17 @@ export class FileDragAndDrop implements
303303

304304
// External file DND (Import/Upload file)
305305
if (data instanceof NativeDragAndDropData) {

‎patches/getting-started.diff

+1-1
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-
@@ -337,6 +337,7 @@ export class WebClientServer {
204+
@@ -340,6 +340,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

+2-2
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
264264
===================================================================
265265
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
266266
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
267-
@@ -306,6 +306,7 @@ export class WebClientServer {
267+
@@ -309,6 +309,7 @@ export class WebClientServer {
268268
} : undefined;
269269

270270
const productConfiguration = {
@@ -276,7 +276,7 @@ Index: code-server/lib/vscode/src/server-main.js
276276
===================================================================
277277
--- code-server.orig/lib/vscode/src/server-main.js
278278
+++ code-server/lib/vscode/src/server-main.js
279-
@@ -336,4 +336,9 @@ function prompt(question) {
279+
@@ -339,4 +339,9 @@ function prompt(question) {
280280
});
281281
}
282282

‎patches/local-storage.diff

+1-1
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-
@@ -328,6 +328,7 @@ export class WebClientServer {
21+
@@ -331,6 +331,7 @@ export class WebClientServer {
2222
remoteAuthority,
2323
serverBasePath: this._basePath,
2424
webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',

‎patches/logout.diff

+1-1
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-
@@ -311,6 +311,7 @@ export class WebClientServer {
43+
@@ -314,6 +314,7 @@ export class WebClientServer {
4444
codeServerVersion: this._productService.codeServerVersion,
4545
rootEndpoint: base,
4646
updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined,

‎patches/marketplace.diff

+2-2
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-
@@ -113,7 +113,7 @@ export class WebClientServer {
43+
@@ -116,7 +116,7 @@ export class WebClientServer {
4444

4545
this._staticRoute = `${serverRootPath}/static`;
4646
this._callbackRoute = `${serverRootPath}/callback`;
@@ -49,7 +49,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
4949
}
5050

5151
/**
52-
@@ -311,14 +311,7 @@ export class WebClientServer {
52+
@@ -314,14 +314,7 @@ export class WebClientServer {
5353
codeServerVersion: this._productService.codeServerVersion,
5454
rootEndpoint: base,
5555
embedderIdentifier: 'server-distro',

‎patches/proposed-api.diff

+1-1
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-
@@ -312,10 +312,7 @@ function extensionDescriptionArrayToMap(
13+
@@ -313,10 +313,7 @@ function extensionDescriptionArrayToMap(
1414
}
1515

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

‎patches/proxy-uri.diff

+1-1
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-
@@ -312,6 +312,7 @@ export class WebClientServer {
74+
@@ -315,6 +315,7 @@ export class WebClientServer {
7575
rootEndpoint: base,
7676
updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined,
7777
logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? base + '/logout' : undefined,

‎patches/service-worker.diff

+1-1
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-
@@ -313,6 +313,10 @@ export class WebClientServer {
57+
@@ -316,6 +316,10 @@ export class WebClientServer {
5858
updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined,
5959
logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? base + '/logout' : undefined,
6060
proxyEndpointTemplate: process.env.VSCODE_PROXY_URI ?? base + '/proxy/{{port}}/',

‎patches/sourcemaps.diff

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js
1010
===================================================================
1111
--- code-server.orig/lib/vscode/build/gulpfile.reh.js
1212
+++ code-server/lib/vscode/build/gulpfile.reh.js
13-
@@ -243,8 +243,7 @@ function packageTask(type, platform, arc
13+
@@ -288,8 +288,7 @@ function packageTask(type, platform, arc
1414

1515
const src = gulp.src(sourceFolderName + '/**', { base: '.' })
1616
.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + sourceFolderName), 'out'); }))
@@ -20,7 +20,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js
2020

2121
const workspaceExtensionPoints = ['debuggers', 'jsonValidation'];
2222
const isUIExtension = (manifest) => {
23-
@@ -283,9 +282,9 @@ function packageTask(type, platform, arc
23+
@@ -328,9 +327,9 @@ function packageTask(type, platform, arc
2424
.map(name => `.build/extensions/${name}/**`);
2525

2626
const extensions = gulp.src(extensionPaths, { base: '.build', dot: true });
@@ -32,7 +32,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js
3232

3333
let version = packageJson.version;
3434
const quality = product.quality;
35-
@@ -459,7 +458,7 @@ function tweakProductForServerWeb(produc
35+
@@ -504,7 +503,7 @@ function tweakProductForServerWeb(produc
3636
const minifyTask = task.define(`minify-vscode-${type}`, task.series(
3737
optimizeTask,
3838
util.rimraf(`out-vscode-${type}-min`),

‎patches/telemetry.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
2828
import { NullPolicyService } from 'vs/platform/policy/common/policy';
2929
import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender';
3030
import { LoggerService } from 'vs/platform/log/node/loggerService';
31-
@@ -147,11 +149,23 @@ export async function setupServerService
31+
@@ -151,11 +153,23 @@ export async function setupServerService
3232
const requestService = new RequestService(configurationService, environmentService, logService, loggerService);
3333
services.set(IRequestService, requestService);
3434

@@ -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-
@@ -317,6 +317,8 @@ export class WebClientServer {
137+
@@ -320,6 +320,8 @@ export class WebClientServer {
138138
scope: vscodeBase + '/',
139139
path: base + '/_static/out/browser/serviceWorker.js',
140140
},

‎patches/update-check.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
105105
===================================================================
106106
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
107107
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
108-
@@ -310,6 +310,7 @@ export class WebClientServer {
108+
@@ -313,6 +313,7 @@ export class WebClientServer {
109109
const productConfiguration = {
110110
codeServerVersion: this._productService.codeServerVersion,
111111
rootEndpoint: base,

0 commit comments

Comments
 (0)