diff --git a/package-lock.json b/package-lock.json index 3816075a0..ae1c4b253 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ "html-webpack-plugin": "4.5.0", "mini-css-extract-plugin": "0.11.2", "webpack": "^5.0.0", - "webpack-merge": "5.4.0" + "webpack-merge": "5.10.0" } }, "node_modules/@adobe/css-tools": { @@ -4734,18 +4734,6 @@ "node": ">=10" } }, - "node_modules/@openedx/frontend-build/node_modules/webpack-merge": { - "version": "5.10.0", - "license": "MIT", - "dependencies": { - "clone-deep": "^4.0.1", - "flat": "^5.0.2", - "wildcard": "^2.0.0" - }, - "engines": { - "node": ">=10.0.0" - } - }, "node_modules/@openedx/paragon": { "version": "21.13.1", "license": "Apache-2.0", @@ -21875,18 +21863,6 @@ "node": ">=14" } }, - "node_modules/webpack-cli/node_modules/webpack-merge": { - "version": "5.10.0", - "license": "MIT", - "dependencies": { - "clone-deep": "^4.0.1", - "flat": "^5.0.2", - "wildcard": "^2.0.0" - }, - "engines": { - "node": ">=10.0.0" - } - }, "node_modules/webpack-dev-middleware": { "version": "5.3.4", "license": "MIT", @@ -22091,11 +22067,13 @@ } }, "node_modules/webpack-merge": { - "version": "5.4.0", + "version": "5.10.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz", + "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==", "license": "MIT", - "peer": true, "dependencies": { "clone-deep": "^4.0.1", + "flat": "^5.0.2", "wildcard": "^2.0.0" }, "engines": { diff --git a/package.json b/package.json index 398475ade..7ac1eb155 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "html-webpack-plugin": "4.5.0", "mini-css-extract-plugin": "0.11.2", "webpack": "^5.0.0", - "webpack-merge": "5.4.0" + "webpack-merge": "5.10.0" }, "devDependencies": { "@edx/browserslist-config": "1.0.0",