zudoku 0.0.0-f471fb8 → 0.0.0-f52e8af

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zudoku",
-  "version": "0.0.0-f471fb8",
+  "version": "0.0.0-f52e8af",
   "type": "module",
   "homepage": "https://zudoku.dev",
   "repository": {
@@ -17,6 +17,7 @@
     "cli.js",
     "src/lib",
     "src/app",
+    "src/shiki",
     "client.d.ts"
   ],
   "bin": {
@@ -98,9 +99,9 @@
       "import": "./lib/zudoku.components.js",
       "types": "./dist/lib/components/index.d.ts"
     },
-    "./post-processors/*": {
-      "import": "./lib/post-processors/*.js",
-      "types": "./dist/lib/plugins/openapi/post-processors/*.d.ts"
+    "./processors/*": {
+      "import": "./lib/processors/*.js",
+      "types": "./dist/lib/plugins/openapi/processors/*.d.ts"
     },
     "./icons": {
       "import": "./lib/zudoku.icons.js",
@@ -118,6 +119,10 @@
       "require": "./src/app/main.css",
       "import": "./src/app/main.css"
     },
+    "./shiki/*": {
+      "require": "./src/shiki/*.js",
+      "import": "./src/shiki/*.js"
+    },
     "./app/*": {
       "import": "./src/app/*"
     },
@@ -127,63 +132,67 @@
     }
   },
   "dependencies": {
-    "@apidevtools/json-schema-ref-parser": "11.9.3",
-    "@envelop/core": "5.0.3",
+    "@apidevtools/json-schema-ref-parser": "12.0.2",
+    "@envelop/core": "5.2.3",
     "@graphql-typed-document-node/core": "3.2.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",
+    "@pothos/core": "4.6.0",
+    "@radix-ui/react-accordion": "1.2.10",
+    "@radix-ui/react-alert-dialog": "1.1.13",
+    "@radix-ui/react-aspect-ratio": "1.1.6",
+    "@radix-ui/react-checkbox": "1.3.1",
+    "@radix-ui/react-collapsible": "1.1.10",
+    "@radix-ui/react-dialog": "1.1.13",
+    "@radix-ui/react-dropdown-menu": "2.1.14",
+    "@radix-ui/react-hover-card": "1.1.13",
+    "@radix-ui/react-label": "2.1.6",
+    "@radix-ui/react-popover": "1.1.13",
+    "@radix-ui/react-progress": "1.1.6",
+    "@radix-ui/react-radio-group": "1.3.6",
+    "@radix-ui/react-scroll-area": "1.2.8",
+    "@radix-ui/react-select": "2.2.4",
+    "@radix-ui/react-slider": "1.3.4",
+    "@radix-ui/react-slot": "1.2.2",
+    "@radix-ui/react-switch": "1.2.4",
+    "@radix-ui/react-tabs": "1.1.11",
+    "@radix-ui/react-toggle": "1.1.8",
+    "@radix-ui/react-toggle-group": "1.1.9",
+    "@radix-ui/react-tooltip": "1.2.6",
+    "@radix-ui/react-visually-hidden": "1.2.2",
+    "@scalar/openapi-parser": "0.10.17",
+    "@sentry/node": "9.12.0",
+    "@shikijs/langs": "3.2.2",
+    "@shikijs/rehype": "3.2.2",
+    "@shikijs/themes": "3.2.2",
+    "@shikijs/transformers": "3.3.0",
     "@sindresorhus/slugify": "2.2.1",
-    "@stefanprobst/rehype-extract-toc": "2.2.1",
+    "@stefanprobst/rehype-extract-toc": "3.0.0",
     "@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",
+    "@tanstack/react-query": "5.74.3",
+    "@types/react": "19.1.1",
+    "@types/react-dom": "19.1.2",
+    "@vitejs/plugin-react": "4.4.1",
     "@zudoku/httpsnippet": "10.0.9",
     "@zudoku/react-helmet-async": "2.0.5",
+    "allof-merge": "0.6.6",
     "autoprefixer": "10.4.21",
     "class-variance-authority": "0.7.1",
     "clsx": "2.1.1",
-    "cmdk": "1.0.4",
+    "cmdk": "1.1.1",
     "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.2",
-    "express": "4.21.2",
+    "dotenv": "16.5.0",
+    "embla-carousel-react": "8.6.0",
+    "estree-util-value-to-estree": "3.3.3",
+    "express": "5.1.0",
     "fast-equals": "5.2.2",
     "glob": "11.0.1",
     "graphql": "16.10.0",
     "graphql-type-json": "0.3.2",
-    "graphql-yoga": "5.13.2",
+    "graphql-yoga": "5.13.3",
     "gray-matter": "4.0.3",
     "hast-util-to-jsx-runtime": "^2.3.6",
     "hast-util-to-string": "3.0.1",
@@ -191,7 +200,7 @@
     "http-terminator": "3.2.0",
     "loglevel": "1.9.2",
     "lru-cache": "11.0.2",
-    "lucide-react": "0.475.0",
+    "lucide-react": "0.488.0",
     "minimatch": "10.0.1",
     "nanoevents": "^9.1.0",
     "next-themes": "0.4.4",
@@ -200,16 +209,16 @@
     "openapi-types": "12.1.3",
     "pagefind": "1.4.0-alpha.1",
     "picocolors": "1.1.1",
-    "piscina": "5.0.0-alpha.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",
+    "posthog-node": "4.17.1",
     "react-error-boundary": "5.0.0",
-    "react-hook-form": "7.54.2",
-    "react-is": "19.0.0",
-    "react-router": "7.2.0",
+    "react-hook-form": "7.55.0",
+    "react-is": "19.1.0",
+    "react-markdown": "10.1.0",
+    "react-router": "7.5.2",
     "rehype-mdx-import-media": "1.2.0",
+    "rehype-pretty-code": "0.14.1",
     "rehype-raw": "7.0.0",
     "rehype-slug": "6.0.0",
     "remark-comment": "1.0.0",
@@ -217,25 +226,25 @@
     "remark-directive-rehype": "0.4.2",
     "remark-frontmatter": "5.0.0",
     "remark-gfm": "4.0.1",
-    "remark-mdx-frontmatter": "5.0.0",
+    "remark-mdx-frontmatter": "5.1.0",
     "remark-parse": "^11.0.0",
-    "remark-rehype": "^11.1.1",
-    "rollup": "4.35.0",
+    "remark-rehype": "^11.1.2",
+    "rollup": "4.40.1",
     "semver": "7.7.1",
+    "shiki": "3.3.0",
     "sitemap": "8.0.0",
     "spin-delay": "2.0.1",
     "strip-ansi": "7.1.0",
     "tailwind-merge": "2.6.0",
     "tailwindcss": "3.4.17",
-    "tsx": "^4.19.3",
     "ulidx": "2.4.1",
     "unified": "^11.0.5",
     "unist-util-visit": "5.0.0",
     "urql": "4.2.1",
     "vaul": "1.1.2",
     "vfile": "6.0.3",
-    "vite": "6.2.0",
-    "yaml": "2.7.0",
+    "vite": "6.3.5",
+    "yaml": "2.7.1",
     "yargs": "17.7.2",
     "zod": "3.24.2",
     "zod-validation-error": "3.4.0",
@@ -243,10 +252,10 @@
   },
   "devDependencies": {
     "@graphql-codegen/cli": "5.0.5",
-    "@graphql-codegen/client-preset": "4.7.0",
-    "@testing-library/react": "16.2.0",
+    "@graphql-codegen/client-preset": "4.8.0",
+    "@testing-library/react": "16.3.0",
     "@types/estree": "1.0.7",
-    "@types/express": "5.0.0",
+    "@types/express": "5.0.1",
     "@types/har-format": "1.2.16",
     "@types/hast": "^3.0.4",
     "@types/json-schema": "7.0.15",
@@ -255,31 +264,31 @@
     "@types/node": "22.13.5",
     "@types/object-hash": "3.0.6",
     "@types/react-is": "19.0.0",
-    "@types/semver": "7.5.8",
+    "@types/semver": "7.7.0",
     "@types/unist": "^3.0.3",
     "@types/yargs": "17.0.33",
-    "@vitest/coverage-v8": "3.0.5",
-    "happy-dom": "17.1.1",
+    "@vitest/coverage-v8": "3.1.1",
+    "happy-dom": "17.4.4",
     "mdast-util-mdx": "3.0.0",
-    "react": "19.0.0",
-    "react-dom": "19.0.0",
+    "react": "19.1.0",
+    "react-dom": "19.1.0",
     "rollup-plugin-visualizer": "5.14.0",
-    "typescript": "5.7.3",
-    "vitest": "3.0.5"
+    "typescript": "5.8.3",
+    "vitest": "3.1.1"
   },
   "peerDependencies": {
     "react": ">=19",
     "react-dom": ">=19"
   },
   "optionalDependencies": {
-    "@clerk/clerk-js": "^5.52.3",
-    "@sentry/react": "^9.1.0",
-    "@supabase/supabase-js": "^2.49.1"
+    "@clerk/clerk-js": "^5.63.1",
+    "@sentry/react": "^9.12.0",
+    "@supabase/supabase-js": "^2.49.4"
   },
   "scripts": {
-    "build": "tsc --project tsconfig.app.json",
+    "build": "tsc --project tsconfig.app.json --incremental",
     "build:vite": "vite build",
-    "generate:icon-types": "tsx ./scripts/generate-icon-types.ts",
+    "generate:types": "node scripts/generate-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 && cp standalone/zudoku.css standalone/style.css",
     "clean": "tsc --build --clean",

package/src/app/ZuploBuildConfig.ts

@@ -0,0 +1,33 @@
+import { z } from "zod";
+
+export const EntitlementsSchema = z.object({
+  devPortalZuploBranding: z.boolean(),
+  numberOfProjects: z.number(),
+  numberOfUsers: z.number(),
+  egressGbPerMonth: z.number(),
+  requestsPerMonth: z.number(),
+  numberOfApiKeys: z.number(),
+  customDomains: z.number(),
+  advancedAnalyticsEnabled: z.boolean(),
+  devPortalAnalyticsEnabled: z.boolean(),
+  premiumSupport: z.boolean(),
+  emergencyPhoneSupport: z.boolean(),
+  rbacEnabled: z.boolean(),
+  onPremEnabled: z.boolean(),
+  largeBuildRunners: z.boolean(),
+});
+
+export const BuildConfigSchema = z.object({
+  entitlements: EntitlementsSchema,
+  environmentType: z.string(),
+  deploymentName: z.string(),
+  deploymentUrl: z.string(),
+  projectId: z.string(),
+  projectType: z.string(),
+  sourceType: z.string(),
+  accountName: z.string(),
+  projectName: z.string(),
+});
+
+export type BuildConfig = z.infer<typeof BuildConfigSchema>;
+export type Entitlements = z.infer<typeof EntitlementsSchema>;

package/src/app/demo.html

@@ -13,7 +13,7 @@
     />
     <title>Zudoku Demo</title>
     <script type="module" crossorigin src="./demo.js"></script>
-    <link rel="stylesheet" crossorigin href="./style.css" />
+    <link rel="stylesheet" crossorigin href="./zudoku.css" />
   </head>
   <body>
     <div id="root"></div>

package/src/app/entry.client.tsx

@@ -34,6 +34,47 @@ if (root.childElementCount > 0) {
   void render(routes);
 }
 
+if (import.meta.env.IS_ZUPLO) {
+  // eslint-disable-next-line no-console
+  console.log(
+    `%cPowered by Zuplo v${window.ZUDOKU_VERSION}`,
+    [
+      "color: #Df0097",
+      "line-height: 50px",
+      "font-weight: bolder",
+      "font-size: 15px",
+      "text-align: center",
+      "letter-spacing: 5px",
+    ].join(" ;"),
+  );
+} else {
+  // eslint-disable-next-line no-console
+  console.log(
+    `%cZUDOKU%c by Zuplo v${window.ZUDOKU_VERSION}`,
+    [
+      "color: #FF00BD",
+      "line-height: 50px",
+      "font-weight: bolder",
+      "font-size: 30px",
+      "-webkit-text-stroke-width: 1px",
+      "-webkit-text-stroke-color: #FF00BD",
+      "text-transform: uppercase",
+      "text-align: center",
+      "letter-spacing: 5px",
+    ].join(" ;"),
+    [
+      "color: #Df0097",
+      "line-height: 50px",
+      "font-weight: bolder",
+      "font-size: 15px",
+      "text-align: center",
+      "letter-spacing: 5px",
+    ].join(" ;"),
+  );
+  // eslint-disable-next-line no-console
+  console.log("» Learn more about Zudoku https://zudoku.dev");
+}
+
 async function hydrateLazyRoutes(routes: RouteObject[]) {
   const path = window.location.pathname;
   const lazyMatches = matchRoutes(routes, path, config.basePath)?.filter(
@@ -43,6 +84,8 @@ async function hydrateLazyRoutes(routes: RouteObject[]) {
   if (lazyMatches?.length) {
     await Promise.all(
       lazyMatches.map(async (m) => {
+        if (typeof m.route.lazy !== "function") return;
+
         const routeModule = await m.route.lazy!();
         Object.assign(m.route, { ...routeModule, lazy: undefined });
       }),

package/src/app/entry.server.tsx

@@ -14,7 +14,7 @@ import "virtual:zudoku-theme.css";
 import "vite/modulepreload-polyfill";
 import { BootstrapStatic, ServerError } from "zudoku/components";
 import { NO_DEHYDRATE } from "../lib/components/cache.js";
-import type { FileWritingResponse } from "../vite/prerender/FileWritingResponse.js";
+import type { PrerenderResponse } from "../vite/prerender/PrerenderResponse.js";
 import "./main.css";
 import { getRoutesByConfig } from "./main.js";
 export { getRoutesByConfig };
@@ -25,12 +25,14 @@ export const render = async ({
   response,
   routes,
   basePath,
+  bypassProtection,
 }: {
   template: string;
   request: express.Request | Request;
-  response: express.Response | FileWritingResponse;
+  response: express.Response | PrerenderResponse;
   routes: RouteObject[];
   basePath?: string;
+  bypassProtection?: boolean;
 }) => {
   const { query, dataRoutes } = createStaticHandler(routes, {
     basename: basePath,
@@ -73,6 +75,7 @@ export const render = async ({
       context={context}
       queryClient={queryClient}
       helmetContext={helmetContext}
+      bypassProtection={bypassProtection}
     />
   );
 
@@ -143,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

package/src/app/env.ts

@@ -0,0 +1,35 @@
+import { BuildConfigSchema } from "./ZuploBuildConfig.js";
+
+const getZuploBuildConfig = () => {
+  if (!process.env.ZUPLO_BUILD_CONFIG) return undefined;
+
+  try {
+    const zuploBuildConfig = BuildConfigSchema.parse(
+      JSON.parse(process.env.ZUPLO_BUILD_CONFIG),
+    );
+    return zuploBuildConfig;
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.error(
+      "ZUPLO_BUILD_CONFIG is a reserved environment variable and cannot be used for custom configuration. Please remove it from your environment variables.",
+    );
+    // eslint-disable-next-line no-console
+    console.log(error);
+    return undefined;
+  }
+};
+
+export const ZuploEnv = {
+  /**
+   * Indicates that the build is running in Zuplo "mode"
+   */
+  get isZuplo(): boolean {
+    return process.env.ZUPLO === "1";
+  },
+
+  get serverUrl(): string | undefined {
+    return process.env.ZUPLO_SERVER_URL;
+  },
+
+  buildConfig: getZuploBuildConfig(),
+};

package/src/app/main.css

@@ -96,7 +96,12 @@
 
   html {
     /* This is to prevent layout jumping when the scrollbar appears/disappears */
-    @apply -mr-[--scrollbar-width] scroll-pt-[--scroll-padding];
+    @apply -me-[--scrollbar-width] scroll-pt-[--scroll-padding];
+    --dark: -1;
+  }
+
+  html.dark {
+    --dark: 1;
   }
 
   html,
@@ -127,15 +132,22 @@
     @apply bg-primary/100 text-primary-foreground;
   }
 
+  .bg-primary::selection,
+  .bg-primary ::selection {
+    background: theme(colors.background);
+    color: theme(colors.foreground);
+  }
+
   .dark {
     color-scheme: dark;
   }
 
   .prose.prose {
-    @apply prose-a:underline-offset-4 hover:prose-a:text-primary;
+    @apply prose-a:underline-offset-4 prose-a:font-normal hover:prose-a:text-primary;
     @apply prose-blockquote:not-italic prose-blockquote:text-neutral-500/75 prose-blockquote:dark:text-neutral-400;
-    @apply prose-headings:prose-code:mx-2;
-    @apply prose-code:before:content-none prose-code:after:content-none;
+    @apply prose-code:before:content-none prose-code:after:content-none prose-code:font-normal;
+    @apply prose-headings:prose-code:mx-2 prose-li:my-0.5;
+    @apply prose-hr:border-border;
 
     ul.contains-task-list {
       @apply list-none px-0;
@@ -145,6 +157,51 @@
     }
   }
 
+  .shiki {
+    counter-reset: line;
+    @apply leading-normal;
+  }
+  .code-block .shiki {
+    @apply grid;
+  }
+
+  .shiki,
+  .shiki span {
+    color: var(--shiki-light);
+    font-style: var(--shiki-light-font-style) !important;
+    font-weight: var(--shiki-light-font-weight) !important;
+    text-decoration: var(--shiki-light-text-decoration) !important;
+  }
+
+  html.dark .shiki,
+  html.dark .shiki span {
+    color: var(--shiki-dark);
+    font-style: var(--shiki-dark-font-style) !important;
+    font-weight: var(--shiki-dark-font-weight) !important;
+    text-decoration: var(--shiki-dark-text-decoration) !important;
+  }
+
+  .line-numbers .shiki .line::before {
+    counter-increment: line;
+    content: counter(line);
+    @apply tabular-nums inline-flex items-baseline justify-end me-4 w-3 text-muted-foreground/25;
+  }
+
+  .shiki.not-inline .line {
+    @apply inline-flex items-baseline -mx-4 px-4 w-[calc(100%+2rem)];
+    --highlighted-bg: hsl(
+      from hsl(var(--muted)) h s calc(l + 4 * var(--dark)) / 50%
+    );
+  }
+  .shiki .line.highlighted {
+    @apply bg-[--highlighted-bg];
+  }
+
+  .shiki .highlighted-word {
+    @apply bg-[--highlighted-bg] px-0.5 rounded;
+    box-shadow: 0 0 0 4px var(--highlighted-bg);
+  }
+
   select {
     @apply focus-visible:ring-primary focus-visible:ring-[1.5px] focus:outline-none;
   }
@@ -320,15 +377,15 @@
 
   /* Bullet with number */
   .stepper > ol > li::before {
-    @apply absolute left-0 flex items-center justify-center size-[--bullet-size];
+    @apply absolute start-0 flex items-center justify-center size-[--bullet-size];
     @apply bg-muted/80 border border-border text-muted-foreground text-[calc(var(--bullet-size)/2)] font-semibold rounded-full;
     content: counter(step-counter);
   }
 
   /* Vertical line */
   .stepper > ol > li::after {
-    @apply absolute content-[''] w-[2px] bg-border -translate-x-1/2;
-    left: calc(var(--bullet-size) / 2);
+    @apply absolute content-[''] w-[2px] bg-border -translate-x-1/2 rtl:translate-x-1/2;
+    inset-inline-start: calc(var(--bullet-size) / 2);
     top: calc(var(--bullet-size) + var(--line-spacing));
     height: calc(100% - var(--bullet-size) - (2 * var(--line-spacing)));
   }

package/src/app/main.tsx

@@ -9,9 +9,11 @@ import { configuredCustomPagesPlugin } from "virtual:zudoku-custom-pages-plugin"
 import { configuredDocsPlugins } from "virtual:zudoku-docs-plugins";
 import { configuredRedirectPlugin } from "virtual:zudoku-redirect-plugin";
 import { configuredSearchPlugin } from "virtual:zudoku-search-plugin";
+import { registerShiki } from "virtual:zudoku-shiki-register";
 import { configuredSidebar } from "virtual:zudoku-sidebar";
 import "virtual:zudoku-theme.css";
 import {
+  BuildCheck,
   Layout,
   RouteGuard,
   RouterError,
@@ -21,6 +23,10 @@ import {
 import type { ZudokuConfig } from "../config/config.js";
 import type { ZudokuContextOptions } from "../lib/core/ZudokuContext.js";
 import { isNavigationPlugin } from "../lib/core/plugins.js";
+import { highlighter } from "../lib/shiki.js";
+import { ZuploEnv } from "./env.js";
+
+await registerShiki(highlighter);
 
 export const convertZudokuConfigToOptions = (
   config: ZudokuConfig,
@@ -43,6 +49,9 @@ export const convertZudokuConfigToOptions = (
     protectedRoutes: config.protectedRoutes,
     page: {
       ...config.page,
+      showPoweredBy:
+        ZuploEnv.buildConfig?.entitlements.devPortalZuploBranding ??
+        config.page?.showPoweredBy,
       logo: {
         ...(isUsingFallback ? { width: "130px" } : {}),
         ...config.page?.logo,
@@ -75,6 +84,10 @@ export const convertZudokuConfigToOptions = (
         : []),
       ...(config.plugins ?? []),
     ],
+    syntaxHighlighting: {
+      highlighter,
+      themes: config.syntaxHighlighting?.themes,
+    },
   };
 };
 
@@ -115,12 +128,22 @@ export const getRoutesByOptions = (
 
 export const getRoutesByConfig = (config: ZudokuConfig): RouteObject[] => {
   const options = convertZudokuConfigToOptions(config);
-  const routes = getRoutesByOptions(options, config.enableStatusPages);
+  const routes = getRoutesByOptions(
+    options,
+    import.meta.env.IS_ZUPLO || config.enableStatusPages,
+  );
 
   return [
     {
       element: (
         <Zudoku {...options}>
+          <BuildCheck
+            buildId={
+              import.meta.env.IS_ZUPLO && import.meta.env.ZUPLO_BUILD_ID
+                ? import.meta.env.ZUPLO_BUILD_ID
+                : undefined
+            }
+          />
           <Layout />
         </Zudoku>
       ),

package/src/lib/authentication/components/CallbackHandler.tsx

@@ -1,18 +1,28 @@
 import { useSuspenseQuery } from "@tanstack/react-query";
 import { Navigate } from "react-router";
+import { useZudoku } from "zudoku/components";
 import { ZudokuError } from "../../util/invariant.js";
+import { joinUrl } from "../../util/joinUrl.js";
+import { normalizeRedirectUrl } from "../../util/url.js";
 
 export function CallbackHandler({
   handleCallback,
 }: {
   handleCallback: () => Promise<string>;
 }) {
+  const { options } = useZudoku();
   const executeCallback = useSuspenseQuery({
     retry: false,
     queryKey: ["oauth-callback"],
     queryFn: async () => {
       try {
-        return await handleCallback();
+        return joinUrl(
+          normalizeRedirectUrl(
+            await handleCallback(),
+            window.location.origin,
+            options.basePath,
+          ),
+        );
       } catch (error) {
         throw new ZudokuError("Could not validate user", {
           cause: error,