diff --git a/.yarn/sdks/prettier/package.json b/.yarn/sdks/prettier/package.json index 91f9c26c..ac6ec862 100644 --- a/.yarn/sdks/prettier/package.json +++ b/.yarn/sdks/prettier/package.json @@ -1,6 +1,6 @@ { "name": "prettier", - "version": "3.6.1-sdk", + "version": "3.7.4-sdk", "main": "./index.cjs", "type": "commonjs", "bin": "./bin/prettier.cjs" diff --git a/.yarn/sdks/typescript/package.json b/.yarn/sdks/typescript/package.json index b4cde731..19a0b6f1 100644 --- a/.yarn/sdks/typescript/package.json +++ b/.yarn/sdks/typescript/package.json @@ -1,6 +1,6 @@ { "name": "typescript", - "version": "5.8.3-sdk", + "version": "5.9.3-sdk", "main": "./lib/typescript.js", "type": "commonjs", "bin": { diff --git a/package.json b/package.json index 6b574a47..0871e8d0 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "publish:storybook": "./scripts/publish-storybook.sh", "format": "prettier --write .", "check-types": "tsc --noEmit", - "check-circular": "madge --exclude __archive --circular --extensions ts,tsx ." + "check-circular": "madge --exclude __archive --exclude .yarn --circular --extensions ts,tsx ." }, "author": "Daven Quinn", "license": "ISC", diff --git a/packages/column-components/CHANGELOG.md b/packages/column-components/CHANGELOG.md index f395ead0..b58dd4ae 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.3] - 2026-01-28 + +Update handling of `@uiw/react-color` dependency + ## [2.0.2] - 2026-01-28 Add rollup interop to fix CommonJS dependency linking issues diff --git a/packages/column-components/package.json b/packages/column-components/package.json index cc793ad6..f155cb70 100644 --- a/packages/column-components/package.json +++ b/packages/column-components/package.json @@ -1,6 +1,6 @@ { "name": "@macrostrat/column-components", - "version": "2.0.2", + "version": "2.0.3", "description": "React rendering primitives for stratigraphic columns", "keywords": [ "geology", @@ -53,7 +53,7 @@ "@macrostrat/stratigraphy-utils": "workspace:^", "@macrostrat/timescale": "workspace:^", "@macrostrat/ui-components": "workspace:^", - "@uiw/react-color-swatch": "^2.9.2", + "@uiw/react-color": "^2.9.2", "chroma-js": "^3.2.0", "classnames": "^2.5.1", "d3-axis": "^3.0.0", diff --git a/packages/column-components/src/editor/facies/color-picker.ts b/packages/column-components/src/editor/facies/color-picker.ts index e3bc71d2..ad3f11e6 100644 --- a/packages/column-components/src/editor/facies/color-picker.ts +++ b/packages/column-components/src/editor/facies/color-picker.ts @@ -1,6 +1,6 @@ import { Component } from "react"; import h from "@macrostrat/hyper"; -import Swatch from "@uiw/react-color-swatch"; +import { Swatch } from "@uiw/react-color"; import { Popover } from "@blueprintjs/core"; import { FaciesContext } from "../../context"; diff --git a/packages/data-sheet/CHANGELOG.md b/packages/data-sheet/CHANGELOG.md index 2ae160d8..f6657541 100644 --- a/packages/data-sheet/CHANGELOG.md +++ b/packages/data-sheet/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.1] - 2026-01-28 + +Update handling of `@uiw/react-color` dependency + ## [3.0.0] - 2026-01-26 - Update bundling process to `@macrostrat/web-components-bundler` diff --git a/packages/data-sheet/package.json b/packages/data-sheet/package.json index 44ece33b..e51b7770 100644 --- a/packages/data-sheet/package.json +++ b/packages/data-sheet/package.json @@ -1,6 +1,6 @@ { "name": "@macrostrat/data-sheet", - "version": "3.0.0", + "version": "3.0.1", "description": "Scalable data sheet with optional editing capabilities", "repository": { "type": "git", @@ -49,7 +49,7 @@ "@macrostrat/ui-components": "workspace:^", "@supabase/postgrest-js": "^1.17.7", "@types/underscore": "^1.13.0", - "@uiw/react-color-sketch": "^2.9.2", + "@uiw/react-color": "^2.9.2", "chroma-js": "^3.2.0", "classnames": "^2.5.1", "immutability-helper": "^3.1.1", diff --git a/packages/data-sheet/src/components/colors.ts b/packages/data-sheet/src/components/colors.ts index 5b5c4c95..542fabf5 100644 --- a/packages/data-sheet/src/components/colors.ts +++ b/packages/data-sheet/src/components/colors.ts @@ -8,7 +8,7 @@ import { } from "@macrostrat/color-utils"; import { useEffect, useMemo, useRef, useState } from "react"; import { memoize } from "underscore"; -import Sketch from "@uiw/react-color-sketch"; +import { Sketch } from "@uiw/react-color"; import classNames from "classnames"; const h = hyper.styled(styles); diff --git a/packages/ui-components/CHANGELOG.md b/packages/ui-components/CHANGELOG.md index 25e04919..4464c21a 100644 --- a/packages/ui-components/CHANGELOG.md +++ b/packages/ui-components/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [5.0.3] - 2026-01-28 + +Update handling of `@uiw/react-color` dependency + ## [5.0.2] - 2026-01-28 More fixes for CommonJS dependency linking diff --git a/packages/ui-components/package.json b/packages/ui-components/package.json index d52a81d2..df74acb8 100644 --- a/packages/ui-components/package.json +++ b/packages/ui-components/package.json @@ -1,6 +1,6 @@ { "name": "@macrostrat/ui-components", - "version": "5.0.2", + "version": "5.0.3", "description": "UI components for React and Blueprint.js", "repository": { "type": "git", @@ -48,7 +48,7 @@ "@macrostrat/hyper": "^3.0.6", "@types/react": "^18.3.12", "@types/react-dom": "^18", - "@uiw/react-color-sketch": "^2.9.2", + "@uiw/react-color": "^2.9.2", "axios": "^1.13.2", "chroma-js": "^3.2.0", "classnames": "^2.5.1", diff --git a/packages/ui-components/src/form-controls/color-editor.ts b/packages/ui-components/src/form-controls/color-editor.ts index 3fb3cec3..fa82d594 100644 --- a/packages/ui-components/src/form-controls/color-editor.ts +++ b/packages/ui-components/src/form-controls/color-editor.ts @@ -1,6 +1,6 @@ import h from "@macrostrat/hyper"; import { ErrorBoundary } from "../error-boundary"; -import Sketch from "@uiw/react-color-sketch"; +import { Sketch } from "@uiw/react-color"; import { Button, Popover } from "@blueprintjs/core"; import { useState } from "react"; import chroma from "chroma-js"; diff --git a/yarn.lock b/yarn.lock index 32e4bab9..e43b628c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1172,7 +1172,7 @@ __metadata: "@macrostrat/timescale": "workspace:^" "@macrostrat/ui-components": "workspace:^" "@macrostrat/web-components-bundler": "workspace:*" - "@uiw/react-color-swatch": "npm:^2.9.2" + "@uiw/react-color": "npm:^2.9.2" chroma-js: "npm:^3.2.0" classnames: "npm:^2.5.1" d3-axis: "npm:^3.0.0" @@ -1316,7 +1316,7 @@ __metadata: "@macrostrat/web-components-bundler": "workspace:*" "@supabase/postgrest-js": "npm:^1.17.7" "@types/underscore": "npm:^1.13.0" - "@uiw/react-color-sketch": "npm:^2.9.2" + "@uiw/react-color": "npm:^2.9.2" chroma-js: "npm:^3.2.0" classnames: "npm:^2.5.1" immutability-helper: "npm:^3.1.1" @@ -1587,7 +1587,7 @@ __metadata: "@macrostrat/web-components-bundler": "workspace:*" "@types/react": "npm:^18.3.12" "@types/react-dom": "npm:^18" - "@uiw/react-color-sketch": "npm:^2.9.2" + "@uiw/react-color": "npm:^2.9.2" axios: "npm:^1.13.2" chroma-js: "npm:^3.2.0" classnames: "npm:^2.5.1" @@ -3798,6 +3798,101 @@ __metadata: languageName: node linkType: hard +"@uiw/react-color-block@npm:2.9.2": + version: 2.9.2 + resolution: "@uiw/react-color-block@npm:2.9.2" + dependencies: + "@uiw/color-convert": "npm:2.9.2" + "@uiw/react-color-editable-input": "npm:2.9.2" + "@uiw/react-color-swatch": "npm:2.9.2" + peerDependencies: + "@babel/runtime": ">=7.19.0" + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 10c0/ab1fd2633b2c777d962b47308548bd13e7d5b80143c3f5d0113458aea5c985cb9a5e8c03f8d5243e7d0abdf721573a919c75dcdae23cb8d987c687c45096b8ca + languageName: node + linkType: hard + +"@uiw/react-color-chrome@npm:2.9.2": + version: 2.9.2 + resolution: "@uiw/react-color-chrome@npm:2.9.2" + dependencies: + "@uiw/color-convert": "npm:2.9.2" + "@uiw/react-color-alpha": "npm:2.9.2" + "@uiw/react-color-editable-input": "npm:2.9.2" + "@uiw/react-color-editable-input-hsla": "npm:2.9.2" + "@uiw/react-color-editable-input-rgba": "npm:2.9.2" + "@uiw/react-color-github": "npm:2.9.2" + "@uiw/react-color-hue": "npm:2.9.2" + "@uiw/react-color-saturation": "npm:2.9.2" + peerDependencies: + "@babel/runtime": ">=7.19.0" + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 10c0/523a47da57ce4d41225a80eb327a711278b868f539c1f521eb01b76f166883eed66d273aeda7a59aa709f553161d8b3a922d4d15230e1ebe55cb6b715f48385a + languageName: node + linkType: hard + +"@uiw/react-color-circle@npm:2.9.2": + version: 2.9.2 + resolution: "@uiw/react-color-circle@npm:2.9.2" + dependencies: + "@uiw/color-convert": "npm:2.9.2" + "@uiw/react-color-swatch": "npm:2.9.2" + peerDependencies: + "@babel/runtime": ">=7.19.0" + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 10c0/a3e6523a7d2184fe8da675a93091e4cd731ddd31890a0f324933dcb30b6680c4298fc65d4cb6549bfa168ae14c586169345014639ad50fdaaa056e4dc90f9866 + languageName: node + linkType: hard + +"@uiw/react-color-colorful@npm:2.9.2": + version: 2.9.2 + resolution: "@uiw/react-color-colorful@npm:2.9.2" + dependencies: + "@uiw/color-convert": "npm:2.9.2" + "@uiw/react-color-alpha": "npm:2.9.2" + "@uiw/react-color-hue": "npm:2.9.2" + "@uiw/react-color-saturation": "npm:2.9.2" + peerDependencies: + "@babel/runtime": ">=7.19.0" + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 10c0/28cfb4171edc200164df94463537480244c6abf24f1825228ad34502129322be522f061d411836d7c91416a42063d34581724abda6e8d98fc0001f699cfb5f8d + languageName: node + linkType: hard + +"@uiw/react-color-compact@npm:2.9.2": + version: 2.9.2 + resolution: "@uiw/react-color-compact@npm:2.9.2" + dependencies: + "@uiw/color-convert": "npm:2.9.2" + "@uiw/react-color-editable-input": "npm:2.9.2" + "@uiw/react-color-editable-input-rgba": "npm:2.9.2" + "@uiw/react-color-swatch": "npm:2.9.2" + peerDependencies: + "@babel/runtime": ">=7.19.0" + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 10c0/e7be906467a43b9098d7a7ade413196db12e935153fc2291e01a7790b009d6f9cbda20764b4aaacfc25f824b3ebc32107bf56a2fa5325261b2770aee1f71274e + languageName: node + linkType: hard + +"@uiw/react-color-editable-input-hsla@npm:2.9.2": + version: 2.9.2 + resolution: "@uiw/react-color-editable-input-hsla@npm:2.9.2" + dependencies: + "@uiw/color-convert": "npm:2.9.2" + "@uiw/react-color-editable-input-rgba": "npm:2.9.2" + peerDependencies: + "@babel/runtime": ">=7.19.0" + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 10c0/0fb392c2ee190b0c5c589b1c54ec89ed6f010be841e4ca7a6081da3c1ed5b4244030e1eb366f509db40bb6bb953a16a7c149e645db9afcddfc3cfa371cd0d843 + languageName: node + linkType: hard + "@uiw/react-color-editable-input-rgba@npm:2.9.2": version: 2.9.2 resolution: "@uiw/react-color-editable-input-rgba@npm:2.9.2" @@ -3823,6 +3918,20 @@ __metadata: languageName: node linkType: hard +"@uiw/react-color-github@npm:2.9.2": + version: 2.9.2 + resolution: "@uiw/react-color-github@npm:2.9.2" + dependencies: + "@uiw/color-convert": "npm:2.9.2" + "@uiw/react-color-swatch": "npm:2.9.2" + peerDependencies: + "@babel/runtime": ">=7.19.0" + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 10c0/c14557d6e18579df6e2d4c5c8b4a45d97bb28e73f81859725bb2452bac79e48a4dbbbc0e605663cd8307815f3ead5059116c6b44b13f6e7fd7ee0d567a845b06 + languageName: node + linkType: hard + "@uiw/react-color-hue@npm:2.9.2": version: 2.9.2 resolution: "@uiw/react-color-hue@npm:2.9.2" @@ -3837,6 +3946,33 @@ __metadata: languageName: node linkType: hard +"@uiw/react-color-material@npm:2.9.2": + version: 2.9.2 + resolution: "@uiw/react-color-material@npm:2.9.2" + dependencies: + "@uiw/color-convert": "npm:2.9.2" + "@uiw/react-color-editable-input": "npm:2.9.2" + "@uiw/react-color-editable-input-rgba": "npm:2.9.2" + peerDependencies: + "@babel/runtime": ">=7.19.0" + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 10c0/27309dca24dae8c71b55771d78085be6afb3c96d46be2f85a48054c4449fc9e6086c3d79315226db70af57541255dee2fbfe874cfb381a00cc063829013e8cd6 + languageName: node + linkType: hard + +"@uiw/react-color-name@npm:2.9.2": + version: 2.9.2 + resolution: "@uiw/react-color-name@npm:2.9.2" + dependencies: + colors-named: "npm:^1.0.1" + colors-named-hex: "npm:^1.0.1" + peerDependencies: + "@babel/runtime": ">=7.19.0" + checksum: 10c0/51730c298dfc477adc13a7fedc6b7cad4c877332d7baba5a36fd3f89bc2e959e894f30919bc7441fc7dc035b216b78b4e0e547c54703010df77f3b329ec366ea + languageName: node + linkType: hard + "@uiw/react-color-saturation@npm:2.9.2": version: 2.9.2 resolution: "@uiw/react-color-saturation@npm:2.9.2" @@ -3851,7 +3987,21 @@ __metadata: languageName: node linkType: hard -"@uiw/react-color-sketch@npm:^2.9.2": +"@uiw/react-color-shade-slider@npm:2.9.2": + version: 2.9.2 + resolution: "@uiw/react-color-shade-slider@npm:2.9.2" + dependencies: + "@uiw/color-convert": "npm:2.9.2" + "@uiw/react-color-alpha": "npm:2.9.2" + peerDependencies: + "@babel/runtime": ">=7.19.0" + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 10c0/445c55926e511a52d771f63765e88505f03c6d112dbebaf44b920200bfcbc9062419a4a20a9a74b630b199aa4be63ca4c0050189a492e054915932d1fd12a292 + languageName: node + linkType: hard + +"@uiw/react-color-sketch@npm:2.9.2": version: 2.9.2 resolution: "@uiw/react-color-sketch@npm:2.9.2" dependencies: @@ -3870,7 +4020,21 @@ __metadata: languageName: node linkType: hard -"@uiw/react-color-swatch@npm:2.9.2, @uiw/react-color-swatch@npm:^2.9.2": +"@uiw/react-color-slider@npm:2.9.2": + version: 2.9.2 + resolution: "@uiw/react-color-slider@npm:2.9.2" + dependencies: + "@uiw/color-convert": "npm:2.9.2" + "@uiw/react-color-alpha": "npm:2.9.2" + peerDependencies: + "@babel/runtime": ">=7.19.0" + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 10c0/374a77ba02e46d0897da674574d466dedccaf98fd1b58c8ecb50a48314180ceb3805165b5cbe13aa844a798967e46372f07a172fe084317d895f833cd086d7b4 + languageName: node + linkType: hard + +"@uiw/react-color-swatch@npm:2.9.2": version: 2.9.2 resolution: "@uiw/react-color-swatch@npm:2.9.2" dependencies: @@ -3883,6 +4047,52 @@ __metadata: languageName: node linkType: hard +"@uiw/react-color-wheel@npm:2.9.2": + version: 2.9.2 + resolution: "@uiw/react-color-wheel@npm:2.9.2" + dependencies: + "@uiw/color-convert": "npm:2.9.2" + "@uiw/react-drag-event-interactive": "npm:2.9.2" + peerDependencies: + "@babel/runtime": ">=7.19.0" + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 10c0/80d351cd5c8a0b796e37dc4b1bf230313675e3667b3ac33aed8d54405bd2cb986eb337052e63f4a177e689f1a6efe8f1f042541ed95c45238fe95de51915a53b + languageName: node + linkType: hard + +"@uiw/react-color@npm:^2.9.2": + version: 2.9.2 + resolution: "@uiw/react-color@npm:2.9.2" + dependencies: + "@uiw/color-convert": "npm:2.9.2" + "@uiw/react-color-alpha": "npm:2.9.2" + "@uiw/react-color-block": "npm:2.9.2" + "@uiw/react-color-chrome": "npm:2.9.2" + "@uiw/react-color-circle": "npm:2.9.2" + "@uiw/react-color-colorful": "npm:2.9.2" + "@uiw/react-color-compact": "npm:2.9.2" + "@uiw/react-color-editable-input": "npm:2.9.2" + "@uiw/react-color-editable-input-hsla": "npm:2.9.2" + "@uiw/react-color-editable-input-rgba": "npm:2.9.2" + "@uiw/react-color-github": "npm:2.9.2" + "@uiw/react-color-hue": "npm:2.9.2" + "@uiw/react-color-material": "npm:2.9.2" + "@uiw/react-color-name": "npm:2.9.2" + "@uiw/react-color-saturation": "npm:2.9.2" + "@uiw/react-color-shade-slider": "npm:2.9.2" + "@uiw/react-color-sketch": "npm:2.9.2" + "@uiw/react-color-slider": "npm:2.9.2" + "@uiw/react-color-swatch": "npm:2.9.2" + "@uiw/react-color-wheel": "npm:2.9.2" + peerDependencies: + "@babel/runtime": ">=7.19.0" + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 10c0/a427143113abd4c0c8ccba6ca185de083974689a5d038ea1d5258d69511376f8e88c0ec98431274b9d1ae205fbfb9b4d2da5d0d2a0b2b911aec817f6c4e67997 + languageName: node + linkType: hard + "@uiw/react-drag-event-interactive@npm:2.9.2": version: 2.9.2 resolution: "@uiw/react-drag-event-interactive@npm:2.9.2" @@ -4984,6 +5194,20 @@ __metadata: languageName: node linkType: hard +"colors-named-hex@npm:^1.0.1": + version: 1.0.3 + resolution: "colors-named-hex@npm:1.0.3" + checksum: 10c0/573aebf2f71510ee83439fdbafcf9c486d8fa64225824b298927ddbfa823861e48e0bca3268eddbb8d6d3a28b03593bc016120b221eda42a9439cb8bf88a638f + languageName: node + linkType: hard + +"colors-named@npm:^1.0.1": + version: 1.0.4 + resolution: "colors-named@npm:1.0.4" + checksum: 10c0/e0688b4b529d4a654dcda1f0a78d159ec989f0e3a236342514caeae70d4cf570bc638a07fad6adab12be19a3bf722a5e13b7c6b0427b3cd041c6a320de1cfb23 + languageName: node + linkType: hard + "combined-stream@npm:^1.0.8": version: 1.0.8 resolution: "combined-stream@npm:1.0.8"