Skip to content

Commit cdc8a5d

Browse files
committed
Merge branch 'fix-storybook-attempt'
* fix-storybook-attempt: Small packaging update Configure some dependencies Updated some typescript types
2 parents 4e1b6e1 + 79cec95 commit cdc8a5d

File tree

13 files changed

+1567
-2043
lines changed

13 files changed

+1567
-2043
lines changed

.yarnrc.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ packageExtensions:
2424
dependencies:
2525
"@types/prop-types": "*"
2626
csstype: "*"
27+
vite@*:
28+
dependencies:
29+
supports-color: "*"
2730

2831
pnpFallbackMode: all
2932

examples/strat-column/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"author": "",
1010
"license": "ISC",
1111
"devDependencies": {
12-
"@types/react": "^18",
12+
"@types/react": "^18.3.12",
1313
"@types/react-dom": "^18",
1414
"typescript": "^5.0.0",
1515
"vite": "^5.3.2",

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,10 @@
4040
"@storybook/react": "^8.6.8",
4141
"@storybook/react-vite": "^8.6.8",
4242
"@storybook/theming": "^8.6.8",
43-
"@types/d3-geo": "^2.0.0",
44-
"@types/geojson": "^7946.0.7",
43+
"@types/d3-geo": "^3.1.0",
44+
"@types/geojson": "^7946.0.16",
4545
"@types/react": "^18.3.12",
4646
"chalk": "^5.0.1",
47-
"concurrently": "^7.2.2",
4847
"date-fns": "^4.1.0",
4948
"glob": "^11.0.1",
5049
"lorem-ipsum": "^2.0.8",

packages/column-views/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
"@turf/distance": "^7.2.0",
4848
"@turf/line-intersect": "^7.2.0",
4949
"@turf/nearest-point-on-line": "^7.2.0",
50-
"@types/chroma-js": "^3",
51-
"@types/d3-format": "^3",
52-
"@types/d3-geo": "^3",
53-
"@types/d3-shape": "^3",
50+
"@types/chroma-js": "^3.1.1",
51+
"@types/d3-format": "^3.0.4",
52+
"@types/d3-geo": "^3.1.0",
53+
"@types/d3-shape": "^3.1.7",
5454
"@types/topojson-client": "^3.1.5",
5555
"@visx/axis": "^3.12.0",
5656
"chroma-js": "^3.1.2",
@@ -63,14 +63,14 @@
6363
"d3-path": "^3.1.0",
6464
"d3-scale": "^4.0.2",
6565
"d3-shape": "^3.2.0",
66-
"mapbox-gl": "^2.11.0",
66+
"mapbox-gl": "^2.15.0",
6767
"react-spring": "^9.7.5",
6868
"topojson-client": "^3.1.0",
6969
"zustand": "^5.0.3",
7070
"zustand-computed": "^2.0.2"
7171
},
7272
"peerDependencies": {
73-
"@blueprintjs/core": "^3.43.0 || ^4.3.0 || ^5.0.0",
73+
"@blueprintjs/core": "^5.0.0",
7474
"react": "^16.8.6||^17.0.0||^18.0.0"
7575
},
7676
"repository": {
@@ -79,8 +79,8 @@
7979
"directory": "packages/column-views"
8080
},
8181
"devDependencies": {
82-
"@types/d3-path": "^3",
83-
"@types/d3-scale": "^4",
82+
"@types/d3-path": "^3.1.1",
83+
"@types/d3-scale": "^4.0.9",
8484
"parcel": "^2.13.3",
8585
"postcss": "^8.0.0",
8686
"postcss-modules": "^6.0.0"

packages/data-components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"license": "MIT",
3434
"devDependencies": {
3535
"@blueprintjs/core": "^5.10.2",
36-
"@types/d3-array": "^3",
36+
"@types/d3-array": "^3.2.1",
3737
"parcel": "^2.13.3"
3838
},
3939
"peerDependencies": {

packages/data-sheet/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"directory": "packages/data-sheet"
5454
},
5555
"devDependencies": {
56-
"@types/underscore": "^1",
56+
"@types/underscore": "^1.13.0",
5757
"parcel": "^2.13.3"
5858
}
5959
}

packages/form-components/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
},
4040
"devDependencies": {
4141
"@types/mapbox-gl": "^2.7.0",
42-
"@types/react": "^17.0.38",
42+
"@types/react": "^18.3.12",
4343
"parcel": "^2.13.3"
4444
},
4545
"peerDependencies": {
@@ -56,8 +56,8 @@
5656
"@mantine/core": "^4.2.1",
5757
"@mantine/hooks": "^4.2.1",
5858
"@mapbox/mapbox-gl-draw": "^1.3.0",
59-
"@types/mapbox__mapbox-gl-draw": "^1.2.3",
60-
"@types/react-dom": "^17.0.16||^18.0.0",
59+
"@types/mapbox__mapbox-gl-draw": "^1.4.8",
60+
"@types/react-dom": "^18",
6161
"axios": "^1.7.9",
6262
"classnames": "^2.5.1",
6363
"mapbox-gl": "^2.15.0"

packages/svg-map-components/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@
4444
"dependencies": {
4545
"@macrostrat/hyper": "^3.0.6",
4646
"@macrostrat/ui-components": "workspace:^",
47-
"@types/d3-array": "^3.0.0",
48-
"@types/d3-drag": "^3.0.0",
49-
"@types/d3-geo": "^3.0.0",
50-
"@types/d3-selection": "^3.0.0",
51-
"@types/d3-zoom": "^3.0.0",
52-
"@types/geojson": "^7946.0.8",
53-
"@types/react-dom": "^16.9.8||^17.0.6||^18.0.0",
47+
"@types/d3-array": "^3.2.1",
48+
"@types/d3-drag": "^3.0.7",
49+
"@types/d3-geo": "^3.1.0",
50+
"@types/d3-selection": "^3.0.11",
51+
"@types/d3-zoom": "^3.0.8",
52+
"@types/geojson": "^7946.0.16",
53+
"@types/react-dom": "^18",
5454
"axios": "^1.7.9",
5555
"d3-array": "^3.2.4",
5656
"d3-drag": "^3.0.0",

packages/timescale/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
"dependencies": {
3535
"@macrostrat/hyper": "^3.0.6",
3636
"@macrostrat/ui-components": "workspace:^",
37-
"@types/classnames": "^2.2.10",
38-
"@types/d3-array": "^2.0.0",
37+
"@types/classnames": "^2.3.4",
38+
"@types/d3-array": "^3.2.1",
3939
"@visx/axis": "^3.12.0",
4040
"@visx/scale": "^3.12.0",
4141
"classnames": "^2.2.6",

packages/ui-components/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
"@blueprintjs/core": "^5.10.2",
4646
"@blueprintjs/datetime2": "^2.3.11",
4747
"@macrostrat/hyper": "^3.0.6",
48-
"@types/react": "^16.14.41 || 17 || 18",
49-
"@types/react-dom": "^17 || ^18",
48+
"@types/react": "^18.3.12",
49+
"@types/react-dom": "^18",
5050
"axios": "^1.7.9",
5151
"chroma-js": "^2.4.2||^3.0.0",
5252
"classnames": "^2.3.0",

0 commit comments

Comments
 (0)