a
/
code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use nativeNodeRequire

This commit is contained in:
Asher 2019-02-06 13:04:54 -06:00
parent 86045e32c6
commit 428729769b
No known key found for this signature in database
GPG Key ID: 7BB4BA9C783D2BBC
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/vscode.patch
View File

@ -69,6 +69,13 @@ index e3efb95b75..163bc4c994 100644
+ // Cannot control GC in the browser. + // Cannot control GC in the browser.
+ return Promise.resolve(obj); + return Promise.resolve(obj);
+ +
diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
index 7841dcdaa2..f5665f0db3 100644
--- a/src/vs/workbench/api/node/extHostExtensionService.ts
+++ b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -654 +654 @@ function loadCommonJSModule<T>(logService: ILogService, modulePath: string, acti
- r = require.__$__nodeRequire<T>(modulePath);
+ r = (global as any).nativeNodeRequire(modulePath);
diff --git a/src/vs/workbench/browser/dnd.ts b/src/vs/workbench/browser/dnd.ts diff --git a/src/vs/workbench/browser/dnd.ts b/src/vs/workbench/browser/dnd.ts
index 38bf337a61..a6ee664a20 100644 index 38bf337a61..a6ee664a20 100644
--- a/src/vs/workbench/browser/dnd.ts --- a/src/vs/workbench/browser/dnd.ts