Skip to content

Commit e0740f6

Browse files
committed
Fix minimatch type error properly, upgrade webpack-dev stuff
1 parent 6af3ac0 commit e0740f6

5 files changed

Lines changed: 1128 additions & 1730 deletions

File tree

backend/tsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
"outDir": "dist/",
1111
"strict": true,
1212
"target": "ES2022",
13-
"skipLibCheck": true,
14-
"types": ["jest"]
13+
"skipLibCheck": true
1514
},
1615
"include": [
1716
"src/**/*.ts",

frontend/tsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
"resolveJsonModule": true,
1313
"strict": true,
1414
"skipLibCheck": true,
15-
"ignoreDeprecations": "5.0",
16-
"types": ["jest"]
15+
"ignoreDeprecations": "5.0"
1716
},
1817
"include": [
1918
"src/**/*.ts",

frontend/webpack.config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ module.exports = {
1111
entry: "./src/index.tsx",
1212

1313
output: {
14-
filename: isProduction ? "[name].[contenthash].js" : "[name].[hash].js",
14+
filename: isProduction ? "[name].[contenthash].js" : "[name].[fullhash].js",
1515
chunkFilename: isProduction
1616
? "[name].[contenthash].js"
17-
: "[name].[hash].js",
17+
: "[name].[fullhash].js",
1818
path: __dirname + "/dist",
1919
},
2020

@@ -80,7 +80,7 @@ module.exports = {
8080
template: "./src/index.html",
8181
}),
8282
new BundleAnalyzerPlugin({
83-
analyzerMode: "static",
83+
analyzerMode: isProduction ? "static" : "disabled",
8484
openAnalyzer: false,
8585
reportFilename: "../bundle/report.html",
8686
}),

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"backend::usermod": "cd backend/ && ts-node src/usermod.ts",
1313
"frontend::build": "cd frontend/ && NODE_ENV=production webpack --mode production",
1414
"frontend::codecov": "./codecov do-upload -f frontend/coverage/*.json -F frontend",
15-
"frontend::start": "cd frontend && webpack-dev-server --inline --hot --mode development",
15+
"frontend::start": "cd frontend && webpack-cli serve --mode development",
1616
"frontend::test": "cd frontend/ && jest --coverage --runInBand",
1717
"frontend::typecheck": "tsc --noEmit --project frontend/",
1818
"unused-exports": "ts-node --compiler-options '{ \"downlevelIteration\": true }' unused-exports.ts",
@@ -24,7 +24,7 @@
2424
"@babel/core": "^7.11.4",
2525
"@emotion/core": "^10.0.28",
2626
"@emotion/styled": "^11.11.0",
27-
"@pmmmwh/react-refresh-webpack-plugin": "^0.4.1",
27+
"@pmmmwh/react-refresh-webpack-plugin": "^0.6.2",
2828
"@types/bcrypt": "^3.0.0",
2929
"@types/chart.js": "^2.9.23",
3030
"@types/convict": "^5.2.1",
@@ -56,7 +56,7 @@
5656
"prettier": "^2.0.5",
5757
"react-chartjs-2": "^2.10.0",
5858
"react-markdown": "^6.0.0",
59-
"react-refresh": "^0.8.3",
59+
"react-refresh": "^0.18.0",
6060
"react-router": "^5.0.0",
6161
"react-router-dom": "^5.0.0",
6262
"react-svg-worldmap": "^1.0.27",
@@ -71,10 +71,10 @@
7171
"tslint-react-hooks": "^2.2.2",
7272
"typescript": "^5.8.2",
7373
"use-debounce": "^3.4.3",
74-
"webpack": "^4.40.2",
75-
"webpack-bundle-analyzer": "^3.8.0",
76-
"webpack-cli": "^3.3.0",
77-
"webpack-dev-server": "^3.8.1"
74+
"webpack": "^5.105.4",
75+
"webpack-bundle-analyzer": "^5.3.0",
76+
"webpack-cli": "^7.0.2",
77+
"webpack-dev-server": "^5.2.3"
7878
},
7979
"dependencies": {
8080
"@emotion/react": "^11.11.3",

0 commit comments

Comments
 (0)