diff --git a/.pnp.cjs b/.pnp.cjs index 841fa6ae..89924360 100644 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -44,7 +44,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["webpack-bundle-analyzer", "npm:4.9.0"],\ ["webpack-cli", "virtual:fb8801c92f00dd6667e99783f87b2e06c1c6c50f0595efcce728769d09c4c45fedb4b7f07b30ada4bba6b9ae92f0709c7cb65194b0fb97aa71ba7eb48c132ee3#npm:5.1.4"],\ ["webpack-dev-server", "virtual:fb8801c92f00dd6667e99783f87b2e06c1c6c50f0595efcce728769d09c4c45fedb4b7f07b30ada4bba6b9ae92f0709c7cb65194b0fb97aa71ba7eb48c132ee3#npm:4.15.1"],\ - ["webpack-merge", "npm:5.9.0"]\ + ["webpack-merge", "npm:5.10.0"]\ ],\ "linkType": "SOFT"\ }]\ @@ -154,7 +154,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["webpack-bundle-analyzer", "npm:4.9.0"],\ ["webpack-cli", "virtual:fb8801c92f00dd6667e99783f87b2e06c1c6c50f0595efcce728769d09c4c45fedb4b7f07b30ada4bba6b9ae92f0709c7cb65194b0fb97aa71ba7eb48c132ee3#npm:5.1.4"],\ ["webpack-dev-server", "virtual:fb8801c92f00dd6667e99783f87b2e06c1c6c50f0595efcce728769d09c4c45fedb4b7f07b30ada4bba6b9ae92f0709c7cb65194b0fb97aa71ba7eb48c132ee3#npm:4.15.1"],\ - ["webpack-merge", "npm:5.9.0"]\ + ["webpack-merge", "npm:5.10.0"]\ ],\ "linkType": "SOFT"\ }]\ @@ -3723,6 +3723,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["flat", [\ + ["npm:5.0.2", {\ + "packageLocation": "./.yarn/cache/flat-npm-5.0.2-12748102a5-12a1536ac7.zip/node_modules/flat/",\ + "packageDependencies": [\ + ["flat", "npm:5.0.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["follow-redirects", [\ ["npm:1.15.2", {\ "packageLocation": "./.yarn/cache/follow-redirects-npm-1.15.2-1ec1dd82be-faa66059b6.zip/node_modules/follow-redirects/",\ @@ -8720,19 +8729,20 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["webpack-merge", [\ - ["npm:5.8.0", {\ - "packageLocation": "./.yarn/cache/webpack-merge-npm-5.8.0-e3c95fdc3c-88786ab910.zip/node_modules/webpack-merge/",\ + ["npm:5.10.0", {\ + "packageLocation": "./.yarn/cache/webpack-merge-npm-5.10.0-c2d9fd1f83-1fe8bf5309.zip/node_modules/webpack-merge/",\ "packageDependencies": [\ - ["webpack-merge", "npm:5.8.0"],\ + ["webpack-merge", "npm:5.10.0"],\ ["clone-deep", "npm:4.0.1"],\ + ["flat", "npm:5.0.2"],\ ["wildcard", "npm:2.0.0"]\ ],\ "linkType": "HARD"\ }],\ - ["npm:5.9.0", {\ - "packageLocation": "./.yarn/cache/webpack-merge-npm-5.9.0-9110e650de-64fe2c23aa.zip/node_modules/webpack-merge/",\ + ["npm:5.8.0", {\ + "packageLocation": "./.yarn/cache/webpack-merge-npm-5.8.0-e3c95fdc3c-88786ab910.zip/node_modules/webpack-merge/",\ "packageDependencies": [\ - ["webpack-merge", "npm:5.9.0"],\ + ["webpack-merge", "npm:5.8.0"],\ ["clone-deep", "npm:4.0.1"],\ ["wildcard", "npm:2.0.0"]\ ],\ diff --git a/.yarn/cache/flat-npm-5.0.2-12748102a5-12a1536ac7.zip b/.yarn/cache/flat-npm-5.0.2-12748102a5-12a1536ac7.zip new file mode 100644 index 00000000..e3295fae Binary files /dev/null and b/.yarn/cache/flat-npm-5.0.2-12748102a5-12a1536ac7.zip differ diff --git a/.yarn/cache/webpack-merge-npm-5.10.0-c2d9fd1f83-1fe8bf5309.zip b/.yarn/cache/webpack-merge-npm-5.10.0-c2d9fd1f83-1fe8bf5309.zip new file mode 100644 index 00000000..d56a0ad1 Binary files /dev/null and b/.yarn/cache/webpack-merge-npm-5.10.0-c2d9fd1f83-1fe8bf5309.zip differ diff --git a/.yarn/cache/webpack-merge-npm-5.9.0-9110e650de-64fe2c23aa.zip b/.yarn/cache/webpack-merge-npm-5.9.0-9110e650de-64fe2c23aa.zip deleted file mode 100644 index ae49abb0..00000000 Binary files a/.yarn/cache/webpack-merge-npm-5.9.0-9110e650de-64fe2c23aa.zip and /dev/null differ diff --git a/package.json b/package.json index 9ed9d03b..ced6c406 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "webpack-bundle-analyzer": "4.9.0", "webpack-cli": "5.1.4", "webpack-dev-server": "^4.11.1", - "webpack-merge": "5.9.0" + "webpack-merge": "5.10.0" }, "packageManager": "yarn@3.4.1" } diff --git a/yarn.lock b/yarn.lock index 12cdc490..74f77e08 100644 --- a/yarn.lock +++ b/yarn.lock @@ -102,7 +102,7 @@ __metadata: webpack-bundle-analyzer: 4.9.0 webpack-cli: 5.1.4 webpack-dev-server: ^4.11.1 - webpack-merge: 5.9.0 + webpack-merge: 5.10.0 languageName: unknown linkType: soft @@ -3138,6 +3138,15 @@ __metadata: languageName: node linkType: hard +"flat@npm:^5.0.2": + version: 5.0.2 + resolution: "flat@npm:5.0.2" + bin: + flat: cli.js + checksum: 12a1536ac746db74881316a181499a78ef953632ddd28050b7a3a43c62ef5462e3357c8c29d76072bb635f147f7a9a1f0c02efef6b4be28f8db62ceb3d5c7f5d + languageName: node + linkType: hard + "follow-redirects@npm:^1.0.0": version: 1.15.2 resolution: "follow-redirects@npm:1.15.2" @@ -7497,13 +7506,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:5.10.0": + version: 5.10.0 + resolution: "webpack-merge@npm:5.10.0" dependencies: clone-deep: ^4.0.1 + flat: ^5.0.2 wildcard: ^2.0.0 - checksum: 64fe2c23aacc5f19684452a0e84ec02c46b990423aee6fcc5c18d7d471155bd14e9a6adb02bd3656eb3e0ac2532c8e97d69412ad14c97eeafe32fa6d10050872 + checksum: 1fe8bf5309add7298e1ac72fb3f2090e1dfa80c48c7e79fa48aa60b5961332c7d0d61efa8851acb805e6b91a4584537a347bc106e05e9aec87fa4f7088c62f2f languageName: node linkType: hard