Seems to work totally

Author: davenquinn

package.json

@@ -70,22 +70,22 @@
     "@macrostrat-web/text-toolchain": "workspace:*",
     "@macrostrat-web/utility-functions": "workspace:*",
     "@macrostrat/api-types": "^1.1.5",
-    "@macrostrat/color-utils": "^1.2.0",
-    "@macrostrat/column-components": "^2.0.3",
-    "@macrostrat/column-views": "^3.0.2",
-    "@macrostrat/data-components": "^1.0.0",
-    "@macrostrat/data-sheet": "^3.0.1",
-    "@macrostrat/feedback-components": "^2.0.0",
-    "@macrostrat/form-components": "^1.0.2",
+    "@macrostrat/color-utils": "^1.2.1",
+    "@macrostrat/column-components": "^2.0.4",
+    "@macrostrat/column-views": "^3.0.3",
+    "@macrostrat/data-components": "^1.0.1",
+    "@macrostrat/data-sheet": "^3.0.2",
+    "@macrostrat/feedback-components": "^2.0.1",
+    "@macrostrat/form-components": "^1.0.3",
     "@macrostrat/hyper": "^3.0.6",
-    "@macrostrat/map-interface": "^2.0.0",
-    "@macrostrat/map-styles": "^2.0.0",
-    "@macrostrat/mapbox-react": "^3.0.0",
-    "@macrostrat/mapbox-utils": "^1.7.0",
+    "@macrostrat/map-interface": "^2.0.1",
+    "@macrostrat/map-styles": "^2.0.1",
+    "@macrostrat/mapbox-react": "^3.0.1",
+    "@macrostrat/mapbox-utils": "^1.7.1",
     "@macrostrat/style-system": "^0.3.0",
-    "@macrostrat/svg-map-components": "^2.0.0",
-    "@macrostrat/timescale": "^3.0.0",
-    "@macrostrat/ui-components": "^5.0.3",
+    "@macrostrat/svg-map-components": "^2.0.1",
+    "@macrostrat/timescale": "^3.0.1",
+    "@macrostrat/ui-components": "^5.0.4",
     "@photonjs/express": "^0.1.13",
     "@react-hook/size": "^2.1.2",
     "@supabase/postgrest-js": "^1.18.1",
@@ -162,27 +162,5 @@
   "prettier": {
     "proseWrap": "always"
   },
-  "packageManager": "[email protected]",
-  "resolutions": {
-    "@macrostrat/api-types": "portal:../web-components/packages/api-types",
-    "@macrostrat/color-utils": "portal:../web-components/packages/color-utils",
-    "@macrostrat/column-components": "portal:../web-components/packages/column-components",
-    "@macrostrat/column-views": "portal:../web-components/packages/column-views",
-    "@macrostrat/data-components": "portal:../web-components/packages/data-components",
-    "@macrostrat/data-sheet": "portal:../web-components/packages/data-sheet",
-    "@macrostrat/map-interface": "portal:../web-components/packages/map-interface",
-    "@macrostrat/map-styles": "portal:../web-components/packages/map-styles",
-    "@macrostrat/mapbox-react": "portal:../web-components/packages/mapbox-react",
-    "@macrostrat/mapbox-utils": "portal:../web-components/packages/mapbox-utils",
-    "@macrostrat/static-map-utils": "portal:../web-components/packages/static-map-utils",
-    "@macrostrat/stratigraphy-utils": "portal:../web-components/packages/stratigraphy-utils",
-    "@macrostrat/svg-map-components": "portal:../web-components/packages/svg-map-components",
-    "@macrostrat/timescale": "portal:../web-components/packages/timescale",
-    "@macrostrat/ui-components": "portal:../web-components/packages/ui-components",
-    "@macrostrat/feedback-components": "portal:../web-components/packages/feedback-components",
-    "@macrostrat/form-components": "portal:../web-components/packages/form-components",
-    "@macrostrat/style-system": "portal:../web-components/packages/style-system",
-    "@macrostrat/hyperstyle-loader": "portal:../web-components/toolchain/hyperstyle-loader",
-    "@macrostrat/vite-plugin-hyperstyles": "portal:../web-components/toolchain/vite-plugin-hyperstyles"
-  }
+  "packageManager": "[email protected]"
 }

packages/column-builder/package.json

@@ -6,11 +6,11 @@
     "@blueprintjs/icons": "^6.5.1",
     "@blueprintjs/select": "^6.0.14",
     "@macrostrat-web/settings": "workspace:*",
-    "@macrostrat/column-components": "^2.0.3",
-    "@macrostrat/data-components": "^1.0.0",
-    "@macrostrat/form-components": "^1.0.2",
+    "@macrostrat/column-components": "^2.0.4",
+    "@macrostrat/data-components": "^1.0.1",
+    "@macrostrat/form-components": "^1.0.3",
     "@macrostrat/hyper": "^3.0.6",
-    "@macrostrat/ui-components": "^5.0.3",
+    "@macrostrat/ui-components": "^5.0.4",
     "@mapbox/mapbox-gl-draw": "^1.3.0",
     "@supabase/postgrest-js": "^1.18.1",
     "@types/mapbox__mapbox-gl-draw": "^1.2.3",

packages/globe-dev/package.json

@@ -11,8 +11,8 @@
     "@macrostrat/cesium-vector-provider": "^2.0.2",
     "@macrostrat/cesium-viewer": "^1.3.0",
     "@macrostrat/hyper": "^3.0.6",
-    "@macrostrat/mapbox-react": "^3.0.0",
-    "@macrostrat/mapbox-utils": "^1.7.0",
+    "@macrostrat/mapbox-react": "^3.0.1",
+    "@macrostrat/mapbox-utils": "^1.7.1",
     "cesium": "^1.135.0",
     "resium": "^1.19.0"
   }

packages/lithology-hierarchy/package.json

@@ -6,7 +6,7 @@
   "dependencies": {
     "@macrostrat-web/settings": "workspace:^",
     "@macrostrat/hyper": "^3.0.6",
-    "@macrostrat/ui-components": "^5.0.3",
+    "@macrostrat/ui-components": "^5.0.4",
     "@visx/gradient": "^3.3.0",
     "@visx/group": "^3.3.0",
     "@visx/hierarchy": "^3.3.0",

packages/section-editor/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@blueprintjs/core": "^6.7.0",
     "@macrostrat/hyper": "^3.0.6",
-    "@macrostrat/ui-components": "^5.0.3",
+    "@macrostrat/ui-components": "^5.0.4",
     "chroma-js": "^3.2.0",
     "d3": "^5.12.0",
     "labella": "^1.1.4",

vite.config.ts

@@ -17,6 +17,10 @@ const pkg = getPackageJSONContents("package.json");
 
 setupVersionEnvironmentVariables(pkg);
 
+const macrostratPackages = Object.keys(pkg.dependencies).filter((name: string) =>
+  name.startsWith("@macrostrat/")
+);
+
 export default defineConfig({
   resolve: {
     alias: {
@@ -26,12 +30,7 @@ export default defineConfig({
     dedupe: [
       "react",
       "react-dom",
-      "@macrostrat/ui-components",
-      "@macrostrat/column-components",
-      "@macrostrat/mapbox-react",
-      "@macrostrat/map-interface",
-      "@macrostrat/column-views",
-      "@uiw/react-color",
+      ...macrostratPackages,
     ],
   },
   plugins: [
@@ -59,22 +58,9 @@ export default defineConfig({
       cesiumBuildRootPath: cesiumRoot,
     }),
   ],
-  // optimizeDeps: {
-  //   exclude: ["@macrostrat/column-components"],
-  //   include: [
-  //     "@macrostrat/column-components > @uiw/react-color",
-  //   include: [
-  //     "@macrostrat/column-components > @uiw/react-color",
-  //   ]
-  //   // exclude: ["@macrostrat/column-components"],
-  //   //exclude: [...getDependenciesToExcludeFromOptimization(pkg)],
-  //   //include: ["@uiw/react-color"],
-  // },
-  // ssr: {
-  //   resolve: {
-  //     conditions: ["import", "module"]
-  //   },
-  // },
+  ssr: {
+    noExternal: macrostratPackages
+  },
   define: {
     // Cesium base URL
     CESIUM_BASE_URL: JSON.stringify("/cesium"),