diff --git a/docs/package.json b/docs/package.json index 7285f5e0..7f9f14e5 100644 --- a/docs/package.json +++ b/docs/package.json @@ -8,11 +8,8 @@ "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0" }, "devDependencies": { - "@mdx-js/react": "3.0.1", - "@types/react": "18.3.11", - "@types/react-dom": "18.3.1", - "react": "18.3.1", - "react-dom": "18.3.1", + "react": "catalog:", + "react-dom": "catalog:", "zudoku": "workspace:*" } } diff --git a/examples/godzilla-inc/package.json b/examples/godzilla-inc/package.json index 970cb766..b0cde7b1 100644 --- a/examples/godzilla-inc/package.json +++ b/examples/godzilla-inc/package.json @@ -21,9 +21,9 @@ }, "devDependencies": { "@mdx-js/react": "3.0.1", - "@types/react": "18.3.11", - "react": "18.3.1", - "react-dom": "18.3.1", + "@types/react": "catalog:", + "react": "catalog:", + "react-dom": "catalog:", "zudoku": "workspace:*", "@clerk/clerk-js": "5.11.0" } diff --git a/examples/many-apis/package.json b/examples/many-apis/package.json index cbf5d8b3..cec28fc6 100644 --- a/examples/many-apis/package.json +++ b/examples/many-apis/package.json @@ -3,20 +3,17 @@ "version": "0.0.1", "type": "module", "scripts": { - "dev": "serve --cors -p 5942 apis & zudoku dev", "build": "echo 'Not implemented yet'", "disabled_build": "zudoku build", "download": "node download.js", "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0" }, "dependencies": { - "react": "18.3.1", - "react-dom": "18.3.1", + "react": "19.0.0", + "react-dom": "19.0.0", "zudoku": "workspace:*" }, "devDependencies": { - "@mdx-js/react": "3.0.1", - "@types/react": "18.3.11", "js-yaml": "4.1.0", "serve": "14.2.3" } diff --git a/examples/with-auth0/package.json b/examples/with-auth0/package.json index 0b6b8581..f6567206 100644 --- a/examples/with-auth0/package.json +++ b/examples/with-auth0/package.json @@ -20,9 +20,8 @@ } }, "devDependencies": { - "@mdx-js/react": "3.0.1", - "react": "18.3.1", - "react-dom": "18.3.1", + "react": "19.0.0", + "react-dom": "19.0.0", "zudoku": "workspace:*" } } diff --git a/examples/with-config/package.json b/examples/with-config/package.json index aa658530..40eabb66 100644 --- a/examples/with-config/package.json +++ b/examples/with-config/package.json @@ -20,10 +20,8 @@ } }, "devDependencies": { - "@mdx-js/react": "3.0.1", - "@types/react": "18.3.11", - "react": "18.3.1", - "react-dom": "18.3.1", + "react": "19.0.0", + "react-dom": "19.0.0", "zudoku": "workspace:*", "@clerk/clerk-js": "5.11.0" } diff --git a/examples/with-openapi-json/package.json b/examples/with-openapi-json/package.json index 43f4ffcd..4e3b0291 100644 --- a/examples/with-openapi-json/package.json +++ b/examples/with-openapi-json/package.json @@ -20,11 +20,8 @@ } }, "devDependencies": { - "@mdx-js/react": "3.0.1", - "@types/react": "18.3.11", - "react": "18.3.1", - "react-dom": "18.3.1", - "zudoku": "workspace:*", - "@clerk/clerk-js": "5.11.0" + "react": "19.0.0", + "react-dom": "19.0.0", + "zudoku": "workspace:*" } } diff --git a/examples/with-openapi-yaml/package.json b/examples/with-openapi-yaml/package.json index 5fd3c2b8..b961ef02 100644 --- a/examples/with-openapi-yaml/package.json +++ b/examples/with-openapi-yaml/package.json @@ -20,11 +20,8 @@ } }, "devDependencies": { - "@mdx-js/react": "3.0.1", - "@types/react": "18.3.11", - "react": "18.3.1", - "react-dom": "18.3.1", - "zudoku": "workspace:*", - "@clerk/clerk-js": "5.11.0" + "react": "19.0.0", + "react-dom": "19.0.0", + "zudoku": "workspace:*" } } diff --git a/examples/with-vite-config/package.json b/examples/with-vite-config/package.json index b563b23e..2b2b12ad 100644 --- a/examples/with-vite-config/package.json +++ b/examples/with-vite-config/package.json @@ -20,11 +20,9 @@ } }, "devDependencies": { - "@mdx-js/react": "3.0.1", - "react": "18.3.1", - "react-dom": "18.3.1", + "react": "19.0.0", + "react-dom": "19.0.0", "rollup-plugin-visualizer": "5.12.0", - "vite-plugin-dynamic-import": "1.5.0", "zudoku": "workspace:*" } } diff --git a/examples/with-vite-config/vite.config.ts b/examples/with-vite-config/vite.config.ts index 98a149e4..52c815d8 100644 --- a/examples/with-vite-config/vite.config.ts +++ b/examples/with-vite-config/vite.config.ts @@ -1,22 +1,10 @@ import { visualizer } from "rollup-plugin-visualizer"; -import dynImport from "vite-plugin-dynamic-import"; /** @type {import('vite').UserConfig} */ export default { build: { rollupOptions: { - plugins: [ - dynImport({ - filter(id) { - // `node_modules` is exclude by default, so we need to include it explicitly - // https://github.com/vite-plugin/vite-plugin-dynamic-import/blob/v1.3.0/src/index.ts#L133-L135 - if (id.includes("rollup-plugin-visualizer")) { - return true; - } - }, - }), - visualizer(), - ], + plugins: [visualizer()], }, }, }; diff --git a/packages/zudoku/package.json b/packages/zudoku/package.json index 3531a5b8..43e34f33 100644 --- a/packages/zudoku/package.json +++ b/packages/zudoku/package.json @@ -154,14 +154,13 @@ "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-alert-dialog": "1.1.4", "@radix-ui/react-aspect-ratio": "1.1.0", "@radix-ui/react-checkbox": "1.1.2", "@radix-ui/react-collapsible": "1.1.1", @@ -180,52 +179,53 @@ "@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-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": "catalog:", + "@types/react-dom": "catalog:", "@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", + "class-variance-authority": "0.7.1", "clsx": "2.1.1", "cmdk": "1.0.4", "devlop": "^1.1.0", - "embla-carousel-react": "8.3.1", + "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-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-router-dom": "6.27.0", + "react-hook-form": "7.54.0", + "react-is": "catalog:", + "react-router": "7.0.2", "rehype-raw": "7.0.0", "rehype-slug": "6.0.0", "remark-comment": "1.0.0", @@ -236,47 +236,47 @@ "remark-mdx-frontmatter": "5.0.0", "remark-parse": "^11.0.0", "remark-rehype": "^11.1.1", - "rollup": "4.24.0", + "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.5.5", + "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": "catalog:", "@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": "catalog:", + "react-dom": "catalog:", "rollup-plugin-visualizer": "5.12.0", "typescript": "5.7.2", "vitest": "2.1.8" diff --git a/packages/zudoku/src/app/demo.tsx b/packages/zudoku/src/app/demo.tsx index e5a2fe66..b2c03213 100644 --- a/packages/zudoku/src/app/demo.tsx +++ b/packages/zudoku/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"; diff --git a/packages/zudoku/src/app/entry.client.tsx b/packages/zudoku/src/app/entry.client.tsx index 25265b34..d33db170 100644 --- a/packages/zudoku/src/app/entry.client.tsx +++ b/packages/zudoku/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(); } @@ -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, ); diff --git a/packages/zudoku/src/app/entry.server.tsx b/packages/zudoku/src/app/entry.server.tsx index 136f016c..f025b0b0 100644 --- a/packages/zudoku/src/app/entry.server.tsx +++ b/packages/zudoku/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"; diff --git a/packages/zudoku/src/app/main.tsx b/packages/zudoku/src/app/main.tsx index 8fbbfcef..5cb486a0 100644 --- a/packages/zudoku/src/app/main.tsx +++ b/packages/zudoku/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, diff --git a/packages/zudoku/src/app/sentry.ts b/packages/zudoku/src/app/sentry.ts index f440eaab..87f202dc 100644 --- a/packages/zudoku/src/app/sentry.ts +++ b/packages/zudoku/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({ diff --git a/packages/zudoku/src/app/standalone.tsx b/packages/zudoku/src/app/standalone.tsx index 8766ca6b..924eb82a 100644 --- a/packages/zudoku/src/app/standalone.tsx +++ b/packages/zudoku/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"; diff --git a/packages/zudoku/src/cli/cmds/build.ts b/packages/zudoku/src/cli/cmds/build.ts index 3b843a6c..dfec2d42 100644 --- a/packages/zudoku/src/cli/cmds/build.ts +++ b/packages/zudoku/src/cli/cmds/build.ts @@ -19,6 +19,7 @@ export default { argv, event: "zudoku build", }); + process.env.NODE_ENV = "production"; await build(argv as Arguments); }, }; diff --git a/packages/zudoku/src/config/validators/icon-types.ts b/packages/zudoku/src/config/validators/icon-types.ts index 62dc313c..6bea1b70 100644 --- a/packages/zudoku/src/config/validators/icon-types.ts +++ b/packages/zudoku/src/config/validators/icon-types.ts @@ -237,6 +237,7 @@ export type IconNames = | "cake-slice" | "cake" | "calculator" + | "calendar-1" | "calendar-arrow-down" | "calendar-arrow-up" | "calendar-check-2" @@ -253,6 +254,7 @@ export type IconNames = | "calendar-plus" | "calendar-range" | "calendar-search" + | "calendar-sync" | "calendar-x-2" | "calendar-x" | "calendar" @@ -395,6 +397,7 @@ export type IconNames = | "clock-arrow-down" | "clock-arrow-up" | "clock" + | "cloud-alert" | "cloud-cog" | "cloud-download" | "cloud-drizzle" @@ -504,6 +507,7 @@ export type IconNames = | "drama" | "dribbble" | "drill" + | "droplet-off" | "droplet" | "droplets" | "drum" @@ -519,6 +523,7 @@ export type IconNames = | "egg" | "ellipsis-vertical" | "ellipsis" + | "equal-approximately" | "equal-not" | "equal" | "eraser" @@ -763,6 +768,7 @@ export type IconNames = | "image-play" | "image-plus" | "image-up" + | "image-upscale" | "image" | "images" | "import" @@ -795,13 +801,13 @@ export type IconNames = | "land-plot" | "landmark" | "languages" + | "laptop-minimal-check" | "laptop-minimal" | "laptop" | "lasso-select" | "lasso" | "laugh" | "layers-2" - | "layers-3" | "layers" | "layout-dashboard" | "layout-grid" @@ -827,6 +833,7 @@ export type IconNames = | "list-checks" | "list-collapse" | "list-end" + | "list-filter-plus" | "list-filter" | "list-minus" | "list-music" @@ -1169,6 +1176,7 @@ export type IconNames = | "scan-barcode" | "scan-eye" | "scan-face" + | "scan-heart" | "scan-line" | "scan-qr-code" | "scan-search" @@ -1407,6 +1415,7 @@ export type IconNames = | "timer" | "toggle-left" | "toggle-right" + | "toilet" | "tornado" | "torus" | "touchpad-off" @@ -1505,6 +1514,7 @@ export type IconNames = | "warehouse" | "washing-machine" | "watch" + | "waves-ladder" | "waves" | "waypoints" | "webcam" @@ -1519,6 +1529,7 @@ export type IconNames = | "wifi-off" | "wifi-zero" | "wifi" + | "wind-arrow-down" | "wind" | "wine-off" | "wine" diff --git a/packages/zudoku/src/lib/authentication/components/CallbackHandler.tsx b/packages/zudoku/src/lib/authentication/components/CallbackHandler.tsx index f33ac183..92e1260d 100644 --- a/packages/zudoku/src/lib/authentication/components/CallbackHandler.tsx +++ b/packages/zudoku/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({ diff --git a/packages/zudoku/src/lib/authentication/components/SignIn.tsx b/packages/zudoku/src/lib/authentication/components/SignIn.tsx index 3126e2fb..27f96809 100644 --- a/packages/zudoku/src/lib/authentication/components/SignIn.tsx +++ b/packages/zudoku/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 = () => { diff --git a/packages/zudoku/src/lib/authentication/components/SignOut.tsx b/packages/zudoku/src/lib/authentication/components/SignOut.tsx index 92af11b7..7e33ba1e 100644 --- a/packages/zudoku/src/lib/authentication/components/SignOut.tsx +++ b/packages/zudoku/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 = () => { diff --git a/packages/zudoku/src/lib/components/AnchorLink.tsx b/packages/zudoku/src/lib/components/AnchorLink.tsx index 9136aa9a..1c8eeb04 100644 --- a/packages/zudoku/src/lib/components/AnchorLink.tsx +++ b/packages/zudoku/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. diff --git a/packages/zudoku/src/lib/components/Bootstrap.tsx b/packages/zudoku/src/lib/components/Bootstrap.tsx index 4dd3dd94..e0be9e6c 100644 --- a/packages/zudoku/src/lib/components/Bootstrap.tsx +++ b/packages/zudoku/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 = ({ - + diff --git a/packages/zudoku/src/lib/components/Header.tsx b/packages/zudoku/src/lib/components/Header.tsx index 6bd30e04..f26491c7 100644 --- a/packages/zudoku/src/lib/components/Header.tsx +++ b/packages/zudoku/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"; diff --git a/packages/zudoku/src/lib/components/Layout.tsx b/packages/zudoku/src/lib/components/Layout.tsx index b19e835f..7d9df7f0 100644 --- a/packages/zudoku/src/lib/components/Layout.tsx +++ b/packages/zudoku/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"; diff --git a/packages/zudoku/src/lib/components/NotFoundPage.tsx b/packages/zudoku/src/lib/components/NotFoundPage.tsx index 73403f01..dd4dff3e 100644 --- a/packages/zudoku/src/lib/components/NotFoundPage.tsx +++ b/packages/zudoku/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"; diff --git a/packages/zudoku/src/lib/components/SlotletProvider.tsx b/packages/zudoku/src/lib/components/SlotletProvider.tsx index 6b8860f4..9cbda9c4 100644 --- a/packages/zudoku/src/lib/components/SlotletProvider.tsx +++ b/packages/zudoku/src/lib/components/SlotletProvider.tsx @@ -10,7 +10,7 @@ import { type NavigateFunction, type Params, type SetURLSearchParams, -} from "react-router-dom"; +} from "react-router"; import { useExposedProps } from "../util/useExposedProps.js"; export type Slotlets = Record< diff --git a/packages/zudoku/src/lib/components/TopNavigation.tsx b/packages/zudoku/src/lib/components/TopNavigation.tsx index 895d71b9..2f7933ef 100644 --- a/packages/zudoku/src/lib/components/TopNavigation.tsx +++ b/packages/zudoku/src/lib/components/TopNavigation.tsx @@ -1,6 +1,6 @@ import { cx } from "class-variance-authority"; import { Suspense } from "react"; -import { NavLink, useNavigation } from "react-router-dom"; +import { NavLink, useNavigation } from "react-router"; import { TopNavigationItem } from "../../config/validators/common.js"; import { useAuth } from "../authentication/hook.js"; import { ZudokuError } from "../util/invariant.js"; diff --git a/packages/zudoku/src/lib/components/Zudoku.tsx b/packages/zudoku/src/lib/components/Zudoku.tsx index daead892..b1b8385c 100644 --- a/packages/zudoku/src/lib/components/Zudoku.tsx +++ b/packages/zudoku/src/lib/components/Zudoku.tsx @@ -11,7 +11,7 @@ import { useState, } from "react"; import { ErrorBoundary } from "react-error-boundary"; -import { Outlet, useNavigation } from "react-router-dom"; +import { Outlet, useNavigation } from "react-router"; import { hasHead, isMdxProviderPlugin } from "../core/plugins.js"; import { ZudokuContext, ZudokuContextOptions } from "../core/ZudokuContext.js"; import { TopLevelError } from "../errors/TopLevelError.js"; diff --git a/packages/zudoku/src/lib/components/context/ZudokuContext.ts b/packages/zudoku/src/lib/components/context/ZudokuContext.ts index 95c51ae7..e8c41c49 100644 --- a/packages/zudoku/src/lib/components/context/ZudokuContext.ts +++ b/packages/zudoku/src/lib/components/context/ZudokuContext.ts @@ -1,6 +1,6 @@ import { useQuery, useSuspenseQuery } from "@tanstack/react-query"; import { createContext, useContext } from "react"; -import { matchPath, useLocation } from "react-router-dom"; +import { matchPath, useLocation } from "react-router"; import { ZudokuContext } from "../../core/ZudokuContext.js"; import { joinPath } from "../../util/joinPath.js"; import { traverseSidebar } from "../navigation/utils.js"; diff --git a/packages/zudoku/src/lib/components/index.ts b/packages/zudoku/src/lib/components/index.ts index c6e50e73..ba31787d 100644 --- a/packages/zudoku/src/lib/components/index.ts +++ b/packages/zudoku/src/lib/components/index.ts @@ -1,6 +1,6 @@ import { useMDXComponents as useMDXComponentsImport } from "@mdx-js/react"; import { Helmet } from "@zudoku/react-helmet-async"; -import { Link as LinkImport } from "react-router-dom"; +import { Link as LinkImport } from "react-router"; import { useAuthState } from "../authentication/state.js"; import { RouterError as RouterErrorImport } from "../errors/RouterError.js"; import { ServerError as ServerErrorImport } from "../errors/ServerError.js"; diff --git a/packages/zudoku/src/lib/components/navigation/SidebarCategory.tsx b/packages/zudoku/src/lib/components/navigation/SidebarCategory.tsx index 7c61753d..f261b4b0 100644 --- a/packages/zudoku/src/lib/components/navigation/SidebarCategory.tsx +++ b/packages/zudoku/src/lib/components/navigation/SidebarCategory.tsx @@ -1,7 +1,7 @@ import * as Collapsible from "@radix-ui/react-collapsible"; import { ChevronRightIcon } from "lucide-react"; import { useEffect, useState } from "react"; -import { NavLink, useMatch } from "react-router-dom"; +import { NavLink, useMatch } from "react-router"; import type { SidebarItemCategory } from "../../../config/validators/SidebarSchema.js"; import { cn } from "../../util/cn.js"; import { joinPath } from "../../util/joinPath.js"; diff --git a/packages/zudoku/src/lib/components/navigation/SidebarItem.tsx b/packages/zudoku/src/lib/components/navigation/SidebarItem.tsx index 6473cbcb..77a1acbb 100644 --- a/packages/zudoku/src/lib/components/navigation/SidebarItem.tsx +++ b/packages/zudoku/src/lib/components/navigation/SidebarItem.tsx @@ -1,6 +1,6 @@ import { cva } from "class-variance-authority"; import { ExternalLinkIcon } from "lucide-react"; -import { NavLink, useSearchParams } from "react-router-dom"; +import { NavLink, useSearchParams } from "react-router"; import type { SidebarItem as SidebarItemType } from "../../../config/validators/SidebarSchema.js"; import { joinPath } from "../../util/joinPath.js"; diff --git a/packages/zudoku/src/lib/components/navigation/utils.ts b/packages/zudoku/src/lib/components/navigation/utils.ts index 89c5059c..9d29d5e8 100644 --- a/packages/zudoku/src/lib/components/navigation/utils.ts +++ b/packages/zudoku/src/lib/components/navigation/utils.ts @@ -1,4 +1,4 @@ -import { useLocation } from "react-router-dom"; +import { useLocation } from "react-router"; import type { SidebarItem, SidebarItemCategory, diff --git a/packages/zudoku/src/lib/core/plugins.ts b/packages/zudoku/src/lib/core/plugins.ts index 1025bb5d..14b8f698 100644 --- a/packages/zudoku/src/lib/core/plugins.ts +++ b/packages/zudoku/src/lib/core/plugins.ts @@ -1,6 +1,6 @@ -import type { LucideProps } from "lucide-react"; +import type { LucideIcon } from "lucide-react"; import { type ReactElement } from "react"; -import { type RouteObject } from "react-router-dom"; +import { type RouteObject } from "react-router"; import type { Sidebar } from "../../config/validators/SidebarSchema.js"; import { MdxComponentsType } from "../util/MdxComponents.js"; import { ZudokuContext, type ApiIdentity } from "./ZudokuContext.js"; @@ -40,11 +40,7 @@ export type ProfileNavigationItem = { weight?: number; category?: "top" | "middle" | "bottom"; children?: ProfileNavigationItem[]; - icon?: React.ComponentType< - LucideProps & { - [key: string]: any; - } - >; + icon?: LucideIcon; }; export interface CommonPlugin { diff --git a/packages/zudoku/src/lib/errors/RouterError.tsx b/packages/zudoku/src/lib/errors/RouterError.tsx index cf93aed1..9a7aeb09 100644 --- a/packages/zudoku/src/lib/errors/RouterError.tsx +++ b/packages/zudoku/src/lib/errors/RouterError.tsx @@ -1,4 +1,4 @@ -import { isRouteErrorResponse, useRouteError } from "react-router-dom"; +import { isRouteErrorResponse, useRouteError } from "react-router"; import { NotFoundPage } from "../components/NotFoundPage.js"; import { ErrorAlert } from "./ErrorAlert.js"; diff --git a/packages/zudoku/src/lib/plugins/api-keys/CreateApiKey.tsx b/packages/zudoku/src/lib/plugins/api-keys/CreateApiKey.tsx index b855f8d2..8390e95b 100644 --- a/packages/zudoku/src/lib/plugins/api-keys/CreateApiKey.tsx +++ b/packages/zudoku/src/lib/plugins/api-keys/CreateApiKey.tsx @@ -1,6 +1,6 @@ import { useMutation } from "@tanstack/react-query"; import { useForm } from "react-hook-form"; -import { Link, useNavigate } from "react-router-dom"; +import { Link, useNavigate } from "react-router"; import { Select, SelectContent, diff --git a/packages/zudoku/src/lib/plugins/api-keys/ProtectedRoute.tsx b/packages/zudoku/src/lib/plugins/api-keys/ProtectedRoute.tsx index b327546b..fad9978e 100644 --- a/packages/zudoku/src/lib/plugins/api-keys/ProtectedRoute.tsx +++ b/packages/zudoku/src/lib/plugins/api-keys/ProtectedRoute.tsx @@ -1,4 +1,4 @@ -import { Outlet } from "react-router-dom"; +import { Outlet } from "react-router"; import { useAuth } from "../../authentication/hook.js"; import { DeveloperHint } from "../../components/DeveloperHint.js"; import { Button } from "../../ui/Button.js"; diff --git a/packages/zudoku/src/lib/plugins/api-keys/SettingsApiKeys.tsx b/packages/zudoku/src/lib/plugins/api-keys/SettingsApiKeys.tsx index 5d528ab3..7ca30bbe 100644 --- a/packages/zudoku/src/lib/plugins/api-keys/SettingsApiKeys.tsx +++ b/packages/zudoku/src/lib/plugins/api-keys/SettingsApiKeys.tsx @@ -12,7 +12,7 @@ import { TrashIcon, } from "lucide-react"; import { useState } from "react"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; import { useZudoku } from "../../components/context/ZudokuContext.js"; import { Slotlet } from "../../components/SlotletProvider.js"; import { Button } from "../../ui/Button.js"; diff --git a/packages/zudoku/src/lib/plugins/api-keys/index.tsx b/packages/zudoku/src/lib/plugins/api-keys/index.tsx index e76affd9..2853d260 100644 --- a/packages/zudoku/src/lib/plugins/api-keys/index.tsx +++ b/packages/zudoku/src/lib/plugins/api-keys/index.tsx @@ -1,5 +1,5 @@ import { FileKey2Icon } from "lucide-react"; -import { type RouteObject } from "react-router-dom"; +import { type RouteObject } from "react-router"; import { ZudokuContext } from "../../core/ZudokuContext.js"; import { type ApiIdentityPlugin, diff --git a/packages/zudoku/src/lib/plugins/custom-pages/index.tsx b/packages/zudoku/src/lib/plugins/custom-pages/index.tsx index 83eaae2b..75c1c77b 100644 --- a/packages/zudoku/src/lib/plugins/custom-pages/index.tsx +++ b/packages/zudoku/src/lib/plugins/custom-pages/index.tsx @@ -1,5 +1,5 @@ import { type ComponentType, type ReactNode } from "react"; -import type { RouteObject } from "react-router-dom"; +import type { RouteObject } from "react-router"; import { type ExposedComponentProps } from "../../components/SlotletProvider.js"; import type { NavigationPlugin, ZudokuPlugin } from "../../core/plugins.js"; import { CustomPage } from "./CustomPage.js"; diff --git a/packages/zudoku/src/lib/plugins/markdown/MdxPage.tsx b/packages/zudoku/src/lib/plugins/markdown/MdxPage.tsx index 70ee71df..21ad0cf1 100644 --- a/packages/zudoku/src/lib/plugins/markdown/MdxPage.tsx +++ b/packages/zudoku/src/lib/plugins/markdown/MdxPage.tsx @@ -2,7 +2,7 @@ import { useMDXComponents } from "@mdx-js/react"; import slugify from "@sindresorhus/slugify"; import { Helmet } from "@zudoku/react-helmet-async"; import { type PropsWithChildren, useEffect } from "react"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; import { CategoryHeading } from "../../components/CategoryHeading.js"; import { Heading } from "../../components/Heading.js"; import { ProseClasses } from "../../components/Markdown.js"; diff --git a/packages/zudoku/src/lib/plugins/markdown/index.tsx b/packages/zudoku/src/lib/plugins/markdown/index.tsx index 4e3770b3..0f600361 100644 --- a/packages/zudoku/src/lib/plugins/markdown/index.tsx +++ b/packages/zudoku/src/lib/plugins/markdown/index.tsx @@ -1,6 +1,7 @@ import type { Toc } from "@stefanprobst/rehype-extract-toc"; import type { MDXProps } from "mdx/types.js"; -import { RouteObject } from "react-router-dom"; +import { type JSX } from "react"; +import { RouteObject } from "react-router"; import { ZudokuDocsConfig } from "../../../config/validators/common.js"; import type { ZudokuPlugin } from "../../core/plugins.js"; import { DocResolver } from "./resolver.js"; diff --git a/packages/zudoku/src/lib/plugins/openapi/Route.tsx b/packages/zudoku/src/lib/plugins/openapi/Route.tsx index 82461bc3..8cb11a06 100644 --- a/packages/zudoku/src/lib/plugins/openapi/Route.tsx +++ b/packages/zudoku/src/lib/plugins/openapi/Route.tsx @@ -1,4 +1,4 @@ -import { Outlet } from "react-router-dom"; +import { Outlet } from "react-router"; import type { GraphQLClient } from "./client/GraphQLClient.js"; import { GraphQLProvider } from "./client/GraphQLContext.js"; import { OasConfigProvider } from "./context.js"; diff --git a/packages/zudoku/src/lib/plugins/openapi/Sidecar.tsx b/packages/zudoku/src/lib/plugins/openapi/Sidecar.tsx index 72e56891..68777951 100644 --- a/packages/zudoku/src/lib/plugins/openapi/Sidecar.tsx +++ b/packages/zudoku/src/lib/plugins/openapi/Sidecar.tsx @@ -1,7 +1,7 @@ import { useSuspenseQuery } from "@tanstack/react-query"; import { HTTPSnippet } from "@zudoku/httpsnippet"; import { Fragment, useMemo, useTransition } from "react"; -import { useSearchParams } from "react-router-dom"; +import { useSearchParams } from "react-router"; import { useSelectedServerStore } from "../../authentication/state.js"; import { TextColorMap } from "../../components/navigation/SidebarBadge.js"; import { SyntaxHighlight } from "../../components/SyntaxHighlight.js"; diff --git a/packages/zudoku/src/lib/plugins/openapi/index.tsx b/packages/zudoku/src/lib/plugins/openapi/index.tsx index b1f9c0fd..80c04e74 100644 --- a/packages/zudoku/src/lib/plugins/openapi/index.tsx +++ b/packages/zudoku/src/lib/plugins/openapi/index.tsx @@ -1,4 +1,4 @@ -import { matchPath, type RouteObject } from "react-router-dom"; +import { matchPath, type RouteObject } from "react-router"; import { type ZudokuPlugin } from "../../core/plugins.js"; import { graphql } from "./graphql/index.js"; diff --git a/packages/zudoku/src/lib/plugins/redirect/index.tsx b/packages/zudoku/src/lib/plugins/redirect/index.tsx index d49bb8a4..3efaf1ec 100644 --- a/packages/zudoku/src/lib/plugins/redirect/index.tsx +++ b/packages/zudoku/src/lib/plugins/redirect/index.tsx @@ -1,4 +1,4 @@ -import { redirect } from "react-router-dom"; +import { redirect } from "react-router"; import { ZudokuRedirect } from "../../../config/validators/common.js"; import type { ZudokuPlugin } from "../../core/plugins.js"; diff --git a/packages/zudoku/src/lib/util/MdxComponents.tsx b/packages/zudoku/src/lib/util/MdxComponents.tsx index 51c1c69c..2c738e40 100644 --- a/packages/zudoku/src/lib/util/MdxComponents.tsx +++ b/packages/zudoku/src/lib/util/MdxComponents.tsx @@ -1,5 +1,5 @@ import { MDXComponents } from "mdx/types.js"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; import { Heading } from "../components/Heading.js"; import { InlineCode } from "../components/InlineCode.js"; import { SyntaxHighlight } from "../components/SyntaxHighlight.js"; @@ -8,7 +8,6 @@ import { Callout } from "../ui/Callout.js"; export type MdxComponentsType = Readonly | null | undefined; export const MdxComponents = { - // @ts-expect-error Node is not in types but still gets passed img: ({ node, ...props }) => { if (/\.(mp4|webm|mov|avi)$/.test(props.src ?? "")) { return