Fix type import not resolving properly

Author: kylecarbs

scripts/vscode.patch

@@ -349,6 +349,14 @@ index 58ba2e5..4fb6272 100644
 @@ -774 +774 @@ 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/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