Merge from master

src/typings/require.d.ts

@@ -3,6 +3,28 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+declare const enum LoaderEventType {
+	LoaderAvailable = 1,
+
+	BeginLoadingScript = 10,
+	EndLoadingScriptOK = 11,
+	EndLoadingScriptError = 12,
+
+	BeginInvokeFactory = 21,
+	EndInvokeFactory = 22,
+
+	NodeBeginEvaluatingScript = 31,
+	NodeEndEvaluatingScript = 32,
+
+	NodeBeginNativeRequire = 33,
+	NodeEndNativeRequire = 34
+}
+
+declare class LoaderEvent {
+	readonly type: LoaderEventType;
+	readonly timestamp: number;
+	readonly detail: string;
+}
 
 declare var define: {
 	(moduleName: string, dependencies: string[], callback: (...args: any[]) => any): any;
@@ -13,11 +35,11 @@ declare var define: {
 	(dependencies: string[], definition: any): any;
 };
 
-declare var require: {
+interface NodeRequire {
 	toUrl(path: string): string;
-	(moduleName: string): any;
 	(dependencies: string[], callback: (...args: any[]) => any, errorback?: (err: any) => void): any;
 	config(data: any): any;
 	onError: Function;
 	__$__nodeRequire<T>(moduleName: string): T;
-};
+	getStats(): ReadonlyArray<LoaderEvent>
+}