Skip to content

Commit 8889059

Browse files
code-ashercode-asher
committed
Update Code to 1.76.1
- worker-src already contains blob so we can avoid patching that. - localeService moved. - Remaining changes were just line changes.
1 parent be40eca commit 8889059

16 files changed

+35
-44
lines changed

‎lib/vscode

Submodule vscode updated 1057 files

‎patches/base-path.diff

+3-3
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
174174
+ `script-src 'self' 'unsafe-eval' ${this._getScriptCspHashes(data).join(' ')} 'sha256-fh3TwPMflhsEIpR8g1OYTIMVWhXTLcjQ9kh2tIpmv54=';`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
175175
'child-src \'self\';',
176176
`frame-src 'self' https://*.vscode-cdn.net data:;`,
177-
'worker-src \'self\' data:;',
177+
'worker-src \'self\' data: blob:;',
178178
@@ -417,3 +421,70 @@ export class WebClientServer {
179179
return void res.end(data);
180180
}
@@ -250,7 +250,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
250250
===================================================================
251251
--- code-server.orig/lib/vscode/src/vs/base/common/product.ts
252252
+++ code-server/lib/vscode/src/vs/base/common/product.ts
253-
@@ -32,6 +32,7 @@ export type ExtensionVirtualWorkspaceSup
253+
@@ -33,6 +33,7 @@ export type ExtensionVirtualWorkspaceSup
254254

255255
export interface IProductConfiguration {
256256
readonly codeServerVersion?: string
@@ -290,7 +290,7 @@ Index: code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/ext
290290
-import { RemoteAuthorities } from 'vs/base/common/network';
291291
import { getRemoteServerRootPath } from 'vs/platform/remote/common/remoteHosts';
292292

293-
export const WEB_EXTENSION_RESOURCE_END_POINT = 'web-extension-resource';
293+
const WEB_EXTENSION_RESOURCE_END_POINT = 'web-extension-resource';
294294
@@ -75,7 +74,7 @@ export abstract class AbstractExtensionR
295295
public getExtensionGalleryResourceURL(galleryExtension: { publisher: string; name: string; version: string }, path?: string): URI | undefined {
296296
if (this._extensionGalleryResourceUrlTemplate) {

‎patches/disable-downloads.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
1212
===================================================================
1313
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
1414
+++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
15-
@@ -266,6 +266,11 @@ export interface IWorkbenchConstructionO
15+
@@ -260,6 +260,11 @@ export interface IWorkbenchConstructionO
1616
*/
1717
readonly userDataPath?: string
1818

@@ -172,7 +172,7 @@ Index: code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
172172
===================================================================
173173
--- code-server.orig/lib/vscode/src/vs/workbench/common/contextkeys.ts
174174
+++ code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
175-
@@ -32,6 +32,8 @@ export const IsFullscreenContext = new R
175+
@@ -33,6 +33,8 @@ export const IsFullscreenContext = new R
176176

177177
export const HasWebFileSystemAccess = new RawContextKey<boolean>('hasWebFileSystemAccess', false, true); // Support for FileSystemAccess web APIs (https://wicg.github.io/file-system-access)
178178

‎patches/display-language.diff

+12-12
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
1919
===================================================================
2020
--- code-server.orig/lib/vscode/src/vs/server/node/serverServices.ts
2121
+++ code-server/lib/vscode/src/vs/server/node/serverServices.ts
22-
@@ -220,6 +220,9 @@ export async function setupServerService
22+
@@ -234,6 +234,9 @@ export async function setupServerService
2323
const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority));
2424
socketServer.registerChannel('extensions', channel);
2525

@@ -138,7 +138,7 @@ Index: code-server/lib/vscode/src/vs/server/node/remoteLanguagePacks.ts
138138
===================================================================
139139
--- code-server.orig/lib/vscode/src/vs/server/node/remoteLanguagePacks.ts
140140
+++ code-server/lib/vscode/src/vs/server/node/remoteLanguagePacks.ts
141-
@@ -30,6 +30,12 @@ export function getNLSConfiguration(lang
141+
@@ -32,6 +32,12 @@ export function getNLSConfiguration(lang
142142
if (InternalNLSConfiguration.is(value)) {
143143
value._languagePackSupport = true;
144144
}
@@ -151,7 +151,7 @@ Index: code-server/lib/vscode/src/vs/server/node/remoteLanguagePacks.ts
151151
return value;
152152
});
153153
_cache.set(key, result);
154-
@@ -44,3 +50,43 @@ export namespace InternalNLSConfiguratio
154+
@@ -46,3 +52,43 @@ export namespace InternalNLSConfiguratio
155155
return candidate && typeof candidate._languagePackId === 'string';
156156
}
157157
}
@@ -264,9 +264,9 @@ Index: code-server/lib/vscode/src/vs/platform/languagePacks/browser/languagePack
264264
===================================================================
265265
--- code-server.orig/lib/vscode/src/vs/platform/languagePacks/browser/languagePacks.ts
266266
+++ code-server/lib/vscode/src/vs/platform/languagePacks/browser/languagePacks.ts
267-
@@ -6,18 +6,24 @@
267+
@@ -5,18 +5,24 @@
268+
268269
import { CancellationTokenSource } from 'vs/base/common/cancellation';
269-
import { Language } from 'vs/base/common/platform';
270270
import { URI } from 'vs/base/common/uri';
271271
+import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
272272
import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
@@ -289,20 +289,20 @@ Index: code-server/lib/vscode/src/vs/platform/languagePacks/browser/languagePack
289289
+ this.languagePackService = ProxyChannel.toService<ILanguagePackService>(remoteAgentService.getConnection()!.getChannel('languagePacks'))
290290
}
291291

292-
async getBuiltInExtensionTranslationsUri(id: string): Promise<URI | undefined> {
293-
@@ -73,6 +79,6 @@ export class WebLanguagePacksService ext
292+
async getBuiltInExtensionTranslationsUri(id: string, language: string): Promise<URI | undefined> {
293+
@@ -72,6 +78,6 @@ export class WebLanguagePacksService ext
294294

295295
// Web doesn't have a concept of language packs, so we just return an empty array
296296
getInstalledLanguages(): Promise<ILanguagePackItem[]> {
297297
- return Promise.resolve([]);
298298
+ return this.languagePackService.getInstalledLanguages()
299299
}
300300
}
301-
Index: code-server/lib/vscode/src/vs/workbench/contrib/localization/electron-sandbox/localeService.ts
301+
Index: code-server/lib/vscode/src/vs/workbench/services/localization/electron-sandbox/localeService.ts
302302
===================================================================
303-
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/localization/electron-sandbox/localeService.ts
304-
+++ code-server/lib/vscode/src/vs/workbench/contrib/localization/electron-sandbox/localeService.ts
305-
@@ -41,7 +41,8 @@ export class NativeLocaleService impleme
303+
--- code-server.orig/lib/vscode/src/vs/workbench/services/localization/electron-sandbox/localeService.ts
304+
+++ code-server/lib/vscode/src/vs/workbench/services/localization/electron-sandbox/localeService.ts
305+
@@ -51,7 +51,8 @@ class NativeLocaleService implements ILo
306306
@IProductService private readonly productService: IProductService
307307
) { }
308308

@@ -312,7 +312,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/localization/electron-san
312312
try {
313313
const content = await this.textFileService.read(this.environmentService.argvResource, { encoding: 'utf8' });
314314

315-
@@ -68,9 +69,6 @@ export class NativeLocaleService impleme
315+
@@ -78,9 +79,6 @@ class NativeLocaleService implements ILo
316316
}
317317

318318
private async writeLocaleValue(locale: string | undefined): Promise<boolean> {

‎patches/getting-started.diff

+3-3
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
143143
===================================================================
144144
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
145145
+++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
146-
@@ -271,6 +271,11 @@ export interface IWorkbenchConstructionO
146+
@@ -265,6 +265,11 @@ export interface IWorkbenchConstructionO
147147
*/
148148
readonly isEnabledFileDownloads?: boolean
149149

@@ -201,7 +201,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
201201
'auth'?: string
202202
'disable-file-downloads'?: boolean;
203203
'locale'?: string
204-
+ 'disable-getting-started-override'?: boolean;
204+
+ 'disable-getting-started-override'?: boolean,
205205

206206
/* ----- server setup ----- */
207207

@@ -242,7 +242,7 @@ Index: code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
242242
===================================================================
243243
--- code-server.orig/lib/vscode/src/vs/workbench/common/contextkeys.ts
244244
+++ code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
245-
@@ -33,6 +33,7 @@ export const IsFullscreenContext = new R
245+
@@ -34,6 +34,7 @@ export const IsFullscreenContext = new R
246246
export const HasWebFileSystemAccess = new RawContextKey<boolean>('hasWebFileSystemAccess', false, true); // Support for FileSystemAccess web APIs (https://wicg.github.io/file-system-access)
247247

248248
export const IsEnabledFileDownloads = new RawContextKey<boolean>('isEnabledFileDownloads', true, true);

‎patches/integration.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandl
107107
===================================================================
108108
--- code-server.orig/lib/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
109109
+++ code-server/lib/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
110-
@@ -145,8 +145,11 @@ export class BrowserDialogHandler implem
110+
@@ -76,8 +76,11 @@ export class BrowserDialogHandler extend
111111

112112
async about(): Promise<void> {
113113
const detailString = (useAgo: boolean): string => {
@@ -198,7 +198,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
198198
===================================================================
199199
--- code-server.orig/lib/vscode/src/vs/base/common/product.ts
200200
+++ code-server/lib/vscode/src/vs/base/common/product.ts
201-
@@ -31,6 +31,8 @@ export type ExtensionVirtualWorkspaceSup
201+
@@ -32,6 +32,8 @@ export type ExtensionVirtualWorkspaceSup
202202
};
203203

204204
export interface IProductConfiguration {

‎patches/local-storage.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
3232
===================================================================
3333
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
3434
+++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
35-
@@ -261,6 +261,11 @@ export interface IWorkbenchConstructionO
35+
@@ -255,6 +255,11 @@ export interface IWorkbenchConstructionO
3636
*/
3737
readonly configurationDefaults?: Record<string, any>;
3838

‎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-
@@ -34,6 +34,7 @@ export interface IProductConfiguration {
11+
@@ -35,6 +35,7 @@ export interface IProductConfiguration {
1212
readonly codeServerVersion?: string
1313
readonly rootEndpoint?: string
1414
readonly updateEndpoint?: string

‎patches/marketplace.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Index: code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/ext
7575
import { getTelemetryLevel, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
7676
-import { getRemoteServerRootPath } from 'vs/platform/remote/common/remoteHosts';
7777

78-
export const WEB_EXTENSION_RESOURCE_END_POINT = 'web-extension-resource';
78+
const WEB_EXTENSION_RESOURCE_END_POINT = 'web-extension-resource';
7979

8080
@@ -60,7 +59,7 @@ export abstract class AbstractExtensionR
8181
private readonly _environmentService: IEnvironmentService,

‎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/abstra
1010
===================================================================
1111
--- code-server.orig/lib/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
1212
+++ code-server/lib/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
13-
@@ -1486,7 +1486,7 @@ class ProposedApiController {
13+
@@ -1488,7 +1488,7 @@ class ProposedApiController {
1414

1515
this._envEnabledExtensions = new Set((_environmentService.extensionEnabledProposedApi ?? []).map(id => ExtensionIdentifier.toKey(id)));
1616

‎patches/proxy-uri.diff

+1-1
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-
@@ -35,6 +35,7 @@ export interface IProductConfiguration {
33+
@@ -36,6 +36,7 @@ export interface IProductConfiguration {
3434
readonly rootEndpoint?: string
3535
readonly updateEndpoint?: string
3636
readonly logoutEndpoint?: string

‎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-
@@ -36,6 +36,10 @@ export interface IProductConfiguration {
9+
@@ -37,6 +37,10 @@ export interface IProductConfiguration {
1010
readonly updateEndpoint?: string
1111
readonly logoutEndpoint?: string
1212
readonly proxyEndpointTemplate?: string

‎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-
@@ -192,8 +192,7 @@ function packageTask(type, platform, arc
13+
@@ -191,8 +191,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-
@@ -232,9 +231,9 @@ function packageTask(type, platform, arc
23+
@@ -231,9 +230,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-
@@ -389,7 +388,7 @@ function tweakProductForServerWeb(produc
35+
@@ -388,7 +387,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
@@ -20,8 +20,8 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
2020
import { NullPolicyService } from 'vs/platform/policy/common/policy';
2121
import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender';
2222
import { LoggerService } from 'vs/platform/log/node/loggerService';
23-
@@ -142,10 +143,13 @@ export async function setupServerService
24-
const machineId = await getMachineId();
23+
@@ -151,10 +152,13 @@ export async function setupServerService
24+
let oneDsAppender: ITelemetryAppender = NullAppender;
2525
const isInternal = isInternalTelemetry(productService, configurationService);
2626
if (supportsTelemetry(productService, environmentService)) {
2727
- if (productService.aiConfig && productService.aiConfig.ariaKey) {

‎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-
@@ -33,6 +33,7 @@ export type ExtensionVirtualWorkspaceSup
96+
@@ -34,6 +34,7 @@ export type ExtensionVirtualWorkspaceSup
9797
export interface IProductConfiguration {
9898
readonly codeServerVersion?: string
9999
readonly rootEndpoint?: string

‎patches/webview.diff

-9
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,6 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
6262
_wrapWebWorkerExtHostInIframe,
6363
developmentOptions: { enableSmokeTestDriver: this._environmentService.args['enable-smoke-test-driver'] ? true : undefined, logLevel: this._logService.getLevel() },
6464
settingsSyncOptions: !this._environmentService.isBuilt && this._environmentService.args['enable-sync'] ? { enabled: true } : undefined,
65-
@@ -344,7 +345,7 @@ export class WebClientServer {
66-
`script-src 'self' 'unsafe-eval' ${this._getScriptCspHashes(data).join(' ')} 'sha256-fh3TwPMflhsEIpR8g1OYTIMVWhXTLcjQ9kh2tIpmv54=';`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
67-
'child-src \'self\';',
68-
`frame-src 'self' https://*.vscode-cdn.net data:;`,
69-
- 'worker-src \'self\' data:;',
70-
+ 'worker-src \'self\' data: blob:;',
71-
'style-src \'self\' \'unsafe-inline\';',
72-
'connect-src \'self\' ws: wss: https:;',
73-
'font-src \'self\' blob:;',
7465
Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html
7566
===================================================================
7667
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html

0 commit comments

Comments
 (0)