Update dependencies

insin · Dec 31, 2016 · fc6e550 · fc6e550
1 parent cf43d5e
commit fc6e550
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,11 @@
 
 * The default build for a React component demo app now supports use of a `demo/public/` directory for static content.
 
+**Dependencies:**
+
+- phantomjs-prebuilt: v2.1.14 → [v2.1.14](https://github.com/Medium/phantomjs/releases/tag/2.1.14)
+- webpack-merge: v1.0.2 → [v1.1.0](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md#110--2016-12-09)
+
 # 0.13.8 / 2016-12-31
 
 **Changed:**

diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
     "resolve": "1.1.7",
     "rimraf": "2.5.4",
     "temp": "0.8.3",
-    "webpack-merge": "1.0.2",
+    "webpack-merge": "1.1.0",
     "whatwg-fetch": "2.0.1",
 
     "babel-cli": "6.18.0",
@@ -91,7 +91,7 @@
     "karma-phantomjs-launcher": "1.0.2",
     "karma-sourcemap-loader": "0.3.7",
     "karma-webpack": "1.8.0",
-    "phantomjs-prebuilt": "2.1.13",
+    "phantomjs-prebuilt": "2.1.14",
 
     "mocha": "3.2.0",
     "expect": "1.20.2",

diff --git a/src/createWebpackConfig.js b/src/createWebpackConfig.js
@@ -575,7 +575,9 @@ export function getCompatConfig(userCompatConfig = {}) {
     }
     configs.push(compatConfig)
   })
-  return configs.length > 0 ? merge(...configs) : null
+  if (configs.length === 0) return null
+  if (configs.length === 1) return {...configs[0]}
+  return merge(...configs)
 }
 
 /**

diff --git a/tests/createWebpackConfig-test.js b/tests/createWebpackConfig-test.js
@@ -372,4 +372,8 @@ describe('getCompatConfig()', () => {
   it('supports sinon', () => {
     expect(getCompatConfig({sinon: true})).toEqual(COMPAT_CONFIGS.sinon)
   })
+  it('merges multiple compat configs ', () => {
+    expect(getCompatConfig({enzyme: true, sinon: true}))
+      .toEqual({...COMPAT_CONFIGS.enzyme, ...COMPAT_CONFIGS.sinon})
+  })
 })