zudoku 0.47.0 → 0.47.2

package/src/app/entry.server.tsx

@@ -10,12 +10,10 @@ import {
   isRouteErrorResponse,
   type RouteObject,
 } from "react-router";
-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 { PrerenderResponse } from "../vite/prerender/PrerenderResponse.js";
-import "./main.css";
 import { getRoutesByConfig } from "./main.js";
 export { getRoutesByConfig };
 

package/src/app/env.ts

@@ -1,3 +1,4 @@
+import z from "zod";
 import { BuildConfigSchema } from "./ZuploBuildConfig.js";
 
 const getZuploBuildConfig = () => {
@@ -9,6 +10,13 @@ const getZuploBuildConfig = () => {
     );
     return zuploBuildConfig;
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      // eslint-disable-next-line no-console
+      console.error("ZUPLO_BUILD_CONFIG is invalid.");
+      // eslint-disable-next-line no-console
+      console.log(error.errors);
+      return undefined;
+    }
     // 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.",

package/src/app/main.css

@@ -1,5 +1,4 @@
-/* @vite-plugin-inject font */
-@import "./defaultTheme.css" layer(theme);
+/* @vite-plugin-inject defaultTheme */
 @import "tailwindcss" source("..");
 
 /* @vite-plugin-inject main */
@@ -7,56 +6,6 @@
 @plugin "@tailwindcss/typography";
 @custom-variant dark (&:is(.dark *));
 
-@theme inline {
-  --color-background: var(--background);
-  --color-foreground: var(--foreground);
-  --color-card: var(--card);
-  --color-card-foreground: var(--card-foreground);
-  --color-popover: var(--popover);
-  --color-popover-foreground: var(--popover-foreground);
-  --color-primary: var(--primary);
-  --color-primary-foreground: var(--primary-foreground);
-  --color-secondary: var(--secondary);
-  --color-secondary-foreground: var(--secondary-foreground);
-  --color-muted: var(--muted);
-  --color-muted-foreground: var(--muted-foreground);
-  --color-accent: var(--accent);
-  --color-accent-foreground: var(--accent-foreground);
-  --color-destructive: var(--destructive);
-  --color-destructive-foreground: var(--destructive-foreground);
-  --color-border: var(--border);
-  --color-input: var(--input);
-  --color-ring: var(--ring);
-  --color-chart-1: var(--chart-1);
-  --color-chart-2: var(--chart-2);
-  --color-chart-3: var(--chart-3);
-  --color-chart-4: var(--chart-4);
-  --color-chart-5: var(--chart-5);
-
-  --radius-sm: calc(var(--radius) - 4px);
-  --radius-md: calc(var(--radius) - 2px);
-  --radius-lg: var(--radius);
-  --radius-xl: calc(var(--radius) + 4px);
-
-  --shadow-2xs: var(--shadow-2xs);
-  --shadow-xs: var(--shadow-xs);
-  --shadow-sm: var(--shadow-sm);
-  --shadow: var(--shadow);
-  --shadow-md: var(--shadow-md);
-  --shadow-lg: var(--shadow-lg);
-  --shadow-xl: var(--shadow-xl);
-  --shadow-2xl: var(--shadow-2xl);
-
-  --color-sidebar: var(--sidebar);
-  --color-sidebar-foreground: var(--sidebar-foreground);
-  --color-sidebar-primary: var(--sidebar-primary);
-  --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
-  --color-sidebar-accent: var(--sidebar-accent);
-  --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
-  --color-sidebar-border: var(--sidebar-border);
-  --color-sidebar-ring: var(--sidebar-ring);
-}
-
 @utility prose {
   a {
     @apply font-normal underline-offset-4 hover:text-primary;

package/src/app/main.tsx

@@ -25,6 +25,7 @@ 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";
+import "./main.css";
 
 await registerShiki(highlighter);
 
@@ -71,7 +72,7 @@ export const convertZudokuConfigToOptions = (
 
 export const getRoutesByOptions = (
   options: ZudokuContextOptions,
-  enableStatusPages = false,
+  enableStatusPages = true,
 ) => {
   const allPlugins = [
     ...(options.plugins ?? []),
@@ -84,7 +85,7 @@ export const getRoutesByOptions = (
       enableStatusPages
         ? [400, 403, 404, 405, 414, 416, 500, 501, 502, 503, 504].map(
             (statusCode) => ({
-              path: `/.static/${statusCode}`,
+              path: `/${statusCode}`,
               element: <StatusPage statusCode={statusCode} />,
             }),
           )

package/src/lib/auth/issuer.test.ts

@@ -14,7 +14,7 @@ describe("getIssuer", () => {
     };
 
     const result = await getIssuer(config);
-    expect(result).toBe("tolerant-hornet-46.clerk.accounts.dev");
+    expect(result).toBe("https://tolerant-hornet-46.clerk.accounts.dev");
   });
 
   it("should throw error for invalid clerk public key format", async () => {
@@ -69,6 +69,22 @@ describe("getIssuer", () => {
     expect(result).toBe("https://example.com/auth");
   });
 
+  it("should return azureb2c issuer for azureb2c authentication", async () => {
+    const config: ZudokuConfig = {
+      authentication: {
+        type: "azureb2c",
+        tenantName: "example",
+        policyName: "B2C_1_SignUpSignIn",
+        issuer: "https://example.b2clogin.com/example.onmicrosoft.com/v2.0/",
+        clientId: "test-client-id",
+      },
+    };
+    const result = await getIssuer(config);
+    expect(result).toBe(
+      "https://example.b2clogin.com/example.onmicrosoft.com/v2.0/",
+    );
+  });
+
   it("should return supabase URL for supabase authentication", async () => {
     const config: ZudokuConfig = {
       authentication: {

package/src/lib/auth/issuer.ts

@@ -17,7 +17,7 @@ export const getIssuer = async (config: ZudokuConfig) => {
       const frontendApi = frontendApiParts.at(0);
       invariant(frontendApi, "Clerk public key is invalid");
 
-      return frontendApi;
+      return `https://${frontendApi}`;
     }
     case "auth0": {
       return `https://${config.authentication.domain}/`;
@@ -28,6 +28,9 @@ export const getIssuer = async (config: ZudokuConfig) => {
     case "supabase": {
       return config.authentication.supabaseUrl;
     }
+    case "azureb2c": {
+      return config.authentication.issuer;
+    }
     case undefined: {
       return undefined;
     }

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

@@ -34,5 +34,5 @@ export function CallbackHandler({
     },
   });
 
-  return <Navigate to={executeCallback.data} />;
+  return <Navigate to={executeCallback.data} replace />;
 }

package/src/lib/components/Framed.tsx

@@ -0,0 +1,51 @@
+import { cva } from "class-variance-authority";
+import type { PropsWithChildren } from "react";
+import { cn } from "../util/cn.js";
+
+const frameVariants = cva("", {
+  variants: {
+    size: {
+      sm: "max-w-sm",
+      md: "max-w-md",
+      lg: "max-w-lg",
+      xl: "max-w-xl",
+      "2xl": "max-w-2xl",
+      full: "max-w-full",
+    },
+    align: {
+      center: "mx-auto",
+      start: "me-auto",
+      end: "ms-auto",
+    },
+  },
+  defaultVariants: {
+    size: "xl",
+    align: "center",
+  },
+});
+
+export const Framed = ({
+  caption,
+  className,
+  size = "xl",
+  align = "center",
+  children,
+}: PropsWithChildren<{
+  caption?: string;
+  className?: string;
+  size?: "sm" | "md" | "lg" | "xl" | "2xl" | "full";
+  align?: "center" | "start" | "end";
+}>) => (
+  <figure className={cn(frameVariants({ size, align }), className)}>
+    <div className="relative overflow-hidden rounded-lg border border-border bg-muted/50 p-1 shadow-sm">
+      <div className="not-prose rounded-md [&_img]:rounded-md! relative overflow-hidden bg-background">
+        {children}
+      </div>
+    </div>
+    {caption && (
+      <figcaption className="mt-3 text-center text-sm text-muted-foreground">
+        {caption}
+      </figcaption>
+    )}
+  </figure>
+);

package/src/lib/components/MobileTopNavigation.tsx

@@ -12,6 +12,7 @@ import { useZudoku } from "./context/ZudokuContext.js";
 import { PoweredByZudoku } from "./navigation/PoweredByZudoku.js";
 import { isHiddenItem } from "./navigation/utils.js";
 import { Search } from "./Search.js";
+import { Slot } from "./Slot.js";
 import { ThemeSwitch } from "./ThemeSwitch.js";
 import { PageProgress, TopNavItem } from "./TopNavigation.js";
 
@@ -43,6 +44,9 @@ export const MobileTopNavigation = () => {
             </VisuallyHidden>
             <Search className="flex p-4" />
             <ul className="flex flex-col items-center gap-4 p-4">
+              <li className="empty:hidden">
+                <Slot.Target name="top-navigation-side" />
+              </li>
               <li>
                 <ThemeSwitch />
               </li>

package/src/lib/plugins/api-keys/SettingsApiKeys.tsx

@@ -296,17 +296,20 @@ export const SettingsApiKeys = ({ service }: { service: ApiKeyService }) => {
                       <Dialog>
                         <DialogTrigger asChild>
                           <Button
-                            size="icon"
                             title="Roll this key"
                             variant="ghost"
                             disabled={rollKeyMutation.isPending}
-                            className={
-                              rollKeyMutation.isPending
-                                ? "animate-spin"
-                                : undefined
-                            }
+                            className="flex items-center gap-1"
                           >
-                            <RotateCwIcon size={16} />
+                            <RotateCwIcon
+                              size={16}
+                              className={
+                                rollKeyMutation.isPending
+                                  ? "animate-spin"
+                                  : undefined
+                              }
+                            />
+                            Roll
                           </Button>
                         </DialogTrigger>
                         <DialogContent>
@@ -473,7 +476,7 @@ const RevealApiKey = ({
         </div>
       </div>
       <div className="flex justify-end">
-        {isExpired && onDeleteKey && (
+        {expiresOn && onDeleteKey && (
           <Dialog>
             <DialogTrigger asChild>
               <Button variant="ghost" size="icon">

package/src/lib/plugins/api-keys/index.tsx

@@ -102,9 +102,7 @@ const createDefaultHandler = (deploymentName: string): ApiKeyService => {
               headers: {
                 "Content-Type": "application/json",
               },
-              body: JSON.stringify({
-                expiresOn: new Date(),
-              }),
+              body: JSON.stringify({}),
             },
           ),
         ),

package/src/lib/plugins/openapi/schema/SchemaView.tsx

@@ -47,7 +47,7 @@ export const SchemaView = ({
       <Card className="overflow-hidden">
         {cardHeader}
         <div className="text-sm text-muted-foreground italic p-4">
-          No schema specified
+          No data returned
         </div>
       </Card>
     );

package/src/lib/ui/CodeBlock.tsx

@@ -71,7 +71,7 @@ export const CodeBlock = ({
           aria-label="Copy code"
           title="Copy code"
           className={cn(
-            "absolute top-2 end-2 p-2 hover:outline hover:outline-border/75 dark:hover:outline-border rounded-md text-sm text-muted-foreground transition",
+            "absolute top-2 end-2 p-2 transition hover:shadow-xs active:shadow-none active:inset-shadow-xs hover:outline outline-border rounded-md text-sm text-muted-foreground",
             title && "top-10",
             showCopy === "hover" && "opacity-0 group-hover:opacity-100",
             showCopyText && "flex gap-2 items-center font-medium",

package/src/lib/util/MdxComponents.tsx

@@ -1,6 +1,7 @@
 import { type MDXComponents } from "mdx/types.js";
 import { CodeBlock } from "zudoku/ui/CodeBlock.js";
 import { AnchorLink } from "../components/AnchorLink.js";
+import { Framed } from "../components/Framed.js";
 import { Heading } from "../components/Heading.js";
 import { InlineCode } from "../components/InlineCode.js";
 import { Button } from "../ui/Button.js";
@@ -14,10 +15,20 @@ export type MdxComponentsType = Readonly<MDXComponents> | null | undefined;
 export const MdxComponents = {
   img: ({ node, ...props }) => {
     if (/\.(mp4|webm|mov|avi)$/.test(props.src ?? "")) {
-      return <video src={props.src} controls playsInline autoPlay loop />;
+      return (
+        <video
+          src={props.src}
+          controls
+          playsInline
+          autoPlay
+          loop
+          className={cn("rounded-lg", props.className)}
+        />
+      );
     }
-    return <img {...props} className={cn("rounded-md", props.className)} />;
+    return <img {...props} className={cn("rounded-lg", props.className)} />;
   },
+  Framed,
   h1: ({ children, id }) => (
     <Heading level={1} id={id}>
       {children}

package/dist/vite/plugin-configure-tailwind.d.ts

@@ -1,2 +0,0 @@
-import type { Plugin } from "vite";
-export declare const viteTailwindPlugin: () => Plugin;

package/dist/vite/plugin-configure-tailwind.js

@@ -1,38 +0,0 @@
-import path from "node:path";
-import { getCurrentConfig } from "../config/loader.js";
-// Font imports need to be at the very top of the file
-const FONT_REPLACE = "/* @vite-plugin-inject font */";
-const MAIN_REPLACE = "/* @vite-plugin-inject main */";
-export const viteTailwindPlugin = () => {
-    return {
-        name: "zudoku-configure-tailwind",
-        enforce: "pre",
-        transform(src, id) {
-            if (!id.endsWith("/src/app/main.css"))
-                return;
-            const config = getCurrentConfig();
-            const files = new Set([config.__meta.rootDir, ...config.__meta.dependencies].map((file) => path.relative(path.dirname(id), file)));
-            const code = [...files].map((file) => `@source "${file}";`);
-            const fontImports = [];
-            code.push("@theme {");
-            if (config.theme?.fonts?.sans) {
-                fontImports.push(`@import url('${config.theme.fonts.sans.url}');`);
-                code.push(`  --font-sans: ${config.theme.fonts.sans.fontFamily}, sans-serif;`);
-            }
-            else {
-                fontImports.push("@import url('./font.geist.css');");
-                code.push("  --font-sans: Geist, sans-serif;");
-                code.push('  --font-display--font-feature-settings: "rlig" 1, "calt" 0;');
-            }
-            if (config.theme?.fonts?.mono) {
-                fontImports.push(`@import url('${config.theme.fonts.mono.url}');`);
-                code.push(`  --font-mono: ${config.theme.fonts.mono.fontFamily}, monospace;`);
-            }
-            code.push("}");
-            return src
-                .replace(FONT_REPLACE, fontImports.join("\n"))
-                .replace(MAIN_REPLACE, code.join("\n"));
-        },
-    };
-};
-//# sourceMappingURL=plugin-configure-tailwind.js.map

package/dist/vite/plugin-configure-tailwind.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"plugin-configure-tailwind.js","sourceRoot":"","sources":["../../src/vite/plugin-configure-tailwind.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,sDAAsD;AACtD,MAAM,YAAY,GAAG,gCAAgC,CAAC;AACtD,MAAM,YAAY,GAAG,gCAAgC,CAAC;AAEtD,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAW,EAAE;IAC7C,OAAO;QACL,IAAI,EAAE,2BAA2B;QACjC,OAAO,EAAE,KAAK;QACd,SAAS,CAAC,GAAG,EAAE,EAAE;YACf,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC;gBAAE,OAAO;YAE9C,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;YAElC,MAAM,KAAK,GAAG,IAAI,GAAG,CACnB,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAClE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CACtC,CACF,CAAC;YAEF,MAAM,IAAI,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC;YAC5D,MAAM,WAAW,GAAa,EAAE,CAAC;YAEjC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAEtB,IAAI,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;gBAC9B,WAAW,CAAC,IAAI,CAAC,gBAAgB,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;gBACnE,IAAI,CAAC,IAAI,CACP,kBAAkB,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,eAAe,CACpE,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,WAAW,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;gBACrD,IAAI,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;gBAC/C,IAAI,CAAC,IAAI,CACP,8DAA8D,CAC/D,CAAC;YACJ,CAAC;YAED,IAAI,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;gBAC9B,WAAW,CAAC,IAAI,CAAC,gBAAgB,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;gBACnE,IAAI,CAAC,IAAI,CACP,kBAAkB,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,cAAc,CACnE,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAEf,OAAO,GAAG;iBACP,OAAO,CAAC,YAAY,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAC7C,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5C,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}

package/dist/vite/plugin-theme-css.d.ts

@@ -1,5 +0,0 @@
-import { type Plugin } from "vite";
-declare const THEME_VARIABLES: readonly ["background", "foreground", "card", "cardForeground", "popover", "popoverForeground", "primary", "primaryForeground", "secondary", "secondaryForeground", "muted", "mutedForeground", "accent", "accentForeground", "destructive", "destructiveForeground", "border", "input", "ring", "radius"];
-export type Theme = Partial<Record<(typeof THEME_VARIABLES)[number], string>>;
-export declare const viteThemeCss: () => Plugin;
-export {};

package/dist/vite/plugin-theme-css.js

@@ -1,77 +0,0 @@
-import Color from "colorjs.io";
-import { getCurrentConfig } from "../config/loader.js";
-import { objectEntries } from "../lib/util/objectEntries.js";
-const THEME_VARIABLES = [
-    "background",
-    "foreground",
-    "card",
-    "cardForeground",
-    "popover",
-    "popoverForeground",
-    "primary",
-    "primaryForeground",
-    "secondary",
-    "secondaryForeground",
-    "muted",
-    "mutedForeground",
-    "accent",
-    "accentForeground",
-    "destructive",
-    "destructiveForeground",
-    "border",
-    "input",
-    "ring",
-    "radius",
-];
-const uncamelize = (str) => str.replace(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`);
-const processColorValue = (value) => {
-    if (!value)
-        return "";
-    const c = !value.startsWith("#") &&
-        !value.includes("(") &&
-        value.split(" ").length >= 3
-        ? // Assume legacy tailwind hsl format
-            `hsl(${value})`
-        : value;
-    try {
-        return new Color(c).to("oklch").toString();
-    }
-    catch (e) {
-        // eslint-disable-next-line no-console
-        console.error("Invalid color value:", value, e);
-        return value;
-    }
-};
-const generateCss = (theme) => objectEntries(theme)
-    .filter(([key]) => THEME_VARIABLES.includes(key))
-    .map(([key, value]) => {
-    const processedValue = processColorValue(value);
-    return `--${uncamelize(key)}: ${processedValue};`;
-})
-    .join("\n");
-export const viteThemeCss = () => {
-    const virtualModuleId = "virtual:zudoku-theme.css";
-    const resolvedVirtualModuleId = "\0" + virtualModuleId;
-    return {
-        name: "zudoku-theme",
-        resolveId(id) {
-            if (id === virtualModuleId) {
-                return resolvedVirtualModuleId;
-            }
-        },
-        load(id) {
-            if (id !== resolvedVirtualModuleId)
-                return;
-            const config = getCurrentConfig();
-            const cssParts = [];
-            if (config.theme?.light) {
-                cssParts.push(`:root {\n${generateCss(config.theme.light)}\n}`);
-            }
-            if (config.theme?.dark) {
-                cssParts.push(`.dark {\n${generateCss(config.theme.dark)}\n}`);
-            }
-            return cssParts.join("\n");
-        },
-    };
-};
-//# sourceMappingURL=plugin-theme-css.js.map

package/dist/vite/plugin-theme-css.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"plugin-theme-css.js","sourceRoot":"","sources":["../../src/vite/plugin-theme-css.ts"],"names":[],"mappings":"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"}