fix: multiple entries, add autoConfigure option (#58)

* fix: multicompiler entries, add autoConfigure option

* docs: add autoConfigure docs

Author: shellscape

README.md

@@ -102,6 +102,14 @@ Returns an `Object` containing:
 
 Type: `Object`
 
+##### autoConfigure
+
+Type: `Boolean`  
+Default: `true`
+
+If true, automatically configures the `entry` for the webpack compiler, and adds
+the `HotModuleReplacementPlugin` to the compiler.
+
 ##### host
 
 Type: `String|Object`  
@@ -258,4 +266,4 @@ We welcome your contributions! Please have a read of [CONTRIBUTING.md](CONTRIBUT
 [dev-server]: https://github.com/webpack/webpack-dev-server
 [hmr-docs]: https://webpack.js.org/concepts/hot-module-replacement/
 [stats]: https://webpack.js.org/configuration/stats/#stats
-[levels]: https://github.com/webpack-contrib/webpack-log#level
+[levels]: https://github.com/webpack-contrib/webpack-log#level

index.js

@@ -7,6 +7,7 @@ const HotClientError = require('./lib/HotClientError');
 const { modifyCompiler, payload, sendData, validateCompiler } = require('./lib/util');
 
 const defaults = {
+  autoConfigure: true,
   host: 'localhost',
   hot: true,
   https: false,
@@ -60,7 +61,9 @@ module.exports = (compiler, opts) => {
     log.warn('`options.host.client` does not match `options.host.server`. This can cause unpredictable behavior in the browser.');
   }
 
-  validateCompiler(compiler);
+  if (options.autoConfigure) {
+    validateCompiler(compiler);
+  }
 
   const { host, port, server } = options;
   const wssOptions = options.server ? { server } : { host: host.server, port };
@@ -93,7 +96,9 @@ module.exports = (compiler, opts) => {
     options.webSocket = { host: host.client, port };
   }
 
-  modifyCompiler(compiler, options);
+  if (options.autoConfigure) {
+    modifyCompiler(compiler, options);
+  }
 
   const compile = (comp) => {
     const compilerName = comp.name || '<unnamed compiler>';
@@ -176,7 +181,9 @@ module.exports = (compiler, opts) => {
       }
     });
 
-    if (stats) {
+    // only send stats to newly connected clients if no previous clients have
+    // connected
+    if (stats && !wss.clients.length) {
       const jsonStats = stats.toJson(options.stats);
 
       /* istanbul ignore if */

lib/util.js

@@ -11,12 +11,8 @@ function addEntry(entry, compilerName) {
   let newEntry = {};
 
   if (!Array.isArray(entry) && typeof entry === 'object') {
-    for (const key of Object.keys(entry)) {
-      const value = entry[key];
-      if (Array.isArray(value)) {
-        newEntry[key] = clientEntry.concat(value);
-      }
-    }
+    const [first] = Object.keys(entry);
+    newEntry[first] = clientEntry.concat(entry[first]);
   } else {
     newEntry = clientEntry.concat(entry);
   }

package-lock.json

@@ -46,12 +46,13 @@
     "@babel/preset-env": "^7.0.0-beta.37",
     "@babel/register": "^7.0.0-beta.37",
     "ansi-regex": "^3.0.0",
-    "assert": "^1.4.1",
     "babel-loader": "^8.0.0-beta.0",
     "codecov": "^3.0.0",
     "eslint": "^4.6.1",
     "eslint-config-webpack": "^1.2.5",
     "eslint-plugin-import": "^2.8.0",
+    "expect": "^22.4.3",
+    "loud-rejection": "^1.6.0",
     "memory-fs": "^0.4.1",
     "mocha": "^5.0.0",
     "nyc": "^11.4.1",

package.json

@@ -16,5 +16,10 @@ if (parseInt(process.version.substring(1), 10) < 8) {
   });
 }
 
+require('loud-rejection/register');
+
+global.expect = require('expect');
+
 require('./tests/init');
+require('./tests/options');
 require('./tests/sockets');