diff --git a/types/karma-webpack/index.d.ts b/types/karma-webpack/index.d.ts index bfb9634ce8..988e510b56 100644 --- a/types/karma-webpack/index.d.ts +++ b/types/karma-webpack/index.d.ts @@ -4,9 +4,9 @@ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.3 -import * as m from 'karma'; -import webpack = require('webpack'); -import webpackDevMiddleware = require('webpack-dev-middleware'); +import 'karma'; +import * as Webpack from 'webpack'; +import { Reporter, Logger } from 'webpack-dev-middleware'; declare module 'karma' { type Logger = (message?: any, ...optionalParams: any[]) => void; @@ -18,14 +18,14 @@ declare module 'karma' { noInfo?: boolean; quiet?: boolean; lazy?: boolean; - watchOptions?: webpack.Options.WatchOptions; + watchOptions?: Webpack.Options.WatchOptions; publicPath?: string; index?: string; headers?: { [name: string]: string; }; - stats?: webpack.Options.Stats; - reporter?: webpackDevMiddleware.Reporter | null; + stats?: Webpack.Options.Stats; + reporter?: Reporter | null; serverSideRender?: boolean; log?: Logger; @@ -35,7 +35,7 @@ declare module 'karma' { } interface ConfigOptions { - webpack: webpack.Configuration; + webpack: Webpack.Configuration; webpackMiddlewareOptions: KarmaWebpackMiddlewareOptions; } } diff --git a/types/mocha/index.d.ts b/types/mocha/index.d.ts index 09b596dcfc..4ae915f683 100644 --- a/types/mocha/index.d.ts +++ b/types/mocha/index.d.ts @@ -3,8 +3,6 @@ // Definitions by: Kazi Manzur Rashid , otiai10 , jt000 , Vadim Macagon // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -/// - interface MochaSetupOptions { //milliseconds to wait before considering a test slow slow?: number; @@ -174,7 +172,7 @@ declare namespace Mocha { /** Partial interface for Mocha's `Runner` class. */ - interface IRunner extends NodeJS.EventEmitter { } + interface IRunner { } interface IContextDefinition { (description: string, callback: (this: ISuiteCallbackContext) => void): ISuite; diff --git a/types/mocha/mocha-tests.ts b/types/mocha/mocha-tests.ts index 865f880530..c3fa00da84 100644 --- a/types/mocha/mocha-tests.ts +++ b/types/mocha/mocha-tests.ts @@ -455,9 +455,3 @@ function test_run_withOnComplete() { function test_throwError() { mocha.throwError(new Error("I'm an error!")); } - -function test_runner_fluentParams() { - new MochaDef().run(); // $ExpectType IRunner - new MochaDef().run().on("event-string", function() {}); // $ExpectType IRunner - new MochaDef().run().on(Symbol("event-symbol"), function() {}); // $ExpectType IRunner -} diff --git a/types/webpack-dev-middleware/index.d.ts b/types/webpack-dev-middleware/index.d.ts index 89905d350f..afd1d940a3 100644 --- a/types/webpack-dev-middleware/index.d.ts +++ b/types/webpack-dev-middleware/index.d.ts @@ -5,9 +5,9 @@ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.2 -import { NextHandleFunction } from 'connect'; -import { Logger } from 'loglevel'; import * as webpack from 'webpack'; +import * as loglevel from 'loglevel'; +import { NextHandleFunction } from 'connect'; import MemoryFileSystem = require('memory-fs'); export = WebpackDevMiddleware; @@ -40,6 +40,7 @@ declare namespace WebpackDevMiddleware { log: Logger; } + type Logger = loglevel.Logger; type Reporter = (middlewareOptions: Options, reporterOptions: ReporterOptions) => void; interface WebpackDevMiddleware {