Merge branch 'master' into hotfix/about-us-horizontal

Author: jacbn

.env

@@ -1 +1 @@
-REACT_APP_API_VERSION=v3.16.7
+REACT_APP_API_VERSION=v3.16.8

.github/workflows/cypress.yml

@@ -84,4 +84,5 @@ jobs:
         run: |
           echo '## 👀 Visual Regression Test updates' >> $GITHUB_STEP_SUMMARY
           echo 'This run failed due to visual differences compared to our baseline images. A PR with new baseline images has been generated. Please review it [here](${{ steps.cypress-create-pr.outputs.result }}) and merge it if the differences are expected.' >> $GITHUB_STEP_SUMMARY
+          echo 'See [this wiki page](https://github.com/isaacphysics/isaac-wiki/wiki/Visual-regression-tests) for more information and troubleshooting steps.' >> $GITHUB_STEP_SUMMARY
 

config/jest/jest.config.common.js

@@ -4,6 +4,9 @@ module.exports = {
         "!src/**/*.d.ts"
     ],
     "resolver": "jest-pnp-resolver",
+    setupFiles: [
+        "<rootDir>/config/jest/jest.polyfills.js"
+    ],
     "setupFilesAfterEnv": [
         "<rootDir>src/test/setupTests.ts",
         "react-app-polyfill/jsdom"
@@ -15,6 +18,7 @@ module.exports = {
     "testEnvironment": "jsdom",
     "testEnvironmentOptions": {
         "url": "http://localhost",
+        customExportConditions: [''],
     },
     "transform": {
         "^.+\\.css$": "<rootDir>config/jest/cssTransform.js",
@@ -27,7 +31,8 @@ module.exports = {
     ],
     "moduleNameMapper": {
         "^react-native$": "react-native-web",
-        "^.+\\.module\\.(css|sass|scss)$": "identity-obj-proxy"
+        "^.+\\.module\\.(css|sass|scss)$": "identity-obj-proxy",
+        "uuid": "uuid"
     },
     "moduleFileExtensions": [
         "web.js",

config/jest/jest.polyfills.js

@@ -0,0 +1,35 @@
+// jest.polyfills.js
+/**
+ * @note The block below contains polyfills for Node.js globals
+ * required for Jest to function when running JSDOM tests.
+ * These HAVE to be require's and HAVE to be in this exact
+ * order, since "undici" depends on the "TextEncoder" global API.
+ *
+ * Consider migrating to a more modern test runner if
+ * you don't want to deal with this.
+ */
+ 
+import { TextDecoder, TextEncoder } from 'node:util';
+import { ReadableStream, TransformStream } from 'node:stream/web';
+import { performance } from 'node:perf_hooks';
+ 
+Object.defineProperties(globalThis, {
+    TextDecoder: { value: TextDecoder },
+    TextEncoder: { value: TextEncoder },
+    ReadableStream: { value: ReadableStream },
+    TransformStream: { value: TransformStream },
+    performance: { value: performance, writable: true }, // writeable for jest fake timers
+});
+
+import { Blob, File } from 'node:buffer';
+import { fetch, Headers, FormData, Request, Response } from 'undici';
+ 
+Object.defineProperties(globalThis, {
+    fetch: { value: fetch, writable: true },
+    Blob: { value: Blob },
+    File: { value: File },
+    Headers: { value: Headers },
+    FormData: { value: FormData },
+    Request: { value: Request, configurable: true },
+    Response: { value: Response, configurable: true },
+});

cypress/support/commands.tsx

@@ -36,7 +36,7 @@
 //   }
 // }
 
-import {mount, MountOptions} from 'cypress/react';
+import {mount, MountOptions} from 'cypress/react18';
 
 // Augment the Cypress namespace to include type definitions for
 // your custom command.
@@ -46,7 +46,7 @@ declare global {
     // eslint-disable-next-line @typescript-eslint/no-namespace
     namespace Cypress {
         interface Chainable {
-            mountWithStoreAndRouter(component: ReactNode, routes: string[], options: MountOptions): Chainable<Element>;
+            mountWithStoreAndRouter(component: ReactNode, routes: string[], mountOptions?: MountOptions): Chainable<Element>;
         }
     }
 }
@@ -56,14 +56,14 @@ import {Provider} from "react-redux";
 import {store} from "../../src/app/state";
 import {MemoryRouter} from "react-router";
 
-Cypress.Commands.add('mountWithStoreAndRouter', (component, routes, options) => {
+Cypress.Commands.add('mountWithStoreAndRouter', (component, routes, mountOptions) => {
     mount(
         <Provider store={store}>
             <MemoryRouter initialEntries={routes}>
                 {component}
             </MemoryRouter>
         </Provider>
-        , options
+        , mountOptions
     );
 });
 
@@ -75,4 +75,4 @@ if (Cypress.config('isInteractive')) {
     Cypress.Commands.add('matchImage', () => {
         cy.log('Skipping snapshot 👀');
     });
-}
+}

eslint.config.mjs

@@ -38,7 +38,8 @@ export default [
             "@typescript-eslint/ban-ts-comment": "off",
             "@typescript-eslint/explicit-function-return-type": "off",
             "@typescript-eslint/no-empty-interface": "warn",
-            "@typescript-eslint/explicit-module-boundary-types": "off"
+            "@typescript-eslint/explicit-module-boundary-types": "off",
+            "react/jsx-no-target-blank": "off", // https://github.com/isaacphysics/isaac-react-app/pull/1134#discussion_r1774839755
         },
         languageOptions: {
             parser: tsParser,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaac-react-app",
-  "version": "3.14.1-SNAPSHOT",
+  "version": "3.14.2-SNAPSHOT",
   "private": true,
   "engines": {
     "node": ">=18",
@@ -50,7 +50,7 @@
     "redux": "^4.2.1",
     "redux-logger": "^3.0.6",
     "remarkable": "^2.0.1",
-    "uuid": "^9.0.1"
+    "uuid": "^10.0.0"
   },
   "scripts": {
     "build-phy": "webpack --env prod --config config/webpack.config.physics.js",
@@ -122,7 +122,7 @@
     "@types/redux-logger": "^3.0.13",
     "@types/redux-mock-store": "^1.0.6",
     "@types/remarkable": "^2.0.8",
-    "@types/uuid": "^9.0.8",
+    "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^8.3.0",
     "@typescript-eslint/parser": "^8.3.0",
     "axios-mock-adapter": "^1.22.0",
@@ -147,7 +147,7 @@
     "jest-environment-jsdom": "^29.7.0",
     "jest-watch-typeahead": "^2.2.2",
     "mini-css-extract-plugin": "^2.9.1",
-    "msw": "0.49.3",
+    "msw": "^2.4.9",
     "react-app-polyfill": "^3.0.0",
     "react-leaflet": "^4.2.1",
     "react-remove-props-loader": "^1.2.7",
@@ -161,15 +161,13 @@
     "ts-loader": "^9.5.1",
     "typescript": "^5.5.4",
     "typescript-eslint": "^8.3.0",
+    "undici": "^6.19.8",
     "webpack": "^5.94.0",
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.2"
   },
   "msw": {
     "workerDirectory": "public"
-  },
-  "resolutions": {
-    "headers-polyfill": "3.2.5"
   }
 }