From 65993d5e6f057f1d93c5a5f13ea1551bfdd3d19f Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Wed, 7 Feb 2018 12:33:20 +0100 Subject: [PATCH 1/4] feat: add missing `addDevServerEntrypoints` in `API` --- types/webpack-dev-server/index.d.ts | 4 ++++ .../webpack-dev-server-tests.ts | 21 ++++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/types/webpack-dev-server/index.d.ts b/types/webpack-dev-server/index.d.ts index 797ae437dc..c969dc9506 100644 --- a/types/webpack-dev-server/index.d.ts +++ b/types/webpack-dev-server/index.d.ts @@ -15,6 +15,10 @@ import * as spdy from 'spdy'; import * as httpProxyMiddleware from 'http-proxy-middleware'; declare namespace WebpackDevServer { + type ListeningApp = { address(): { port?: number } }; + + function addDevServerEntrypoints(webpack: webpack.Compiler | webpack.MultiCompiler, config: WebpackDevServer.Configuration, listeningApp?: ListeningApp): void + interface proxyConfigMap { [url: string]: string | httpProxyMiddleware.Config; } diff --git a/types/webpack-dev-server/webpack-dev-server-tests.ts b/types/webpack-dev-server/webpack-dev-server-tests.ts index a288ea51be..eee626ecec 100644 --- a/types/webpack-dev-server/webpack-dev-server-tests.ts +++ b/types/webpack-dev-server/webpack-dev-server-tests.ts @@ -75,7 +75,7 @@ const config: WebpackDevServer.Configuration = { // API example server = new WebpackDevServer(compiler, config); -server.listen(8080, "localhost", () => {}); +server.listen(8080, "localhost", () => { }); // HTTPS example server = new WebpackDevServer(compiler, { @@ -83,10 +83,25 @@ server = new WebpackDevServer(compiler, { https: true }); -server.listen(8080, "localhost", () => {}); +server.listen(8080, "localhost", () => { }); server.close(); -// multiple compilers +WebpackDevServer.addDevServerEntrypoints(compiler, { + publicPath: "/assets/", + https: true +}); +WebpackDevServer.addDevServerEntrypoints( + compiler, + { + publicPath: "/assets/", + https: true + }, + { + address: () => ({ port: 80 }) + } +); + +// multiple compilers server = new WebpackDevServer(multipleCompiler, config); From a418bdb31a70d01dbf10983f6d14ee9e29ac172e Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Wed, 7 Feb 2018 12:46:14 +0100 Subject: [PATCH 2/4] style(webpack-dev-server): fix lint issues --- types/webpack-dev-server/index.d.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/types/webpack-dev-server/index.d.ts b/types/webpack-dev-server/index.d.ts index c969dc9506..c07a2ec997 100644 --- a/types/webpack-dev-server/index.d.ts +++ b/types/webpack-dev-server/index.d.ts @@ -15,9 +15,11 @@ import * as spdy from 'spdy'; import * as httpProxyMiddleware from 'http-proxy-middleware'; declare namespace WebpackDevServer { - type ListeningApp = { address(): { port?: number } }; + interface ListeningApp { + address(): { port?: number }; + } - function addDevServerEntrypoints(webpack: webpack.Compiler | webpack.MultiCompiler, config: WebpackDevServer.Configuration, listeningApp?: ListeningApp): void + function addDevServerEntrypoints(webpack: webpack.Compiler | webpack.MultiCompiler, config: Configuration, listeningApp?: ListeningApp): void; interface proxyConfigMap { [url: string]: string | httpProxyMiddleware.Config; From 4b5437ecd413a12ee07eced426f4198c6a13c183 Mon Sep 17 00:00:00 2001 From: Alan Date: Wed, 14 Feb 2018 09:06:10 +0100 Subject: [PATCH 3/4] webpack-dev-server: move `addDevServerEntrypoints` in class and mark it as static --- types/webpack-dev-server/index.d.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/types/webpack-dev-server/index.d.ts b/types/webpack-dev-server/index.d.ts index c07a2ec997..31d5b42891 100644 --- a/types/webpack-dev-server/index.d.ts +++ b/types/webpack-dev-server/index.d.ts @@ -19,8 +19,6 @@ declare namespace WebpackDevServer { address(): { port?: number }; } - function addDevServerEntrypoints(webpack: webpack.Compiler | webpack.MultiCompiler, config: Configuration, listeningApp?: ListeningApp): void; - interface proxyConfigMap { [url: string]: string | httpProxyMiddleware.Config; } @@ -82,6 +80,12 @@ declare class WebpackDevServer { config: WebpackDevServer.Configuration ); + static addDevServerEntrypoints( + webpack: webpack.Compiler | webpack.MultiCompiler, + config: WebpackDevServer.Configuration, + listeningApp?: WebpackDevServer.ListeningApp + ): void; + listen(port: number, hostname: string, callback?: (error?: Error) => void): http.Server; listen(port: number, callback?: (error?: Error) => void): http.Server; From a6aea3ab811f6c41caa87f7d7d22ebe79a0ba52a Mon Sep 17 00:00:00 2001 From: Alan Date: Wed, 14 Feb 2018 09:23:21 +0100 Subject: [PATCH 4/4] webpack dev server: `addDevServerEntrypoints` change options types --- types/webpack-dev-server/index.d.ts | 2 +- types/webpack-dev-server/webpack-dev-server-tests.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/types/webpack-dev-server/index.d.ts b/types/webpack-dev-server/index.d.ts index 31d5b42891..c6bab12c3b 100644 --- a/types/webpack-dev-server/index.d.ts +++ b/types/webpack-dev-server/index.d.ts @@ -81,7 +81,7 @@ declare class WebpackDevServer { ); static addDevServerEntrypoints( - webpack: webpack.Compiler | webpack.MultiCompiler, + webpackOptions: webpack.Configuration | webpack.Configuration[], config: WebpackDevServer.Configuration, listeningApp?: WebpackDevServer.ListeningApp ): void; diff --git a/types/webpack-dev-server/webpack-dev-server-tests.ts b/types/webpack-dev-server/webpack-dev-server-tests.ts index eee626ecec..5a23a60ad7 100644 --- a/types/webpack-dev-server/webpack-dev-server-tests.ts +++ b/types/webpack-dev-server/webpack-dev-server-tests.ts @@ -87,13 +87,13 @@ server.listen(8080, "localhost", () => { }); server.close(); -WebpackDevServer.addDevServerEntrypoints(compiler, { +WebpackDevServer.addDevServerEntrypoints(config, { publicPath: "/assets/", https: true }); WebpackDevServer.addDevServerEntrypoints( - compiler, + [config], { publicPath: "/assets/", https: true