From 8c4f6ead64f6b20c391ec4fefe160e6548b5caf1 Mon Sep 17 00:00:00 2001
From: Chris Beer <chris@cbeer.info>
Date: Thu, 17 Mar 2022 09:39:22 -0700
Subject: [PATCH] Update to Webpack 5

---
 jest-puppeteer.config.js |  1 +
 package.json             | 13 +++++++------
 webpack.config.js        |  7 +++----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/jest-puppeteer.config.js b/jest-puppeteer.config.js
index f2324320b..673592b7d 100644
--- a/jest-puppeteer.config.js
+++ b/jest-puppeteer.config.js
@@ -4,6 +4,7 @@ module.exports = {
   },
   server: [{
     command: 'npm run server -- -p 4488',
+    launchTimeout: 180000,
     port: 4488,
   }],
 };
diff --git a/package.json b/package.json
index cb2499faf..abf616532 100644
--- a/package.json
+++ b/package.json
@@ -75,6 +75,7 @@
     "redux-saga": "^1.1.3",
     "redux-thunk": "^2.3.0",
     "reselect": "^4.0.0",
+    "url": "^0.11.0",
     "uuid": "^8.1.0"
   },
   "devDependencies": {
@@ -86,7 +87,7 @@
     "@babel/plugin-transform-runtime": "^7.10.3",
     "@babel/preset-env": "^7.10.3",
     "@babel/preset-react": "^7.10.1",
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.4",
     "@typescript-eslint/eslint-plugin": "^4.21.0",
     "@typescript-eslint/parser": "^4.21.0",
     "babel-eslint": "^10.1.0",
@@ -120,15 +121,15 @@
     "puppeteer": "^9.0.0",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
-    "react-refresh": "^0.8.3",
+    "react-refresh": "^0.11.0",
     "redux-mock-store": "^1.5.1",
     "redux-saga-test-plan": "^4.0.0-rc.3",
-    "terser-webpack-plugin": "^4.0.0",
+    "terser-webpack-plugin": "^5.3.1",
     "unfetch": "^4.1.0",
     "url-polyfill": "^1.1.7",
-    "webpack": "^4.43.0",
-    "webpack-cli": "^4.6.0",
-    "webpack-dev-server": "^3.11.0"
+    "webpack": "^5.70.0",
+    "webpack-cli": "^4.9.2",
+    "webpack-dev-server": "^4.7.4"
   },
   "peerDependencies": {
     "react": "^16.8.3",
diff --git a/webpack.config.js b/webpack.config.js
index 69be72ce9..8c4e2eaf0 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -27,7 +27,6 @@ const baseConfig = mode => ({
     minimizer: [
       new TerserPlugin({
         extractComments: true,
-        sourceMap: true,
       }),
     ],
   },
@@ -75,12 +74,12 @@ module.exports = (env, options) => {
   return {
     ...config,
     devServer: {
-      contentBase: [
+      hot: true,
+      port: 4444,
+      static: [
         './__tests__/integration/mirador',
         './__tests__/fixtures',
       ],
-      hot: true,
-      port: 4444,
     },
     devtool: 'eval-source-map',
     mode: 'development',
-- 
GitLab