diff --git a/package-lock.json b/package-lock.json index a2f56169868..d6f54cf4c9a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28489,7 +28489,7 @@ "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-dev-server": "5.2.0", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "engines": { "node": ">=18" @@ -28498,6 +28498,20 @@ "@opentelemetry/api": "^1.3.0" } }, + "selenium-tests/node_modules/webpack-merge": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-6.0.1.tgz", + "integrity": "sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==", + "dev": true, + "dependencies": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.1" + }, + "engines": { + "node": ">=18.0.0" + } + }, "semantic-conventions": { "name": "@opentelemetry/semantic-conventions", "version": "1.28.0", @@ -32601,8 +32615,21 @@ "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-dev-server": "5.2.0", - "webpack-merge": "5.10.0", + "webpack-merge": "6.0.1", "zone.js": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^0.14.0 || ^0.15.0" + }, + "dependencies": { + "webpack-merge": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-6.0.1.tgz", + "integrity": "sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==", + "dev": true, + "requires": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.1" + } + } } }, "@opentelemetry/semantic-conventions": { diff --git a/selenium-tests/package.json b/selenium-tests/package.json index ce890a8ca1d..5ca6d66c403 100644 --- a/selenium-tests/package.json +++ b/selenium-tests/package.json @@ -51,7 +51,7 @@ "webpack": "5.96.1", "webpack-cli": "5.1.4", "webpack-dev-server": "5.2.0", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0"