Skip to content

Commit 3b1c25a

Browse files
authored
Merge pull request #269 from UW-Macrostrat/column-map-updates
Column visualizer updates
2 parents 8b26d49 + ae2828f commit 3b1c25a

File tree

48 files changed

+2225
-2951
lines changed

Some content is hidden

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

48 files changed

+2225
-2951
lines changed
Lines changed: 346 additions & 345 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ pnpFallbackMode: all
1717

1818
pnpMode: loose
1919

20-
yarnPath: .yarn/releases/yarn-4.6.0.cjs
20+
yarnPath: .yarn/releases/yarn-4.8.1.cjs

package.json

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,21 @@
6363
"@macrostrat-web/sift": "workspace:*",
6464
"@macrostrat-web/text-toolchain": "workspace:*",
6565
"@macrostrat-web/utility-functions": "workspace:*",
66-
"@macrostrat/api-types": "^1.0.0",
67-
"@macrostrat/color-utils": "^1.0.0",
68-
"@macrostrat/column-components": "^1.0.3",
69-
"@macrostrat/column-views": "^1.0.2",
70-
"@macrostrat/data-components": "^0.0.6",
71-
"@macrostrat/data-sheet": "^2.0.1",
66+
"@macrostrat/api-types": "^1.1.0",
67+
"@macrostrat/color-utils": "^1.1.0",
68+
"@macrostrat/column-components": "^1.1.0",
69+
"@macrostrat/column-views": "^2.0.0",
70+
"@macrostrat/data-components": "^0.1.0",
71+
"@macrostrat/data-sheet": "^2.0.2",
7272
"@macrostrat/feedback-components": "^1.0.1",
73-
"@macrostrat/form-components": "^0.1.2",
73+
"@macrostrat/form-components": "^0.2.1",
7474
"@macrostrat/hyper": "^3.0.6",
75-
"@macrostrat/map-interface": "^1.2.2",
76-
"@macrostrat/map-styles": "^1.1.1",
77-
"@macrostrat/mapbox-react": "^2.5.0",
78-
"@macrostrat/mapbox-utils": "^1.4.0",
79-
"@macrostrat/style-system": "^0.2.0",
80-
"@macrostrat/svg-map-components": "^1.0.3",
75+
"@macrostrat/map-interface": "^1.3.0",
76+
"@macrostrat/map-styles": "^1.2.0",
77+
"@macrostrat/mapbox-react": "^2.6.0",
78+
"@macrostrat/mapbox-utils": "^1.5.0",
79+
"@macrostrat/style-system": "^0.2.1",
80+
"@macrostrat/svg-map-components": "^1.0.4",
8181
"@macrostrat/timescale": "^2.1.1",
8282
"@macrostrat/ui-components": "^4.1.2",
8383
"@react-hook/size": "^2.1.2",
@@ -156,14 +156,10 @@
156156
"vite-plugin-cesium": "^1.2.22",
157157
"vite-plugin-cjs-interop": "^2.1.6",
158158
"vite-plugin-inspect": "^0.8.4",
159-
"zustand": "^4.5.1"
160-
},
161-
"resolutions": {
162-
"cesium": "^1.123.1",
163-
"resium:": "1.17.1"
159+
"zustand": "^5.0.1"
164160
},
165161
"prettier": {
166162
"proseWrap": "always"
167163
},
168-
"packageManager": "yarn@4.6.0"
164+
"packageManager": "yarn@4.8.1"
169165
}

packages/globe-dev/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"@macrostrat/cesium-vector-provider": "2.0.2",
1919
"@macrostrat/cesium-viewer": "^1.2.1",
2020
"@macrostrat/hyper": "^3.0.6",
21-
"@macrostrat/mapbox-react": "^2.5.0",
22-
"@macrostrat/mapbox-utils": "^1.4.0",
21+
"@macrostrat/mapbox-react": "^2.6.0",
22+
"@macrostrat/mapbox-utils": "^1.5.0",
2323
"cesium": "^1.123.1",
2424
"resium": "^1.18.0"
2525
}

0 commit comments

Comments
 (0)