@@ -19,7 +19,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
19
19
===================================================================
20
20
--- code-server.orig/lib/vscode/src/vs/server/node/serverServices.ts
21
21
+++ code-server/lib/vscode/src/vs/server/node/serverServices.ts
22
- @@ -212 ,6 +212 ,9 @@ export async function setupServerService
22
+ @@ -209 ,6 +209 ,9 @@ export async function setupServerService
23
23
const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority));
24
24
socketServer.registerChannel('extensions', channel);
25
25
@@ -39,11 +39,11 @@ Index: code-server/lib/vscode/src/vs/base/common/platform.ts
39
39
*--------------------------------------------------------------------------------------------*/
40
40
- import * as nls from 'vs/nls';
41
41
-
42
- const LANGUAGE_DEFAULT = 'en';
42
+ export const LANGUAGE_DEFAULT = 'en';
43
43
44
44
let _isWindows = false;
45
- @@ -81 ,17 +79 ,19 @@ if (typeof navigator === 'object' && !is
46
- _isLinux = _userAgent.indexOf('Linux ') >= 0;
45
+ @@ -83 ,17 +81 ,19 @@ if (typeof navigator === 'object' && !is
46
+ _isMobile = _userAgent? .indexOf('Mobi ') >= 0;
47
47
_isWeb = true;
48
48
49
49
- const configuredLocale = nls.getConfiguredDefaultLocale(
@@ -216,7 +216,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
216
216
217
217
const workbenchWebConfiguration = {
218
218
remoteAuthority,
219
- @@ -339 ,6 +342 ,7 @@ export class WebClientServer {
219
+ @@ -336 ,6 +339 ,7 @@ export class WebClientServer {
220
220
WORKBENCH_NLS_BASE_URL: vscodeBase + (nlsBaseUrl ? `${nlsBaseUrl}${!nlsBaseUrl.endsWith('/') ? '/' : ''}${this._productService.commit}/${this._productService.version}/` : ''),
221
221
BASE: base,
222
222
VS_BASE: vscodeBase,
@@ -236,7 +236,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
236
236
237
237
/* ----- server setup ----- */
238
238
239
- @@ -97 ,6 +98 ,7 @@ export interface ServerParsedArgs {
239
+ @@ -96 ,6 +97 ,7 @@ export interface ServerParsedArgs {
240
240
'disable-update-check'?: boolean;
241
241
'auth'?: string
242
242
'disable-file-downloads'?: boolean;
@@ -248,7 +248,7 @@ Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
248
248
===================================================================
249
249
--- code-server.orig/lib/vscode/src/vs/workbench/workbench.web.main.ts
250
250
+++ code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
251
- @@ -122 ,8 +122 ,9 @@ import 'vs/workbench/contrib/logs/browse
251
+ @@ -123 ,8 +123 ,9 @@ import 'vs/workbench/contrib/logs/browse
252
252
// Explorer
253
253
import 'vs/workbench/contrib/files/browser/files.web.contribution';
254
254
@@ -314,19 +314,3 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/localization/electron-san
314
314
await this.jsonEditingService.write(this.environmentService.argvResource, [{ path: ['locale'], value: locale }], true);
315
315
return true;
316
316
}
317
- Index: code-server/lib/vscode/src/vs/base/node/languagePacks.js
318
- ===================================================================
319
- --- code-server.orig/lib/vscode/src/vs/base/node/languagePacks.js
320
- +++ code-server/lib/vscode/src/vs/base/node/languagePacks.js
321
- @@ -73,7 +73,10 @@
322
- function getLanguagePackConfigurations(userDataPath) {
323
- const configFile = path.join(userDataPath, 'languagepacks.json');
324
- try {
325
- - return nodeRequire(configFile);
326
- + // This must not use Node's require otherwise it will be cached forever.
327
- + // Code can get away with this since the process actually restarts but
328
- + // that is not currently the case with code-server.
329
- + return JSON.parse(fs.readFileSync(configFile, "utf8"));
330
- } catch (err) {
331
- // Do nothing. If we can't read the file we have no
332
- // language pack config.
0 commit comments