Internalizing some troublesome dependencies

davenquinn · davenquinn · commit 609ae3a9541d · 2026-01-29T14:51:53.000-06:00
diff --git a/packages/color-utils/package.json b/packages/color-utils/package.json
@@ -45,6 +45,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "typings": "dist/index.d.ts"
+  }
 }
diff --git a/packages/column-components/package.json b/packages/column-components/package.json
@@ -72,14 +72,13 @@
     "react-svg-textures": "^1.4.7",
     "uuid": "^7.0.3"
   },
-  "rollupInternal": [
-    "labella"
-  ],
   "devDependencies": {
     "@macrostrat/web-components-bundler": "workspace:*"
   },
+  "rollupInternal": [
+    "labella"
+  ],
   "publishConfig": {
     "access": "public"
-  },
-  "typings": "dist/index.d.ts"
+  }
 }
diff --git a/packages/column-components/src/editor/facies/description.ts b/packages/column-components/src/editor/facies/description.ts
@@ -2,7 +2,7 @@ import { Component } from "react";
 import h from "@macrostrat/hyper";
 import classNames from "classnames";
 import { FaciesContext } from "../../context";
-import { FaciesSwatch } from "./color-picker";
+import { FaciesSwatch } from "./swatch";
 
 type FaciesData = any;
 
diff --git a/packages/column-creator/package.json b/packages/column-creator/package.json
@@ -59,6 +59,5 @@
   },
   "devDependencies": {
     "@macrostrat/web-components-bundler": "workspace:*"
-  },
-  "typings": "dist/index.d.ts"
+  }
 }
diff --git a/packages/column-views/package.json b/packages/column-views/package.json
@@ -94,6 +94,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "typings": "dist/index.d.ts"
+  }
 }
diff --git a/packages/cross-section-utils/package.json b/packages/cross-section-utils/package.json
@@ -41,6 +41,5 @@
   },
   "devDependencies": {
     "@macrostrat/web-components-bundler": "workspace:*"
-  },
-  "typings": "dist/index.d.ts"
+  }
 }
diff --git a/packages/data-components/package.json b/packages/data-components/package.json
@@ -71,6 +71,5 @@
   ],
   "publishConfig": {
     "access": "public"
-  },
-  "typings": "dist/index.d.ts"
+  }
 }
diff --git a/packages/data-sheet/package.json b/packages/data-sheet/package.json
@@ -65,6 +65,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "typings": "dist/index.d.ts"
+  }
 }
diff --git a/packages/feedback-components/package.json b/packages/feedback-components/package.json
@@ -66,6 +66,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "typings": "dist/index.d.ts"
+  }
 }
diff --git a/packages/form-components/package.json b/packages/form-components/package.json
@@ -73,6 +73,5 @@
   ],
   "publishConfig": {
     "access": "public"
-  },
-  "typings": "dist/index.d.ts"
+  }
 }
diff --git a/packages/map-interface/package.json b/packages/map-interface/package.json
@@ -72,6 +72,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "typings": "dist/index.d.ts"
+  }
 }
diff --git a/packages/map-styles/package.json b/packages/map-styles/package.json
@@ -50,6 +50,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "typings": "dist/index.d.ts"
+  }
 }
diff --git a/packages/mapbox-react/package.json b/packages/mapbox-react/package.json
@@ -58,6 +58,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "typings": "dist/index.d.ts"
+  }
 }
diff --git a/packages/mapbox-utils/package.json b/packages/mapbox-utils/package.json
@@ -46,6 +46,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "typings": "dist/index.d.ts"
+  }
 }
diff --git a/packages/static-map-utils/package.json b/packages/static-map-utils/package.json
@@ -66,6 +66,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "typings": "dist/index.d.ts"
+  }
 }
diff --git a/packages/stratigraphy-utils/package.json b/packages/stratigraphy-utils/package.json
@@ -41,6 +41,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "typings": "dist/index.d.ts"
+  }
 }
diff --git a/packages/svg-map-components/package.json b/packages/svg-map-components/package.json
@@ -71,6 +71,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "typings": "dist/index.d.ts"
+  }
 }
diff --git a/packages/timescale/package.json b/packages/timescale/package.json
@@ -62,6 +62,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "typings": "dist/index.d.ts"
+  }
 }
diff --git a/packages/ui-components/package.json b/packages/ui-components/package.json
@@ -76,7 +76,6 @@
     "@uiw/react-color",
     "ui-box",
     "use-async-effect",
-    "use-element-dimensions",
     "react-json-tree"
   ],
   "contributors": [
@@ -86,6 +85,5 @@
   ],
   "publishConfig": {
     "access": "public"
-  },
-  "typings": "dist/index.d.ts"
+  }
 }
diff --git a/scripts/publish-helpers/update-package-json-files.ts b/scripts/publish-helpers/update-package-json-files.ts
@@ -39,6 +39,7 @@ const packageJSONKeyOrder = [
   "peerDependencies",
   "dependencies",
   "devDependencies",
+  "rollupInternal",
 ];
 
 export function updatePackageJsonFiles() {
@@ -163,6 +164,7 @@ export function updatePackageJsonFiles() {
       }
     }
     delete newPackageData.targets;
+    delete newPackageData.typings;
 
     const outdatedDevDeps = ["vite", "typescript", "parcel"];
 
diff --git a/toolchain/bundler/src/index.ts b/toolchain/bundler/src/index.ts
@@ -50,18 +50,13 @@ interface PackageJSONData extends Omit<PackageData, "directory"> {
   dependencies?: Record<string, string>;
   peerDependencies?: Record<string, string>;
   devDependencies?: Record<string, string>;
+  rollupInternal?: string[];
 }
 
 interface ViteConfigOpts {
   verbose?: boolean;
 }
 
-const troublesomeDependenciesToInternalize = [
-  "@uiw/react-color",
-  "use-async-effect",
-  "react-json-tree",
-];
-
 function buildStandardViteConfig(
   pkg: PackageJSONData,
   root: string,
@@ -83,13 +78,19 @@ function buildStandardViteConfig(
     },
   };
 
+  const rollupInternal = pkg.rollupInternal ?? [];
+
+  if (rollupInternal.length > 0) {
+    console.log("Internalizing dependencies: ", rollupInternal.join(", "));
+  }
+
   // Prefix for output files
   const prefix = resolve(root).replace(workspaceRoot, "").slice(1) + "/src";
 
   const externalDeps = [
     ...Object.keys(pkg.dependencies || {}),
     ...Object.keys(pkg.peerDependencies || {}),
-  ].filter((dep) => !troublesomeDependenciesToInternalize.includes(dep));
+  ].filter((dep) => !rollupInternal.includes(dep));
 
   return defineConfig({
     root,
diff --git a/toolchain/vite-plugin-hyperstyles/package.json b/toolchain/vite-plugin-hyperstyles/package.json
@@ -44,6 +44,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "typings": "dist/index.d.ts"
+  }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -1172,8 +1172,6 @@ __metadata:
     "@macrostrat/timescale": "workspace:^"
     "@macrostrat/ui-components": "workspace:^"
     "@macrostrat/web-components-bundler": "workspace:*"
-    "@uiw/react-color": "npm:^2.9.2"
-    chroma-js: "npm:^3.2.0"
     classnames: "npm:^2.5.1"
     d3-axis: "npm:^3.0.0"
     d3-format: "npm:^3.1.2"
@@ -1186,7 +1184,6 @@ __metadata:
     react-scroll: "npm:^1.7.16"
     react-select: "npm:^3.0.8"
     react-svg-textures: "npm:^1.4.7"
-    ui-box: "npm:^5.4.1"
     uuid: "npm:^7.0.3"
   peerDependencies:
     react: ^18.0.0||^19.0.0
@@ -1207,7 +1204,6 @@ __metadata:
     "@macrostrat/ui-components": "workspace:^"
     "@macrostrat/web-components-bundler": "workspace:*"
     immutability-helper: "npm:^3.1.1"
-    ui-box: "npm:^5.4.1"
     zustand: "npm:^5.0.3"
     zustand-computed: "npm:^2.0.2"
   peerDependencies:
@@ -1317,8 +1313,6 @@ __metadata:
     "@macrostrat/web-components-bundler": "workspace:*"
     "@supabase/postgrest-js": "npm:^1.17.7"
     "@types/underscore": "npm:^1.13.0"
-    "@uiw/react-color": "npm:^2.9.2"
-    chroma-js: "npm:^3.2.0"
     classnames: "npm:^2.5.1"
     immutability-helper: "npm:^3.1.1"
     underscore: "npm:^1.13.7"
@@ -1375,7 +1369,6 @@ __metadata:
     axios: "npm:^1.13.2"
     classnames: "npm:^2.5.1"
     mapbox-gl: "npm:^2.15.0||^3.0.0"
-    ui-box: "npm:^5.4.1"
   peerDependencies:
     react: ^18.0.0||^19.0.0
     react-dom: ^18.0.0||^19.0.0
@@ -1426,7 +1419,6 @@ __metadata:
     mapbox-gl: "npm:^2.15.0||^3.0.0"
     query-string: "npm:^9.0.0"
     transition-hook: "npm:^1.5.2"
-    ui-box: "npm:^5.4.1"
     underscore: "npm:^1.13.7"
     use-resize-observer: "npm:^9.1.0"
   peerDependencies:

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,5 @@`
`45`	`45`	`},`
`46`	`46`	`"publishConfig": {`
`47`	`47`	`"access": "public"`
`48`		`- },`
`49`		`- "typings": "dist/index.d.ts"`
	`48`	`+ }`
`50`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,5 @@`
`59`	`59`	`},`
`60`	`60`	`"devDependencies": {`
`61`	`61`	`"@macrostrat/web-components-bundler": "workspace:*"`
`62`		`- },`
`63`		`- "typings": "dist/index.d.ts"`
	`62`	`+ }`
`64`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,5 @@`
`94`	`94`	`},`
`95`	`95`	`"publishConfig": {`
`96`	`96`	`"access": "public"`
`97`		`- },`
`98`		`- "typings": "dist/index.d.ts"`
	`97`	`+ }`
`99`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,5 @@`
`41`	`41`	`},`
`42`	`42`	`"devDependencies": {`
`43`	`43`	`"@macrostrat/web-components-bundler": "workspace:*"`
`44`		`- },`
`45`		`- "typings": "dist/index.d.ts"`
	`44`	`+ }`
`46`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,5 @@`
`71`	`71`	`],`
`72`	`72`	`"publishConfig": {`
`73`	`73`	`"access": "public"`
`74`		`- },`
`75`		`- "typings": "dist/index.d.ts"`
	`74`	`+ }`
`76`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,5 @@`
`65`	`65`	`},`
`66`	`66`	`"publishConfig": {`
`67`	`67`	`"access": "public"`
`68`		`- },`
`69`		`- "typings": "dist/index.d.ts"`
	`68`	`+ }`
`70`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,5 @@`
`66`	`66`	`},`
`67`	`67`	`"publishConfig": {`
`68`	`68`	`"access": "public"`
`69`		`- },`
`70`		`- "typings": "dist/index.d.ts"`
	`69`	`+ }`
`71`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,5 @@`
`73`	`73`	`],`
`74`	`74`	`"publishConfig": {`
`75`	`75`	`"access": "public"`
`76`		`- },`
`77`		`- "typings": "dist/index.d.ts"`
	`76`	`+ }`
`78`	`77`	`}`