Update webpack-merge

michael9dk · Jun 15, 2021 · 60d0e1f · 60d0e1f
1 parent 8c23911
commit 60d0e1f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "webpack": "^5.39.0",
     "webpack-cli": "^4.7.2",
     "webpack-dev-server": "^3.11.2",
-    "webpack-merge": "^4.2.2",
+    "webpack-merge": "^5.8.0",
     "workbox-webpack-plugin": "^6.1.5",
     "worker-plugin": "^5.0.1"
   },

diff --git a/webpack.dev.js b/webpack.dev.js
@@ -1,6 +1,6 @@
 const path = require('path');
 const common = require('./webpack.common');
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 
 module.exports = merge(common, {
     // In order for live reload to work we must use "web" as the target not "browserlist"

diff --git a/webpack.prod.js b/webpack.prod.js
@@ -1,6 +1,6 @@
 const path = require('path');
 const common = require('./webpack.common');
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const WorkboxPlugin = require('workbox-webpack-plugin');
 
 module.exports = merge(common, {