diff --git a/package.json b/package.json
index 0d8a306515d0d..3badfea3f1296 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
"through2": "^3.0.1",
"tmp": "^0.1.0",
"typescript": "^3.7.5",
- "webpack": "^4.41.2",
+ "webpack": "^5",
"yargs": "^15.3.1"
},
"devEngines": {
diff --git a/packages/react-devtools-core/webpack.backend.js b/packages/react-devtools-core/webpack.backend.js
index 0236c4ab30ea2..6aeb300711e5d 100644
--- a/packages/react-devtools-core/webpack.backend.js
+++ b/packages/react-devtools-core/webpack.backend.js
@@ -55,9 +55,6 @@ module.exports = {
scheduler: resolve(builtModulesDir, 'scheduler'),
},
},
- node: {
- fs: 'empty',
- },
plugins: [
new DefinePlugin({
__DEV__,
diff --git a/packages/react-devtools-core/webpack.standalone.js b/packages/react-devtools-core/webpack.standalone.js
index 8f17efe9c28b1..e98dc7609fa38 100644
--- a/packages/react-devtools-core/webpack.standalone.js
+++ b/packages/react-devtools-core/webpack.standalone.js
@@ -59,6 +59,8 @@ module.exports = {
scheduler: resolve(builtModulesDir, 'scheduler'),
},
},
+ // webpack doesnt like these bundled
+ externals: ['utf-8-validate', 'bufferutil'],
node: {
// Don't replace __dirname!
// This would break the standalone DevTools ability to load the backend.
@@ -90,7 +92,7 @@ module.exports = {
test: /\.worker\.js$/,
use: [
{
- loader: 'workerize-loader',
+ loader: 'workerize-loader-5',
options: {
inline: true,
},
diff --git a/packages/react-devtools-extensions/package.json b/packages/react-devtools-extensions/package.json
index a2642788b5f4c..8a7b1e6f14e77 100644
--- a/packages/react-devtools-extensions/package.json
+++ b/packages/react-devtools-extensions/package.json
@@ -62,10 +62,10 @@
"source-map-js": "^0.6.2",
"sourcemap-codec": "^1.4.8",
"style-loader": "^0.23.1",
- "webpack": "^4.43.0",
- "webpack-cli": "^3.3.11",
- "webpack-dev-server": "^3.10.3",
- "workerize-loader": "^1.3.0"
+ "webpack": "^5",
+ "webpack-cli": "^4",
+ "webpack-dev-server": "^4",
+ "workerize-loader-5": "^1.4.0"
},
"dependencies": {
"web-ext": "^4"
diff --git a/packages/react-devtools-extensions/webpack.backend.js b/packages/react-devtools-extensions/webpack.backend.js
index 1644d0b9843e8..12bd34d2cf797 100644
--- a/packages/react-devtools-extensions/webpack.backend.js
+++ b/packages/react-devtools-extensions/webpack.backend.js
@@ -38,14 +38,6 @@ module.exports = {
path: __dirname + '/build',
filename: 'react_devtools_backend.js',
},
- node: {
- // Don't define a polyfill on window.setImmediate
- setImmediate: false,
-
- // source-maps package has a dependency on 'fs'
- // but this build won't trigger that code path
- fs: 'empty',
- },
resolve: {
alias: {
react: resolve(builtModulesDir, 'react'),
diff --git a/packages/react-devtools-extensions/webpack.config.js b/packages/react-devtools-extensions/webpack.config.js
index 7f9e632ffab19..a9cb38a1fcf35 100644
--- a/packages/react-devtools-extensions/webpack.config.js
+++ b/packages/react-devtools-extensions/webpack.config.js
@@ -53,14 +53,6 @@ module.exports = {
publicPath: '/build/',
filename: '[name].js',
},
- node: {
- // Don't define a polyfill on window.setImmediate
- setImmediate: false,
-
- // source-maps package has a dependency on 'fs'
- // but this build won't trigger that code path
- fs: 'empty',
- },
resolve: {
alias: {
react: resolve(builtModulesDir, 'react'),
@@ -110,7 +102,7 @@ module.exports = {
test: /\.worker\.js$/,
use: [
{
- loader: 'workerize-loader',
+ loader: 'workerize-loader-5',
options: {
inline: true,
},
diff --git a/packages/react-devtools-inline/backend.js b/packages/react-devtools-inline/backend.js
index 2c2a32d45125b..dbfbf7b34a46b 100644
--- a/packages/react-devtools-inline/backend.js
+++ b/packages/react-devtools-inline/backend.js
@@ -1 +1 @@
-module.exports = require('./dist/backend');
+module.exports = require('./dist/backend').backend;
diff --git a/packages/react-devtools-inline/frontend.js b/packages/react-devtools-inline/frontend.js
index a86be22376f39..53f8fea06de4a 100644
--- a/packages/react-devtools-inline/frontend.js
+++ b/packages/react-devtools-inline/frontend.js
@@ -1 +1 @@
-module.exports = require('./dist/frontend');
+module.exports = require('./dist/frontend').frontend;
diff --git a/packages/react-devtools-inline/package.json b/packages/react-devtools-inline/package.json
index 8b2e745a85856..c1a2502cded99 100644
--- a/packages/react-devtools-inline/package.json
+++ b/packages/react-devtools-inline/package.json
@@ -37,9 +37,9 @@
"file-loader": "^6.1.0",
"raw-loader": "^3.1.0",
"style-loader": "^0.23.1",
- "webpack": "^4.43.0",
- "webpack-cli": "^3.3.11",
- "webpack-dev-server": "^3.10.3",
- "worker-loader": "^3.0.3"
+ "webpack": "^5",
+ "webpack-cli": "^4",
+ "webpack-dev-server": "^4",
+ "worker-loader": "^3.0.8"
}
}
diff --git a/packages/react-devtools-inline/webpack.config.js b/packages/react-devtools-inline/webpack.config.js
index 169484f8cc271..1856bd082e857 100644
--- a/packages/react-devtools-inline/webpack.config.js
+++ b/packages/react-devtools-inline/webpack.config.js
@@ -52,11 +52,6 @@ module.exports = {
'react-is': 'react-is',
scheduler: 'scheduler',
},
- node: {
- // source-maps package has a dependency on 'fs'
- // but this build won't trigger that code path
- fs: 'empty',
- },
resolve: {
alias: {
'react-devtools-feature-flags': resolveFeatureFlags('inline'),
@@ -84,13 +79,16 @@ module.exports = {
'process.env.LIGHT_MODE_DIMMED_LOG_COLOR': `"${LIGHT_MODE_DIMMED_LOG_COLOR}"`,
}),
],
+ stats: {
+ children: true,
+ },
module: {
rules: [
{
test: /\.worker\.js$/,
use: [
{
- loader: 'workerize-loader',
+ loader: 'workerize-loader-5',
options: {
inline: true,
},
diff --git a/packages/react-devtools-scheduling-profiler/package.json b/packages/react-devtools-scheduling-profiler/package.json
index 98a386ba1949c..7c616a8ac2784 100644
--- a/packages/react-devtools-scheduling-profiler/package.json
+++ b/packages/react-devtools-scheduling-profiler/package.json
@@ -19,13 +19,13 @@
"babel-loader": "^8.1.0",
"css-loader": "^4.2.1",
"file-loader": "^6.0.0",
- "html-webpack-plugin": "^4.3.0",
+ "html-webpack-plugin": "^5",
"style-loader": "^1.2.1",
"url-loader": "^4.1.0",
"vercel": "^20.1.0",
- "webpack": "^4.44.1",
- "webpack-cli": "^3.3.12",
- "webpack-dev-server": "^3.11.0",
+ "webpack": "^5",
+ "webpack-cli": "^4",
+ "webpack-dev-server": "^4",
"worker-loader": "^3.0.2"
}
}
diff --git a/packages/react-devtools-shell/index.html b/packages/react-devtools-shell/index.html
index 410dc5bdc2abd..701de8b4a82cb 100644
--- a/packages/react-devtools-shell/index.html
+++ b/packages/react-devtools-shell/index.html
@@ -64,6 +64,6 @@
-
+
-