chore: reworking the deps a little more

Signed-off-by: blam <ben@blam.sh>

packages/cli/package.json

@@ -110,7 +110,7 @@
     "url-loader": "^4.1.0",
     "util": "^0.12.3",
     "webpack": "^5.0.0",
-    "webpack-dev-server": "4.0.0-beta.3",
+    "webpack-dev-server": "4.0.0-rc.0",
     "webpack-node-externals": "^3.0.0",
     "yaml": "^1.10.0",
     "yaml-jest": "^1.0.5",

packages/cli/src/lib/bundler/server.ts

@@ -62,7 +62,7 @@ export async function serveBundle(options: ServeOptions) {
     port,
     proxy: pkg.proxy,
     // When the dev server is behind a proxy, the host and public hostname differ
-    firewall: [url.hostname],
+    allowedHosts: [url.hostname],
   });
 
   await new Promise<void>((resolve, reject) => {

packages/cli/src/types.d.ts

@@ -258,9 +258,23 @@ declare module 'webpack-node-externals' {
     }
   }
 }
+
+// local webpack.d.ts
+import * as webpack from 'webpack';
+
+declare module 'webpack' {
+  namespace loader {
+    // Stub to avoid compiler error in ts-loader types.
+    interface LoaderContext {}
+  }
+
+  namespace Stats {
+    // Work-around for https://github.com/DefinitelyTyped/DefinitelyTyped/pull/50802
+    type ToJsonOptions = Parameters<webpack.Stats['toJson']>[0];
+  }
+}
 declare module 'webpack-dev-server' {
   declare namespace WebpackDevServer {
-    import webpack = require('webpack');
     import httpProxyMiddleware = require('http-proxy-middleware');
     import express = require('express');
     import serveStatic = require('serve-static');
@@ -604,17 +618,6 @@ declare module 'webpack-dev-server' {
       writeToDisk?: boolean | ((filePath: string) => boolean);
     }
   }
-
-  declare module 'webpack' {
-    interface Configuration {
-      /**
-       * Can be used to configure the behaviour of webpack-dev-server when
-       * the webpack config is passed to webpack-dev-server CLI.
-       */
-      devServer?: WebpackDevServer.Configuration;
-    }
-  }
-
   declare class WebpackDevServer {
     listeningApp: WebpackDevServer.ListeningApp;
     sockets: NodeJS.EventEmitter[];