Merge pull request #103 from shanedg/dev/upgrade-deps-try-again

Dev/upgrade deps try again

CONTRIBUTING.md

@@ -89,8 +89,16 @@ corresponds with the expected major version of Node and this repository
 will continue to use Node 18 until Node 20 becomes the active Long Term
 Support (LTS) version
 * `eslint` is excluded because some plugins are not compatible with v9
-* `@testing-library/react` is excluded because of peer dependency conflcts
-* `eslint-plugin-ava` is excluded because it expects `eslint` >= 9
+* `eslint-plugin-ava` is excluded until we can upgrade to eslint v9
+
+Blockers for Eslint v9:
+
+* `eslint-plugin-import` <https://github.com/import-js/eslint-plugin-import/issues/2948>
+* `eslint-plugin-jest`
+* `eslint-plugin-jsx-a11y`
+* `eslint-plugin-react-hooks`
+* `eslint-plugin-testing-library`
+* `@typescript-eslint/utils`
 
 ## Updating pnpm
 

client/package.json

@@ -41,14 +41,15 @@
   "private": true,
   "license": "UNLICENSED",
   "devDependencies": {
-    "@babel/core": "~7.24.4",
+    "@babel/core": "~7.25.2",
     "@babel/plugin-syntax-dynamic-import": "~7.8.3",
     "@babel/plugin-transform-modules-commonjs": "~7.24.1",
-    "@babel/preset-env": "~7.24.4",
+    "@babel/preset-env": "~7.25.3",
     "@babel/preset-react": "~7.24.1",
     "@babel/preset-typescript": "~7.24.1",
+    "@testing-library/dom": "~10.4.0",
     "@testing-library/jest-dom": "~6.4.2",
-    "@testing-library/react": "~15.0.2",
+    "@testing-library/react": "~16.0.0",
     "@trshcmpctr/eslint-config-jest": "workspace:*",
     "@trshcmpctr/eslint-config-react": "workspace:*",
     "@trshcmpctr/eslint-config-typescript": "workspace:*",
@@ -60,24 +61,24 @@
     "@types/react-dom": "~18.3.0",
     "@types/react": "~18.3.3",
     "@types/testing-library__jest-dom": "~5.14.5",
-    "@typescript-eslint/eslint-plugin": "~7.16.0",
-    "@typescript-eslint/parser": "~7.16.0",
+    "@typescript-eslint/eslint-plugin": "~8.1.0",
+    "@typescript-eslint/parser": "~8.1.0",
     "babel-jest": "~29.7.0",
     "babel-loader": "~9.1.0",
     "babel-plugin-syntax-dynamic-import": "~6.18.0",
     "css-loader": "~7.1.1",
-    "cypress": "13.13.0",
+    "cypress": "13.13.3",
     "discord-api-types": "~0.37.46",
     "eslint-import-resolver-typescript": "~3.6.1",
-    "eslint-plugin-cypress": "~3.3.0",
+    "eslint-plugin-cypress": "~3.5.0",
     "eslint-plugin-eslint-comments": "~3.2.0",
     "eslint-plugin-import": "~2.29.1",
-    "eslint-plugin-jest": "~28.6.0",
+    "eslint-plugin-jest": "~28.8.0",
     "eslint-plugin-jsx-a11y": "~6.9.0",
     "eslint-plugin-node": "~11.1.0",
     "eslint-plugin-react-hooks": "~4.6.0",
-    "eslint-plugin-react": "~7.34.1",
-    "eslint-plugin-testing-library": "~6.2.2",
+    "eslint-plugin-react": "~7.35.0",
+    "eslint-plugin-testing-library": "~6.3.0",
     "eslint-webpack-plugin": "~4.2.0",
     "eslint": "~8.57.0",
     "html-webpack-plugin": "~5.6.0",
@@ -97,9 +98,9 @@
   },
   "dependencies": {
     "axios": "~1.7.2",
-    "core-js": "~3.37.0",
+    "core-js": "~3.38.0",
     "react-dom": "~18.3.1",
-    "react-router-dom": "~6.24.1",
+    "react-router-dom": "~6.26.1",
     "react": "~18.3.1"
   }
 }

common/config/rush/.pnpmfile.cjs

@@ -34,5 +34,13 @@ function readPackage(packageJson, context) {
   //  packageJson.dependencies['log4js'] = '0.6.38';
   // }
 
+  if (packageJson.name === '@trshcmpctr/client') {
+    // Running into an issue with latest minor version of webpack-dev-middleware
+    // Possibly an interaction with start-server-and-test but downgrading helps
+    // https://github.com/webpack/webpack-dev-middleware/issues/1920
+    packageJson.dependencies['webpack-dev-middleware'] = '7.2.1';
+    context.log('Fixed up @trshcmpctr/client dependency, webpack-dev-middleware');
+  }
+
   return packageJson;
 }

common/config/rush/command-line.json

@@ -73,7 +73,7 @@
         --minimal \
         --dep 'prod','dev','optional','packageManager','peer' \
         --target latest \
-        --reject '@types/node,eslint,@testing-library/react,eslint-plugin-ava' \
+        --reject '@types/node,eslint,eslint-plugin-ava' \
         && \
         node common/scripts/install-run.js [email protected] \
         npm-check-updates \
@@ -82,7 +82,7 @@
         --minimal \
         --dep 'prod','dev','optional','packageManager','peer' \
         --target latest \
-        --reject '@types/node,eslint,@testing-library/react,eslint-plugin-ava'"
+        --reject '@types/node,eslint,eslint-plugin-ava'"
     },
     {
       "name": "update-minor",