diff --git a/package.json b/package.json index 691ffd3b..6b574a47 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,6 @@ "tsx": "^4.19.1", "typescript": "^5.8.3", "underscore": "^1.13.7", - "use-async-effect": "^2.2.1", "vite-plugin-cjs-interop": "^2.4.0" }, "devDependencies": { diff --git a/packages/column-components/CHANGELOG.md b/packages/column-components/CHANGELOG.md index 8103ffab..f395ead0 100644 --- a/packages/column-components/CHANGELOG.md +++ b/packages/column-components/CHANGELOG.md @@ -4,6 +4,10 @@ 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.2] - 2026-01-28 + +Add rollup interop to fix CommonJS dependency linking issues + ## [2.0.1] - 2026-01-28 - Improve linking of CommonJS dependencies diff --git a/packages/column-components/package.json b/packages/column-components/package.json index ae7acbfb..cc793ad6 100644 --- a/packages/column-components/package.json +++ b/packages/column-components/package.json @@ -1,6 +1,6 @@ { "name": "@macrostrat/column-components", - "version": "2.0.1", + "version": "2.0.2", "description": "React rendering primitives for stratigraphic columns", "keywords": [ "geology", diff --git a/packages/column-components/src/util/column-box.ts b/packages/column-components/src/util/column-box.ts index 4407841f..b74a9dd8 100644 --- a/packages/column-components/src/util/column-box.ts +++ b/packages/column-components/src/util/column-box.ts @@ -2,7 +2,7 @@ import h from "@macrostrat/hyper"; import { useContext } from "react"; import { ColumnContext } from "../context"; import classNames from "classnames"; -import Box from "ui-box"; +import { default as Box } from "ui-box"; import { path } from "d3-path"; import type { Path } from "d3-path"; diff --git a/packages/column-views/CHANGELOG.md b/packages/column-views/CHANGELOG.md index df492b1e..3d2fb549 100644 --- a/packages/column-views/CHANGELOG.md +++ b/packages/column-views/CHANGELOG.md @@ -4,6 +4,10 @@ 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). +## [3.0.2] - 2026-01-28 + +Add rollup interop to fix CommonJS dependency linking issues + ## [3.0.1] - 2026-01-28 - Fix CommonJS dependency linking issues diff --git a/packages/column-views/package.json b/packages/column-views/package.json index 4388694d..9dc5b9aa 100644 --- a/packages/column-views/package.json +++ b/packages/column-views/package.json @@ -1,6 +1,6 @@ { "name": "@macrostrat/column-views", - "version": "3.0.1", + "version": "3.0.2", "description": "Data views for Macrostrat stratigraphic columns", "repository": { "type": "git", diff --git a/packages/form-components/CHANGELOG.md b/packages/form-components/CHANGELOG.md index 034968ef..b4b1e371 100644 --- a/packages/form-components/CHANGELOG.md +++ b/packages/form-components/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [1.0.2] - 2026-01-28 + +Add rollup interop to fix CommonJS dependency linking issues + ## [1.0.1] - 2026-01-28 - Fix CommonJS dependency linking issues diff --git a/packages/form-components/package.json b/packages/form-components/package.json index ab7dbeb5..5d06b163 100644 --- a/packages/form-components/package.json +++ b/packages/form-components/package.json @@ -1,6 +1,6 @@ { "name": "@macrostrat/form-components", - "version": "1.0.1", + "version": "1.0.2", "description": "Form components for user input into Macrostrat apps", "repository": { "type": "git", diff --git a/packages/map-interface/CHANGELOG.md b/packages/map-interface/CHANGELOG.md index 80511fa0..843e1ca2 100644 --- a/packages/map-interface/CHANGELOG.md +++ b/packages/map-interface/CHANGELOG.md @@ -4,6 +4,10 @@ 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.1] - 2026-01-28 + +Add rollup interop to fix CommonJS dependency linking issues + ## [2.0.0] - 2026-01-26 - Update peer dependencies to React 18 diff --git a/packages/ui-components/CHANGELOG.md b/packages/ui-components/CHANGELOG.md index c19c0761..25e04919 100644 --- a/packages/ui-components/CHANGELOG.md +++ b/packages/ui-components/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [5.0.2] - 2026-01-28 + +More fixes for CommonJS dependency linking + ## [5.0.1] - 2026-01-28 Fix CommonJS dependency linking issues (centered around `ui-box` dependency) @@ -11,7 +15,6 @@ Fix CommonJS dependency linking issues (centered around `ui-box` dependency) - Require styles to be imported separately as `@macrostrat/ui-components/styles.css` or `@macrostrat/ui-components/dist/ui-components.css` -- ## [4.6.0] - 2026-01-20 diff --git a/packages/ui-components/package.json b/packages/ui-components/package.json index 31736f52..d52a81d2 100644 --- a/packages/ui-components/package.json +++ b/packages/ui-components/package.json @@ -1,6 +1,6 @@ { "name": "@macrostrat/ui-components", - "version": "5.0.1", + "version": "5.0.2", "description": "UI components for React and Blueprint.js", "repository": { "type": "git", diff --git a/packages/ui-components/src/api/provider.ts b/packages/ui-components/src/api/provider.ts index d45cabf7..a41c36f3 100644 --- a/packages/ui-components/src/api/provider.ts +++ b/packages/ui-components/src/api/provider.ts @@ -7,7 +7,7 @@ import axios, { AxiosRequestConfig, AxiosResponse, } from "axios"; -import useAsyncEffect from "use-async-effect"; +import { useAsyncEffect } from "use-async-effect"; import { debounce } from "underscore"; import { APIConfig, ResponseUnwrapper, APIConfigOptions } from "./types"; import { QueryParams } from "../util/query-string"; diff --git a/packages/ui-components/src/util/state-hooks.ts b/packages/ui-components/src/util/state-hooks.ts index 428daf40..696d55eb 100644 --- a/packages/ui-components/src/util/state-hooks.ts +++ b/packages/ui-components/src/util/state-hooks.ts @@ -1,15 +1,8 @@ -import { - Component, - useState, - useRef, - useEffect, - RefObject, - MutableRefObject, -} from "react"; +import { useState, useRef, useEffect } from "react"; import { isEqual } from "underscore"; import update, { Spec } from "immutability-helper"; import { useAsyncEffect } from "use-async-effect"; - +import { Component, MutableRefObject } from "react"; // Re-export useAsyncEffect export { useAsyncEffect }; diff --git a/toolchain/bundler/src/index.ts b/toolchain/bundler/src/index.ts index 102c8a19..84db27a1 100644 --- a/toolchain/bundler/src/index.ts +++ b/toolchain/bundler/src/index.ts @@ -138,7 +138,7 @@ function buildStandardViteConfig( ], output: { preserveModules: true, - exports: "named", // Ignore module export warning for sass files. + interop: "auto", }, }, }, diff --git a/yarn.lock b/yarn.lock index 620081d7..32e4bab9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1668,7 +1668,6 @@ __metadata: tsx: "npm:^4.19.1" typescript: "npm:^5.8.3" underscore: "npm:^1.13.7" - use-async-effect: "npm:^2.2.1" vite: "npm:^7.3.1" vite-plugin-cjs-interop: "npm:^2.4.0" languageName: unknown