Skip to content

Commit ec4177c

Browse files
committed
chore: remove require in integration.diff
I don't know what the impact of this is but in microsoft/vscode@192c67d they removed the usage of `require` in `server.main.ts`. More details in PR: microsoft/vscode#165831
1 parent 320f035 commit ec4177c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

patches/integration.diff

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Index: code-server/lib/vscode/src/vs/server/node/server.main.ts
3838
-const LOCAL_HISTORY_HOME = join(APP_SETTINGS_HOME, 'History');
3939
-const MACHINE_SETTINGS_HOME = join(USER_DATA_PATH, 'Machine');
4040
-args['user-data-dir'] = USER_DATA_PATH;
41-
-const APP_ROOT = dirname(FileAccess.asFileUri('', require).fsPath);
41+
-const APP_ROOT = dirname(FileAccess.asFileUri('').fsPath);
4242
-const BUILTIN_EXTENSIONS_FOLDER_PATH = join(APP_ROOT, 'extensions');
4343
-args['builtin-extensions-dir'] = BUILTIN_EXTENSIONS_FOLDER_PATH;
4444
-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
5858
+ const LOCAL_HISTORY_HOME = join(APP_SETTINGS_HOME, 'History');
5959
+ const MACHINE_SETTINGS_HOME = join(USER_DATA_PATH, 'Machine');
6060
+ args['user-data-dir'] = USER_DATA_PATH;
61-
+ const APP_ROOT = dirname(FileAccess.asFileUri('', require).fsPath);
61+
+ const APP_ROOT = dirname(FileAccess.asFileUri('').fsPath);
6262
+ const BUILTIN_EXTENSIONS_FOLDER_PATH = args['builtin-extensions-dir'] || join(APP_ROOT, 'extensions');
6363
+ args['builtin-extensions-dir'] = BUILTIN_EXTENSIONS_FOLDER_PATH;
6464
+ 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
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-
@@ -143,8 +143,11 @@ export class BrowserDialogHandler implem
110+
@@ -145,8 +145,11 @@ export class BrowserDialogHandler implem
111111

112112
async about(): Promise<void> {
113113
const detailString = (useAgo: boolean): string => {
@@ -184,7 +184,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
184184
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
185185
import { IProgressService } from 'vs/platform/progress/common/progress';
186186
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
188188
// Startup
189189
const instantiationService = workbench.startup();
190190

0 commit comments

Comments
 (0)