zudoku 0.0.0-e88b02e → 0.0.0-e8a949d

package/lib/zudoku.plugin-search-inkeep.js

@@ -1,7 +1,7 @@
-import { j as n } from "./jsx-runtime-B6kdoens.js";
-import { lazy as a } from "react";
-import { C as i } from "./ClientOnly-E7hGysn1.js";
-const o = {
+import { j as i } from "./jsx-runtime-Dx-03ztt.js";
+import { useRef as l, useState as f, useMemo as m, useEffect as u } from "react";
+import { C as g } from "./ClientOnly-E7hGysn1.js";
+const h = {
   theme: {
     components: {
       AIChatPageWrapper: {
@@ -19,29 +19,58 @@ const o = {
       }
     }
   }
-}, p = {}, c = a(() => import("./InkeepCustomTrigger-CE5-K5ex.js")), l = ({
-  prefilledQuery: e,
-  isOpen: r,
-  onClose: t,
-  settings: s
-}) => /* @__PURE__ */ n.jsx(
-  c,
-  {
-    isOpen: r,
-    onClose: t,
-    baseSettings: { ...o, ...s },
-    aiChatSettings: p,
-    searchSettings: {
-      prefilledQuery: e || void 0
+}, k = {}, I = ({
+  prefilledQuery: r,
+  isOpen: e,
+  onClose: n,
+  settings: p
+}) => {
+  const o = l(null), c = l(null), [s, d] = f(
+    typeof Inkeep < "u"
+  ), a = m(
+    () => ({
+      componentType: "CustomTrigger",
+      targetElement: o.current,
+      properties: {
+        isOpen: e,
+        onClose: n,
+        onOpen: void 0,
+        baseSettings: { ...h, ...p },
+        searchSettings: {
+          prefilledQuery: r || void 0
+        },
+        aiChatSettings: k
+      }
+    }),
+    [e, n, r, p, o]
+  );
+  return u(() => {
+    if (s) return;
+    const t = setInterval(() => {
+      typeof Inkeep < "u" && (d(!0), clearInterval(t));
+    }, 100);
+    return () => clearInterval(t);
+  }, [s]), u(() => {
+    !s || c.current || (c.current = Inkeep().embed(a));
+  }, [a, s]), u(() => {
+    var t;
+    (t = c.current) == null || t.render({ ...a, isOpen: e });
+  }, [a, e]), /* @__PURE__ */ i.jsx("div", { ref: o });
+}, x = (r) => ({
+  getHead: () => /* @__PURE__ */ i.jsx(
+    "script",
+    {
+      type: "module",
+      src: "https://unpkg.com/@inkeep/uikit-js@0.3.19/dist/embed.js",
+      defer: !0
     }
-  }
-), d = (e) => ({
+  ),
   renderSearch: ({
-    isOpen: r,
-    onClose: t
-  }) => /* @__PURE__ */ n.jsx(i, { children: /* @__PURE__ */ n.jsx(l, { isOpen: r, onClose: t, settings: e }) })
+    isOpen: e,
+    onClose: n
+  }) => /* @__PURE__ */ i.jsx(g, { children: /* @__PURE__ */ i.jsx(I, { isOpen: e, onClose: n, settings: r }) })
 });
 export {
-  d as inkeepSearchPlugin
+  x as inkeepSearchPlugin
 };
 //# sourceMappingURL=zudoku.plugin-search-inkeep.js.map

package/lib/zudoku.plugin-search-inkeep.js.map

@@ -1 +1 @@
-{"version":3,"file":"zudoku.plugin-search-inkeep.js","sources":["../src/lib/plugins/search-inkeep/inkeep.ts","../src/lib/plugins/search-inkeep/index.tsx"],"sourcesContent":["import {\n  InkeepAIChatSettings,\n  InkeepModalSettings,\n  InkeepSearchSettings,\n} from \"@inkeep/widgets\";\n\nconst baseSettings = {\n  theme: {\n    components: {\n      AIChatPageWrapper: {\n        defaultProps: {\n          size: \"shrink-vertically\",\n          variant: \"no-shadow\",\n        },\n      },\n      SearchBarTrigger: {\n        defaultProps: {\n          size: \"expand\",\n          variant: \"subtle\", // Choose from 'emphasized' or 'subtle'\n        },\n      },\n    },\n  },\n} as const;\n\nconst modalSettings: InkeepModalSettings = {};\n\nconst searchSettings: InkeepSearchSettings = {};\n\nconst aiChatSettings: InkeepAIChatSettings = {};\n\nexport { aiChatSettings, baseSettings, modalSettings, searchSettings };\n","import type { InkeepWidgetBaseSettings } from \"@inkeep/widgets\";\nimport { lazy } from \"react\";\nimport { ClientOnly } from \"../../components/ClientOnly.js\";\nimport type { ZudokuPlugin } from \"../../core/plugins.js\";\nimport { aiChatSettings, baseSettings } from \"./inkeep.js\";\n\ntype PickedPluginInkeepBaseSettings =\n  | \"apiKey\"\n  | \"integrationId\"\n  | \"organizationId\"\n  | \"primaryBrandColor\"\n  | \"organizationDisplayName\";\n\ntype PluginInkeepBaseSettings = Pick<\n  InkeepWidgetBaseSettings,\n  PickedPluginInkeepBaseSettings\n>;\n\nconst Inkeep = lazy(() => import(\"./InkeepCustomTrigger.js\"));\n\nconst InkeepSearch = ({\n  prefilledQuery,\n  isOpen,\n  onClose,\n  settings,\n}: {\n  isOpen: boolean;\n  onClose: () => void;\n  prefilledQuery?: string | null;\n  settings: PluginInkeepBaseSettings;\n}) => {\n  return (\n    <Inkeep\n      isOpen={isOpen}\n      onClose={onClose}\n      baseSettings={{ ...baseSettings, ...settings }}\n      aiChatSettings={aiChatSettings}\n      searchSettings={{\n        prefilledQuery: prefilledQuery || undefined,\n      }}\n    />\n  );\n};\n\nexport const inkeepSearchPlugin = (\n  settings: PluginInkeepBaseSettings,\n): ZudokuPlugin => {\n  return {\n    renderSearch: ({\n      isOpen,\n      onClose,\n    }: {\n      isOpen: boolean;\n      onClose: () => void;\n    }) => {\n      return (\n        <ClientOnly>\n          <InkeepSearch isOpen={isOpen} onClose={onClose} settings={settings} />\n        </ClientOnly>\n      );\n    },\n  };\n};\n"],"names":["baseSettings","aiChatSettings","Inkeep","lazy","InkeepSearch","prefilledQuery","isOpen","onClose","settings","jsx","inkeepSearchPlugin","ClientOnly"],"mappings":";;;AAMA,MAAMA,IAAe;AAAA,EACnB,OAAO;AAAA,IACL,YAAY;AAAA,MACV,mBAAmB;AAAA,QACjB,cAAc;AAAA,UACZ,MAAM;AAAA,UACN,SAAS;AAAA,QACX;AAAA,MACF;AAAA,MACA,kBAAkB;AAAA,QAChB,cAAc;AAAA,UACZ,MAAM;AAAA,UACN,SAAS;AAAA;AAAA,QACX;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF,GAMMC,IAAuC,CAAC,GCXxCC,IAASC,EAAK,MAAM,OAAO,mCAA0B,CAAC,GAEtDC,IAAe,CAAC;AAAA,EACpB,gBAAAC;AAAA,EACA,QAAAC;AAAA,EACA,SAAAC;AAAA,EACA,UAAAC;AACF,MAOIC,gBAAAA,EAAA;AAAA,EAACP;AAAA,EAAA;AAAA,IACC,QAAAI;AAAA,IACA,SAAAC;AAAA,IACA,cAAc,EAAE,GAAGP,GAAc,GAAGQ,EAAS;AAAA,IAC7C,gBAAAP;AAAA,IACA,gBAAgB;AAAA,MACd,gBAAgBI,KAAkB;AAAA,IACpC;AAAA,EAAA;AAAA,GAKOK,IAAqB,CAChCF,OAEO;AAAA,EACL,cAAc,CAAC;AAAA,IACb,QAAAF;AAAA,IACA,SAAAC;AAAA,EAAA,4BAMGI,GACC,EAAA,UAAAF,gBAAAA,EAAAA,IAACL,KAAa,QAAAE,GAAgB,SAAAC,GAAkB,UAAAC,EAAoB,CAAA,EACtE,CAAA;AAEJ;"}
+{"version":3,"file":"zudoku.plugin-search-inkeep.js","sources":["../src/lib/plugins/search-inkeep/inkeep.ts","../src/lib/plugins/search-inkeep/index.tsx"],"sourcesContent":["const baseSettings = {\n  theme: {\n    components: {\n      AIChatPageWrapper: {\n        defaultProps: {\n          size: \"shrink-vertically\",\n          variant: \"no-shadow\",\n        },\n      },\n      SearchBarTrigger: {\n        defaultProps: {\n          size: \"expand\",\n          variant: \"subtle\", // Choose from 'emphasized' or 'subtle'\n        },\n      },\n    },\n  },\n} as const;\n\nconst modalSettings = {};\n\nconst searchSettings = {};\n\nconst aiChatSettings = {};\n\nexport { aiChatSettings, baseSettings, modalSettings, searchSettings };\n","import { useEffect, useMemo, useRef, useState } from \"react\";\nimport { ClientOnly } from \"../../components/ClientOnly.js\";\nimport type { ZudokuPlugin } from \"../../core/plugins.js\";\nimport { aiChatSettings, baseSettings } from \"./inkeep.js\";\n\ninterface PluginInkeepBaseSettings {\n  apiKey?: string;\n  integrationId: string;\n  organizationId: string;\n  organizationDisplayName?: string;\n  primaryBrandColor: string;\n}\n\ninterface InkeepEmbedConfig {\n  componentType: string;\n  targetElement: HTMLElement;\n  properties: unknown;\n}\n\ninterface InkeepWidget {\n  render: (config: InkeepEmbedConfig & { isOpen: boolean }) => void;\n}\n\ndeclare global {\n  let Inkeep: () => {\n    embed: (config: InkeepEmbedConfig) => InkeepWidget;\n  };\n}\n\nconst InkeepSearch = ({\n  prefilledQuery,\n  isOpen,\n  onClose,\n  settings,\n}: {\n  isOpen: boolean;\n  onClose: () => void;\n  prefilledQuery?: string | null;\n  settings: PluginInkeepBaseSettings;\n}) => {\n  const ref = useRef<HTMLDivElement>(null);\n  const widgetRef = useRef<InkeepWidget | null>(null);\n  const [isInkeepAvailable, setIsInkeepAvailable] = useState(\n    typeof Inkeep !== \"undefined\",\n  );\n\n  const config: InkeepEmbedConfig = useMemo(\n    () => ({\n      componentType: \"CustomTrigger\",\n      targetElement: ref.current!,\n      properties: {\n        isOpen,\n        onClose,\n        onOpen: undefined,\n        baseSettings: { ...baseSettings, ...settings },\n        searchSettings: {\n          prefilledQuery: prefilledQuery || undefined,\n        },\n        aiChatSettings,\n      },\n    }),\n    [isOpen, onClose, prefilledQuery, settings, ref],\n  );\n\n  useEffect(() => {\n    if (isInkeepAvailable) return;\n\n    const checkInkeep = setInterval(() => {\n      if (typeof Inkeep !== \"undefined\") {\n        setIsInkeepAvailable(true);\n        clearInterval(checkInkeep);\n      }\n    }, 100);\n\n    return () => clearInterval(checkInkeep);\n  }, [isInkeepAvailable]);\n\n  useEffect(() => {\n    if (!isInkeepAvailable || widgetRef.current) return;\n\n    widgetRef.current = Inkeep().embed(config);\n  }, [config, isInkeepAvailable]);\n\n  useEffect(() => {\n    widgetRef.current?.render({ ...config, isOpen });\n  }, [config, isOpen]);\n\n  return <div ref={ref} />;\n};\n\nexport const inkeepSearchPlugin = (\n  settings: PluginInkeepBaseSettings,\n): ZudokuPlugin => {\n  return {\n    getHead: () => {\n      return (\n        <script\n          type=\"module\"\n          src=\"https://unpkg.com/@inkeep/uikit-js@0.3.19/dist/embed.js\"\n          defer\n        />\n      );\n    },\n    renderSearch: ({\n      isOpen,\n      onClose,\n    }: {\n      isOpen: boolean;\n      onClose: () => void;\n    }) => {\n      return (\n        <ClientOnly>\n          <InkeepSearch isOpen={isOpen} onClose={onClose} settings={settings} />\n        </ClientOnly>\n      );\n    },\n  };\n};\n"],"names":["baseSettings","aiChatSettings","InkeepSearch","prefilledQuery","isOpen","onClose","settings","ref","useRef","widgetRef","isInkeepAvailable","setIsInkeepAvailable","useState","config","useMemo","useEffect","checkInkeep","_a","jsx","inkeepSearchPlugin","ClientOnly"],"mappings":";;;AAAA,MAAMA,IAAe;AAAA,EACnB,OAAO;AAAA,IACL,YAAY;AAAA,MACV,mBAAmB;AAAA,QACjB,cAAc;AAAA,UACZ,MAAM;AAAA,UACN,SAAS;AAAA,QAAA;AAAA,MAEb;AAAA,MACA,kBAAkB;AAAA,QAChB,cAAc;AAAA,UACZ,MAAM;AAAA,UACN,SAAS;AAAA;AAAA,QAAA;AAAA,MACX;AAAA,IACF;AAAA,EACF;AAEJ,GAMMC,IAAiB,CAAC,GCMlBC,IAAe,CAAC;AAAA,EACpB,gBAAAC;AAAA,EACA,QAAAC;AAAA,EACA,SAAAC;AAAA,EACA,UAAAC;AACF,MAKM;AACE,QAAAC,IAAMC,EAAuB,IAAI,GACjCC,IAAYD,EAA4B,IAAI,GAC5C,CAACE,GAAmBC,CAAoB,IAAIC;AAAA,IAChD,OAAO,SAAW;AAAA,EACpB,GAEMC,IAA4BC;AAAA,IAChC,OAAO;AAAA,MACL,eAAe;AAAA,MACf,eAAeP,EAAI;AAAA,MACnB,YAAY;AAAA,QACV,QAAAH;AAAA,QACA,SAAAC;AAAA,QACA,QAAQ;AAAA,QACR,cAAc,EAAE,GAAGL,GAAc,GAAGM,EAAS;AAAA,QAC7C,gBAAgB;AAAA,UACd,gBAAgBH,KAAkB;AAAA,QACpC;AAAA,QACA,gBAAAF;AAAA,MAAA;AAAA,IACF;AAAA,IAEF,CAACG,GAAQC,GAASF,GAAgBG,GAAUC,CAAG;AAAA,EACjD;AAEA,SAAAQ,EAAU,MAAM;AACd,QAAIL,EAAmB;AAEjB,UAAAM,IAAc,YAAY,MAAM;AAChC,MAAA,OAAO,SAAW,QACpBL,EAAqB,EAAI,GACzB,cAAcK,CAAW;AAAA,OAE1B,GAAG;AAEC,WAAA,MAAM,cAAcA,CAAW;AAAA,EAAA,GACrC,CAACN,CAAiB,CAAC,GAEtBK,EAAU,MAAM;AACV,IAAA,CAACL,KAAqBD,EAAU,YAEpCA,EAAU,UAAU,SAAS,MAAMI,CAAM;AAAA,EAAA,GACxC,CAACA,GAAQH,CAAiB,CAAC,GAE9BK,EAAU,MAAM;;AACd,KAAAE,IAAAR,EAAU,YAAV,QAAAQ,EAAmB,OAAO,EAAE,GAAGJ,GAAQ,QAAAT;EAAQ,GAC9C,CAACS,GAAQT,CAAM,CAAC,GAEZc,gBAAAA,MAAC,SAAI,KAAAX,GAAU;AACxB,GAEaY,IAAqB,CAChCb,OAEO;AAAA,EACL,SAAS,MAELY,gBAAAA,EAAA;AAAA,IAAC;AAAA,IAAA;AAAA,MACC,MAAK;AAAA,MACL,KAAI;AAAA,MACJ,OAAK;AAAA,IAAA;AAAA,EACP;AAAA,EAGJ,cAAc,CAAC;AAAA,IACb,QAAAd;AAAA,IACA,SAAAC;AAAA,EAAA,4BAMGe,GACC,EAAA,UAAAF,gBAAAA,EAAA,IAAChB,KAAa,QAAAE,GAAgB,SAAAC,GAAkB,UAAAC,GAAoB,EACtE,CAAA;AAGN;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zudoku",
-  "version": "0.0.0-e88b02e",
+  "version": "0.0.0-e8a949d",
   "type": "module",
   "homepage": "https://zudoku.dev",
   "repository": {
@@ -117,15 +117,14 @@
   "dependencies": {
     "@envelop/core": "5.0.2",
     "@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",
+    "@mdx-js/react": "3.1.0",
+    "@mdx-js/rollup": "3.1.0",
     "@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-accordion": "1.2.2",
+    "@radix-ui/react-alert-dialog": "1.1.4",
+    "@radix-ui/react-aspect-ratio": "1.1.1",
     "@radix-ui/react-checkbox": "1.1.2",
     "@radix-ui/react-collapsible": "1.1.1",
     "@radix-ui/react-dialog": "1.1.2",
@@ -142,52 +141,54 @@
     "@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-toggle-group": "1.1.1",
+    "@radix-ui/react-tooltip": "1.1.4",
     "@radix-ui/react-visually-hidden": "1",
-    "@sentry/node": "8.34.0",
+    "@sentry/node": "8.42.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",
+    "@tanstack/react-query": "5.62.3",
+    "@types/react": "19.0.1",
+    "@types/react-dom": "19.0.1",
     "@vitejs/plugin-react": "4.3.4",
     "@zudoku/httpsnippet": "10.0.9",
-    "@zudoku/react-helmet-async": "2.0.4",
+    "@zudoku/react-helmet-async": "2.0.5",
     "autoprefixer": "10.4.20",
     "chokidar": "3.6.0",
-    "class-variance-authority": "0.7.0",
+    "class-variance-authority": "0.7.1",
     "clsx": "2.1.1",
     "cmdk": "1.0.4",
-    "dotenv": "16.4.5",
-    "embla-carousel-react": "8.3.1",
+    "devlop": "^1.1.0",
+    "dotenv": "16.4.7",
+    "embla-carousel-react": "8.5.1",
     "estree-util-value-to-estree": "3.2.1",
-    "express": "4.21.1",
+    "express": "4.21.2",
     "glob": "11.0.0",
-    "graphql": "16.9.0",
+    "graphql": "16.10.0",
     "graphql-type-json": "0.3.2",
-    "graphql-yoga": "5.7.0",
+    "graphql-yoga": "5.10.4",
     "gray-matter": "4.0.3",
+    "hast-util-to-jsx-runtime": "^2.3.2",
     "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.468.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",
+    "picocolors": "1.1.1",
+    "postcss": "8.4.49",
+    "posthog-node": "4.3.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",
+    "react-hook-form": "7.54.0",
+    "react-is": "19.0.0",
+    "react-router": "7.0.2",
     "rehype-raw": "7.0.0",
     "rehype-slug": "6.0.0",
     "remark-comment": "1.0.0",
@@ -196,56 +197,60 @@
     "remark-frontmatter": "5.0.0",
     "remark-gfm": "4.0.0",
     "remark-mdx-frontmatter": "5.0.0",
-    "rollup": "4.24.0",
+    "remark-parse": "^11.0.0",
+    "remark-rehype": "^11.1.1",
+    "rollup": "4.28.1",
     "semver": "7.6.3",
     "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.16",
     "tsx": "^4.19.2",
     "ulidx": "2.4.1",
+    "unified": "^11.0.5",
     "unist-util-visit": "5.0.0",
-    "urql": "4.1.0",
+    "urql": "4.2.1",
     "vaul": "1.1.1",
     "vfile": "6.0.3",
-    "vite": "5.4.9",
-    "yaml": "2.6.0",
+    "vite": "6.0.3",
+    "yaml": "2.6.1",
     "yargs": "17.7.2",
     "zod": "3.23.8",
     "zod-validation-error": "3.4.0",
-    "zustand": "5.0.0"
+    "zustand": "5.0.2"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "5.0.3",
-    "@graphql-codegen/client-preset": "4.5.0",
+    "@graphql-codegen/client-preset": "4.5.1",
     "@types/estree": "1.0.6",
     "@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/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": "2.1.8",
     "mdast-util-mdx": "3.0.0",
-    "react": "18.3.1",
-    "react-dom": "18.3.1",
+    "react": "19.0.0",
+    "react-dom": "19.0.0",
     "rollup-plugin-visualizer": "5.12.0",
     "typescript": "5.7.2",
     "vitest": "2.1.8"
   },
   "peerDependencies": {
-    "react": ">=18",
-    "react-dom": ">=18"
+    "react": ">=19",
+    "react-dom": ">=19"
   },
   "optionalDependencies": {
-    "@clerk/clerk-js": "5.11.0",
-    "@inkeep/widgets": "^0.2.289",
-    "@sentry/react": "^8.45.1"
+    "@clerk/clerk-js": "^5.43.4",
+    "@sentry/react": "^8.48.0"
   },
   "scripts": {
     "build": "tsc --project tsconfig.json",

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";

package/src/app/entry.client.tsx

@@ -3,7 +3,7 @@ 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";
@@ -45,13 +45,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} />);
 }
@@ -60,13 +53,6 @@ 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} />);

package/src/app/entry.server.tsx

@@ -4,11 +4,11 @@ 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,
+} from "react-router";
 import "virtual:zudoku-theme.css";
 import "vite/modulepreload-polyfill";
 import { BootstrapStatic, ServerError } from "zudoku/components";

package/src/app/main.tsx

@@ -1,4 +1,4 @@
-import { type RouteObject } from "react-router-dom";
+import { type RouteObject } from "react-router";
 import { configuredApiKeysPlugin } from "virtual:zudoku-api-keys-plugin";
 import {
   configuredApiCatalogPlugins,

package/src/app/sentry.ts

@@ -5,7 +5,7 @@ import {
   matchRoutes,
   useLocation,
   useNavigationType,
-} from "react-router-dom";
+} from "react-router";
 
 export const initSentry = ({ dsn }: { dsn: string }) => {
   Sentry.init({

package/src/app/standalone.tsx

@@ -1,5 +1,5 @@
 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 { openApiPlugin } from "../lib/plugins/openapi/index.js";

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

@@ -1,5 +1,5 @@
 import { useSuspenseQuery } from "@tanstack/react-query";
-import { Navigate } from "react-router-dom";
+import { Navigate } from "react-router";
 import { ZudokuError } from "../../util/invariant.js";
 
 export function CallbackHandler({

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

@@ -1,5 +1,5 @@
 import { useEffect } from "react";
-import { useSearchParams } from "react-router-dom";
+import { useSearchParams } from "react-router";
 import { useZudoku } from "../../components/context/ZudokuContext.js";
 
 export const SignIn = () => {

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

@@ -1,5 +1,5 @@
 import { useEffect } from "react";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useZudoku } from "../../components/context/ZudokuContext.js";
 
 export const SignOut = () => {

package/src/lib/authentication/providers/openid.tsx

@@ -12,8 +12,9 @@ import { useAuthState, UserProfile } from "../state.js";
 
 const CODE_VERIFIER_KEY = "code-verifier";
 
-interface TokenState {
+export interface OpenIdProviderData {
   accessToken: string;
+  idToken?: string;
   refreshToken?: string;
   expiresOn: Date;
   tokenType: string;
@@ -101,9 +102,10 @@ export class OpenIDAuthenticationProvider implements AuthenticationProvider {
       throw new AuthorizationError("No expires_in in response");
     }
 
-    const tokens: TokenState = {
+    const tokens: OpenIdProviderData = {
       accessToken: response.access_token,
       refreshToken: response.refresh_token,
+      idToken: response.id_token,
       expiresOn: new Date(Date.now() + response.expires_in * 1000),
       tokenType: response.token_type,
     };
@@ -201,7 +203,7 @@ export class OpenIDAuthenticationProvider implements AuthenticationProvider {
     if (!providerData) {
       throw new AuthorizationError("User is not authenticated");
     }
-    const tokenState = providerData as TokenState;
+    const tokenState = providerData as OpenIdProviderData;
 
     if (new Date(tokenState.expiresOn) < new Date()) {
       if (!tokenState.refreshToken) {

package/src/lib/components/AnchorLink.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { Link, type LinkProps, useLocation } from "react-router-dom";
+import { Link, type LinkProps, useLocation } from "react-router";
 
 /**
  * Link that scrolls to anchor even if the hash is already set in the URL.

package/src/lib/components/Bootstrap.tsx

@@ -5,12 +5,13 @@ import {
 } from "@tanstack/react-query";
 import { type HelmetData, HelmetProvider } from "@zudoku/react-helmet-async";
 import { StrictMode } from "react";
-import { type createBrowserRouter, RouterProvider } from "react-router-dom";
 import {
+  type createBrowserRouter,
   type createStaticRouter,
   type StaticHandlerContext,
   StaticRouterProvider,
-} from "react-router-dom/server.js";
+} from "react-router";
+import { RouterProvider } from "react-router/dom";
 import { StaggeredRenderContext } from "../plugins/openapi/StaggeredRender.js";
 
 const queryClient = new QueryClient({
@@ -33,10 +34,7 @@ const Bootstrap = ({
       <HydrationBoundary state={hydrate ? (window as any).DATA : undefined}>
         <HelmetProvider>
           <StaggeredRenderContext.Provider value={{ stagger: !hydrate }}>
-            <RouterProvider
-              router={router}
-              future={{ v7_startTransition: true }}
-            />
+            <RouterProvider router={router} />
           </StaggeredRenderContext.Provider>
         </HelmetProvider>
       </HydrationBoundary>

package/src/lib/components/Header.tsx

@@ -1,5 +1,5 @@
 import { memo } from "react";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { Button } from "zudoku/ui/Button.js";
 import { Skeleton } from "zudoku/ui/Skeleton.js";
 import { useAuth } from "../authentication/hook.js";
@@ -66,7 +66,7 @@ export const Header = memo(function HeaderInner() {
     <header className="sticky lg:top-0 z-10 bg-background/80 backdrop-blur w-full">
       <Banner />
       <div className="max-w-screen-2xl mx-auto">
-        <div className="grid grid-cols-2 lg:grid-cols-[calc(var(--side-nav-width))_1fr] lg:gap-12 items-center border-b px-10 lg:px-12 h-[--top-header-height]">
+        <div className="grid grid-cols-[1fr_auto] lg:grid-cols-[calc(var(--side-nav-width))_1fr] lg:gap-12 items-center border-b px-4 lg:px-12 h-[--top-header-height]">
           <div className="flex">
             <Link to="/">
               <div className="flex items-center gap-3.5">

package/src/lib/components/Layout.tsx

@@ -1,7 +1,7 @@
 import { Helmet } from "@zudoku/react-helmet-async";
 import { PanelLeftIcon } from "lucide-react";
 import { Suspense, useEffect, useRef, useState, type ReactNode } from "react";
-import { Outlet, useLocation, useNavigation } from "react-router-dom";
+import { Outlet, useLocation, useNavigation } from "react-router";
 import { useSpinDelay } from "spin-delay";
 import { Drawer, DrawerTrigger } from "../ui/Drawer.js";
 import { cn } from "../util/cn.js";
@@ -66,7 +66,7 @@ export const Layout = ({ children }: { children?: ReactNode }) => {
       <Header />
       <Slotlet name="layout-after-head" />
 
-      <div className="w-full max-w-screen-2xl mx-auto px-10 lg:px-12">
+      <div className="w-full max-w-screen-2xl mx-auto px-4 lg:px-12">
         {showSpinner ? (
           <LoadingFallback />
         ) : (

package/src/lib/components/Markdown.tsx

@@ -1,8 +1,8 @@
-import ReactMarkdown from "react-markdown";
 import rehypeRaw from "rehype-raw";
 import remarkGfm from "remark-gfm";
 import { visit } from "unist-util-visit";
 import { MdxComponents } from "../util/MdxComponents.js";
+import { ReactMarkdown } from "./ReactMarkdown.js";
 
 // same as in packages/dev-portal/framework/vite.ts
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/lib/components/MobileTopNavigation.tsx

@@ -33,7 +33,7 @@ export const MobileTopNavigation = () => {
         className="lg:hidden h-[100dvh] right-0 left-auto w-[320px] rounded-none"
         aria-describedby={undefined}
       >
-        <div className="p-6 overflow-y-auto overscroll-none">
+        <div className="p-4 overflow-y-auto overscroll-none">
           <VisuallyHidden>
             <DrawerTitle>Navigation</DrawerTitle>
           </VisuallyHidden>

package/src/lib/components/NotFoundPage.tsx

@@ -1,5 +1,5 @@
 import { UnlinkIcon } from "lucide-react";
-import { Link, useParams } from "react-router-dom";
+import { Link, useParams } from "react-router";
 import { CategoryHeading } from "./CategoryHeading.js";
 import { DeveloperHint } from "./DeveloperHint.js";
 import { Heading } from "./Heading.js";

package/src/lib/components/ReactMarkdown.license.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) Espen Hovlandsdal
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.