Merge pull request #32 from UW-Macrostrat/updates

Updates

Author: davidsklar99

.gitmodules

@@ -1,12 +0,0 @@
-[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

deps/cesium-martini

@@ -17,10 +17,6 @@
     "test": "vitest"
   },
   "workspaces": [
-    "deps/web-components/packages/*",
-    "deps/web-components/storybook",
-    "deps/cesium-viewer",
-    "deps/cesium-martini",
     "packages/*"
   ],
   "authors": [
@@ -32,7 +28,6 @@
     "@babel/preset-env": "^7.19.4",
     "@babel/preset-typescript": "^7.18.6",
     "@macrostrat/revision-info-webpack": "^1.0.0",
-    "@macrostrat/storybook": "workspace:*",
     "@mdx-js/rollup": "^2.3.0",
     "@types/esprima": "^4",
     "@types/underscore": "^1",
@@ -53,9 +48,6 @@
     "@blueprintjs/table": "^5.1.4",
     "@lagunovsky/redux-react-router": "^3.2.0",
     "@loadable/component": "^5.14.1",
-    "@macrostrat-web/data-sheet-test": "workspace:*",
-    "@macrostrat-web/globe": "workspace:*",
-    "@macrostrat-web/lithology-hierarchy": "workspace:*",
     "@macrostrat-web/map-utils": "workspace:*",
     "@macrostrat-web/qgis-integration": "workspace:*",
     "@macrostrat-web/section-editor-demo": "workspace:*",
@@ -64,23 +56,21 @@
     "@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/color-utils": "^1.0.0",
+    "@macrostrat/column-components": "^1.0.3",
+    "@macrostrat/column-views": "^1.0.2",
     "@macrostrat/corelle": "^2.0.1",
-    "@macrostrat/data-sheet2": "workspace:*",
-    "@macrostrat/feedback-components": "workspace:*",
-    "@macrostrat/hyper": "^2.2.1",
-    "@macrostrat/map-components": "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/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",
     "@turf/bbox": "^6.5.0",
@@ -100,6 +90,7 @@
     "@universal-middleware/express": "^0.0.2",
     "@vitejs/plugin-react": "^4.0.4",
     "axios": "^0.25.0",
+    "cesium": "^1.126.0",
     "chroma-js": "^2.4.2",
     "classnames": "^2.2.6",
     "compression": "^1.7.4",
@@ -152,6 +143,10 @@
     "vite-plugin-inspect": "^0.8.4",
     "zustand": "^4.5.1"
   },
+  "resolutions": {
+    "cesium": "^1.123.1",
+    "resium:": "1.17.1"
+  },
   "prettier": {
     "proseWrap": "always"
   },