Skip to content

Commit 55f41cb

Browse files
authored
Merge pull request #394 from UW-Macrostrat/upgrade-vike
Upgrade various dependencies
2 parents bf1faba + 6b0915b commit 55f41cb

File tree

12 files changed

+2075
-1863
lines changed

12 files changed

+2075
-1863
lines changed

.node-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
nodejs 20.7.0
1+
nodejs 22
22
python 3.11

.yarn/releases/yarn-4.11.0.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: 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.8.1.cjs
20+
yarnPath: .yarn/releases/yarn-4.11.0.cjs

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:20
1+
FROM node:22
22

33
# Install rsync
44
RUN apt-get update && apt-get install -y rsync

package.json

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
"format": "prettier --write .",
1414
"server:prod": "NODE_NO_WARNINGS=1 NODE_ENV=production yarn run server",
1515
"start": "yarn run build && yarn run server",
16-
"test:runtime": "tsx tests/test-urls.ts",
17-
"test": "vitest"
16+
"test:runtime": "tsx tests/test-urls.ts"
1817
},
1918
"workspaces": [
2019
"packages/*"
@@ -38,12 +37,11 @@
3837
"@yarnpkg/sdks": "^3.1.0",
3938
"chalk": "^5.3.0",
4039
"http-proxy-middleware": "^3.0.3",
41-
"nodemon": "^3.1.9",
40+
"nodemon": "^3.1.11",
4241
"prettier": "^2.7.1",
4342
"sass-embedded": "^1.79.1",
4443
"stylus": "^0.55.0",
45-
"typescript": "^5.1.6",
46-
"vitest": "^1.6.0"
44+
"typescript": "^5.9.3"
4745
},
4846
"dependencies": {
4947
"@blueprintjs/core": "^5.10.2",
@@ -98,8 +96,8 @@
9896
"@visx/scale": "^2.2.2",
9997
"@vitejs/plugin-react": "^4.0.4",
10098
"allotment": "^1.20.2",
101-
"axios": "^1.7.9",
102-
"cesium": "^1.130.1",
99+
"axios": "^1.13.2",
100+
"cesium": "^1.135.0",
103101
"chroma-js": "^3.0.0",
104102
"classnames": "^2.2.6",
105103
"compression": "^1.7.4",
@@ -143,23 +141,22 @@
143141
"swagger-ui-react": "^5.12.3",
144142
"topojson-client": "^3.0.0",
145143
"transition-hook": "^1.5.2",
146-
"tsx": "^4.11.2",
147-
"underscore": "^1.13.6",
144+
"tsx": "^4.20.6",
145+
"underscore": "^1.13.7",
148146
"use-debounce": "^9.0.4",
149147
"use-element-dimensions": "^2.1.3",
150148
"use-react-router-breadcrumbs": "^3.2.1",
151149
"use-resize-observer": "^9.1.0",
152150
"vike": "^0.4.222",
153151
"vike-react": "^0.5.12",
154-
"vite": "^6.1.0",
155-
"vite-css-modules": "^1.8.4",
156-
"vite-plugin-cesium": "^1.2.22",
157-
"vite-plugin-cjs-interop": "^2.1.6",
158-
"vite-plugin-inspect": "^0.8.4",
159-
"zustand": "^5.0.1"
152+
"vite": "^7.2.2",
153+
"vite-css-modules": "^1.11.1",
154+
"vite-plugin-cesium": "^1.2.23",
155+
"vite-plugin-cjs-interop": "^2.3.0",
156+
"zustand": "^5.0.8"
160157
},
161158
"prettier": {
162159
"proseWrap": "always"
163160
},
164-
"packageManager": "yarn@4.8.1"
161+
"packageManager": "yarn@4.11.0"
165162
}

packages/column-builder/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@mapbox/mapbox-gl-draw": "^1.3.0",
2222
"@supabase/postgrest-js": "^1.18.1",
2323
"@types/mapbox__mapbox-gl-draw": "^1.2.3",
24-
"axios": "^1.7.9",
24+
"axios": "^1.13.2",
2525
"cross-fetch": "^3.1.5",
2626
"mapbox-gl": "^3.0.0",
2727
"react": "^18",
@@ -34,6 +34,6 @@
3434
"@types/react-beautiful-dnd": "^13.1.2",
3535
"eslint": "^8.7.0",
3636
"eslint-config-next": "^12.0.8",
37-
"typescript": "^4.5.4"
37+
"typescript": "^5.9.3"
3838
}
3939
}

packages/globe-dev/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"devDependencies": {
1010
"react": "^18",
1111
"react-dom": "^18",
12-
"typescript": "^5.0.0",
13-
"vite": "5.4.11",
14-
"vite-plugin-cesium": "^1.2.22"
12+
"typescript": "^5.9.3",
13+
"vite": "^7.2.2",
14+
"vite-plugin-cesium": "^1.2.23"
1515
},
1616
"dependencies": {
1717
"@macrostrat/cesium-martini": "^1.5.3",
@@ -20,7 +20,7 @@
2020
"@macrostrat/hyper": "^3.0.6",
2121
"@macrostrat/mapbox-react": "^2.6.0",
2222
"@macrostrat/mapbox-utils": "^1.5.0",
23-
"cesium": "^1.123.1",
24-
"resium": "^1.18.0"
23+
"cesium": "^1.135.0",
24+
"resium": "^1.19.0"
2525
}
2626
}

packages/sift/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
"turf-centroid": "^1.1.2",
2525
"turf-convex": "^1.0.1",
2626
"turf-explode": "^1.0.1",
27-
"underscore": "^1.8.3",
27+
"underscore": "^1.13.7",
2828
"wellknown": "^0.3.2",
2929
"xhr": "^2.0.3"
3030
},
3131
"devDependencies": {
3232
"@types/react": "^18",
3333
"@types/react-dom": "^18",
3434
"@vitejs/plugin-react": "^4.2.1",
35-
"vite": "5.4.11"
35+
"vite": "^7.2.2"
3636
}
3737
}

0 commit comments

Comments
 (0)