OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Fix type import not resolving properly

Browse Source
This commit is contained in:
Kyle Carberry 2019-03-15 00:48:39 -04:00
parent bfaadd4e51
commit 400fba7f6f
No known key found for this signature in database
GPG Key ID: A0409BDB6B0B3EDB
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/vscode.patch
View File

@ -349,6 +349,14 @@ index 58ba2e5..4fb6272 100644
@@ -774 +774 @@ function loadCommonJSModule<T>(logService: ILogService, modulePath: string, acti @@ -774 +774 @@ function loadCommonJSModule<T>(logService: ILogService, modulePath: string, acti
- r = require.__$__nodeRequire<T>(modulePath); - r = require.__$__nodeRequire<T>(modulePath);
+ r = (global as any).nativeNodeRequire(modulePath); + r = (global as any).nativeNodeRequire(modulePath);
diff --git a/src/vs/workbench/api/node/extHostTypeConverters.ts b/src/vs/workbench/api/node/extHostTypeConverters.ts
index a445750..c7beb13 100644
--- a/src/vs/workbench/api/node/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/node/extHostTypeConverters.ts
@@ -26 +25,0 @@ import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumen
-import { isString, isNumber } from 'vs/base/common/types';
@@ -116,0 +116 @@ export namespace Diagnostic {
+ const { isString, isNumber } = require('vs/base/common/types');
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 5897ab9..57b926e 100644 index 5897ab9..57b926e 100644
--- a/src/vs/workbench/browser/dnd.ts --- a/src/vs/workbench/browser/dnd.ts