Merge pull request #207 from UW-Macrostrat/cjs-interop

CommonJS interop

Author: davenquinn

package.json

@@ -53,7 +53,8 @@
     "tsx": "^4.19.1",
     "typescript": "^5.8.3",
     "underscore": "^1.13.7",
-    "use-async-effect": "^2.2.1"
+    "use-async-effect": "^2.2.1",
+    "vite-plugin-cjs-interop": "^2.4.0"
   },
   "devDependencies": {
     "prettier": "^3.7.4",

packages/column-components/CHANGELOG.md

@@ -4,7 +4,11 @@ All notable changes to this project will be documented in this file. The format
 is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.0.0] - Unreleased
+## [2.0.1] - 2026-01-28
+
+- Improve linking of CommonJS dependencies
+
+## [2.0.0] - 2026-01-26
 
 - Standardize bundling
 - Require separate import of `@macrostrat/column-components/style.css` or

packages/column-components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/column-components",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "React rendering primitives for stratigraphic columns",
   "keywords": [
     "geology",

packages/column-creator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/column-creator",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "private": true,
   "description": "Interface for defining stratigraphic columns in a standardized format",
   "repository": {

packages/form-components/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.0.1] - 2026-01-28
+
+- Fix CommonJS dependency linking issues
+- Add `ui-box` dependency
+
 ## [1.0.0] - 2026-01-26
 
 - Update peer dependencies to React 18

packages/form-components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/form-components",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Form components for user input into Macrostrat apps",
   "repository": {
     "type": "git",
@@ -57,7 +57,8 @@
     "@types/react-dom": "^18",
     "axios": "^1.13.2",
     "classnames": "^2.5.1",
-    "mapbox-gl": "^2.15.0||^3.0.0"
+    "mapbox-gl": "^2.15.0||^3.0.0",
+    "ui-box": "^5.4.1"
   },
   "devDependencies": {
     "@macrostrat/web-components-bundler": "workspace:*"

packages/ui-components/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [5.0.1] - 2026-01-28
+
+Fix CommonJS dependency linking issues (centered around `ui-box` dependency)
+
 ## [5.0.0] - 2026-01-26
 
 - Change bundling process to use `@macrostrat/web-components-bundler`

packages/ui-components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/ui-components",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "UI components for React and Blueprint.js",
   "repository": {
     "type": "git",

toolchain/bundler/src/index.ts

@@ -10,6 +10,7 @@ import {
   readPackageJSON,
 } from "./check-entries.js";
 import chalk from "chalk";
+import { cjsInterop } from "vite-plugin-cjs-interop";
 
 const module = import.meta.url;
 const __file = fileURLToPath(module);
@@ -97,6 +98,9 @@ function buildStandardViteConfig(
         logLevel: verbose ? "info" : "silent",
       }) as any,
       checkExportsPlugin,
+      cjsInterop({
+        dependencies: ["labella", "ui-box"],
+      }),
     ],
     build: {
       outDir: resolve(root, "dist"),

tsconfig.json

@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.base.json",
   "compilerOptions": {
-    "types": ["vite/client", "./global.d.ts"],
+    "types": ["vite/client", "./global.d.ts"]
   },
   "include": ["./packages/**/src/*.ts"]
 }