Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 4 additions & 0 deletions packages/column-components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/column-components/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/column-components/src/util/column-box.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
4 changes: 4 additions & 0 deletions packages/column-views/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/column-views/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 4 additions & 0 deletions packages/form-components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/form-components/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 4 additions & 0 deletions packages/map-interface/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion packages/ui-components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion packages/ui-components/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-components/src/api/provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
11 changes: 2 additions & 9 deletions packages/ui-components/src/util/state-hooks.ts
Original file line number Diff line number Diff line change
@@ -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 };

Expand Down
2 changes: 1 addition & 1 deletion toolchain/bundler/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ function buildStandardViteConfig(
],
output: {
preserveModules: true,
exports: "named", // Ignore module export warning for sass files.
interop: "auto",
},
},
},
Expand Down
1 change: 0 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading