Merge 64c64ff into 2728a31

steven-haddix · Feb 2, 2017 · 49bed94 · 49bed94
2 parents 2728a31 + 64c64ff
commit 49bed94
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
     "redux": "^3.6.0",
     "uuid": "^3.0.0",
     "webpack": "^1.13.3",
-    "webpack-merge": "^1.0.1",
+    "webpack-merge": "^2.6.1",
     "webpack-sources": "^0.1.2"
   },
   "nyc": {

diff --git a/src/webpackUtils.js b/src/webpackUtils.js
@@ -117,7 +117,7 @@ export function generateConfiguration(entries = [], configuration = {}) {
     }
 
     entries.forEach((entry) => {
-        config.entry[entry.key] = entry.file;
+        config.entry[entry.key] = [entry.file];
     })
 
     return config;

diff --git a/tests/webpackUtils.test.js b/tests/webpackUtils.test.js
@@ -136,7 +136,7 @@ test('generateConfiguration', (t) => {
 
     const generatedConfig = generateConfiguration(entries, configuration);
 
-    t.deepEqual(generatedConfig.entry, { key1: 'file1', key2: 'file2' }, 'should add entries to configuration');
+    t.deepEqual(generatedConfig.entry, { key1: ['file1'], key2: ['file2'] }, 'should add entries to configuration');
     t.equal(generatedConfig.module.loaders[1].loader, 'someLoader', 'should merge additional configurations with base configuration');
     t.end()
 })