Fixing monaco build errors related to require

src/tsconfig.json

@@ -32,5 +32,8 @@
 	"include": [
 		"./typings",
 		"./vs"
+	],
+	"exclude": [
+		"./typings/require-monaco.d.ts"
 	]
 }
\ No newline at end of file

src/tsconfig.monaco.json

@@ -17,6 +17,7 @@
 	},
 	"include": [
 		"typings/require.d.ts",
+		"./typings/require-monaco.d.ts",
 		"typings/thenable.d.ts",
 		"typings/es6-promise.d.ts",
 		"typings/lib.array-ext.d.ts",
@@ -35,4 +36,4 @@
 	"exclude": [
 		"node_modules/*"
 	]
-}
+}
\ No newline at end of file

src/typings/require-monaco.d.ts

+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+interface NodeRequire {
+ 	(moduleName: string): any;
+ }
+
+declare var require: NodeRequire;
\ No newline at end of file

src/vs/base/common/async.ts

@@ -305,7 +305,7 @@ export function timeout(millis: number, token?: CancellationToken): CancelablePr
 	});
 }
 
-export function disposableTimeout(handler: TimerHandler, timeout = 0): IDisposable {
+export function disposableTimeout(handler: Function, timeout = 0): IDisposable {
 	const timer = setTimeout(handler, timeout);
 	return {
 		dispose() {