fix: use webpack-merge instead of merge

codymikol · Dec 10, 2018 · 238744d · 238744d
1 parent 048f6ee
commit 238744d
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 70 deletions.
diff --git a/lib/KarmaWebpackController.js b/lib/KarmaWebpackController.js
@@ -5,7 +5,7 @@ const fs = require('fs');
 const os = require('os');
 
 const webpack = require('webpack');
-const merge = require('merge');
+const merge = require('webpack-merge');
 
 class KarmaSyncPlugin {
   constructor(options) {
@@ -118,8 +118,7 @@ class KarmaWebpackController {
   }
 
   updateWebpackOptions(newOptions) {
-    this.__webpackOptions = merge.recursive(
-      true,
+    this.__webpackOptions = merge(
       this.__webpackOptions,
       newOptions
     );

diff --git a/package-lock.json b/package-lock.json