upgrade dependencies

Author: tizayi

.devcontainer/devcontainer.json

@@ -9,7 +9,9 @@
     "dockerfile": "../Dockerfile"
   },
   // Features to add to the dev container. More info: https://containers.dev/features.
-  // "features": {},
+  "features": {
+    "ghcr.io/devcontainers/features/git:1": {}
+  },
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   "forwardPorts": [3000],
   // // Uncomment the next line to run commands after the container is created.
@@ -22,5 +24,6 @@
   ],
   // make the workspace folder the same inside and outside of the container
   "workspaceMount": "source=${localWorkspaceFolder},target=${localWorkspaceFolder},type=bind",
-  "workspaceFolder": "${localWorkspaceFolder}"
+  "workspaceFolder": "${localWorkspaceFolder}",
+  "overrideCommand": true
 }

package-lock.json

@@ -16,44 +16,42 @@
   "dependencies": {
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.0",
-    "@eslint/compat": "^1.3.0",
-    "@h5web/lib": "^14.0.1",
-    "@jsonforms/core": "~3.6.0",
-    "@jsonforms/material-renderers": "~3.6.0",
-    "@jsonforms/react": "~3.6.0",
-    "@mui/icons-material": "^5.17.1",
-    "@mui/material": "^5.17.1",
-    "@mui/system": "^5.15.9",
-    "@mui/x-data-grid": "^5.17.4",
-    "@mui/x-date-pickers": "^7.29.4",
+    "@h5web/lib": "^17.0.0",
+    "@jsonforms/core": "~3.8.0",
+    "@jsonforms/material-renderers": "~3.8.0",
+    "@jsonforms/react": "~3.8.0",
+    "@mui/icons-material": "^7.0.0",
+    "@mui/material": "^7.0.0",
+    "@mui/x-data-grid": "^8.0.0",
+    "@mui/x-date-pickers": "^8.0.0",
     "@react-three/fiber": "^8.16.2",
-    "mathjs": "^12.1.0",
+    "mathjs": "^15.0.0",
     "react": "18.3.1",
     "react-color": "^2.19.3",
     "react-dom": "18.3.1",
-    "react-error-boundary": "^5.0.0",
-    "three": "^0.158.0",
-    "zustand": "^4.4.6"
+    "react-error-boundary": "^6.0.0",
+    "three": "~0.182.0",
+    "zustand": "^5.0.0"
   },
   "devDependencies": {
-    "@eslint/css": "^0.9.0",
-    "@eslint/js": "^9.29.0",
+    "@eslint/js": "^10.0.1",
+    "@types/react": "^18.0.0",
     "@types/react-color": "^3.0.10",
-    "@types/react-dom": "^19.1.6",
-    "@types/three": "^0.155.1",
+    "@types/react-dom": "^18.3.1",
+    "@types/three": "~0.182.0",
     "@typescript-eslint/eslint-plugin": "^8.34.1",
     "@typescript-eslint/parser": "^8.34.1",
-    "@vitejs/plugin-react-swc": "^3.4.1",
-    "eslint": "^9.29.0",
+    "@vitejs/plugin-react": "^6.0.2",
+    "eslint": "^10.5.0",
     "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-react": "^7.37.5",
-    "eslint-plugin-react-hooks": "^5.2.0",
-    "eslint-plugin-react-refresh": "^0.4.3",
-    "globals": "^16.2.0",
+    "eslint-plugin-react-hooks": "^7.1.1",
+    "eslint-plugin-react-refresh": "^0.5.3",
+    "globals": "^17.6.0",
+    "jiti": "^2.7.0",
     "prettier": "^3.5.3",
-    "typescript": "^5.8.3",
+    "typescript": "^6.0.0",
     "typescript-eslint": "^8.34.0",
-    "vite": "^6.3.5",
-    "vitest": "^3.0.5"
+    "vite": "^8.0.16",
+    "vitest": "^4.1.9"
   }
 }

package.json

@@ -31,13 +31,13 @@ export class UnitVector {
    */
   multiply(other: UnitVector | Vector3 | Vector2): UnitVector {
     const newx = multiply(this.x, other.x);
-    if (typeof newx === "number" || !("units" in newx)) {
+    if (typeof newx !== "object" || newx === null || !("units" in newx)) {
       throw TypeError("Units of unit vector may be incorrect");
     }
     this.x = newx;
 
     const newy = multiply(this.y, other.y);
-    if (typeof newy === "number" || !("units" in newy)) {
+    if (typeof newy !== "object" || newy === null || !("units" in newy)) {
       throw TypeError("");
     }
     this.y = newy;

src/calculations/unitVector.ts

@@ -121,10 +121,9 @@ export default function AppConfigTable(): React.JSX.Element {
       rows={displayArray}
       getRowId={(row: AppConfigTableRow) => row.name}
       columns={columns}
-      components={{ Toolbar: GridToolbar }}
-      rowsPerPageOptions={[5, 10, 20, 100]}
+      slots={{ toolbar: GridToolbar }}
+      pageSizeOptions={[5, 10, 20, 100]}
       sx={{ border: 0 }}
-      disableSelectionOnClick
     />
   );
 }

src/dialogs/beamline/appConfigTable.tsx

@@ -109,10 +109,9 @@ export default function DetectorTable() {
       rows={displayArray}
       getRowId={(row: DetectorTableRow) => row.name}
       columns={columns}
-      components={{ Toolbar: GridToolbar }}
-      rowsPerPageOptions={[5, 10, 20, 100]}
+      slots={{ toolbar: GridToolbar }}
+      pageSizeOptions={[5, 10, 20, 100]}
       sx={{ border: 0 }}
-      disableSelectionOnClick
     />
   );
 }

src/dialogs/detector/detectorTable.tsx

@@ -5,7 +5,7 @@ import "./index.css";
 import { ErrorBoundary } from "react-error-boundary";
 import AppErrorFallBack from "./utils/errorComponents.tsx";
 
-function logError(error: Error, info: React.ErrorInfo) {
+function logError(error: unknown, info: React.ErrorInfo) {
   console.error("[ErrorBoundary] Uncaught error:", error);
   console.error("[ErrorBoundary] Component stack:", info.componentStack);
 }

src/main.tsx

@@ -9,7 +9,7 @@ import {
 } from "@h5web/lib";
 import { Card, CardContent, Stack } from "@mui/material";
 import Box from "@mui/material/Box";
-import { Unit, createUnit, unit } from "mathjs";
+import { type Unit, createUnit, unit } from "mathjs";
 import { Vector3 } from "three";
 import { computeQrange } from "../calculations/qrange";
 import { getPointForQ } from "../calculations/qvalue";
@@ -430,18 +430,6 @@ export default function CentrePlot(): React.JSX.Element {
 }
 
 function updatePixelUnits(detector: AppDetector): void {
-  /* eslint-disable */
-  // @ts-ignore
-  if (Unit.UNITS.xpixel) {
-    // @ts-ignore
-    delete Unit.UNITS.xpixel;
-  }
-  // @ts-ignore
-  if (Unit.UNITS.ypixel) {
-    // @ts-ignore
-    delete Unit.UNITS.ypixel;
-  }
-  createUnit("xpixel", detector.pixelSize.width.toString());
-  createUnit("ypixel", detector.pixelSize.height.toString());
-  /* eslint-enable */
+  createUnit("xpixel", detector.pixelSize.width.toString(), { override: true });
+  createUnit("ypixel", detector.pixelSize.height.toString(), { override: true });
 }

src/plot/centrePlot.tsx

@@ -292,7 +292,7 @@ function getScaleFactor(
     2 * Math.PI,
     mathjs.multiply(cameraLength, wavelength.to(LengthUnits.metre)),
   );
-  if (typeof scaleFactor === "number" || !("units" in scaleFactor)) {
+  if (typeof scaleFactor !== "object" || scaleFactor === null || !("units" in scaleFactor)) {
     throw new TypeError("scaleFactor should be a Unit not a number");
   }
   return scaleFactor;

src/plot/plotter.ts

@@ -9,23 +9,23 @@ export enum ScatteringOptions {
 
 export const convertFromQToS = (quantity: Unit): Unit => {
   const result = multiply(quantity, 2 * Math.PI);
-  if (typeof result == "number" || !("units" in result)) {
+  if (typeof result !== "object" || result === null || !("units" in result)) {
     throw TypeError("name this error later ");
   }
   return result;
 };
 
 export const convertFromSToQ = (quantity: Unit): Unit => {
   const result = divide(quantity, 2 * Math.PI);
-  if (typeof result == "number" || !("units" in result)) {
+  if (typeof result !== "object" || result === null || !("units" in result)) {
     throw TypeError("name this error later ");
   }
   return result;
 };
 
 export const convertFromQtoD = (quantity: Unit): Unit => {
   const result = divide(2 * Math.PI, quantity);
-  if (typeof result == "number" || !("units" in result)) {
+  if (typeof result !== "object" || result === null || !("units" in result)) {
     throw TypeError("name this error later ");
   }
   return result;