From 400fba7f6f029ebe85defe87889b767a82110cc6 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Fri, 15 Mar 2019 00:48:39 -0400 Subject: [PATCH] Fix type import not resolving properly --- scripts/vscode.patch | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/vscode.patch b/scripts/vscode.patch index 698376764..f57bfa449 100644 --- a/scripts/vscode.patch +++ b/scripts/vscode.patch @@ -349,6 +349,14 @@ index 58ba2e5..4fb6272 100644 @@ -774 +774 @@ function loadCommonJSModule(logService: ILogService, modulePath: string, acti - r = require.__$__nodeRequire(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 index 5897ab9..57b926e 100644 --- a/src/vs/workbench/browser/dnd.ts