Update build

.node-version

@@ -1 +1 @@
-20.7.0
+22.13.1

.yarnrc.yml

@@ -1,8 +1,4 @@
-compressionLevel: mixed
-
-enableGlobalCache: false
-
-nodeLinker: node-modules
+nodeLinker: pnp
 
 packageExtensions:
   debug@*:
@@ -16,4 +12,4 @@ pnpFallbackMode: all
 
 pnpMode: loose
 
-yarnPath: .yarn/releases/yarn-4.3.1.cjs
+yarnPath: .yarn/releases/yarn-4.9.4.cjs

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20
+FROM node:22
 
 # Install rsync
 RUN apt-get update && apt-get install -y rsync
@@ -10,22 +10,6 @@ WORKDIR /usr/src/app
 COPY .yarn/releases .yarn/releases
 COPY .yarnrc.yml yarn.lock package.json ./
 
-# Copy only the elements needed for a Yarn install to take advantage of
-# Docker's layer caching
-# This is complex because we are working with multiple workspaces.
-
-# Copy package JSON files with wildcards
-# This scoops up all package.json files in the directory and subdirectories
-# to deal with Yarn workspaces. However it requires BUILDKIT to be enabled,
-# which is done by setting DOCKER_BUILDKIT=1 in the environment
-RUN --mount=type=bind,target=/docker-context \
-    cd /docker-context/; \
-    find . -name "package.json" -mindepth 0 -maxdepth 5 -exec cp --parents "{}" /usr/src/app/ \;
-
-RUN yarn install --immutable
-
-
-
 # Load the cache from the previous build
 RUN --mount=type=cache,target=/yarn-cache \
      rsync -a /yarn-cache/ .yarn/cache/ \

Makefile

@@ -19,7 +19,6 @@ debug:
 		node --inspect=0.0.0.0:9229 /code/server.js
 
 publish:
-	docker build --platform=linux/amd64 -t $(TAG) .
-	docker push $(TAG)
-
-#nothing changing; testing CI/CD pipeline
+	# Ensure the git repository is clean
+	@git diff --quiet || (echo "Uncommitted changes present. Please commit or stash them before publishing." && exit 1)
+	git tag -a v$(VERSION) -m "Version $(VERSION)"

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "@macrostrat/web",
+  "name": "@macrostrat/rockd-website",
   "private": true,
-  "version": "4.0.8",
+  "version": "2.3.0",
   "description": "Macrostrat map interface",
   "type": "module",
   "scripts": {
@@ -16,11 +16,9 @@
     "test:runtime": "tsx tests/test-urls.ts",
     "test": "vitest"
   },
-  "workspaces": [
-    "packages/*"
-  ],
   "authors": [
-    "David Sklar <[email protected]>"
+    "David Sklar <[email protected]>",
+    "Daven Quinn <[email protected]>"
   ],
   "license": "MIT",
   "devDependencies": {
@@ -46,14 +44,7 @@
     "@blueprintjs/core": "^5.10.2",
     "@blueprintjs/table": "^5.1.4",
     "@loadable/component": "^5.14.1",
-    "@macrostrat-web/map-utils": "workspace:*",
-    "@macrostrat-web/qgis-integration": "workspace:*",
-    "@macrostrat-web/security": "workspace:*",
-    "@macrostrat-web/settings": "workspace:*",
-    "@macrostrat-web/text-toolchain": "workspace:*",
-    "@macrostrat-web/utility-functions": "workspace:*",
     "@macrostrat/color-utils": "^1.0.0",
-    "@macrostrat/corelle": "^2.0.1",
     "@macrostrat/data-components": "^0.2.0",
     "@macrostrat/form-components": "^0.1.2",
     "@macrostrat/hyper": "^3.0.6",
@@ -66,7 +57,6 @@
     "@supabase/postgrest-js": "^1.11.0",
     "@universal-middleware/express": "^0.0.2",
     "@vitejs/plugin-react": "^4.0.4",
-    "cesium": "^1.126.0",
     "chroma-js": "^2.4.2",
     "classnames": "^2.2.6",
     "compression": "^1.7.4",
@@ -77,15 +67,13 @@
     "mapbox-gl": "^2.15.0",
     "new-github-issue-url": "^1.0.0",
     "react": "^18.3.0",
-    "react-cookie": "^3.0.4",
     "react-datepicker": "^7.5.0",
     "react-dom": "^18.3.0",
     "react-intersection-observer": "^9.4.3",
     "react-redux": "^7.2.0",
     "react-router": "^6.8.2",
     "react-router-dom": "^6.8.2",
     "react-router-hash-link": "^2.4.3",
-    "react-spring": "^9.7.3",
     "recharts": "^2.13.0",
     "redux": "^4.0.5",
     "sirv": "^2.0.3",
@@ -94,7 +82,6 @@
     "vike": "^0.4.177",
     "vike-react": "^0.4.15",
     "vite": "^5.3.2",
-    "vite-plugin-cesium": "^1.2.22",
     "zustand": "^4.5.1"
   },
   "resolutions": {
@@ -104,5 +91,5 @@
   "prettier": {
     "proseWrap": "always"
   },
-  "packageManager": "yarn@4.3.1"
+  "packageManager": "yarn@4.9.4"
 }