diff --git a/jest-puppeteer.config.js b/jest-puppeteer.config.js index f2324320bc4f2d94696575f495b44753639c7e94..673592b7dd957a274ed2589825eebb9a65efd59d 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 cb2499fafc99afba02a93cd78169d89de5bccdee..abf616532efaf29f154765ad998beaa515eb1265 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 69be72ce98fe4121b47632e383c5ff73a6f57cec..8c4e2eaf0637d3348b43251a47cd32f59d0fe097 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',