Skip to content

Commit c7631fc

Browse files
chore(deps): update dependency webpack-merge to v6 (#4222)
1 parent bb4d7ba commit c7631fc

File tree

42 files changed

+140
-122
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+140
-122
lines changed

apollo-client/app1/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"rimraf": "5.0.8",
4242
"webpack": "5.92.1",
4343
"webpack-cli": "5.1.4",
44-
"webpack-merge": "5.10.0",
44+
"webpack-merge": "6.0.1",
4545
"@rspack/core": "0.7.5",
4646
"@rspack/cli": "0.7.5",
4747
"@rspack/dev-server": "0.7.5"

apollo-client/app2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"rimraf": "5.0.8",
4242
"webpack": "5.92.1",
4343
"webpack-cli": "5.1.4",
44-
"webpack-merge": "5.10.0",
44+
"webpack-merge": "6.0.1",
4545
"@rspack/core": "0.7.5",
4646
"@rspack/cli": "0.7.5",
4747
"@rspack/dev-server": "0.7.5"

federated-css-react-ssr/expose-apps/expose-css-module/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"react-helmet": "6.1.0",
2525
"isomorphic-style-loader": "5.3.2",
2626
"css-loader": "7.1.2",
27-
"webpack-merge": "5.10.0"
27+
"webpack-merge": "6.0.1"
2828
},
2929
"dependencies": {
3030
"@babel/runtime": "^7.13.10",

federated-css-react-ssr/expose-apps/expose-css/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"webpack-dev-server": "5.0.4",
2525
"react-helmet": "6.1.0",
2626
"isomorphic-style-loader": "5.3.2",
27-
"webpack-merge": "5.10.0"
27+
"webpack-merge": "6.0.1"
2828
},
2929
"dependencies": {
3030
"@babel/runtime": "^7.13.10",

federated-css-react-ssr/expose-apps/expose-jss/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"react-helmet": "6.1.0",
2424
"isomorphic-style-loader": "5.3.2",
2525
"react-jss": "10.10.0",
26-
"webpack-merge": "5.10.0"
26+
"webpack-merge": "6.0.1"
2727
},
2828
"dependencies": {
2929
"@babel/runtime": "^7.13.10",

federated-css-react-ssr/expose-apps/expose-less/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"isomorphic-style-loader": "5.3.2",
2727
"less": "4.2.0",
2828
"less-loader": "12.2.0",
29-
"webpack-merge": "5.10.0"
29+
"webpack-merge": "6.0.1"
3030
},
3131
"dependencies": {
3232
"@babel/runtime": "^7.13.10",

federated-css-react-ssr/expose-apps/expose-scss/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"webpack-dev-server": "5.0.4",
2626
"react-helmet": "6.1.0",
2727
"isomorphic-style-loader": "5.3.2",
28-
"webpack-merge": "5.10.0"
28+
"webpack-merge": "6.0.1"
2929
},
3030
"dependencies": {
3131
"@babel/runtime": "^7.13.10",

federated-css-react-ssr/expose-apps/expose-styled-component/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"react-helmet": "6.1.0",
2626
"isomorphic-style-loader": "5.3.2",
2727
"styled-components": "5.3.11",
28-
"webpack-merge": "5.10.0"
28+
"webpack-merge": "6.0.1"
2929
},
3030
"dependencies": {
3131
"@babel/runtime": "^7.13.10",

federated-css-react-ssr/expose-apps/expose-tailwind-css/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"react-helmet": "6.1.0",
2828
"isomorphic-style-loader": "5.3.2",
2929
"tailwindcss": "3.4.4",
30-
"webpack-merge": "5.10.0"
30+
"webpack-merge": "6.0.1"
3131
},
3232
"dependencies": {
3333
"@babel/runtime": "^7.13.10",

federated-css-react-ssr/shell-apps/css-jss/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"css-loader": "7.1.2",
4242
"html-webpack-plugin": "5.6.0",
4343
"isomorphic-style-loader": "5.3.2",
44-
"webpack-merge": "5.10.0",
44+
"webpack-merge": "6.0.1",
4545
"styled-components": "5.3.11",
4646
"babel-plugin-styled-components": "2.1.4"
4747
}

federated-css-react-ssr/shell-apps/css-scss/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"css-loader": "7.1.2",
4242
"html-webpack-plugin": "5.6.0",
4343
"isomorphic-style-loader": "5.3.2",
44-
"webpack-merge": "5.10.0",
44+
"webpack-merge": "6.0.1",
4545
"styled-components": "5.3.11",
4646
"babel-plugin-styled-components": "2.1.4"
4747
}

federated-css-react-ssr/shell-apps/jss-styled-components-css-module/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"css-loader": "7.1.2",
4242
"html-webpack-plugin": "5.6.0",
4343
"isomorphic-style-loader": "5.3.2",
44-
"webpack-merge": "5.10.0",
44+
"webpack-merge": "6.0.1",
4545
"styled-components": "5.3.11",
4646
"babel-plugin-styled-components": "2.1.4"
4747
}

federated-css-react-ssr/shell-apps/jss-styled-components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"css-loader": "7.1.2",
4242
"html-webpack-plugin": "5.6.0",
4343
"isomorphic-style-loader": "5.3.2",
44-
"webpack-merge": "5.10.0",
44+
"webpack-merge": "6.0.1",
4545
"styled-components": "5.3.11",
4646
"babel-plugin-styled-components": "2.1.4"
4747
}

federated-css-react-ssr/shell-apps/less-scss/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"css-loader": "7.1.2",
4242
"html-webpack-plugin": "5.6.0",
4343
"isomorphic-style-loader": "5.3.2",
44-
"webpack-merge": "5.10.0",
44+
"webpack-merge": "6.0.1",
4545
"styled-components": "5.3.11",
4646
"babel-plugin-styled-components": "2.1.4"
4747
}

federated-css-react-ssr/shell-apps/scss-tailwind-css/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"css-loader": "7.1.2",
4242
"html-webpack-plugin": "5.6.0",
4343
"isomorphic-style-loader": "5.3.2",
44-
"webpack-merge": "5.10.0",
44+
"webpack-merge": "6.0.1",
4545
"styled-components": "5.3.11",
4646
"babel-plugin-styled-components": "2.1.4"
4747
}

loadable-react-16/app1/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@
4141
"webpack": "5.92.1",
4242
"webpack-cli": "5.1.4",
4343
"webpack-federation-stats-plugin": "1.1.0",
44-
"webpack-merge": "5.10.0"
44+
"webpack-merge": "6.0.1"
4545
}
4646
}

loadable-react-16/app2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@
3838
"webpack": "5.92.1",
3939
"webpack-cli": "5.1.4",
4040
"webpack-federation-stats-plugin": "1.1.0",
41-
"webpack-merge": "5.10.0"
41+
"webpack-merge": "6.0.1"
4242
}
4343
}

loadable-react-18/app1/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@
3838
"webpack": "5.92.1",
3939
"webpack-cli": "5.1.4",
4040
"webpack-federation-stats-plugin": "1.1.0",
41-
"webpack-merge": "5.10.0"
41+
"webpack-merge": "6.0.1"
4242
}
4343
}

loadable-react-18/app2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@
3838
"webpack": "5.92.1",
3939
"webpack-cli": "5.1.4",
4040
"webpack-federation-stats-plugin": "1.1.0",
41-
"webpack-merge": "5.10.0"
41+
"webpack-merge": "6.0.1"
4242
}
4343
}

0 commit comments

Comments
 (0)