Avoid exceptions in empty config

neutrinojs · Feb 9, 2017 · ab46ee0 · ab46ee0
1 parent 5c6a65b
commit ab46ee0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webpack-chain",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "main": "src/Config.js",
   "repository": "mozilla-rpweb/webpack-chain",
   "keywords": [

diff --git a/src/Config.js b/src/Config.js
@@ -57,15 +57,15 @@ module.exports = class {
 
   toConfig() {
     const entries = this.entries.entries();
-    const config = Object.assign(this.options.entries(), {
+    const config = Object.assign({}, this.options.entries(), {
       node: this.node.entries(),
       output: this.output.entries(),
       resolve: this.resolve.toConfig(),
       resolveLoader: this.resolveLoader.toConfig(),
       devServer: this.devServer.entries(),
       plugins: this.plugins.values().map(value => value.init(value.plugin, value.args)),
       module: this.module.toConfig(),
-      entry: Object
+      entry: entries && Object
         .keys(entries)
         .reduce((acc, key) => {
           acc[key] = entries[key].values();