Skip to content

Commit 6e4f846

Browse files
authored
Merge pull request #176 from UW-Macrostrat/static-map-utils
Static map utils
2 parents 7c4b95e + efcb73f commit 6e4f846

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+3071
-1540
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,4 @@ packages/*/dist
3737

3838
.idea/workspace.xml
3939
.idea/tasks.xml
40+
.npmrc

.mise.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[tools]
2-
node = "20"
2+
node = "22"

.storybook/main.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// This file has been automatically migrated to valid ESM format by Storybook.
12
import { createRequire } from "node:module";
23
import { dirname, join } from "node:path";
34
import type { StorybookConfig } from "@storybook/react-vite";
@@ -14,11 +15,11 @@ export default {
1415
"../packages/**/*.stories.@(mdx|js|jsx|ts|tsx)",
1516
],
1617
addons: [
17-
"@storybook/addon-docs",
18-
"@storybook/addon-links",
19-
"@vueless/storybook-dark-mode",
18+
getAbsolutePath("@storybook/addon-docs"),
19+
getAbsolutePath("@storybook/addon-links"),
20+
getAbsolutePath("@vueless/storybook-dark-mode"),
2021
],
21-
framework: "@storybook/react-vite",
22+
framework: getAbsolutePath("@storybook/react-vite"),
2223
docs: {},
2324
} as StorybookConfig;
2425

.storybook/preview.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export const parameters = {
2323
container: DocsContainer,
2424
},
2525
backgrounds: {
26-
disable: true,
26+
disabled: true,
2727
},
2828
darkMode: {
2929
// Override the default light theme
@@ -62,11 +62,13 @@ export const decorators = [
6262

6363
export const tags = ["autodocs"];
6464

65+
export function resolvePattern(id: string) {
66+
return `https://dev.macrostrat.org/assets/geologic-patterns/svg/${id}.svg`;
67+
}
68+
6569
function PatternProvider({ children }) {
6670
return h(GeologicPatternProvider, {
67-
resolvePattern(id: string) {
68-
return `https://dev.macrostrat.org/assets/geologic-patterns/svg/${id}.svg`;
69-
},
71+
resolvePattern,
7072
children,
7173
});
7274
}

.yarn/releases/yarn-4.10.3.cjs

Lines changed: 942 additions & 0 deletions
Large diffs are not rendered by default.

.yarn/releases/yarn-4.8.1.cjs

Lines changed: 0 additions & 935 deletions
This file was deleted.

.yarnrc.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ packageExtensions:
2828
dependencies:
2929
supports-color: "*"
3030

31-
pnpFallbackMode: all
31+
#pnpFallbackMode: all
32+
#
33+
#pnpMode: loose
3234

33-
pnpMode: loose
35+
nodeLinker: node-modules
3436

35-
yarnPath: .yarn/releases/yarn-4.8.1.cjs
37+
yarnPath: .yarn/releases/yarn-4.10.3.cjs

package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
"@parcel/config-default": "^2.16.0",
3333
"@parcel/transformer-sass": "^2.16.0",
3434
"@parcel/transformer-typescript-types": "^2.16.0",
35-
"@storybook/addon-docs": "9.0.12",
36-
"@storybook/addon-links": "9.0.12",
37-
"@storybook/builder-vite": "9.0.12",
38-
"@storybook/react-vite": "9.0.12",
35+
"@storybook/addon-docs": "10.0.0",
36+
"@storybook/addon-links": "10.0.0",
37+
"@storybook/builder-vite": "10.0.0",
38+
"@storybook/react-vite": "10.0.0",
3939
"@types/d3-geo": "^3.1.0",
4040
"@types/geojson": "^7946.0.16",
4141
"@types/react": "^18.3.12",
@@ -44,6 +44,7 @@
4444
"date-fns": "^4.1.0",
4545
"glob": "^11.0.1",
4646
"lorem-ipsum": "^2.0.8",
47+
"maplibregl-mapbox-request-transformer": "^0.0.3",
4748
"marked": "^11.0",
4849
"marked-terminal": "^7.1.0",
4950
"node-fetch": "^3.2.9",
@@ -52,7 +53,7 @@
5253
"react": "^19",
5354
"react-dom": "^19",
5455
"sass-embedded": "^1.83.0",
55-
"storybook": "9.0.12",
56+
"storybook": "10.0.0",
5657
"tsx": "^4.19.1",
5758
"typescript": "^5.8.3",
5859
"underscore": "^1.12.0",
@@ -69,7 +70,7 @@
6970
"toolchain/*",
7071
"examples/*"
7172
],
72-
"packageManager": "yarn@4.8.1",
73+
"packageManager": "yarn@4.10.3",
7374
"devDependencies": {
7475
"@parcel/packager-ts": "^2.16.0",
7576
"@parcel/transformer-stylus": "^2.16.0",

packages/column-components/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. The format
44
is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
55
project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [1.3.0] - 2025-10-29
8+
9+
- Switch to `@visx/axis` for axis rendering
10+
- Remove `SymbolColumn` component
11+
- Simplify many components
12+
- Improve surface generation
13+
714
## [1.2.0] - 2025-06-25
815

916
Major improvement and modernization for `Note` component for section-aligned

packages/column-components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@macrostrat/column-components",
3-
"version": "1.2.0",
3+
"version": "1.3.0",
44
"description": "React rendering primitives for stratigraphic columns",
55
"keywords": [
66
"geology",

0 commit comments

Comments
 (0)