Transition to NPM-packaged dependencies

.gitmodules

@@ -1,12 +1,3 @@
 [submodule "bundledDeps/cesium-martini"]
 	path = packages/cesium-martini
 	url = https://github.com/davenquinn/cesium-martini.git
-[submodule "deps/ui-components"]
-	path = deps/web-components
-	url = https://github.com/UW-Macrostrat/web-components.git
-[submodule "deps/cesium-viewer"]
-	path = deps/cesium-viewer
-	url = https://github.com/UW-Macrostrat/cesium-viewer.git
-[submodule "deps/cesium-martini"]
-	path = deps/cesium-martini
-	url = https://github.com/davenquinn/cesium-martini.git

.yarnrc.yml

@@ -3,19 +3,18 @@ compressionLevel: mixed
 enableGlobalCache: false
 
 packageExtensions:
+  "@next/react-dev-overlay@*":
+    peerDependencies:
+      react: "*"
   debug@*:
     dependencies:
       supports-color: "*"
   vite@*:
     dependencies:
       supports-color: "*"
 
-  '@next/react-dev-overlay@*':
-    peerDependencies:
-      react: '*'
-
 pnpFallbackMode: all
 
 pnpMode: loose
 
-yarnPath: .yarn/releases/yarn-4.5.1.cjs
+yarnPath: .yarn/releases/yarn-4.6.0.cjs

package.json

@@ -17,9 +17,6 @@
     "test": "vitest"
   },
   "workspaces": [
-    "deps/web-components/packages/*",
-    "deps/cesium-viewer",
-    "deps/cesium-martini",
     "packages/*"
   ],
   "authors": [
@@ -42,17 +39,16 @@
     "chalk": "^5.3.0",
     "http-proxy-middleware": "^3.0.3",
     "prettier": "^2.7.1",
-    "sass": "^1.49.0",
     "sass-embedded": "^1.79.1",
     "stylus": "^0.55.0",
     "typescript": "^5.1.6",
-    "vite-plugin-rewrite-all": "^1.0.1",
     "vitest": "^1.6.0"
   },
   "dependencies": {
     "@blueprintjs/core": "^5.10.2",
     "@blueprintjs/select": "^5.1.4",
     "@blueprintjs/table": "^5.1.4",
+    "@corelle/svg-map-layers": "^1.0.0",
     "@lagunovsky/redux-react-router": "^3.2.0",
     "@loadable/component": "^5.14.1",
     "@macrostrat-web/column-builder": "workspace:*",
@@ -66,27 +62,25 @@
     "@macrostrat-web/sift": "workspace:*",
     "@macrostrat-web/text-toolchain": "workspace:*",
     "@macrostrat-web/utility-functions": "workspace:*",
-    "@macrostrat/api-utils": "workspace:*",
-    "@macrostrat/api-views": "workspace:*",
-    "@macrostrat/auth-components": "workspace:*",
-    "@macrostrat/color-utils": "workspace:*",
-    "@macrostrat/column-components": "workspace:*",
-    "@macrostrat/column-views": "workspace:*",
-    "@macrostrat/corelle": "^2.0.1",
-    "@macrostrat/data-components": "workspace:*",
-    "@macrostrat/data-sheet2": "workspace:*",
-    "@macrostrat/feedback-components": "workspace:*",
-    "@macrostrat/hyper": "^2.2.1",
-    "@macrostrat/map-components": "workspace:*",
-    "@macrostrat/map-interface": "workspace:*",
-    "@macrostrat/mapbox-react": "workspace:^2.1.0",
-    "@macrostrat/mapbox-styles": "workspace:*",
-    "@macrostrat/mapbox-utils": "workspace:*",
-    "@macrostrat/style-system": "workspace:*",
-    "@macrostrat/timescale": "workspace:*",
-    "@macrostrat/ui-components": "workspace:*",
+    "@macrostrat/api-types": "^1.0.0",
+    "@macrostrat/color-utils": "^1.0.0",
+    "@macrostrat/column-components": "^1.0.3",
+    "@macrostrat/column-views": "^1.0.2",
+    "@macrostrat/data-components": "^0.0.6",
+    "@macrostrat/data-sheet": "^2.0.1",
+    "@macrostrat/feedback-components": "^1.0.1",
+    "@macrostrat/form-components": "^0.1.2",
+    "@macrostrat/hyper": "^3.0.6",
+    "@macrostrat/map-interface": "^1.2.2",
+    "@macrostrat/map-styles": "^1.1.1",
+    "@macrostrat/mapbox-react": "^2.5.0",
+    "@macrostrat/mapbox-utils": "^1.4.0",
+    "@macrostrat/style-system": "^0.2.0",
+    "@macrostrat/svg-map-components": "^1.0.3",
+    "@macrostrat/timescale": "^2.1.1",
+    "@macrostrat/ui-components": "^4.1.2",
     "@react-hook/size": "^2.1.2",
-    "@supabase/postgrest-js": "^1.11.0",
+    "@supabase/postgrest-js": "^1.18.1",
     "@turf/bbox": "^6.5.0",
     "@turf/boolean-contains": "^6.5.0",
     "@turf/buffer": "^6.5.0",
@@ -106,25 +100,26 @@
     "@visx/scale": "^2.2.2",
     "@vitejs/plugin-react": "^4.0.4",
     "allotment": "^1.20.2",
-    "axios": "^0.25.0",
+    "axios": "^1.7.9",
     "chroma-js": "^3.0.0",
     "classnames": "^2.2.6",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",
     "cross-fetch": "^4.0.0",
     "d3-array": "^3.1.1",
     "d3-axis": "^3.0.0",
-    "d3-format": "^1.4.4",
+    "d3-format": "^3.1.0",
     "d3-geo": "^3.0.1",
     "d3-scale": "^4.0.2",
-    "d3-selection": "^1.0.0",
+    "d3-selection": "^3.0.0",
     "d3-shape": "^3.2.0",
     "esbuild": "^0.20.0",
     "esbuild-register": "^3.5.0",
     "esprima": "^4.0.1",
-    "express": "^4.18.2",
+    "express": "^4.21.2",
     "express-http-proxy": "^2.0.0",
     "fuse.js": "^7.0.0",
+    "geologic-patterns": "2.0.0-dev1",
     "hex-to-css-filter": "^5.4.0",
     "history": "^5.3.0",
     "immutability-helper": "^3.1.1",
@@ -153,10 +148,12 @@
     "use-element-dimensions": "^2.1.3",
     "use-react-router-breadcrumbs": "^3.2.1",
     "use-resize-observer": "^9.1.0",
-    "vike": "^0.4.199",
-    "vike-react": "^0.5.7",
-    "vite": "^5.3.2",
+    "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": "^4.5.1"
   },
@@ -167,5 +164,5 @@
   "prettier": {
     "proseWrap": "always"
   },
-  "packageManager": "yarn@4.5.1"
+  "packageManager": "yarn@4.6.0"
 }

packages/column-builder/package.json

@@ -13,15 +13,15 @@
     "@blueprintjs/popover2": "^1.2.1",
     "@blueprintjs/select": "^5.2.1",
     "@macrostrat-web/settings": "workspace:*",
-    "@macrostrat/column-components": "workspace:*",
-    "@macrostrat/data-components": "workspace:*",
-    "@macrostrat/form-components": "workspace:*",
-    "@macrostrat/hyper": "^2.0.1",
-    "@macrostrat/ui-components": "workspace:*",
+    "@macrostrat/column-components": "^1.0.3",
+    "@macrostrat/data-components": "^0.0.6",
+    "@macrostrat/form-components": "^0.1.2",
+    "@macrostrat/hyper": "^3.0.6",
+    "@macrostrat/ui-components": "^4.1.2",
     "@mapbox/mapbox-gl-draw": "^1.3.0",
-    "@supabase/postgrest-js": "^0.36.0",
+    "@supabase/postgrest-js": "^1.18.1",
     "@types/mapbox__mapbox-gl-draw": "^1.2.3",
-    "axios": "^0.27.2",
+    "axios": "^1.7.9",
     "cross-fetch": "^3.1.5",
     "mapbox-gl": "^2.8.2",
     "react": "^18",

packages/globe-dev/__temp_disabled/cesium-view.old.ts

@@ -44,7 +44,7 @@ export function BaseLayer({ enabled = true, style, accessToken, ...rest }) {
 import "@znemz/cesium-navigation/dist/index.css";
 
 import { SETTINGS } from "../settings";
-import { buildXRayStyle } from "@macrostrat/mapbox-styles";
+import { buildXRayStyle } from "@macrostrat/map-styles";
 
 // const VectorGeologyLayer = ({ enabled = true, ...rest }) => {
 //   const provider = useRef(

packages/globe-dev/package.json

@@ -14,12 +14,13 @@
     "vite-plugin-cesium": "^1.2.22"
   },
   "dependencies": {
-    "@macrostrat/cesium-martini": "workspace:^1.3.0",
+    "@macrostrat/cesium-martini": "^1.5.3",
     "@macrostrat/cesium-vector-provider": "2.0.2",
-    "@macrostrat/cesium-viewer": "workspace:*",
-    "@macrostrat/hyper": "^2.0.1",
-    "@macrostrat/mapbox-react": "workspace:*",
-    "@macrostrat/mapbox-utils": "workspace:*",
-    "cesium": "^1.123.1"
+    "@macrostrat/cesium-viewer": "^1.2.1",
+    "@macrostrat/hyper": "^3.0.6",
+    "@macrostrat/mapbox-react": "^2.5.0",
+    "@macrostrat/mapbox-utils": "^1.4.0",
+    "cesium": "^1.123.1",
+    "resium": "^1.18.0"
   }
 }

packages/globe-dev/src/cesium-view.ts

@@ -3,7 +3,6 @@
 import TerrainProvider from "@macrostrat/cesium-martini";
 import { useRef, useEffect } from "react";
 import h from "@macrostrat/hyper";
-import { ImageryLayer } from "resium";
 import CesiumViewer, {
   DisplayQuality,
   MapboxLogo,

packages/globe-dev/src/main.module.scss

@@ -95,7 +95,6 @@ body {
     border-radius: 4px;
     margin-bottom: 2px;
     text-decoration: none;
-    background-color: #eee;
   }
 
   .controls li a.active {

packages/lithology-hierarchy/package.json

@@ -4,9 +4,9 @@
   "main": "src/index.ts",
   "license": "ISC",
   "dependencies": {
-    "@macrostrat-web/settings": "workspace:^1.0.0",
-    "@macrostrat/hyper": "^2.2.1",
-    "@macrostrat/ui-components": "workspace:*",
+    "@macrostrat-web/settings": "workspace:^",
+    "@macrostrat/hyper": "^3.0.6",
+    "@macrostrat/ui-components": "^4.1.2",
     "@visx/gradient": "^3.3.0",
     "@visx/group": "^3.3.0",
     "@visx/hierarchy": "^3.3.0",

packages/qgis-integration/package.json

@@ -7,7 +7,7 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "express": "^4.19.2"
+    "express": "^4.21.2"
   },
   "devDependencies": {
     "@types/express": "^4"

packages/section-editor/package.json

@@ -10,8 +10,8 @@
   "license": "ISC",
   "dependencies": {
     "@blueprintjs/core": "^5.10.3",
-    "@macrostrat/hyper": "^2.0",
-    "@macrostrat/ui-components": "workspace:*",
+    "@macrostrat/hyper": "^3.0.6",
+    "@macrostrat/ui-components": "^4.1.2",
     "chroma-js": "^2.0.6",
     "d3": "^5.12.0",
     "labella": "^1.1.4",

packages/sift/package.json

@@ -11,7 +11,7 @@
   "license": "CC0-1.0",
   "dependencies": {
     "@macrostrat-web/settings": "workspace:*",
-    "@macrostrat/hyper": "^2.2.1",
+    "@macrostrat/hyper": "^3.0.6",
     "async": "^1.5.2",
     "chart.js": "^1.0.2",
     "fastclick": "^1.0.6",

pages/+Layout.ts

@@ -1,8 +1,4 @@
-import {
-  DarkModeProvider,
-  DevToolsConsole,
-  DevToolsProvider,
-} from "@macrostrat/ui-components";
+import { DarkModeProvider, DevToolsConsole } from "@macrostrat/ui-components";
 import { ReactNode } from "react";
 
 import { AuthProvider } from "~/_providers/auth";

pages/+config.ts

@@ -5,6 +5,7 @@ import type { Config } from "vike/types";
 // Default config (can be overridden by pages)
 export default {
   title: "Macrostrat",
+  pageStyle: "content",
   description:
     "A platform for geological data exploration, integration, and analysis.",
   extends: vikeReact,

pages/_error/+Page.ts

@@ -40,7 +40,7 @@ function LoginButton() {
   /** For now, the login button only loads on the client side */
   return h(ClientOnly, {
     load: async () => {
-      const res = await import("@macrostrat/auth-components");
+      const res = await import("@macrostrat/form-components");
       return res.AuthStatus;
     },
     fallback: h(

pages/columns/+config.ts

@@ -1,3 +1,4 @@
 export default {
   title: "Columns",
+  pageStyle: "content",
 };

pages/columns/@column/+onBeforeRender.ts

@@ -1,7 +1,7 @@
 // https://vike.dev/onBeforeRender
 
 import { apiV2Prefix } from "@macrostrat-web/settings";
-import { preprocessUnits } from "@macrostrat/column-views/src/helpers";
+import { preprocessUnits } from "@macrostrat/column-views";
 import fetch from "node-fetch";
 
 import { ColumnSummary } from "#/map/map-interface/app-state/handlers/columns";

pages/columns/@column/column-inspector/index.ts

@@ -1,4 +1,4 @@
-import { MacrostratAPIProvider } from "@macrostrat/api-views";
+import { MacrostratAPIProvider } from "@macrostrat/column-views";
 import {
   ColumnNavigatorMap,
   UnitSelectionProvider,
@@ -10,13 +10,15 @@ import { hyperStyled } from "@macrostrat/hyper";
 import { getHashString, setHashString } from "@macrostrat/ui-components";
 import { useEffect, useRef } from "react";
 import { apiV2Prefix } from "@macrostrat-web/settings";
-import { PatternProvider } from "~/_providers.client";
+import { PatternProvider } from "~/_providers";
 import styles from "./column-inspector.module.styl";
-import ModalUnitPanel from "./modal-panel";
 import { BasePage } from "~/layouts";
 
 import { navigate } from "vike/client/router";
 import { PageBreadcrumbs } from "~/components";
+import { onDemand } from "~/_utils";
+
+const ModalUnitPanel = onDemand(() => import("./modal-panel"));
 
 const h = hyperStyled(styles);
 

pages/columns/correlation/+Page.ts

@@ -15,7 +15,7 @@ import { Feature, FeatureCollection, LineString, Point } from "geojson";
 import { useEffect, useMemo } from "react";
 import { setGeoJSON } from "@macrostrat/mapbox-utils";
 import { useCorrelationDiagramStore } from "./state";
-import { PatternProvider } from "~/_providers.client";
+import { PatternProvider } from "~/_providers";
 
 import { buildCrossSectionLayers } from "~/_utils/map-layers";
 import { Button, OverlaysProvider } from "@blueprintjs/core";