Merge branch 'main' of https://github.com/UW-Macrostrat/web

* 'main' of https://github.com/UW-Macrostrat/web:
  Set node version to 22
  Upgraded Typescript, etc.
  Upgraded yarn
  Updated globe styles'

Author: davenquinn

.node-version

@@ -1,2 +1,2 @@
-nodejs 20.7.0
+nodejs 22
 python 3.11

.tool-versions

@@ -17,4 +17,4 @@ pnpFallbackMode: all
 
 pnpMode: loose
 
-yarnPath: .yarn/releases/yarn-4.8.1.cjs
+yarnPath: .yarn/releases/yarn-4.11.0.cjs

.yarn/releases/yarn-4.11.0.cjs

@@ -1,4 +1,4 @@
-FROM node:20
+FROM node:22
 
 # Install rsync
 RUN apt-get update && apt-get install -y rsync

.yarn/releases/yarn-4.8.1.cjs

@@ -13,8 +13,7 @@
     "format": "prettier --write .",
     "server:prod": "NODE_NO_WARNINGS=1 NODE_ENV=production yarn run server",
     "start": "yarn run build && yarn run server",
-    "test:runtime": "tsx tests/test-urls.ts",
-    "test": "vitest"
+    "test:runtime": "tsx tests/test-urls.ts"
   },
   "workspaces": [
     "packages/*"
@@ -38,12 +37,11 @@
     "@yarnpkg/sdks": "^3.1.0",
     "chalk": "^5.3.0",
     "http-proxy-middleware": "^3.0.3",
-    "nodemon": "^3.1.9",
+    "nodemon": "^3.1.11",
     "prettier": "^2.7.1",
     "sass-embedded": "^1.79.1",
     "stylus": "^0.55.0",
-    "typescript": "^5.1.6",
-    "vitest": "^1.6.0"
+    "typescript": "^5.9.3"
   },
   "dependencies": {
     "@blueprintjs/core": "^5.10.2",
@@ -98,8 +96,8 @@
     "@visx/scale": "^2.2.2",
     "@vitejs/plugin-react": "^4.0.4",
     "allotment": "^1.20.2",
-    "axios": "^1.7.9",
-    "cesium": "^1.130.1",
+    "axios": "^1.13.2",
+    "cesium": "^1.135.0",
     "chroma-js": "^3.0.0",
     "classnames": "^2.2.6",
     "compression": "^1.7.4",
@@ -143,23 +141,22 @@
     "swagger-ui-react": "^5.12.3",
     "topojson-client": "^3.0.0",
     "transition-hook": "^1.5.2",
-    "tsx": "^4.11.2",
-    "underscore": "^1.13.6",
+    "tsx": "^4.20.6",
+    "underscore": "^1.13.7",
     "use-debounce": "^9.0.4",
     "use-element-dimensions": "^2.1.3",
     "use-react-router-breadcrumbs": "^3.2.1",
     "use-resize-observer": "^9.1.0",
     "vike": "^0.4.222",
     "vike-react": "^0.5.12",
-    "vite": "^6.1.0",
-    "vite-css-modules": "^1.8.4",
-    "vite-plugin-cesium": "^1.2.22",
-    "vite-plugin-cjs-interop": "^2.1.6",
-    "vite-plugin-inspect": "^0.8.4",
-    "zustand": "^5.0.1"
+    "vite": "^7.2.2",
+    "vite-css-modules": "^1.11.1",
+    "vite-plugin-cesium": "^1.2.23",
+    "vite-plugin-cjs-interop": "^2.3.0",
+    "zustand": "^5.0.8"
   },
   "prettier": {
     "proseWrap": "always"
   },
-  "packageManager": "yarn@4.8.1"
+  "packageManager": "yarn@4.11.0"
 }

.yarnrc.yml

@@ -21,7 +21,7 @@
     "@mapbox/mapbox-gl-draw": "^1.3.0",
     "@supabase/postgrest-js": "^1.18.1",
     "@types/mapbox__mapbox-gl-draw": "^1.2.3",
-    "axios": "^1.7.9",
+    "axios": "^1.13.2",
     "cross-fetch": "^3.1.5",
     "mapbox-gl": "^3.0.0",
     "react": "^18",
@@ -34,6 +34,6 @@
     "@types/react-beautiful-dnd": "^13.1.2",
     "eslint": "^8.7.0",
     "eslint-config-next": "^12.0.8",
-    "typescript": "^4.5.4"
+    "typescript": "^5.9.3"
   }
 }

Dockerfile

@@ -9,9 +9,9 @@
   "devDependencies": {
     "react": "^18",
     "react-dom": "^18",
-    "typescript": "^5.0.0",
-    "vite": "5.4.11",
-    "vite-plugin-cesium": "^1.2.22"
+    "typescript": "^5.9.3",
+    "vite": "^7.2.2",
+    "vite-plugin-cesium": "^1.2.23"
   },
   "dependencies": {
     "@macrostrat/cesium-martini": "^1.5.3",
@@ -20,7 +20,7 @@
     "@macrostrat/hyper": "^3.0.6",
     "@macrostrat/mapbox-react": "^2.6.0",
     "@macrostrat/mapbox-utils": "^1.5.0",
-    "cesium": "^1.123.1",
-    "resium": "^1.18.0"
+    "cesium": "^1.135.0",
+    "resium": "^1.19.0"
   }
 }

package.json

@@ -24,14 +24,14 @@
     "turf-centroid": "^1.1.2",
     "turf-convex": "^1.0.1",
     "turf-explode": "^1.0.1",
-    "underscore": "^1.8.3",
+    "underscore": "^1.13.7",
     "wellknown": "^0.3.2",
     "xhr": "^2.0.3"
   },
   "devDependencies": {
     "@types/react": "^18",
     "@types/react-dom": "^18",
     "@vitejs/plugin-react": "^4.2.1",
-    "vite": "5.4.11"
+    "vite": "^7.2.2"
   }
 }