diff --git a/src/tsconfig.json b/src/tsconfig.json index f3622929fed..c5a31a458f8 100644 --- a/src/tsconfig.json +++ b/src/tsconfig.json @@ -32,5 +32,8 @@ "include": [ "./typings", "./vs" + ], + "exclude": [ + "./typings/require-monaco.d.ts" ] } \ No newline at end of file diff --git a/src/tsconfig.monaco.json b/src/tsconfig.monaco.json index 81bd7677f76..9e295f40659 100644 --- a/src/tsconfig.monaco.json +++ b/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 diff --git a/src/typings/require-monaco.d.ts b/src/typings/require-monaco.d.ts new file mode 100644 index 00000000000..4d00b30f34d --- /dev/null +++ b/src/typings/require-monaco.d.ts @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * 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 diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts index b12db7b3f28..cc3d388ce35 100644 --- a/src/vs/base/common/async.ts +++ b/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() {