From ab61e375d260d644575c762eaca2e7372ec2c2f7 Mon Sep 17 00:00:00 2001 From: ScriptedAlchemy Date: Sat, 6 Jul 2024 19:53:31 -0700 Subject: [PATCH] chore(deps): update dependency webpack-merge to v6 --- apollo-client/app1/package.json | 2 +- apollo-client/app2/package.json | 2 +- .../expose-css-module/package.json | 2 +- .../expose-apps/expose-css/package.json | 2 +- .../expose-apps/expose-jss/package.json | 2 +- .../expose-apps/expose-less/package.json | 2 +- .../expose-apps/expose-scss/package.json | 2 +- .../expose-styled-component/package.json | 2 +- .../expose-tailwind-css/package.json | 2 +- .../shell-apps/css-jss/package.json | 2 +- .../shell-apps/css-scss/package.json | 2 +- .../package.json | 2 +- .../jss-styled-components/package.json | 2 +- .../shell-apps/less-scss/package.json | 2 +- .../shell-apps/scss-tailwind-css/package.json | 2 +- loadable-react-16/app1/package.json | 2 +- loadable-react-16/app2/package.json | 2 +- loadable-react-18/app1/package.json | 2 +- loadable-react-18/app2/package.json | 2 +- pnpm-lock.yaml | 169 +++++++++--------- react-16-17-18-ssr/remote1/package.json | 2 +- react-16-17-18-ssr/remote2/package.json | 2 +- react-16-17-18-ssr/shell/package.json | 2 +- react-18-code-splitting/app1/package.json | 2 +- react-18-code-splitting/app2/package.json | 2 +- react-18-server-2-server/app1/package.json | 2 +- react-18-server-2-server/app2/package.json | 2 +- react-18-ssr/remote1/package.json | 2 +- react-18-ssr/remote2/package.json | 2 +- react-18-ssr/shell/package.json | 2 +- .../remote-router/host/package.json | 2 +- runtime-plugins/remote-router/pnpm-lock.yaml | 13 +- server-side-rendering/remote1/package.json | 2 +- server-side-rendering/remote2/package.json | 2 +- server-side-rendering/shell/package.json | 2 +- styled-components/app1/package.json | 2 +- styled-components/app2/package.json | 2 +- .../packages/host/package.json | 2 +- .../packages/remote/package.json | 2 +- .../packages/app1/package.json | 2 +- .../packages/app2/package.json | 2 +- .../packages/host/package.json | 2 +- 42 files changed, 140 insertions(+), 122 deletions(-) diff --git a/apollo-client/app1/package.json b/apollo-client/app1/package.json index 867cf40c44..bea3a226e4 100644 --- a/apollo-client/app1/package.json +++ b/apollo-client/app1/package.json @@ -41,7 +41,7 @@ "rimraf": "5.0.8", "webpack": "5.92.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0", + "webpack-merge": "6.0.1", "@rspack/core": "0.7.5", "@rspack/cli": "0.7.5", "@rspack/dev-server": "0.7.5" diff --git a/apollo-client/app2/package.json b/apollo-client/app2/package.json index f88e6c0b53..305a67f4cb 100644 --- a/apollo-client/app2/package.json +++ b/apollo-client/app2/package.json @@ -41,7 +41,7 @@ "rimraf": "5.0.8", "webpack": "5.92.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0", + "webpack-merge": "6.0.1", "@rspack/core": "0.7.5", "@rspack/cli": "0.7.5", "@rspack/dev-server": "0.7.5" diff --git a/federated-css-react-ssr/expose-apps/expose-css-module/package.json b/federated-css-react-ssr/expose-apps/expose-css-module/package.json index cc12c1de9b..b8b8e71317 100644 --- a/federated-css-react-ssr/expose-apps/expose-css-module/package.json +++ b/federated-css-react-ssr/expose-apps/expose-css-module/package.json @@ -24,7 +24,7 @@ "react-helmet": "6.1.0", "isomorphic-style-loader": "5.3.2", "css-loader": "7.1.2", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "dependencies": { "@babel/runtime": "^7.13.10", diff --git a/federated-css-react-ssr/expose-apps/expose-css/package.json b/federated-css-react-ssr/expose-apps/expose-css/package.json index 4b64883af2..945ca27c98 100644 --- a/federated-css-react-ssr/expose-apps/expose-css/package.json +++ b/federated-css-react-ssr/expose-apps/expose-css/package.json @@ -24,7 +24,7 @@ "webpack-dev-server": "5.0.4", "react-helmet": "6.1.0", "isomorphic-style-loader": "5.3.2", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "dependencies": { "@babel/runtime": "^7.13.10", diff --git a/federated-css-react-ssr/expose-apps/expose-jss/package.json b/federated-css-react-ssr/expose-apps/expose-jss/package.json index a9b777c351..67a780bb18 100644 --- a/federated-css-react-ssr/expose-apps/expose-jss/package.json +++ b/federated-css-react-ssr/expose-apps/expose-jss/package.json @@ -23,7 +23,7 @@ "react-helmet": "6.1.0", "isomorphic-style-loader": "5.3.2", "react-jss": "10.10.0", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "dependencies": { "@babel/runtime": "^7.13.10", diff --git a/federated-css-react-ssr/expose-apps/expose-less/package.json b/federated-css-react-ssr/expose-apps/expose-less/package.json index d07b295f2e..e570de22d3 100644 --- a/federated-css-react-ssr/expose-apps/expose-less/package.json +++ b/federated-css-react-ssr/expose-apps/expose-less/package.json @@ -26,7 +26,7 @@ "isomorphic-style-loader": "5.3.2", "less": "4.2.0", "less-loader": "12.2.0", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "dependencies": { "@babel/runtime": "^7.13.10", diff --git a/federated-css-react-ssr/expose-apps/expose-scss/package.json b/federated-css-react-ssr/expose-apps/expose-scss/package.json index 4fa0a26546..732db534ec 100644 --- a/federated-css-react-ssr/expose-apps/expose-scss/package.json +++ b/federated-css-react-ssr/expose-apps/expose-scss/package.json @@ -25,7 +25,7 @@ "webpack-dev-server": "5.0.4", "react-helmet": "6.1.0", "isomorphic-style-loader": "5.3.2", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "dependencies": { "@babel/runtime": "^7.13.10", diff --git a/federated-css-react-ssr/expose-apps/expose-styled-component/package.json b/federated-css-react-ssr/expose-apps/expose-styled-component/package.json index 5c79906e1b..9672df6293 100644 --- a/federated-css-react-ssr/expose-apps/expose-styled-component/package.json +++ b/federated-css-react-ssr/expose-apps/expose-styled-component/package.json @@ -25,7 +25,7 @@ "react-helmet": "6.1.0", "isomorphic-style-loader": "5.3.2", "styled-components": "5.3.11", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "dependencies": { "@babel/runtime": "^7.13.10", diff --git a/federated-css-react-ssr/expose-apps/expose-tailwind-css/package.json b/federated-css-react-ssr/expose-apps/expose-tailwind-css/package.json index 55f94c866f..51b0073333 100644 --- a/federated-css-react-ssr/expose-apps/expose-tailwind-css/package.json +++ b/federated-css-react-ssr/expose-apps/expose-tailwind-css/package.json @@ -27,7 +27,7 @@ "react-helmet": "6.1.0", "isomorphic-style-loader": "5.3.2", "tailwindcss": "3.4.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "dependencies": { "@babel/runtime": "^7.13.10", diff --git a/federated-css-react-ssr/shell-apps/css-jss/package.json b/federated-css-react-ssr/shell-apps/css-jss/package.json index c2be22807e..02fdfb12e5 100644 --- a/federated-css-react-ssr/shell-apps/css-jss/package.json +++ b/federated-css-react-ssr/shell-apps/css-jss/package.json @@ -41,7 +41,7 @@ "css-loader": "7.1.2", "html-webpack-plugin": "5.6.0", "isomorphic-style-loader": "5.3.2", - "webpack-merge": "5.10.0", + "webpack-merge": "6.0.1", "styled-components": "5.3.11", "babel-plugin-styled-components": "2.1.4" } diff --git a/federated-css-react-ssr/shell-apps/css-scss/package.json b/federated-css-react-ssr/shell-apps/css-scss/package.json index 0166922016..ba3c741588 100644 --- a/federated-css-react-ssr/shell-apps/css-scss/package.json +++ b/federated-css-react-ssr/shell-apps/css-scss/package.json @@ -41,7 +41,7 @@ "css-loader": "7.1.2", "html-webpack-plugin": "5.6.0", "isomorphic-style-loader": "5.3.2", - "webpack-merge": "5.10.0", + "webpack-merge": "6.0.1", "styled-components": "5.3.11", "babel-plugin-styled-components": "2.1.4" } diff --git a/federated-css-react-ssr/shell-apps/jss-styled-components-css-module/package.json b/federated-css-react-ssr/shell-apps/jss-styled-components-css-module/package.json index deafc97521..0cbfed770d 100644 --- a/federated-css-react-ssr/shell-apps/jss-styled-components-css-module/package.json +++ b/federated-css-react-ssr/shell-apps/jss-styled-components-css-module/package.json @@ -41,7 +41,7 @@ "css-loader": "7.1.2", "html-webpack-plugin": "5.6.0", "isomorphic-style-loader": "5.3.2", - "webpack-merge": "5.10.0", + "webpack-merge": "6.0.1", "styled-components": "5.3.11", "babel-plugin-styled-components": "2.1.4" } diff --git a/federated-css-react-ssr/shell-apps/jss-styled-components/package.json b/federated-css-react-ssr/shell-apps/jss-styled-components/package.json index dac8f93be9..f7b2c1f9c8 100644 --- a/federated-css-react-ssr/shell-apps/jss-styled-components/package.json +++ b/federated-css-react-ssr/shell-apps/jss-styled-components/package.json @@ -41,7 +41,7 @@ "css-loader": "7.1.2", "html-webpack-plugin": "5.6.0", "isomorphic-style-loader": "5.3.2", - "webpack-merge": "5.10.0", + "webpack-merge": "6.0.1", "styled-components": "5.3.11", "babel-plugin-styled-components": "2.1.4" } diff --git a/federated-css-react-ssr/shell-apps/less-scss/package.json b/federated-css-react-ssr/shell-apps/less-scss/package.json index d4b92124e9..01321f276d 100644 --- a/federated-css-react-ssr/shell-apps/less-scss/package.json +++ b/federated-css-react-ssr/shell-apps/less-scss/package.json @@ -41,7 +41,7 @@ "css-loader": "7.1.2", "html-webpack-plugin": "5.6.0", "isomorphic-style-loader": "5.3.2", - "webpack-merge": "5.10.0", + "webpack-merge": "6.0.1", "styled-components": "5.3.11", "babel-plugin-styled-components": "2.1.4" } diff --git a/federated-css-react-ssr/shell-apps/scss-tailwind-css/package.json b/federated-css-react-ssr/shell-apps/scss-tailwind-css/package.json index 094e9b4761..497562e85c 100644 --- a/federated-css-react-ssr/shell-apps/scss-tailwind-css/package.json +++ b/federated-css-react-ssr/shell-apps/scss-tailwind-css/package.json @@ -41,7 +41,7 @@ "css-loader": "7.1.2", "html-webpack-plugin": "5.6.0", "isomorphic-style-loader": "5.3.2", - "webpack-merge": "5.10.0", + "webpack-merge": "6.0.1", "styled-components": "5.3.11", "babel-plugin-styled-components": "2.1.4" } diff --git a/loadable-react-16/app1/package.json b/loadable-react-16/app1/package.json index 1dd7eef6b6..907b736b39 100644 --- a/loadable-react-16/app1/package.json +++ b/loadable-react-16/app1/package.json @@ -41,6 +41,6 @@ "webpack": "5.92.1", "webpack-cli": "5.1.4", "webpack-federation-stats-plugin": "1.1.0", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" } } diff --git a/loadable-react-16/app2/package.json b/loadable-react-16/app2/package.json index a2a1b25a1b..8797123862 100644 --- a/loadable-react-16/app2/package.json +++ b/loadable-react-16/app2/package.json @@ -38,6 +38,6 @@ "webpack": "5.92.1", "webpack-cli": "5.1.4", "webpack-federation-stats-plugin": "1.1.0", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" } } diff --git a/loadable-react-18/app1/package.json b/loadable-react-18/app1/package.json index 4439d34286..604f885427 100644 --- a/loadable-react-18/app1/package.json +++ b/loadable-react-18/app1/package.json @@ -38,6 +38,6 @@ "webpack": "5.92.1", "webpack-cli": "5.1.4", "webpack-federation-stats-plugin": "1.1.0", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" } } diff --git a/loadable-react-18/app2/package.json b/loadable-react-18/app2/package.json index 53632cea8a..82e5c197e1 100644 --- a/loadable-react-18/app2/package.json +++ b/loadable-react-18/app2/package.json @@ -38,6 +38,6 @@ "webpack": "5.92.1", "webpack-cli": "5.1.4", "webpack-federation-stats-plugin": "1.1.0", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 44fa3595be..3f43b023d7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -816,8 +816,8 @@ importers: specifier: 5.1.4 version: 5.1.4(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 apollo-client/app2: dependencies: @@ -910,8 +910,8 @@ importers: specifier: 5.1.4 version: 5.1.4(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 basic-host-remote: devDependencies: @@ -3366,8 +3366,8 @@ importers: specifier: 5.0.4 version: 5.0.4(webpack-cli@5.1.4)(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 federated-css-react-ssr/expose-apps/expose-css-module: dependencies: @@ -3424,8 +3424,8 @@ importers: specifier: 5.0.4 version: 5.0.4(webpack-cli@5.1.4)(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 federated-css-react-ssr/expose-apps/expose-jss: dependencies: @@ -3479,8 +3479,8 @@ importers: specifier: 5.0.4 version: 5.0.4(webpack-cli@5.1.4)(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 federated-css-react-ssr/expose-apps/expose-less: dependencies: @@ -3543,8 +3543,8 @@ importers: specifier: 5.0.4 version: 5.0.4(webpack-cli@5.1.4)(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 federated-css-react-ssr/expose-apps/expose-scss: dependencies: @@ -3604,8 +3604,8 @@ importers: specifier: 5.0.4 version: 5.0.4(webpack-cli@5.1.4)(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 federated-css-react-ssr/expose-apps/expose-styled-component: dependencies: @@ -3665,8 +3665,8 @@ importers: specifier: 5.0.4 version: 5.0.4(webpack-cli@5.1.4)(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 federated-css-react-ssr/expose-apps/expose-tailwind-css: dependencies: @@ -3732,8 +3732,8 @@ importers: specifier: 5.0.4 version: 5.0.4(webpack-cli@5.1.4)(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 federated-css-react-ssr/shell-apps/css-jss: dependencies: @@ -3823,8 +3823,8 @@ importers: specifier: 5.1.4 version: 5.1.4(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 federated-css-react-ssr/shell-apps/css-scss: dependencies: @@ -3914,8 +3914,8 @@ importers: specifier: 5.1.4 version: 5.1.4(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 federated-css-react-ssr/shell-apps/jss-styled-components: dependencies: @@ -4005,8 +4005,8 @@ importers: specifier: 5.1.4 version: 5.1.4(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 federated-css-react-ssr/shell-apps/jss-styled-components-css-module: dependencies: @@ -4096,8 +4096,8 @@ importers: specifier: 5.1.4 version: 5.1.4(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 federated-css-react-ssr/shell-apps/less-scss: dependencies: @@ -4187,8 +4187,8 @@ importers: specifier: 5.1.4 version: 5.1.4(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 federated-css-react-ssr/shell-apps/scss-tailwind-css: dependencies: @@ -4278,8 +4278,8 @@ importers: specifier: 5.1.4 version: 5.1.4(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 federated-css/consumers-nextjs: {} @@ -6132,8 +6132,8 @@ importers: specifier: 1.1.0 version: 1.1.0 webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 loadable-react-16/app2: dependencies: @@ -6220,8 +6220,8 @@ importers: specifier: 1.1.0 version: 1.1.0 webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 loadable-react-18: devDependencies: @@ -6317,8 +6317,8 @@ importers: specifier: 1.1.0 version: 1.1.0 webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 loadable-react-18/app2: dependencies: @@ -6405,8 +6405,8 @@ importers: specifier: 1.1.0 version: 1.1.0 webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 medusa-delegate-example: devDependencies: @@ -8530,8 +8530,8 @@ importers: specifier: 5.1.4 version: 5.1.4(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 react-16-17-18-ssr/remote2: dependencies: @@ -8597,8 +8597,8 @@ importers: specifier: 5.1.4 version: 5.1.4(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 react-16-17-18-ssr/shell: dependencies: @@ -8679,8 +8679,8 @@ importers: specifier: 5.1.4 version: 5.1.4(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 react-18-code-splitting: devDependencies: @@ -8767,8 +8767,8 @@ importers: specifier: 5.1.4 version: 5.1.4(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 react-18-code-splitting/app2: dependencies: @@ -8849,8 +8849,8 @@ importers: specifier: 5.1.4 version: 5.1.4(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 react-18-server-2-server: dependencies: @@ -8928,8 +8928,8 @@ importers: specifier: 5.1.4 version: 5.1.4(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 react-18-server-2-server/app2: dependencies: @@ -9001,8 +9001,8 @@ importers: specifier: 5.1.4 version: 5.1.4(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 react-18-ssr: {} @@ -9061,8 +9061,8 @@ importers: specifier: 5.1.4 version: 5.1.4(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 react-18-ssr/remote2: dependencies: @@ -9119,8 +9119,8 @@ importers: specifier: 5.1.4 version: 5.1.4(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 react-18-ssr/shell: dependencies: @@ -9189,8 +9189,8 @@ importers: specifier: 5.1.4 version: 5.1.4(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 react-in-vue: devDependencies: @@ -11254,8 +11254,8 @@ importers: specifier: 5.0.4 version: 5.0.4(webpack-cli@5.1.4)(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 runtime-plugins/remote-router/remotes-monorepo: dependencies: @@ -11723,8 +11723,8 @@ importers: specifier: 5.0.4 version: 5.0.4(webpack-cli@5.1.4)(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 server-side-rendering/remote2: dependencies: @@ -11763,8 +11763,8 @@ importers: specifier: 5.1.4 version: 5.1.4(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 server-side-rendering/shell: dependencies: @@ -11836,8 +11836,8 @@ importers: specifier: 5.1.4 version: 5.1.4(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 shared-context: devDependencies: @@ -12653,8 +12653,8 @@ importers: specifier: 1.1.0 version: 1.1.0 webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 styled-components/app2: dependencies: @@ -12729,8 +12729,8 @@ importers: specifier: 1.1.0 version: 1.1.0 webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 third-party-scripts: {} @@ -13192,8 +13192,8 @@ importers: specifier: 5.0.4 version: 5.0.4(webpack-cli@5.1.4)(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 typescript-react-monorepo-test/packages/remote: dependencies: @@ -13253,8 +13253,8 @@ importers: specifier: 5.0.4 version: 5.0.4(webpack-cli@5.1.4)(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 typescript-react-monorepo/packages/app1: dependencies: @@ -13308,8 +13308,8 @@ importers: specifier: 5.0.4 version: 5.0.4(webpack-cli@5.1.4)(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 typescript-react-monorepo/packages/app2: dependencies: @@ -13363,8 +13363,8 @@ importers: specifier: 5.0.4 version: 5.0.4(webpack-cli@5.1.4)(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 typescript-react-monorepo/packages/host: dependencies: @@ -13418,8 +13418,8 @@ importers: specifier: 5.0.4 version: 5.0.4(webpack-cli@5.1.4)(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 typescript/app1: dependencies: @@ -71494,6 +71494,15 @@ packages: wildcard: 2.0.1 dev: true + /webpack-merge@6.0.1: + resolution: {integrity: sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==} + engines: {node: '>=18.0.0'} + dependencies: + clone-deep: 4.0.1 + flat: 5.0.2 + wildcard: 2.0.1 + dev: true + /webpack-node-externals@3.0.0: resolution: {integrity: sha512-LnL6Z3GGDPht/AigwRh2dvL9PQPFQ8skEpVrWZXLWBYmqcaojHNN0onvHzie6rq7EWKrrBfPYqNEzTJgiwEQDQ==} engines: {node: '>=6'} diff --git a/react-16-17-18-ssr/remote1/package.json b/react-16-17-18-ssr/remote1/package.json index b6f5942f14..b07741fba9 100644 --- a/react-16-17-18-ssr/remote1/package.json +++ b/react-16-17-18-ssr/remote1/package.json @@ -28,7 +28,7 @@ "rimraf": "5.0.8", "webpack": "5.92.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0", + "webpack-merge": "6.0.1", "@rspack/core": "0.7.5", "@rspack/cli": "0.7.5", "@rspack/dev-server": "0.7.5" diff --git a/react-16-17-18-ssr/remote2/package.json b/react-16-17-18-ssr/remote2/package.json index 0e057d49ee..ed84c228a7 100644 --- a/react-16-17-18-ssr/remote2/package.json +++ b/react-16-17-18-ssr/remote2/package.json @@ -28,7 +28,7 @@ "rimraf": "5.0.8", "webpack": "5.92.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0", + "webpack-merge": "6.0.1", "@rspack/core": "0.7.5", "@rspack/cli": "0.7.5", "@rspack/dev-server": "0.7.5" diff --git a/react-16-17-18-ssr/shell/package.json b/react-16-17-18-ssr/shell/package.json index b385dd0fc3..a51980c400 100644 --- a/react-16-17-18-ssr/shell/package.json +++ b/react-16-17-18-ssr/shell/package.json @@ -33,7 +33,7 @@ "rimraf": "5.0.8", "webpack": "5.92.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0", + "webpack-merge": "6.0.1", "@rspack/core": "0.7.5", "@rspack/cli": "0.7.5", "@rspack/dev-server": "0.7.5" diff --git a/react-18-code-splitting/app1/package.json b/react-18-code-splitting/app1/package.json index 31ae983961..1b3295db93 100644 --- a/react-18-code-splitting/app1/package.json +++ b/react-18-code-splitting/app1/package.json @@ -33,7 +33,7 @@ "rimraf": "5.0.8", "webpack": "5.92.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0", + "webpack-merge": "6.0.1", "@rspack/cli": "0.7.5", "@rspack/core": "0.7.5", "@rspack/dev-server": "0.7.5" diff --git a/react-18-code-splitting/app2/package.json b/react-18-code-splitting/app2/package.json index d62d701a0f..de02ec3a6d 100644 --- a/react-18-code-splitting/app2/package.json +++ b/react-18-code-splitting/app2/package.json @@ -33,7 +33,7 @@ "rimraf": "5.0.8", "webpack": "5.92.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0", + "webpack-merge": "6.0.1", "@rspack/cli": "0.7.5", "@rspack/core": "0.7.5", "@rspack/dev-server": "0.7.5" diff --git a/react-18-server-2-server/app1/package.json b/react-18-server-2-server/app1/package.json index 3be23ca606..406a9a9085 100644 --- a/react-18-server-2-server/app1/package.json +++ b/react-18-server-2-server/app1/package.json @@ -33,6 +33,6 @@ "rimraf": "5.0.8", "webpack": "5.92.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" } } diff --git a/react-18-server-2-server/app2/package.json b/react-18-server-2-server/app2/package.json index 9445d4e114..60186dd53d 100644 --- a/react-18-server-2-server/app2/package.json +++ b/react-18-server-2-server/app2/package.json @@ -33,6 +33,6 @@ "rimraf": "5.0.8", "webpack": "5.92.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" } } diff --git a/react-18-ssr/remote1/package.json b/react-18-ssr/remote1/package.json index 3781295e2f..efaa2158f6 100644 --- a/react-18-ssr/remote1/package.json +++ b/react-18-ssr/remote1/package.json @@ -28,6 +28,6 @@ "rimraf": "5.0.8", "webpack": "5.92.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" } } diff --git a/react-18-ssr/remote2/package.json b/react-18-ssr/remote2/package.json index 9015852d8a..17f7d46a8c 100644 --- a/react-18-ssr/remote2/package.json +++ b/react-18-ssr/remote2/package.json @@ -28,6 +28,6 @@ "webpack": "5.92.1", "webpack-cli": "5.1.4", "@module-federation/enhanced": "0.2.5", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" } } diff --git a/react-18-ssr/shell/package.json b/react-18-ssr/shell/package.json index 4654545d6e..17b1466661 100644 --- a/react-18-ssr/shell/package.json +++ b/react-18-ssr/shell/package.json @@ -32,6 +32,6 @@ "rimraf": "5.0.8", "webpack": "5.92.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" } } diff --git a/runtime-plugins/remote-router/host/package.json b/runtime-plugins/remote-router/host/package.json index 0faaad8b74..226c303cd5 100644 --- a/runtime-plugins/remote-router/host/package.json +++ b/runtime-plugins/remote-router/host/package.json @@ -37,6 +37,6 @@ "webpack": "5.92.1", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" } } diff --git a/runtime-plugins/remote-router/pnpm-lock.yaml b/runtime-plugins/remote-router/pnpm-lock.yaml index 3b8f866638..4c2fedeb36 100644 --- a/runtime-plugins/remote-router/pnpm-lock.yaml +++ b/runtime-plugins/remote-router/pnpm-lock.yaml @@ -80,8 +80,8 @@ importers: specifier: 5.0.4 version: 5.0.4(webpack-cli@5.1.4)(webpack@5.92.1) webpack-merge: - specifier: 5.10.0 - version: 5.10.0 + specifier: 6.0.1 + version: 6.0.1 remotes-monorepo: dependencies: @@ -12925,6 +12925,15 @@ packages: wildcard: 2.0.1 dev: true + /webpack-merge@6.0.1: + resolution: {integrity: sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==} + engines: {node: '>=18.0.0'} + dependencies: + clone-deep: 4.0.1 + flat: 5.0.2 + wildcard: 2.0.1 + dev: true + /webpack-node-externals@3.0.0: resolution: {integrity: sha512-LnL6Z3GGDPht/AigwRh2dvL9PQPFQ8skEpVrWZXLWBYmqcaojHNN0onvHzie6rq7EWKrrBfPYqNEzTJgiwEQDQ==} engines: {node: '>=6'} diff --git a/server-side-rendering/remote1/package.json b/server-side-rendering/remote1/package.json index 9015a21e60..99cd1cbbf5 100644 --- a/server-side-rendering/remote1/package.json +++ b/server-side-rendering/remote1/package.json @@ -25,7 +25,7 @@ "webpack": "5.92.1", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "dependencies": { "@babel/runtime": "^7.13.10", diff --git a/server-side-rendering/remote2/package.json b/server-side-rendering/remote2/package.json index 18de0ce55e..f067fb15c3 100644 --- a/server-side-rendering/remote2/package.json +++ b/server-side-rendering/remote2/package.json @@ -23,7 +23,7 @@ "babel-loader": "9.1.3", "webpack": "5.92.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" }, "dependencies": { "@babel/runtime": "^7.13.10", diff --git a/server-side-rendering/shell/package.json b/server-side-rendering/shell/package.json index c1f39d75f4..463c9684c2 100644 --- a/server-side-rendering/shell/package.json +++ b/server-side-rendering/shell/package.json @@ -38,6 +38,6 @@ "rimraf": "5.0.8", "webpack": "5.92.1", "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" } } diff --git a/styled-components/app1/package.json b/styled-components/app1/package.json index 581f815be5..2843b940b8 100644 --- a/styled-components/app1/package.json +++ b/styled-components/app1/package.json @@ -36,6 +36,6 @@ "webpack": "5.92.1", "webpack-cli": "5.1.4", "webpack-federation-stats-plugin": "1.1.0", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" } } diff --git a/styled-components/app2/package.json b/styled-components/app2/package.json index 0bbab3761e..d9a75b3431 100644 --- a/styled-components/app2/package.json +++ b/styled-components/app2/package.json @@ -34,6 +34,6 @@ "webpack": "5.92.1", "webpack-cli": "5.1.4", "webpack-federation-stats-plugin": "1.1.0", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" } } diff --git a/typescript-react-monorepo-test/packages/host/package.json b/typescript-react-monorepo-test/packages/host/package.json index 6d0d247f05..851f5f600e 100644 --- a/typescript-react-monorepo-test/packages/host/package.json +++ b/typescript-react-monorepo-test/packages/host/package.json @@ -44,6 +44,6 @@ "webpack": "5.92.1", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" } } diff --git a/typescript-react-monorepo-test/packages/remote/package.json b/typescript-react-monorepo-test/packages/remote/package.json index 43601f2257..583e801dd0 100644 --- a/typescript-react-monorepo-test/packages/remote/package.json +++ b/typescript-react-monorepo-test/packages/remote/package.json @@ -33,6 +33,6 @@ "webpack": "5.92.1", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" } } diff --git a/typescript-react-monorepo/packages/app1/package.json b/typescript-react-monorepo/packages/app1/package.json index 7f78ddc202..81a9c9078c 100644 --- a/typescript-react-monorepo/packages/app1/package.json +++ b/typescript-react-monorepo/packages/app1/package.json @@ -30,6 +30,6 @@ "webpack": "5.92.1", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" } } diff --git a/typescript-react-monorepo/packages/app2/package.json b/typescript-react-monorepo/packages/app2/package.json index d98bf13d3b..13b120aa8c 100644 --- a/typescript-react-monorepo/packages/app2/package.json +++ b/typescript-react-monorepo/packages/app2/package.json @@ -30,6 +30,6 @@ "webpack": "5.92.1", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" } } diff --git a/typescript-react-monorepo/packages/host/package.json b/typescript-react-monorepo/packages/host/package.json index 0e5df8ad23..923863210b 100644 --- a/typescript-react-monorepo/packages/host/package.json +++ b/typescript-react-monorepo/packages/host/package.json @@ -31,6 +31,6 @@ "webpack": "5.92.1", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" } }