From 7454c9b54bfdb59f4a508d90c8efe33e8ce5ac37 Mon Sep 17 00:00:00 2001 From: geoffsee <> Date: Wed, 18 Jun 2025 10:41:39 -0400 Subject: [PATCH] fix build --- .gitignore | 3 +- bun.lock | 62 +++++++++++++++++++--------------- package.json | 2 +- packages/client/package.json | 9 +++-- packages/client/vite.config.ts | 10 +++--- packages/scripts/cleanup.sh | 2 ++ 6 files changed, 50 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index 645d01d..e32406c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,5 @@ packages/client/public/static/fonts/* **/.dev.vars packages/client/public/sitemap.xml packages/client/public/robots.txt -wrangler.dev.jsonc \ No newline at end of file +wrangler.dev.jsonc +/packages/client/public/static/fonts/ diff --git a/bun.lock b/bun.lock index 6f40d00..6a3c989 100644 --- a/bun.lock +++ b/bun.lock @@ -25,14 +25,15 @@ "@testing-library/jest-dom": "^6.4.2", "@testing-library/react": "^14.2.1", "@testing-library/user-event": "^14.5.2", + "@types/bun": "*", "@types/marked": "^6.0.0", "@vitejs/plugin-react": "^4.3.4", "@vitest/coverage-v8": "^3.1.4", "@vitest/ui": "^3.1.4", + "bun": "*", "chokidar": "^4.0.1", "framer-motion": "^11.13.1", "isomorphic-dompurify": "^2.19.0", - "itty-router": "^5.0.18", "js-cookie": "^3.0.5", "jsdom": "^24.0.0", "katex": "^0.16.20", @@ -45,7 +46,6 @@ "mobx-react-lite": "^4.0.7", "mobx-state-tree": "^6.0.1", "moo": "^0.5.2", - "openai": "^5.0.1", "qrcode.react": "^4.1.0", "react": "^18.3.1", "react-dom": "^18.3.1", @@ -58,8 +58,6 @@ "vite": "^6.3.5", "vite-plugin-pwa": "^1.0.0", "vitest": "^3.1.4", - "wrangler": "^4.18.0", - "zod": "^3.23.8", }, }, "packages/cloudflare-workers/open-gsio": { @@ -86,48 +84,24 @@ "name": "@open-gsio/server", "devDependencies": { "@anthropic-ai/sdk": "^0.32.1", - "@chakra-ui/react": "^2.10.6", "@cloudflare/workers-types": "^4.20241205.0", - "@emotion/react": "^11.13.5", - "@emotion/styled": "^11.13.5", "@open-gsio/env": "workspace:*", "@testing-library/jest-dom": "^6.4.2", - "@testing-library/react": "^14.2.1", "@testing-library/user-event": "^14.5.2", - "@types/marked": "^6.0.0", - "@vitejs/plugin-react": "^4.3.4", "@vitest/coverage-v8": "^3.1.4", "@vitest/ui": "^3.1.4", "bun-sqlite-key-value": "^1.13.1", "chokidar": "^4.0.1", "dotenv": "^16.5.0", - "framer-motion": "^11.13.1", - "isomorphic-dompurify": "^2.19.0", "itty-router": "^5.0.18", - "js-cookie": "^3.0.5", "jsdom": "^24.0.0", - "katex": "^0.16.20", - "lucide-react": "^0.436.0", - "marked": "^15.0.4", - "marked-extended-latex": "^1.1.0", - "marked-footnote": "^1.2.4", - "marked-katex-extension": "^5.1.4", "mobx": "^6.13.5", - "mobx-react-lite": "^4.0.7", "mobx-state-tree": "^6.0.1", "moo": "^0.5.2", "openai": "^5.0.1", - "qrcode.react": "^4.1.0", - "react": "^18.3.1", - "react-dom": "^18.3.1", - "react-icons": "^5.4.0", - "react-streaming": "^0.3.44", - "react-textarea-autosize": "^8.5.5", - "shiki": "^1.24.0", "typescript": "^5.7.2", "vike": "0.4.193", "vite": "^6.3.5", - "vite-plugin-pwa": "^1.0.0", "vitest": "^3.1.4", "wrangler": "^4.18.0", "zod": "^3.23.8", @@ -535,6 +509,28 @@ "@open-gsio/worker": ["@open-gsio/worker@workspace:packages/cloudflare-workers/open-gsio"], + "@oven/bun-darwin-aarch64": ["@oven/bun-darwin-aarch64@1.2.16", "", { "os": "darwin", "cpu": "arm64" }, "sha512-NLVU9YDORq/3WuJOE5TQv5of3R99n56gYZPfdqP4U0/5nllbC8yzRxA2BWwAS2RxxD0Y3bxqEVUsIGiTNN2jxg=="], + + "@oven/bun-darwin-x64": ["@oven/bun-darwin-x64@1.2.16", "", { "os": "darwin", "cpu": "x64" }, "sha512-HpcSVCTH9n+9bG2zu3OUJ9h22m6HzNgZpqib9r4NEVZg7Z2U86bOUMKlTCA0ZANaWsK9czl2VIhMWbLF4fgvLA=="], + + "@oven/bun-darwin-x64-baseline": ["@oven/bun-darwin-x64-baseline@1.2.16", "", { "os": "darwin", "cpu": "x64" }, "sha512-FtKr6FwLN+QfrF0/vJtOwBMU72krmrHlxhRSElbKEOWox2n2vWSZ/sNNkHePEsrxGfqaHC5GhEZk2lnaZTavBQ=="], + + "@oven/bun-linux-aarch64": ["@oven/bun-linux-aarch64@1.2.16", "", { "os": "linux", "cpu": "arm64" }, "sha512-nd0eZhihfgrDtfI/NdEqOAQ8KY87SWNQLZKjRB8WoYkqcY1BGwtZqvJOc2bEn2oERJ8K2etJRynXz+MKngiYxw=="], + + "@oven/bun-linux-aarch64-musl": ["@oven/bun-linux-aarch64-musl@1.2.16", "", { "os": "linux", "cpu": "none" }, "sha512-MhvQ0hecunZnbac9cEOqA1CGk/ISDhhnF35i9l90Jgc/osfgGndViLkMp3wk1EO5UG4/Kbil1OlfLmyOHKq0SQ=="], + + "@oven/bun-linux-x64": ["@oven/bun-linux-x64@1.2.16", "", { "os": "linux", "cpu": "x64" }, "sha512-qYUXPXbT4S+MImv51+dLBHKFYy40QIowwCRtzUFGf3TG+9MQQUXHNXryMNSdHveHqecd9rO1EIQ8hroAPBl+Sg=="], + + "@oven/bun-linux-x64-baseline": ["@oven/bun-linux-x64-baseline@1.2.16", "", { "os": "linux", "cpu": "x64" }, "sha512-ZysDeqDfUAqKrQu2R+ddRgSCY30qSnn0LQLr6fAm7Pw9lU2yhWVNa8R3DavddmZQc1vUw6j3ITIAE+DDT9OBCg=="], + + "@oven/bun-linux-x64-musl": ["@oven/bun-linux-x64-musl@1.2.16", "", { "os": "linux", "cpu": "x64" }, "sha512-6o5Oi5ARKYErF6nIBrewxtl20PGhM97faPemJ+v26D47dRNAlUWN5lMVuOqZOhYjqzOe4V+NpxIFBHtXWEmoNQ=="], + + "@oven/bun-linux-x64-musl-baseline": ["@oven/bun-linux-x64-musl-baseline@1.2.16", "", { "os": "linux", "cpu": "x64" }, "sha512-cWwny3cxYkvV9fYnSDb2brXodWV7IcG+Bwd3q3b8OUYbeC3ekHN3zm+TYdSxIVhMm7z46CkiDz5QnnQWVVfZ5A=="], + + "@oven/bun-windows-x64": ["@oven/bun-windows-x64@1.2.16", "", { "os": "win32", "cpu": "x64" }, "sha512-1xUlHHbMZ3DMZlEcppBAQ5vQDgNHDMIGB/AXO+dxQJl/3GiO/Ek4pMDzcqMnlbGDaDcTmTXyZ6cEXEF4C2qygQ=="], + + "@oven/bun-windows-x64-baseline": ["@oven/bun-windows-x64-baseline@1.2.16", "", { "os": "win32", "cpu": "x64" }, "sha512-tHdtHqH6c5ScNusLWOzZCTeuV2rSc3mvlLQQ+DYefTy+XwtjXmY47MbBSgNuBWVYePIob9BqDFOtTHYIWRZTww=="], + "@pkgjs/parseargs": ["@pkgjs/parseargs@0.11.0", "", {}, "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg=="], "@polka/url": ["@polka/url@1.0.0-next.28", "", {}, "sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw=="], @@ -741,6 +737,8 @@ "buffer-from": ["buffer-from@1.1.2", "", {}, "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="], + "bun": ["bun@1.2.16", "", { "optionalDependencies": { "@oven/bun-darwin-aarch64": "1.2.16", "@oven/bun-darwin-x64": "1.2.16", "@oven/bun-darwin-x64-baseline": "1.2.16", "@oven/bun-linux-aarch64": "1.2.16", "@oven/bun-linux-aarch64-musl": "1.2.16", "@oven/bun-linux-x64": "1.2.16", "@oven/bun-linux-x64-baseline": "1.2.16", "@oven/bun-linux-x64-musl": "1.2.16", "@oven/bun-linux-x64-musl-baseline": "1.2.16", "@oven/bun-windows-x64": "1.2.16", "@oven/bun-windows-x64-baseline": "1.2.16" }, "os": [ "linux", "win32", "darwin", ], "cpu": [ "x64", "arm64", ], "bin": { "bun": "bin/bun.exe", "bunx": "bin/bun.exe" } }, "sha512-sjZH6rr1P6yu44+XPA8r+ZojwmK9Kbz9lO6KAA/4HRIupdpC31k7b93crLBm19wEYmd6f2+3+57/7tbOcmHbGg=="], + "bun-sqlite-key-value": ["bun-sqlite-key-value@1.13.1", "", { "peerDependencies": { "typescript": "^5.5.3" } }, "sha512-cb3thB8QXPeXB6B7NhObpADEYvtVNwqg/0ED7PgKt2OxVAxPSejkiTsy1+byQDC0AwLYajw3nhtr/ubKvcLcKw=="], "bun-types": ["bun-types@1.2.15", "", { "dependencies": { "@types/node": "*" } }, "sha512-NarRIaS+iOaQU1JPfyKhZm4AsUOrwUOqRNHY0XxI8GI8jYxiLXLcdjYMG9UKS+fwWasc1uw1htV9AX24dD+p4w=="], @@ -1887,6 +1885,10 @@ "@cspotcode/source-map-support/@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.9", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.0.3", "@jridgewell/sourcemap-codec": "^1.4.10" } }, "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ=="], + "@open-gsio/client/@types/bun": ["@types/bun@1.2.16", "", { "dependencies": { "bun-types": "1.2.16" } }, "sha512-1aCZJ/6nSiViw339RsaNhkNoEloLaPzZhxMOYEa7OzRzO41IGg5n/7I43/ZIAW/c+Q6cT12Vf7fOZOoVIzb5BQ=="], + + "@open-gsio/scripts/@types/bun": ["@types/bun@1.2.16", "", { "dependencies": { "bun-types": "1.2.16" } }, "sha512-1aCZJ/6nSiViw339RsaNhkNoEloLaPzZhxMOYEa7OzRzO41IGg5n/7I43/ZIAW/c+Q6cT12Vf7fOZOoVIzb5BQ=="], + "@rollup/plugin-babel/@rollup/pluginutils": ["@rollup/pluginutils@3.1.0", "", { "dependencies": { "@types/estree": "0.0.39", "estree-walker": "^1.0.1", "picomatch": "^2.2.2" }, "peerDependencies": { "rollup": "^1.20.0||^2.0.0" } }, "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg=="], "@rollup/plugin-babel/rollup": ["rollup@2.79.2", "", { "optionalDependencies": { "fsevents": "~2.3.2" }, "bin": { "rollup": "dist/bin/rollup" } }, "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ=="], @@ -2137,6 +2139,10 @@ "@babel/traverse/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.25.9", "", {}, "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ=="], + "@open-gsio/client/@types/bun/bun-types": ["bun-types@1.2.16", "", { "dependencies": { "@types/node": "*" } }, "sha512-ciXLrHV4PXax9vHvUrkvun9VPVGOVwbbbBF/Ev1cXz12lyEZMoJpIJABOfPcN9gDJRaiKF9MVbSygLg4NXu3/A=="], + + "@open-gsio/scripts/@types/bun/bun-types": ["bun-types@1.2.16", "", { "dependencies": { "@types/node": "*" } }, "sha512-ciXLrHV4PXax9vHvUrkvun9VPVGOVwbbbBF/Ev1cXz12lyEZMoJpIJABOfPcN9gDJRaiKF9MVbSygLg4NXu3/A=="], + "@rollup/plugin-babel/@rollup/pluginutils/@types/estree": ["@types/estree@0.0.39", "", {}, "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="], "@rollup/plugin-babel/@rollup/pluginutils/estree-walker": ["estree-walker@1.0.1", "", {}, "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="], diff --git a/package.json b/package.json index 67d67d6..9f4fe76 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "test:all": "bun run --filter='*' tests", "client:dev": "(cd packages/client && bun run dev)", "server:dev": "bun build:client && (cd packages/server && bun run dev)", - "build": "(cd packages/cloudflare-workers && bun run deploy:dry-run)", + "build": "(cd packages/cloudflare-workers/open-gsio && bun run deploy:dry-run)", "build:client": "(cd packages/client && bun run vite build)", "deploy": "(cd packages/cloudflare-workers && bun run deploy)", "deploy:secrets": "wrangler secret bulk secrets.json -c packages/cloudflare-workers/open-gsio/wrangler.jsonc", diff --git a/packages/client/package.json b/packages/client/package.json index c012359..81d7c65 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -5,7 +5,10 @@ "dev": "bun vite dev", "build": "bun vite build", "tests": "vitest run", - "tests:coverage": "vitest run --coverage.enabled=true" + "tests:coverage": "vitest run --coverage.enabled=true", + "generate:sitemap": "bun ./scripts/generate_sitemap.js open-gsio.seemueller.workers.dev", + "generate:robotstxt": "bun ./scripts/generate_robots_txt.js open-gsio.seemueller.workers.dev", + "generate:fonts": "cp -r ../../node_modules/katex/dist/fonts public/static" }, "dependencies": { "@open-gsio/env": "workspace:*", @@ -48,6 +51,8 @@ "vike": "0.4.193", "vite": "^6.3.5", "vite-plugin-pwa": "^1.0.0", - "vitest": "^3.1.4" + "vitest": "^3.1.4", + "bun": "*", + "@types/bun": "*" } } diff --git a/packages/client/vite.config.ts b/packages/client/vite.config.ts index 06e0c58..2ce9252 100644 --- a/packages/client/vite.config.ts +++ b/packages/client/vite.config.ts @@ -5,20 +5,18 @@ import * as child_process from "node:child_process"; import {VitePWA} from 'vite-plugin-pwa'; import { configDefaults } from 'vitest/config'; -const APP_FQDN = "open-gsio.seemueller.workers.dev"; - export default defineConfig(({command}) => { const customPlugins = [ { name: "sitemap-generator", buildStart(options) { if (command === "build") { - child_process.execSync("./scripts/generate_sitemap.js " + APP_FQDN); + child_process.execSync("bun run generate:sitemap"); console.log("Generated Sitemap -> public/sitemap.xml"); - child_process.execSync("./scripts/generate_robots_txt.js " + APP_FQDN); + child_process.execSync("bun run generate:robotstxt"); console.log("Generated robots.txt -> public/robots.txt"); - child_process.execSync("cp -r ../../node_modules/katex/dist/fonts public/static"); - console.log("Copied KaTeX fonts -> public/static/fonts"); + child_process.execSync("bun run generate:fonts"); + console.log("Copied fonts -> public/static/fonts"); } }, }, diff --git a/packages/scripts/cleanup.sh b/packages/scripts/cleanup.sh index f388ee8..42b6fe3 100755 --- a/packages/scripts/cleanup.sh +++ b/packages/scripts/cleanup.sh @@ -17,6 +17,8 @@ find . -name ".wrangler" -type d -prune -exec rm -rf {} \; find . -name "dist" -type d -prune -exec rm -rf {} \; find . -name "build" -type d -prune -exec rm -rf {} \; +find . -name "fonts" -type d -prune -exec rm -rf {} \; + # Remove coverage directories find . -name "coverage" -type d -prune -exec rm -rf {} \; find . -name "html" -type d -prune -exec rm -rf {} \;