diff --git a/tools/cli/package.json b/tools/cli/package.json index 151fe34dc5..2452cc28fc 100644 --- a/tools/cli/package.json +++ b/tools/cli/package.json @@ -39,7 +39,7 @@ "webpack": "^5.91.0", "webpack-cli": "^5.1.4", "webpack-dev-server": "^5.0.4", - "webpack-merge": "^5.10.0" + "webpack-merge": "^6.0.0" }, "scripts": { "build": "node --loader ts-node/esm/transpile-only.mjs ./src/bin/build.ts", diff --git a/yarn.lock b/yarn.lock index 6be4e7a88b..fdf35bfb75 100644 --- a/yarn.lock +++ b/yarn.lock @@ -259,7 +259,7 @@ __metadata: webpack: "npm:^5.91.0" webpack-cli: "npm:^5.1.4" webpack-dev-server: "npm:^5.0.4" - webpack-merge: "npm:^5.10.0" + webpack-merge: "npm:^6.0.0" languageName: unknown linkType: soft @@ -39133,7 +39133,7 @@ __metadata: languageName: node linkType: hard -"webpack-merge@npm:^5.10.0, webpack-merge@npm:^5.7.3": +"webpack-merge@npm:^5.7.3": version: 5.10.0 resolution: "webpack-merge@npm:5.10.0" dependencies: @@ -39144,6 +39144,17 @@ __metadata: languageName: node linkType: hard +"webpack-merge@npm:^6.0.0": + version: 6.0.1 + resolution: "webpack-merge@npm:6.0.1" + dependencies: + clone-deep: "npm:^4.0.1" + flat: "npm:^5.0.2" + wildcard: "npm:^2.0.1" + checksum: 10/39ab911c26237922295d9b3d0617c8ea0c438c35a3b21b05506616a10423f5ece1962bccbedec932c5db61af57999b6d055d56d1f1755c63e2701bd4a55c3887 + languageName: node + linkType: hard + "webpack-sources@npm:^3.2.3": version: 3.2.3 resolution: "webpack-sources@npm:3.2.3" @@ -39330,7 +39341,7 @@ __metadata: languageName: node linkType: hard -"wildcard@npm:^2.0.0": +"wildcard@npm:^2.0.0, wildcard@npm:^2.0.1": version: 2.0.1 resolution: "wildcard@npm:2.0.1" checksum: 10/e0c60a12a219e4b12065d1199802d81c27b841ed6ad6d9d28240980c73ceec6f856771d575af367cbec2982d9ae7838759168b551776577f155044f5a5ba843c