diff --git a/package.json b/package.json index 0c8640d..26ef07b 100644 --- a/package.json +++ b/package.json @@ -215,7 +215,7 @@ "web-worker": "^1.3.0", "webpack": "5.88.2", "webpack-cli": "5.1.4", - "webpack-merge": "5.9.0", + "webpack-merge": "6.0.1", "webpack-permissions-plugin": "^1.0.9" }, "resolutions": { diff --git a/yarn.lock b/yarn.lock index 34a1aba..5fd6cba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8925,7 +8925,7 @@ __metadata: web-worker: "npm:^1.3.0" webpack: "npm:5.88.2" webpack-cli: "npm:5.1.4" - webpack-merge: "npm:5.9.0" + webpack-merge: "npm:6.0.1" webpack-permissions-plugin: "npm:^1.0.9" languageName: unknown linkType: soft @@ -9029,13 +9029,14 @@ __metadata: languageName: node linkType: hard -"webpack-merge@npm:5.9.0": - version: 5.9.0 - resolution: "webpack-merge@npm:5.9.0" +"webpack-merge@npm:6.0.1": + version: 6.0.1 + resolution: "webpack-merge@npm:6.0.1" dependencies: clone-deep: "npm:^4.0.1" - wildcard: "npm:^2.0.0" - checksum: 10/d23dd1f0bad0b9821bf58443d2d29097d65cd9353046c2d8a6d7b57877ec19cf64be57cc7ef2a371a15cf9264fe6eaf8dea4015dc87487e664ffab2a28329d56 + flat: "npm:^5.0.2" + wildcard: "npm:^2.0.1" + checksum: 10/39ab911c26237922295d9b3d0617c8ea0c438c35a3b21b05506616a10423f5ece1962bccbedec932c5db61af57999b6d055d56d1f1755c63e2701bd4a55c3887 languageName: node linkType: hard @@ -9135,7 +9136,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