zudoku 0.0.0-fd8f8ad → 0.0.0-feda542

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zudoku",
-  "version": "0.0.0-fd8f8ad",
+  "version": "0.0.0-feda542",
   "type": "module",
   "homepage": "https://zudoku.dev",
   "repository": {
@@ -35,6 +35,10 @@
       "import": "./lib/ui/*.js",
       "types": "./dist/lib/ui/*.d.ts"
     },
+    "./hooks": {
+      "import": "./lib/hooks/index.js",
+      "types": "./dist/lib/hooks/index.d.ts"
+    },
     "./client": {
       "types": "./client.d.ts"
     },
@@ -50,10 +54,22 @@
       "import": "./lib/zudoku.auth-openid.js",
       "types": "./dist/lib/authentication/providers/openid.d.ts"
     },
+    "./auth/supabase": {
+      "import": "./lib/zudoku.auth-supabase.js",
+      "types": "./dist/lib/authentication/providers/supabase.d.ts"
+    },
+    "./plugins": {
+      "import": "./lib/zudoku.plugins.js",
+      "types": "./dist/lib/core/plugins.d.ts"
+    },
     "./plugins/api-keys": {
       "import": "./lib/zudoku.plugin-api-keys.js",
       "types": "./dist/lib/plugins/api-keys/index.d.ts"
     },
+    "./plugins/api-catalog": {
+      "import": "./lib/zudoku.plugin-api-catalog.js",
+      "types": "./dist/lib/plugins/api-catalog/index.d.ts"
+    },
     "./plugins/markdown": {
       "import": "./lib/zudoku.plugin-markdown.js",
       "types": "./dist/lib/plugins/markdown/index.d.ts"
@@ -74,14 +90,18 @@
       "import": "./lib/zudoku.plugin-search-inkeep.js",
       "types": "./dist/lib/plugins/search-inkeep/index.d.ts"
     },
-    "./openapi-worker": {
-      "import": "./lib/zudoku.openapi-worker.js",
-      "types": "./dist/lib/plugins/openapi-worker.d.ts"
+    "./plugins/search-pagefind": {
+      "import": "./lib/zudoku.plugin-search-pagefind.js",
+      "types": "./dist/lib/plugins/search-pagefind/index.d.ts"
     },
     "./components": {
       "import": "./lib/zudoku.components.js",
       "types": "./dist/lib/components/index.d.ts"
     },
+    "./processors/*": {
+      "import": "./lib/processors/*.js",
+      "types": "./dist/lib/plugins/openapi/processors/*.d.ts"
+    },
     "./icons": {
       "import": "./lib/zudoku.icons.js",
       "types": "./dist/lib/icons.d.ts"
@@ -100,145 +120,170 @@
     },
     "./app/*": {
       "import": "./src/app/*"
+    },
+    "./with-zuplo": {
+      "require": "./dist/zuplo/with-zuplo.js",
+      "import": "./dist/zuplo/with-zuplo.js"
     }
   },
   "dependencies": {
-    "@envelop/core": "5.0.2",
+    "@apidevtools/json-schema-ref-parser": "11.9.3",
+    "@envelop/core": "5.0.3",
     "@graphql-typed-document-node/core": "3.2.0",
-    "@hiogawa/vite-plugin-ssr-css": "0.0.1",
-    "@hookform/resolvers": "3.9.1",
-    "@lekoarts/rehype-meta-as-attributes": "3.0.1",
-    "@mdx-js/react": "3.0.1",
-    "@mdx-js/rollup": "3.0.1",
-    "@pothos/core": "3.41.0",
-    "@radix-ui/react-accordion": "1.2.1",
-    "@radix-ui/react-alert-dialog": "1.1.2",
-    "@radix-ui/react-aspect-ratio": "1.1.0",
-    "@radix-ui/react-checkbox": "1.1.2",
-    "@radix-ui/react-collapsible": "1.1.1",
-    "@radix-ui/react-dialog": "1.1.2",
-    "@radix-ui/react-dropdown-menu": "2.1.2",
-    "@radix-ui/react-hover-card": "1.1.2",
-    "@radix-ui/react-label": "2.1.0",
-    "@radix-ui/react-popover": "1.1.2",
-    "@radix-ui/react-progress": "1.1.0",
-    "@radix-ui/react-radio-group": "1.2.1",
-    "@radix-ui/react-scroll-area": "1.2.1",
-    "@radix-ui/react-select": "2.1.2",
-    "@radix-ui/react-slider": "1.2.1",
-    "@radix-ui/react-slot": "1.1.0",
-    "@radix-ui/react-switch": "1.1.1",
-    "@radix-ui/react-tabs": "1.1.1",
-    "@radix-ui/react-toggle": "1.1.0",
-    "@radix-ui/react-toggle-group": "1.1.0",
-    "@radix-ui/react-tooltip": "1.1.3",
-    "@radix-ui/react-visually-hidden": "1",
-    "@sentry/node": "8.34.0",
+    "@hookform/resolvers": "4.1.3",
+    "@lekoarts/rehype-meta-as-attributes": "3.0.2",
+    "@mdx-js/react": "3.1.0",
+    "@mdx-js/rollup": "3.1.0",
+    "@pothos/core": "4.5.0",
+    "@radix-ui/react-accordion": "1.2.3",
+    "@radix-ui/react-alert-dialog": "1.1.6",
+    "@radix-ui/react-aspect-ratio": "1.1.2",
+    "@radix-ui/react-checkbox": "1.1.4",
+    "@radix-ui/react-collapsible": "1.1.3",
+    "@radix-ui/react-dialog": "1.1.6",
+    "@radix-ui/react-dropdown-menu": "2.1.6",
+    "@radix-ui/react-hover-card": "1.1.6",
+    "@radix-ui/react-label": "2.1.2",
+    "@radix-ui/react-popover": "1.1.6",
+    "@radix-ui/react-progress": "1.1.2",
+    "@radix-ui/react-radio-group": "1.2.3",
+    "@radix-ui/react-scroll-area": "1.2.3",
+    "@radix-ui/react-select": "2.1.6",
+    "@radix-ui/react-slider": "1.2.3",
+    "@radix-ui/react-slot": "1.1.2",
+    "@radix-ui/react-switch": "1.1.3",
+    "@radix-ui/react-tabs": "1.1.3",
+    "@radix-ui/react-toggle": "1.1.2",
+    "@radix-ui/react-toggle-group": "1.1.2",
+    "@radix-ui/react-tooltip": "1.1.8",
+    "@radix-ui/react-visually-hidden": "1.1.2",
+    "@scalar/openapi-parser": "0.10.12",
+    "@sentry/node": "9.1.0",
     "@sindresorhus/slugify": "2.2.1",
-    "@stefanprobst/rehype-extract-toc": "2.2.0",
-    "@tailwindcss/typography": "0.5.15",
-    "@tanstack/react-query": "5.61.0",
-    "@types/react": "18.3.11",
-    "@types/react-dom": "18.3.1",
-    "@vitejs/plugin-react": "4.3.1",
-    "@zudoku/config": "0.0.0-fd8f8ad",
+    "@stefanprobst/rehype-extract-toc": "2.2.1",
+    "@tailwindcss/typography": "0.5.16",
+    "@tanem/react-nprogress": "5.0.55",
+    "@tanstack/react-query": "5.66.6",
+    "@types/react": "19.0.10",
+    "@types/react-dom": "19.0.4",
+    "@vitejs/plugin-react": "4.3.4",
     "@zudoku/httpsnippet": "10.0.9",
-    "@zudoku/react-helmet-async": "2.0.4",
-    "autoprefixer": "10.4.20",
-    "chokidar": "3.6.0",
-    "class-variance-authority": "0.7.0",
+    "@zudoku/react-helmet-async": "2.0.5",
+    "autoprefixer": "10.4.21",
+    "class-variance-authority": "0.7.1",
     "clsx": "2.1.1",
     "cmdk": "1.0.4",
-    "dotenv": "16.4.5",
-    "embla-carousel-react": "8.3.1",
-    "estree-util-value-to-estree": "3.2.1",
-    "express": "4.21.1",
-    "glob": "11.0.0",
-    "graphql": "16.9.0",
+    "devlop": "^1.1.0",
+    "dotenv": "16.4.7",
+    "embla-carousel-react": "8.5.2",
+    "esm-loader-css": "^1.0.3",
+    "estree-util-value-to-estree": "3.3.3",
+    "express": "4.21.2",
+    "fast-equals": "5.2.2",
+    "glob": "11.0.1",
+    "graphql": "16.10.0",
     "graphql-type-json": "0.3.2",
-    "graphql-yoga": "5.7.0",
+    "graphql-yoga": "5.13.2",
     "gray-matter": "4.0.3",
+    "hast-util-to-jsx-runtime": "^2.3.6",
+    "hast-util-to-string": "3.0.1",
+    "html-url-attributes": "^3.0.1",
     "http-terminator": "3.2.0",
     "loglevel": "1.9.2",
-    "lru-cache": "11.0.1",
-    "lucide-react": "0.452.0",
-    "next-themes": "0.4.3",
+    "lru-cache": "11.0.2",
+    "lucide-react": "0.475.0",
+    "minimatch": "10.0.1",
+    "nanoevents": "^9.1.0",
+    "next-themes": "0.4.4",
     "oauth4webapi": "2.17.0",
     "object-hash": "3.0.0",
     "openapi-types": "12.1.3",
-    "picocolors": "1.1.0",
-    "postcss": "8.4.47",
-    "posthog-node": "4.2.1",
-    "prism-react-renderer": "2.4.0",
-    "prismjs": "1.29.0",
-    "react-error-boundary": "4.1.2",
-    "react-hook-form": "7.53.0",
-    "react-is": "18.3.1",
-    "react-markdown": "9.0.1",
-    "react-router-dom": "6.27.0",
+    "pagefind": "1.4.0-alpha.1",
+    "picocolors": "1.1.1",
+    "piscina": "5.0.0-alpha.2",
+    "postcss": "8.5.3",
+    "posthog-node": "4.8.1",
+    "prism-react-renderer": "2.4.1",
+    "prismjs": "1.30.0",
+    "react-error-boundary": "5.0.0",
+    "react-hook-form": "7.54.2",
+    "react-is": "19.0.0",
+    "react-router": "7.2.0",
+    "rehype-mdx-import-media": "1.2.0",
     "rehype-raw": "7.0.0",
     "rehype-slug": "6.0.0",
     "remark-comment": "1.0.0",
-    "remark-directive": "3.0.0",
+    "remark-directive": "3.0.1",
     "remark-directive-rehype": "0.4.2",
     "remark-frontmatter": "5.0.0",
-    "remark-gfm": "4.0.0",
+    "remark-gfm": "4.0.1",
     "remark-mdx-frontmatter": "5.0.0",
-    "rollup": "4.24.0",
-    "semver": "7.6.3",
+    "remark-parse": "^11.0.0",
+    "remark-rehype": "^11.1.1",
+    "rollup": "4.35.0",
+    "semver": "7.7.1",
     "sitemap": "8.0.0",
+    "spin-delay": "2.0.1",
     "strip-ansi": "7.1.0",
-    "tailwind-merge": "2.5.4",
-    "tailwindcss": "3.4.13",
+    "tailwind-merge": "2.6.0",
+    "tailwindcss": "3.4.17",
     "ulidx": "2.4.1",
+    "unified": "^11.0.5",
     "unist-util-visit": "5.0.0",
-    "urql": "4.1.0",
-    "vaul": "1.1.0",
+    "urql": "4.2.1",
+    "vaul": "1.1.2",
     "vfile": "6.0.3",
-    "vite": "5.4.9",
-    "yaml": "2.6.0",
+    "vite": "6.2.0",
+    "yaml": "2.7.0",
     "yargs": "17.7.2",
-    "zod": "3.23.8",
+    "zod": "3.24.2",
     "zod-validation-error": "3.4.0",
-    "zustand": "5.0.0"
+    "zustand": "5.0.3"
   },
   "devDependencies": {
-    "@types/estree": "1.0.6",
-    "@graphql-codegen/cli": "5.0.3",
-    "@graphql-codegen/client-preset": "4.5.0",
+    "@graphql-codegen/cli": "5.0.5",
+    "@graphql-codegen/client-preset": "4.8.0",
+    "@testing-library/react": "16.2.0",
+    "@types/estree": "1.0.7",
     "@types/express": "5.0.0",
-    "@types/har-format": "1.2.15",
+    "@types/har-format": "1.2.16",
+    "@types/hast": "^3.0.4",
     "@types/json-schema": "7.0.15",
     "@types/mdast": "4.0.4",
     "@types/mdx": "2.0.13",
-    "@types/node": "20.16.11",
+    "@types/node": "22.13.5",
     "@types/object-hash": "3.0.6",
-    "@types/react-is": "18.3.0",
+    "@types/react-is": "19.0.0",
     "@types/semver": "7.5.8",
+    "@types/unist": "^3.0.3",
     "@types/yargs": "17.0.33",
+    "@vitest/coverage-v8": "3.0.5",
+    "happy-dom": "17.4.4",
     "mdast-util-mdx": "3.0.0",
-    "react": "18.3.1",
-    "react-dom": "18.3.1",
-    "rollup-plugin-visualizer": "5.12.0",
-    "typescript": "5.6.3"
+    "react": "19.0.0",
+    "react-dom": "19.0.0",
+    "rollup-plugin-visualizer": "5.14.0",
+    "typescript": "5.7.3",
+    "vitest": "3.0.5"
   },
   "peerDependencies": {
-    "react": ">=18",
-    "react-dom": ">=18"
+    "react": ">=19",
+    "react-dom": ">=19"
   },
   "optionalDependencies": {
-    "@clerk/clerk-js": "5.11.0",
-    "@inkeep/widgets": "^0.2.289"
+    "@clerk/clerk-js": "^5.52.3",
+    "@sentry/react": "^9.1.0",
+    "@supabase/supabase-js": "^2.49.1"
   },
   "scripts": {
-    "build": "tsc --project tsconfig.json",
+    "build": "tsc --project tsconfig.app.json",
     "build:vite": "vite build",
+    "generate:icon-types": "node scripts/generate-icon-types.js",
     "build:standalone:vite": "vite build --mode standalone --config vite.standalone.config.ts",
-    "build:standalone:html": "cp ./src/app/standalone.html ./standalone/standalone.html && cp ./src/app/demo.html ./standalone/demo.html && cp ./src/app/demo-cdn.html ./standalone/index.html",
-    "hack:fix-worker-paths": "node ./scripts/hack-worker.mjs",
+    "build:standalone:html": "cp ./src/app/standalone.html ./standalone/standalone.html && cp ./src/app/demo.html ./standalone/demo.html && cp ./src/app/demo-cdn.html ./standalone/index.html && cp standalone/zudoku.css standalone/style.css",
     "clean": "tsc --build --clean",
     "codegen": "graphql-codegen --config ./src/codegen.ts",
-    "test": "node --test --enable-source-maps"
+    "test": "vitest run"
   },
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts"

package/src/app/demo-cdn.html

@@ -1,34 +1,34 @@
 <!doctype html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link
-      rel="icon"
-      type="image/svg+xml"
-      href="https://cdn.zudoku.dev/logos/favicon.svg"
-    />
-    <meta
-      name="viewport"
-      content="width=device-width, initial-scale=1.0, minimum-scale=1.0"
-    />
-    <title>Zudoku Demo</title>
-    <script
-      type="module"
-      crossorigin
-      src="https://cdn.zudoku.dev/latest/demo.js"
-    ></script>
-    <link
-      rel="stylesheet"
-      crossorigin
-      href="https://cdn.zudoku.dev/latest/style.css"
-    />
-    <script>
-      !function(t,e){var o,n,p,r;e.__SV||(window.posthog=e,e._i=[],e.init=function(i,s,a){function g(t,e){var o=e.split(".");2==o.length&&(t=t[o[0]],e=o[1]),t[e]=function(){t.push([e].concat(Array.prototype.slice.call(arguments,0)))}}(p=t.createElement("script")).type="text/javascript",p.async=!0,p.src=s.api_host.replace(".i.posthog.com","-assets.i.posthog.com")+"/static/array.js",(r=t.getElementsByTagName("script")[0]).parentNode.insertBefore(p,r);var u=e;for(void 0!==a?u=e[a]=[]:a="posthog",u.people=u.people||[],u.toString=function(t){var e="posthog";return"posthog"!==a&&(e+="."+a),t||(e+=" (stub)"),e},u.people.toString=function(){return u.toString(1)+".people (stub)"},o="init push capture register register_once register_for_session unregister unregister_for_session getFeatureFlag getFeatureFlagPayload isFeatureEnabled reloadFeatureFlags updateEarlyAccessFeatureEnrollment getEarlyAccessFeatures on onFeatureFlags onSessionId getSurveys getActiveMatchingSurveys renderSurvey canRenderSurvey getNextSurveyStep identify setPersonProperties group resetGroups setPersonPropertiesForFlags resetPersonPropertiesForFlags setGroupPropertiesForFlags resetGroupPropertiesForFlags reset get_distinct_id getGroups get_session_id get_session_replay_url alias set_config startSessionRecording stopSessionRecording sessionRecordingStarted captureException loadToolbar get_property getSessionProperty createPersonProfile opt_in_capturing opt_out_capturing has_opted_in_capturing has_opted_out_capturing clear_opt_in_out_capturing debug".split(" "),n=0;n<o.length;n++)g(u,o[n]);e._i.push([i,s,a])},e.__SV=1)}(document,window.posthog||[]);
-      posthog.init('phc_l8rjm0vHBMwNdGeBRDrK8UIYjyVxZyBAtnYo2hS18OY',{api_host:'https://us.i.posthog.com', person_profiles: 'identified_only' // or 'always' to create profiles for anonymous users as well
-      })
-    </script>
-  </head>
-  <body>
-    <div id="root"></div>
-  </body>
+<head>
+  <meta charset="UTF-8" />
+  <link
+    rel="icon"
+    type="image/svg+xml"
+    href="https://cdn.zudoku.dev/logos/favicon.svg"
+  />
+  <meta
+    name="viewport"
+    content="width=device-width, initial-scale=1.0, minimum-scale=1.0"
+  />
+  <title>Zudoku Demo</title>
+  <script
+    type="module"
+    crossorigin
+    src="https://cdn.zudoku.dev/latest/demo.js"
+  ></script>
+  <link
+    rel="stylesheet"
+    crossorigin
+    href="https://cdn.zudoku.dev/latest/style.css"
+  />
+  <script>
+    !function(t,e){var o,n,p,r;e.__SV||(window.posthog=e,e._i=[],e.init=function(i,s,a){function g(t,e){var o=e.split(".");2==o.length&&(t=t[o[0]],e=o[1]),t[e]=function(){t.push([e].concat(Array.prototype.slice.call(arguments,0)))}}(p=t.createElement("script")).type="text/javascript",p.async=!0,p.src=s.api_host.replace(".i.posthog.com","-assets.i.posthog.com")+"/static/array.js",(r=t.getElementsByTagName("script")[0]).parentNode.insertBefore(p,r);var u=e;for(void 0!==a?u=e[a]=[]:a="posthog",u.people=u.people||[],u.toString=function(t){var e="posthog";return"posthog"!==a&&(e+="."+a),t||(e+=" (stub)"),e},u.people.toString=function(){return u.toString(1)+".people (stub)"},o="init push capture register register_once register_for_session unregister unregister_for_session getFeatureFlag getFeatureFlagPayload isFeatureEnabled reloadFeatureFlags updateEarlyAccessFeatureEnrollment getEarlyAccessFeatures on onFeatureFlags onSessionId getSurveys getActiveMatchingSurveys renderSurvey canRenderSurvey getNextSurveyStep identify setPersonProperties group resetGroups setPersonPropertiesForFlags resetPersonPropertiesForFlags setGroupPropertiesForFlags resetGroupPropertiesForFlags reset get_distinct_id getGroups get_session_id get_session_replay_url alias set_config startSessionRecording stopSessionRecording sessionRecordingStarted captureException loadToolbar get_property getSessionProperty createPersonProfile opt_in_capturing opt_out_capturing has_opted_in_capturing has_opted_out_capturing clear_opt_in_out_capturing debug".split(" "),n=0;n<o.length;n++)g(u,o[n]);e._i.push([i,s,a])},e.__SV=1)}(document,window.posthog||[]);
+    posthog.init('phc_l8rjm0vHBMwNdGeBRDrK8UIYjyVxZyBAtnYo2hS18OY',{api_host:'https://us.i.posthog.com', person_profiles: 'identified_only' // or 'always' to create profiles for anonymous users as well
+    })
+  </script>
+</head>
+<body>
+<div id="root"></div>
+</body>
 </html>

package/src/app/demo.tsx

@@ -1,6 +1,6 @@
 import logger from "loglevel";
 import { createRoot } from "react-dom/client";
-import { createBrowserRouter } from "react-router-dom";
+import { createBrowserRouter } from "react-router";
 import { Bootstrap } from "zudoku/components";
 import type { ZudokuConfig } from "../config/validators/validate.js";
 import DemoAnnouncement from "../lib/demo/DemoAnnouncement.js";
@@ -48,7 +48,6 @@ const config = {
       type: "url",
       input: apiUrl,
       navigationId: "/",
-      inMemory: true,
     }),
   ],
 } satisfies ZudokuConfig;

package/src/app/entry.client.tsx

@@ -3,9 +3,10 @@ import {
   createBrowserRouter,
   matchRoutes,
   type RouteObject,
-} from "react-router-dom";
+} from "react-router";
 import config from "virtual:zudoku-config";
 import "virtual:zudoku-theme.css";
+import "vite/modulepreload-polyfill";
 import { Bootstrap } from "zudoku/components";
 import "./main.css";
 import { getRoutesByConfig } from "./main.js";
@@ -13,6 +14,20 @@ import { getRoutesByConfig } from "./main.js";
 const routes = getRoutesByConfig(config);
 const root = document.getElementById("root")!;
 
+declare global {
+  interface Window {
+    ZUDOKU_VERSION: string;
+  }
+}
+
+window.ZUDOKU_VERSION = process.env.ZUDOKU_VERSION ?? "unknown";
+
+if (process.env.SENTRY_DSN) {
+  void import("./sentry.js").then((mod) => {
+    mod.initSentry({ dsn: process.env.SENTRY_DSN as string });
+  });
+}
+
 if (root.childElementCount > 0) {
   void hydrate(routes);
 } else {
@@ -38,13 +53,6 @@ async function hydrateLazyRoutes(routes: RouteObject[]) {
 function render(routes: RouteObject[]) {
   const router = createBrowserRouter(routes, {
     basename: config.basePath,
-    future: {
-      v7_relativeSplatPath: true,
-      v7_fetcherPersist: true,
-      v7_partialHydration: true,
-      v7_skipActionErrorRevalidation: true,
-      v7_normalizeFormMethod: true,
-    },
   });
   createRoot(root).render(<Bootstrap router={router} />);
 }
@@ -53,14 +61,15 @@ async function hydrate(routes: RouteObject[]) {
   await hydrateLazyRoutes(routes);
   const router = createBrowserRouter(routes, {
     basename: config.basePath,
-    future: {
-      v7_relativeSplatPath: true,
-      v7_fetcherPersist: true,
-      v7_partialHydration: true,
-      v7_skipActionErrorRevalidation: true,
-      v7_normalizeFormMethod: true,
-    },
   });
 
   hydrateRoot(root, <Bootstrap hydrate router={router} />);
 }
+
+// This is a workaround to avoid version skewing
+// See https://vite.dev/guide/build.html#load-error-handling
+// TODO: Implement a more advanced solution if there are CDN urls or e.g. Vercel Skew Protection
+window.addEventListener("vite:preloadError", (e) => {
+  e.preventDefault();
+  window.location.reload();
+});

package/src/app/entry.server.tsx

@@ -4,34 +4,38 @@ import type express from "express";
 import logger from "loglevel";
 import { Transform } from "node:stream";
 import { renderToPipeableStream, renderToStaticMarkup } from "react-dom/server";
-import { isRouteErrorResponse } from "react-router-dom";
 import {
   createStaticHandler,
   createStaticRouter,
-} from "react-router-dom/server.js";
+  isRouteErrorResponse,
+  type RouteObject,
+} from "react-router";
 import "virtual:zudoku-theme.css";
+import "vite/modulepreload-polyfill";
 import { BootstrapStatic, ServerError } from "zudoku/components";
-import type { ZudokuConfig } from "../config/config.js";
-import type { FileWritingResponse } from "../vite/prerender.js";
+import { NO_DEHYDRATE } from "../lib/components/cache.js";
+import type { PrerenderResponse } from "../vite/prerender/PrerenderResponse.js";
 import "./main.css";
 import { getRoutesByConfig } from "./main.js";
-
 export { getRoutesByConfig };
 
 export const render = async ({
   template,
   request: baseRequest,
   response,
-  config,
+  routes,
+  basePath,
+  bypassProtection,
 }: {
   template: string;
   request: express.Request | Request;
-  response: express.Response | FileWritingResponse;
-  config: ZudokuConfig;
+  response: express.Response | PrerenderResponse;
+  routes: RouteObject[];
+  basePath?: string;
+  bypassProtection?: boolean;
 }) => {
-  const routes = getRoutesByConfig(config);
   const { query, dataRoutes } = createStaticHandler(routes, {
-    basename: config.basePath,
+    basename: basePath,
   });
   const queryClient = new QueryClient();
 
@@ -46,7 +50,7 @@ export const render = async ({
   if (context instanceof Response) {
     if ([301, 302, 303, 307, 308].includes(context.status)) {
       return response.redirect(
-        context.status,
+        import.meta.env.PROD ? context.status : 307,
         context.headers.get("Location")!,
       );
     }
@@ -71,6 +75,7 @@ export const render = async ({
       context={context}
       queryClient={queryClient}
       helmetContext={helmetContext}
+      bypassProtection={bypassProtection}
     />
   );
 
@@ -83,8 +88,6 @@ export const render = async ({
 
       response.send(html);
     },
-    // for SSG we could use onAllReady instead of onShellReady
-    // https://react.dev/reference/react-dom/server/renderToPipeableStream#waiting-for-all-content-to-load-for-crawlers-and-static-generation
     onAllReady() {
       response.set({ "Content-Type": "text/html" });
       response.status(status);
@@ -116,10 +119,15 @@ export const render = async ({
       );
 
       transformStream.on("finish", () => {
+        const dehydrated = dehydrate(queryClient, {
+          shouldDehydrateQuery: (query) =>
+            !query.queryKey.includes(NO_DEHYDRATE),
+        });
+
         response.end(
           htmlEnd?.replace(
             "</body>",
-            `<script>window.DATA = ${JSON.stringify(dehydrate(queryClient))}</script></body>`,
+            `<script>window.DATA=${JSON.stringify(dehydrated)}</script></body>`,
           ),
         );
       });
@@ -128,6 +136,9 @@ export const render = async ({
     },
     onError(error) {
       status = 500;
+      if (import.meta.env.PROD) {
+        throw error;
+      }
       logger.error(error);
     },
   });
@@ -135,7 +146,7 @@ export const render = async ({
 
 export function createFetchRequest(
   req: express.Request,
-  res: express.Response | FileWritingResponse,
+  res: express.Response | PrerenderResponse,
 ): Request {
   const origin = `${req.protocol}://${req.get("host")}`;
   // Note: This had to take originalUrl into account for presumably vite's proxying