diff --git a/package-lock.json b/package-lock.json index 5b75cd58b33..b0d085a805a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15231,12 +15231,13 @@ } }, "webpack-merge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz", - "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", + "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", "dev": true, "requires": { - "lodash": "^4.17.15" + "clone-deep": "^4.0.1", + "wildcard": "^2.0.0" } }, "webpack-sources": { diff --git a/package.json b/package.json index 29a700be7de..eea31992588 100644 --- 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 index 8ebb094d87c..2b0e31d06d1 100644 --- 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 index 1f2366fae1a..ad02582f91b 100644 --- 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, {