From 6b2b0d3b3810c1cbfc4ff021429caccfa7e5f717 Mon Sep 17 00:00:00 2001
From: Renovate Bot
Date: Fri, 12 Feb 2021 21:35:47 +0000
Subject: Update dependency webpack-merge to v5
Signed-off-by: Renovate Bot <bot@renovateapp.com>
---
package.json | 2 +-
yarn.lock | 9 +--------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/package.json b/package.json
index 46ea2fff..11c88416 100644
--- a/package.json
+++ b/package.json
@@ -202,7 +202,7 @@
"url-loader": "4.1.1",
"webpack": "4.46.0",
"webpack-cli": "4.5.0",
- "webpack-merge": "4.2.2"
+ "webpack-merge": "5.7.3"
},
"optionalDependencies": {
"bufferutil": "^4.0.0",
diff --git a/yarn.lock b/yarn.lock
index d1a26697..38e38434 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11506,14 +11506,7 @@ webpack-cli@4.5.0:
v8-compile-cache "^2.2.0"
webpack-merge "^5.7.3"
-webpack-merge@4.2.2:
- version "4.2.2"
- resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d"
- integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==
- dependencies:
- lodash "^4.17.15"
-
-webpack-merge@^5.7.3:
+webpack-merge@5.7.3, webpack-merge@^5.7.3:
version "5.7.3"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz#2a0754e1877a25a8bbab3d2475ca70a052708213"
integrity sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==
--
cgit v1.2.3
From 87909b599e08a2361173c3a8717927da51e1aec3 Mon Sep 17 00:00:00 2001
From: David Mehren
Date: Fri, 12 Feb 2021 22:43:31 +0100
Subject: Use named import for webpack-merge
Signed-off-by: David Mehren <git@herrmehren.de>
---
webpack.dev.js | 2 +-
webpack.prod.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/webpack.dev.js b/webpack.dev.js
index 0e84f7a4..7c7edb61 100644
--- a/webpack.dev.js
+++ b/webpack.dev.js
@@ -1,6 +1,6 @@
const common = require('./webpack.common.js')
const htmlexport = require('./webpack.htmlexport')
-const merge = require('webpack-merge')
+const { merge } = require('webpack-merge');
module.exports = [
// merge common config
diff --git a/webpack.prod.js b/webpack.prod.js
index 4dfac1a8..5c523c06 100644
--- a/webpack.prod.js
+++ b/webpack.prod.js
@@ -1,6 +1,6 @@
const common = require('./webpack.common.js')
const htmlexport = require('./webpack.htmlexport')
-const merge = require('webpack-merge')
+const { merge } = require('webpack-merge');
const path = require('path')
const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin')
--
cgit v1.2.3