olova 2.0.61 → 2.0.63

package/src/entry-server.tsx

@@ -1,165 +0,0 @@
-import { StrictMode, Suspense } from 'react';
-import { renderToString } from 'react-dom/server';
-import { QueryClient, QueryClientProvider, dehydrate, HydrationBoundary } from '@tanstack/react-query';
-// @ts-expect-error - Virtual module resolved by vite-plugin-olova
-import { layouts, notFoundPages, OlovaRouter, Outlet, routes } from 'virtual:olova-app';
-
-// Wrapper to support "children" prop style layouts
-const wrappedLayouts = layouts.map((item: any) => ({
-  ...item,
-  layout: (props: any) => (
-    <item.layout {...props}>
-      <Outlet />
-    </item.layout>
-  )
-}));
-
-/**
- * Find matching route and extract params
- */
-function matchRoute(url: string): { route: any; params: Record<string, string> } | null {
-  const pathname = url.split('?')[0];
-  
-  for (const route of routes) {
-    // Exact match
-    if (route.path === pathname) {
-      return { route, params: {} };
-    }
-    
-    // Dynamic segments
-    if (route.path.includes(':') || route.path.includes('*')) {
-      const pattern = route.path
-        .replace(/\*/g, '(.*)')
-        .replace(/:[^/]+/g, '([^/]+)');
-      const regex = new RegExp(`^${pattern}$`);
-      const match = pathname.match(regex);
-      
-      if (match) {
-        const params: Record<string, string> = {};
-        const paramNames = route.path.match(/:[^/]+|\*/g) || [];
-        
-        paramNames.forEach((name: string, i: number) => {
-          if (name === '*') {
-            params['*'] = match[i + 1];
-          } else {
-            params[name.slice(1)] = match[i + 1];
-          }
-        });
-        
-        return { route, params };
-      }
-    }
-  }
-  
-  return null;
-}
-
-/**
- * Run loader for SSG builds
- * Simplified: loader just returns data directly
- */
-async function runLoader(url: string): Promise<Record<string, unknown> | null> {
-  const match = matchRoute(url);
-  
-  if (!match || !match.route.loader) {
-    return null;
-  }
-  
-  try {
-    // Simple call - loader returns data directly
-    // Use a valid URL for Request (requires absolute URL)
-    const baseUrl = 'http://localhost';
-    const result = await match.route.loader({
-      request: new Request(new URL(url, baseUrl)),
-      params: match.params
-    });
-    
-    // If it's a Response, skip
-    if (result instanceof Response) {
-      return null;
-    }
-    
-    // Direct data return (simplified syntax)
-    return result as Record<string, unknown>;
-  } catch (error) {
-    console.error(`[SSR] Loader error for ${url}:`, error);
-    return null;
-  }
-}
-
-export async function render(url: string) {
-  // Always recreate the window mock to ensure clean state for every SSG path
-  const globalAny = globalThis as any;
-  globalAny.window = {
-    location: { pathname: url, search: '', hash: '' },
-    addEventListener: () => {},
-    removeEventListener: () => {},
-    history: { 
-      pushState: () => {}, 
-      replaceState: () => {}, 
-      location: { pathname: url, search: '', hash: '' } 
-    }
-  };
-  globalAny.location = globalAny.window.location;
-  globalAny.document = {
-    createElement: () => ({}),
-    getElementsByTagName: () => [],
-    getElementById: () => null,
-    querySelector: () => null,
-    title: '',
-    location: globalAny.window.location
-  };
-
-  // Run loader for data-only SSR
-  const loaderData = await runLoader(url);
-  
-  // Inject loader data into window for components to access
-  if (loaderData) {
-    globalAny.window.__LOADER_DATA__ = loaderData;
-  }
-
-  // Create QueryClient for SSR with pre-loaded data
-  const queryClient = new QueryClient({
-    defaultOptions: {
-      queries: {
-        staleTime: Infinity, // Data is fresh during SSR
-        gcTime: Infinity,
-      },
-    },
-  });
-
-  // Pre-populate query client with loader data
-  if (loaderData) {
-    // Convert loader data to query state format
-    // If loader returns { user: {...} }, we hydrate it
-    Object.entries(loaderData).forEach(([key, value]) => {
-      queryClient.setQueryData([key], value);
-    });
-  }
-
-  // Get dehydrated state for client hydration
-  const dehydratedState = dehydrate(queryClient);
-
-  // Wrap in Suspense to handle lazy-loaded components
-  const html = renderToString(
-    <StrictMode>
-      <QueryClientProvider client={queryClient}>
-        <HydrationBoundary state={dehydratedState}>
-          <Suspense fallback={null}>
-            <OlovaRouter routes={routes} layouts={wrappedLayouts} notFoundPages={notFoundPages} />
-          </Suspense>
-        </HydrationBoundary>
-      </QueryClientProvider>
-    </StrictMode>
-  );
-
-  // Return both html and dehydrated state for flight serialization
-  return { 
-    html, 
-    loaderData,
-    queryState: dehydratedState 
-  };
-}
-
-export { routes };
-

package/src/entry-worker.tsx

@@ -1,201 +0,0 @@
-/**
- * Olova Cloudflare Workers Entry
- * Auto-generated by plugin - handles SSR for routes with loaders only
- */
-
-import { renderToString } from 'react-dom/server';
-import { StrictMode, Suspense } from 'react';
-import { QueryClient, QueryClientProvider, dehydrate, HydrationBoundary } from '@tanstack/react-query';
-// @ts-expect-error - Virtual module resolved by vite-plugin-olova
-import { layouts, notFoundPages, OlovaRouter, Outlet, routes } from 'virtual:olova-app';
-
-// =============================================================================
-// TYPES
-// =============================================================================
-
-interface RouteMatch {
-  route: any;
-  params: Record<string, string>;
-}
-
-// =============================================================================
-// ROUTE MATCHING
-// =============================================================================
-
-function matchRoute(pathname: string): RouteMatch | null {
-  for (const route of routes) {
-    // Exact match
-    if (route.path === pathname) {
-      return { route, params: {} };
-    }
-
-    // Dynamic segments
-    if (route.path.includes(':') || route.path.includes('*')) {
-      const pattern = route.path
-        .replace(/\*/g, '(.*)')
-        .replace(/:[^/]+/g, '([^/]+)');
-      const regex = new RegExp(`^${pattern}$`);
-      const match = pathname.match(regex);
-
-      if (match) {
-        const params: Record<string, string> = {};
-        const paramNames = route.path.match(/:[^/]+|\*/g) || [];
-
-        paramNames.forEach((name: string, i: number) => {
-          const key = name === '*' ? '*' : name.slice(1);
-          params[key] = match[i + 1];
-        });
-
-        return { route, params };
-      }
-    }
-  }
-
-  return null;
-}
-
-// =============================================================================
-// SSR RENDERING
-// =============================================================================
-
-// Wrapper to support "children" prop style layouts
-const wrappedLayouts = layouts.map((item: any) => ({
-  ...item,
-  layout: (props: any) => (
-    <item.layout {...props}>
-      <Outlet />
-    </item.layout>
-  )
-}));
-
-async function render(
-  pathname: string,
-  loaderData?: Record<string, unknown>
-): Promise<{ html: string; queryState: unknown }> {
-  // Mock browser globals
-  const g = globalThis as any;
-  g.window = {
-    location: { pathname, search: '', hash: '' },
-    addEventListener: () => {},
-    removeEventListener: () => {},
-    history: { pushState: () => {}, replaceState: () => {} },
-    __LOADER_DATA__: loaderData
-  };
-  g.__LOADER_DATA__ = loaderData;
-
-  // Create QueryClient with pre-loaded data
-  const queryClient = new QueryClient({
-    defaultOptions: {
-      queries: {
-        staleTime: Infinity,
-        gcTime: Infinity,
-      },
-    },
-  });
-
-  // Pre-populate query client with loader data
-  if (loaderData) {
-    Object.entries(loaderData).forEach(([key, value]) => {
-      queryClient.setQueryData([key], value);
-    });
-  }
-
-  // Get dehydrated state for client hydration
-  const queryState = dehydrate(queryClient);
-
-  const html = renderToString(
-    <StrictMode>
-      <QueryClientProvider client={queryClient}>
-        <HydrationBoundary state={queryState}>
-          <Suspense fallback={null}>
-            <OlovaRouter
-              routes={routes}
-              layouts={wrappedLayouts}
-              notFoundPages={notFoundPages}
-            />
-          </Suspense>
-        </HydrationBoundary>
-      </QueryClientProvider>
-    </StrictMode>
-  );
-
-  return { html, queryState };
-}
-
-// =============================================================================
-// WORKER EXPORT
-// =============================================================================
-
-export interface WorkerEnv {
-  ASSETS: { fetch: (request: Request | URL) => Promise<Response> };
-}
-
-export default {
-  async fetch(request: Request, env: WorkerEnv): Promise<Response> {
-    const url = new URL(request.url);
-    const pathname = url.pathname;
-
-    // 1. Non-HTML requests → serve static assets directly
-    if (!request.headers.get('accept')?.includes('text/html')) {
-      return env.ASSETS.fetch(request);
-    }
-
-    // 2. Check if route has loader (needs SSR)
-    const match = matchRoute(pathname);
-    const needsSSR = match?.route?.loader;
-
-    // 3. No SSR needed → serve pre-built static HTML
-    if (!needsSSR) {
-      const staticPath = pathname === '/' ? '/index.html' : `${pathname}/index.html`;
-      try {
-        const staticResponse = await env.ASSETS.fetch(new URL(staticPath, url));
-        if (staticResponse.ok) {
-          return new Response(staticResponse.body, {
-            status: 200,
-            headers: { 'Content-Type': 'text/html; charset=utf-8' }
-          });
-        }
-      } catch {}
-      
-      // Fallback to 404.html
-      try {
-        const notFoundResponse = await env.ASSETS.fetch(new URL('/404.html', url));
-        return new Response(notFoundResponse.body, { 
-          status: 404, 
-          headers: { 'Content-Type': 'text/html; charset=utf-8' } 
-        });
-      } catch {}
-      
-      return new Response('Not Found', { status: 404 });
-    }
-
-    // 4. Route has loader → run SSR
-    let loaderData: Record<string, unknown> | undefined;
-
-    try {
-      const result = await match.route.loader({
-        request,
-        params: match.params
-      });
-
-      if (!(result instanceof Response)) {
-        loaderData = result;
-      }
-    } catch (error) {
-      console.error('[Olova] Loader error:', error);
-    }
-
-    // 5. Render with loader data
-    const { html: appHtml, queryState } = await render(pathname, loaderData);
-
-    // Build full HTML document
-    const html = `<!DOCTYPE html>${appHtml}<script>window.__QUERY_STATE__=${JSON.stringify(queryState)}</script><script type="module" src="/assets/_olova/main.js"></script>`;
-
-    return new Response(html, {
-      headers: { 'Content-Type': 'text/html; charset=utf-8' }
-    });
-  }
-};
-
-// Export for SSG builds
-export { render, matchRoute };