My personal site cherry.computer
htmx tailwind axum askama

build: update to latest toolchains

cherry.computer 3540a2c5 80c9385b

verified
+36 -13
+3 -3
Dockerfile
··· 1 - FROM node:16 as build-js 2 3 WORKDIR /usr/src/myivo 4 ··· 8 COPY frontend . 9 RUN npm run build:production 10 11 - FROM rust:1.74-buster as builder-rs 12 13 WORKDIR /usr/src/myivo-server 14 COPY server . ··· 16 RUN cargo install --profile release --locked --path . 17 18 # run on different image 19 - FROM debian:buster-slim 20 21 RUN apt-get update \ 22 && apt-get install -y openssl ca-certificates \
··· 1 + FROM node:22 AS build-js 2 3 WORKDIR /usr/src/myivo 4 ··· 8 COPY frontend . 9 RUN npm run build:production 10 11 + FROM rust:1.83 AS builder-rs 12 13 WORKDIR /usr/src/myivo-server 14 COPY server . ··· 16 RUN cargo install --profile release --locked --path . 17 18 # run on different image 19 + FROM debian:bookworm-slim 20 21 RUN apt-get update \ 22 && apt-get install -y openssl ca-certificates \
+29 -9
frontend/package-lock.json
··· 13 "three": "^0.139.2" 14 }, 15 "devDependencies": { 16 - "@types/node": "^17.0.25", 17 "@types/three": "^0.139.0", 18 "@typescript-eslint/eslint-plugin": "^5.20.0", 19 "@typescript-eslint/parser": "^5.20.0", ··· 136 "dev": true 137 }, 138 "node_modules/@types/node": { 139 - "version": "17.0.25", 140 - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.25.tgz", 141 - "integrity": "sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==", 142 - "dev": true 143 }, 144 "node_modules/@types/three": { 145 "version": "0.139.0", ··· 2172 "node": ">=4.2.0" 2173 } 2174 }, 2175 "node_modules/uri-js": { 2176 "version": "4.4.1", 2177 "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", ··· 2301 "dev": true 2302 }, 2303 "@types/node": { 2304 - "version": "17.0.25", 2305 - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.25.tgz", 2306 - "integrity": "sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==", 2307 - "dev": true 2308 }, 2309 "@types/three": { 2310 "version": "0.139.0", ··· 3613 "version": "4.6.3", 3614 "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz", 3615 "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==", 3616 "dev": true 3617 }, 3618 "uri-js": {
··· 13 "three": "^0.139.2" 14 }, 15 "devDependencies": { 16 + "@types/node": "^22.10.5", 17 "@types/three": "^0.139.0", 18 "@typescript-eslint/eslint-plugin": "^5.20.0", 19 "@typescript-eslint/parser": "^5.20.0", ··· 136 "dev": true 137 }, 138 "node_modules/@types/node": { 139 + "version": "22.10.5", 140 + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.5.tgz", 141 + "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==", 142 + "dev": true, 143 + "license": "MIT", 144 + "dependencies": { 145 + "undici-types": "~6.20.0" 146 + } 147 }, 148 "node_modules/@types/three": { 149 "version": "0.139.0", ··· 2176 "node": ">=4.2.0" 2177 } 2178 }, 2179 + "node_modules/undici-types": { 2180 + "version": "6.20.0", 2181 + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", 2182 + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", 2183 + "dev": true, 2184 + "license": "MIT" 2185 + }, 2186 "node_modules/uri-js": { 2187 "version": "4.4.1", 2188 "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", ··· 2312 "dev": true 2313 }, 2314 "@types/node": { 2315 + "version": "22.10.5", 2316 + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.5.tgz", 2317 + "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==", 2318 + "dev": true, 2319 + "requires": { 2320 + "undici-types": "~6.20.0" 2321 + } 2322 }, 2323 "@types/three": { 2324 "version": "0.139.0", ··· 3627 "version": "4.6.3", 3628 "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz", 3629 "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==", 3630 + "dev": true 3631 + }, 3632 + "undici-types": { 3633 + "version": "6.20.0", 3634 + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", 3635 + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", 3636 "dev": true 3637 }, 3638 "uri-js": {
+4 -1
frontend/package.json
··· 4 "description": "Personal site for Ivo Murrell", 5 "main": "index.js", 6 "devDependencies": { 7 - "@types/node": "^17.0.25", 8 "@types/three": "^0.139.0", 9 "@typescript-eslint/eslint-plugin": "^5.20.0", 10 "@typescript-eslint/parser": "^5.20.0", ··· 38 "dependencies": { 39 "normalize.css": "^8.0.1", 40 "three": "^0.139.2" 41 } 42 }
··· 4 "description": "Personal site for Ivo Murrell", 5 "main": "index.js", 6 "devDependencies": { 7 + "@types/node": "^22.10.5", 8 "@types/three": "^0.139.0", 9 "@typescript-eslint/eslint-plugin": "^5.20.0", 10 "@typescript-eslint/parser": "^5.20.0", ··· 38 "dependencies": { 39 "normalize.css": "^8.0.1", 40 "three": "^0.139.2" 41 + }, 42 + "volta": { 43 + "node": "22.13.0" 44 } 45 }