Skip to content

Commit 4d5460c

Browse files
committed
Merge branch 'sass-updates'
* sass-updates: Attempt to update vike Remove some unnecessary dependencies Update storybook
2 parents 818fac8 + 6a4ef78 commit 4d5460c

File tree

18 files changed

+37
-60
lines changed

18 files changed

+37
-60
lines changed

package.json

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,21 @@
2727
"@babel/preset-typescript": "^7.21.4",
2828
"@blueprintjs/core": "^5.10.2",
2929
"@macrostrat/hyper": "^3.0.0",
30-
"@parcel/packager-ts": "2.12.0",
31-
"@parcel/transformer-sass": "2.12.0",
32-
"@parcel/transformer-typescript-types": "2.12.0",
33-
"@storybook/addon-actions": "^8.4.1",
34-
"@storybook/addon-docs": "^8.4.1",
35-
"@storybook/addon-essentials": "^8.4.1",
36-
"@storybook/addon-links": "^8.4.1",
37-
"@storybook/addon-viewport": "^8.4.1",
38-
"@storybook/builder-vite": "^8.4.1",
39-
"@storybook/components": "^8.4.1",
40-
"@storybook/manager-api": "^8.4.1",
41-
"@storybook/preview-api": "^8.4.1",
42-
"@storybook/react": "^8.4.1",
43-
"@storybook/react-vite": "^8.4.1",
44-
"@storybook/theming": "^8.4.1",
30+
"@parcel/packager-ts": "^2.13.3",
31+
"@parcel/transformer-sass": "^2.13.3",
32+
"@parcel/transformer-typescript-types": "^2.13.3",
33+
"@storybook/addon-actions": "^8.4.7",
34+
"@storybook/addon-docs": "^8.4.7",
35+
"@storybook/addon-essentials": "^8.4.7",
36+
"@storybook/addon-links": "^8.4.7",
37+
"@storybook/addon-viewport": "^8.4.7",
38+
"@storybook/builder-vite": "^8.4.7",
39+
"@storybook/components": "^8.4.7",
40+
"@storybook/manager-api": "^8.4.7",
41+
"@storybook/preview-api": "^8.4.7",
42+
"@storybook/react": "^8.4.7",
43+
"@storybook/react-vite": "^8.4.7",
44+
"@storybook/theming": "^8.4.7",
4545
"@types/d3-geo": "^2.0.0",
4646
"@types/geojson": "^7946.0.7",
4747
"chalk": "^5.0.1",
@@ -53,16 +53,18 @@
5353
"marked": "^11.0",
5454
"marked-terminal": "^7.1.0",
5555
"node-fetch": "^3.2.9",
56+
"parcel": "^2.13.3",
5657
"prettier": "^2.7.1",
5758
"react": "^18",
5859
"react-dom": "^18",
59-
"sass-embedded": "^1.79.4",
60-
"storybook": "^8.4.1",
60+
"sass-embedded": "^1.83.0",
61+
"storybook": "^8.4.7",
6162
"storybook-dark-mode": "^4.0.2",
6263
"tsx": "^4.19.1",
6364
"typescript": "^5.6.2",
6465
"underscore": "^1.12.0",
65-
"use-async-effect": "^2.2.1"
66+
"use-async-effect": "^2.2.1",
67+
"vite": "^5.4.11"
6668
},
6769
"resolutions": {
6870
"@types/react": "18.3.12"

packages/api-views/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"author": "Daven Quinn",
1010
"license": "ISC",
1111
"dependencies": {
12-
"@macrostrat/hyper": "^2.2.1",
12+
"@macrostrat/hyper": "^3.0.0",
1313
"@macrostrat/ui-components": "workspace:*"
1414
},
1515
"peerDependencies": {

packages/auth-components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"license": "ISC",
88
"dependencies": {
99
"@blueprintjs/core": "^5.10.2",
10-
"@macrostrat/hyper": "^2.0.0",
10+
"@macrostrat/hyper": "^3.0.0",
1111
"classnames": "^2.3.1",
1212
"react": "^18"
1313
},

packages/color-utils/package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
"dist",
2727
"src"
2828
],
29-
"devDependencies": {
30-
"parcel": "^2.12.0"
31-
},
3229
"repository": {
3330
"type": "git",
3431
"url": "https://github.com/UW-Macrostrat/web-components.git",

packages/column-components/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
"author": "Daven Quinn <[email protected]>",
3838
"license": "MIT",
3939
"devDependencies": {
40-
"parcel": "^2.12.0",
4140
"stylus": "^0.59.0"
4241
},
4342
"dependencies": {

packages/data-sheet/package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
"react-dnd-html5-backend": "^14.0.0",
2323
"react-draggable": "^4.4.3"
2424
},
25-
"devDependencies": {
26-
"typescript": "^5.6.2"
27-
},
2825
"exports": {
2926
".": {
3027
"typescript": "./src",

packages/data-sheet2/package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
"react-color": "^2.19.3",
2020
"react-colorful": "^5.6.1"
2121
},
22-
"devDependencies": {
23-
"typescript": "^5.6.2"
24-
},
2522
"exports": {
2623
".": {
2724
"typescript": "./src",

packages/map-components/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
"@types/topojson-client": "^3",
6868
"npm-run-all": "^4.1.5",
6969
"postcss": "^8.3.6",
70-
"prettier": "^2.0.5",
7170
"prompt": "^1.0.0",
7271
"replace-in-file": "^3.4.2",
7372
"rimraf": "^2.6.2",

packages/map-interface/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
"src"
6161
],
6262
"devDependencies": {
63-
"parcel": "^2.12.0",
6463
"postcss": "^8.0.0",
6564
"postcss-modules": "^4.3.0"
6665
},

packages/mapbox-react/package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
"module": "dist/module.js",
77
"types": "dist/types.d.ts",
88
"source": "src/index.ts",
9-
"devDependencies": {
10-
"@parcel/config-default": "^2.6.2",
11-
"parcel": "^2.6.2"
12-
},
139
"dependencies": {
1410
"@macrostrat/hyper": "^3.0.0",
1511
"@macrostrat/mapbox-utils": "^1.3.2",

0 commit comments

Comments
 (0)