Skip to content

Commit 2c9b4e7

Browse files
benz0libenz0li
authored
Update Code to 1.100.0 (#7343)
1 parent 7af90ea commit 2c9b4e7

20 files changed

+83
-48
lines changed

‎.node-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.18.3
1+
20.19.0

‎lib/vscode

Submodule vscode updated 1142 files

‎patches/base-path.diff

+4-4
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,13 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
140140
return serveError(req, res, 400, `Bad request.`);
141141
@@ -335,6 +341,7 @@ export class WebClientServer {
142142

143-
const productConfiguration = {
143+
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-
@@ -382,7 +389,9 @@ export class WebClientServer {
149+
@@ -388,7 +395,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-
@@ -419,7 +428,7 @@ export class WebClientServer {
160+
@@ -425,7 +434,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-
@@ -492,3 +501,70 @@ export class WebClientServer {
169+
@@ -498,3 +507,70 @@ export class WebClientServer {
170170
return void res.end(data);
171171
}
172172
}

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

‎patches/display-language.diff

+8-8
Original file line numberDiff line numberDiff line change
@@ -156,12 +156,12 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
156156
@@ -26,6 +26,7 @@ import { URI } from '../../base/common/u
157157
import { streamToBuffer } from '../../base/common/buffer.js';
158158
import { IProductConfiguration } from '../../base/common/product.js';
159-
import { isString } from '../../base/common/types.js';
159+
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-
@@ -380,14 +381,22 @@ export class WebClientServer {
164+
@@ -386,14 +387,22 @@ export class WebClientServer {
165165
};
166166

167167
const cookies = cookie.parse(req.headers.cookie || '');
@@ -198,7 +198,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
198198

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

201-
@@ -106,6 +107,7 @@ export interface ServerParsedArgs {
201+
@@ -107,6 +108,7 @@ export interface ServerParsedArgs {
202202
'disable-file-downloads'?: boolean;
203203
'disable-file-uploads'?: boolean;
204204
'disable-getting-started-override'?: boolean,
@@ -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-
@@ -445,9 +445,6 @@ export class InstallAction extends Exten
275+
@@ -474,9 +474,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-
@@ -752,7 +749,7 @@ export abstract class InstallInOtherServ
285+
@@ -781,7 +778,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-
@@ -2039,17 +2036,6 @@ export class SetLanguageAction extends E
294+
@@ -2071,17 +2068,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-
@@ -2066,7 +2052,6 @@ export class ClearLanguageAction extends
312+
@@ -2098,7 +2084,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-
@@ -2076,17 +2061,6 @@ export class ClearLanguageAction extends
320+
@@ -2108,17 +2093,6 @@ export class ClearLanguageAction extends
321321
update(): void {
322322
this.enabled = false;
323323
this.class = ClearLanguageAction.DisabledClass;

‎patches/external-file-actions.diff

+4-4
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
9999

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

102-
@@ -100,6 +102,8 @@ export interface ServerParsedArgs {
102+
@@ -101,6 +103,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-
@@ -364,6 +364,8 @@ export class WebClientServer {
115+
@@ -370,6 +370,8 @@ export class WebClientServer {
116116
serverBasePath: basePath,
117117
webviewEndpoint: staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
118118
userDataPath: this._environmentService.userDataPath,
@@ -126,7 +126,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
126126
--- code-server.orig/lib/vscode/src/vs/workbench/browser/contextkeys.ts
127127
+++ code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
128128
@@ -7,11 +7,11 @@ import { Event } from '../../base/common
129-
import { Disposable } from '../../base/common/lifecycle.js';
129+
import { Disposable, DisposableStore } from '../../base/common/lifecycle.js';
130130
import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from '../../platform/contextkey/common/contextkey.js';
131131
import { InputFocusedContext, IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext } from '../../platform/contextkey/common/contextkeys.js';
132132
-import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext } from '../common/contextkeys.js';
@@ -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-
@@ -39,6 +39,9 @@ export const HasWebFileSystemAccess = ne
211+
@@ -40,6 +40,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

‎patches/getting-started.diff

+6-6
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-
@@ -872,6 +872,72 @@ export class GettingStartedPage extends
31+
@@ -874,6 +874,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-
@@ -907,6 +973,9 @@ export class GettingStartedPage extends
104+
@@ -909,6 +975,9 @@ export class GettingStartedPage extends
105105
recentList.setLimit(5);
106106
reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
107107
}
@@ -189,7 +189,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
189189

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

192-
@@ -104,6 +105,7 @@ export interface ServerParsedArgs {
192+
@@ -105,6 +106,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-
@@ -368,6 +368,7 @@ export class WebClientServer {
204+
@@ -374,6 +374,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'],
@@ -214,7 +214,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
214214
--- code-server.orig/lib/vscode/src/vs/workbench/browser/contextkeys.ts
215215
+++ code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
216216
@@ -7,7 +7,7 @@ import { Event } from '../../base/common
217-
import { Disposable } from '../../base/common/lifecycle.js';
217+
import { Disposable, DisposableStore } from '../../base/common/lifecycle.js';
218218
import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from '../../platform/contextkey/common/contextkey.js';
219219
import { InputFocusedContext, IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext } from '../../platform/contextkey/common/contextkeys.js';
220220
-import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext, IsEnabledFileDownloads, IsEnabledFileUploads } from '../common/contextkeys.js';
@@ -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-
@@ -41,6 +41,7 @@ export const EmbedderIdentifierContext =
237+
@@ -42,6 +42,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

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
272272
@@ -334,6 +334,7 @@ export class WebClientServer {
273273
} : undefined;
274274

275-
const productConfiguration = {
275+
const productConfiguration: Partial<Mutable<IProductConfiguration>> = {
276276
+ codeServerVersion: this._productService.codeServerVersion,
277277
embedderIdentifier: 'server-distro',
278278
extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? {

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

‎patches/logout.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
2828

2929
/* ----- server setup ----- */
3030

31-
@@ -98,6 +99,7 @@ export const serverOptions: OptionDescri
31+
@@ -99,6 +100,7 @@ export const serverOptions: OptionDescri
3232
export interface ServerParsedArgs {
3333
/* ----- code-server ----- */
3434
'disable-update-check'?: boolean;
@@ -47,7 +47,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
4747
+ logoutEndpoint: this._environmentService.args['auth'] && this._environmentService.args['auth'] !== "none" ? rootBase + '/logout' : undefined,
4848
embedderIdentifier: 'server-distro',
4949
extensionsGallery: this._productService.extensionsGallery,
50-
} satisfies Partial<IProductConfiguration>;
50+
};
5151
Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts
5252
===================================================================
5353
--- code-server.orig/lib/vscode/src/vs/workbench/browser/client.ts

‎patches/marketplace.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
6161
- }).toString(true)
6262
- } : undefined
6363
+ extensionsGallery: this._productService.extensionsGallery,
64-
} satisfies Partial<IProductConfiguration>;
64+
};
6565

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

‎patches/proxy-uri.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
7878
+ proxyEndpointTemplate: process.env.VSCODE_PROXY_URI ?? rootBase + '/proxy/{{port}}/',
7979
embedderIdentifier: 'server-distro',
8080
extensionsGallery: this._productService.extensionsGallery,
81-
} satisfies Partial<IProductConfiguration>;
81+
};
8282
Index: code-server/lib/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
8383
===================================================================
8484
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts

‎patches/series

+1
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ keepalive.diff
2121
clipboard.diff
2222
display-language.diff
2323
trusted-domains.diff
24+
signature-verification.diff

‎patches/service-worker.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
6464
+ },
6565
embedderIdentifier: 'server-distro',
6666
extensionsGallery: this._productService.extensionsGallery,
67-
} satisfies Partial<IProductConfiguration>;
67+
};

‎patches/signature-verification.diff

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
Disable signature verification.
2+
3+
Extension signature verification is now mandatory for all platforms and needs to be disabled.
4+
5+
Index: code-server/lib/vscode/src/vs/platform/extensionManagement/node/extensionManagementService.ts
6+
===================================================================
7+
--- code-server.orig/lib/vscode/src/vs/platform/extensionManagement/node/extensionManagementService.ts
8+
+++ code-server/lib/vscode/src/vs/platform/extensionManagement/node/extensionManagementService.ts
9+
@@ -34,6 +34,7 @@ import {
10+
ExtensionSignatureVerificationCode,
11+
computeSize,
12+
IAllowedExtensionsService,
13+
+ // @ts-expect-error no-unused-variable
14+
VerifyExtensionSignatureConfigKey,
15+
shouldRequireRepositorySignatureFor,
16+
} from '../common/extensionManagement.js';
17+
@@ -87,6 +88,7 @@ export class ExtensionManagementService
18+
@IDownloadService private downloadService: IDownloadService,
19+
@IInstantiationService private readonly instantiationService: IInstantiationService,
20+
@IFileService private readonly fileService: IFileService,
21+
+ // @ts-expect-error no-unused-variable
22+
@IConfigurationService private readonly configurationService: IConfigurationService,
23+
@IExtensionGalleryManifestService protected readonly extensionGalleryManifestService: IExtensionGalleryManifestService,
24+
@IProductService productService: IProductService,
25+
@@ -331,8 +333,7 @@ export class ExtensionManagementService
26+
27+
private async downloadExtension(extension: IGalleryExtension, operation: InstallOperation, verifySignature: boolean, clientTargetPlatform?: TargetPlatform): Promise<{ readonly location: URI; readonly verificationStatus: ExtensionSignatureVerificationCode | undefined }> {
28+
if (verifySignature) {
29+
- const value = this.configurationService.getValue(VerifyExtensionSignatureConfigKey);
30+
- verifySignature = isBoolean(value) ? value : true;
31+
+ verifySignature = false;
32+
}
33+
const { location, verificationStatus } = await this.extensionsDownloader.download(extension, operation, verifySignature, clientTargetPlatform);
34+
const shouldRequireSignature = shouldRequireRepositorySignatureFor(extension.private, await this.extensionGalleryManifestService.getExtensionGalleryManifest());

0 commit comments

Comments
 (0)