Skip to content

Commit 9b91c92

Browse files
CraigMacomberCraig Macomber
CraigMacomber
and
Craig Macomber
authored
Update misc webpack related packages (#9889)
As part of the effort to update to webpack5 (#9568) this updates a few webpack related packages, hopefully reducing the number of issues when updating webpack itself. The most significant change is migrating from duplicate-package-checker-webpack-plugin to its fork @cerner/duplicate-package-checker-webpack-plugin because the original has not merged support for webpack5, see darrenscerri/duplicate-package-checker-webpack-plugin#46 Co-authored-by: Craig Macomber <[email protected]>
1 parent 9ed3dc1 commit 9b91c92

File tree

112 files changed

+309
-279
lines changed

Some content is hidden

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

112 files changed

+309
-279
lines changed

‎docs/themes/thxvscode/assets/js/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"@babel/runtime": "^7.17.2",
99
"babel-loader": "^8.2.3",
1010
"core-js": "^3.21.1",
11-
"terser-webpack-plugin": "^4.2.3",
11+
"terser-webpack-plugin": "^5.3.1",
1212
"webpack": "^4.46.0",
1313
"webpack-cli": "^4.9.2"
1414
},

‎examples/apps/collaborative-textarea/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"eslint-plugin-no-null": "~1.0.2",
7575
"eslint-plugin-react": "~7.28.0",
7676
"eslint-plugin-unicorn": "~40.0.0",
77-
"html-webpack-plugin": "^4.3.0",
77+
"html-webpack-plugin": "^4.5.2",
7878
"jest": "^26.6.3",
7979
"jest-junit": "^10.0.0",
8080
"jest-puppeteer": "^4.3.0",
@@ -87,7 +87,7 @@
8787
"webpack": "^4.46.0",
8888
"webpack-cli": "^4.9.2",
8989
"webpack-dev-server": "4.0.0",
90-
"webpack-merge": "^4.1.4"
90+
"webpack-merge": "^5.8.0"
9191
},
9292
"fluid": {
9393
"browser": {

‎examples/apps/collaborative-textarea/webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
const fluidRoute = require("@fluid-tools/webpack-fluid-loader");
77
const path = require("path");
8-
const merge = require("webpack-merge");
8+
const { merge } = require("webpack-merge");
99

1010
module.exports = env => {
1111
const isProduction = env && env.production;

‎examples/apps/collaborative-textarea/webpack.test.js

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55

66
const path = require("path");
7-
const merge = require("webpack-merge");
87
const HtmlWebpackPlugin = require("html-webpack-plugin");
98

109
const pkg = require("./package.json");

‎examples/apps/contact-collection/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"@types/puppeteer": "1.3.0",
6262
"@typescript-eslint/eslint-plugin": "~5.9.0",
6363
"@typescript-eslint/parser": "~5.9.0",
64-
"clean-webpack-plugin": "^3.0.0",
64+
"clean-webpack-plugin": "^4.0.0",
6565
"concurrently": "^6.2.0",
6666
"cross-env": "^7.0.2",
6767
"eslint": "~8.6.0",
@@ -71,7 +71,7 @@
7171
"eslint-plugin-no-null": "~1.0.2",
7272
"eslint-plugin-react": "~7.28.0",
7373
"eslint-plugin-unicorn": "~40.0.0",
74-
"html-webpack-plugin": "^4.3.0",
74+
"html-webpack-plugin": "^4.5.2",
7575
"jest": "^26.6.3",
7676
"jest-junit": "^10.0.0",
7777
"jest-puppeteer": "^4.3.0",
@@ -84,7 +84,7 @@
8484
"webpack": "^4.46.0",
8585
"webpack-cli": "^4.9.2",
8686
"webpack-dev-server": "4.0.0",
87-
"webpack-merge": "^4.1.4"
87+
"webpack-merge": "^5.8.0"
8888
},
8989
"fluid": {
9090
"browser": {

‎examples/apps/contact-collection/webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
const path = require("path");
7-
const merge = require("webpack-merge");
7+
const { merge } = require("webpack-merge");
88
const HtmlWebpackPlugin = require("html-webpack-plugin");
99
// const { CleanWebpackPlugin } = require("clean-webpack-plugin");
1010

‎examples/apps/contact-collection/webpack.test.js

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55

66
const path = require("path");
7-
const merge = require("webpack-merge");
87
const HtmlWebpackPlugin = require("html-webpack-plugin");
98

109
module.exports = env => {

‎examples/apps/likes/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"eslint-plugin-no-null": "~1.0.2",
7373
"eslint-plugin-react": "~7.28.0",
7474
"eslint-plugin-unicorn": "~40.0.0",
75-
"html-webpack-plugin": "^4.3.0",
75+
"html-webpack-plugin": "^4.5.2",
7676
"jest": "^26.6.3",
7777
"jest-junit": "^10.0.0",
7878
"jest-puppeteer": "^4.3.0",
@@ -86,7 +86,7 @@
8686
"webpack": "^4.46.0",
8787
"webpack-cli": "^4.9.2",
8888
"webpack-dev-server": "4.0.0",
89-
"webpack-merge": "^4.1.4"
89+
"webpack-merge": "^5.8.0"
9090
},
9191
"fluid": {
9292
"browser": {

‎examples/apps/likes/webpack.config.js

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55

66
const path = require("path");
7-
const merge = require("webpack-merge");
87
const HtmlWebpackPlugin = require("html-webpack-plugin");
98

109
module.exports = env => {

‎examples/apps/likes/webpack.test.js

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55

66
const path = require("path");
7-
const merge = require("webpack-merge");
87
const HtmlWebpackPlugin = require("html-webpack-plugin");
98

109
module.exports = env => {

‎examples/apps/spaces/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"eslint-plugin-react": "~7.28.0",
8989
"eslint-plugin-unicorn": "~40.0.0",
9090
"html-loader": "^0.5.5",
91-
"html-webpack-plugin": "^4.3.0",
91+
"html-webpack-plugin": "^4.5.2",
9292
"jest": "^26.6.3",
9393
"jest-junit": "^10.0.0",
9494
"jest-puppeteer": "^4.3.0",
@@ -104,7 +104,7 @@
104104
"webpack": "^4.46.0",
105105
"webpack-cli": "^4.9.2",
106106
"webpack-dev-server": "4.0.0",
107-
"webpack-merge": "^4.1.4"
107+
"webpack-merge": "^5.8.0"
108108
},
109109
"fluid": {
110110
"browser": {

‎examples/apps/spaces/webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
const path = require("path");
7-
const merge = require("webpack-merge");
7+
const { merge } = require("webpack-merge");
88
const HtmlWebpackPlugin = require("html-webpack-plugin");
99

1010
const pkg = require("./package.json");

‎examples/apps/spaces/webpack.test.js

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55

66
const path = require("path");
7-
const merge = require("webpack-merge");
87
const HtmlWebpackPlugin = require("html-webpack-plugin");
98

109
const pkg = require("./package.json");

‎examples/apps/view-framework-sampler/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"@types/puppeteer": "1.3.0",
5959
"@typescript-eslint/eslint-plugin": "~5.9.0",
6060
"@typescript-eslint/parser": "~5.9.0",
61-
"clean-webpack-plugin": "^3.0.0",
61+
"clean-webpack-plugin": "^4.0.0",
6262
"concurrently": "^6.2.0",
6363
"cross-env": "^7.0.2",
6464
"eslint": "~8.6.0",
@@ -68,7 +68,7 @@
6868
"eslint-plugin-no-null": "~1.0.2",
6969
"eslint-plugin-react": "~7.28.0",
7070
"eslint-plugin-unicorn": "~40.0.0",
71-
"html-webpack-plugin": "^4.3.0",
71+
"html-webpack-plugin": "^4.5.2",
7272
"jest": "^26.6.3",
7373
"jest-junit": "^10.0.0",
7474
"jest-puppeteer": "^4.3.0",
@@ -81,7 +81,7 @@
8181
"webpack": "^4.46.0",
8282
"webpack-cli": "^4.9.2",
8383
"webpack-dev-server": "4.0.0",
84-
"webpack-merge": "^4.1.4"
84+
"webpack-merge": "^5.8.0"
8585
},
8686
"fluid": {
8787
"browser": {

‎examples/apps/view-framework-sampler/webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
const path = require("path");
7-
const merge = require("webpack-merge");
7+
const { merge } = require("webpack-merge");
88
const HtmlWebpackPlugin = require("html-webpack-plugin");
99
// const { CleanWebpackPlugin } = require("clean-webpack-plugin");
1010

‎examples/apps/view-framework-sampler/webpack.test.js

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55

66
const path = require("path");
7-
const merge = require("webpack-merge");
87
const HtmlWebpackPlugin = require("html-webpack-plugin");
98

109
module.exports = env => {

‎examples/data-objects/badge/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"webpack": "^4.46.0",
7474
"webpack-cli": "^4.9.2",
7575
"webpack-dev-server": "4.0.0",
76-
"webpack-merge": "^4.1.4"
76+
"webpack-merge": "^5.8.0"
7777
},
7878
"fluid": {
7979
"browser": {

‎examples/data-objects/badge/webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
const fluidRoute = require("@fluid-tools/webpack-fluid-loader");
77
const path = require("path");
8-
const merge = require("webpack-merge");
8+
const { merge } = require("webpack-merge");
99

1010
const pkg = require("./package.json");
1111
const componentName = pkg.name.slice(1);

‎examples/data-objects/canvas/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"webpack": "^4.46.0",
8888
"webpack-cli": "^4.9.2",
8989
"webpack-dev-server": "4.0.0",
90-
"webpack-merge": "^4.1.4"
90+
"webpack-merge": "^5.8.0"
9191
},
9292
"fluid": {
9393
"browser": {

‎examples/data-objects/canvas/webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
const fluidRoute = require("@fluid-tools/webpack-fluid-loader");
77
const path = require("path");
8-
const merge = require("webpack-merge");
8+
const { merge } = require("webpack-merge");
99

1010
const pkg = require("./package.json");
1111
const fluidPackageName = pkg.name.slice(1);

‎examples/data-objects/clicker-react/clicker-context/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
"typescript": "~4.1.3",
8080
"webpack": "^4.46.0",
8181
"webpack-dev-server": "4.0.0",
82-
"webpack-merge": "^4.1.4"
82+
"webpack-merge": "^5.8.0"
8383
},
8484
"fluid": {
8585
"browser": {

‎examples/data-objects/clicker-react/clicker-context/webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
const fluidRoute = require("@fluid-tools/webpack-fluid-loader");
77
const path = require("path");
8-
const merge = require("webpack-merge");
8+
const { merge } = require("webpack-merge");
99

1010
module.exports = env => {
1111
const isProduction = env && env.production;

‎examples/data-objects/clicker-react/clicker-function/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
"typescript": "~4.1.3",
8080
"webpack": "^4.46.0",
8181
"webpack-dev-server": "4.0.0",
82-
"webpack-merge": "^4.1.4"
82+
"webpack-merge": "^5.8.0"
8383
},
8484
"fluid": {
8585
"browser": {

‎examples/data-objects/clicker-react/clicker-function/webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
const fluidRoute = require("@fluid-tools/webpack-fluid-loader");
77
const path = require("path");
8-
const merge = require("webpack-merge");
8+
const { merge } = require("webpack-merge");
99

1010
module.exports = env => {
1111
const isProduction = env && env.production;

‎examples/data-objects/clicker-react/clicker-react/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"webpack": "^4.46.0",
8585
"webpack-cli": "^4.9.2",
8686
"webpack-dev-server": "4.0.0",
87-
"webpack-merge": "^4.1.4"
87+
"webpack-merge": "^5.8.0"
8888
},
8989
"fluid": {
9090
"browser": {

‎examples/data-objects/clicker-react/clicker-react/webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
const fluidRoute = require("@fluid-tools/webpack-fluid-loader");
77
const path = require("path");
8-
const merge = require("webpack-merge");
8+
const { merge } = require("webpack-merge");
99

1010
const pkg = require("./package.json");
1111
const fluidPackageName = pkg.name.slice(1);

‎examples/data-objects/clicker-react/clicker-reducer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"typescript": "~4.1.3",
8282
"webpack": "^4.46.0",
8383
"webpack-dev-server": "4.0.0",
84-
"webpack-merge": "^4.1.4"
84+
"webpack-merge": "^5.8.0"
8585
},
8686
"fluid": {
8787
"browser": {

‎examples/data-objects/clicker-react/clicker-reducer/webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
const fluidRoute = require("@fluid-tools/webpack-fluid-loader");
77
const path = require("path");
8-
const merge = require("webpack-merge");
8+
const { merge } = require("webpack-merge");
99

1010
module.exports = env => {
1111
const isProduction = env && env.production;

‎examples/data-objects/clicker-react/clicker-with-hook/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"typescript": "~4.1.3",
8282
"webpack": "^4.46.0",
8383
"webpack-dev-server": "4.0.0",
84-
"webpack-merge": "^4.1.4"
84+
"webpack-merge": "^5.8.0"
8585
},
8686
"fluid": {
8787
"browser": {

‎examples/data-objects/clicker-react/clicker-with-hook/webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
const fluidRoute = require("@fluid-tools/webpack-fluid-loader");
77
const path = require("path");
8-
const merge = require("webpack-merge");
8+
const { merge } = require("webpack-merge");
99

1010
module.exports = env => {
1111
const isProduction = env && env.production;

‎examples/data-objects/clicker/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"webpack": "^4.46.0",
8787
"webpack-cli": "^4.9.2",
8888
"webpack-dev-server": "4.0.0",
89-
"webpack-merge": "^4.1.4"
89+
"webpack-merge": "^5.8.0"
9090
},
9191
"fluid": {
9292
"browser": {

‎examples/data-objects/clicker/webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
const fluidRoute = require("@fluid-tools/webpack-fluid-loader");
77
const path = require("path");
8-
const merge = require("webpack-merge");
8+
const { merge } = require("webpack-merge");
99

1010
const pkg = require("./package.json");
1111
const fluidPackageName = pkg.name.slice(1);

‎examples/data-objects/codemirror/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"webpack": "^4.46.0",
8484
"webpack-cli": "^4.9.2",
8585
"webpack-dev-server": "4.0.0",
86-
"webpack-merge": "^4.1.4"
86+
"webpack-merge": "^5.8.0"
8787
},
8888
"fluid": {
8989
"browser": {

‎examples/data-objects/codemirror/webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
const fluidRoute = require("@fluid-tools/webpack-fluid-loader");
77
const path = require("path");
8-
const merge = require("webpack-merge");
8+
const { merge } = require("webpack-merge");
99

1010
const pkg = require("./package.json");
1111
const fluidPackageName = pkg.name.slice(1);

‎examples/data-objects/diceroller/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"webpack": "^4.46.0",
8484
"webpack-cli": "^4.9.2",
8585
"webpack-dev-server": "4.0.0",
86-
"webpack-merge": "^4.1.4"
86+
"webpack-merge": "^5.8.0"
8787
},
8888
"fluid": {
8989
"browser": {

‎examples/data-objects/diceroller/webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
const fluidRoute = require("@fluid-tools/webpack-fluid-loader");
77
const path = require("path");
8-
const merge = require("webpack-merge");
8+
const { merge } = require("webpack-merge");
99

1010
module.exports = env => {
1111
const isProduction = env && env.production;

‎examples/data-objects/focus-tracker/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"eslint-plugin-no-null": "~1.0.2",
6464
"eslint-plugin-react": "~7.28.0",
6565
"eslint-plugin-unicorn": "~40.0.0",
66-
"html-webpack-plugin": "^4.3.0",
66+
"html-webpack-plugin": "^4.5.2",
6767
"jest": "^26.6.3",
6868
"jest-junit": "^10.0.0",
6969
"jest-puppeteer": "^4.3.0",
@@ -76,7 +76,7 @@
7676
"webpack": "^4.46.0",
7777
"webpack-cli": "^4.9.2",
7878
"webpack-dev-server": "4.0.0",
79-
"webpack-merge": "^4.1.4"
79+
"webpack-merge": "^5.8.0"
8080
},
8181
"fluid": {
8282
"browser": {

0 commit comments

Comments
 (0)