From 661c43dbeadc6be1bfd4e72bbb47bbf190f3f04b Mon Sep 17 00:00:00 2001
From: Avi Vahl <avi.vahl@wix.com>
Date: Tue, 16 Oct 2018 01:20:36 +0300
Subject: [PATCH] [webpack] avoid recursive import (#29698)

- fix recursive import between `webpack` and `webpack-dev-server`
- `webpack-dev-server` already augments the `webpack.Configuration` interface, so if a user needs that field, he should install @types/webpack-dev-server.
---
 types/webpack/index.d.ts    | 3 ---
 types/webpack/v3/index.d.ts | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index 1aa7f03608..92113449e8 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -25,7 +25,6 @@ import { Tapable, HookMap,
          AsyncParallelBailHook, AsyncParallelHook, AsyncSeriesBailHook, AsyncSeriesHook, AsyncSeriesWaterfallHook } from 'tapable';
 import * as UglifyJS from 'uglify-js';
 import { RawSourceMap } from 'source-map';
-import * as WebpackDevServer from 'webpack-dev-server';
 
 export = webpack;
 
@@ -113,8 +112,6 @@ declare namespace webpack {
         parallelism?: number;
         /** Optimization options */
         optimization?: Options.Optimization;
-        /** A set of options picked up by `webpack-dev-server` to change the dev server's default behavior. */
-        devServer?: WebpackDevServer.Configuration;
     }
 
     interface Entry {
diff --git a/types/webpack/v3/index.d.ts b/types/webpack/v3/index.d.ts
index 72126e056d..79a2d4eed4 100644
--- a/types/webpack/v3/index.d.ts
+++ b/types/webpack/v3/index.d.ts
@@ -20,7 +20,6 @@
 import Tapable = require('tapable');
 import * as UglifyJS from 'uglify-js';
 import { RawSourceMap } from 'source-map';
-import * as WebpackDevServer from 'webpack-dev-server';
 
 export = webpack;
 
@@ -106,8 +105,6 @@ declare namespace webpack {
         performance?: Options.Performance;
         /** Limit the number of parallel processed modules. Can be used to fine tune performance or to get more reliable profiling results */
         parallelism?: number;
-        /** A set of options picked up by `webpack-dev-server` to change the dev server's default behavior. */
-        devServer?: WebpackDevServer.Configuration;
     }
 
     interface Entry {