Skip to content

Commit 53722c5

Browse files
benz0libenz0li
authored
Update Code to 1.99.0 (#7300)
1 parent e2c489d commit 53722c5

18 files changed

+39
-39
lines changed

‎.node-version

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

‎lib/vscode

Submodule vscode updated 1286 files

‎patches/base-path.diff

+5-5
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
241241
===================================================================
242242
--- code-server.orig/lib/vscode/src/vs/base/common/product.ts
243243
+++ code-server/lib/vscode/src/vs/base/common/product.ts
244-
@@ -56,6 +56,7 @@ export type ExtensionVirtualWorkspaceSup
244+
@@ -57,6 +57,7 @@ export type ExtensionVirtualWorkspaceSup
245245

246246
export interface IProductConfiguration {
247247
readonly codeServerVersion?: string
@@ -253,7 +253,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
253253
===================================================================
254254
--- code-server.orig/lib/vscode/src/vs/code/browser/workbench/workbench.ts
255255
+++ code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
256-
@@ -317,7 +317,8 @@ class LocalStorageURLCallbackProvider ex
256+
@@ -332,7 +332,8 @@ class LocalStorageURLCallbackProvider ex
257257
this.startListening();
258258
}
259259

@@ -263,7 +263,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
263263
}
264264

265265
private startListening(): void {
266-
@@ -563,17 +564,6 @@ class WorkspaceProvider implements IWork
266+
@@ -579,17 +580,6 @@ class WorkspaceProvider implements IWork
267267
}
268268
}
269269

@@ -281,7 +281,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
281281
(function () {
282282

283283
// Find config by checking for DOM
284-
@@ -582,8 +572,8 @@ function readCookie(name: string): strin
284+
@@ -598,8 +588,8 @@ function readCookie(name: string): strin
285285
if (!configElement || !configElementAttribute) {
286286
throw new Error('Missing web configuration element');
287287
}
@@ -296,7 +296,7 @@ Index: code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/ext
296296
===================================================================
297297
--- code-server.orig/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
298298
+++ code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
299-
@@ -98,7 +98,7 @@ export abstract class AbstractExtensionR
299+
@@ -120,7 +120,7 @@ export abstract class AbstractExtensionR
300300
: version,
301301
path: 'extension'
302302
}));

‎patches/clipboard.diff

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ Index: code-server/lib/vscode/src/vs/platform/environment/common/argv.ts
7979
--- code-server.orig/lib/vscode/src/vs/platform/environment/common/argv.ts
8080
+++ code-server/lib/vscode/src/vs/platform/environment/common/argv.ts
8181
@@ -122,6 +122,7 @@ export interface NativeParsedArgs {
82+
'disable-chromium-sandbox'?: boolean;
8283
sandbox?: boolean;
83-
8484
'enable-coi'?: boolean;
8585
+ 'stdin-to-clipboard'?: boolean;
86+
'unresponsive-sample-interval'?: string;
87+
'unresponsive-sample-period'?: string;
8688

87-
// chromium command line args: https://electronjs.org/docs/all#supported-chrome-command-line-switches
88-
'no-proxy-server'?: 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

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

‎patches/display-language.diff

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

@@ -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-
@@ -435,9 +435,6 @@ export class InstallAction extends Exten
275+
@@ -445,9 +445,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-
@@ -742,7 +739,7 @@ export abstract class InstallInOtherServ
285+
@@ -752,7 +749,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-
@@ -2028,17 +2025,6 @@ export class SetLanguageAction extends E
294+
@@ -2039,17 +2036,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-
@@ -2055,7 +2041,6 @@ export class ClearLanguageAction extends
312+
@@ -2066,7 +2052,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-
@@ -2065,17 +2050,6 @@ export class ClearLanguageAction extends
320+
@@ -2076,17 +2061,6 @@ export class ClearLanguageAction extends
321321
update(): void {
322322
this.enabled = false;
323323
this.class = ClearLanguageAction.DisabledClass;
@@ -351,7 +351,7 @@ Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.internal.ts
351351
===================================================================
352352
--- code-server.orig/lib/vscode/src/vs/workbench/workbench.web.main.internal.ts
353353
+++ code-server/lib/vscode/src/vs/workbench/workbench.web.main.internal.ts
354-
@@ -52,7 +52,7 @@ import './services/dialogs/browser/fileD
354+
@@ -53,7 +53,7 @@ import './services/dialogs/browser/fileD
355355
import './services/host/browser/browserHostService.js';
356356
import './services/lifecycle/browser/lifecycleService.js';
357357
import './services/clipboard/browser/clipboardService.js';

‎patches/getting-started.diff

+2-2
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-
@@ -870,6 +870,72 @@ export class GettingStartedPage extends
31+
@@ -872,6 +872,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-
@@ -905,6 +971,9 @@ export class GettingStartedPage extends
104+
@@ -907,6 +973,9 @@ export class GettingStartedPage extends
105105
recentList.setLimit(5);
106106
reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
107107
}

‎patches/integration.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandl
113113
===================================================================
114114
--- code-server.orig/lib/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
115115
+++ code-server/lib/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
116-
@@ -79,8 +79,11 @@ export class BrowserDialogHandler extend
116+
@@ -78,8 +78,11 @@ export class BrowserDialogHandler extend
117117

118118
async about(): Promise<void> {
119119
const detailString = (useAgo: boolean): string => {
@@ -204,7 +204,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
204204
===================================================================
205205
--- code-server.orig/lib/vscode/src/vs/base/common/product.ts
206206
+++ code-server/lib/vscode/src/vs/base/common/product.ts
207-
@@ -55,6 +55,8 @@ export type ExtensionVirtualWorkspaceSup
207+
@@ -56,6 +56,8 @@ export type ExtensionVirtualWorkspaceSup
208208
};
209209

210210
export interface IProductConfiguration {

‎patches/logout.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
88
===================================================================
99
--- code-server.orig/lib/vscode/src/vs/base/common/product.ts
1010
+++ code-server/lib/vscode/src/vs/base/common/product.ts
11-
@@ -58,6 +58,7 @@ export interface IProductConfiguration {
11+
@@ -59,6 +59,7 @@ export interface IProductConfiguration {
1212
readonly codeServerVersion?: string
1313
readonly rootEndpoint?: string
1414
readonly updateEndpoint?: string

‎patches/marketplace.diff

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Index: code-server/lib/vscode/src/vs/platform/product/common/product.ts
1919
===================================================================
2020
--- code-server.orig/lib/vscode/src/vs/platform/product/common/product.ts
2121
+++ code-server/lib/vscode/src/vs/platform/product/common/product.ts
22-
@@ -47,6 +47,16 @@ else if (globalThis._VSCODE_PRODUCT_JSON
22+
@@ -49,6 +49,16 @@ else if (globalThis._VSCODE_PRODUCT_JSON
2323
version: pkg.version
2424
});
2525
}
@@ -74,9 +74,9 @@ Index: code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/ext
7474
import { getTelemetryLevel, supportsTelemetry } from '../../telemetry/common/telemetryUtils.js';
7575
-import { RemoteAuthorities } from '../../../base/common/network.js';
7676
import { TargetPlatform } from '../../extensions/common/extensions.js';
77-
78-
const WEB_EXTENSION_RESOURCE_END_POINT_SEGMENT = '/web-extension-resource/';
79-
@@ -140,9 +139,9 @@ export abstract class AbstractExtensionR
77+
import { ExtensionGalleryResourceType, getExtensionGalleryManifestResourceUri, IExtensionGalleryManifest, IExtensionGalleryManifestService } from '../../extensionManagement/common/extensionGalleryManifest.js';
78+
import { ILogService } from '../../log/common/log.js';
79+
@@ -163,9 +162,9 @@ export abstract class AbstractExtensionR
8080
}
8181

8282
protected _isWebExtensionResourceEndPoint(uri: URI): boolean {

‎patches/proxy-uri.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
3030
===================================================================
3131
--- code-server.orig/lib/vscode/src/vs/base/common/product.ts
3232
+++ code-server/lib/vscode/src/vs/base/common/product.ts
33-
@@ -59,6 +59,7 @@ export interface IProductConfiguration {
33+
@@ -60,6 +60,7 @@ export interface IProductConfiguration {
3434
readonly rootEndpoint?: string
3535
readonly updateEndpoint?: string
3636
readonly logoutEndpoint?: string
@@ -104,7 +104,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
104104
import type { IURLCallbackProvider } from '../../../workbench/services/url/browser/urlService.js';
105105
import { create } from '../../../workbench/workbench.web.main.internal.js';
106106

107-
@@ -584,6 +585,39 @@ class WorkspaceProvider implements IWork
107+
@@ -600,6 +601,39 @@ class WorkspaceProvider implements IWork
108108
settingsSyncOptions: config.settingsSyncOptions ? { enabled: config.settingsSyncOptions.enabled, } : undefined,
109109
workspaceProvider: WorkspaceProvider.create(config),
110110
urlCallbackProvider: new LocalStorageURLCallbackProvider(config.callbackRoute),

‎patches/service-worker.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
66
===================================================================
77
--- code-server.orig/lib/vscode/src/vs/base/common/product.ts
88
+++ code-server/lib/vscode/src/vs/base/common/product.ts
9-
@@ -60,6 +60,10 @@ export interface IProductConfiguration {
9+
@@ -61,6 +61,10 @@ export interface IProductConfiguration {
1010
readonly updateEndpoint?: string
1111
readonly logoutEndpoint?: string
1212
readonly proxyEndpointTemplate?: string

‎patches/sourcemaps.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -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-
@@ -457,7 +456,7 @@ function tweakProductForServerWeb(produc
35+
@@ -451,7 +450,7 @@ function tweakProductForServerWeb(produc
3636
const minifyTask = task.define(`minify-vscode-${type}`, task.series(
3737
bundleTask,
3838
util.rimraf(`out-vscode-${type}-min`),

‎patches/store-socket.diff

+1-1
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-
@@ -422,7 +423,28 @@ async function startExtensionHostProcess
99+
@@ -423,7 +424,28 @@ async function startExtensionHostProcess
100100
);
101101

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

‎patches/telemetry.diff

+3-3
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 '../../platform/policy/common/policy.js';
2929
import { OneDataSystemAppender } from '../../platform/telemetry/node/1dsAppender.js';
3030
import { LoggerService } from '../../platform/log/node/loggerService.js';
31-
@@ -153,11 +155,23 @@ export async function setupServerService
31+
@@ -158,11 +160,23 @@ export async function setupServerService
3232
const requestService = new RequestService('remote', configurationService, environmentService, logService);
3333
services.set(IRequestService, requestService);
3434

@@ -147,7 +147,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
147147
===================================================================
148148
--- code-server.orig/lib/vscode/src/vs/base/common/product.ts
149149
+++ code-server/lib/vscode/src/vs/base/common/product.ts
150-
@@ -64,6 +64,7 @@ export interface IProductConfiguration {
150+
@@ -65,6 +65,7 @@ export interface IProductConfiguration {
151151
readonly path: string;
152152
readonly scope: string;
153153
}
@@ -159,7 +159,7 @@ Index: code-server/lib/vscode/src/vs/platform/product/common/product.ts
159159
===================================================================
160160
--- code-server.orig/lib/vscode/src/vs/platform/product/common/product.ts
161161
+++ code-server/lib/vscode/src/vs/platform/product/common/product.ts
162-
@@ -55,7 +55,8 @@ else if (globalThis._VSCODE_PRODUCT_JSON
162+
@@ -57,7 +57,8 @@ else if (globalThis._VSCODE_PRODUCT_JSON
163163
resourceUrlTemplate: "https://open-vsx.org/vscode/asset/{publisher}/{name}/{version}/Microsoft.VisualStudio.Code.WebResources/{path}",
164164
controlUrl: "",
165165
recommendationsUrl: "",

‎patches/unique-db.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/storage/browser/storageS
2121

2222
export class BrowserStorageService extends AbstractStorageService {
2323

24-
@@ -298,7 +299,11 @@ export class IndexedDBStorageDatabase ex
24+
@@ -300,7 +301,11 @@ export class IndexedDBStorageDatabase ex
2525
}
2626

2727
static async createWorkspaceStorage(workspaceId: string, logService: ILogService): Promise<IIndexedDBStorageDatabase> {

‎patches/update-check.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
9393
===================================================================
9494
--- code-server.orig/lib/vscode/src/vs/base/common/product.ts
9595
+++ code-server/lib/vscode/src/vs/base/common/product.ts
96-
@@ -57,6 +57,7 @@ export type ExtensionVirtualWorkspaceSup
96+
@@ -58,6 +58,7 @@ export type ExtensionVirtualWorkspaceSup
9797
export interface IProductConfiguration {
9898
readonly codeServerVersion?: string
9999
readonly rootEndpoint?: string

‎patches/webview.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index
7070
<meta charset="UTF-8">
7171

7272
<meta http-equiv="Content-Security-Policy"
73-
- content="default-src 'none'; script-src 'sha256-DXeP32g8BdMsVuVabYTmznoTH59F7M7UtV0vXemEFqc=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
74-
+ content="default-src 'none'; script-src 'sha256-z5v/0xE4zQPgV1fazhHB/UlsTzdm39hRMk3V8Av0HI4=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
73+
- content="default-src 'none'; script-src 'sha256-nlLyDpnjtftJG2xvXh2vuy77l7xFTjfOz7Jnj1iXNmA=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
74+
+ content="default-src 'none'; script-src 'sha256-ap/AtocvSWp0rrxaO19DJy/nOpazT6M5Cv9utUWe7MA=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
7575

7676

7777
<!-- Disable pinch zooming -->

0 commit comments

Comments
 (0)