@@ -38,7 +38,7 @@ Index: code-server/lib/vscode/src/vs/server/node/server.main.ts
38
38
- const LOCAL_HISTORY_HOME = join(APP_SETTINGS_HOME, 'History');
39
39
- const MACHINE_SETTINGS_HOME = join(USER_DATA_PATH, 'Machine');
40
40
- args['user-data-dir'] = USER_DATA_PATH;
41
- - const APP_ROOT = dirname(FileAccess.asFileUri('', require ).fsPath);
41
+ - const APP_ROOT = dirname(FileAccess.asFileUri('').fsPath);
42
42
- const BUILTIN_EXTENSIONS_FOLDER_PATH = join(APP_ROOT, 'extensions');
43
43
- args['builtin-extensions-dir'] = BUILTIN_EXTENSIONS_FOLDER_PATH;
44
44
- args['extensions-dir'] = args['extensions-dir'] || join(REMOTE_DATA_FOLDER, 'extensions');
@@ -58,7 +58,7 @@ Index: code-server/lib/vscode/src/vs/server/node/server.main.ts
58
58
+ const LOCAL_HISTORY_HOME = join(APP_SETTINGS_HOME, 'History');
59
59
+ const MACHINE_SETTINGS_HOME = join(USER_DATA_PATH, 'Machine');
60
60
+ args['user-data-dir'] = USER_DATA_PATH;
61
- + const APP_ROOT = dirname(FileAccess.asFileUri('', require ).fsPath);
61
+ + const APP_ROOT = dirname(FileAccess.asFileUri('').fsPath);
62
62
+ const BUILTIN_EXTENSIONS_FOLDER_PATH = args['builtin-extensions-dir'] || join(APP_ROOT, 'extensions');
63
63
+ args['builtin-extensions-dir'] = BUILTIN_EXTENSIONS_FOLDER_PATH;
64
64
+ args['extensions-dir'] = args['extensions-dir'] || join(REMOTE_DATA_FOLDER, 'extensions');
@@ -107,7 +107,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandl
107
107
===================================================================
108
108
--- code-server.orig/lib/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
109
109
+++ code-server/lib/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
110
- @@ -143 ,8 +143 ,11 @@ export class BrowserDialogHandler implem
110
+ @@ -145 ,8 +145 ,11 @@ export class BrowserDialogHandler implem
111
111
112
112
async about(): Promise<void> {
113
113
const detailString = (useAgo: boolean): string => {
@@ -184,7 +184,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
184
184
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
185
185
import { IProgressService } from 'vs/platform/progress/common/progress';
186
186
import { DelayedLogChannel } from 'vs/workbench/services/output/common/delayedLogChannel';
187
- @@ -117 ,6 +118 ,9 @@ export class BrowserMain extends Disposa
187
+ @@ -118 ,6 +119 ,9 @@ export class BrowserMain extends Disposa
188
188
// Startup
189
189
const instantiationService = workbench.startup();
190
190
0 commit comments