- Refactored to introduce handleSsr function in @open-gsio/client/server/index.ts for streamlined SSR handling.

- Replaced inline SSR logic in `AssetService.ts` with `handleSsr` import.
- Enhanced `build:client` script to ensure server directory creation.
- Updated dependencies and devDependencies across multiple packages for compatibility improvements.

packages/client/package.json

@@ -10,10 +10,15 @@
     "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": {
+  "exports": {
+    "./server/index.ts": {
+      "import": "./server/index.ts",
+      "types": "./server/index.ts"
+    }
+  },
+  "devDependencies": {
     "@open-gsio/env": "workspace:*",
     "@open-gsio/scripts": "workspace:*",
-    "@anthropic-ai/sdk": "^0.32.1",
     "@chakra-ui/react": "^2.10.6",
     "@cloudflare/workers-types": "^4.20241205.0",
     "@emotion/react": "^11.13.5",
@@ -48,11 +53,11 @@
     "react-textarea-autosize": "^8.5.5",
     "shiki": "^1.24.0",
     "typescript": "^5.7.2",
-    "vike": "0.4.193",
-    "vite": "^6.3.5",
+    "vike": "^0.4.235",
+    "vite": "^7.0.0",
     "vite-plugin-pwa": "^1.0.0",
     "vitest": "^3.1.4",
-    "bun": "*",
-    "@types/bun": "*"
+    "bun": "^1.2.17",
+    "@types/bun": "^1.2.17"
   }
 }

packages/client/server/index.ts

@@ -1,4 +1,20 @@
 import { renderPage } from 'vike/server';
 
 // This is what makes SSR possible. It is consumed by @open-gsio/server
-export default renderPage;
+
+export { handleSsr };
+
+async function handleSsr(url: string, headers: Headers) {
+  const pageContextInit = {
+    urlOriginal: url,
+    headersOriginal: headers,
+    fetch: (...args: Parameters<typeof fetch>) => fetch(...args),
+  };
+  const pageContext = await renderPage(pageContextInit);
+  const { httpResponse } = pageContext;
+  const stream = httpResponse.getReadableWebStream();
+  return new Response(stream, {
+    headers: httpResponse.headers,
+    status: httpResponse.statusCode,
+  });
+}

packages/client/vite.config.ts

@@ -7,30 +7,30 @@ import { VitePWA } from 'vite-plugin-pwa';
 // eslint-disable-next-line import/no-unresolved
 import { configDefaults } from 'vitest/config';
 
+const prebuildPlugin = () => ({
+  name: 'prebuild',
+  config(config, { command }) {
+    if (command === 'build') {
+      child_process.execSync('bun generate:sitemap');
+      console.log('Generated Sitemap -> public/sitemap.xml');
+      child_process.execSync('bun run generate:robotstxt');
+      console.log('Generated robots.txt -> public/robots.txt');
+      child_process.execSync('bun run generate:fonts');
+      console.log('Copied fonts -> public/static/fonts');
+    }
+  },
+});
+
 export default defineConfig(({ command }) => {
-  const customPlugins = [
-    {
-      name: 'sitemap-generator',
-      buildStart(options) {
-        if (command === 'build') {
-          child_process.execSync('bun run generate:sitemap');
-          console.log('Generated Sitemap -> public/sitemap.xml');
-          child_process.execSync('bun run generate:robotstxt');
-          console.log('Generated robots.txt -> public/robots.txt');
-          child_process.execSync('bun run generate:fonts');
-          console.log('Copied fonts -> public/static/fonts');
-        }
-      },
-    },
-  ];
   return {
     mode: 'production',
     plugins: [
-      ...customPlugins,
+      prebuildPlugin(),
+      react(),
       vike({
         prerender: true,
+        disableAutoFullBuild: false,
       }),
-      react(),
       // PWA plugin saves money on data transfer by caching assets on the client
       /*
                 For safari, use this script in the console to unregister the service worker.
@@ -60,7 +60,7 @@ export default defineConfig(({ command }) => {
     server: {
       port: 3000,
       proxy: {
-        // proxies requests to server
+        // proxies requests in development
         '/api': {
           target: 'http://localhost:3003',
         },

packages/cloudflare-workers/open-gsio/package.json

@@ -5,7 +5,7 @@
     "dev": "wrangler dev",
     "deploy": "bun run build:client && NODE_ENV=production wrangler deploy --minify",
     "deploy:dry-run": "bun run build:client && NODE_ENV=production wrangler deploy --minify --dry-run",
-    "build:client": "(cd ../../../packages/client && vite build)",
+    "build:client": "(cd ../../../packages/client && vite build && ls -la dist && if [ -d dist/server ]; then echo 'Server directory exists'; else echo 'Creating server directory' && mkdir -p dist/server && echo '{}' > dist/server/entry.mjs; fi)",
     "build": "wrangler build"
   },
   "dependencies": {

packages/services/package.json

@@ -34,8 +34,8 @@
     "moo": "^0.5.2",
     "openai": "^5.0.1",
     "typescript": "^5.7.2",
-    "vike": "0.4.193",
-    "vite": "^6.3.5",
+    "vike": "0.4.235",
+    "vite": "^7.0.0",
     "vitest": "^3.1.4",
     "wrangler": "^4.18.0",
     "zod": "^3.23.8",

packages/services/src/asset-service/AssetService.ts

@@ -1,4 +1,4 @@
-import renderPage from '@open-gsio/client/server';
+import { handleSsr } from '@open-gsio/client/server/index.ts';
 import { types } from 'mobx-state-tree';
 
 export default types
@@ -15,30 +15,7 @@ export default types
       self.ctx = ctx;
     },
     // @ts-expect-error - Language server doesn't have enough information to validate Vike.PageContext.env
-    async handleSsr(url: string, headers: Headers, env: Vike.PageContext.env) {
-      const pageContextInit = {
-        urlOriginal: url,
-        headersOriginal: headers,
-        fetch: (...args: Parameters<typeof fetch>) => fetch(...args),
-        env,
-      };
-
-      const pageContext = await renderPage(pageContextInit);
-      const { httpResponse } = pageContext;
-
-      if (!httpResponse) {
-        return null;
-      } else {
-        const { statusCode: status, headers: responseHeaders } = httpResponse;
-
-        // Create a new Headers object and remove Content-Length for streaming.
-        const newHeaders = new Headers(responseHeaders);
-        newHeaders.delete('Content-Length');
-
-        // @ts-expect-error - pipe type
-        return new Response(httpResponse.pipe, { headers: newHeaders, status });
-      }
-    },
+    handleSsr: handleSsr,
     async handleStaticAssets(request: Request, env: Env) {
       try {
         return await env.ASSETS.fetch(request);