From 911c0680fbe5b756f9c43b6ff170eeab2fb70643 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Wed, 19 Feb 2025 10:39:06 -0800 Subject: [PATCH 001/143] initial playground --- .gitignore | 1 + .vscode/settings.json | 12 +- package.json | 2 + packages/react-router/package.json | 17 +- packages/react-router/server.ts | 2 + packages/react-router/tsup.config.server.ts | 49 + playground/rsc-parcel/.gitignore | 3 + playground/rsc-parcel/package.json | 46 + playground/rsc-parcel/src/browser.tsx | 25 + playground/rsc-parcel/src/counter.tsx | 17 + .../rsc-parcel/src/react-router.browser.tsx | 43 + .../rsc-parcel/src/react-router.client.ts | 3 + .../rsc-parcel/src/react-router.server.tsx | 142 + .../rsc-parcel/src/react-router.ssr.tsx | 68 + playground/rsc-parcel/src/routes.ts | 24 + .../src/routes/home/home.client.tsx | 22 + playground/rsc-parcel/src/routes/home/home.ts | 7 + .../src/routes/root/root.client.tsx | 32 + playground/rsc-parcel/src/routes/root/root.ts | 7 + playground/rsc-parcel/src/server.tsx | 85 + playground/rsc-parcel/tsconfig.json | 12 + pnpm-lock.yaml | 2379 +++++++++++++++-- 22 files changed, 2822 insertions(+), 176 deletions(-) create mode 100644 packages/react-router/server.ts create mode 100644 packages/react-router/tsup.config.server.ts create mode 100644 playground/rsc-parcel/.gitignore create mode 100644 playground/rsc-parcel/package.json create mode 100644 playground/rsc-parcel/src/browser.tsx create mode 100644 playground/rsc-parcel/src/counter.tsx create mode 100644 playground/rsc-parcel/src/react-router.browser.tsx create mode 100644 playground/rsc-parcel/src/react-router.client.ts create mode 100644 playground/rsc-parcel/src/react-router.server.tsx create mode 100644 playground/rsc-parcel/src/react-router.ssr.tsx create mode 100644 playground/rsc-parcel/src/routes.ts create mode 100644 playground/rsc-parcel/src/routes/home/home.client.tsx create mode 100644 playground/rsc-parcel/src/routes/home/home.ts create mode 100644 playground/rsc-parcel/src/routes/root/root.client.tsx create mode 100644 playground/rsc-parcel/src/routes/root/root.ts create mode 100644 playground/rsc-parcel/src/server.tsx create mode 100644 playground/rsc-parcel/tsconfig.json diff --git a/.gitignore b/.gitignore index 3f1e373362..39f7d31401 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ node_modules/ .wireit .eslintcache +.parcel-cache .tmp tsup.config.bundled_*.mjs build.utils.d.ts diff --git a/.vscode/settings.json b/.vscode/settings.json index fae8e3d8a9..b6918a82b1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,14 @@ { "typescript.tsdk": "node_modules/typescript/lib", - "typescript.enablePromptUseWorkspaceTsdk": true + "typescript.enablePromptUseWorkspaceTsdk": true, + "editor.defaultFormatter": "esbenp.prettier-vscode", + "[json]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[jsonc]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + } } diff --git a/package.json b/package.json index 944ed5a8da..78493f9d7d 100644 --- a/package.json +++ b/package.json @@ -124,6 +124,8 @@ "@changesets/assemble-release-plan": "patches/@changesets__assemble-release-plan.patch" }, "overrides": { + "react": "0.0.0-experimental-93b58361-20250209", + "react-dom": "0.0.0-experimental-93b58361-20250209", "workerd": "1.20240614.0" } } diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 252d2cb5af..4a11223f18 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -23,6 +23,21 @@ "module": "./dist/development/index.mjs", "exports": { ".": { + "react-server": { + "node": { + "types": "./dist/development/server.d.ts", + "module-sync": "./dist/development/server.mjs", + "default": "./dist/development/server.js" + }, + "import": { + "types": "./dist/development/server.d.mts", + "default": "./dist/development/server.mjs" + }, + "default": { + "types": "./dist/development/server.d.ts", + "default": "./dist/development/server.js" + } + }, "node": { "types": "./dist/development/index.d.ts", "module-sync": "./dist/development/index.mjs", @@ -68,7 +83,7 @@ }, "wireit": { "build": { - "command": "rimraf dist && tsup", + "command": "rimraf dist && tsup && tsup --config tsup.config.server.ts", "files": [ "lib/**", "*.ts", diff --git a/packages/react-router/server.ts b/packages/react-router/server.ts new file mode 100644 index 0000000000..25a7c288aa --- /dev/null +++ b/packages/react-router/server.ts @@ -0,0 +1,2 @@ +export { createStaticHandler } from "./lib/router/router"; +export { matchRoutes } from "./lib/router/utils"; diff --git a/packages/react-router/tsup.config.server.ts b/packages/react-router/tsup.config.server.ts new file mode 100644 index 0000000000..f084cbd0b7 --- /dev/null +++ b/packages/react-router/tsup.config.server.ts @@ -0,0 +1,49 @@ +import { defineConfig } from "tsup"; + +// @ts-ignore - out of scope +import { createBanner } from "../../build.utils.js"; + +import pkg from "./package.json"; + +const entry = ["server.ts"]; + +const config = (enableDevWarnings: boolean) => + defineConfig([ + { + clean: false, + entry, + format: ["cjs"], + outDir: enableDevWarnings ? "dist/development" : "dist/production", + dts: true, + banner: { + js: createBanner(pkg.name, pkg.version), + }, + define: { + "import.meta.hot": "undefined", + REACT_ROUTER_VERSION: JSON.stringify(pkg.version), + __DEV__: JSON.stringify(enableDevWarnings), + }, + treeshake: true, + }, + { + clean: false, + entry, + format: ["esm"], + outDir: enableDevWarnings ? "dist/development" : "dist/production", + dts: true, + banner: { + js: createBanner(pkg.name, pkg.version), + }, + define: { + REACT_ROUTER_VERSION: JSON.stringify(pkg.version), + __DEV__: JSON.stringify(enableDevWarnings), + }, + treeshake: true, + }, + ]); + +export default defineConfig([ + // @ts-expect-error + ...config(false), + ...config(true), +]); diff --git a/playground/rsc-parcel/.gitignore b/playground/rsc-parcel/.gitignore new file mode 100644 index 0000000000..ef718b97ff --- /dev/null +++ b/playground/rsc-parcel/.gitignore @@ -0,0 +1,3 @@ +.parcel-cache +dist +node_modules diff --git a/playground/rsc-parcel/package.json b/playground/rsc-parcel/package.json new file mode 100644 index 0000000000..e33bd9711e --- /dev/null +++ b/playground/rsc-parcel/package.json @@ -0,0 +1,46 @@ +{ + "name": "@playground/rsc-parcel", + "private": true, + "source": "src/server.tsx", + "server": "dist/server.js", + "targets": { + "server": { + "context": "react-server", + "includeNodeModules": { + "express": false + } + } + }, + "scripts": { + "dev": "parcel", + "build": "parcel build", + "start": "node dist/server.js" + }, + "devDependencies": { + "@biomejs/biome": "^1.9.4", + "@types/express": "^5.0.0", + "@types/node": "^22.13.1", + "@types/parcel-env": "0.0.8", + "@types/react": "^19.0.8", + "@types/react-dom": "^19.0.3", + "parcel": "2.0.0-canary.1777" + }, + "dependencies": { + "@mjackson/node-fetch-server": "0.6.1", + "@parcel/runtime-rsc": "2.13.4-canary.3402", + "express": "^4.21.2", + "react": "0.0.0-experimental-93b58361-20250209", + "react-dom": "0.0.0-experimental-93b58361-20250209", + "react-router": "0.0.0-experimental-1ebb6d403", + "react-server-dom-parcel": "0.0.0-experimental-93b58361-20250209", + "rsc-html-stream": "0.0.4" + }, + "pnpm": { + "overrides": { + "react": "0.0.0-experimental-93b58361-20250209", + "react-dom": "0.0.0-experimental-93b58361-20250209", + "react-router": "0.0.0-experimental-1ebb6d403", + "react-server-dom-parcel": "0.0.0-experimental-93b58361-20250209" + } + } +} diff --git a/playground/rsc-parcel/src/browser.tsx b/playground/rsc-parcel/src/browser.tsx new file mode 100644 index 0000000000..5792d52286 --- /dev/null +++ b/playground/rsc-parcel/src/browser.tsx @@ -0,0 +1,25 @@ +"use client-entry"; + +import { startTransition, StrictMode, type ReactElement } from "react"; +import { hydrateRoot } from "react-dom/client"; +// @ts-expect-error +import { createFromReadableStream } from "react-server-dom-parcel/client"; +import { rscStream } from "rsc-html-stream/client"; + +import { BrowserRouter } from "./react-router.browser"; +import type { ServerPayload } from "./react-router.server"; + +const initialRSCPayloadPromise = + createFromReadableStream(rscStream); + +initialRSCPayloadPromise.then((initialRSCPayload: ServerPayload) => { + console.log(initialRSCPayload); + startTransition(() => { + hydrateRoot( + document, + + + , + ); + }); +}); diff --git a/playground/rsc-parcel/src/counter.tsx b/playground/rsc-parcel/src/counter.tsx new file mode 100644 index 0000000000..0293a7f136 --- /dev/null +++ b/playground/rsc-parcel/src/counter.tsx @@ -0,0 +1,17 @@ +"use client"; + +import { useState } from "react"; + +export function Counter() { + const [count, setCount] = useState(0); + + return ( +
+

Counter

+

Current count: {count}

+ +
+ ); +} diff --git a/playground/rsc-parcel/src/react-router.browser.tsx b/playground/rsc-parcel/src/react-router.browser.tsx new file mode 100644 index 0000000000..8d99810107 --- /dev/null +++ b/playground/rsc-parcel/src/react-router.browser.tsx @@ -0,0 +1,43 @@ +import { + UNSAFE_createRouter, + RouterProvider, + type DataRouteObject, + UNSAFE_createBrowserHistory, +} from "react-router"; + +import type { ServerPayload } from "./react-router.server"; + +export function BrowserRouter({ payload }: { payload: ServerPayload }) { + const routes = payload.matches.reduceRight((previous, match) => { + const route: DataRouteObject = { + id: match.id, + action: match.hasAction || !!match.clientAction, + Component: match.Component, + ErrorBoundary: match.ErrorBoundary, + handle: match.handle, + hasErrorBoundary: !!match.ErrorBoundary, + HydrateFallback: match.HydrateFallback, + index: match.index, + loader: match.hasLoader || !!match.clientLoader, + path: match.path, + shouldRevalidate: match.shouldRevalidate, + }; + if (previous.length > 0) { + route.children = previous; + } + return [route]; + }, [] as DataRouteObject[]); + + const router = UNSAFE_createRouter({ + basename: payload.basename, + history: UNSAFE_createBrowserHistory(), + hydrationData: { + actionData: payload.actionData, + errors: payload.errors, + loaderData: payload.loaderData, + }, + routes: routes, + }); + + return ; +} diff --git a/playground/rsc-parcel/src/react-router.client.ts b/playground/rsc-parcel/src/react-router.client.ts new file mode 100644 index 0000000000..f26ae87d0a --- /dev/null +++ b/playground/rsc-parcel/src/react-router.client.ts @@ -0,0 +1,3 @@ +"use client"; + +export { Link, Outlet } from "react-router"; diff --git a/playground/rsc-parcel/src/react-router.server.tsx b/playground/rsc-parcel/src/react-router.server.tsx new file mode 100644 index 0000000000..569a3f3ed7 --- /dev/null +++ b/playground/rsc-parcel/src/react-router.server.tsx @@ -0,0 +1,142 @@ +import { + createStaticHandler, + type ActionFunction, + type ClientActionFunction, + type ClientLoaderFunction, + type LinksFunction, + type LoaderFunction, + type Location, + type MetaFunction, + type Params, + type ShouldRevalidateFunction, + type UNSAFE_ErrorResponseImpl, +} from "react-router"; +import { + renderToReadableStream, + // @ts-expect-error +} from "react-server-dom-parcel/server.edge"; + +export type RouteObject = { id: string; path?: string } & ( + | { + index: true; + } + | { + children?: RouteObject[]; + } +) & { + action?: ActionFunction; + clientAction?: ClientActionFunction; + clientLoader?: ClientLoaderFunction; + Component?: React.ComponentType; + ErrorBoundary?: React.ComponentType; + handle?: any; + HydrateFallback?: React.ComponentType; + Layout?: React.ComponentType; + links?: LinksFunction; + loader?: LoaderFunction; + meta?: MetaFunction; + shouldRevalidate?: ShouldRevalidateFunction; + }; + +export type RouteMatch = { + clientAction?: ClientActionFunction; + clientLoader?: ClientLoaderFunction; + Component?: React.ComponentType; + ErrorBoundary?: React.ComponentType; + handle?: any; + hasAction: boolean; + hasLoader: boolean; + HydrateFallback?: React.ComponentType; + id: string; + index?: boolean; + Layout?: React.ComponentType; + links?: LinksFunction; + meta?: MetaFunction; + params: Params; + path?: string; + pathname: string; + pathnameBase: string; + shouldRevalidate?: ShouldRevalidateFunction; +}; + +export type ServerPayload = { + actionData: Record | null; + basename?: string; + deepestRenderedBoundaryId?: string; + errors: Record | null; + loaderData: Record; + location: Location; + matches: RouteMatch[]; + nonce?: string; +}; + +export async function handleRequest(request: Request, routes: RouteObject[]) { + const handler = createStaticHandler(routes); + const result = await handler.query(request); + + if (result instanceof Response) { + const headers = new Headers(result.headers); + headers.set("Vary", "Content-Type"); + headers.set("x-react-router-error", "true"); + return result; + } + + const errors = result.errors + ? Object.fromEntries( + Object.entries(result.errors).map(([key, error]) => [ + key, + isRouteErrorResponse(error) + ? Object.fromEntries(Object.entries(error)) + : error, + ]), + ) + : result.errors; + + const payload: ServerPayload = { + actionData: result.actionData, + deepestRenderedBoundaryId: result._deepestRenderedBoundaryId ?? undefined, + errors, + loaderData: result.loaderData, + location: result.location, + matches: result.matches.map((match) => ({ + clientAction: (match.route as any).clientAction, + clientLoader: (match.route as any).clientLoader, + Component: (match.route as any).default, + ErrorBoundary: (match.route as any).ErrorBoundary, + handle: (match.route as any).handle, + hasAction: !!match.route.action, + hasLoader: !!match.route.loader, + HydrateFallback: (match.route as any).HydrateFallback, + id: match.route.id, + index: match.route.index, + Layout: (match.route as any).Layout, + links: (match.route as any).links, + meta: (match.route as any).meta, + params: match.params, + path: match.route.path, + pathname: match.pathname, + pathnameBase: match.pathnameBase, + shouldRevalidate: (match.route as any).shouldRevalidate, + })), + }; + + const body = renderToReadableStream(payload); + + return new Response(body, { + status: 200, + headers: { + "Content-Type": "text/x-component", + Vary: "Content-Type", + }, + }); +} + +function isRouteErrorResponse(error: any): error is UNSAFE_ErrorResponseImpl { + return ( + error != null && + typeof error.status === "number" && + typeof error.statusText === "string" && + typeof error.internal === "boolean" && + "data" in error + ); +} diff --git a/playground/rsc-parcel/src/react-router.ssr.tsx b/playground/rsc-parcel/src/react-router.ssr.tsx new file mode 100644 index 0000000000..bfe371d871 --- /dev/null +++ b/playground/rsc-parcel/src/react-router.ssr.tsx @@ -0,0 +1,68 @@ +import { + createStaticRouter, + StaticRouterProvider, + type DataRouteObject, +} from "react-router"; + +import type { ServerPayload } from "./react-router.server"; + +export function PrerenderRouter({ payload }: { payload: ServerPayload }) { + const context = { + actionData: payload.actionData, + actionHeaders: {}, + basename: payload.basename, + errors: payload.errors, + loaderData: payload.loaderData, + loaderHeaders: {}, + location: payload.location, + statusCode: 200, + _deepestRenderedBoundaryId: payload.deepestRenderedBoundaryId, + matches: payload.matches.map((match) => ({ + params: match.params, + pathname: match.pathname, + pathnameBase: match.pathnameBase, + route: { + id: match.id, + action: match.hasAction || !!match.clientAction, + handle: match.handle, + hasErrorBoundary: !!match.ErrorBoundary, + loader: match.hasLoader || !!match.clientLoader, + index: match.index, + path: match.path, + shouldRevalidate: match.shouldRevalidate, + }, + })), + }; + + const router = createStaticRouter( + payload.matches.reduceRight((previous, match) => { + const route: DataRouteObject = { + id: match.id, + action: match.hasAction || !!match.clientAction, + Component: match.Component, + ErrorBoundary: match.ErrorBoundary, + handle: match.handle, + hasErrorBoundary: !!match.ErrorBoundary, + HydrateFallback: match.HydrateFallback, + index: match.index, + loader: match.hasLoader || !!match.clientLoader, + path: match.path, + shouldRevalidate: match.shouldRevalidate, + }; + if (previous.length > 0) { + route.children = previous; + } + return [route]; + }, [] as DataRouteObject[]), + context, + ); + + return ( + + ); +} diff --git a/playground/rsc-parcel/src/routes.ts b/playground/rsc-parcel/src/routes.ts new file mode 100644 index 0000000000..4b183bac10 --- /dev/null +++ b/playground/rsc-parcel/src/routes.ts @@ -0,0 +1,24 @@ +"use server-entry"; + +import "./browser"; + +import type { RouteObject } from "./react-router.server"; + +import * as home from "./routes/home/home"; +import * as root from "./routes/root/root"; + +export function routes(): RouteObject[] { + return [ + { + id: "root", + ...root, + children: [ + { + id: "home", + index: true, + ...home, + }, + ], + }, + ]; +} diff --git a/playground/rsc-parcel/src/routes/home/home.client.tsx b/playground/rsc-parcel/src/routes/home/home.client.tsx new file mode 100644 index 0000000000..6f305f6a23 --- /dev/null +++ b/playground/rsc-parcel/src/routes/home/home.client.tsx @@ -0,0 +1,22 @@ +"use client"; + +import { type ClientLoaderFunctionArgs, useLoaderData } from "react-router"; + +export async function clientLoader({ serverLoader }: ClientLoaderFunctionArgs) { + const res = await serverLoader(); + + return { + client: true, + ...res, + }; +} + +export default function Component() { + const { client, message } = useLoaderData(); + + return ( +

+ {message} {client} +

+ ); +} diff --git a/playground/rsc-parcel/src/routes/home/home.ts b/playground/rsc-parcel/src/routes/home/home.ts new file mode 100644 index 0000000000..82e3a7cff3 --- /dev/null +++ b/playground/rsc-parcel/src/routes/home/home.ts @@ -0,0 +1,7 @@ +export { clientLoader, default } from "./home.client"; + +export function loader() { + return { + message: "Hello Home!", + }; +} diff --git a/playground/rsc-parcel/src/routes/root/root.client.tsx b/playground/rsc-parcel/src/routes/root/root.client.tsx new file mode 100644 index 0000000000..276638d7fb --- /dev/null +++ b/playground/rsc-parcel/src/routes/root/root.client.tsx @@ -0,0 +1,32 @@ +"use client"; + +import { Outlet, useLoaderData } from "react-router"; +import { Counter } from "../../counter"; + +export function Layout({ children }: { children: React.ReactNode }) { + return ( + + + + + React Server + + {children} + + ); +} + +export default function Component() { + const { message } = useLoaderData(); + return ( + <> +

{message}

+ + + + ); +} + +export function ErrorBoundary() { + return

Something went wrong!

; +} diff --git a/playground/rsc-parcel/src/routes/root/root.ts b/playground/rsc-parcel/src/routes/root/root.ts new file mode 100644 index 0000000000..a543245651 --- /dev/null +++ b/playground/rsc-parcel/src/routes/root/root.ts @@ -0,0 +1,7 @@ +export { default, ErrorBoundary, Layout } from "./root.client"; + +export function loader() { + return { + message: "Hello from the server!", + }; +} diff --git a/playground/rsc-parcel/src/server.tsx b/playground/rsc-parcel/src/server.tsx new file mode 100644 index 0000000000..ac4c51cc99 --- /dev/null +++ b/playground/rsc-parcel/src/server.tsx @@ -0,0 +1,85 @@ +import { createRequestListener } from "@mjackson/node-fetch-server"; +import express from "express"; +import { injectRSCPayload } from "rsc-html-stream/server"; + +// @ts-expect-error +import { createFromReadableStream } from "react-server-dom-parcel/client.edge" with { + env: "react-client", +}; +// @ts-expect-error +import { renderToReadableStream as renderHTMLToReadableStream } from "react-dom/server.edge" with { + env: "react-client", +}; +import { PrerenderRouter } from "./react-router.ssr" with { + env: "react-client", +}; + +import { handleRequest, type ServerPayload } from "./react-router.server"; + +import { routes } from "./routes"; + +const _routes = routes(); + +const app = express(); + +app.use(express.static("dist")); + +app.use( + createRequestListener(async (request) => { + let serverRequest = request; + const serverURL = new URL(request.url); + const isDataRequest = serverURL.pathname.endsWith(".data"); + if (isDataRequest) { + serverURL.pathname = serverURL.pathname.replace(/\.data$/, ""); + serverRequest = new Request(serverURL, { + body: request.body, + duplex: request.body ? "half" : undefined, + headers: request.headers, + method: request.method, + signal: request.signal, + } as RequestInit & { duplex?: "half" }); + } + const serverResponse = await handleRequest(serverRequest, _routes); + + if (isDataRequest || serverResponse.headers.has("x-react-router-error")) { + return serverResponse; + } + + if (!serverResponse.body) { + throw new Error("No body in server response"); + } + + const [rscStreamA, rscStreamB] = serverResponse.body.tee(); + + const payload: ServerPayload = await createFromReadableStream(rscStreamA); + + const htmlStream = await renderHTMLToReadableStream( + , + { + bootstrapScriptContent: ( + routes as unknown as { bootstrapScript: string } + ).bootstrapScript, + }, + ); + + const headers = new Headers(serverResponse.headers); + headers.set("Content-Type", "text/html"); + + return new Response(htmlStream.pipeThrough(injectRSCPayload(rscStreamB)), { + status: serverResponse.status, + headers, + }); + }), +); + +const server = app.listen(3001); +console.log("Server listening on port 3001"); + +// Restart the server when it changes. +if (module.hot) { + module.hot.dispose(() => { + server.close(); + }); + + module.hot.accept(); +} diff --git a/playground/rsc-parcel/tsconfig.json b/playground/rsc-parcel/tsconfig.json new file mode 100644 index 0000000000..5593ae70d9 --- /dev/null +++ b/playground/rsc-parcel/tsconfig.json @@ -0,0 +1,12 @@ +{ + "compilerOptions": { + "strict": true, + "jsx": "react-jsx", + "allowSyntheticDefaultImports": true, + "moduleResolution": "node", + "module": "esnext", + "isolatedModules": true, + "esModuleInterop": true, + "target": "es2022" + } +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7bd83899ad..67da5da3ca 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,6 +8,8 @@ overrides: '@types/react': ^18.2.18 '@types/react-dom': ^18.2.7 jsdom: 22.1.0 + react: 0.0.0-experimental-93b58361-20250209 + react-dom: 0.0.0-experimental-93b58361-20250209 workerd: 1.20240614.0 patchedDependencies: @@ -75,7 +77,7 @@ importers: version: 5.17.0 '@testing-library/react': specifier: ^13.4.0 - version: 13.4.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0) + version: 13.4.0(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209) '@testing-library/user-event': specifier: ^14.5.2 version: 14.5.2(@testing-library/dom@8.17.1) @@ -182,14 +184,14 @@ importers: specifier: ^2.4.2 version: 2.4.2 react: - specifier: ^18.2.0 - version: 18.2.0 + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209 react-dom: - specifier: ^18.2.0 - version: 18.2.0(react@18.2.0) + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) react-test-renderer: specifier: ^18.2.0 - version: 18.2.0(react@18.2.0) + version: 18.2.0(react@0.0.0-experimental-93b58361-20250209) remark-gfm: specifier: 3.0.1 version: 3.0.1 @@ -225,13 +227,13 @@ importers: version: 3.1.1 vite: specifier: ^6.0.0 - version: 6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0) + version: 6.0.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) vite-env-only: specifier: ^3.0.1 - version: 3.0.1(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0)) + version: 3.0.1(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)) vite-tsconfig-paths: specifier: ^4.2.2 - version: 4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)) integration: dependencies: @@ -261,7 +263,7 @@ importers: version: 1.14.2 '@vanilla-extract/vite-plugin': specifier: ^3.9.2 - version: 3.9.5(@types/node@20.11.30)(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0)) + version: 3.9.5(@types/node@22.13.4)(lightningcss@1.29.1)(vite@6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)) cheerio: specifier: ^1.0.0-rc.12 version: 1.0.0 @@ -305,11 +307,11 @@ importers: specifier: ^2.7.1 version: 2.8.8 react: - specifier: ^18.2.0 - version: 18.2.0 + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209 react-dom: - specifier: ^18.2.0 - version: 18.2.0(react@18.2.0) + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) react-router: specifier: workspace:* version: link:../packages/react-router @@ -336,13 +338,13 @@ importers: version: 5.4.5 vite: specifier: ^6.0.0 - version: 6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0) + version: 6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) vite-env-only: specifier: ^3.0.1 - version: 3.0.1(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0)) + version: 3.0.1(vite@6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)) vite-tsconfig-paths: specifier: ^4.2.2 - version: 4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)) wait-on: specifier: ^7.0.1 version: 7.2.0 @@ -363,7 +365,7 @@ importers: version: 1.14.2 '@vanilla-extract/vite-plugin': specifier: ^3.9.2 - version: 3.9.5(@types/node@20.11.30)(terser@5.15.0)(vite@5.1.3(@types/node@20.11.30)(terser@5.15.0)) + version: 3.9.5(@types/node@22.13.4)(lightningcss@1.29.1)(terser@5.15.0)(vite@5.1.3(@types/node@22.13.4)(lightningcss@1.29.1)(terser@5.15.0)) express: specifier: ^4.19.2 version: 4.19.2 @@ -371,11 +373,11 @@ importers: specifier: ^5.1.11 version: 5.1.11 react: - specifier: ^18.2.0 - version: 18.2.0 + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209 react-dom: - specifier: ^18.2.0 - version: 18.2.0(react@18.2.0) + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) react-router: specifier: workspace:* version: link:../../../packages/react-router @@ -406,13 +408,13 @@ importers: version: 5.4.5 vite: specifier: ^5.1.0 - version: 5.1.3(@types/node@20.11.30)(terser@5.15.0) + version: 5.1.3(@types/node@22.13.4)(lightningcss@1.29.1)(terser@5.15.0) vite-env-only: specifier: ^3.0.1 - version: 3.0.1(vite@5.1.3(@types/node@20.11.30)(terser@5.15.0)) + version: 3.0.1(vite@5.1.3(@types/node@22.13.4)(lightningcss@1.29.1)(terser@5.15.0)) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@5.1.3(@types/node@20.11.30)(terser@5.15.0)) + version: 4.3.2(typescript@5.4.5)(vite@5.1.3(@types/node@22.13.4)(lightningcss@1.29.1)(terser@5.15.0)) integration/helpers/vite-6-template: dependencies: @@ -430,7 +432,7 @@ importers: version: 1.14.2 '@vanilla-extract/vite-plugin': specifier: ^3.9.2 - version: 3.9.5(@types/node@20.11.30)(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0)) + version: 3.9.5(@types/node@22.13.4)(lightningcss@1.29.1)(vite@6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)) express: specifier: ^4.19.2 version: 4.19.2 @@ -438,11 +440,11 @@ importers: specifier: ^5.1.11 version: 5.1.11 react: - specifier: ^18.2.0 - version: 18.2.0 + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209 react-dom: - specifier: ^18.2.0 - version: 18.2.0(react@18.2.0) + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) react-router: specifier: workspace:* version: link:../../../packages/react-router @@ -473,13 +475,13 @@ importers: version: 5.4.5 vite: specifier: ^6.0.0 - version: 6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0) + version: 6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) vite-env-only: specifier: ^3.0.1 - version: 3.0.1(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0)) + version: 3.0.1(vite@6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)) integration/helpers/vite-cloudflare-template: dependencies: @@ -493,11 +495,11 @@ importers: specifier: ^3.20231030.4 version: 3.20240701.0 react: - specifier: ^18.2.0 - version: 18.2.0 + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209 react-dom: - specifier: ^18.2.0 - version: 18.2.0(react@18.2.0) + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) react-router: specifier: workspace:* version: link:../../../packages/react-router @@ -525,7 +527,7 @@ importers: version: 5.4.5 vite: specifier: ^6.0.0 - version: 6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0) + version: 6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) wrangler: specifier: ^3.28.2 version: 3.64.0(@cloudflare/workers-types@4.20240712.0) @@ -598,7 +600,7 @@ importers: version: 1.3.3 tsup: specifier: ^8.3.0 - version: 8.3.0(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -625,17 +627,17 @@ importers: specifier: ^2.4.1 version: 2.4.7 react: - specifier: ^18.2.0 - version: 18.2.0 + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209 react-dom: - specifier: ^18.2.0 - version: 18.2.0(react@18.2.0) + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) rimraf: specifier: ^6.0.1 version: 6.0.1 tsup: specifier: ^8.3.0 - version: 8.3.0(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -665,17 +667,17 @@ importers: specifier: ^4.0.1 version: 4.0.1 react: - specifier: ^18.2.0 - version: 18.2.0 + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209 react-dom: - specifier: ^18.2.0 - version: 18.2.0(react@18.2.0) + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) react-router: specifier: workspace:* version: link:../react-router tsup: specifier: ^8.3.0 - version: 8.3.0(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -693,7 +695,7 @@ importers: version: link:../react-router tsup: specifier: ^8.3.0 - version: 8.3.0(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -789,7 +791,7 @@ importers: version: 0.41.0(typescript@5.4.5) vite-node: specifier: 3.0.0-beta.2 - version: 3.0.0-beta.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0) + version: 3.0.0-beta.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) devDependencies: '@react-router/serve': specifier: workspace:* @@ -862,13 +864,13 @@ importers: version: 1.3.3 tsup: specifier: ^8.3.0 - version: 8.3.0(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 vite: specifier: ^6.0.0 - version: 6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0) + version: 6.0.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) wireit: specifier: 0.14.9 version: 0.14.9 @@ -883,14 +885,14 @@ importers: version: link:../react-router devDependencies: react: - specifier: ^18.2.0 - version: 18.2.0 + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209 react-dom: - specifier: ^18.2.0 - version: 18.2.0(react@18.2.0) + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) tsup: specifier: ^8.3.0 - version: 8.3.0(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -927,7 +929,7 @@ importers: version: 6.3.4 tsup: specifier: ^8.3.0 - version: 8.3.0(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -946,7 +948,7 @@ importers: version: link:../react-router-dev tsup: specifier: ^8.3.0 - version: 8.3.0(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -977,7 +979,7 @@ importers: version: link:../react-router tsup: specifier: ^8.3.0 - version: 8.3.0(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -992,7 +994,7 @@ importers: version: link:../react-router-dev tsup: specifier: ^8.3.0 - version: 8.3.0(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -1041,7 +1043,7 @@ importers: version: 0.5.10 tsup: specifier: ^8.3.0 - version: 8.3.0(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -1061,11 +1063,11 @@ importers: specifier: ^5.1.11 version: 5.1.11 react: - specifier: ^18.2.0 - version: 18.2.0 + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209 react-dom: - specifier: ^18.2.0 - version: 18.2.0(react@18.2.0) + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) react-router: specifier: workspace:* version: link:../../packages/react-router @@ -1084,10 +1086,10 @@ importers: version: 5.4.5 vite: specifier: ^6.0.0 - version: 6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0) + version: 6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)) playground/framework-express: dependencies: @@ -1110,11 +1112,11 @@ importers: specifier: ^1.10.0 version: 1.10.0 react: - specifier: ^18.2.0 - version: 18.2.0 + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209 react-dom: - specifier: ^18.2.0 - version: 18.2.0(react@18.2.0) + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) react-router: specifier: workspace:* version: link:../../packages/react-router @@ -1145,10 +1147,10 @@ importers: version: 5.4.5 vite: specifier: ^6.0.0 - version: 6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0) + version: 6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)) playground/framework-spa: dependencies: @@ -1159,11 +1161,11 @@ importers: specifier: ^5 version: 5.1.11 react: - specifier: ^18.2.0 - version: 18.2.0 + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209 react-dom: - specifier: ^18.2.0 - version: 18.2.0(react@18.2.0) + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) react-router: specifier: workspace:* version: link:../../packages/react-router @@ -1182,10 +1184,10 @@ importers: version: 5.4.5 vite: specifier: ^6.0.0 - version: 6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0) + version: 6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)) playground/framework-vite-5: dependencies: @@ -1199,11 +1201,11 @@ importers: specifier: ^5.1.11 version: 5.1.11 react: - specifier: ^18.2.0 - version: 18.2.0 + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209 react-dom: - specifier: ^18.2.0 - version: 18.2.0(react@18.2.0) + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) react-router: specifier: workspace:* version: link:../../packages/react-router @@ -1222,10 +1224,59 @@ importers: version: 5.4.5 vite: specifier: ^5.1.0 - version: 5.1.3(@types/node@20.11.30)(terser@5.15.0) + version: 5.1.3(@types/node@22.13.4)(lightningcss@1.29.1)(terser@5.15.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@5.1.3(@types/node@20.11.30)(terser@5.15.0)) + version: 4.3.2(typescript@5.4.5)(vite@5.1.3(@types/node@22.13.4)(lightningcss@1.29.1)(terser@5.15.0)) + + playground/rsc-parcel: + dependencies: + '@mjackson/node-fetch-server': + specifier: 0.6.1 + version: 0.6.1 + '@parcel/runtime-rsc': + specifier: 2.13.4-canary.3402 + version: 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + express: + specifier: ^4.21.2 + version: 4.21.2 + react: + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209 + react-dom: + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) + react-router: + specifier: 0.0.0-experimental-1ebb6d403 + version: 0.0.0-experimental-1ebb6d403(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209) + react-server-dom-parcel: + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209) + rsc-html-stream: + specifier: 0.0.4 + version: 0.0.4 + devDependencies: + '@biomejs/biome': + specifier: ^1.9.4 + version: 1.9.4 + '@types/express': + specifier: ^5.0.0 + version: 5.0.0 + '@types/node': + specifier: ^22.13.1 + version: 22.13.4 + '@types/parcel-env': + specifier: 0.0.8 + version: 0.0.8 + '@types/react': + specifier: ^18.2.18 + version: 18.2.18 + '@types/react-dom': + specifier: ^18.2.7 + version: 18.2.7 + parcel: + specifier: 2.0.0-canary.1777 + version: 2.0.0-canary.1777(@swc/helpers@0.5.15)(postcss@8.4.49)(terser@5.15.0)(typescript@5.4.5) playground/split-route-modules: dependencies: @@ -1239,11 +1290,11 @@ importers: specifier: ^5.1.11 version: 5.1.11 react: - specifier: ^18.2.0 - version: 18.2.0 + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209 react-dom: - specifier: ^18.2.0 - version: 18.2.0(react@18.2.0) + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) react-router: specifier: workspace:* version: link:../../packages/react-router @@ -1262,10 +1313,10 @@ importers: version: 5.4.5 vite: specifier: ^6.0.0 - version: 6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0) + version: 6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)) playground/split-route-modules-spa: dependencies: @@ -1276,11 +1327,11 @@ importers: specifier: ^5 version: 5.1.11 react: - specifier: ^18.2.0 - version: 18.2.0 + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209 react-dom: - specifier: ^18.2.0 - version: 18.2.0(react@18.2.0) + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) react-router: specifier: workspace:* version: link:../../packages/react-router @@ -1299,10 +1350,10 @@ importers: version: 5.4.5 vite: specifier: ^6.0.0 - version: 6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0) + version: 6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)) packages: @@ -2049,6 +2100,59 @@ packages: '@bcoe/v8-coverage@0.2.3': resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} + '@biomejs/biome@1.9.4': + resolution: {integrity: sha512-1rkd7G70+o9KkTn5KLmDYXihGoTaIGO9PIIN2ZB7UJxFrWw04CZHPYiMRjYsaDvVV7hP1dYNRLxSANLaBFGpog==} + engines: {node: '>=14.21.3'} + hasBin: true + + '@biomejs/cli-darwin-arm64@1.9.4': + resolution: {integrity: sha512-bFBsPWrNvkdKrNCYeAp+xo2HecOGPAy9WyNyB/jKnnedgzl4W4Hb9ZMzYNbf8dMCGmUdSavlYHiR01QaYR58cw==} + engines: {node: '>=14.21.3'} + cpu: [arm64] + os: [darwin] + + '@biomejs/cli-darwin-x64@1.9.4': + resolution: {integrity: sha512-ngYBh/+bEedqkSevPVhLP4QfVPCpb+4BBe2p7Xs32dBgs7rh9nY2AIYUL6BgLw1JVXV8GlpKmb/hNiuIxfPfZg==} + engines: {node: '>=14.21.3'} + cpu: [x64] + os: [darwin] + + '@biomejs/cli-linux-arm64-musl@1.9.4': + resolution: {integrity: sha512-v665Ct9WCRjGa8+kTr0CzApU0+XXtRgwmzIf1SeKSGAv+2scAlW6JR5PMFo6FzqqZ64Po79cKODKf3/AAmECqA==} + engines: {node: '>=14.21.3'} + cpu: [arm64] + os: [linux] + + '@biomejs/cli-linux-arm64@1.9.4': + resolution: {integrity: sha512-fJIW0+LYujdjUgJJuwesP4EjIBl/N/TcOX3IvIHJQNsAqvV2CHIogsmA94BPG6jZATS4Hi+xv4SkBBQSt1N4/g==} + engines: {node: '>=14.21.3'} + cpu: [arm64] + os: [linux] + + '@biomejs/cli-linux-x64-musl@1.9.4': + resolution: {integrity: sha512-gEhi/jSBhZ2m6wjV530Yy8+fNqG8PAinM3oV7CyO+6c3CEh16Eizm21uHVsyVBEB6RIM8JHIl6AGYCv6Q6Q9Tg==} + engines: {node: '>=14.21.3'} + cpu: [x64] + os: [linux] + + '@biomejs/cli-linux-x64@1.9.4': + resolution: {integrity: sha512-lRCJv/Vi3Vlwmbd6K+oQ0KhLHMAysN8lXoCI7XeHlxaajk06u7G+UsFSO01NAs5iYuWKmVZjmiOzJ0OJmGsMwg==} + engines: {node: '>=14.21.3'} + cpu: [x64] + os: [linux] + + '@biomejs/cli-win32-arm64@1.9.4': + resolution: {integrity: sha512-tlbhLk+WXZmgwoIKwHIHEBZUwxml7bRJgk0X2sPyNR3S93cdRq6XulAZRQJ17FYGGzWne0fgrXBKpl7l4M87Hg==} + engines: {node: '>=14.21.3'} + cpu: [arm64] + os: [win32] + + '@biomejs/cli-win32-x64@1.9.4': + resolution: {integrity: sha512-8Y5wMhVIPaWe6jw2H+KlEm4wP/f7EW3810ZLmDlrEEy5KvBsb9ECEfu/kMWD484ijfQ8+nIi0giMgu9g1UAuuA==} + engines: {node: '>=14.21.3'} + cpu: [x64] + os: [win32] + '@changesets/apply-release-plan@6.1.4': resolution: {integrity: sha512-FMpKF1fRlJyCZVYHr3CbinpZZ+6MwvOtWUuO8uo+svcATEoc1zRDcj23pAurJ2TZ/uVz1wFHH6K3NlACy0PLew==} @@ -3013,6 +3117,42 @@ packages: '@jridgewell/trace-mapping@0.3.9': resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==} + '@lezer/common@1.2.3': + resolution: {integrity: sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==} + + '@lezer/lr@1.4.2': + resolution: {integrity: sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==} + + '@lmdb/lmdb-darwin-arm64@2.8.5': + resolution: {integrity: sha512-KPDeVScZgA1oq0CiPBcOa3kHIqU+pTOwRFDIhxvmf8CTNvqdZQYp5cCKW0bUk69VygB2PuTiINFWbY78aR2pQw==} + cpu: [arm64] + os: [darwin] + + '@lmdb/lmdb-darwin-x64@2.8.5': + resolution: {integrity: sha512-w/sLhN4T7MW1nB3R/U8WK5BgQLz904wh+/SmA2jD8NnF7BLLoUgflCNxOeSPOWp8geP6nP/+VjWzZVip7rZ1ug==} + cpu: [x64] + os: [darwin] + + '@lmdb/lmdb-linux-arm64@2.8.5': + resolution: {integrity: sha512-vtbZRHH5UDlL01TT5jB576Zox3+hdyogvpcbvVJlmU5PdL3c5V7cj1EODdh1CHPksRl+cws/58ugEHi8bcj4Ww==} + cpu: [arm64] + os: [linux] + + '@lmdb/lmdb-linux-arm@2.8.5': + resolution: {integrity: sha512-c0TGMbm2M55pwTDIfkDLB6BpIsgxV4PjYck2HiOX+cy/JWiBXz32lYbarPqejKs9Flm7YVAKSILUducU9g2RVg==} + cpu: [arm] + os: [linux] + + '@lmdb/lmdb-linux-x64@2.8.5': + resolution: {integrity: sha512-Xkc8IUx9aEhP0zvgeKy7IQ3ReX2N8N1L0WPcQwnZweWmOuKfwpS3GRIYqLtK5za/w3E60zhFfNdS+3pBZPytqQ==} + cpu: [x64] + os: [linux] + + '@lmdb/lmdb-win32-x64@2.8.5': + resolution: {integrity: sha512-4wvrf5BgnR8RpogHhtpCPJMKBmvyZPhhUtEwMJbXh0ni2BucpfF07jlmyM11zRqQ2XIq6PbC2j7W7UCCcm1rRQ==} + cpu: [x64] + os: [win32] + '@manypkg/find-root@1.1.0': resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} @@ -3027,9 +3167,46 @@ packages: peerDependencies: rollup: '>=2' + '@mischnic/json-sourcemap@0.1.1': + resolution: {integrity: sha512-iA7+tyVqfrATAIsIRWQG+a7ZLLD0VaOCKV2Wd/v4mqIU3J9c4jx9p7S0nw1XH3gJCKNBOOwACOPYYSUu9pgT+w==} + engines: {node: '>=12.0.0'} + '@mjackson/node-fetch-server@0.2.0': resolution: {integrity: sha512-EMlH1e30yzmTpGLQjlFmaDAjyOeZhng1/XCd7DExR8PNAnG/G1tyruZxEoUe11ClnwGhGrtsdnyyUx1frSzjng==} + '@mjackson/node-fetch-server@0.6.1': + resolution: {integrity: sha512-9ZJnk/DJjt805uv5PPv11haJIW+HHf3YEEyVXv+8iLQxLD/iXA68FH220XoiTPBC4gCg5q+IMadDw8qPqlA5wg==} + + '@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.3': + resolution: {integrity: sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==} + cpu: [arm64] + os: [darwin] + + '@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.3': + resolution: {integrity: sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==} + cpu: [x64] + os: [darwin] + + '@msgpackr-extract/msgpackr-extract-linux-arm64@3.0.3': + resolution: {integrity: sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==} + cpu: [arm64] + os: [linux] + + '@msgpackr-extract/msgpackr-extract-linux-arm@3.0.3': + resolution: {integrity: sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==} + cpu: [arm] + os: [linux] + + '@msgpackr-extract/msgpackr-extract-linux-x64@3.0.3': + resolution: {integrity: sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==} + cpu: [x64] + os: [linux] + + '@msgpackr-extract/msgpackr-extract-win32-x64@3.0.3': + resolution: {integrity: sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==} + cpu: [x64] + os: [win32] + '@mswjs/cookies@0.2.2': resolution: {integrity: sha512-mlN83YSrcFgk7Dm1Mys40DLssI1KdJji2CMKN8eOlBqsTADYzj2+jWzsANsUTFbxDMWPD5e9bfA1RGqBpS3O1g==} engines: {node: '>=14'} @@ -3140,6 +3317,325 @@ packages: '@open-draft/until@1.0.3': resolution: {integrity: sha512-Aq58f5HiWdyDlFffbbSjAlv596h/cOnt2DO1w3DOC7OJ5EHs0hd/nycJfiu9RJbT6Yk6F1knnRRXNSpxoIVZ9Q==} + '@parcel/bundler-default@2.0.0-canary.1779': + resolution: {integrity: sha512-1ArMD7Ov3eTRUyPRj4ki3msaoqaNXVuVvCPs/fM8UO6LlLUh8J1m3559WWQVti50ji8noE6/W6ZuN4FGtbYe5g==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/cache@2.0.0-canary.1779': + resolution: {integrity: sha512-N5lhFIeplMZQMZeSa63lUq+OR99rADKFU3CG3AOLtfW3HzgL05LlMJvUhjvlSO67/40lX3CcMcltqHHEMgyQXA==} + engines: {node: '>= 16.0.0'} + peerDependencies: + '@parcel/core': ^2.0.0-canary.1777+d6a4df370 + + '@parcel/codeframe@2.0.0-canary.1779': + resolution: {integrity: sha512-+GjVEZId3DRLIiqZtnh7xCtwBtnDutqhty50m7zrRpR03Y9uD+vwrdgJ7GyFIk+qVMRHY7bsp8ET054Q+BGleg==} + engines: {node: '>= 16.0.0'} + + '@parcel/compressor-raw@2.13.4-canary.3402': + resolution: {integrity: sha512-j1rYTRuxbnBKsgNX0Qjn3T8L6MHNA8XG53lWrQhHD6s7/6gJT5tn/yJMKjwlxdF23r8sUZhjzFEnRsm9YxTXRQ==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/config-default@2.0.0-canary.1779': + resolution: {integrity: sha512-4Grhn44qtBAK2+kaQ6yJtAny1zZqGbv34WhDqDsthl56N81VtAgmwqCaadAMsT+vf0rgL8nqVGITCPMtqNWvTg==} + peerDependencies: + '@parcel/core': ^2.0.0-canary.1777+d6a4df370 + + '@parcel/core@2.0.0-canary.1777': + resolution: {integrity: sha512-NC9JCB++8SDk70MV7MdsOh5h3EDnX6fSDsKAY79uv4Ho35ZD4HnbFEF44atjq/v1yYfPFDO+SIE4Dj48omVAVg==} + engines: {node: '>= 16.0.0'} + + '@parcel/diagnostic@2.0.0-canary.1779': + resolution: {integrity: sha512-u5j3iihaOdOeTVeZfAdLHvVisvZxNLLOiVraCxIDCyUO0l7afT4McsR/WZiQeAsUt+uGWcNNeRqngf5uYt+HZw==} + engines: {node: '>= 16.0.0'} + + '@parcel/error-overlay@2.13.4-canary.3402': + resolution: {integrity: sha512-pZ8GBmQwbO0AyFsOQ9lFkWG3YQOZAAHmHRGaZrtgtp/ayk1Pr+z+/LEadhlfaSKOF+UyZrONP2YO+GoXjZ1mqA==} + engines: {node: '>= 16.0.0'} + + '@parcel/events@2.0.0-canary.1779': + resolution: {integrity: sha512-vCb7o+IP2xtndK5yg8+IKVsGDjuRN7FQ1d0RNbFBQ/2PveAjDGyNlAzJGlDtdXmb6qt3p4LEn1zGUPnhzcfYgw==} + engines: {node: '>= 16.0.0'} + + '@parcel/feature-flags@2.13.4-canary.3402': + resolution: {integrity: sha512-Y8nxvWT5VKD2ZurbQ9Fp9nZ0yVnqhBYITYaoplrBGqSYPzvqjhzpLOYlsF3rs1mhBudRaJ/gEds5P/CIX9ZT3A==} + engines: {node: '>= 16.0.0'} + + '@parcel/fs@2.0.0-canary.1779': + resolution: {integrity: sha512-UfgoaGgXTEd7XF2MKBP8hMRjnfXa/EzSPGkh+1ZydfE1Uj9zhkSj8k1sVAnc+0RJcSTd91pcI3YA4y+/3u9+tA==} + engines: {node: '>= 16.0.0'} + peerDependencies: + '@parcel/core': ^2.0.0-canary.1777+d6a4df370 + + '@parcel/graph@3.3.4-canary.3402': + resolution: {integrity: sha512-5DMqaCFL2R4yy5G2FDFmlJ0hOmbrQ12FRiw4f3hXmLnj9mUOsArGIyWnwlS4kRpVaSiEV3gTHqPsTjjYcBYBCQ==} + engines: {node: '>= 16.0.0'} + + '@parcel/logger@2.0.0-canary.1779': + resolution: {integrity: sha512-MikuQupiNd1OkAsM30OHvGZ2ggsH/g5RXLO7LMOWf3SFCIjQpJt0wQcDqOZEkrhmtKcJn00pP/zW8iLD6FbQ5A==} + engines: {node: '>= 16.0.0'} + + '@parcel/markdown-ansi@2.0.0-canary.1779': + resolution: {integrity: sha512-QR87Q5noaCuUFmHgjW2vWaW6TSZThLIWCf0Q+r7aAv/Wx8ZdwZJuY8EYtMVkFfNONmF+x6xZBXyflexhlNbTkg==} + engines: {node: '>= 16.0.0'} + + '@parcel/namer-default@2.0.0-canary.1779': + resolution: {integrity: sha512-amBbywKlq27odaOXucaoJL838bAGOIz5rMsmFD/L0UWDZnLoHSGpftCAMBPD4qONaKlQ1ahqP14JsTJFhZJt4A==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/node-resolver-core@3.4.4-canary.3402': + resolution: {integrity: sha512-F1mNOZqVTjk4dgvqvRBpzlKMtFynbXeXUWULpvzwre6zo1jupThtLwVSdNbLc/Mt9hDuR179kcAIldYMLNKOxQ==} + engines: {node: '>= 16.0.0'} + + '@parcel/optimizer-css@2.13.4-canary.3402': + resolution: {integrity: sha512-YYjLhWkWnmc0xTfSPjXkNIO47vhYSn95rqcZ1fYM21MSZYikxpVU9yw6hgKr0wUqlfp3ZtDeI61mmAS7qs3Gng==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/optimizer-htmlnano@2.0.0-canary.1779': + resolution: {integrity: sha512-S84jC3xzmC9SK2na6mAridV7dXnrncoE+ObBvrtQDi6u3rzwjLvb/BJwBLC+tBuDwZZgx2a0r/mEestO7IjbKQ==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/optimizer-image@2.13.4-canary.3402': + resolution: {integrity: sha512-BZt5rBlW5hrDx4oqKU4w8YCFXGYkelCknGr8SpZu2WL+TQmgzDNZpx6dI6H4DIgw9J6DXbLHSWT+K+2MzVlyAA==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + peerDependencies: + '@parcel/core': ^2.0.0-canary.1777+d6a4df370 + + '@parcel/optimizer-svgo@2.13.4-canary.3402': + resolution: {integrity: sha512-DcoTEaMucMgGbotheklVX+/8xvmLNvCbun2BklAOH3cBlMR3n0SXVyLuBteDL9A6nDzIAFI0NVoY6oa/Th7lhg==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/optimizer-swc@2.13.4-canary.3402': + resolution: {integrity: sha512-FyT+fFPIZ7Eg06nUWWroLiGoc/iQZbLNvHwnWL1hMYLmCxF1bPURThsWfAaXMA4kRJZcQpG9u6VjWAknClOQNA==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/package-manager@2.0.0-canary.1779': + resolution: {integrity: sha512-4AJqcoDYWd4tzKnCEKswah57uLHIQ5PenMNCMmGE3cKB5r63vol/GV7bd04bndj0djVWxrDIXwfO8NjvB/Kinw==} + engines: {node: '>= 16.0.0'} + peerDependencies: + '@parcel/core': ^2.0.0-canary.1777+d6a4df370 + + '@parcel/packager-css@2.0.0-canary.1779': + resolution: {integrity: sha512-yrKkFR+BwoWd8yS5w87dvZZMW90HdCwyL/GHRnID8uBPq8fgF5nWJojFuD7q1BSAxOtRrYkzV0rWw1T5cBc3WQ==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/packager-html@2.0.0-canary.1779': + resolution: {integrity: sha512-QPdfaqjHN0whzTfpPJFoHvhNhfAnFVaYW813uCYFTo09q24cpRaV5m2XW5z4FQOkvoFuSRsTXWQAJDM43EnVVw==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/packager-js@2.0.0-canary.1779': + resolution: {integrity: sha512-OOYQ0cdx9zjZzBpcnb8HhO0PmxLDVtck6X0Eifq8HGOfB4G7yzzDN3dtdAtPtuP/6OpG6sH++b1QnbS2ONP3AA==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/packager-raw@2.0.0-canary.1779': + resolution: {integrity: sha512-z9w6N+Fo3tApZK+tZb3ewyHRCn+WzLKOuicp9WAgUzj6URs+q3LCtnfoKJjhD0SM+1GaykuoDNmLEcThi7ByTA==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/packager-svg@2.13.4-canary.3402': + resolution: {integrity: sha512-6VXQByd+YuNNqAQBUVj5dA9W72vaH1JIKmuSiWyQSO1LuQiaW0injV5Zhdx1mxO5JB0aT4+/LhnVvmGwJaOxww==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/packager-wasm@2.13.4-canary.3402': + resolution: {integrity: sha512-e4UY662sKYMLuN7LJ8O5reyfQ7t+bqvDnJjQuT3h6OntFDgLUNYtdxuo0e/h9mTuGLtgvEgvwwAcuz3kH+LfRw==} + engines: {node: '>=16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/plugin@2.0.0-canary.1779': + resolution: {integrity: sha512-u9D0OhpWXy77UMJKpQS++Mdgb/nLDpD29y83ki/pxEA7pOLPMnQB7/j9f4+CBj7v3SdcaTuzKTKACOIaTGMXnQ==} + engines: {node: '>= 16.0.0'} + + '@parcel/profiler@2.13.4-canary.3402': + resolution: {integrity: sha512-TrRyfij6Y6QHHX+ZaMvjkW3lIQYeoGRnVBTkbkXBzxBdGVgYbH+8KtW/PhCsJHwDIE51HuSDFQ1lSr2m1NXhQg==} + engines: {node: '>= 16.0.0'} + + '@parcel/reporter-cli@2.0.0-canary.1779': + resolution: {integrity: sha512-NeVnlJgRXCaHOVttrP8Wja5be/FNgkXcAnEp3Z3yFGTzsWcSp5xTZRz4C1pe7KFJFT+01958ED72q8B7OTuJug==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/reporter-dev-server@2.0.0-canary.1779': + resolution: {integrity: sha512-Jk+ze98KecLc2SwCf21cCRYyk6m6uDeJcirkTjqBE2Ry4mCztNRNKYEVPfIeaEmNEymvIBWc1BKUPz1Kr4qyOg==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/reporter-tracer@2.13.4-canary.3402': + resolution: {integrity: sha512-mbd2rkcjTnNANg0Rd3dss3OU0BqyjmClFW+ZAUp13by6CG2iEcVM20zRQeIHF0hqrbLIw0H5DhZwABJCdS5ylg==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/resolver-default@2.0.0-canary.1779': + resolution: {integrity: sha512-uZImvm9V+W2AJ/FLxgiMm1d3QBAMW5sibZ/L0UK4h+RwvB7+yge4bL1y9ak00L590sWa05UaU5mp209/CHucgA==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/runtime-browser-hmr@2.0.0-canary.1779': + resolution: {integrity: sha512-dzldU4gRob2Q1wEYYdmsFnQjKo0QVV4crXMtxdfjgCVjHRZOWlDziegCfKiRiOmbprEGlCNI+W3ceHRSGaON1Q==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/runtime-js@2.0.0-canary.1779': + resolution: {integrity: sha512-PS7mmHPEsXgMPrBkxjTyO/tjKW/H7kv4nN1Nwow4Aof4/iF06t4Jbfl88nx7x3GLpOV8HPlqY1GLbwYRdLs2nA==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/runtime-rsc@2.13.4-canary.3402': + resolution: {integrity: sha512-sXr6V+lnrbWI4onmYjEmalAFRBckSEFbFDlCvubm+sWXalzxIP4yfSs/Q86Qq9IJTGlUMXkTafl2u7JZRg0qbA==} + engines: {node: '>= 12.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/runtime-service-worker@2.13.4-canary.3402': + resolution: {integrity: sha512-lwAZUFsL8fpm/ZhlDmmxUvyjbMXg0DIqxQEuvfjsO7zHpDBdr4Jlg8s0G0NXIWN8G60cr5kw97nN4ANDeD9XaA==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/rust@2.13.4-canary.3402': + resolution: {integrity: sha512-ghMDyBXOl+2FV8mHHzqeOTmkqT/GjpFRwR5eANhkxicR48j7oQUmslJS9NBb0NnYxLVcbleZbAXWB3+YcpVAyA==} + engines: {node: '>= 16.0.0'} + + '@parcel/source-map@2.1.1': + resolution: {integrity: sha512-Ejx1P/mj+kMjQb8/y5XxDUn4reGdr+WyKYloBljpppUy8gs42T+BNoEOuRYqDVdgPc6NxduzIDoJS9pOFfV5Ew==} + engines: {node: ^12.18.3 || >=14} + + '@parcel/transformer-babel@2.0.0-canary.1779': + resolution: {integrity: sha512-bDMVODv6ogXtaeGQ+S7Lq857nhXqSPfYfBQmK2AvczchcJxs9B52Y2MI4heKG0B+qNifzSHcvegJwO+rv8HOtA==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/transformer-css@2.0.0-canary.1779': + resolution: {integrity: sha512-22Y3XxPvo6ov+u5w/8+aoMCllJ6ApxoeSjbIyOvsmhYPZeHZbxIJ/2GtZJ4kaXrANCCUBwfV4B8mCTlsWe0GhA==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/transformer-html@2.0.0-canary.1779': + resolution: {integrity: sha512-jJ/75i0Ak+6nUu5L1YqCbLS/gBnaH86DXmCvfdxcjXlaQjaVzhbfRyHcGKqRsvM2zFO/7+7PGZ8cBFCbRAty9w==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/transformer-image@2.13.4-canary.3402': + resolution: {integrity: sha512-NpvRxaftesjov3iiykDNQxFInW9Ovpua5QgE6cBu+veM1PXZBzfacjyLaL+FEnGftSFoiGe0NP4MW8xNGZIdmw==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + peerDependencies: + '@parcel/core': ^2.0.0-canary.1777+d6a4df370 + + '@parcel/transformer-js@2.0.0-canary.1779': + resolution: {integrity: sha512-GSc6nVN511+Q0bCjWmucan43/9DJi6fKQEEqCIe2Fl/tG2i7R8gnf/ax0AJTDTHsIbULPDviVqUZVIrNyJilng==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + peerDependencies: + '@parcel/core': ^2.0.0-canary.1777+d6a4df370 + + '@parcel/transformer-json@2.0.0-canary.1779': + resolution: {integrity: sha512-eFpSC+AXIAaNq3/E5C/1PMfyA0XSnB/8nJwppXvdDFF72wB0mDCcdjDuvEoi91JlpRMoihSyA862mi+udb8q5Q==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/transformer-node@2.13.4-canary.3402': + resolution: {integrity: sha512-1xhaeJvWqbTtoz/r+rFIqz1OqfOn9ipH6vEb/ZumeWAc3DFaoNAcrZkqR3hlMnVRBbB1Ag4rPHSynqYROK0xnQ==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/transformer-postcss@2.0.0-canary.1779': + resolution: {integrity: sha512-dc1NT21zYDujhTNGJeTxhj06p3VnGxxfsqD0xhZNKcbRH+ER6mC6WDarQEZyMqj2xrCSdqrUm1EAsWrxwgzm+A==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/transformer-posthtml@2.0.0-canary.1779': + resolution: {integrity: sha512-9sdqH8N0bB0l0+u2uuLNTPPZth7L1m4kR+k+UujPlNjsApRzYrcwQTOGB4LgmF2BGtldzLIsm8s4Nfd/yuRGVw==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/transformer-raw@2.0.0-canary.1779': + resolution: {integrity: sha512-FyQXX3ya8b610BLM7R9/A07dbk3aXigHYgjue3BqUigYm/f4zVwyfwXt/Rmk4eJ0anCsVTrLse5dVfOu8YpVQg==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/transformer-react-refresh-wrap@2.0.0-canary.1779': + resolution: {integrity: sha512-fr92QZUitx1JhxNhSRYUkMu38NMwgYoN+X/ATHsJkbfwBb8AXtj7G0FJy6HmdjG5gPTqPvoBHRNXWTibCi8iUA==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/transformer-svg@2.13.4-canary.3402': + resolution: {integrity: sha512-50eQefPx9DZmtRq6AOy+GDxk0GDYWpRjba85AgrkptGZsYK/M1oM6vU8M64Vw8qfZG3kdHPvIBEhgcpDbyEdiw==} + engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + + '@parcel/types-internal@2.13.4-canary.3402': + resolution: {integrity: sha512-E6hvTwWEQJzE+EuzKtfhcXumVe8Slf0kCDq4K1tQrX5sWmyVCJ74X4+kI8FaCy1VaonTkNpTxbKLPO81EBv7KQ==} + + '@parcel/types@2.0.0-canary.1779': + resolution: {integrity: sha512-bJr5W5WbPoyBuCN/7tC+7bjS8wvJYlLdATorvXlFSygta0KwdvhY7HhGAwCYYaKBIkmr0d4/qPvthIle7qnwVA==} + + '@parcel/utils@2.0.0-canary.1779': + resolution: {integrity: sha512-RGJx5T7dji0A8ErgkM7un4iqHF+9SCrtx3VE/dv16b0HLbJyLgCeZWH7osNknA/U7GSs/VJODvgdsV1Y9ktK9g==} + engines: {node: '>= 16.0.0'} + + '@parcel/watcher-android-arm64@2.5.1': + resolution: {integrity: sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==} + engines: {node: '>= 10.0.0'} + cpu: [arm64] + os: [android] + + '@parcel/watcher-darwin-arm64@2.5.1': + resolution: {integrity: sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==} + engines: {node: '>= 10.0.0'} + cpu: [arm64] + os: [darwin] + + '@parcel/watcher-darwin-x64@2.5.1': + resolution: {integrity: sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==} + engines: {node: '>= 10.0.0'} + cpu: [x64] + os: [darwin] + + '@parcel/watcher-freebsd-x64@2.5.1': + resolution: {integrity: sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==} + engines: {node: '>= 10.0.0'} + cpu: [x64] + os: [freebsd] + + '@parcel/watcher-linux-arm-glibc@2.5.1': + resolution: {integrity: sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==} + engines: {node: '>= 10.0.0'} + cpu: [arm] + os: [linux] + + '@parcel/watcher-linux-arm-musl@2.5.1': + resolution: {integrity: sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==} + engines: {node: '>= 10.0.0'} + cpu: [arm] + os: [linux] + + '@parcel/watcher-linux-arm64-glibc@2.5.1': + resolution: {integrity: sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==} + engines: {node: '>= 10.0.0'} + cpu: [arm64] + os: [linux] + + '@parcel/watcher-linux-arm64-musl@2.5.1': + resolution: {integrity: sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==} + engines: {node: '>= 10.0.0'} + cpu: [arm64] + os: [linux] + + '@parcel/watcher-linux-x64-glibc@2.5.1': + resolution: {integrity: sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==} + engines: {node: '>= 10.0.0'} + cpu: [x64] + os: [linux] + + '@parcel/watcher-linux-x64-musl@2.5.1': + resolution: {integrity: sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==} + engines: {node: '>= 10.0.0'} + cpu: [x64] + os: [linux] + + '@parcel/watcher-win32-arm64@2.5.1': + resolution: {integrity: sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==} + engines: {node: '>= 10.0.0'} + cpu: [arm64] + os: [win32] + + '@parcel/watcher-win32-ia32@2.5.1': + resolution: {integrity: sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==} + engines: {node: '>= 10.0.0'} + cpu: [ia32] + os: [win32] + + '@parcel/watcher-win32-x64@2.5.1': + resolution: {integrity: sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==} + engines: {node: '>= 10.0.0'} + cpu: [x64] + os: [win32] + + '@parcel/watcher@2.5.1': + resolution: {integrity: sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==} + engines: {node: '>= 10.0.0'} + + '@parcel/workers@2.0.0-canary.1779': + resolution: {integrity: sha512-8SIZ/IX3AvHvf/6Ixd7ROdAvG2AxJSP0o2ooauEaG+caBkXo0694hKZjHF4q5lNcAqQQrTutqBG0fihiy+LrYA==} + engines: {node: '>= 16.0.0'} + peerDependencies: + '@parcel/core': ^2.0.0-canary.1777+d6a4df370 + '@pkgjs/parseargs@0.11.0': resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} @@ -3293,26 +3789,104 @@ packages: '@sinonjs/fake-timers@10.0.2': resolution: {integrity: sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==} - '@testing-library/dom@8.17.1': - resolution: {integrity: sha512-KnH2MnJUzmFNPW6RIKfd+zf2Wue8mEKX0M3cpX6aKl5ZXrJM1/c/Pc8c2xDNYQCnJO48Sm5ITbMXgqTr3h4jxQ==} - engines: {node: '>=12'} + '@swc/core-darwin-arm64@1.10.18': + resolution: {integrity: sha512-FdGqzAIKVQJu8ROlnHElP59XAUsUzCFSNsou+tY/9ba+lhu8R9v0OI5wXiPErrKGZpQFMmx/BPqqhx3X4SuGNg==} + engines: {node: '>=10'} + cpu: [arm64] + os: [darwin] - '@testing-library/jest-dom@5.17.0': - resolution: {integrity: sha512-ynmNeT7asXyH3aSVv4vvX4Rb+0qjOhdNHnO/3vuZNqPmhDpV/+rCSGwQ7bLcmU2cJ4dvoheIO85LQj0IbJHEtg==} - engines: {node: '>=8', npm: '>=6', yarn: '>=1'} + '@swc/core-darwin-x64@1.10.18': + resolution: {integrity: sha512-RZ73gZRituL/ZVLgrW6BYnQ5g8tuStG4cLUiPGJsUZpUm0ullSH6lHFvZTCBNFTfpQChG6eEhi2IdG6DwFp1lw==} + engines: {node: '>=10'} + cpu: [x64] + os: [darwin] - '@testing-library/react@13.4.0': - resolution: {integrity: sha512-sXOGON+WNTh3MLE9rve97ftaZukN3oNf2KjDy7YTx6hcTO2uuLHuCGynMDhFwGw/jYf4OJ2Qk0i4i79qMNNkyw==} - engines: {node: '>=12'} - peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + '@swc/core-linux-arm-gnueabihf@1.10.18': + resolution: {integrity: sha512-8iJqI3EkxJuuq21UHoen1VS+QlS23RvynRuk95K+Q2HBjygetztCGGEc+Xelx9a0uPkDaaAtFvds4JMDqb9SAA==} + engines: {node: '>=10'} + cpu: [arm] + os: [linux] - '@testing-library/user-event@14.5.2': - resolution: {integrity: sha512-YAh82Wh4TIrxYLmfGcixwD18oIjyC1pFQC2Y01F2lzV2HTMiYrI0nze0FD0ocB//CKS/7jIUgae+adPqxK5yCQ==} - engines: {node: '>=12', npm: '>=6'} - peerDependencies: - '@testing-library/dom': '>=7.21.4' + '@swc/core-linux-arm64-gnu@1.10.18': + resolution: {integrity: sha512-8f1kSktWzMB6PG+r8lOlCfXz5E8Qhsmfwonn77T/OfjvGwQaWrcoASh2cdjpk3dydbf8jsKGPQE1lSc7GyjXRQ==} + engines: {node: '>=10'} + cpu: [arm64] + os: [linux] + + '@swc/core-linux-arm64-musl@1.10.18': + resolution: {integrity: sha512-4rv+E4VLdgQw6zjbTAauCAEExxChvxMpBUMCiZweTNPKbJJ2dY6BX2WGJ1ea8+RcgqR/Xysj3AFbOz1LBz6dGA==} + engines: {node: '>=10'} + cpu: [arm64] + os: [linux] + + '@swc/core-linux-x64-gnu@1.10.18': + resolution: {integrity: sha512-vTNmyRBVP+sZca+vtwygYPGTNudTU6Gl6XhaZZ7cEUTBr8xvSTgEmYXoK/2uzyXpaTUI4Bmtp1x81cGN0mMoLQ==} + engines: {node: '>=10'} + cpu: [x64] + os: [linux] + + '@swc/core-linux-x64-musl@1.10.18': + resolution: {integrity: sha512-1TZPReKhFCeX776XaT6wegknfg+g3zODve+r4oslFHI+g7cInfWlxoGNDS3niPKyuafgCdOjme2g3OF+zzxfsQ==} + engines: {node: '>=10'} + cpu: [x64] + os: [linux] + + '@swc/core-win32-arm64-msvc@1.10.18': + resolution: {integrity: sha512-o/2CsaWSN3bkzVQ6DA+BiFKSVEYvhWGA1h+wnL2zWmIDs2Knag54sOEXZkCaf8YQyZesGeXJtPEy9hh/vjJgkA==} + engines: {node: '>=10'} + cpu: [arm64] + os: [win32] + + '@swc/core-win32-ia32-msvc@1.10.18': + resolution: {integrity: sha512-eTPASeJtk4mJDfWiYEiOC6OYUi/N7meHbNHcU8e+aKABonhXrIo/FmnTE8vsUtC6+jakT1TQBdiQ8fzJ1kJVwA==} + engines: {node: '>=10'} + cpu: [ia32] + os: [win32] + + '@swc/core-win32-x64-msvc@1.10.18': + resolution: {integrity: sha512-1Dud8CDBnc34wkBOboFBQud9YlV1bcIQtKSg7zC8LtwR3h+XAaCayZPkpGmmAlCv1DLQPvkF+s0JcaVC9mfffQ==} + engines: {node: '>=10'} + cpu: [x64] + os: [win32] + + '@swc/core@1.10.18': + resolution: {integrity: sha512-IUWKD6uQYGRy8w2X9EZrtYg1O3SCijlHbCXzMaHQYc1X7yjijQh4H3IVL9ssZZyVp2ZDfQZu4bD5DWxxvpyjvg==} + engines: {node: '>=10'} + peerDependencies: + '@swc/helpers': '*' + peerDependenciesMeta: + '@swc/helpers': + optional: true + + '@swc/counter@0.1.3': + resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==} + + '@swc/helpers@0.5.15': + resolution: {integrity: sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==} + + '@swc/types@0.1.17': + resolution: {integrity: sha512-V5gRru+aD8YVyCOMAjMpWR1Ui577DD5KSJsHP8RAxopAH22jFz6GZd/qxqjO6MJHQhcsjvjOFXyDhyLQUnMveQ==} + + '@testing-library/dom@8.17.1': + resolution: {integrity: sha512-KnH2MnJUzmFNPW6RIKfd+zf2Wue8mEKX0M3cpX6aKl5ZXrJM1/c/Pc8c2xDNYQCnJO48Sm5ITbMXgqTr3h4jxQ==} + engines: {node: '>=12'} + + '@testing-library/jest-dom@5.17.0': + resolution: {integrity: sha512-ynmNeT7asXyH3aSVv4vvX4Rb+0qjOhdNHnO/3vuZNqPmhDpV/+rCSGwQ7bLcmU2cJ4dvoheIO85LQj0IbJHEtg==} + engines: {node: '>=8', npm: '>=6', yarn: '>=1'} + + '@testing-library/react@13.4.0': + resolution: {integrity: sha512-sXOGON+WNTh3MLE9rve97ftaZukN3oNf2KjDy7YTx6hcTO2uuLHuCGynMDhFwGw/jYf4OJ2Qk0i4i79qMNNkyw==} + engines: {node: '>=12'} + peerDependencies: + react: 0.0.0-experimental-93b58361-20250209 + react-dom: 0.0.0-experimental-93b58361-20250209 + + '@testing-library/user-event@14.5.2': + resolution: {integrity: sha512-YAh82Wh4TIrxYLmfGcixwD18oIjyC1pFQC2Y01F2lzV2HTMiYrI0nze0FD0ocB//CKS/7jIUgae+adPqxK5yCQ==} + engines: {node: '>=12', npm: '>=6'} + peerDependencies: + '@testing-library/dom': '>=7.21.4' '@tootallnate/once@2.0.0': resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==} @@ -3378,9 +3952,15 @@ packages: '@types/express-serve-static-core@4.17.43': resolution: {integrity: sha512-oaYtiBirUOPQGSWNGPWnzyAFJ0BP3cwvN4oWZQY+zUBwpVIGsKUkpBpSztp74drYcjavs7SKFZ4DX1V2QeN8rg==} + '@types/express-serve-static-core@5.0.6': + resolution: {integrity: sha512-3xhRnjJPkULekpSzgtoNYYcTWgEZkp4myc+Saevii5JPnHNvHMRlBSHDbs7Bh1iPPoVTERHEZXyhyLbMEsExsA==} + '@types/express@4.17.21': resolution: {integrity: sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==} + '@types/express@5.0.0': + resolution: {integrity: sha512-DvZriSMehGHL1ZNLzi6MidnsDhUZM/x2pRdDIKdwbUNqqwHxMlRdkxtn6/EPKyqKpHqTl/4nRZsRNLpZxZRpPQ==} + '@types/fs-extra@8.1.2': resolution: {integrity: sha512-SvSrYXfWSc7R4eqnOzbQF4TZmfpNSM9FrSWLU3EUnWBuyZqNBOrv1B1JA3byUDPUl9z4Ab3jeZG2eDdySlgNMg==} @@ -3480,12 +4060,18 @@ packages: '@types/node@20.11.30': resolution: {integrity: sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==} + '@types/node@22.13.4': + resolution: {integrity: sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==} + '@types/normalize-package-data@2.4.1': resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==} '@types/npmcli__package-json@4.0.4': resolution: {integrity: sha512-6QjlFUSHBmZJWuC08bz1ZCx6tm4t+7+OJXAdvM6tL2pI7n6Bh5SIp/YxQvnOLFf8MzCXs2ijyFgrzaiu1UFBGA==} + '@types/parcel-env@0.0.8': + resolution: {integrity: sha512-6Sa7yWgEPn6jxv1A4AdEMUTAth909LMjJhMfQOp3icwA3fVHZo1wPY+tQTWE/tZvomSa2M82V05pdk1CW8T7Xw==} + '@types/parse-json@4.0.2': resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==} @@ -3774,6 +4360,11 @@ packages: resolution: {integrity: sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==} engines: {node: '>=12'} + ansi-html-community@0.0.8: + resolution: {integrity: sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==} + engines: {'0': node >= 0.8.0} + hasBin: true + ansi-regex@5.0.1: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} @@ -3986,6 +4577,9 @@ packages: resolution: {integrity: sha512-vjtV3hiLqYDNRoiAv0zC4QaGAMPomEoq83PRmYIofPswwZurCeWR5LByXm7SyoL0Zh5+2z0+HC7jG8gSZJUh0w==} engines: {node: '>= 16'} + base-x@3.0.10: + resolution: {integrity: sha512-7d0s06rR9rYaIWHkpfLIFICM/tkSVdoPC9qYAQRpxn9DdKNWNsKC0uk++akckyLq16Tx2WIinnZ6WRriAt6njQ==} + base64-js@1.5.1: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} @@ -4018,6 +4612,10 @@ packages: resolution: {integrity: sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==} engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} + body-parser@1.20.3: + resolution: {integrity: sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==} + engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} + boolbase@1.0.0: resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==} @@ -4158,6 +4756,10 @@ packages: chownr@1.1.4: resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} + chrome-trace-event@1.0.4: + resolution: {integrity: sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==} + engines: {node: '>=6.0'} + ci-info@3.8.0: resolution: {integrity: sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==} engines: {node: '>=8'} @@ -4196,6 +4798,10 @@ packages: resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==} engines: {node: '>=0.8'} + clone@2.1.2: + resolution: {integrity: sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==} + engines: {node: '>=0.8'} + co@4.6.0: resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==} engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'} @@ -4226,6 +4832,10 @@ packages: comma-separated-tokens@2.0.3: resolution: {integrity: sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==} + commander@12.1.0: + resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==} + engines: {node: '>=18'} + commander@2.20.3: resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} @@ -4287,6 +4897,10 @@ packages: resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==} engines: {node: '>= 0.6'} + cookie@0.7.1: + resolution: {integrity: sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==} + engines: {node: '>= 0.6'} + cookie@1.0.1: resolution: {integrity: sha512-Xd8lFX4LM9QEEwxQpF9J9NTUh8pmdJO0cyRJhFiDoLTk2eH8FXlRv2IFGYVadZpqI3j8fhNrSdKCeYPxiAhLXw==} engines: {node: '>=18'} @@ -4304,6 +4918,15 @@ packages: resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==} engines: {node: '>=10'} + cosmiconfig@9.0.0: + resolution: {integrity: sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==} + engines: {node: '>=14'} + peerDependencies: + typescript: '>=4.9.5' + peerDependenciesMeta: + typescript: + optional: true + create-jest@29.7.0: resolution: {integrity: sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} @@ -4514,6 +5137,15 @@ packages: resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==} engines: {node: '>=8'} + detect-libc@1.0.3: + resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==} + engines: {node: '>=0.10'} + hasBin: true + + detect-libc@2.0.3: + resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==} + engines: {node: '>=8'} + detect-newline@3.1.0: resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==} engines: {node: '>=8'} @@ -4553,6 +5185,9 @@ packages: dom-accessibility-api@0.5.14: resolution: {integrity: sha512-NMt+m9zFMPZe0JcY9gN224Qvk6qLIdqex29clBvc/y75ZBX9YA9wNK3frsYvu2DI1xcCIwxwnX+TlsJ2DSOADg==} + dom-serializer@1.4.1: + resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==} + dom-serializer@2.0.0: resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==} @@ -4564,13 +5199,24 @@ packages: engines: {node: '>=12'} deprecated: Use your platform's native DOMException instead + domhandler@4.3.1: + resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==} + engines: {node: '>= 4'} + domhandler@5.0.3: resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==} engines: {node: '>= 4'} + domutils@2.8.0: + resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==} + domutils@3.1.0: resolution: {integrity: sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==} + dotenv-expand@11.0.7: + resolution: {integrity: sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==} + engines: {node: '>=12'} + dotenv-json@1.0.0: resolution: {integrity: sha512-jAssr+6r4nKhKRudQ0HOzMskOFFi9+ubXWwmrSGJFgTvpjyPXCXsCsYbjif6mXp7uxA7xY3/LGaiTQukZzSbOQ==} @@ -4608,6 +5254,10 @@ packages: resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} engines: {node: '>= 0.8'} + encodeurl@2.0.0: + resolution: {integrity: sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==} + engines: {node: '>= 0.8'} + encoding-sniffer@0.2.0: resolution: {integrity: sha512-ju7Wq1kg04I3HtiYIOrUrdfdDvkyO9s5XM8QAj/bN61Yo/Vb4vgJxy5vi4Yxk01gWHbrofpPtpxM8bKger9jhg==} @@ -4618,10 +5268,21 @@ packages: resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==} engines: {node: '>=8.6'} + entities@2.2.0: + resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==} + + entities@3.0.1: + resolution: {integrity: sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==} + engines: {node: '>=0.12'} + entities@4.5.0: resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} engines: {node: '>=0.12'} + env-paths@2.2.1: + resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==} + engines: {node: '>=6'} + err-code@2.0.3: resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==} @@ -4939,6 +5600,10 @@ packages: resolution: {integrity: sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==} engines: {node: '>= 0.10.0'} + express@4.21.2: + resolution: {integrity: sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==} + engines: {node: '>= 0.10.0'} + extend@3.0.2: resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==} @@ -4999,6 +5664,10 @@ packages: resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==} engines: {node: '>= 0.8'} + finalhandler@1.3.1: + resolution: {integrity: sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==} + engines: {node: '>= 0.8'} + find-up@4.1.0: resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==} engines: {node: '>=8'} @@ -5106,6 +5775,10 @@ packages: resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==} engines: {node: '>=8.0.0'} + get-port@4.2.0: + resolution: {integrity: sha512-/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw==} + engines: {node: '>=6'} + get-port@5.1.1: resolution: {integrity: sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==} engines: {node: '>=8'} @@ -5274,6 +5947,38 @@ packages: html-void-elements@3.0.0: resolution: {integrity: sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==} + htmlnano@2.1.1: + resolution: {integrity: sha512-kAERyg/LuNZYmdqgCdYvugyLWNFAm8MWXpQMz1pLpetmCbFwoMxvkSoaAMlFrOC4OKTWI4KlZGT/RsNxg4ghOw==} + peerDependencies: + cssnano: ^7.0.0 + postcss: ^8.3.11 + purgecss: ^6.0.0 + relateurl: ^0.2.7 + srcset: 5.0.1 + svgo: ^3.0.2 + terser: ^5.10.0 + uncss: ^0.17.3 + peerDependenciesMeta: + cssnano: + optional: true + postcss: + optional: true + purgecss: + optional: true + relateurl: + optional: true + srcset: + optional: true + svgo: + optional: true + terser: + optional: true + uncss: + optional: true + + htmlparser2@7.2.0: + resolution: {integrity: sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==} + htmlparser2@9.1.0: resolution: {integrity: sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==} @@ -5468,6 +6173,9 @@ packages: resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==} engines: {node: '>=8'} + is-json@2.0.1: + resolution: {integrity: sha512-6BEnpVn1rcf3ngfmViLM6vjUjGErbdrL4rwlv+u1NO1XO8kqT4YGL8+19Q+Z/bas8tY90BTWMk2+fW1g6hQjbA==} + is-map@2.0.3: resolution: {integrity: sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==} engines: {node: '>= 0.4'} @@ -5894,6 +6602,70 @@ packages: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} engines: {node: '>= 0.8.0'} + lightningcss-darwin-arm64@1.29.1: + resolution: {integrity: sha512-HtR5XJ5A0lvCqYAoSv2QdZZyoHNttBpa5EP9aNuzBQeKGfbyH5+UipLWvVzpP4Uml5ej4BYs5I9Lco9u1fECqw==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [darwin] + + lightningcss-darwin-x64@1.29.1: + resolution: {integrity: sha512-k33G9IzKUpHy/J/3+9MCO4e+PzaFblsgBjSGlpAaFikeBFm8B/CkO3cKU9oI4g+fjS2KlkLM/Bza9K/aw8wsNA==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [darwin] + + lightningcss-freebsd-x64@1.29.1: + resolution: {integrity: sha512-0SUW22fv/8kln2LnIdOCmSuXnxgxVC276W5KLTwoehiO0hxkacBxjHOL5EtHD8BAXg2BvuhsJPmVMasvby3LiQ==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [freebsd] + + lightningcss-linux-arm-gnueabihf@1.29.1: + resolution: {integrity: sha512-sD32pFvlR0kDlqsOZmYqH/68SqUMPNj+0pucGxToXZi4XZgZmqeX/NkxNKCPsswAXU3UeYgDSpGhu05eAufjDg==} + engines: {node: '>= 12.0.0'} + cpu: [arm] + os: [linux] + + lightningcss-linux-arm64-gnu@1.29.1: + resolution: {integrity: sha512-0+vClRIZ6mmJl/dxGuRsE197o1HDEeeRk6nzycSy2GofC2JsY4ifCRnvUWf/CUBQmlrvMzt6SMQNMSEu22csWQ==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [linux] + + lightningcss-linux-arm64-musl@1.29.1: + resolution: {integrity: sha512-UKMFrG4rL/uHNgelBsDwJcBqVpzNJbzsKkbI3Ja5fg00sgQnHw/VrzUTEc4jhZ+AN2BvQYz/tkHu4vt1kLuJyw==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [linux] + + lightningcss-linux-x64-gnu@1.29.1: + resolution: {integrity: sha512-u1S+xdODy/eEtjADqirA774y3jLcm8RPtYztwReEXoZKdzgsHYPl0s5V52Tst+GKzqjebkULT86XMSxejzfISw==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [linux] + + lightningcss-linux-x64-musl@1.29.1: + resolution: {integrity: sha512-L0Tx0DtaNUTzXv0lbGCLB/c/qEADanHbu4QdcNOXLIe1i8i22rZRpbT3gpWYsCh9aSL9zFujY/WmEXIatWvXbw==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [linux] + + lightningcss-win32-arm64-msvc@1.29.1: + resolution: {integrity: sha512-QoOVnkIEFfbW4xPi+dpdft/zAKmgLgsRHfJalEPYuJDOWf7cLQzYg0DEh8/sn737FaeMJxHZRc1oBreiwZCjog==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [win32] + + lightningcss-win32-x64-msvc@1.29.1: + resolution: {integrity: sha512-NygcbThNBe4JElP+olyTI/doBNGJvLs3bFCRPdvuCcxZCcCZ71B858IHpdm7L1btZex0FvCmM17FK98Y9MRy1Q==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [win32] + + lightningcss@1.29.1: + resolution: {integrity: sha512-FmGoeD4S05ewj+AkhTY+D+myDvXI6eL27FjHIjoyUkO/uw7WZD1fBVs0QxeYWa7E17CUHJaYX/RUGISCtcrG4Q==} + engines: {node: '>= 12.0.0'} + lilconfig@2.1.0: resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==} engines: {node: '>=10'} @@ -5908,6 +6680,10 @@ packages: linkify-it@5.0.0: resolution: {integrity: sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==} + lmdb@2.8.5: + resolution: {integrity: sha512-9bMdFfc80S+vSldBmG3HOuLVHnxRdNTlpzR6QDnzqCQtCzGUEAGTzBKYMeIM+I/sU4oZfgbcbS7X7F65/z/oxQ==} + hasBin: true + load-json-file@4.0.0: resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==} engines: {node: '>=4'} @@ -6380,6 +7156,13 @@ packages: ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} + msgpackr-extract@3.0.3: + resolution: {integrity: sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==} + hasBin: true + + msgpackr@1.11.2: + resolution: {integrity: sha512-F9UngXRlPyWCDEASDpTf6c9uNhGPTqnTeLVt7bN+bU1eajoR/8V9ys2BRaV5C/e5ihE6sJ9uPIKaYt6bFuO32g==} + msw@1.3.5: resolution: {integrity: sha512-nG3fpmBXxFbKSIdk6miPuL3KjU6WMxgoW4tG1YgnP1M+TRG3Qn7b7R0euKAHq4vpwARHb18ZyfZljSxsTnMX2w==} engines: {node: '>=14'} @@ -6422,6 +7205,12 @@ packages: nice-try@1.0.5: resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==} + node-addon-api@6.1.0: + resolution: {integrity: sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==} + + node-addon-api@7.1.1: + resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==} + node-fetch-native@1.6.4: resolution: {integrity: sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ==} @@ -6438,6 +7227,14 @@ packages: resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==} engines: {node: '>= 6.13.0'} + node-gyp-build-optional-packages@5.1.1: + resolution: {integrity: sha512-+P72GAjVAbTxjjwUmwjVrqrdZROD4nf8KgpBoDxqXXTiYZZt/ud60dE5yvCSr9lRO8e8yv6kgJIC0K0PfZFVQw==} + hasBin: true + + node-gyp-build-optional-packages@5.2.2: + resolution: {integrity: sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==} + hasBin: true + node-int64@0.4.0: resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==} @@ -6491,6 +7288,9 @@ packages: nth-check@2.1.1: resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==} + nullthrows@1.1.1: + resolution: {integrity: sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==} + nwsapi@2.2.4: resolution: {integrity: sha512-NHj4rzRo0tQdijE9ZqAx6kYDcoRwYwSYzCA8MY3JzfxlrvEU0jhnhJT9BhqhJs7I/dKcrDm6TyulaRqZPIhN5g==} @@ -6563,6 +7363,9 @@ packages: resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==} engines: {node: '>=10'} + ordered-binary@1.5.3: + resolution: {integrity: sha512-oGFr3T+pYdTGJ+YFEILMpS3es+GiIbs9h/XQrclBXUtd44ey7XwfsMzM31f64I1SQOawDoDr/D823kNCADI8TA==} + os-tmpdir@1.0.2: resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==} engines: {node: '>=0.10.0'} @@ -6618,6 +7421,11 @@ packages: pako@0.2.9: resolution: {integrity: sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==} + parcel@2.0.0-canary.1777: + resolution: {integrity: sha512-PdgoJ84CcpN4ZCa/E6YsrEQ+A4ft9RVgK/UQeuUUuEDy4kU/iHMoi7FOlTmNH+HYlWvbEuRL+RM41n6sPzHwaQ==} + engines: {node: '>= 16.0.0'} + hasBin: true + parent-module@1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} engines: {node: '>=6'} @@ -6673,6 +7481,9 @@ packages: resolution: {integrity: sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==} engines: {node: 20 || >=22} + path-to-regexp@0.1.12: + resolution: {integrity: sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==} + path-to-regexp@0.1.7: resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==} @@ -6808,6 +7619,22 @@ packages: resolution: {integrity: sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==} engines: {node: ^10 || ^12 || >=14} + posthtml-parser@0.11.0: + resolution: {integrity: sha512-QecJtfLekJbWVo/dMAA+OSwY79wpRmbqS5TeXvXSX+f0c6pW4/SE6inzZ2qkU7oAMCPqIDkZDvd/bQsSFUnKyw==} + engines: {node: '>=12'} + + posthtml-parser@0.12.1: + resolution: {integrity: sha512-rYFmsDLfYm+4Ts2Oh4DCDSZPtdC1BLnRXAobypVzX9alj28KGl65dIFtgDY9zB57D0TC4Qxqrawuq/2et1P0GA==} + engines: {node: '>=16'} + + posthtml-render@3.0.0: + resolution: {integrity: sha512-z+16RoxK3fUPgwaIgH9NGnK1HKY9XIDpydky5eQGgAFVXTCSezalv9U2jQuNV+Z9qV1fDWNzldcw4eK0SSbqKA==} + engines: {node: '>=12'} + + posthtml@0.16.6: + resolution: {integrity: sha512-JcEmHlyLK/o0uGAlj65vgg+7LIms0xKXe60lcDOTU7oVX/3LuEuLwrQpW3VJ7de5TaFKiW4kWkaIpJL42FEgxQ==} + engines: {node: '>=12.0.0'} + preferred-pm@3.0.3: resolution: {integrity: sha512-+wZgbxNES/KlJs9q40F/1sfOd/j7f1O9JaHcW5Dsn3aUUOZg3L2bjpVUcKV2jvtElYfoTuQiNeMfQJ4kwUAhCQ==} engines: {node: '>=10'} @@ -6909,6 +7736,10 @@ packages: resolution: {integrity: sha512-trVZiI6RMOkO476zLGaBIzszOdFPnCCXHPG9kn0yuS1uz6xdVxPfZdB3vUig9pxPFDM9BRAgz/YUIVQ1/vuiUg==} engines: {node: '>=0.6'} + qs@6.13.0: + resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==} + engines: {node: '>=0.6'} + querystringify@2.2.0: resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==} @@ -6934,10 +7765,10 @@ packages: resolution: {integrity: sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==} engines: {node: '>= 0.8'} - react-dom@18.2.0: - resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==} + react-dom@0.0.0-experimental-93b58361-20250209: + resolution: {integrity: sha512-6DCQYyF220WyHjR3sbcoDkWlXf+2IEwPWoAAB+k328c+ETElboMP5e5FUVwAorpK6UaWgKuqeXbm7B3NLIixTQ==} peerDependencies: - react: ^18.2.0 + react: 0.0.0-experimental-93b58361-20250209 react-is@16.13.1: resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==} @@ -6952,18 +7783,35 @@ packages: resolution: {integrity: sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==} engines: {node: '>=0.10.0'} + react-router@0.0.0-experimental-1ebb6d403: + resolution: {integrity: sha512-GqXmiGT94oWp/w5JjQO5e5dFBSu3qiOrBfwf9YkfpRitJ/RiXgAOuHciRpy8DBBpKxyvrH5Mf28QugqL+wxDBg==} + engines: {node: '>=20.0.0'} + peerDependencies: + react: 0.0.0-experimental-93b58361-20250209 + react-dom: 0.0.0-experimental-93b58361-20250209 + peerDependenciesMeta: + react-dom: + optional: true + + react-server-dom-parcel@0.0.0-experimental-93b58361-20250209: + resolution: {integrity: sha512-ASAqPoho6m+5fb9SuJY8hcA7Il9QV72og4ZhA8Q3SYM8yZnE1PxvUpt84cipNg0RmmT6BiRX1FpbxhtfhPCyGQ==} + engines: {node: '>=0.10.0'} + peerDependencies: + react: 0.0.0-experimental-93b58361-20250209 + react-dom: 0.0.0-experimental-93b58361-20250209 + react-shallow-renderer@16.15.0: resolution: {integrity: sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA==} peerDependencies: - react: ^16.0.0 || ^17.0.0 || ^18.0.0 + react: 0.0.0-experimental-93b58361-20250209 react-test-renderer@18.2.0: resolution: {integrity: sha512-JWD+aQ0lh2gvh4NM3bBM42Kx+XybOxCpgYK7F8ugAlpaTSnWsX+39Z4XkOykGZAHrjwwTZT3x3KxswVWxHPUqA==} peerDependencies: - react: ^18.2.0 + react: 0.0.0-experimental-93b58361-20250209 - react@18.2.0: - resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==} + react@0.0.0-experimental-93b58361-20250209: + resolution: {integrity: sha512-/XlQy7qjc/uVVhsqtty/kO7ZONu0fOFGPgN55HosxJTkiqm1KThznjYk6QKT6xowLEE8elrQ2qFePQ2M2t5oGQ==} engines: {node: '>=0.10.0'} read-cache@1.0.0: @@ -7146,6 +7994,9 @@ packages: rrweb-cssom@0.6.0: resolution: {integrity: sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==} + rsc-html-stream@0.0.4: + resolution: {integrity: sha512-1isiXIrlTI/vRLTvS3O4fMrO9qIHje1FSphufrIV5QfzHUgBDCZFwP9b8+rH63nbhxtcKTqfyziwM+2khfX0Uw==} + run-async@2.4.1: resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==} engines: {node: '>=0.12.0'} @@ -7184,6 +8035,9 @@ packages: resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==} engines: {node: '>=v12.22.7'} + scheduler@0.0.0-experimental-93b58361-20250209: + resolution: {integrity: sha512-/jHVwrXds2Amuht81tUvUBZsziu1rzbtd1TYnDWmFU+tHWeRGOw88DjGcUrWRGJem63nDzVZwl0wY+flJXj6JQ==} + scheduler@0.23.0: resolution: {integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==} @@ -7208,6 +8062,10 @@ packages: resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==} engines: {node: '>= 0.8.0'} + send@0.19.0: + resolution: {integrity: sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==} + engines: {node: '>= 0.8.0'} + serialize-javascript@6.0.2: resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==} @@ -7215,6 +8073,10 @@ packages: resolution: {integrity: sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==} engines: {node: '>= 0.8.0'} + serve-static@1.16.2: + resolution: {integrity: sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==} + engines: {node: '>= 0.8.0'} + set-blocking@2.0.0: resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==} @@ -7359,6 +8221,10 @@ packages: sprintf-js@1.1.3: resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==} + srcset@4.0.0: + resolution: {integrity: sha512-wvLeHgcVHKO8Sc/H/5lkGreJQVeYMm9rlmt8PuR1xE31rIuXhuzznUUqAt8MqLhB3MqJdFzlNAfpcWnxiFUcPw==} + engines: {node: '>=12'} + stack-utils@2.0.6: resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==} engines: {node: '>=10'} @@ -7537,6 +8403,9 @@ packages: through@2.3.8: resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} + timsort@0.3.0: + resolution: {integrity: sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==} + tiny-invariant@1.3.3: resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==} @@ -7619,6 +8488,9 @@ packages: tslib@2.6.2: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} + tslib@2.8.1: + resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} + tsscmp@1.0.6: resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==} engines: {node: '>=0.6.x'} @@ -7744,6 +8616,9 @@ packages: undici-types@5.26.5: resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} + undici-types@6.20.0: + resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==} + undici@5.28.4: resolution: {integrity: sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==} engines: {node: '>=14.0'} @@ -7850,6 +8725,10 @@ packages: util@0.12.5: resolution: {integrity: sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==} + utility-types@3.11.0: + resolution: {integrity: sha512-6Z7Ma2aVEWisaL6TvBCy7P8rm2LQoPv6dJ7ecIaIixHcwfbJ0x7mWdbcwlIM5IGQxPZSFYeqRCqlOOeKoJYMkw==} + engines: {node: '>= 4'} + utils-merge@1.0.1: resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==} engines: {node: '>= 0.4.0'} @@ -8012,6 +8891,9 @@ packages: wcwidth@1.0.1: resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} + weak-lru-cache@1.2.2: + resolution: {integrity: sha512-DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw==} + web-encoding@1.1.5: resolution: {integrity: sha512-HYLeVCdJ0+lBYV2FvNZmv3HJ2Nt0QYXqZojk3d9FJOLkwnuhzM9tmamh8d7HPM8QqjKH8DeHkFTx+CFlWpZZDA==} @@ -9107,6 +9989,41 @@ snapshots: '@bcoe/v8-coverage@0.2.3': {} + '@biomejs/biome@1.9.4': + optionalDependencies: + '@biomejs/cli-darwin-arm64': 1.9.4 + '@biomejs/cli-darwin-x64': 1.9.4 + '@biomejs/cli-linux-arm64': 1.9.4 + '@biomejs/cli-linux-arm64-musl': 1.9.4 + '@biomejs/cli-linux-x64': 1.9.4 + '@biomejs/cli-linux-x64-musl': 1.9.4 + '@biomejs/cli-win32-arm64': 1.9.4 + '@biomejs/cli-win32-x64': 1.9.4 + + '@biomejs/cli-darwin-arm64@1.9.4': + optional: true + + '@biomejs/cli-darwin-x64@1.9.4': + optional: true + + '@biomejs/cli-linux-arm64-musl@1.9.4': + optional: true + + '@biomejs/cli-linux-arm64@1.9.4': + optional: true + + '@biomejs/cli-linux-x64-musl@1.9.4': + optional: true + + '@biomejs/cli-linux-x64@1.9.4': + optional: true + + '@biomejs/cli-win32-arm64@1.9.4': + optional: true + + '@biomejs/cli-win32-x64@1.9.4': + optional: true + '@changesets/apply-release-plan@6.1.4': dependencies: '@babel/runtime': 7.24.1 @@ -9908,6 +10825,30 @@ snapshots: '@jridgewell/resolve-uri': 3.1.0 '@jridgewell/sourcemap-codec': 1.4.15 + '@lezer/common@1.2.3': {} + + '@lezer/lr@1.4.2': + dependencies: + '@lezer/common': 1.2.3 + + '@lmdb/lmdb-darwin-arm64@2.8.5': + optional: true + + '@lmdb/lmdb-darwin-x64@2.8.5': + optional: true + + '@lmdb/lmdb-linux-arm64@2.8.5': + optional: true + + '@lmdb/lmdb-linux-arm@2.8.5': + optional: true + + '@lmdb/lmdb-linux-x64@2.8.5': + optional: true + + '@lmdb/lmdb-win32-x64@2.8.5': + optional: true + '@manypkg/find-root@1.1.0': dependencies: '@babel/runtime': 7.24.1 @@ -9962,8 +10903,34 @@ snapshots: transitivePeerDependencies: - supports-color + '@mischnic/json-sourcemap@0.1.1': + dependencies: + '@lezer/common': 1.2.3 + '@lezer/lr': 1.4.2 + json5: 2.2.3 + '@mjackson/node-fetch-server@0.2.0': {} + '@mjackson/node-fetch-server@0.6.1': {} + + '@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.3': + optional: true + + '@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.3': + optional: true + + '@msgpackr-extract/msgpackr-extract-linux-arm64@3.0.3': + optional: true + + '@msgpackr-extract/msgpackr-extract-linux-arm@3.0.3': + optional: true + + '@msgpackr-extract/msgpackr-extract-linux-x64@3.0.3': + optional: true + + '@msgpackr-extract/msgpackr-extract-win32-x64@3.0.3': + optional: true + '@mswjs/cookies@0.2.2': dependencies: '@types/set-cookie-parser': 2.4.7 @@ -10162,6 +11129,612 @@ snapshots: '@open-draft/until@1.0.3': {} + '@parcel/bundler-default@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/graph': 3.3.4-canary.3402 + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/rust': 2.13.4-canary.3402 + '@parcel/utils': 2.0.0-canary.1779 + nullthrows: 1.1.1 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/cache@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/core': 2.0.0-canary.1777(@swc/helpers@0.5.15) + '@parcel/fs': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/logger': 2.0.0-canary.1779 + '@parcel/utils': 2.0.0-canary.1779 + lmdb: 2.8.5 + + '@parcel/codeframe@2.0.0-canary.1779': + dependencies: + chalk: 4.1.2 + + '@parcel/compressor-raw@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/config-default@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)(postcss@8.4.49)(terser@5.15.0)(typescript@5.4.5)': + dependencies: + '@parcel/bundler-default': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/compressor-raw': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/core': 2.0.0-canary.1777(@swc/helpers@0.5.15) + '@parcel/namer-default': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/optimizer-css': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/optimizer-htmlnano': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(postcss@8.4.49)(terser@5.15.0)(typescript@5.4.5) + '@parcel/optimizer-image': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/optimizer-svgo': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/optimizer-swc': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) + '@parcel/packager-css': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/packager-html': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/packager-js': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/packager-raw': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/packager-svg': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/packager-wasm': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/reporter-dev-server': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/resolver-default': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/runtime-browser-hmr': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/runtime-js': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/runtime-rsc': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/runtime-service-worker': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/transformer-babel': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/transformer-css': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/transformer-html': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/transformer-image': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/transformer-js': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/transformer-json': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/transformer-node': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/transformer-postcss': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/transformer-posthtml': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/transformer-raw': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/transformer-react-refresh-wrap': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/transformer-svg': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + transitivePeerDependencies: + - '@swc/helpers' + - cssnano + - postcss + - purgecss + - relateurl + - srcset + - svgo + - terser + - typescript + - uncss + + '@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)': + dependencies: + '@mischnic/json-sourcemap': 0.1.1 + '@parcel/cache': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/events': 2.0.0-canary.1779 + '@parcel/feature-flags': 2.13.4-canary.3402 + '@parcel/fs': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/graph': 3.3.4-canary.3402 + '@parcel/logger': 2.0.0-canary.1779 + '@parcel/package-manager': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/profiler': 2.13.4-canary.3402 + '@parcel/rust': 2.13.4-canary.3402 + '@parcel/source-map': 2.1.1 + '@parcel/types': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/utils': 2.0.0-canary.1779 + '@parcel/workers': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + base-x: 3.0.10 + browserslist: 4.23.0 + clone: 2.1.2 + dotenv: 16.4.5 + dotenv-expand: 11.0.7 + json5: 2.2.3 + msgpackr: 1.11.2 + nullthrows: 1.1.1 + semver: 7.5.4 + transitivePeerDependencies: + - '@swc/helpers' + + '@parcel/diagnostic@2.0.0-canary.1779': + dependencies: + '@mischnic/json-sourcemap': 0.1.1 + nullthrows: 1.1.1 + + '@parcel/error-overlay@2.13.4-canary.3402': + dependencies: + ansi-html-community: 0.0.8 + react: 0.0.0-experimental-93b58361-20250209 + react-dom: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) + + '@parcel/events@2.0.0-canary.1779': {} + + '@parcel/feature-flags@2.13.4-canary.3402': {} + + '@parcel/fs@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/core': 2.0.0-canary.1777(@swc/helpers@0.5.15) + '@parcel/feature-flags': 2.13.4-canary.3402 + '@parcel/rust': 2.13.4-canary.3402 + '@parcel/types-internal': 2.13.4-canary.3402 + '@parcel/utils': 2.0.0-canary.1779 + '@parcel/watcher': 2.5.1 + '@parcel/workers': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + + '@parcel/graph@3.3.4-canary.3402': + dependencies: + '@parcel/feature-flags': 2.13.4-canary.3402 + nullthrows: 1.1.1 + + '@parcel/logger@2.0.0-canary.1779': + dependencies: + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/events': 2.0.0-canary.1779 + + '@parcel/markdown-ansi@2.0.0-canary.1779': + dependencies: + chalk: 4.1.2 + + '@parcel/namer-default@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + nullthrows: 1.1.1 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/node-resolver-core@3.4.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@mischnic/json-sourcemap': 0.1.1 + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/fs': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/rust': 2.13.4-canary.3402 + '@parcel/utils': 2.0.0-canary.1779 + nullthrows: 1.1.1 + semver: 7.5.4 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/optimizer-css@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/source-map': 2.1.1 + '@parcel/utils': 2.0.0-canary.1779 + browserslist: 4.23.0 + lightningcss: 1.29.1 + nullthrows: 1.1.1 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/optimizer-htmlnano@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(postcss@8.4.49)(terser@5.15.0)(typescript@5.4.5)': + dependencies: + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/utils': 2.0.0-canary.1779 + htmlnano: 2.1.1(postcss@8.4.49)(terser@5.15.0)(typescript@5.4.5) + nullthrows: 1.1.1 + posthtml: 0.16.6 + transitivePeerDependencies: + - '@parcel/core' + - cssnano + - postcss + - purgecss + - relateurl + - srcset + - svgo + - terser + - typescript + - uncss + + '@parcel/optimizer-image@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/core': 2.0.0-canary.1777(@swc/helpers@0.5.15) + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/rust': 2.13.4-canary.3402 + '@parcel/utils': 2.0.0-canary.1779 + '@parcel/workers': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + + '@parcel/optimizer-svgo@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/utils': 2.0.0-canary.1779 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/optimizer-swc@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)': + dependencies: + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/source-map': 2.1.1 + '@parcel/utils': 2.0.0-canary.1779 + '@swc/core': 1.10.18(@swc/helpers@0.5.15) + nullthrows: 1.1.1 + transitivePeerDependencies: + - '@parcel/core' + - '@swc/helpers' + + '@parcel/package-manager@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)': + dependencies: + '@parcel/core': 2.0.0-canary.1777(@swc/helpers@0.5.15) + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/fs': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/logger': 2.0.0-canary.1779 + '@parcel/node-resolver-core': 3.4.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/types': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/utils': 2.0.0-canary.1779 + '@parcel/workers': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@swc/core': 1.10.18(@swc/helpers@0.5.15) + semver: 7.5.4 + transitivePeerDependencies: + - '@swc/helpers' + + '@parcel/packager-css@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/source-map': 2.1.1 + '@parcel/utils': 2.0.0-canary.1779 + lightningcss: 1.29.1 + nullthrows: 1.1.1 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/packager-html@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/types': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/utils': 2.0.0-canary.1779 + nullthrows: 1.1.1 + posthtml: 0.16.6 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/packager-js@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/rust': 2.13.4-canary.3402 + '@parcel/source-map': 2.1.1 + '@parcel/types': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/utils': 2.0.0-canary.1779 + globals: 13.24.0 + nullthrows: 1.1.1 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/packager-raw@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/packager-svg@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/types': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/utils': 2.0.0-canary.1779 + posthtml: 0.16.6 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/packager-wasm@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/plugin@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/types': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/profiler@2.13.4-canary.3402': + dependencies: + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/events': 2.0.0-canary.1779 + '@parcel/types-internal': 2.13.4-canary.3402 + chrome-trace-event: 1.0.4 + + '@parcel/reporter-cli@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/types': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/utils': 2.0.0-canary.1779 + chalk: 4.1.2 + term-size: 2.2.1 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/reporter-dev-server@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/codeframe': 2.0.0-canary.1779 + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/source-map': 2.1.1 + '@parcel/utils': 2.0.0-canary.1779 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/reporter-tracer@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/utils': 2.0.0-canary.1779 + chrome-trace-event: 1.0.4 + nullthrows: 1.1.1 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/resolver-default@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/node-resolver-core': 3.4.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/runtime-browser-hmr@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/utils': 2.0.0-canary.1779 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/runtime-js@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/utils': 2.0.0-canary.1779 + nullthrows: 1.1.1 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/runtime-rsc@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/rust': 2.13.4-canary.3402 + '@parcel/utils': 2.0.0-canary.1779 + nullthrows: 1.1.1 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/runtime-service-worker@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/utils': 2.0.0-canary.1779 + nullthrows: 1.1.1 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/rust@2.13.4-canary.3402': {} + + '@parcel/source-map@2.1.1': + dependencies: + detect-libc: 1.0.3 + + '@parcel/transformer-babel@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/source-map': 2.1.1 + '@parcel/utils': 2.0.0-canary.1779 + browserslist: 4.23.0 + json5: 2.2.3 + nullthrows: 1.1.1 + semver: 7.5.4 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/transformer-css@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/source-map': 2.1.1 + '@parcel/utils': 2.0.0-canary.1779 + browserslist: 4.23.0 + lightningcss: 1.29.1 + nullthrows: 1.1.1 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/transformer-html@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/rust': 2.13.4-canary.3402 + nullthrows: 1.1.1 + posthtml: 0.16.6 + posthtml-parser: 0.12.1 + posthtml-render: 3.0.0 + semver: 7.5.4 + srcset: 4.0.0 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/transformer-image@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/core': 2.0.0-canary.1777(@swc/helpers@0.5.15) + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/utils': 2.0.0-canary.1779 + '@parcel/workers': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + nullthrows: 1.1.1 + + '@parcel/transformer-js@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/core': 2.0.0-canary.1777(@swc/helpers@0.5.15) + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/rust': 2.13.4-canary.3402 + '@parcel/source-map': 2.1.1 + '@parcel/utils': 2.0.0-canary.1779 + '@parcel/workers': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@swc/helpers': 0.5.15 + browserslist: 4.23.0 + nullthrows: 1.1.1 + regenerator-runtime: 0.14.1 + semver: 7.5.4 + + '@parcel/transformer-json@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + json5: 2.2.3 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/transformer-node@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/transformer-postcss@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/rust': 2.13.4-canary.3402 + '@parcel/utils': 2.0.0-canary.1779 + clone: 2.1.2 + nullthrows: 1.1.1 + postcss-value-parser: 4.2.0 + semver: 7.5.4 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/transformer-posthtml@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/utils': 2.0.0-canary.1779 + nullthrows: 1.1.1 + posthtml: 0.16.6 + posthtml-parser: 0.12.1 + posthtml-render: 3.0.0 + semver: 7.5.4 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/transformer-raw@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/transformer-react-refresh-wrap@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/error-overlay': 2.13.4-canary.3402 + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/utils': 2.0.0-canary.1779 + react-refresh: 0.14.0 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/transformer-svg@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/rust': 2.13.4-canary.3402 + nullthrows: 1.1.1 + posthtml: 0.16.6 + posthtml-parser: 0.12.1 + posthtml-render: 3.0.0 + semver: 7.5.4 + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/types-internal@2.13.4-canary.3402': + dependencies: + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/feature-flags': 2.13.4-canary.3402 + '@parcel/source-map': 2.1.1 + utility-types: 3.11.0 + + '@parcel/types@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/types-internal': 2.13.4-canary.3402 + '@parcel/workers': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + transitivePeerDependencies: + - '@parcel/core' + + '@parcel/utils@2.0.0-canary.1779': + dependencies: + '@parcel/codeframe': 2.0.0-canary.1779 + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/logger': 2.0.0-canary.1779 + '@parcel/markdown-ansi': 2.0.0-canary.1779 + '@parcel/rust': 2.13.4-canary.3402 + '@parcel/source-map': 2.1.1 + chalk: 4.1.2 + nullthrows: 1.1.1 + + '@parcel/watcher-android-arm64@2.5.1': + optional: true + + '@parcel/watcher-darwin-arm64@2.5.1': + optional: true + + '@parcel/watcher-darwin-x64@2.5.1': + optional: true + + '@parcel/watcher-freebsd-x64@2.5.1': + optional: true + + '@parcel/watcher-linux-arm-glibc@2.5.1': + optional: true + + '@parcel/watcher-linux-arm-musl@2.5.1': + optional: true + + '@parcel/watcher-linux-arm64-glibc@2.5.1': + optional: true + + '@parcel/watcher-linux-arm64-musl@2.5.1': + optional: true + + '@parcel/watcher-linux-x64-glibc@2.5.1': + optional: true + + '@parcel/watcher-linux-x64-musl@2.5.1': + optional: true + + '@parcel/watcher-win32-arm64@2.5.1': + optional: true + + '@parcel/watcher-win32-ia32@2.5.1': + optional: true + + '@parcel/watcher-win32-x64@2.5.1': + optional: true + + '@parcel/watcher@2.5.1': + dependencies: + detect-libc: 1.0.3 + is-glob: 4.0.3 + micromatch: 4.0.5 + node-addon-api: 7.1.1 + optionalDependencies: + '@parcel/watcher-android-arm64': 2.5.1 + '@parcel/watcher-darwin-arm64': 2.5.1 + '@parcel/watcher-darwin-x64': 2.5.1 + '@parcel/watcher-freebsd-x64': 2.5.1 + '@parcel/watcher-linux-arm-glibc': 2.5.1 + '@parcel/watcher-linux-arm-musl': 2.5.1 + '@parcel/watcher-linux-arm64-glibc': 2.5.1 + '@parcel/watcher-linux-arm64-musl': 2.5.1 + '@parcel/watcher-linux-x64-glibc': 2.5.1 + '@parcel/watcher-linux-x64-musl': 2.5.1 + '@parcel/watcher-win32-arm64': 2.5.1 + '@parcel/watcher-win32-ia32': 2.5.1 + '@parcel/watcher-win32-x64': 2.5.1 + + '@parcel/workers@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + dependencies: + '@parcel/core': 2.0.0-canary.1777(@swc/helpers@0.5.15) + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/logger': 2.0.0-canary.1779 + '@parcel/profiler': 2.13.4-canary.3402 + '@parcel/types-internal': 2.13.4-canary.3402 + '@parcel/utils': 2.0.0-canary.1779 + nullthrows: 1.1.1 + '@pkgjs/parseargs@0.11.0': optional: true @@ -10289,25 +11862,82 @@ snapshots: '@shikijs/vscode-textmate': 9.3.0 '@types/hast': 3.0.4 - '@shikijs/vscode-textmate@9.3.0': {} + '@shikijs/vscode-textmate@9.3.0': {} + + '@sideway/address@4.1.5': + dependencies: + '@hapi/hoek': 9.3.0 + + '@sideway/formula@3.0.1': {} + + '@sideway/pinpoint@2.0.0': {} + + '@sinclair/typebox@0.27.8': {} + + '@sinonjs/commons@2.0.0': + dependencies: + type-detect: 4.0.8 + + '@sinonjs/fake-timers@10.0.2': + dependencies: + '@sinonjs/commons': 2.0.0 + + '@swc/core-darwin-arm64@1.10.18': + optional: true + + '@swc/core-darwin-x64@1.10.18': + optional: true + + '@swc/core-linux-arm-gnueabihf@1.10.18': + optional: true + + '@swc/core-linux-arm64-gnu@1.10.18': + optional: true + + '@swc/core-linux-arm64-musl@1.10.18': + optional: true + + '@swc/core-linux-x64-gnu@1.10.18': + optional: true + + '@swc/core-linux-x64-musl@1.10.18': + optional: true + + '@swc/core-win32-arm64-msvc@1.10.18': + optional: true - '@sideway/address@4.1.5': - dependencies: - '@hapi/hoek': 9.3.0 + '@swc/core-win32-ia32-msvc@1.10.18': + optional: true - '@sideway/formula@3.0.1': {} + '@swc/core-win32-x64-msvc@1.10.18': + optional: true - '@sideway/pinpoint@2.0.0': {} + '@swc/core@1.10.18(@swc/helpers@0.5.15)': + dependencies: + '@swc/counter': 0.1.3 + '@swc/types': 0.1.17 + optionalDependencies: + '@swc/core-darwin-arm64': 1.10.18 + '@swc/core-darwin-x64': 1.10.18 + '@swc/core-linux-arm-gnueabihf': 1.10.18 + '@swc/core-linux-arm64-gnu': 1.10.18 + '@swc/core-linux-arm64-musl': 1.10.18 + '@swc/core-linux-x64-gnu': 1.10.18 + '@swc/core-linux-x64-musl': 1.10.18 + '@swc/core-win32-arm64-msvc': 1.10.18 + '@swc/core-win32-ia32-msvc': 1.10.18 + '@swc/core-win32-x64-msvc': 1.10.18 + '@swc/helpers': 0.5.15 - '@sinclair/typebox@0.27.8': {} + '@swc/counter@0.1.3': {} - '@sinonjs/commons@2.0.0': + '@swc/helpers@0.5.15': dependencies: - type-detect: 4.0.8 + tslib: 2.8.1 - '@sinonjs/fake-timers@10.0.2': + '@swc/types@0.1.17': dependencies: - '@sinonjs/commons': 2.0.0 + '@swc/counter': 0.1.3 '@testing-library/dom@8.17.1': dependencies: @@ -10332,13 +11962,13 @@ snapshots: lodash: 4.17.21 redent: 3.0.0 - '@testing-library/react@13.4.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': + '@testing-library/react@13.4.0(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209)': dependencies: '@babel/runtime': 7.24.1 '@testing-library/dom': 8.17.1 '@types/react-dom': 18.2.7 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + react: 0.0.0-experimental-93b58361-20250209 + react-dom: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) '@testing-library/user-event@14.5.2(@testing-library/dom@8.17.1)': dependencies: @@ -10419,6 +12049,13 @@ snapshots: '@types/range-parser': 1.2.7 '@types/send': 0.17.4 + '@types/express-serve-static-core@5.0.6': + dependencies: + '@types/node': 22.13.4 + '@types/qs': 6.9.14 + '@types/range-parser': 1.2.7 + '@types/send': 0.17.4 + '@types/express@4.17.21': dependencies: '@types/body-parser': 1.19.5 @@ -10426,6 +12063,13 @@ snapshots: '@types/qs': 6.9.14 '@types/serve-static': 1.15.5 + '@types/express@5.0.0': + dependencies: + '@types/body-parser': 1.19.5 + '@types/express-serve-static-core': 5.0.6 + '@types/qs': 6.9.14 + '@types/serve-static': 1.15.5 + '@types/fs-extra@8.1.2': dependencies: '@types/node': 20.11.30 @@ -10534,10 +12178,16 @@ snapshots: dependencies: undici-types: 5.26.5 + '@types/node@22.13.4': + dependencies: + undici-types: 6.20.0 + '@types/normalize-package-data@2.4.1': {} '@types/npmcli__package-json@4.0.4': {} + '@types/parcel-env@0.0.8': {} + '@types/parse-json@4.0.2': {} '@types/picomatch@2.3.3': {} @@ -10837,7 +12487,7 @@ snapshots: modern-ahocorasick: 1.0.1 outdent: 0.8.0 - '@vanilla-extract/integration@6.5.0(@types/node@20.11.30)(terser@5.15.0)': + '@vanilla-extract/integration@6.5.0(@types/node@22.13.4)(lightningcss@1.29.1)(terser@5.15.0)': dependencies: '@babel/core': 7.24.3 '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.24.3) @@ -10850,8 +12500,8 @@ snapshots: lodash: 4.17.21 mlly: 1.6.1 outdent: 0.8.0 - vite: 5.1.3(@types/node@20.11.30)(terser@5.15.0) - vite-node: 1.6.0(@types/node@20.11.30)(terser@5.15.0) + vite: 5.1.3(@types/node@22.13.4)(lightningcss@1.29.1)(terser@5.15.0) + vite-node: 1.6.0(@types/node@22.13.4)(lightningcss@1.29.1)(terser@5.15.0) transitivePeerDependencies: - '@types/node' - less @@ -10864,13 +12514,13 @@ snapshots: '@vanilla-extract/private@1.0.4': {} - '@vanilla-extract/vite-plugin@3.9.5(@types/node@20.11.30)(terser@5.15.0)(vite@5.1.3(@types/node@20.11.30)(terser@5.15.0))': + '@vanilla-extract/vite-plugin@3.9.5(@types/node@22.13.4)(lightningcss@1.29.1)(terser@5.15.0)(vite@5.1.3(@types/node@22.13.4)(lightningcss@1.29.1)(terser@5.15.0))': dependencies: - '@vanilla-extract/integration': 6.5.0(@types/node@20.11.30)(terser@5.15.0) + '@vanilla-extract/integration': 6.5.0(@types/node@22.13.4)(lightningcss@1.29.1)(terser@5.15.0) outdent: 0.8.0 postcss: 8.4.49 postcss-load-config: 4.0.2(postcss@8.4.49) - vite: 5.1.3(@types/node@20.11.30)(terser@5.15.0) + vite: 5.1.3(@types/node@22.13.4)(lightningcss@1.29.1)(terser@5.15.0) transitivePeerDependencies: - '@types/node' - less @@ -10882,13 +12532,13 @@ snapshots: - terser - ts-node - '@vanilla-extract/vite-plugin@3.9.5(@types/node@20.11.30)(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0))': + '@vanilla-extract/vite-plugin@3.9.5(@types/node@22.13.4)(lightningcss@1.29.1)(vite@6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0))': dependencies: - '@vanilla-extract/integration': 6.5.0(@types/node@20.11.30)(terser@5.15.0) + '@vanilla-extract/integration': 6.5.0(@types/node@22.13.4)(lightningcss@1.29.1)(terser@5.15.0) outdent: 0.8.0 postcss: 8.4.49 postcss-load-config: 4.0.2(postcss@8.4.49) - vite: 6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0) + vite: 6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) transitivePeerDependencies: - '@types/node' - less @@ -10957,6 +12607,8 @@ snapshots: dependencies: type-fest: 1.4.0 + ansi-html-community@0.0.8: {} + ansi-regex@5.0.1: {} ansi-regex@6.0.1: {} @@ -11257,6 +12909,10 @@ snapshots: balanced-match@3.0.1: {} + base-x@3.0.10: + dependencies: + safe-buffer: 5.2.1 + base64-js@1.5.1: {} basic-auth@2.0.1: @@ -11298,6 +12954,23 @@ snapshots: transitivePeerDependencies: - supports-color + body-parser@1.20.3: + dependencies: + bytes: 3.1.2 + content-type: 1.0.5 + debug: 2.6.9 + depd: 2.0.0 + destroy: 1.2.0 + http-errors: 2.0.0 + iconv-lite: 0.4.24 + on-finished: 2.4.1 + qs: 6.13.0 + raw-body: 2.5.2 + type-is: 1.6.18 + unpipe: 1.0.0 + transitivePeerDependencies: + - supports-color + boolbase@1.0.0: {} brace-expansion@1.1.11: @@ -11460,6 +13133,8 @@ snapshots: chownr@1.1.4: {} + chrome-trace-event@1.0.4: {} + ci-info@3.8.0: {} cjs-module-lexer@1.2.2: {} @@ -11496,6 +13171,8 @@ snapshots: clone@1.0.4: {} + clone@2.1.2: {} + co@4.6.0: {} collapse-white-space@2.1.0: {} @@ -11520,6 +13197,8 @@ snapshots: comma-separated-tokens@2.0.3: {} + commander@12.1.0: {} + commander@2.20.3: optional: true @@ -11569,6 +13248,8 @@ snapshots: cookie@0.6.0: {} + cookie@0.7.1: {} + cookie@1.0.1: {} cookiejar@2.1.4: {} @@ -11587,6 +13268,15 @@ snapshots: path-type: 4.0.0 yaml: 1.10.2 + cosmiconfig@9.0.0(typescript@5.4.5): + dependencies: + env-paths: 2.2.1 + import-fresh: 3.3.0 + js-yaml: 4.1.0 + parse-json: 5.2.0 + optionalDependencies: + typescript: 5.4.5 + create-jest@29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0): dependencies: '@jest/types': 29.6.3 @@ -11780,6 +13470,10 @@ snapshots: detect-indent@6.1.0: {} + detect-libc@1.0.3: {} + + detect-libc@2.0.3: {} + detect-newline@3.1.0: {} devlop@1.1.0: @@ -11813,6 +13507,12 @@ snapshots: dom-accessibility-api@0.5.14: {} + dom-serializer@1.4.1: + dependencies: + domelementtype: 2.3.0 + domhandler: 4.3.1 + entities: 2.2.0 + dom-serializer@2.0.0: dependencies: domelementtype: 2.3.0 @@ -11825,16 +13525,30 @@ snapshots: dependencies: webidl-conversions: 7.0.0 + domhandler@4.3.1: + dependencies: + domelementtype: 2.3.0 + domhandler@5.0.3: dependencies: domelementtype: 2.3.0 + domutils@2.8.0: + dependencies: + dom-serializer: 1.4.1 + domelementtype: 2.3.0 + domhandler: 4.3.1 + domutils@3.1.0: dependencies: dom-serializer: 2.0.0 domelementtype: 2.3.0 domhandler: 5.0.3 + dotenv-expand@11.0.7: + dependencies: + dotenv: 16.4.5 + dotenv-json@1.0.0: {} dotenv@16.4.5: {} @@ -11862,6 +13576,8 @@ snapshots: encodeurl@1.0.2: {} + encodeurl@2.0.0: {} + encoding-sniffer@0.2.0: dependencies: iconv-lite: 0.6.3 @@ -11875,8 +13591,14 @@ snapshots: dependencies: ansi-colors: 4.1.3 + entities@2.2.0: {} + + entities@3.0.1: {} + entities@4.5.0: {} + env-paths@2.2.1: {} + err-code@2.0.3: {} error-ex@1.3.2: @@ -12516,6 +14238,42 @@ snapshots: transitivePeerDependencies: - supports-color + express@4.21.2: + dependencies: + accepts: 1.3.8 + array-flatten: 1.1.1 + body-parser: 1.20.3 + content-disposition: 0.5.4 + content-type: 1.0.5 + cookie: 0.7.1 + cookie-signature: 1.0.6 + debug: 2.6.9 + depd: 2.0.0 + encodeurl: 2.0.0 + escape-html: 1.0.3 + etag: 1.8.1 + finalhandler: 1.3.1 + fresh: 0.5.2 + http-errors: 2.0.0 + merge-descriptors: 1.0.3 + methods: 1.1.2 + on-finished: 2.4.1 + parseurl: 1.3.3 + path-to-regexp: 0.1.12 + proxy-addr: 2.0.7 + qs: 6.13.0 + range-parser: 1.2.1 + safe-buffer: 5.2.1 + send: 0.19.0 + serve-static: 1.16.2 + setprototypeof: 1.2.0 + statuses: 2.0.1 + type-is: 1.6.18 + utils-merge: 1.0.1 + vary: 1.1.2 + transitivePeerDependencies: + - supports-color + extend@3.0.2: {} extendable-error@0.1.7: {} @@ -12586,6 +14344,18 @@ snapshots: transitivePeerDependencies: - supports-color + finalhandler@1.3.1: + dependencies: + debug: 2.6.9 + encodeurl: 2.0.0 + escape-html: 1.0.3 + on-finished: 2.4.1 + parseurl: 1.3.3 + statuses: 2.0.1 + unpipe: 1.0.0 + transitivePeerDependencies: + - supports-color + find-up@4.1.0: dependencies: locate-path: 5.0.0 @@ -12695,6 +14465,8 @@ snapshots: get-package-type@0.1.0: {} + get-port@4.2.0: {} + get-port@5.1.1: {} get-source@2.0.12: @@ -12923,6 +14695,24 @@ snapshots: html-void-elements@3.0.0: {} + htmlnano@2.1.1(postcss@8.4.49)(terser@5.15.0)(typescript@5.4.5): + dependencies: + cosmiconfig: 9.0.0(typescript@5.4.5) + posthtml: 0.16.6 + timsort: 0.3.0 + optionalDependencies: + postcss: 8.4.49 + terser: 5.15.0 + transitivePeerDependencies: + - typescript + + htmlparser2@7.2.0: + dependencies: + domelementtype: 2.3.0 + domhandler: 4.3.1 + domutils: 2.8.0 + entities: 3.0.1 + htmlparser2@9.1.0: dependencies: domelementtype: 2.3.0 @@ -13127,6 +14917,8 @@ snapshots: is-interactive@1.0.0: {} + is-json@2.0.1: {} + is-map@2.0.3: {} is-negative-zero@2.0.3: {} @@ -13736,6 +15528,51 @@ snapshots: prelude-ls: 1.2.1 type-check: 0.4.0 + lightningcss-darwin-arm64@1.29.1: + optional: true + + lightningcss-darwin-x64@1.29.1: + optional: true + + lightningcss-freebsd-x64@1.29.1: + optional: true + + lightningcss-linux-arm-gnueabihf@1.29.1: + optional: true + + lightningcss-linux-arm64-gnu@1.29.1: + optional: true + + lightningcss-linux-arm64-musl@1.29.1: + optional: true + + lightningcss-linux-x64-gnu@1.29.1: + optional: true + + lightningcss-linux-x64-musl@1.29.1: + optional: true + + lightningcss-win32-arm64-msvc@1.29.1: + optional: true + + lightningcss-win32-x64-msvc@1.29.1: + optional: true + + lightningcss@1.29.1: + dependencies: + detect-libc: 1.0.3 + optionalDependencies: + lightningcss-darwin-arm64: 1.29.1 + lightningcss-darwin-x64: 1.29.1 + lightningcss-freebsd-x64: 1.29.1 + lightningcss-linux-arm-gnueabihf: 1.29.1 + lightningcss-linux-arm64-gnu: 1.29.1 + lightningcss-linux-arm64-musl: 1.29.1 + lightningcss-linux-x64-gnu: 1.29.1 + lightningcss-linux-x64-musl: 1.29.1 + lightningcss-win32-arm64-msvc: 1.29.1 + lightningcss-win32-x64-msvc: 1.29.1 + lilconfig@2.1.0: {} lilconfig@3.1.1: {} @@ -13746,6 +15583,21 @@ snapshots: dependencies: uc.micro: 2.1.0 + lmdb@2.8.5: + dependencies: + msgpackr: 1.11.2 + node-addon-api: 6.1.0 + node-gyp-build-optional-packages: 5.1.1 + ordered-binary: 1.5.3 + weak-lru-cache: 1.2.2 + optionalDependencies: + '@lmdb/lmdb-darwin-arm64': 2.8.5 + '@lmdb/lmdb-darwin-x64': 2.8.5 + '@lmdb/lmdb-linux-arm': 2.8.5 + '@lmdb/lmdb-linux-arm64': 2.8.5 + '@lmdb/lmdb-linux-x64': 2.8.5 + '@lmdb/lmdb-win32-x64': 2.8.5 + load-json-file@4.0.0: dependencies: graceful-fs: 4.2.11 @@ -14570,6 +16422,22 @@ snapshots: ms@2.1.3: {} + msgpackr-extract@3.0.3: + dependencies: + node-gyp-build-optional-packages: 5.2.2 + optionalDependencies: + '@msgpackr-extract/msgpackr-extract-darwin-arm64': 3.0.3 + '@msgpackr-extract/msgpackr-extract-darwin-x64': 3.0.3 + '@msgpackr-extract/msgpackr-extract-linux-arm': 3.0.3 + '@msgpackr-extract/msgpackr-extract-linux-arm64': 3.0.3 + '@msgpackr-extract/msgpackr-extract-linux-x64': 3.0.3 + '@msgpackr-extract/msgpackr-extract-win32-x64': 3.0.3 + optional: true + + msgpackr@1.11.2: + optionalDependencies: + msgpackr-extract: 3.0.3 + msw@1.3.5(typescript@5.4.5): dependencies: '@mswjs/cookies': 0.2.2 @@ -14619,6 +16487,10 @@ snapshots: nice-try@1.0.5: {} + node-addon-api@6.1.0: {} + + node-addon-api@7.1.1: {} + node-fetch-native@1.6.4: {} node-fetch@2.6.7: @@ -14627,6 +16499,15 @@ snapshots: node-forge@1.3.1: {} + node-gyp-build-optional-packages@5.1.1: + dependencies: + detect-libc: 2.0.3 + + node-gyp-build-optional-packages@5.2.2: + dependencies: + detect-libc: 2.0.3 + optional: true + node-int64@0.4.0: {} node-mocks-http@1.14.1: @@ -14704,6 +16585,8 @@ snapshots: dependencies: boolbase: 1.0.0 + nullthrows@1.1.1: {} + nwsapi@2.2.4: {} object-assign@4.1.1: {} @@ -14795,6 +16678,8 @@ snapshots: strip-ansi: 6.0.1 wcwidth: 1.0.1 + ordered-binary@1.5.3: {} + os-tmpdir@1.0.2: {} outdent@0.5.0: {} @@ -14849,6 +16734,35 @@ snapshots: pako@0.2.9: {} + parcel@2.0.0-canary.1777(@swc/helpers@0.5.15)(postcss@8.4.49)(terser@5.15.0)(typescript@5.4.5): + dependencies: + '@parcel/config-default': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)(postcss@8.4.49)(terser@5.15.0)(typescript@5.4.5) + '@parcel/core': 2.0.0-canary.1777(@swc/helpers@0.5.15) + '@parcel/diagnostic': 2.0.0-canary.1779 + '@parcel/events': 2.0.0-canary.1779 + '@parcel/feature-flags': 2.13.4-canary.3402 + '@parcel/fs': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/logger': 2.0.0-canary.1779 + '@parcel/package-manager': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) + '@parcel/reporter-cli': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/reporter-dev-server': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/reporter-tracer': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/utils': 2.0.0-canary.1779 + chalk: 4.1.2 + commander: 12.1.0 + get-port: 4.2.0 + transitivePeerDependencies: + - '@swc/helpers' + - cssnano + - postcss + - purgecss + - relateurl + - srcset + - svgo + - terser + - typescript + - uncss + parent-module@1.0.1: dependencies: callsites: 3.1.0 @@ -14911,6 +16825,8 @@ snapshots: lru-cache: 11.0.1 minipass: 7.1.2 + path-to-regexp@0.1.12: {} + path-to-regexp@0.1.7: {} path-to-regexp@6.3.0: {} @@ -15016,6 +16932,23 @@ snapshots: picocolors: 1.1.1 source-map-js: 1.2.1 + posthtml-parser@0.11.0: + dependencies: + htmlparser2: 7.2.0 + + posthtml-parser@0.12.1: + dependencies: + htmlparser2: 9.1.0 + + posthtml-render@3.0.0: + dependencies: + is-json: 2.0.1 + + posthtml@0.16.6: + dependencies: + posthtml-parser: 0.11.0 + posthtml-render: 3.0.0 + preferred-pm@3.0.3: dependencies: find-up: 5.0.0 @@ -15125,6 +17058,10 @@ snapshots: dependencies: side-channel: 1.0.6 + qs@6.13.0: + dependencies: + side-channel: 1.0.6 + querystringify@2.2.0: {} queue-microtask@1.2.3: {} @@ -15146,11 +17083,10 @@ snapshots: iconv-lite: 0.4.24 unpipe: 1.0.0 - react-dom@18.2.0(react@18.2.0): + react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209): dependencies: - loose-envify: 1.4.0 - react: 18.2.0 - scheduler: 0.23.0 + react: 0.0.0-experimental-93b58361-20250209 + scheduler: 0.0.0-experimental-93b58361-20250209 react-is@16.13.1: {} @@ -15160,22 +17096,35 @@ snapshots: react-refresh@0.14.0: {} - react-shallow-renderer@16.15.0(react@18.2.0): + react-router@0.0.0-experimental-1ebb6d403(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209): + dependencies: + '@types/cookie': 0.6.0 + cookie: 1.0.1 + react: 0.0.0-experimental-93b58361-20250209 + set-cookie-parser: 2.6.0 + turbo-stream: 2.4.0 + optionalDependencies: + react-dom: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) + + react-server-dom-parcel@0.0.0-experimental-93b58361-20250209(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209): + dependencies: + react: 0.0.0-experimental-93b58361-20250209 + react-dom: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) + + react-shallow-renderer@16.15.0(react@0.0.0-experimental-93b58361-20250209): dependencies: object-assign: 4.1.1 - react: 18.2.0 + react: 0.0.0-experimental-93b58361-20250209 react-is: 18.2.0 - react-test-renderer@18.2.0(react@18.2.0): + react-test-renderer@18.2.0(react@0.0.0-experimental-93b58361-20250209): dependencies: - react: 18.2.0 + react: 0.0.0-experimental-93b58361-20250209 react-is: 18.2.0 - react-shallow-renderer: 16.15.0(react@18.2.0) + react-shallow-renderer: 16.15.0(react@0.0.0-experimental-93b58361-20250209) scheduler: 0.23.0 - react@18.2.0: - dependencies: - loose-envify: 1.4.0 + react@0.0.0-experimental-93b58361-20250209: {} read-cache@1.0.0: dependencies: @@ -15426,6 +17375,8 @@ snapshots: rrweb-cssom@0.6.0: {} + rsc-html-stream@0.0.4: {} + run-async@2.4.1: {} run-parallel@1.2.0: @@ -15465,6 +17416,8 @@ snapshots: dependencies: xmlchars: 2.2.0 + scheduler@0.0.0-experimental-93b58361-20250209: {} + scheduler@0.23.0: dependencies: loose-envify: 1.4.0 @@ -15500,6 +17453,24 @@ snapshots: transitivePeerDependencies: - supports-color + send@0.19.0: + dependencies: + debug: 2.6.9 + depd: 2.0.0 + destroy: 1.2.0 + encodeurl: 1.0.2 + escape-html: 1.0.3 + etag: 1.8.1 + fresh: 0.5.2 + http-errors: 2.0.0 + mime: 1.6.0 + ms: 2.1.3 + on-finished: 2.4.1 + range-parser: 1.2.1 + statuses: 2.0.1 + transitivePeerDependencies: + - supports-color + serialize-javascript@6.0.2: dependencies: randombytes: 2.1.0 @@ -15513,6 +17484,15 @@ snapshots: transitivePeerDependencies: - supports-color + serve-static@1.16.2: + dependencies: + encodeurl: 2.0.0 + escape-html: 1.0.3 + parseurl: 1.3.3 + send: 0.19.0 + transitivePeerDependencies: + - supports-color + set-blocking@2.0.0: {} set-cookie-parser@2.6.0: {} @@ -15670,6 +17650,8 @@ snapshots: sprintf-js@1.1.3: {} + srcset@4.0.0: {} + stack-utils@2.0.6: dependencies: escape-string-regexp: 2.0.0 @@ -15917,6 +17899,8 @@ snapshots: through@2.3.8: {} + timsort@0.3.0: {} + tiny-invariant@1.3.3: {} tinyglobby@0.2.9: @@ -15984,9 +17968,11 @@ snapshots: tslib@2.6.2: {} + tslib@2.8.1: {} + tsscmp@1.0.6: {} - tsup@8.3.0(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0): + tsup@8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0): dependencies: bundle-require: 5.0.0(esbuild@0.23.1) cac: 6.7.14 @@ -16005,6 +17991,7 @@ snapshots: tinyglobby: 0.2.9 tree-kill: 1.2.2 optionalDependencies: + '@swc/core': 1.10.18(@swc/helpers@0.5.15) postcss: 8.4.49 typescript: 5.4.5 transitivePeerDependencies: @@ -16117,6 +18104,8 @@ snapshots: undici-types@5.26.5: {} + undici-types@6.20.0: {} + undici@5.28.4: dependencies: '@fastify/busboy': 2.1.1 @@ -16255,6 +18244,8 @@ snapshots: is-typed-array: 1.1.13 which-typed-array: 1.1.15 + utility-types@3.11.0: {} + utils-merge@1.0.1: {} uuid@3.4.0: {} @@ -16314,7 +18305,20 @@ snapshots: unist-util-stringify-position: 4.0.0 vfile-message: 4.0.2 - vite-env-only@3.0.1(vite@5.1.3(@types/node@20.11.30)(terser@5.15.0)): + vite-env-only@3.0.1(vite@5.1.3(@types/node@22.13.4)(lightningcss@1.29.1)(terser@5.15.0)): + dependencies: + '@babel/core': 7.24.3 + '@babel/generator': 7.24.1 + '@babel/parser': 7.24.1 + '@babel/traverse': 7.24.1 + '@babel/types': 7.24.0 + babel-dead-code-elimination: 1.0.6 + micromatch: 4.0.5 + vite: 5.1.3(@types/node@22.13.4)(lightningcss@1.29.1)(terser@5.15.0) + transitivePeerDependencies: + - supports-color + + vite-env-only@3.0.1(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)): dependencies: '@babel/core': 7.24.3 '@babel/generator': 7.24.1 @@ -16323,11 +18327,11 @@ snapshots: '@babel/types': 7.24.0 babel-dead-code-elimination: 1.0.6 micromatch: 4.0.5 - vite: 5.1.3(@types/node@20.11.30)(terser@5.15.0) + vite: 6.0.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) transitivePeerDependencies: - supports-color - vite-env-only@3.0.1(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0)): + vite-env-only@3.0.1(vite@6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)): dependencies: '@babel/core': 7.24.3 '@babel/generator': 7.24.1 @@ -16336,17 +18340,17 @@ snapshots: '@babel/types': 7.24.0 babel-dead-code-elimination: 1.0.6 micromatch: 4.0.5 - vite: 6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0) + vite: 6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) transitivePeerDependencies: - supports-color - vite-node@1.6.0(@types/node@20.11.30)(terser@5.15.0): + vite-node@1.6.0(@types/node@22.13.4)(lightningcss@1.29.1)(terser@5.15.0): dependencies: cac: 6.7.14 debug: 4.4.0 pathe: 1.1.2 picocolors: 1.1.1 - vite: 5.1.3(@types/node@20.11.30)(terser@5.15.0) + vite: 5.1.3(@types/node@22.13.4)(lightningcss@1.29.1)(terser@5.15.0) transitivePeerDependencies: - '@types/node' - less @@ -16357,13 +18361,13 @@ snapshots: - supports-color - terser - vite-node@3.0.0-beta.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0): + vite-node@3.0.0-beta.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0): dependencies: cac: 6.7.14 debug: 4.4.0 es-module-lexer: 1.5.4 pathe: 1.1.2 - vite: 6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0) + vite: 6.0.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) transitivePeerDependencies: - '@types/node' - jiti @@ -16378,39 +18382,51 @@ snapshots: - tsx - yaml - vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@5.1.3(@types/node@20.11.30)(terser@5.15.0)): + vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@5.1.3(@types/node@22.13.4)(lightningcss@1.29.1)(terser@5.15.0)): + dependencies: + debug: 4.3.7 + globrex: 0.1.2 + tsconfck: 3.0.3(typescript@5.4.5) + optionalDependencies: + vite: 5.1.3(@types/node@22.13.4)(lightningcss@1.29.1)(terser@5.15.0) + transitivePeerDependencies: + - supports-color + - typescript + + vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)): dependencies: debug: 4.3.7 globrex: 0.1.2 tsconfck: 3.0.3(typescript@5.4.5) optionalDependencies: - vite: 5.1.3(@types/node@20.11.30)(terser@5.15.0) + vite: 6.0.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) transitivePeerDependencies: - supports-color - typescript - vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0)): + vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)): dependencies: debug: 4.3.7 globrex: 0.1.2 tsconfck: 3.0.3(typescript@5.4.5) optionalDependencies: - vite: 6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0) + vite: 6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) transitivePeerDependencies: - supports-color - typescript - vite@5.1.3(@types/node@20.11.30)(terser@5.15.0): + vite@5.1.3(@types/node@22.13.4)(lightningcss@1.29.1)(terser@5.15.0): dependencies: esbuild: 0.19.12 postcss: 8.4.49 rollup: 4.24.0 optionalDependencies: - '@types/node': 20.11.30 + '@types/node': 22.13.4 fsevents: 2.3.3 + lightningcss: 1.29.1 terser: 5.15.0 - vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(yaml@2.6.0): + vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0): dependencies: esbuild: 0.24.0 postcss: 8.4.49 @@ -16419,6 +18435,19 @@ snapshots: '@types/node': 20.11.30 fsevents: 2.3.3 jiti: 1.21.0 + lightningcss: 1.29.1 + yaml: 2.6.0 + + vite@6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0): + dependencies: + esbuild: 0.24.0 + postcss: 8.4.49 + rollup: 4.24.0 + optionalDependencies: + '@types/node': 22.13.4 + fsevents: 2.3.3 + jiti: 1.21.0 + lightningcss: 1.29.1 yaml: 2.6.0 w3c-xmlserializer@4.0.0: @@ -16443,6 +18472,8 @@ snapshots: dependencies: defaults: 1.0.3 + weak-lru-cache@1.2.2: {} + web-encoding@1.1.5: dependencies: util: 0.12.5 From 01044bb42415cbb224ee24592a873bbc3ba356f1 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Wed, 19 Feb 2025 11:07:42 -0800 Subject: [PATCH 002/143] feat: add `matchServerRequest`, `ServerMatch`, `ServerPayload`, `ServerRouteMatch`, `ServerRouteObject` --- .vscode/settings.json | 3 + packages/react-router/.eslintrc.js | 1 - packages/react-router/index.ts | 16 ++ packages/react-router/server.ts | 139 +++++++++++++++++ playground/rsc-parcel/package.json | 3 +- playground/rsc-parcel/src/browser.tsx | 22 +-- .../rsc-parcel/src/react-router.browser.tsx | 70 ++++----- .../rsc-parcel/src/react-router.server.tsx | 142 ------------------ .../rsc-parcel/src/react-router.ssr.tsx | 120 +++++++-------- playground/rsc-parcel/src/routes.ts | 30 ++-- playground/rsc-parcel/src/server.tsx | 25 ++- pnpm-lock.yaml | 24 +-- 12 files changed, 299 insertions(+), 296 deletions(-) delete mode 100644 playground/rsc-parcel/src/react-router.server.tsx diff --git a/.vscode/settings.json b/.vscode/settings.json index b6918a82b1..9e4816b2c0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,5 +10,8 @@ }, "[typescript]": { "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[typescriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" } } diff --git a/packages/react-router/.eslintrc.js b/packages/react-router/.eslintrc.js index a634ea0440..6af77a3cad 100644 --- a/packages/react-router/.eslintrc.js +++ b/packages/react-router/.eslintrc.js @@ -7,7 +7,6 @@ module.exports = { }, rules: { strict: 0, - "no-restricted-syntax": ["error", "LogicalExpression[operator='??']"], "no-restricted-globals": [ "error", { name: "__dirname", message: restrictedGlobalsError }, diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts index fd669ed6c2..9868daa933 100644 --- a/packages/react-router/index.ts +++ b/packages/react-router/index.ts @@ -348,3 +348,19 @@ export { ServerMode as UNSAFE_ServerMode } from "./lib/server-runtime/mode"; /** @internal */ export { useScrollRestoration as UNSAFE_useScrollRestoration } from "./lib/dom/lib"; + +import type { ServerRouteObject, ServerMatch } from "./server"; +export type { + ServerMatch, + ServerPayload, + ServerRouteMatch, + ServerRouteObject, +} from "./server"; +export async function matchServerRequest( + request: Request, + routes: ServerRouteObject[] +): Promise { + throw new Error( + "matchServerRequest is not available in client runtimes. Module resolution must enable the react-server condition." + ); +} diff --git a/packages/react-router/server.ts b/packages/react-router/server.ts index 25a7c288aa..420fd3f188 100644 --- a/packages/react-router/server.ts +++ b/packages/react-router/server.ts @@ -1,2 +1,141 @@ +import type { + ClientActionFunction, + ClientLoaderFunction, + LinksFunction, + MetaFunction, +} from "./lib/dom/ssr/routeModules"; +import type { Location } from "./lib/router/history"; +import { createStaticHandler } from "./lib/router/router"; +import { + isRouteErrorResponse, + type ActionFunction, + type LoaderFunction, + type Params, + type ShouldRevalidateFunction, +} from "./lib/router/utils"; + export { createStaticHandler } from "./lib/router/router"; export { matchRoutes } from "./lib/router/utils"; + +export type ServerRouteObject = { id: string; path?: string } & ( + | { + index: true; + } + | { + children?: ServerRouteObject[]; + } +) & { + action?: ActionFunction; + clientAction?: ClientActionFunction; + clientLoader?: ClientLoaderFunction; + Component?: React.ComponentType; + ErrorBoundary?: React.ComponentType; + handle?: any; + HydrateFallback?: React.ComponentType; + Layout?: React.ComponentType; + links?: LinksFunction; + loader?: LoaderFunction; + meta?: MetaFunction; + shouldRevalidate?: ShouldRevalidateFunction; + }; + +export type ServerRouteMatch = { + clientAction?: ClientActionFunction; + clientLoader?: ClientLoaderFunction; + Component?: React.ComponentType; + ErrorBoundary?: React.ComponentType; + handle?: any; + hasAction: boolean; + hasLoader: boolean; + HydrateFallback?: React.ComponentType; + id: string; + index?: boolean; + Layout?: React.ComponentType; + links?: LinksFunction; + meta?: MetaFunction; + params: Params; + path?: string; + pathname: string; + pathnameBase: string; + shouldRevalidate?: ShouldRevalidateFunction; +}; + +export type ServerPayload = { + actionData: Record | null; + basename?: string; + deepestRenderedBoundaryId?: string; + errors: Record | null; + loaderData: Record; + location: Location; + matches: ServerRouteMatch[]; + nonce?: string; +}; + +export type ServerMatch = { + statusCode: number; + headers: Headers; + payload: ServerPayload; +}; + +export async function matchServerRequest( + request: Request, + routes: ServerRouteObject[] +): Promise { + const handler = createStaticHandler(routes); + const result = await handler.query(request); + + if (result instanceof Response) { + const headers = new Headers(result.headers); + headers.set("Vary", "Content-Type"); + headers.set("x-react-router-error", "true"); + return result; + } + + const errors = result.errors + ? Object.fromEntries( + Object.entries(result.errors).map(([key, error]) => [ + key, + isRouteErrorResponse(error) + ? Object.fromEntries(Object.entries(error)) + : error, + ]) + ) + : result.errors; + + const payload = { + actionData: result.actionData, + deepestRenderedBoundaryId: result._deepestRenderedBoundaryId ?? undefined, + errors, + loaderData: result.loaderData, + location: result.location, + matches: result.matches.map((match) => ({ + clientAction: (match.route as any).clientAction, + clientLoader: (match.route as any).clientLoader, + Component: (match.route as any).default, + ErrorBoundary: (match.route as any).ErrorBoundary, + handle: (match.route as any).handle, + hasAction: !!match.route.action, + hasLoader: !!match.route.loader, + HydrateFallback: (match.route as any).HydrateFallback, + id: match.route.id, + index: match.route.index, + Layout: (match.route as any).Layout, + links: (match.route as any).links, + meta: (match.route as any).meta, + params: match.params, + path: match.route.path, + pathname: match.pathname, + pathnameBase: match.pathnameBase, + shouldRevalidate: (match.route as any).shouldRevalidate, + })), + } satisfies ServerPayload; + + return { + statusCode: result.statusCode, + headers: new Headers({ + "Content-Type": "text/x-component", + Vary: "Content-Type", + }), + payload, + }; +} diff --git a/playground/rsc-parcel/package.json b/playground/rsc-parcel/package.json index e33bd9711e..6b2193a8e2 100644 --- a/playground/rsc-parcel/package.json +++ b/playground/rsc-parcel/package.json @@ -31,7 +31,7 @@ "express": "^4.21.2", "react": "0.0.0-experimental-93b58361-20250209", "react-dom": "0.0.0-experimental-93b58361-20250209", - "react-router": "0.0.0-experimental-1ebb6d403", + "react-router": "workspace:*", "react-server-dom-parcel": "0.0.0-experimental-93b58361-20250209", "rsc-html-stream": "0.0.4" }, @@ -39,7 +39,6 @@ "overrides": { "react": "0.0.0-experimental-93b58361-20250209", "react-dom": "0.0.0-experimental-93b58361-20250209", - "react-router": "0.0.0-experimental-1ebb6d403", "react-server-dom-parcel": "0.0.0-experimental-93b58361-20250209" } } diff --git a/playground/rsc-parcel/src/browser.tsx b/playground/rsc-parcel/src/browser.tsx index 5792d52286..80efc12ce1 100644 --- a/playground/rsc-parcel/src/browser.tsx +++ b/playground/rsc-parcel/src/browser.tsx @@ -6,20 +6,20 @@ import { hydrateRoot } from "react-dom/client"; import { createFromReadableStream } from "react-server-dom-parcel/client"; import { rscStream } from "rsc-html-stream/client"; +import type { ServerPayload } from "react-router"; import { BrowserRouter } from "./react-router.browser"; -import type { ServerPayload } from "./react-router.server"; const initialRSCPayloadPromise = - createFromReadableStream(rscStream); + createFromReadableStream(rscStream); initialRSCPayloadPromise.then((initialRSCPayload: ServerPayload) => { - console.log(initialRSCPayload); - startTransition(() => { - hydrateRoot( - document, - - - , - ); - }); + console.log(initialRSCPayload); + startTransition(() => { + hydrateRoot( + document, + + + + ); + }); }); diff --git a/playground/rsc-parcel/src/react-router.browser.tsx b/playground/rsc-parcel/src/react-router.browser.tsx index 8d99810107..e844e17599 100644 --- a/playground/rsc-parcel/src/react-router.browser.tsx +++ b/playground/rsc-parcel/src/react-router.browser.tsx @@ -1,43 +1,43 @@ import { - UNSAFE_createRouter, - RouterProvider, - type DataRouteObject, - UNSAFE_createBrowserHistory, + UNSAFE_createRouter, + RouterProvider, + type DataRouteObject, + UNSAFE_createBrowserHistory, } from "react-router"; -import type { ServerPayload } from "./react-router.server"; +import type { ServerPayload } from "react-router"; export function BrowserRouter({ payload }: { payload: ServerPayload }) { - const routes = payload.matches.reduceRight((previous, match) => { - const route: DataRouteObject = { - id: match.id, - action: match.hasAction || !!match.clientAction, - Component: match.Component, - ErrorBoundary: match.ErrorBoundary, - handle: match.handle, - hasErrorBoundary: !!match.ErrorBoundary, - HydrateFallback: match.HydrateFallback, - index: match.index, - loader: match.hasLoader || !!match.clientLoader, - path: match.path, - shouldRevalidate: match.shouldRevalidate, - }; - if (previous.length > 0) { - route.children = previous; - } - return [route]; - }, [] as DataRouteObject[]); + const routes = payload.matches.reduceRight((previous, match) => { + const route: DataRouteObject = { + id: match.id, + action: match.hasAction || !!match.clientAction, + Component: match.Component, + ErrorBoundary: match.ErrorBoundary, + handle: match.handle, + hasErrorBoundary: !!match.ErrorBoundary, + HydrateFallback: match.HydrateFallback, + index: match.index, + loader: match.hasLoader || !!match.clientLoader, + path: match.path, + shouldRevalidate: match.shouldRevalidate, + }; + if (previous.length > 0) { + route.children = previous; + } + return [route]; + }, [] as DataRouteObject[]); - const router = UNSAFE_createRouter({ - basename: payload.basename, - history: UNSAFE_createBrowserHistory(), - hydrationData: { - actionData: payload.actionData, - errors: payload.errors, - loaderData: payload.loaderData, - }, - routes: routes, - }); + const router = UNSAFE_createRouter({ + basename: payload.basename, + history: UNSAFE_createBrowserHistory(), + hydrationData: { + actionData: payload.actionData, + errors: payload.errors, + loaderData: payload.loaderData, + }, + routes: routes, + }); - return ; + return ; } diff --git a/playground/rsc-parcel/src/react-router.server.tsx b/playground/rsc-parcel/src/react-router.server.tsx deleted file mode 100644 index 569a3f3ed7..0000000000 --- a/playground/rsc-parcel/src/react-router.server.tsx +++ /dev/null @@ -1,142 +0,0 @@ -import { - createStaticHandler, - type ActionFunction, - type ClientActionFunction, - type ClientLoaderFunction, - type LinksFunction, - type LoaderFunction, - type Location, - type MetaFunction, - type Params, - type ShouldRevalidateFunction, - type UNSAFE_ErrorResponseImpl, -} from "react-router"; -import { - renderToReadableStream, - // @ts-expect-error -} from "react-server-dom-parcel/server.edge"; - -export type RouteObject = { id: string; path?: string } & ( - | { - index: true; - } - | { - children?: RouteObject[]; - } -) & { - action?: ActionFunction; - clientAction?: ClientActionFunction; - clientLoader?: ClientLoaderFunction; - Component?: React.ComponentType; - ErrorBoundary?: React.ComponentType; - handle?: any; - HydrateFallback?: React.ComponentType; - Layout?: React.ComponentType; - links?: LinksFunction; - loader?: LoaderFunction; - meta?: MetaFunction; - shouldRevalidate?: ShouldRevalidateFunction; - }; - -export type RouteMatch = { - clientAction?: ClientActionFunction; - clientLoader?: ClientLoaderFunction; - Component?: React.ComponentType; - ErrorBoundary?: React.ComponentType; - handle?: any; - hasAction: boolean; - hasLoader: boolean; - HydrateFallback?: React.ComponentType; - id: string; - index?: boolean; - Layout?: React.ComponentType; - links?: LinksFunction; - meta?: MetaFunction; - params: Params; - path?: string; - pathname: string; - pathnameBase: string; - shouldRevalidate?: ShouldRevalidateFunction; -}; - -export type ServerPayload = { - actionData: Record | null; - basename?: string; - deepestRenderedBoundaryId?: string; - errors: Record | null; - loaderData: Record; - location: Location; - matches: RouteMatch[]; - nonce?: string; -}; - -export async function handleRequest(request: Request, routes: RouteObject[]) { - const handler = createStaticHandler(routes); - const result = await handler.query(request); - - if (result instanceof Response) { - const headers = new Headers(result.headers); - headers.set("Vary", "Content-Type"); - headers.set("x-react-router-error", "true"); - return result; - } - - const errors = result.errors - ? Object.fromEntries( - Object.entries(result.errors).map(([key, error]) => [ - key, - isRouteErrorResponse(error) - ? Object.fromEntries(Object.entries(error)) - : error, - ]), - ) - : result.errors; - - const payload: ServerPayload = { - actionData: result.actionData, - deepestRenderedBoundaryId: result._deepestRenderedBoundaryId ?? undefined, - errors, - loaderData: result.loaderData, - location: result.location, - matches: result.matches.map((match) => ({ - clientAction: (match.route as any).clientAction, - clientLoader: (match.route as any).clientLoader, - Component: (match.route as any).default, - ErrorBoundary: (match.route as any).ErrorBoundary, - handle: (match.route as any).handle, - hasAction: !!match.route.action, - hasLoader: !!match.route.loader, - HydrateFallback: (match.route as any).HydrateFallback, - id: match.route.id, - index: match.route.index, - Layout: (match.route as any).Layout, - links: (match.route as any).links, - meta: (match.route as any).meta, - params: match.params, - path: match.route.path, - pathname: match.pathname, - pathnameBase: match.pathnameBase, - shouldRevalidate: (match.route as any).shouldRevalidate, - })), - }; - - const body = renderToReadableStream(payload); - - return new Response(body, { - status: 200, - headers: { - "Content-Type": "text/x-component", - Vary: "Content-Type", - }, - }); -} - -function isRouteErrorResponse(error: any): error is UNSAFE_ErrorResponseImpl { - return ( - error != null && - typeof error.status === "number" && - typeof error.statusText === "string" && - typeof error.internal === "boolean" && - "data" in error - ); -} diff --git a/playground/rsc-parcel/src/react-router.ssr.tsx b/playground/rsc-parcel/src/react-router.ssr.tsx index bfe371d871..ac5ecf764e 100644 --- a/playground/rsc-parcel/src/react-router.ssr.tsx +++ b/playground/rsc-parcel/src/react-router.ssr.tsx @@ -1,68 +1,68 @@ import { - createStaticRouter, - StaticRouterProvider, - type DataRouteObject, + createStaticRouter, + StaticRouterProvider, + type DataRouteObject, } from "react-router"; -import type { ServerPayload } from "./react-router.server"; +import type { ServerPayload } from "react-router"; export function PrerenderRouter({ payload }: { payload: ServerPayload }) { - const context = { - actionData: payload.actionData, - actionHeaders: {}, - basename: payload.basename, - errors: payload.errors, - loaderData: payload.loaderData, - loaderHeaders: {}, - location: payload.location, - statusCode: 200, - _deepestRenderedBoundaryId: payload.deepestRenderedBoundaryId, - matches: payload.matches.map((match) => ({ - params: match.params, - pathname: match.pathname, - pathnameBase: match.pathnameBase, - route: { - id: match.id, - action: match.hasAction || !!match.clientAction, - handle: match.handle, - hasErrorBoundary: !!match.ErrorBoundary, - loader: match.hasLoader || !!match.clientLoader, - index: match.index, - path: match.path, - shouldRevalidate: match.shouldRevalidate, - }, - })), - }; + const context = { + actionData: payload.actionData, + actionHeaders: {}, + basename: payload.basename, + errors: payload.errors, + loaderData: payload.loaderData, + loaderHeaders: {}, + location: payload.location, + statusCode: 200, + _deepestRenderedBoundaryId: payload.deepestRenderedBoundaryId, + matches: payload.matches.map((match) => ({ + params: match.params, + pathname: match.pathname, + pathnameBase: match.pathnameBase, + route: { + id: match.id, + action: match.hasAction || !!match.clientAction, + handle: match.handle, + hasErrorBoundary: !!match.ErrorBoundary, + loader: match.hasLoader || !!match.clientLoader, + index: match.index, + path: match.path, + shouldRevalidate: match.shouldRevalidate, + }, + })), + }; - const router = createStaticRouter( - payload.matches.reduceRight((previous, match) => { - const route: DataRouteObject = { - id: match.id, - action: match.hasAction || !!match.clientAction, - Component: match.Component, - ErrorBoundary: match.ErrorBoundary, - handle: match.handle, - hasErrorBoundary: !!match.ErrorBoundary, - HydrateFallback: match.HydrateFallback, - index: match.index, - loader: match.hasLoader || !!match.clientLoader, - path: match.path, - shouldRevalidate: match.shouldRevalidate, - }; - if (previous.length > 0) { - route.children = previous; - } - return [route]; - }, [] as DataRouteObject[]), - context, - ); + const router = createStaticRouter( + payload.matches.reduceRight((previous, match) => { + const route: DataRouteObject = { + id: match.id, + action: match.hasAction || !!match.clientAction, + Component: match.Component, + ErrorBoundary: match.ErrorBoundary, + handle: match.handle, + hasErrorBoundary: !!match.ErrorBoundary, + HydrateFallback: match.HydrateFallback, + index: match.index, + loader: match.hasLoader || !!match.clientLoader, + path: match.path, + shouldRevalidate: match.shouldRevalidate, + }; + if (previous.length > 0) { + route.children = previous; + } + return [route]; + }, [] as DataRouteObject[]), + context + ); - return ( - - ); + return ( + + ); } diff --git a/playground/rsc-parcel/src/routes.ts b/playground/rsc-parcel/src/routes.ts index 4b183bac10..6c3a916144 100644 --- a/playground/rsc-parcel/src/routes.ts +++ b/playground/rsc-parcel/src/routes.ts @@ -2,23 +2,23 @@ import "./browser"; -import type { RouteObject } from "./react-router.server"; +import type { ServerRouteObject } from "react-router"; import * as home from "./routes/home/home"; import * as root from "./routes/root/root"; -export function routes(): RouteObject[] { - return [ - { - id: "root", - ...root, - children: [ - { - id: "home", - index: true, - ...home, - }, - ], - }, - ]; +export function routes(): ServerRouteObject[] { + return [ + { + id: "root", + ...root, + children: [ + { + id: "home", + index: true, + ...home, + }, + ], + }, + ]; } diff --git a/playground/rsc-parcel/src/server.tsx b/playground/rsc-parcel/src/server.tsx index ac4c51cc99..190115df9d 100644 --- a/playground/rsc-parcel/src/server.tsx +++ b/playground/rsc-parcel/src/server.tsx @@ -2,6 +2,8 @@ import { createRequestListener } from "@mjackson/node-fetch-server"; import express from "express"; import { injectRSCPayload } from "rsc-html-stream/server"; +// @ts-expect-error +import { renderToReadableStream } from "react-server-dom-parcel/server.edge"; // @ts-expect-error import { createFromReadableStream } from "react-server-dom-parcel/client.edge" with { env: "react-client", @@ -14,7 +16,7 @@ import { PrerenderRouter } from "./react-router.ssr" with { env: "react-client", }; -import { handleRequest, type ServerPayload } from "./react-router.server"; +import { matchServerRequest, type ServerPayload } from "react-router"; import { routes } from "./routes"; @@ -39,17 +41,24 @@ app.use( signal: request.signal, } as RequestInit & { duplex?: "half" }); } - const serverResponse = await handleRequest(serverRequest, _routes); + const serverResponse = await matchServerRequest(serverRequest, _routes); - if (isDataRequest || serverResponse.headers.has("x-react-router-error")) { + if (serverResponse instanceof Response) { return serverResponse; } - if (!serverResponse.body) { - throw new Error("No body in server response"); - } + const body = renderToReadableStream(serverResponse.payload); - const [rscStreamA, rscStreamB] = serverResponse.body.tee(); + if (isDataRequest) { + const headers = new Headers(serverResponse.headers); + headers.set("Content-Type", "application/json"); + return new Response(body, { + status: serverResponse.statusCode, + headers, + }); + } + + const [rscStreamA, rscStreamB] = body.tee(); const payload: ServerPayload = await createFromReadableStream(rscStreamA); @@ -66,7 +75,7 @@ app.use( headers.set("Content-Type", "text/html"); return new Response(htmlStream.pipeThrough(injectRSCPayload(rscStreamB)), { - status: serverResponse.status, + status: serverResponse.statusCode, headers, }); }), diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 67da5da3ca..a807554f39 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1247,8 +1247,8 @@ importers: specifier: 0.0.0-experimental-93b58361-20250209 version: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) react-router: - specifier: 0.0.0-experimental-1ebb6d403 - version: 0.0.0-experimental-1ebb6d403(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209) + specifier: workspace:* + version: link:../../packages/react-router react-server-dom-parcel: specifier: 0.0.0-experimental-93b58361-20250209 version: 0.0.0-experimental-93b58361-20250209(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209) @@ -7783,16 +7783,6 @@ packages: resolution: {integrity: sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==} engines: {node: '>=0.10.0'} - react-router@0.0.0-experimental-1ebb6d403: - resolution: {integrity: sha512-GqXmiGT94oWp/w5JjQO5e5dFBSu3qiOrBfwf9YkfpRitJ/RiXgAOuHciRpy8DBBpKxyvrH5Mf28QugqL+wxDBg==} - engines: {node: '>=20.0.0'} - peerDependencies: - react: 0.0.0-experimental-93b58361-20250209 - react-dom: 0.0.0-experimental-93b58361-20250209 - peerDependenciesMeta: - react-dom: - optional: true - react-server-dom-parcel@0.0.0-experimental-93b58361-20250209: resolution: {integrity: sha512-ASAqPoho6m+5fb9SuJY8hcA7Il9QV72og4ZhA8Q3SYM8yZnE1PxvUpt84cipNg0RmmT6BiRX1FpbxhtfhPCyGQ==} engines: {node: '>=0.10.0'} @@ -17096,16 +17086,6 @@ snapshots: react-refresh@0.14.0: {} - react-router@0.0.0-experimental-1ebb6d403(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209): - dependencies: - '@types/cookie': 0.6.0 - cookie: 1.0.1 - react: 0.0.0-experimental-93b58361-20250209 - set-cookie-parser: 2.6.0 - turbo-stream: 2.4.0 - optionalDependencies: - react-dom: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) - react-server-dom-parcel@0.0.0-experimental-93b58361-20250209(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209): dependencies: react: 0.0.0-experimental-93b58361-20250209 From 7db2d812ac7d6294ce2041794f1d7c0b0230f684 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Wed, 19 Feb 2025 12:03:58 -0800 Subject: [PATCH 003/143] feat: add `routeServerRequest` to abstract out the bundler / runtime specific parts --- packages/react-router/index.ts | 16 +- .../react-router/lib/html-stream/browser.ts | 37 ++++ .../react-router/lib/html-stream/server.ts | 114 +++++++++++ packages/react-router/lib/server.ts | 192 ++++++++++++++++++ packages/react-router/server.ts | 149 +------------- playground/rsc-parcel/src/server.tsx | 76 +++---- 6 files changed, 387 insertions(+), 197 deletions(-) create mode 100644 packages/react-router/lib/html-stream/browser.ts create mode 100644 packages/react-router/lib/html-stream/server.ts create mode 100644 packages/react-router/lib/server.ts diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts index 9868daa933..95672b2ffd 100644 --- a/packages/react-router/index.ts +++ b/packages/react-router/index.ts @@ -349,18 +349,14 @@ export { ServerMode as UNSAFE_ServerMode } from "./lib/server-runtime/mode"; /** @internal */ export { useScrollRestoration as UNSAFE_useScrollRestoration } from "./lib/dom/lib"; -import type { ServerRouteObject, ServerMatch } from "./server"; export type { ServerMatch, ServerPayload, ServerRouteMatch, ServerRouteObject, -} from "./server"; -export async function matchServerRequest( - request: Request, - routes: ServerRouteObject[] -): Promise { - throw new Error( - "matchServerRequest is not available in client runtimes. Module resolution must enable the react-server condition." - ); -} +} from "./lib/server"; +export { + isReactServerRequest, + matchServerRequest, + routeServerRequest, +} from "./lib/server"; diff --git a/packages/react-router/lib/html-stream/browser.ts b/packages/react-router/lib/html-stream/browser.ts new file mode 100644 index 0000000000..3a8da15ab6 --- /dev/null +++ b/packages/react-router/lib/html-stream/browser.ts @@ -0,0 +1,37 @@ +declare global { + interface Window { + __FLIGHT_DATA: any[]; + } +} + +let encoder = new TextEncoder(); +let streamController: ReadableStreamDefaultController | null = null; +export let rscStream = new ReadableStream({ + start(controller) { + if (typeof window === "undefined") { + return; + } + let handleChunk = (chunk: string) => { + if (typeof chunk === "string") { + controller.enqueue(encoder.encode(chunk)); + } else { + controller.enqueue(chunk); + } + }; + window.__FLIGHT_DATA ||= []; + window.__FLIGHT_DATA.forEach(handleChunk); + window.__FLIGHT_DATA.push = (chunk) => { + handleChunk(chunk); + return 0; + }; + streamController = controller; + }, +}); + +if (typeof document !== "undefined" && document.readyState === "loading") { + document.addEventListener("DOMContentLoaded", () => { + streamController?.close(); + }); +} else { + (streamController as any)?.close(); +} diff --git a/packages/react-router/lib/html-stream/server.ts b/packages/react-router/lib/html-stream/server.ts new file mode 100644 index 0000000000..2fbb6b6669 --- /dev/null +++ b/packages/react-router/lib/html-stream/server.ts @@ -0,0 +1,114 @@ +const encoder = new TextEncoder(); +const trailer = ""; + +export function injectRSCPayload(rscStream: ReadableStream) { + let decoder = new TextDecoder(); + let resolveFlightDataPromise: (value: void) => void; + let flightDataPromise = new Promise( + (resolve) => (resolveFlightDataPromise = resolve) + ); + let startedRSC = false; + + // Buffer all HTML chunks enqueued during the current tick of the event loop (roughly) + // and write them to the output stream all at once. This ensures that we don't generate + // invalid HTML by injecting RSC in between two partial chunks of HTML. + let buffered: Uint8Array[] = []; + let timeout: ReturnType | null = null; + function flushBufferedChunks( + controller: TransformStreamDefaultController + ) { + for (let chunk of buffered) { + let buf = decoder.decode(chunk); + if (buf.endsWith(trailer)) { + buf = buf.slice(0, -trailer.length); + } + controller.enqueue(encoder.encode(buf)); + } + + buffered.length = 0; + timeout = null; + } + + return new TransformStream({ + transform(chunk, controller) { + buffered.push(chunk); + if (timeout) { + return; + } + + timeout = setTimeout(async () => { + flushBufferedChunks(controller); + if (!startedRSC) { + startedRSC = true; + writeRSCStream(rscStream, controller) + .catch((err) => controller.error(err)) + .then(resolveFlightDataPromise); + } + }, 0); + }, + async flush(controller) { + await flightDataPromise; + if (timeout) { + clearTimeout(timeout); + flushBufferedChunks(controller); + } + controller.enqueue(encoder.encode("")); + }, + }); +} + +async function writeRSCStream( + rscStream: ReadableStream, + controller: TransformStreamDefaultController +) { + let decoder = new TextDecoder("utf-8", { fatal: true }); + const reader = rscStream.getReader(); + try { + let read: ReadableStreamReadResult; + while ((read = await reader.read()) && !read.done) { + const chunk = read.value; + // Try decoding the chunk to send as a string. + // If that fails (e.g. binary data that is invalid unicode), write as base64. + try { + writeChunk( + JSON.stringify(decoder.decode(chunk, { stream: true })), + controller + ); + } catch (err) { + let base64 = JSON.stringify(btoa(String.fromCodePoint(...chunk))); + writeChunk( + `Uint8Array.from(atob(${base64}), m => m.codePointAt(0))`, + controller + ); + } + } + } finally { + reader.releaseLock(); + } + + let remaining = decoder.decode(); + if (remaining.length) { + writeChunk(JSON.stringify(remaining), controller); + } +} + +function writeChunk( + chunk: string, + controller: TransformStreamDefaultController +) { + controller.enqueue( + encoder.encode( + `` + ) + ); +} + +// Escape closing script tags and HTML comments in JS content. +// https://www.w3.org/TR/html52/semantics-scripting.html#restrictions-for-contents-of-script-elements +// Avoid replacing ; + ErrorBoundary?: React.ComponentType; + handle?: any; + HydrateFallback?: React.ComponentType; + Layout?: React.ComponentType; + links?: LinksFunction; + loader?: LoaderFunction; + meta?: MetaFunction; + shouldRevalidate?: ShouldRevalidateFunction; + }; + +export type ServerRouteMatch = { + clientAction?: ClientActionFunction; + clientLoader?: ClientLoaderFunction; + Component?: React.ComponentType; + ErrorBoundary?: React.ComponentType; + handle?: any; + hasAction: boolean; + hasLoader: boolean; + HydrateFallback?: React.ComponentType; + id: string; + index?: boolean; + Layout?: React.ComponentType; + links?: LinksFunction; + meta?: MetaFunction; + params: Params; + path?: string; + pathname: string; + pathnameBase: string; + shouldRevalidate?: ShouldRevalidateFunction; +}; + +export type ServerPayload = { + actionData: Record | null; + basename?: string; + deepestRenderedBoundaryId?: string; + errors: Record | null; + loaderData: Record; + location: Location; + matches: ServerRouteMatch[]; + nonce?: string; +}; + +export type ServerMatch = { + statusCode: number; + headers: Headers; + payload: ServerPayload; +}; + +export async function matchServerRequest( + request: Request, + routes: ServerRouteObject[] +): Promise { + const handler = createStaticHandler(routes); + const result = await handler.query(request); + + if (result instanceof Response) { + const headers = new Headers(result.headers); + headers.set("Vary", "Content-Type"); + headers.set("x-react-router-error", "true"); + return result; + } + + const errors = result.errors + ? Object.fromEntries( + Object.entries(result.errors).map(([key, error]) => [ + key, + isRouteErrorResponse(error) + ? Object.fromEntries(Object.entries(error)) + : error, + ]) + ) + : result.errors; + + const payload = { + actionData: result.actionData, + deepestRenderedBoundaryId: result._deepestRenderedBoundaryId ?? undefined, + errors, + loaderData: result.loaderData, + location: result.location, + matches: result.matches.map((match) => ({ + clientAction: (match.route as any).clientAction, + clientLoader: (match.route as any).clientLoader, + Component: (match.route as any).default, + ErrorBoundary: (match.route as any).ErrorBoundary, + handle: (match.route as any).handle, + hasAction: !!match.route.action, + hasLoader: !!match.route.loader, + HydrateFallback: (match.route as any).HydrateFallback, + id: match.route.id, + index: match.route.index, + Layout: (match.route as any).Layout, + links: (match.route as any).links, + meta: (match.route as any).meta, + params: match.params, + path: match.route.path, + pathname: match.pathname, + pathnameBase: match.pathnameBase, + shouldRevalidate: (match.route as any).shouldRevalidate, + })), + } satisfies ServerPayload; + + return { + statusCode: result.statusCode, + headers: new Headers({ + "Content-Type": "text/x-component", + Vary: "Content-Type", + }), + payload, + }; +} + +import { injectRSCPayload } from "./html-stream/server"; +export async function routeServerRequest( + request: Request, + requestServer: (request: Request) => Promise, + renderHTML: ( + response: Response + ) => ReadableStream | Promise> +) { + const url = new URL(request.url); + let serverRequest = request; + const isDataRequest = isReactServerRequest(url); + if (isDataRequest) { + const serverURL = new URL(request.url); + serverURL.pathname = serverURL.pathname.replace(/\.rsc$/, ""); + serverRequest = new Request(serverURL, { + body: request.body, + duplex: request.body ? "half" : undefined, + headers: request.headers, + method: request.method, + signal: request.signal, + } as RequestInit & { duplex?: "half" }); + } + + const serverResponse = await requestServer(serverRequest); + + if (isDataRequest) { + return serverResponse; + } + + if (!serverResponse.body) { + throw new Error("Missing body in server response"); + } + + const serverResponseB = serverResponse.clone(); + if (!serverResponseB.body) { + throw new Error("Failed to clone server response"); + } + + const html = await renderHTML(serverResponse); + const body = html.pipeThrough(injectRSCPayload(serverResponseB.body)); + + const headers = new Headers(serverResponse.headers); + headers.set("Content-Type", "text/html"); + + return new Response(body, { + status: serverResponse.status, + headers, + }); +} + +export function isReactServerRequest(url: URL) { + return url.pathname.endsWith(".rsc"); +} diff --git a/packages/react-router/server.ts b/packages/react-router/server.ts index 420fd3f188..a1bb2566d5 100644 --- a/packages/react-router/server.ts +++ b/packages/react-router/server.ts @@ -1,141 +1,14 @@ -import type { - ClientActionFunction, - ClientLoaderFunction, - LinksFunction, - MetaFunction, -} from "./lib/dom/ssr/routeModules"; -import type { Location } from "./lib/router/history"; -import { createStaticHandler } from "./lib/router/router"; -import { - isRouteErrorResponse, - type ActionFunction, - type LoaderFunction, - type Params, - type ShouldRevalidateFunction, -} from "./lib/router/utils"; - export { createStaticHandler } from "./lib/router/router"; export { matchRoutes } from "./lib/router/utils"; -export type ServerRouteObject = { id: string; path?: string } & ( - | { - index: true; - } - | { - children?: ServerRouteObject[]; - } -) & { - action?: ActionFunction; - clientAction?: ClientActionFunction; - clientLoader?: ClientLoaderFunction; - Component?: React.ComponentType; - ErrorBoundary?: React.ComponentType; - handle?: any; - HydrateFallback?: React.ComponentType; - Layout?: React.ComponentType; - links?: LinksFunction; - loader?: LoaderFunction; - meta?: MetaFunction; - shouldRevalidate?: ShouldRevalidateFunction; - }; - -export type ServerRouteMatch = { - clientAction?: ClientActionFunction; - clientLoader?: ClientLoaderFunction; - Component?: React.ComponentType; - ErrorBoundary?: React.ComponentType; - handle?: any; - hasAction: boolean; - hasLoader: boolean; - HydrateFallback?: React.ComponentType; - id: string; - index?: boolean; - Layout?: React.ComponentType; - links?: LinksFunction; - meta?: MetaFunction; - params: Params; - path?: string; - pathname: string; - pathnameBase: string; - shouldRevalidate?: ShouldRevalidateFunction; -}; - -export type ServerPayload = { - actionData: Record | null; - basename?: string; - deepestRenderedBoundaryId?: string; - errors: Record | null; - loaderData: Record; - location: Location; - matches: ServerRouteMatch[]; - nonce?: string; -}; - -export type ServerMatch = { - statusCode: number; - headers: Headers; - payload: ServerPayload; -}; - -export async function matchServerRequest( - request: Request, - routes: ServerRouteObject[] -): Promise { - const handler = createStaticHandler(routes); - const result = await handler.query(request); - - if (result instanceof Response) { - const headers = new Headers(result.headers); - headers.set("Vary", "Content-Type"); - headers.set("x-react-router-error", "true"); - return result; - } - - const errors = result.errors - ? Object.fromEntries( - Object.entries(result.errors).map(([key, error]) => [ - key, - isRouteErrorResponse(error) - ? Object.fromEntries(Object.entries(error)) - : error, - ]) - ) - : result.errors; - - const payload = { - actionData: result.actionData, - deepestRenderedBoundaryId: result._deepestRenderedBoundaryId ?? undefined, - errors, - loaderData: result.loaderData, - location: result.location, - matches: result.matches.map((match) => ({ - clientAction: (match.route as any).clientAction, - clientLoader: (match.route as any).clientLoader, - Component: (match.route as any).default, - ErrorBoundary: (match.route as any).ErrorBoundary, - handle: (match.route as any).handle, - hasAction: !!match.route.action, - hasLoader: !!match.route.loader, - HydrateFallback: (match.route as any).HydrateFallback, - id: match.route.id, - index: match.route.index, - Layout: (match.route as any).Layout, - links: (match.route as any).links, - meta: (match.route as any).meta, - params: match.params, - path: match.route.path, - pathname: match.pathname, - pathnameBase: match.pathnameBase, - shouldRevalidate: (match.route as any).shouldRevalidate, - })), - } satisfies ServerPayload; - - return { - statusCode: result.statusCode, - headers: new Headers({ - "Content-Type": "text/x-component", - Vary: "Content-Type", - }), - payload, - }; -} +export type { + ServerMatch, + ServerPayload, + ServerRouteMatch, + ServerRouteObject, +} from "./lib/server"; +export { + isReactServerRequest, + matchServerRequest, + routeServerRequest, +} from "./lib/server"; diff --git a/playground/rsc-parcel/src/server.tsx b/playground/rsc-parcel/src/server.tsx index 190115df9d..b6fa7eeb96 100644 --- a/playground/rsc-parcel/src/server.tsx +++ b/playground/rsc-parcel/src/server.tsx @@ -1,6 +1,5 @@ import { createRequestListener } from "@mjackson/node-fetch-server"; import express from "express"; -import { injectRSCPayload } from "rsc-html-stream/server"; // @ts-expect-error import { renderToReadableStream } from "react-server-dom-parcel/server.edge"; @@ -17,6 +16,9 @@ import { PrerenderRouter } from "./react-router.ssr" with { }; import { matchServerRequest, type ServerPayload } from "react-router"; +import { routeServerRequest } from "react-router" with { + env: "react-client", +}; import { routes } from "./routes"; @@ -28,56 +30,32 @@ app.use(express.static("dist")); app.use( createRequestListener(async (request) => { - let serverRequest = request; - const serverURL = new URL(request.url); - const isDataRequest = serverURL.pathname.endsWith(".data"); - if (isDataRequest) { - serverURL.pathname = serverURL.pathname.replace(/\.data$/, ""); - serverRequest = new Request(serverURL, { - body: request.body, - duplex: request.body ? "half" : undefined, - headers: request.headers, - method: request.method, - signal: request.signal, - } as RequestInit & { duplex?: "half" }); - } - const serverResponse = await matchServerRequest(serverRequest, _routes); - - if (serverResponse instanceof Response) { - return serverResponse; - } - - const body = renderToReadableStream(serverResponse.payload); - - if (isDataRequest) { - const headers = new Headers(serverResponse.headers); - headers.set("Content-Type", "application/json"); - return new Response(body, { - status: serverResponse.statusCode, - headers, - }); - } - - const [rscStreamA, rscStreamB] = body.tee(); - - const payload: ServerPayload = await createFromReadableStream(rscStreamA); - - const htmlStream = await renderHTMLToReadableStream( - , - { - bootstrapScriptContent: ( - routes as unknown as { bootstrapScript: string } - ).bootstrapScript, + return routeServerRequest( + request, + async (request) => { + const match = await matchServerRequest(request, _routes); + if (match instanceof Response) { + return match; + } + + return new Response(renderToReadableStream(match.payload), { + status: match.statusCode, + headers: match.headers, + }); }, + async (response) => { + const payload: ServerPayload = await createFromReadableStream(response.body); + + return await renderHTMLToReadableStream( + , + { + bootstrapScriptContent: ( + routes as unknown as { bootstrapScript: string } + ).bootstrapScript, + }, + ); + } ); - - const headers = new Headers(serverResponse.headers); - headers.set("Content-Type", "text/html"); - - return new Response(htmlStream.pipeThrough(injectRSCPayload(rscStreamB)), { - status: serverResponse.statusCode, - headers, - }); }), ); From 27438a53017f75a8756c6090f5f098a9d5c9dbb4 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Wed, 19 Feb 2025 12:58:49 -0800 Subject: [PATCH 004/143] move things to core --- packages/react-router/index.ts | 3 + .../react-router/lib/html-stream/browser.ts | 63 ++++++++++--------- .../react-router/lib/html-stream/server.ts | 2 + .../react-router/lib/server.browser.tsx | 21 +++---- .../react-router/lib/server.static.tsx | 13 ++-- packages/react-router/lib/server.ts | 2 +- playground/rsc-parcel/package.json | 3 +- playground/rsc-parcel/src/browser.tsx | 34 +++++----- .../rsc-parcel/src/react-router.client.ts | 3 - playground/rsc-parcel/src/server.tsx | 7 +-- pnpm-lock.yaml | 8 --- 11 files changed, 76 insertions(+), 83 deletions(-) rename playground/rsc-parcel/src/react-router.browser.tsx => packages/react-router/lib/server.browser.tsx (66%) rename playground/rsc-parcel/src/react-router.ssr.tsx => packages/react-router/lib/server.static.tsx (85%) delete mode 100644 playground/rsc-parcel/src/react-router.client.ts diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts index 95672b2ffd..f79bc02230 100644 --- a/packages/react-router/index.ts +++ b/packages/react-router/index.ts @@ -360,3 +360,6 @@ export { matchServerRequest, routeServerRequest, } from "./lib/server"; +export { ServerBrowserRouter } from "./lib/server.browser"; +export { ServerStaticRouter } from "./lib/server.static"; +export { getServerStream } from "./lib/html-stream/browser"; diff --git a/packages/react-router/lib/html-stream/browser.ts b/packages/react-router/lib/html-stream/browser.ts index 3a8da15ab6..91a88c1037 100644 --- a/packages/react-router/lib/html-stream/browser.ts +++ b/packages/react-router/lib/html-stream/browser.ts @@ -1,37 +1,44 @@ +// https://github.com/devongovett/rsc-html-stream/blob/main/client.js + declare global { interface Window { __FLIGHT_DATA: any[]; } } -let encoder = new TextEncoder(); -let streamController: ReadableStreamDefaultController | null = null; -export let rscStream = new ReadableStream({ - start(controller) { - if (typeof window === "undefined") { - return; - } - let handleChunk = (chunk: string) => { - if (typeof chunk === "string") { - controller.enqueue(encoder.encode(chunk)); - } else { - controller.enqueue(chunk); +export function getServerStream() { + let encoder = new TextEncoder(); + let streamController: ReadableStreamDefaultController | null = + null; + let rscStream = new ReadableStream({ + start(controller) { + if (typeof window === "undefined") { + return; } - }; - window.__FLIGHT_DATA ||= []; - window.__FLIGHT_DATA.forEach(handleChunk); - window.__FLIGHT_DATA.push = (chunk) => { - handleChunk(chunk); - return 0; - }; - streamController = controller; - }, -}); - -if (typeof document !== "undefined" && document.readyState === "loading") { - document.addEventListener("DOMContentLoaded", () => { - streamController?.close(); + let handleChunk = (chunk: string) => { + if (typeof chunk === "string") { + controller.enqueue(encoder.encode(chunk)); + } else { + controller.enqueue(chunk); + } + }; + window.__FLIGHT_DATA ||= []; + window.__FLIGHT_DATA.forEach(handleChunk); + window.__FLIGHT_DATA.push = (chunk) => { + handleChunk(chunk); + return 0; + }; + streamController = controller; + }, }); -} else { - (streamController as any)?.close(); + + if (typeof document !== "undefined" && document.readyState === "loading") { + document.addEventListener("DOMContentLoaded", () => { + streamController?.close(); + }); + } else { + (streamController as any)?.close(); + } + + return rscStream; } diff --git a/packages/react-router/lib/html-stream/server.ts b/packages/react-router/lib/html-stream/server.ts index 2fbb6b6669..16419d4758 100644 --- a/packages/react-router/lib/html-stream/server.ts +++ b/packages/react-router/lib/html-stream/server.ts @@ -1,3 +1,5 @@ +// https://github.com/devongovett/rsc-html-stream/blob/main/server.js + const encoder = new TextEncoder(); const trailer = ""; diff --git a/playground/rsc-parcel/src/react-router.browser.tsx b/packages/react-router/lib/server.browser.tsx similarity index 66% rename from playground/rsc-parcel/src/react-router.browser.tsx rename to packages/react-router/lib/server.browser.tsx index e844e17599..52792ed1c9 100644 --- a/playground/rsc-parcel/src/react-router.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -1,13 +1,12 @@ -import { - UNSAFE_createRouter, - RouterProvider, - type DataRouteObject, - UNSAFE_createBrowserHistory, -} from "react-router"; +import * as React from "react"; +import { RouterProvider } from "./components"; +import type { DataRouteObject } from "./context"; +import { createBrowserHistory } from "./router/history"; +import { createRouter } from "./router/router"; +import type { ServerPayload } from "./server"; -import type { ServerPayload } from "react-router"; - -export function BrowserRouter({ payload }: { payload: ServerPayload }) { +export function ServerBrowserRouter({ payload }: { payload: ServerPayload }) { + // TODO: Implement this const routes = payload.matches.reduceRight((previous, match) => { const route: DataRouteObject = { id: match.id, @@ -28,9 +27,9 @@ export function BrowserRouter({ payload }: { payload: ServerPayload }) { return [route]; }, [] as DataRouteObject[]); - const router = UNSAFE_createRouter({ + const router = createRouter({ basename: payload.basename, - history: UNSAFE_createBrowserHistory(), + history: createBrowserHistory(), hydrationData: { actionData: payload.actionData, errors: payload.errors, diff --git a/playground/rsc-parcel/src/react-router.ssr.tsx b/packages/react-router/lib/server.static.tsx similarity index 85% rename from playground/rsc-parcel/src/react-router.ssr.tsx rename to packages/react-router/lib/server.static.tsx index ac5ecf764e..bd644e3070 100644 --- a/playground/rsc-parcel/src/react-router.ssr.tsx +++ b/packages/react-router/lib/server.static.tsx @@ -1,12 +1,9 @@ -import { - createStaticRouter, - StaticRouterProvider, - type DataRouteObject, -} from "react-router"; +import * as React from "react"; +import type { DataRouteObject } from "./context"; +import { createStaticRouter, StaticRouterProvider } from "./dom/server"; +import type { ServerPayload } from "./server"; -import type { ServerPayload } from "react-router"; - -export function PrerenderRouter({ payload }: { payload: ServerPayload }) { +export function ServerStaticRouter({ payload }: { payload: ServerPayload }) { const context = { actionData: payload.actionData, actionHeaders: {}, diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index aa63dec2b0..ce59880758 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -4,6 +4,7 @@ import type { LinksFunction, MetaFunction, } from "./dom/ssr/routeModules"; +import { injectRSCPayload } from "./html-stream/server"; import type { Location } from "./router/history"; import { createStaticHandler } from "./router/router"; import { @@ -137,7 +138,6 @@ export async function matchServerRequest( }; } -import { injectRSCPayload } from "./html-stream/server"; export async function routeServerRequest( request: Request, requestServer: (request: Request) => Promise, diff --git a/playground/rsc-parcel/package.json b/playground/rsc-parcel/package.json index 6b2193a8e2..edd3a32d3e 100644 --- a/playground/rsc-parcel/package.json +++ b/playground/rsc-parcel/package.json @@ -32,8 +32,7 @@ "react": "0.0.0-experimental-93b58361-20250209", "react-dom": "0.0.0-experimental-93b58361-20250209", "react-router": "workspace:*", - "react-server-dom-parcel": "0.0.0-experimental-93b58361-20250209", - "rsc-html-stream": "0.0.4" + "react-server-dom-parcel": "0.0.0-experimental-93b58361-20250209" }, "pnpm": { "overrides": { diff --git a/playground/rsc-parcel/src/browser.tsx b/playground/rsc-parcel/src/browser.tsx index 80efc12ce1..e3f782b674 100644 --- a/playground/rsc-parcel/src/browser.tsx +++ b/playground/rsc-parcel/src/browser.tsx @@ -4,22 +4,22 @@ import { startTransition, StrictMode, type ReactElement } from "react"; import { hydrateRoot } from "react-dom/client"; // @ts-expect-error import { createFromReadableStream } from "react-server-dom-parcel/client"; -import { rscStream } from "rsc-html-stream/client"; -import type { ServerPayload } from "react-router"; -import { BrowserRouter } from "./react-router.browser"; +import { + type ServerPayload, + getServerStream, + ServerBrowserRouter, +} from "react-router"; -const initialRSCPayloadPromise = - createFromReadableStream(rscStream); - -initialRSCPayloadPromise.then((initialRSCPayload: ServerPayload) => { - console.log(initialRSCPayload); - startTransition(() => { - hydrateRoot( - document, - - - - ); - }); -}); +createFromReadableStream(getServerStream()).then( + (payload: ServerPayload) => { + startTransition(() => { + hydrateRoot( + document, + + + + ); + }); + } +); diff --git a/playground/rsc-parcel/src/react-router.client.ts b/playground/rsc-parcel/src/react-router.client.ts deleted file mode 100644 index f26ae87d0a..0000000000 --- a/playground/rsc-parcel/src/react-router.client.ts +++ /dev/null @@ -1,3 +0,0 @@ -"use client"; - -export { Link, Outlet } from "react-router"; diff --git a/playground/rsc-parcel/src/server.tsx b/playground/rsc-parcel/src/server.tsx index b6fa7eeb96..5a806459b6 100644 --- a/playground/rsc-parcel/src/server.tsx +++ b/playground/rsc-parcel/src/server.tsx @@ -11,12 +11,9 @@ import { createFromReadableStream } from "react-server-dom-parcel/client.edge" w import { renderToReadableStream as renderHTMLToReadableStream } from "react-dom/server.edge" with { env: "react-client", }; -import { PrerenderRouter } from "./react-router.ssr" with { - env: "react-client", -}; import { matchServerRequest, type ServerPayload } from "react-router"; -import { routeServerRequest } from "react-router" with { +import { routeServerRequest, ServerStaticRouter } from "react-router" with { env: "react-client", }; @@ -47,7 +44,7 @@ app.use( const payload: ServerPayload = await createFromReadableStream(response.body); return await renderHTMLToReadableStream( - , + , { bootstrapScriptContent: ( routes as unknown as { bootstrapScript: string } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a807554f39..e90462a95f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1252,9 +1252,6 @@ importers: react-server-dom-parcel: specifier: 0.0.0-experimental-93b58361-20250209 version: 0.0.0-experimental-93b58361-20250209(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209) - rsc-html-stream: - specifier: 0.0.4 - version: 0.0.4 devDependencies: '@biomejs/biome': specifier: ^1.9.4 @@ -7984,9 +7981,6 @@ packages: rrweb-cssom@0.6.0: resolution: {integrity: sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==} - rsc-html-stream@0.0.4: - resolution: {integrity: sha512-1isiXIrlTI/vRLTvS3O4fMrO9qIHje1FSphufrIV5QfzHUgBDCZFwP9b8+rH63nbhxtcKTqfyziwM+2khfX0Uw==} - run-async@2.4.1: resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==} engines: {node: '>=0.12.0'} @@ -17355,8 +17349,6 @@ snapshots: rrweb-cssom@0.6.0: {} - rsc-html-stream@0.0.4: {} - run-async@2.4.1: {} run-parallel@1.2.0: From aabc80750d9caeffbb481da1c542306d3a1777c7 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Wed, 19 Feb 2025 14:04:33 -0800 Subject: [PATCH 005/143] cleanup --- .vscode/settings.json | 3 +++ playground/rsc-parcel/src/server.tsx | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 9e4816b2c0..4e0cf8a198 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -13,5 +13,8 @@ }, "[typescriptreact]": { "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[javascript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" } } diff --git a/playground/rsc-parcel/src/server.tsx b/playground/rsc-parcel/src/server.tsx index 5a806459b6..0dfa2d7e79 100644 --- a/playground/rsc-parcel/src/server.tsx +++ b/playground/rsc-parcel/src/server.tsx @@ -17,7 +17,9 @@ import { routeServerRequest, ServerStaticRouter } from "react-router" with { env: "react-client", }; -import { routes } from "./routes"; +import { routes } from "./routes" with { + env: "react-server", +}; const _routes = routes(); From 9b38f06fcc9dba0c0b065478990d9953eb1b7d7b Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Wed, 19 Feb 2025 15:21:39 -0800 Subject: [PATCH 006/143] feat: add initial server "manifest" payload --- packages/react-router/lib/server.browser.tsx | 2 + packages/react-router/lib/server.static.tsx | 2 + packages/react-router/lib/server.ts | 77 ++++++++++++++++++-- 3 files changed, 74 insertions(+), 7 deletions(-) diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index 52792ed1c9..e6dff383a0 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -6,6 +6,8 @@ import { createRouter } from "./router/router"; import type { ServerPayload } from "./server"; export function ServerBrowserRouter({ payload }: { payload: ServerPayload }) { + if (payload.type !== "render") return null; + // TODO: Implement this const routes = payload.matches.reduceRight((previous, match) => { const route: DataRouteObject = { diff --git a/packages/react-router/lib/server.static.tsx b/packages/react-router/lib/server.static.tsx index bd644e3070..4111d84c93 100644 --- a/packages/react-router/lib/server.static.tsx +++ b/packages/react-router/lib/server.static.tsx @@ -4,6 +4,8 @@ import { createStaticRouter, StaticRouterProvider } from "./dom/server"; import type { ServerPayload } from "./server"; export function ServerStaticRouter({ payload }: { payload: ServerPayload }) { + if (payload.type !== "render") return null; + const context = { actionData: payload.actionData, actionHeaders: {}, diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index ce59880758..e0cf92bae3 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -26,7 +26,7 @@ export type ServerRouteObject = { id: string; path?: string } & ( action?: ActionFunction; clientAction?: ClientActionFunction; clientLoader?: ClientLoaderFunction; - Component?: React.ComponentType; + default?: React.ComponentType; ErrorBoundary?: React.ComponentType; handle?: any; HydrateFallback?: React.ComponentType; @@ -37,7 +37,7 @@ export type ServerRouteObject = { id: string; path?: string } & ( shouldRevalidate?: ShouldRevalidateFunction; }; -export type ServerRouteMatch = { +export type ServerRouteManifest = { clientAction?: ClientActionFunction; clientLoader?: ClientLoaderFunction; Component?: React.ComponentType; @@ -51,14 +51,22 @@ export type ServerRouteMatch = { Layout?: React.ComponentType; links?: LinksFunction; meta?: MetaFunction; - params: Params; path?: string; + shouldRevalidate?: ShouldRevalidateFunction; +}; + +export type ServerRouteManifestTree = ServerRouteManifest & { + children?: ServerRouteManifestTree[]; +}; + +export type ServerRouteMatch = ServerRouteManifest & { + params: Params; pathname: string; pathnameBase: string; - shouldRevalidate?: ShouldRevalidateFunction; }; -export type ServerPayload = { +export type ServerRenderPayload = { + type: "render"; actionData: Record | null; basename?: string; deepestRenderedBoundaryId?: string; @@ -69,16 +77,66 @@ export type ServerPayload = { nonce?: string; }; +export type ServerManifestPayload = { + type: "manifest"; + routes: ServerRouteManifestTree[]; +}; + +export type ServerPayload = ServerRenderPayload | ServerManifestPayload; + export type ServerMatch = { statusCode: number; headers: Headers; payload: ServerPayload; }; +function makeServerRouteManifestTree( + routes: ServerRouteObject[] +): ServerRouteManifestTree[] { + return routes.map((route) => { + return { + clientAction: route.clientAction, + clientLoader: route.clientLoader, + Component: route.default, + ErrorBoundary: route.ErrorBoundary, + handle: route.handle, + hasAction: !!route.action, + hasLoader: !!route.loader, + HydrateFallback: route.HydrateFallback, + id: route.id, + index: "index" in route ? route.index : undefined, + Layout: route.Layout, + links: route.links, + meta: route.meta, + path: route.path, + shouldRevalidate: route.shouldRevalidate, + children: + "children" in route && route.children + ? makeServerRouteManifestTree(route.children) + : undefined, + }; + }); +} + export async function matchServerRequest( request: Request, routes: ServerRouteObject[] ): Promise { + const url = new URL(request.url); + if (url.pathname === "/__manifest") { + return { + statusCode: 200, + headers: new Headers({ + "Content-Type": "text/x-component", + Vary: "Content-Type", + }), + payload: { + type: "manifest", + routes: makeServerRouteManifestTree(routes), + } satisfies ServerManifestPayload, + }; + } + const handler = createStaticHandler(routes); const result = await handler.query(request); @@ -101,6 +159,7 @@ export async function matchServerRequest( : result.errors; const payload = { + type: "render", actionData: result.actionData, deepestRenderedBoundaryId: result._deepestRenderedBoundaryId ?? undefined, errors, @@ -126,7 +185,7 @@ export async function matchServerRequest( pathnameBase: match.pathnameBase, shouldRevalidate: (match.route as any).shouldRevalidate, })), - } satisfies ServerPayload; + } satisfies ServerRenderPayload; return { statusCode: result.statusCode, @@ -162,7 +221,7 @@ export async function routeServerRequest( const serverResponse = await requestServer(serverRequest); - if (isDataRequest) { + if (isDataRequest || isManifestRequest(url)) { return serverResponse; } @@ -190,3 +249,7 @@ export async function routeServerRequest( export function isReactServerRequest(url: URL) { return url.pathname.endsWith(".rsc"); } + +export function isManifestRequest(url: URL) { + return url.pathname === "/__manifest"; +} From 10d0ce40c5bdf57b1cdb2ae98adb98d0d5bfcdc2 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Wed, 19 Feb 2025 15:49:31 -0800 Subject: [PATCH 007/143] fix production build --- playground/rsc-parcel/package.json | 91 ++++++++++++---------- playground/rsc-parcel/src/react-server.ts | 23 ++++++ playground/rsc-parcel/src/routes.ts | 4 - playground/rsc-parcel/src/server.tsx | 23 +----- pnpm-lock.yaml | 93 +++++++++++++++++++---- 5 files changed, 155 insertions(+), 79 deletions(-) create mode 100644 playground/rsc-parcel/src/react-server.ts diff --git a/playground/rsc-parcel/package.json b/playground/rsc-parcel/package.json index edd3a32d3e..5af62e5ff1 100644 --- a/playground/rsc-parcel/package.json +++ b/playground/rsc-parcel/package.json @@ -1,44 +1,51 @@ { - "name": "@playground/rsc-parcel", - "private": true, - "source": "src/server.tsx", - "server": "dist/server.js", - "targets": { - "server": { - "context": "react-server", - "includeNodeModules": { - "express": false - } - } - }, - "scripts": { - "dev": "parcel", - "build": "parcel build", - "start": "node dist/server.js" - }, - "devDependencies": { - "@biomejs/biome": "^1.9.4", - "@types/express": "^5.0.0", - "@types/node": "^22.13.1", - "@types/parcel-env": "0.0.8", - "@types/react": "^19.0.8", - "@types/react-dom": "^19.0.3", - "parcel": "2.0.0-canary.1777" - }, - "dependencies": { - "@mjackson/node-fetch-server": "0.6.1", - "@parcel/runtime-rsc": "2.13.4-canary.3402", - "express": "^4.21.2", - "react": "0.0.0-experimental-93b58361-20250209", - "react-dom": "0.0.0-experimental-93b58361-20250209", - "react-router": "workspace:*", - "react-server-dom-parcel": "0.0.0-experimental-93b58361-20250209" - }, - "pnpm": { - "overrides": { - "react": "0.0.0-experimental-93b58361-20250209", - "react-dom": "0.0.0-experimental-93b58361-20250209", - "react-server-dom-parcel": "0.0.0-experimental-93b58361-20250209" - } - } + "name": "@playground/rsc-parcel", + "private": true, + "source": "src/server.tsx", + "server": "dist/server.js", + "targets": { + "server": { + "context": "react-server", + "includeNodeModules": { + "express": false + } + } + }, + "scripts": { + "dev": "parcel", + "build": "parcel build", + "start": "node dist/server.js" + }, + "devDependencies": { + "@biomejs/biome": "^1.9.4", + "@types/express": "^5.0.0", + "@types/node": "^22.13.1", + "@types/parcel-env": "0.0.8", + "@types/react-dom": "^19.0.3", + "@types/react": "^19.0.8", + "browserify-zlib": "^0.2.0", + "buffer": "^5.5.0||^6.0.0", + "events": "^3.1.0", + "parcel": "2.0.0-canary.1777", + "path-browserify": "^1.0.0", + "querystring-es3": "^0.2.1", + "stream-http": "^3.1.0", + "url": "^0.11.0" + }, + "dependencies": { + "@mjackson/node-fetch-server": "0.6.1", + "@parcel/runtime-rsc": "2.13.4-canary.3402", + "express": "^4.21.2", + "react": "0.0.0-experimental-93b58361-20250209", + "react-dom": "0.0.0-experimental-93b58361-20250209", + "react-router": "workspace:*", + "react-server-dom-parcel": "0.0.0-experimental-93b58361-20250209" + }, + "pnpm": { + "overrides": { + "react": "0.0.0-experimental-93b58361-20250209", + "react-dom": "0.0.0-experimental-93b58361-20250209", + "react-server-dom-parcel": "0.0.0-experimental-93b58361-20250209" + } + } } diff --git a/playground/rsc-parcel/src/react-server.ts b/playground/rsc-parcel/src/react-server.ts new file mode 100644 index 0000000000..1195011aad --- /dev/null +++ b/playground/rsc-parcel/src/react-server.ts @@ -0,0 +1,23 @@ +"use server-entry"; + +import "./browser"; + +import { matchServerRequest } from "react-router"; +// @ts-expect-error +import { renderToReadableStream } from "react-server-dom-parcel/server.edge"; + +import { routes } from "./routes"; + +const _routes = routes(); + +export async function callServer(request: Request) { + const match = await matchServerRequest(request, _routes); + if (match instanceof Response) { + return match; + } + + return new Response(renderToReadableStream(match.payload), { + status: match.statusCode, + headers: match.headers, + }); +} diff --git a/playground/rsc-parcel/src/routes.ts b/playground/rsc-parcel/src/routes.ts index 6c3a916144..d56d533bf3 100644 --- a/playground/rsc-parcel/src/routes.ts +++ b/playground/rsc-parcel/src/routes.ts @@ -1,7 +1,3 @@ -"use server-entry"; - -import "./browser"; - import type { ServerRouteObject } from "react-router"; import * as home from "./routes/home/home"; diff --git a/playground/rsc-parcel/src/server.tsx b/playground/rsc-parcel/src/server.tsx index 0dfa2d7e79..8238b26b60 100644 --- a/playground/rsc-parcel/src/server.tsx +++ b/playground/rsc-parcel/src/server.tsx @@ -1,8 +1,6 @@ import { createRequestListener } from "@mjackson/node-fetch-server"; import express from "express"; -// @ts-expect-error -import { renderToReadableStream } from "react-server-dom-parcel/server.edge"; // @ts-expect-error import { createFromReadableStream } from "react-server-dom-parcel/client.edge" with { env: "react-client", @@ -12,17 +10,14 @@ import { renderToReadableStream as renderHTMLToReadableStream } from "react-dom/ env: "react-client", }; -import { matchServerRequest, type ServerPayload } from "react-router"; -import { routeServerRequest, ServerStaticRouter } from "react-router" with { +import { routeServerRequest, ServerStaticRouter,type ServerPayload } from "react-router" with { env: "react-client", }; -import { routes } from "./routes" with { +import { callServer } from "./react-server" with { env: "react-server", }; -const _routes = routes(); - const app = express(); app.use(express.static("dist")); @@ -31,17 +26,7 @@ app.use( createRequestListener(async (request) => { return routeServerRequest( request, - async (request) => { - const match = await matchServerRequest(request, _routes); - if (match instanceof Response) { - return match; - } - - return new Response(renderToReadableStream(match.payload), { - status: match.statusCode, - headers: match.headers, - }); - }, + callServer, async (response) => { const payload: ServerPayload = await createFromReadableStream(response.body); @@ -49,7 +34,7 @@ app.use( , { bootstrapScriptContent: ( - routes as unknown as { bootstrapScript: string } + callServer as unknown as { bootstrapScript: string } ).bootstrapScript, }, ); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e90462a95f..3f9b983fee 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -158,7 +158,7 @@ importers: version: 7.34.1(eslint@8.57.0) eslint-plugin-react-hooks: specifier: next - version: 5.1.0-rc-1c9b1387-20241204(eslint@8.57.0) + version: 5.2.0-canary-a84862db-20250218(eslint@8.57.0) fs-extra: specifier: ^10.1.0 version: 10.1.0 @@ -1271,9 +1271,30 @@ importers: '@types/react-dom': specifier: ^18.2.7 version: 18.2.7 + browserify-zlib: + specifier: ^0.2.0 + version: 0.2.0 + buffer: + specifier: ^5.5.0||^6.0.0 + version: 5.7.1 + events: + specifier: ^3.1.0 + version: 3.3.0 parcel: specifier: 2.0.0-canary.1777 version: 2.0.0-canary.1777(@swc/helpers@0.5.15)(postcss@8.4.49)(terser@5.15.0)(typescript@5.4.5) + path-browserify: + specifier: ^1.0.0 + version: 1.0.1 + querystring-es3: + specifier: ^0.2.1 + version: 0.2.1 + stream-http: + specifier: ^3.1.0 + version: 3.2.0 + url: + specifier: ^0.11.0 + version: 0.11.4 playground/split-route-modules: dependencies: @@ -4636,6 +4657,9 @@ packages: browserify-zlib@0.1.4: resolution: {integrity: sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==} + browserify-zlib@0.2.0: + resolution: {integrity: sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==} + browserslist@4.23.0: resolution: {integrity: sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} @@ -4650,6 +4674,9 @@ packages: buffer@5.7.1: resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==} + builtin-status-codes@3.0.0: + resolution: {integrity: sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==} + builtins@5.0.1: resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==} @@ -5468,8 +5495,8 @@ packages: peerDependencies: eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 - eslint-plugin-react-hooks@5.1.0-rc-1c9b1387-20241204: - resolution: {integrity: sha512-E9JU9aJux/AlcpVVvPvwAzou9pkoCMfIs8JchMUcUufw+poffUoXtV1QG+JE3c5mIJ887BeQyXCX1pQNLghu5g==} + eslint-plugin-react-hooks@5.2.0-canary-a84862db-20250218: + resolution: {integrity: sha512-vxpEdyHHefMT9MrTHIUq8dBGbxBxWN97RPKppPmK9zIX3En2fxnkQYgSiC4nje3USoPgOp4p+GTC8KkhfTNa7w==} engines: {node: '>=10'} peerDependencies: eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0 @@ -7418,6 +7445,9 @@ packages: pako@0.2.9: resolution: {integrity: sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==} + pako@1.0.11: + resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==} + parcel@2.0.0-canary.1777: resolution: {integrity: sha512-PdgoJ84CcpN4ZCa/E6YsrEQ+A4ft9RVgK/UQeuUUuEDy4kU/iHMoi7FOlTmNH+HYlWvbEuRL+RM41n6sPzHwaQ==} engines: {node: '>= 16.0.0'} @@ -7451,6 +7481,9 @@ packages: resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==} engines: {node: '>= 0.8'} + path-browserify@1.0.1: + resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==} + path-exists@4.0.0: resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} engines: {node: '>=8'} @@ -7718,6 +7751,9 @@ packages: resolution: {integrity: sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==} engines: {node: '>=6'} + punycode@1.4.1: + resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==} + punycode@2.3.0: resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==} engines: {node: '>=6'} @@ -7729,14 +7765,14 @@ packages: resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==} engines: {node: '>=0.6'} - qs@6.12.0: - resolution: {integrity: sha512-trVZiI6RMOkO476zLGaBIzszOdFPnCCXHPG9kn0yuS1uz6xdVxPfZdB3vUig9pxPFDM9BRAgz/YUIVQ1/vuiUg==} - engines: {node: '>=0.6'} - qs@6.13.0: resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==} engines: {node: '>=0.6'} + querystring-es3@0.2.1: + resolution: {integrity: sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==} + engines: {node: '>=0.4.x'} + querystringify@2.2.0: resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==} @@ -8224,6 +8260,9 @@ packages: resolution: {integrity: sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==} engines: {node: '>=4', npm: '>=6'} + stream-http@3.2.0: + resolution: {integrity: sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==} + stream-shift@1.0.3: resolution: {integrity: sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==} @@ -8703,6 +8742,10 @@ packages: url-parse@1.5.10: resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==} + url@0.11.4: + resolution: {integrity: sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==} + engines: {node: '>= 0.4'} + util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} @@ -12982,6 +13025,10 @@ snapshots: dependencies: pako: 0.2.9 + browserify-zlib@0.2.0: + dependencies: + pako: 1.0.11 + browserslist@4.23.0: dependencies: caniuse-lite: 1.0.30001599 @@ -13000,6 +13047,8 @@ snapshots: base64-js: 1.5.1 ieee754: 1.2.1 + builtin-status-codes@3.0.0: {} + builtins@5.0.1: dependencies: semver: 7.5.4 @@ -14006,7 +14055,7 @@ snapshots: dependencies: eslint: 8.57.0 - eslint-plugin-react-hooks@5.1.0-rc-1c9b1387-20241204(eslint@8.57.0): + eslint-plugin-react-hooks@5.2.0-canary-a84862db-20250218(eslint@8.57.0): dependencies: eslint: 8.57.0 @@ -14384,7 +14433,7 @@ snapshots: dezalgo: 1.0.4 hexoid: 1.0.0 once: 1.4.0 - qs: 6.12.0 + qs: 6.13.0 forwarded@0.2.0: {} @@ -16718,6 +16767,8 @@ snapshots: pako@0.2.9: {} + pako@1.0.11: {} + parcel@2.0.0-canary.1777(@swc/helpers@0.5.15)(postcss@8.4.49)(terser@5.15.0)(typescript@5.4.5): dependencies: '@parcel/config-default': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)(postcss@8.4.49)(terser@5.15.0)(typescript@5.4.5) @@ -16789,6 +16840,8 @@ snapshots: parseurl@1.3.3: {} + path-browserify@1.0.1: {} + path-exists@4.0.0: {} path-is-absolute@1.0.1: {} @@ -17030,6 +17083,8 @@ snapshots: punycode.js@2.3.1: {} + punycode@1.4.1: {} + punycode@2.3.0: {} pure-rand@6.0.2: {} @@ -17038,14 +17093,12 @@ snapshots: dependencies: side-channel: 1.0.6 - qs@6.12.0: - dependencies: - side-channel: 1.0.6 - qs@6.13.0: dependencies: side-channel: 1.0.6 + querystring-es3@0.2.1: {} + querystringify@2.2.0: {} queue-microtask@1.2.3: {} @@ -17637,6 +17690,13 @@ snapshots: stoppable@1.1.0: {} + stream-http@3.2.0: + dependencies: + builtin-status-codes: 3.0.0 + inherits: 2.0.4 + readable-stream: 3.6.2 + xtend: 4.0.2 + stream-shift@1.0.3: {} stream-slice@0.1.2: {} @@ -17768,7 +17828,7 @@ snapshots: formidable: 2.1.2 methods: 1.1.2 mime: 2.6.0 - qs: 6.12.0 + qs: 6.13.0 semver: 7.5.4 transitivePeerDependencies: - supports-color @@ -18206,6 +18266,11 @@ snapshots: querystringify: 2.2.0 requires-port: 1.0.0 + url@0.11.4: + dependencies: + punycode: 1.4.1 + qs: 6.13.0 + util-deprecate@1.0.2: {} util@0.12.5: From 57c33c97c406a5f45b752af105405b4129f7f12f Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Wed, 19 Feb 2025 15:51:30 -0800 Subject: [PATCH 008/143] flatten routes --- playground/rsc-parcel/src/react-server.ts | 4 +--- playground/rsc-parcel/src/routes.ts | 28 +++++++++++------------ 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/playground/rsc-parcel/src/react-server.ts b/playground/rsc-parcel/src/react-server.ts index 1195011aad..4b58944045 100644 --- a/playground/rsc-parcel/src/react-server.ts +++ b/playground/rsc-parcel/src/react-server.ts @@ -8,10 +8,8 @@ import { renderToReadableStream } from "react-server-dom-parcel/server.edge"; import { routes } from "./routes"; -const _routes = routes(); - export async function callServer(request: Request) { - const match = await matchServerRequest(request, _routes); + const match = await matchServerRequest(request, routes); if (match instanceof Response) { return match; } diff --git a/playground/rsc-parcel/src/routes.ts b/playground/rsc-parcel/src/routes.ts index d56d533bf3..18069ac006 100644 --- a/playground/rsc-parcel/src/routes.ts +++ b/playground/rsc-parcel/src/routes.ts @@ -3,18 +3,16 @@ import type { ServerRouteObject } from "react-router"; import * as home from "./routes/home/home"; import * as root from "./routes/root/root"; -export function routes(): ServerRouteObject[] { - return [ - { - id: "root", - ...root, - children: [ - { - id: "home", - index: true, - ...home, - }, - ], - }, - ]; -} +export const routes = [ + { + id: "root", + ...root, + children: [ + { + id: "home", + index: true, + ...home, + }, + ], + }, +] satisfies ServerRouteObject[]; From 6fd49873b52b290aa39126cb729673f43ae299fd Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Wed, 19 Feb 2025 15:53:06 -0800 Subject: [PATCH 009/143] cleanup types --- playground/rsc-parcel/src/browser.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/playground/rsc-parcel/src/browser.tsx b/playground/rsc-parcel/src/browser.tsx index e3f782b674..830e832479 100644 --- a/playground/rsc-parcel/src/browser.tsx +++ b/playground/rsc-parcel/src/browser.tsx @@ -1,6 +1,6 @@ "use client-entry"; -import { startTransition, StrictMode, type ReactElement } from "react"; +import { startTransition, StrictMode } from "react"; import { hydrateRoot } from "react-dom/client"; // @ts-expect-error import { createFromReadableStream } from "react-server-dom-parcel/client"; @@ -11,7 +11,7 @@ import { ServerBrowserRouter, } from "react-router"; -createFromReadableStream(getServerStream()).then( +createFromReadableStream(getServerStream()).then( (payload: ServerPayload) => { startTransition(() => { hydrateRoot( From aca8764388917d687d4bb63e9416004e54af224f Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Wed, 19 Feb 2025 20:54:28 -0800 Subject: [PATCH 010/143] cleanup --- playground/rsc-parcel/src/browser.tsx | 22 +++++----- playground/rsc-parcel/src/counter.tsx | 20 ++++----- playground/rsc-parcel/src/routes.ts | 8 ++-- .../src/routes/home/home.client.tsx | 24 +++++------ playground/rsc-parcel/src/routes/home/home.ts | 6 +-- .../src/routes/root/root.client.tsx | 41 +++++++++---------- playground/rsc-parcel/src/routes/root/root.ts | 7 ---- .../rsc-parcel/src/routes/root/root.tsx | 10 +++++ 8 files changed, 69 insertions(+), 69 deletions(-) delete mode 100644 playground/rsc-parcel/src/routes/root/root.ts create mode 100644 playground/rsc-parcel/src/routes/root/root.tsx diff --git a/playground/rsc-parcel/src/browser.tsx b/playground/rsc-parcel/src/browser.tsx index 830e832479..b0a9d4e45d 100644 --- a/playground/rsc-parcel/src/browser.tsx +++ b/playground/rsc-parcel/src/browser.tsx @@ -11,15 +11,13 @@ import { ServerBrowserRouter, } from "react-router"; -createFromReadableStream(getServerStream()).then( - (payload: ServerPayload) => { - startTransition(() => { - hydrateRoot( - document, - - - - ); - }); - } -); +createFromReadableStream(getServerStream()).then((payload: ServerPayload) => { + startTransition(() => { + hydrateRoot( + document, + + + + ); + }); +}); diff --git a/playground/rsc-parcel/src/counter.tsx b/playground/rsc-parcel/src/counter.tsx index 0293a7f136..7a5b69a098 100644 --- a/playground/rsc-parcel/src/counter.tsx +++ b/playground/rsc-parcel/src/counter.tsx @@ -3,15 +3,15 @@ import { useState } from "react"; export function Counter() { - const [count, setCount] = useState(0); + const [count, setCount] = useState(0); - return ( -
-

Counter

-

Current count: {count}

- -
- ); + return ( +
+

Counter

+

Current count: {count}

+ +
+ ); } diff --git a/playground/rsc-parcel/src/routes.ts b/playground/rsc-parcel/src/routes.ts index 18069ac006..33a7740f11 100644 --- a/playground/rsc-parcel/src/routes.ts +++ b/playground/rsc-parcel/src/routes.ts @@ -1,17 +1,17 @@ import type { ServerRouteObject } from "react-router"; -import * as home from "./routes/home/home"; -import * as root from "./routes/root/root"; +// import * as home from "./routes/home/home"; +// import * as root from "./routes/root/root"; export const routes = [ { id: "root", - ...root, + lazy: () => import("./routes/root/root"), children: [ { id: "home", index: true, - ...home, + lazy: () => import("./routes/home/home"), }, ], }, diff --git a/playground/rsc-parcel/src/routes/home/home.client.tsx b/playground/rsc-parcel/src/routes/home/home.client.tsx index 6f305f6a23..87d7ce6590 100644 --- a/playground/rsc-parcel/src/routes/home/home.client.tsx +++ b/playground/rsc-parcel/src/routes/home/home.client.tsx @@ -3,20 +3,20 @@ import { type ClientLoaderFunctionArgs, useLoaderData } from "react-router"; export async function clientLoader({ serverLoader }: ClientLoaderFunctionArgs) { - const res = await serverLoader(); + const res = await serverLoader(); - return { - client: true, - ...res, - }; + return { + client: true, + ...res, + }; } -export default function Component() { - const { client, message } = useLoaderData(); +export default function Home() { + const { client, message } = useLoaderData(); - return ( -

- {message} {client} -

- ); + return ( +

+ {message} {client} +

+ ); } diff --git a/playground/rsc-parcel/src/routes/home/home.ts b/playground/rsc-parcel/src/routes/home/home.ts index 82e3a7cff3..22fffe84be 100644 --- a/playground/rsc-parcel/src/routes/home/home.ts +++ b/playground/rsc-parcel/src/routes/home/home.ts @@ -1,7 +1,7 @@ export { clientLoader, default } from "./home.client"; export function loader() { - return { - message: "Hello Home!", - }; + return { + message: "Hello Home!", + }; } diff --git a/playground/rsc-parcel/src/routes/root/root.client.tsx b/playground/rsc-parcel/src/routes/root/root.client.tsx index 276638d7fb..6ae3ef78c4 100644 --- a/playground/rsc-parcel/src/routes/root/root.client.tsx +++ b/playground/rsc-parcel/src/routes/root/root.client.tsx @@ -1,32 +1,31 @@ "use client"; import { Outlet, useLoaderData } from "react-router"; -import { Counter } from "../../counter"; export function Layout({ children }: { children: React.ReactNode }) { - return ( - - - - - React Server - - {children} - - ); + return ( + + + + + React Server + + {children} + + ); } -export default function Component() { - const { message } = useLoaderData(); - return ( - <> -

{message}

- - - - ); +export default function Root() { + const { counter, message } = useLoaderData(); + return ( + <> +

{message}

+ {counter} + + + ); } export function ErrorBoundary() { - return

Something went wrong!

; + return

Something went wrong!

; } diff --git a/playground/rsc-parcel/src/routes/root/root.ts b/playground/rsc-parcel/src/routes/root/root.ts deleted file mode 100644 index a543245651..0000000000 --- a/playground/rsc-parcel/src/routes/root/root.ts +++ /dev/null @@ -1,7 +0,0 @@ -export { default, ErrorBoundary, Layout } from "./root.client"; - -export function loader() { - return { - message: "Hello from the server!", - }; -} diff --git a/playground/rsc-parcel/src/routes/root/root.tsx b/playground/rsc-parcel/src/routes/root/root.tsx new file mode 100644 index 0000000000..347dbd2248 --- /dev/null +++ b/playground/rsc-parcel/src/routes/root/root.tsx @@ -0,0 +1,10 @@ +export { default, ErrorBoundary, Layout } from "./root.client"; + +import { Counter } from "../../counter"; + +export function loader() { + return { + counter: , + message: "Hello from the server!", + }; +} From 9c519c4f7cc85f961743d15dbeb1cd0eebe19b26 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Wed, 19 Feb 2025 21:46:13 -0800 Subject: [PATCH 011/143] render layout --- packages/react-router/lib/server.browser.tsx | 5 +- packages/react-router/lib/server.static.tsx | 18 +++++- packages/react-router/lib/server.ts | 60 +++++++++++-------- playground/rsc-parcel/src/routes.ts | 3 - .../src/routes/home/home.client.tsx | 11 +++- .../src/routes/home/{home.ts => home.tsx} | 0 6 files changed, 63 insertions(+), 34 deletions(-) rename playground/rsc-parcel/src/routes/home/{home.ts => home.tsx} (100%) diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index e6dff383a0..5c566fd983 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -4,6 +4,7 @@ import type { DataRouteObject } from "./context"; import { createBrowserHistory } from "./router/history"; import { createRouter } from "./router/router"; import type { ServerPayload } from "./server"; +import { RouteWrapper } from "./server.static"; export function ServerBrowserRouter({ payload }: { payload: ServerPayload }) { if (payload.type !== "render") return null; @@ -13,7 +14,9 @@ export function ServerBrowserRouter({ payload }: { payload: ServerPayload }) { const route: DataRouteObject = { id: match.id, action: match.hasAction || !!match.clientAction, - Component: match.Component, + element: ( + + ), ErrorBoundary: match.ErrorBoundary, handle: match.handle, hasErrorBoundary: !!match.ErrorBoundary, diff --git a/packages/react-router/lib/server.static.tsx b/packages/react-router/lib/server.static.tsx index 4111d84c93..825fa7b1a3 100644 --- a/packages/react-router/lib/server.static.tsx +++ b/packages/react-router/lib/server.static.tsx @@ -3,6 +3,20 @@ import type { DataRouteObject } from "./context"; import { createStaticRouter, StaticRouterProvider } from "./dom/server"; import type { ServerPayload } from "./server"; +export function RouteWrapper({ + Component, + Layout, +}: { + Component?: React.ComponentType; + Layout?: React.ComponentType; +}) { + return Layout ? ( + {Component ? : null} + ) : Component ? ( + + ) : null; +} + export function ServerStaticRouter({ payload }: { payload: ServerPayload }) { if (payload.type !== "render") return null; @@ -38,7 +52,9 @@ export function ServerStaticRouter({ payload }: { payload: ServerPayload }) { const route: DataRouteObject = { id: match.id, action: match.hasAction || !!match.clientAction, - Component: match.Component, + element: ( + + ), ErrorBoundary: match.ErrorBoundary, handle: match.handle, hasErrorBoundary: !!match.ErrorBoundary, diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index e0cf92bae3..e340468027 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -10,45 +10,53 @@ import { createStaticHandler } from "./router/router"; import { isRouteErrorResponse, type ActionFunction, + type AgnosticRouteObject, + type LazyRouteFunction, type LoaderFunction, type Params, type ShouldRevalidateFunction, } from "./router/utils"; -export type ServerRouteObject = { id: string; path?: string } & ( - | { - index: true; - } - | { - children?: ServerRouteObject[]; - } -) & { - action?: ActionFunction; - clientAction?: ClientActionFunction; - clientLoader?: ClientLoaderFunction; - default?: React.ComponentType; - ErrorBoundary?: React.ComponentType; - handle?: any; - HydrateFallback?: React.ComponentType; - Layout?: React.ComponentType; - links?: LinksFunction; - loader?: LoaderFunction; - meta?: MetaFunction; - shouldRevalidate?: ShouldRevalidateFunction; - }; +type ServerRouteObjectBase = { + action?: ActionFunction; + clientAction?: ClientActionFunction; + clientLoader?: ClientLoaderFunction; + default?: React.ComponentType; + ErrorBoundary?: React.ComponentType; + handle?: any; + HydrateFallback?: React.ComponentType; + Layout?: React.ComponentType; + links?: LinksFunction; + loader?: LoaderFunction; + meta?: MetaFunction; + shouldRevalidate?: ShouldRevalidateFunction; +}; + +export type ServerRouteObject = ServerRouteObjectBase & { + id: string; + path?: string; + lazy?: LazyRouteFunction; +} & ( + | { + index: true; + } + | { + children?: ServerRouteObject[]; + } + ); export type ServerRouteManifest = { clientAction?: ClientActionFunction; clientLoader?: ClientLoaderFunction; - Component?: React.ComponentType; - ErrorBoundary?: React.ComponentType; + Component?: React.ComponentType; + ErrorBoundary?: React.ComponentType; handle?: any; hasAction: boolean; hasLoader: boolean; - HydrateFallback?: React.ComponentType; + HydrateFallback?: React.ComponentType; id: string; index?: boolean; - Layout?: React.ComponentType; + Layout?: React.ComponentType; links?: LinksFunction; meta?: MetaFunction; path?: string; @@ -137,7 +145,7 @@ export async function matchServerRequest( }; } - const handler = createStaticHandler(routes); + const handler = createStaticHandler(routes as AgnosticRouteObject[]); const result = await handler.query(request); if (result instanceof Response) { diff --git a/playground/rsc-parcel/src/routes.ts b/playground/rsc-parcel/src/routes.ts index 33a7740f11..c2ce9dcacc 100644 --- a/playground/rsc-parcel/src/routes.ts +++ b/playground/rsc-parcel/src/routes.ts @@ -1,8 +1,5 @@ import type { ServerRouteObject } from "react-router"; -// import * as home from "./routes/home/home"; -// import * as root from "./routes/root/root"; - export const routes = [ { id: "root", diff --git a/playground/rsc-parcel/src/routes/home/home.client.tsx b/playground/rsc-parcel/src/routes/home/home.client.tsx index 87d7ce6590..c27bb319eb 100644 --- a/playground/rsc-parcel/src/routes/home/home.client.tsx +++ b/playground/rsc-parcel/src/routes/home/home.client.tsx @@ -2,6 +2,8 @@ import { type ClientLoaderFunctionArgs, useLoaderData } from "react-router"; +import { Counter } from "../../counter"; + export async function clientLoader({ serverLoader }: ClientLoaderFunctionArgs) { const res = await serverLoader(); @@ -15,8 +17,11 @@ export default function Home() { const { client, message } = useLoaderData(); return ( -

- {message} {client} -

+
+

+ {message} {String(client)} +

+ +
); } diff --git a/playground/rsc-parcel/src/routes/home/home.ts b/playground/rsc-parcel/src/routes/home/home.tsx similarity index 100% rename from playground/rsc-parcel/src/routes/home/home.ts rename to playground/rsc-parcel/src/routes/home/home.tsx From 6691850251319876f5d98d8ab684baffc58ace8e Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Thu, 20 Feb 2025 17:34:00 -0800 Subject: [PATCH 012/143] initial patchRoutesOnNavigation and dataStrategy --- packages/react-router/index.ts | 1 + packages/react-router/lib/server.browser.tsx | 107 +++++++++++++++++- packages/react-router/lib/server.ts | 75 ++++++------ playground/rsc-parcel/src/browser.tsx | 5 +- playground/rsc-parcel/src/routes.ts | 5 + .../src/routes/about/about.client.tsx | 27 +++++ .../rsc-parcel/src/routes/about/about.tsx | 7 ++ .../src/routes/root/root.client.tsx | 10 +- 8 files changed, 194 insertions(+), 43 deletions(-) create mode 100644 playground/rsc-parcel/src/routes/about/about.client.tsx create mode 100644 playground/rsc-parcel/src/routes/about/about.tsx diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts index f79bc02230..fba0f1503f 100644 --- a/packages/react-router/index.ts +++ b/packages/react-router/index.ts @@ -360,6 +360,7 @@ export { matchServerRequest, routeServerRequest, } from "./lib/server"; +export type { DecodeServerResponseFunction } from "./lib/server.browser"; export { ServerBrowserRouter } from "./lib/server.browser"; export { ServerStaticRouter } from "./lib/server.static"; export { getServerStream } from "./lib/html-stream/browser"; diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index 5c566fd983..5352796c8d 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -3,13 +3,24 @@ import { RouterProvider } from "./components"; import type { DataRouteObject } from "./context"; import { createBrowserHistory } from "./router/history"; import { createRouter } from "./router/router"; -import type { ServerPayload } from "./server"; +import type { ServerPayload, ServerRouteManifest } from "./server"; import { RouteWrapper } from "./server.static"; -export function ServerBrowserRouter({ payload }: { payload: ServerPayload }) { +export type DecodeServerResponseFunction = ( + body: ReadableStream +) => Promise; + +export function ServerBrowserRouter({ + decode, + payload, +}: { + decode: DecodeServerResponseFunction; + payload: ServerPayload; +}) { if (payload.type !== "render") return null; - // TODO: Implement this + // TODO: Make this a singleton? Re-create this when the payload changes? + // At a minimum, update the singleton with new state when the payload changes. const routes = payload.matches.reduceRight((previous, match) => { const route: DataRouteObject = { id: match.id, @@ -32,7 +43,7 @@ export function ServerBrowserRouter({ payload }: { payload: ServerPayload }) { return [route]; }, [] as DataRouteObject[]); - const router = createRouter({ + const router = ((window as any).__router = createRouter({ basename: payload.basename, history: createBrowserHistory(), hydrationData: { @@ -41,7 +52,93 @@ export function ServerBrowserRouter({ payload }: { payload: ServerPayload }) { loaderData: payload.loaderData, }, routes: routes, - }); + async patchRoutesOnNavigation({ patch, path, signal }) { + const response = await fetch(`${path}.manifest`, { signal }); + if (!response.body || response.status < 200 || response.status >= 300) { + return; + } + const payload = await decode(response.body); + if (payload.type !== "manifest") { + console.error("Failed to patch routes on navigation"); + return; + } + + let lastMatch: ServerRouteManifest | undefined; + for (const match of payload.matches) { + const route: DataRouteObject = { + id: match.id, + action: match.hasAction || !!match.clientAction, + element: ( + + ), + ErrorBoundary: match.ErrorBoundary, + handle: match.handle, + hasErrorBoundary: !!match.ErrorBoundary, + HydrateFallback: match.HydrateFallback, + index: match.index, + loader: match.hasLoader || !!match.clientLoader, + path: match.path, + shouldRevalidate: match.shouldRevalidate, + }; + patch(lastMatch?.id ?? null, [route]); + lastMatch = match; + } + }, + async dataStrategy({ matches, request }) { + // TODO: Implement this + const url = new URL(request.url); + url.pathname += ".rsc"; + const response = await fetch(url, { + body: request.body, + headers: request.headers, + method: request.method, + referrer: request.referrer, + signal: request.signal, + }); + if (!response.body) { + throw new Error("No response body"); + } + const payload = await decode(response.body); + if (payload.type !== "render") { + throw new Error("Unexpected payload type"); + } + + let lastMatch: ServerRouteManifest | undefined; + for (const match of payload.matches) { + const route: DataRouteObject = { + id: match.id, + action: match.hasAction || !!match.clientAction, + element: ( + + ), + ErrorBoundary: match.ErrorBoundary, + handle: match.handle, + hasErrorBoundary: !!match.ErrorBoundary, + HydrateFallback: match.HydrateFallback, + index: match.index, + loader: match.hasLoader || !!match.clientLoader, + path: match.path, + shouldRevalidate: match.shouldRevalidate, + }; + router.patchRoutes(lastMatch?.id ?? null, [route]); + lastMatch = match; + } + + const dataKey = + request.method === "GET" || request.method === "HEAD" + ? "loaderData" + : "actionData"; + return Object.fromEntries( + Object.entries(payload[dataKey] ?? {}).map(([key, value]) => [ + key, + { + type: "data", + result: value, + }, + ]) + ); + }, + })); return ; } diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index e340468027..4fb01c7880 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -9,6 +9,7 @@ import type { Location } from "./router/history"; import { createStaticHandler } from "./router/router"; import { isRouteErrorResponse, + matchRoutes, type ActionFunction, type AgnosticRouteObject, type LazyRouteFunction, @@ -63,10 +64,6 @@ export type ServerRouteManifest = { shouldRevalidate?: ShouldRevalidateFunction; }; -export type ServerRouteManifestTree = ServerRouteManifest & { - children?: ServerRouteManifestTree[]; -}; - export type ServerRouteMatch = ServerRouteManifest & { params: Params; pathname: string; @@ -87,7 +84,7 @@ export type ServerRenderPayload = { export type ServerManifestPayload = { type: "manifest"; - routes: ServerRouteManifestTree[]; + matches: ServerRouteManifest[]; }; export type ServerPayload = ServerRenderPayload | ServerManifestPayload; @@ -98,40 +95,20 @@ export type ServerMatch = { payload: ServerPayload; }; -function makeServerRouteManifestTree( - routes: ServerRouteObject[] -): ServerRouteManifestTree[] { - return routes.map((route) => { - return { - clientAction: route.clientAction, - clientLoader: route.clientLoader, - Component: route.default, - ErrorBoundary: route.ErrorBoundary, - handle: route.handle, - hasAction: !!route.action, - hasLoader: !!route.loader, - HydrateFallback: route.HydrateFallback, - id: route.id, - index: "index" in route ? route.index : undefined, - Layout: route.Layout, - links: route.links, - meta: route.meta, - path: route.path, - shouldRevalidate: route.shouldRevalidate, - children: - "children" in route && route.children - ? makeServerRouteManifestTree(route.children) - : undefined, - }; - }); -} - export async function matchServerRequest( request: Request, routes: ServerRouteObject[] ): Promise { const url = new URL(request.url); - if (url.pathname === "/__manifest") { + + if (isManifestRequest(url)) { + const matches = matchRoutes( + routes as AgnosticRouteObject[], + url.pathname.replace(/\.manifest$/, "") + ); + if (!matches?.length) { + return new Response("Not found", { status: 404 }); + } return { statusCode: 200, headers: new Headers({ @@ -140,7 +117,33 @@ export async function matchServerRequest( }), payload: { type: "manifest", - routes: makeServerRouteManifestTree(routes), + matches: await Promise.all( + matches.map(async (match) => { + let route = match.route as ServerRouteObject; + if ("lazy" in route && route.lazy) { + route = { + ...route, + ...((await route.lazy()) as any), + }; + } + return { + clientAction: route.clientAction, + clientLoader: route.clientLoader, + Component: route.default, + ErrorBoundary: route.ErrorBoundary, + handle: route.handle, + hasAction: !!route.action, + hasLoader: !!route.loader, + HydrateFallback: route.HydrateFallback, + id: route.id, + path: route.path, + index: "index" in route ? route.index : undefined, + Layout: route.Layout, + links: route.links, + meta: route.meta, + }; + }) + ), } satisfies ServerManifestPayload, }; } @@ -259,5 +262,5 @@ export function isReactServerRequest(url: URL) { } export function isManifestRequest(url: URL) { - return url.pathname === "/__manifest"; + return url.pathname.endsWith(".manifest"); } diff --git a/playground/rsc-parcel/src/browser.tsx b/playground/rsc-parcel/src/browser.tsx index b0a9d4e45d..29867e4495 100644 --- a/playground/rsc-parcel/src/browser.tsx +++ b/playground/rsc-parcel/src/browser.tsx @@ -16,7 +16,10 @@ createFromReadableStream(getServerStream()).then((payload: ServerPayload) => { hydrateRoot( document, - + ); }); diff --git a/playground/rsc-parcel/src/routes.ts b/playground/rsc-parcel/src/routes.ts index c2ce9dcacc..bf95d0ef8c 100644 --- a/playground/rsc-parcel/src/routes.ts +++ b/playground/rsc-parcel/src/routes.ts @@ -10,6 +10,11 @@ export const routes = [ index: true, lazy: () => import("./routes/home/home"), }, + { + id: "about", + path: "about", + lazy: () => import("./routes/about/about"), + }, ], }, ] satisfies ServerRouteObject[]; diff --git a/playground/rsc-parcel/src/routes/about/about.client.tsx b/playground/rsc-parcel/src/routes/about/about.client.tsx new file mode 100644 index 0000000000..359a87042c --- /dev/null +++ b/playground/rsc-parcel/src/routes/about/about.client.tsx @@ -0,0 +1,27 @@ +"use client"; + +import { type ClientLoaderFunctionArgs, useLoaderData } from "react-router"; + +import { Counter } from "../../counter"; + +export async function clientLoader({ serverLoader }: ClientLoaderFunctionArgs) { + const res = await serverLoader(); + + return { + client: true, + ...res, + }; +} + +export default function About() { + const { client, message } = useLoaderData(); + + return ( +
+

+ {message} {String(client)} +

+ +
+ ); +} diff --git a/playground/rsc-parcel/src/routes/about/about.tsx b/playground/rsc-parcel/src/routes/about/about.tsx new file mode 100644 index 0000000000..815c50903d --- /dev/null +++ b/playground/rsc-parcel/src/routes/about/about.tsx @@ -0,0 +1,7 @@ +export { clientLoader, default } from "./about.client"; + +export function loader() { + return { + message: "Hello About!", + }; +} diff --git a/playground/rsc-parcel/src/routes/root/root.client.tsx b/playground/rsc-parcel/src/routes/root/root.client.tsx index 6ae3ef78c4..0e9ea4dc95 100644 --- a/playground/rsc-parcel/src/routes/root/root.client.tsx +++ b/playground/rsc-parcel/src/routes/root/root.client.tsx @@ -1,6 +1,6 @@ "use client"; -import { Outlet, useLoaderData } from "react-router"; +import { Link, Outlet, useLoaderData } from "react-router"; export function Layout({ children }: { children: React.ReactNode }) { return ( @@ -20,6 +20,14 @@ export default function Root() { return ( <>

{message}

+
    +
  • + Home +
    • +
  • + About +
    • +
{counter} From 971e86002ccf2aeefffd951dea1bf62395ad14e1 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Thu, 20 Feb 2025 17:38:38 -0800 Subject: [PATCH 013/143] cleanup --- packages/react-router/lib/server.browser.tsx | 70 +++++++------------- 1 file changed, 23 insertions(+), 47 deletions(-) diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index 5352796c8d..f1433902da 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -22,21 +22,7 @@ export function ServerBrowserRouter({ // TODO: Make this a singleton? Re-create this when the payload changes? // At a minimum, update the singleton with new state when the payload changes. const routes = payload.matches.reduceRight((previous, match) => { - const route: DataRouteObject = { - id: match.id, - action: match.hasAction || !!match.clientAction, - element: ( - - ), - ErrorBoundary: match.ErrorBoundary, - handle: match.handle, - hasErrorBoundary: !!match.ErrorBoundary, - HydrateFallback: match.HydrateFallback, - index: match.index, - loader: match.hasLoader || !!match.clientLoader, - path: match.path, - shouldRevalidate: match.shouldRevalidate, - }; + const route: DataRouteObject = createRouteFromServerManifest(match); if (previous.length > 0) { route.children = previous; } @@ -65,22 +51,7 @@ export function ServerBrowserRouter({ let lastMatch: ServerRouteManifest | undefined; for (const match of payload.matches) { - const route: DataRouteObject = { - id: match.id, - action: match.hasAction || !!match.clientAction, - element: ( - - ), - ErrorBoundary: match.ErrorBoundary, - handle: match.handle, - hasErrorBoundary: !!match.ErrorBoundary, - HydrateFallback: match.HydrateFallback, - index: match.index, - loader: match.hasLoader || !!match.clientLoader, - path: match.path, - shouldRevalidate: match.shouldRevalidate, - }; - patch(lastMatch?.id ?? null, [route]); + patch(lastMatch?.id ?? null, [createRouteFromServerManifest(match)]); lastMatch = match; } }, @@ -105,22 +76,9 @@ export function ServerBrowserRouter({ let lastMatch: ServerRouteManifest | undefined; for (const match of payload.matches) { - const route: DataRouteObject = { - id: match.id, - action: match.hasAction || !!match.clientAction, - element: ( - - ), - ErrorBoundary: match.ErrorBoundary, - handle: match.handle, - hasErrorBoundary: !!match.ErrorBoundary, - HydrateFallback: match.HydrateFallback, - index: match.index, - loader: match.hasLoader || !!match.clientLoader, - path: match.path, - shouldRevalidate: match.shouldRevalidate, - }; - router.patchRoutes(lastMatch?.id ?? null, [route]); + router.patchRoutes(lastMatch?.id ?? null, [ + createRouteFromServerManifest(match), + ]); lastMatch = match; } @@ -142,3 +100,21 @@ export function ServerBrowserRouter({ return ; } + +function createRouteFromServerManifest( + match: ServerRouteManifest +): DataRouteObject { + return { + id: match.id, + action: match.hasAction || !!match.clientAction, + element: , + ErrorBoundary: match.ErrorBoundary, + handle: match.handle, + hasErrorBoundary: !!match.ErrorBoundary, + HydrateFallback: match.HydrateFallback, + index: match.index, + loader: match.hasLoader || !!match.clientLoader, + path: match.path, + shouldRevalidate: match.shouldRevalidate, + }; +} From 1a3060789bde80acd7fc2e7c052c6557814f547a Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Fri, 21 Feb 2025 09:59:23 -0800 Subject: [PATCH 014/143] initialize router --- packages/react-router/lib/server.browser.tsx | 35 ++++++++++++++----- .../src/routes/about/about.client.tsx | 4 ++- .../src/routes/home/home.client.tsx | 4 ++- 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index f1433902da..c2d086cb48 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -10,6 +10,8 @@ export type DecodeServerResponseFunction = ( body: ReadableStream ) => Promise; +let router: ReturnType | undefined; + export function ServerBrowserRouter({ decode, payload, @@ -29,7 +31,7 @@ export function ServerBrowserRouter({ return [route]; }, [] as DataRouteObject[]); - const router = ((window as any).__router = createRouter({ + router ??= createRouter({ basename: payload.basename, history: createBrowserHistory(), hydrationData: { @@ -45,8 +47,7 @@ export function ServerBrowserRouter({ } const payload = await decode(response.body); if (payload.type !== "manifest") { - console.error("Failed to patch routes on navigation"); - return; + throw new Error("Failed to patch routes on navigation"); } let lastMatch: ServerRouteManifest | undefined; @@ -56,6 +57,10 @@ export function ServerBrowserRouter({ } }, async dataStrategy({ matches, request }) { + if (!router) { + throw new Error("No router"); + } + // TODO: Implement this const url = new URL(request.url); url.pathname += ".rsc"; @@ -86,17 +91,29 @@ export function ServerBrowserRouter({ request.method === "GET" || request.method === "HEAD" ? "loaderData" : "actionData"; - return Object.fromEntries( - Object.entries(payload[dataKey] ?? {}).map(([key, value]) => [ - key, + + const res = Object.fromEntries([ + ...Object.entries(payload[dataKey] ?? {}).map(([id, value]) => [ + id, { type: "data", result: value, }, - ]) - ); + ]), + ...(await Promise.all( + matches.map(async (match) => { + const result = await match.resolve(async () => { + return payload[dataKey]?.[match.route.id]; + }); + + return [match.route.id, result]; + }) + )), + ]); + + return res; }, - })); + }).initialize(); return ; } diff --git a/playground/rsc-parcel/src/routes/about/about.client.tsx b/playground/rsc-parcel/src/routes/about/about.client.tsx index 359a87042c..c147d6aba5 100644 --- a/playground/rsc-parcel/src/routes/about/about.client.tsx +++ b/playground/rsc-parcel/src/routes/about/about.client.tsx @@ -4,8 +4,10 @@ import { type ClientLoaderFunctionArgs, useLoaderData } from "react-router"; import { Counter } from "../../counter"; +import type { loader } from "./about"; + export async function clientLoader({ serverLoader }: ClientLoaderFunctionArgs) { - const res = await serverLoader(); + const res = await serverLoader(); return { client: true, diff --git a/playground/rsc-parcel/src/routes/home/home.client.tsx b/playground/rsc-parcel/src/routes/home/home.client.tsx index c27bb319eb..d2865e5bd3 100644 --- a/playground/rsc-parcel/src/routes/home/home.client.tsx +++ b/playground/rsc-parcel/src/routes/home/home.client.tsx @@ -4,8 +4,10 @@ import { type ClientLoaderFunctionArgs, useLoaderData } from "react-router"; import { Counter } from "../../counter"; +import type { loader } from "./home"; + export async function clientLoader({ serverLoader }: ClientLoaderFunctionArgs) { - const res = await serverLoader(); + const res = await serverLoader(); return { client: true, From 1c1c1691112416787814df8cb7e9cd2d31e20329 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Tue, 25 Feb 2025 14:45:01 -0800 Subject: [PATCH 015/143] pass around decode --- packages/react-router/lib/server.ts | 30 +++++++++++++++++++-------- playground/rsc-parcel/src/browser.tsx | 12 +++++++++-- playground/rsc-parcel/src/server.tsx | 5 ++--- 3 files changed, 33 insertions(+), 14 deletions(-) diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index 4fb01c7880..8ce69deb3c 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -211,8 +211,9 @@ export async function matchServerRequest( export async function routeServerRequest( request: Request, requestServer: (request: Request) => Promise, + decode: (body: ReadableStream) => Promise, renderHTML: ( - response: Response + payload: ServerPayload ) => ReadableStream | Promise> ) { const url = new URL(request.url); @@ -245,16 +246,27 @@ export async function routeServerRequest( throw new Error("Failed to clone server response"); } - const html = await renderHTML(serverResponse); - const body = html.pipeThrough(injectRSCPayload(serverResponseB.body)); + const payload = (await decode(serverResponse.body)) as ServerRenderPayload; - const headers = new Headers(serverResponse.headers); - headers.set("Content-Type", "text/html"); + const html = await renderHTML(payload); - return new Response(body, { - status: serverResponse.status, - headers, - }); + try { + const body = html.pipeThrough(injectRSCPayload(serverResponseB.body)); + + const headers = new Headers(serverResponse.headers); + headers.set("Content-Type", "text/html"); + + return new Response(body, { + status: serverResponse.status, + headers, + }); + } catch (reason) { + throw reason; + // TODO: Track deepest rendered boundary and re-try + // Figure out how / if we need to transport the error, + // or if we can just re-try on the client to reach + // the correct boundary. + } } export function isReactServerRequest(url: URL) { diff --git a/playground/rsc-parcel/src/browser.tsx b/playground/rsc-parcel/src/browser.tsx index 29867e4495..c92397268c 100644 --- a/playground/rsc-parcel/src/browser.tsx +++ b/playground/rsc-parcel/src/browser.tsx @@ -11,13 +11,21 @@ import { ServerBrowserRouter, } from "react-router"; -createFromReadableStream(getServerStream()).then((payload: ServerPayload) => { +createFromReadableStream( + getServerStream(), + { assets: "manifest" }, + { + temporaryReferences: { + clientId: () =>
Client ID
, + }, + } +).then((payload: ServerPayload) => { startTransition(() => { hydrateRoot( document, createFromReadableStream(payload, manifest)} payload={payload} /> diff --git a/playground/rsc-parcel/src/server.tsx b/playground/rsc-parcel/src/server.tsx index 8238b26b60..c1899392c2 100644 --- a/playground/rsc-parcel/src/server.tsx +++ b/playground/rsc-parcel/src/server.tsx @@ -27,9 +27,8 @@ app.use( return routeServerRequest( request, callServer, - async (response) => { - const payload: ServerPayload = await createFromReadableStream(response.body); - + createFromReadableStream, + async (payload) => { return await renderHTMLToReadableStream( , { From 266d95a9516a33f502927816349bdaad5cc57b1f Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Tue, 25 Feb 2025 20:26:15 -0800 Subject: [PATCH 016/143] allow rendering `` and `` --- packages/react-router/lib/server.browser.tsx | 29 ++++++++++++++- packages/react-router/lib/server.static.tsx | 37 ++++++++++++++++--- playground/rsc-parcel/src/browser.tsx | 2 +- playground/rsc-parcel/src/routes.ts | 1 + .../src/routes/about/about.client.tsx | 12 ++++++ .../src/routes/root/root.client.tsx | 18 +++++++-- 6 files changed, 88 insertions(+), 11 deletions(-) diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index c2d086cb48..e03e89c1f8 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -1,6 +1,8 @@ import * as React from "react"; import { RouterProvider } from "./components"; import type { DataRouteObject } from "./context"; +import { FrameworkContext } from "./dom/ssr/components"; +import type { FrameworkContextObject } from "./dom/ssr/entry"; import { createBrowserHistory } from "./router/history"; import { createRouter } from "./router/router"; import type { ServerPayload, ServerRouteManifest } from "./server"; @@ -115,7 +117,32 @@ export function ServerBrowserRouter({ }, }).initialize(); - return ; + const frameworkContext: FrameworkContextObject = { + future: {}, + isSpaMode: true, + ssr: true, + criticalCss: "", + manifest: { + routes: { + // root: { + // css: [] + // }, + }, + version: "1", + url: "", + entry: { + module: "", + imports: [], + }, + }, + routeModules: {}, + }; + + return ( + + + + ); } function createRouteFromServerManifest( diff --git a/packages/react-router/lib/server.static.tsx b/packages/react-router/lib/server.static.tsx index 825fa7b1a3..fdd589f44f 100644 --- a/packages/react-router/lib/server.static.tsx +++ b/packages/react-router/lib/server.static.tsx @@ -1,5 +1,7 @@ import * as React from "react"; import type { DataRouteObject } from "./context"; +import { FrameworkContext } from "./dom/ssr/components"; +import type { FrameworkContextObject } from "./dom/ssr/entry"; import { createStaticRouter, StaticRouterProvider } from "./dom/server"; import type { ServerPayload } from "./server"; @@ -72,12 +74,35 @@ export function ServerStaticRouter({ payload }: { payload: ServerPayload }) { context ); + const frameworkContext: FrameworkContextObject = { + future: {}, + isSpaMode: false, + ssr: false, + criticalCss: "", + manifest: { + routes: { + // root: { + // css: [] + // }, + }, + version: "1", + url: "", + entry: { + module: "", + imports: [], + }, + }, + routeModules: {}, + }; + return ( - + + + ); } diff --git a/playground/rsc-parcel/src/browser.tsx b/playground/rsc-parcel/src/browser.tsx index c92397268c..2463563684 100644 --- a/playground/rsc-parcel/src/browser.tsx +++ b/playground/rsc-parcel/src/browser.tsx @@ -25,7 +25,7 @@ createFromReadableStream( document, createFromReadableStream(payload, manifest)} + decode={createFromReadableStream} payload={payload} /> diff --git a/playground/rsc-parcel/src/routes.ts b/playground/rsc-parcel/src/routes.ts index bf95d0ef8c..424f37e5ee 100644 --- a/playground/rsc-parcel/src/routes.ts +++ b/playground/rsc-parcel/src/routes.ts @@ -3,6 +3,7 @@ import type { ServerRouteObject } from "react-router"; export const routes = [ { id: "root", + // requiredCSS: ["/index.css"], lazy: () => import("./routes/root/root"), children: [ { diff --git a/playground/rsc-parcel/src/routes/about/about.client.tsx b/playground/rsc-parcel/src/routes/about/about.client.tsx index c147d6aba5..a3137b4067 100644 --- a/playground/rsc-parcel/src/routes/about/about.client.tsx +++ b/playground/rsc-parcel/src/routes/about/about.client.tsx @@ -6,6 +6,18 @@ import { Counter } from "../../counter"; import type { loader } from "./about"; +// TODO: Investigate using lazy as a preload method for split route chunk modules +// export function lazy() { +// import("./about.client.tsx?route-chunk=clientLoader"); +// import("./about.client.tsx?route-chunk=clientAction"); +// return {}; +// } +// export async function clientLoader(...args) { +// return import("./about.client.tsx?route-chunk=clientLoader").then((mod) => +// mod.clientLoader(...args) +// ); +// } + export async function clientLoader({ serverLoader }: ClientLoaderFunctionArgs) { const res = await serverLoader(); diff --git a/playground/rsc-parcel/src/routes/root/root.client.tsx b/playground/rsc-parcel/src/routes/root/root.client.tsx index 0e9ea4dc95..d5e190d168 100644 --- a/playground/rsc-parcel/src/routes/root/root.client.tsx +++ b/playground/rsc-parcel/src/routes/root/root.client.tsx @@ -1,6 +1,14 @@ "use client"; -import { Link, Outlet, useLoaderData } from "react-router"; +import { + Link, + Links, + Outlet, + ScrollRestoration, + useLoaderData, +} from "react-router"; + +import type { loader } from "./root"; export function Layout({ children }: { children: React.ReactNode }) { return ( @@ -9,14 +17,18 @@ export function Layout({ children }: { children: React.ReactNode }) { React Server + - {children} + + {children} + + ); } export default function Root() { - const { counter, message } = useLoaderData(); + const { counter, message } = useLoaderData(); return ( <>

{message}

From e0e0db8002dc8061ca558498057dc8dff57ccfab Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Thu, 27 Feb 2025 13:58:55 -0800 Subject: [PATCH 017/143] add vite rsc playground --- package.json | 2 +- packages/react-router/index.ts | 2 + packages/react-router/package.json | 15 + packages/react-router/server.ts | 2 + packages/react-router/tsup.config.server.ts | 3 + playground/rsc-vite/.gitignore | 3 + .../rsc-vite/framework/references.browser.ts | 12 + .../rsc-vite/framework/references.server.ts | 5 + .../rsc-vite/framework/references.ssr.ts | 4 + playground/rsc-vite/framework/server.ts | 12 + playground/rsc-vite/package.json | 37 + .../rsc-vite/src/browser/entry.browser.tsx | 28 + playground/rsc-vite/src/counter.tsx | 17 + playground/rsc-vite/src/routes.ts | 21 + .../src/routes/about/about.client.tsx | 41 + .../rsc-vite/src/routes/about/about.tsx | 7 + .../rsc-vite/src/routes/home/home.client.tsx | 29 + playground/rsc-vite/src/routes/home/home.tsx | 7 + .../rsc-vite/src/routes/root/root.client.tsx | 51 + playground/rsc-vite/src/routes/root/root.tsx | 10 + .../rsc-vite/src/server/entry.server.tsx | 20 + playground/rsc-vite/src/server/wrangler.toml | 4 + playground/rsc-vite/src/ssr/entry.ssr.tsx | 40 + playground/rsc-vite/src/ssr/wrangler.toml | 6 + playground/rsc-vite/tsconfig.client.json | 26 + playground/rsc-vite/tsconfig.json | 7 + playground/rsc-vite/tsconfig.node.json | 18 + playground/rsc-vite/vite.config.ts | 52 + pnpm-lock.yaml | 1554 +++++++++++++++-- 29 files changed, 1866 insertions(+), 169 deletions(-) create mode 100644 playground/rsc-vite/.gitignore create mode 100644 playground/rsc-vite/framework/references.browser.ts create mode 100644 playground/rsc-vite/framework/references.server.ts create mode 100644 playground/rsc-vite/framework/references.ssr.ts create mode 100644 playground/rsc-vite/framework/server.ts create mode 100644 playground/rsc-vite/package.json create mode 100644 playground/rsc-vite/src/browser/entry.browser.tsx create mode 100644 playground/rsc-vite/src/counter.tsx create mode 100644 playground/rsc-vite/src/routes.ts create mode 100644 playground/rsc-vite/src/routes/about/about.client.tsx create mode 100644 playground/rsc-vite/src/routes/about/about.tsx create mode 100644 playground/rsc-vite/src/routes/home/home.client.tsx create mode 100644 playground/rsc-vite/src/routes/home/home.tsx create mode 100644 playground/rsc-vite/src/routes/root/root.client.tsx create mode 100644 playground/rsc-vite/src/routes/root/root.tsx create mode 100644 playground/rsc-vite/src/server/entry.server.tsx create mode 100644 playground/rsc-vite/src/server/wrangler.toml create mode 100644 playground/rsc-vite/src/ssr/entry.ssr.tsx create mode 100644 playground/rsc-vite/src/ssr/wrangler.toml create mode 100644 playground/rsc-vite/tsconfig.client.json create mode 100644 playground/rsc-vite/tsconfig.json create mode 100644 playground/rsc-vite/tsconfig.node.json create mode 100644 playground/rsc-vite/vite.config.ts diff --git a/package.json b/package.json index 78493f9d7d..68498e89e2 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "overrides": { "react": "0.0.0-experimental-93b58361-20250209", "react-dom": "0.0.0-experimental-93b58361-20250209", - "workerd": "1.20240614.0" + "workerd": "1.20250224.0" } } } diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts index fba0f1503f..e454ca3817 100644 --- a/packages/react-router/index.ts +++ b/packages/react-router/index.ts @@ -1,3 +1,5 @@ +"use client"; + // Expose old @remix-run/router API y2 export type { InitialEntry, Location, Path, To } from "./lib/router/history"; export type { diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 4a11223f18..df03354b86 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -52,6 +52,21 @@ "default": "./dist/development/index.js" } }, + "./client": { + "node": { + "types": "./dist/development/index.d.ts", + "module-sync": "./dist/development/index.mjs", + "default": "./dist/development/index.js" + }, + "import": { + "types": "./dist/development/index.d.mts", + "default": "./dist/development/index.mjs" + }, + "default": { + "types": "./dist/development/index.d.ts", + "default": "./dist/development/index.js" + } + }, "./route-module": { "import": { "types": "./dist/development/lib/types/route-module.d.mts" diff --git a/packages/react-router/server.ts b/packages/react-router/server.ts index a1bb2566d5..f5681a80a4 100644 --- a/packages/react-router/server.ts +++ b/packages/react-router/server.ts @@ -1,3 +1,5 @@ +export * from "react-router/client"; + export { createStaticHandler } from "./lib/router/router"; export { matchRoutes } from "./lib/router/utils"; diff --git a/packages/react-router/tsup.config.server.ts b/packages/react-router/tsup.config.server.ts index f084cbd0b7..39c319e709 100644 --- a/packages/react-router/tsup.config.server.ts +++ b/packages/react-router/tsup.config.server.ts @@ -6,12 +6,14 @@ import { createBanner } from "../../build.utils.js"; import pkg from "./package.json"; const entry = ["server.ts"]; +const external = ["react-router/client"]; const config = (enableDevWarnings: boolean) => defineConfig([ { clean: false, entry, + external, format: ["cjs"], outDir: enableDevWarnings ? "dist/development" : "dist/production", dts: true, @@ -28,6 +30,7 @@ const config = (enableDevWarnings: boolean) => { clean: false, entry, + external, format: ["esm"], outDir: enableDevWarnings ? "dist/development" : "dist/production", dts: true, diff --git a/playground/rsc-vite/.gitignore b/playground/rsc-vite/.gitignore new file mode 100644 index 0000000000..ef718b97ff --- /dev/null +++ b/playground/rsc-vite/.gitignore @@ -0,0 +1,3 @@ +.parcel-cache +dist +node_modules diff --git a/playground/rsc-vite/framework/references.browser.ts b/playground/rsc-vite/framework/references.browser.ts new file mode 100644 index 0000000000..cbf0af69e3 --- /dev/null +++ b/playground/rsc-vite/framework/references.browser.ts @@ -0,0 +1,12 @@ +import { + createServerReference as createServerReferenceImp, + // @ts-expect-error - no types yet +} from "@jacob-ebey/react-server-dom-vite/client"; + +export async function callServer(id: string, args: unknown) { + throw new Error("callServer not implemented"); +} + +export function createServerReference(imp: unknown, id: string, name: string) { + return createServerReferenceImp(`${id}#${name}`, callServer); +} diff --git a/playground/rsc-vite/framework/references.server.ts b/playground/rsc-vite/framework/references.server.ts new file mode 100644 index 0000000000..be086b8a0a --- /dev/null +++ b/playground/rsc-vite/framework/references.server.ts @@ -0,0 +1,5 @@ +// @ts-expect-error - no types yet +import RSD from "@jacob-ebey/react-server-dom-vite/server"; + +export const registerServerReference = RSD.registerServerReference; +export const registerClientReference = RSD.registerClientReference; diff --git a/playground/rsc-vite/framework/references.ssr.ts b/playground/rsc-vite/framework/references.ssr.ts new file mode 100644 index 0000000000..071d2d68e4 --- /dev/null +++ b/playground/rsc-vite/framework/references.ssr.ts @@ -0,0 +1,4 @@ +// @ts-expect-error - no types yet +import RSD from "@jacob-ebey/react-server-dom-vite/client"; + +export const createServerReference = RSD.createServerReference; diff --git a/playground/rsc-vite/framework/server.ts b/playground/rsc-vite/framework/server.ts new file mode 100644 index 0000000000..67411cf5aa --- /dev/null +++ b/playground/rsc-vite/framework/server.ts @@ -0,0 +1,12 @@ +import * as stream from "node:stream"; +// @ts-expect-error - no types yet +import RSD from "@jacob-ebey/react-server-dom-vite/server"; +// @ts-expect-error - no types yet +import { manifest } from "virtual:react-manifest"; + +export function renderToReadableStream(payload: any) { + const { pipe } = RSD.renderToPipeableStream(payload, manifest); + return stream.Readable.toWeb( + pipe(new stream.PassThrough()) + ) as ReadableStream; +} diff --git a/playground/rsc-vite/package.json b/playground/rsc-vite/package.json new file mode 100644 index 0000000000..b002ed547f --- /dev/null +++ b/playground/rsc-vite/package.json @@ -0,0 +1,37 @@ +{ + "name": "@playground/rsc-vite", + "private": true, + "type": "module", + "scripts": { + "dev": "vite", + "build": "vite build", + "start": "node dist/server.js" + }, + "devDependencies": { + "@biomejs/biome": "^1.9.4", + "@cloudflare/vite-plugin": "0.1.7", + "@cloudflare/workers-types": "^4.20250224.0", + "@jacob-ebey/vite-react-server-dom": "0.0.12", + "@types/express": "^5.0.0", + "@types/node": "^22.13.1", + "@types/react": "^19.0.8", + "@types/react-dom": "^19.0.3", + "vite": "^6.2.0", + "vite-tsconfig-paths": "^5.1.4", + "wrangler": "^3.111.0" + }, + "dependencies": { + "@jacob-ebey/react-server-dom-vite": "19.0.0-experimental.14", + "@mjackson/node-fetch-server": "0.6.1", + "express": "^4.21.2", + "react": "^19.0.0", + "react-dom": "^19.0.0", + "react-router": "workspace:*" + }, + "pnpm": { + "overrides": { + "react": "^19.0.0", + "react-dom": "^19.0.0" + } + } +} diff --git a/playground/rsc-vite/src/browser/entry.browser.tsx b/playground/rsc-vite/src/browser/entry.browser.tsx new file mode 100644 index 0000000000..0d75ec30ea --- /dev/null +++ b/playground/rsc-vite/src/browser/entry.browser.tsx @@ -0,0 +1,28 @@ +import { startTransition, StrictMode } from "react"; +import { hydrateRoot } from "react-dom/client"; +// @ts-expect-error - no types +import { createFromReadableStream } from "@jacob-ebey/react-server-dom-vite/client"; +// @ts-expect-error - no types yet +import { manifest } from "virtual:react-manifest"; + +import { + type ServerPayload, + getServerStream, + ServerBrowserRouter, +} from "react-router"; + +createFromReadableStream(getServerStream(), manifest).then( + (payload: ServerPayload) => { + startTransition(() => { + hydrateRoot( + document, + + createFromReadableStream(body, manifest)} + payload={payload} + /> + + ); + }); + } +); diff --git a/playground/rsc-vite/src/counter.tsx b/playground/rsc-vite/src/counter.tsx new file mode 100644 index 0000000000..7a5b69a098 --- /dev/null +++ b/playground/rsc-vite/src/counter.tsx @@ -0,0 +1,17 @@ +"use client"; + +import { useState } from "react"; + +export function Counter() { + const [count, setCount] = useState(0); + + return ( +
+

Counter

+

Current count: {count}

+ +
+ ); +} diff --git a/playground/rsc-vite/src/routes.ts b/playground/rsc-vite/src/routes.ts new file mode 100644 index 0000000000..424f37e5ee --- /dev/null +++ b/playground/rsc-vite/src/routes.ts @@ -0,0 +1,21 @@ +import type { ServerRouteObject } from "react-router"; + +export const routes = [ + { + id: "root", + // requiredCSS: ["/index.css"], + lazy: () => import("./routes/root/root"), + children: [ + { + id: "home", + index: true, + lazy: () => import("./routes/home/home"), + }, + { + id: "about", + path: "about", + lazy: () => import("./routes/about/about"), + }, + ], + }, +] satisfies ServerRouteObject[]; diff --git a/playground/rsc-vite/src/routes/about/about.client.tsx b/playground/rsc-vite/src/routes/about/about.client.tsx new file mode 100644 index 0000000000..a3137b4067 --- /dev/null +++ b/playground/rsc-vite/src/routes/about/about.client.tsx @@ -0,0 +1,41 @@ +"use client"; + +import { type ClientLoaderFunctionArgs, useLoaderData } from "react-router"; + +import { Counter } from "../../counter"; + +import type { loader } from "./about"; + +// TODO: Investigate using lazy as a preload method for split route chunk modules +// export function lazy() { +// import("./about.client.tsx?route-chunk=clientLoader"); +// import("./about.client.tsx?route-chunk=clientAction"); +// return {}; +// } +// export async function clientLoader(...args) { +// return import("./about.client.tsx?route-chunk=clientLoader").then((mod) => +// mod.clientLoader(...args) +// ); +// } + +export async function clientLoader({ serverLoader }: ClientLoaderFunctionArgs) { + const res = await serverLoader(); + + return { + client: true, + ...res, + }; +} + +export default function About() { + const { client, message } = useLoaderData(); + + return ( +
+

+ {message} {String(client)} +

+ +
+ ); +} diff --git a/playground/rsc-vite/src/routes/about/about.tsx b/playground/rsc-vite/src/routes/about/about.tsx new file mode 100644 index 0000000000..815c50903d --- /dev/null +++ b/playground/rsc-vite/src/routes/about/about.tsx @@ -0,0 +1,7 @@ +export { clientLoader, default } from "./about.client"; + +export function loader() { + return { + message: "Hello About!", + }; +} diff --git a/playground/rsc-vite/src/routes/home/home.client.tsx b/playground/rsc-vite/src/routes/home/home.client.tsx new file mode 100644 index 0000000000..d2865e5bd3 --- /dev/null +++ b/playground/rsc-vite/src/routes/home/home.client.tsx @@ -0,0 +1,29 @@ +"use client"; + +import { type ClientLoaderFunctionArgs, useLoaderData } from "react-router"; + +import { Counter } from "../../counter"; + +import type { loader } from "./home"; + +export async function clientLoader({ serverLoader }: ClientLoaderFunctionArgs) { + const res = await serverLoader(); + + return { + client: true, + ...res, + }; +} + +export default function Home() { + const { client, message } = useLoaderData(); + + return ( +
+

+ {message} {String(client)} +

+ +
+ ); +} diff --git a/playground/rsc-vite/src/routes/home/home.tsx b/playground/rsc-vite/src/routes/home/home.tsx new file mode 100644 index 0000000000..22fffe84be --- /dev/null +++ b/playground/rsc-vite/src/routes/home/home.tsx @@ -0,0 +1,7 @@ +export { clientLoader, default } from "./home.client"; + +export function loader() { + return { + message: "Hello Home!", + }; +} diff --git a/playground/rsc-vite/src/routes/root/root.client.tsx b/playground/rsc-vite/src/routes/root/root.client.tsx new file mode 100644 index 0000000000..d5e190d168 --- /dev/null +++ b/playground/rsc-vite/src/routes/root/root.client.tsx @@ -0,0 +1,51 @@ +"use client"; + +import { + Link, + Links, + Outlet, + ScrollRestoration, + useLoaderData, +} from "react-router"; + +import type { loader } from "./root"; + +export function Layout({ children }: { children: React.ReactNode }) { + return ( + + + + + React Server + + + + {children} + + + + ); +} + +export default function Root() { + const { counter, message } = useLoaderData(); + return ( + <> +

{message}

+
    +
  • + Home +
    • +
  • + About +
    • +
+ {counter} + + + ); +} + +export function ErrorBoundary() { + return

Something went wrong!

; +} diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx new file mode 100644 index 0000000000..347dbd2248 --- /dev/null +++ b/playground/rsc-vite/src/routes/root/root.tsx @@ -0,0 +1,10 @@ +export { default, ErrorBoundary, Layout } from "./root.client"; + +import { Counter } from "../../counter"; + +export function loader() { + return { + counter: , + message: "Hello from the server!", + }; +} diff --git a/playground/rsc-vite/src/server/entry.server.tsx b/playground/rsc-vite/src/server/entry.server.tsx new file mode 100644 index 0000000000..41cc6d6ee4 --- /dev/null +++ b/playground/rsc-vite/src/server/entry.server.tsx @@ -0,0 +1,20 @@ +/// + +import { renderToReadableStream } from "framework/server"; +import { matchServerRequest } from "react-router"; + +import { routes } from "../routes"; + +export default { + async fetch(request, env) { + const match = await matchServerRequest(request, routes); + if (match instanceof Response) { + return match; + } + + return new Response(renderToReadableStream(match.payload), { + status: match.statusCode, + headers: match.headers, + }); + }, +} satisfies ExportedHandler; diff --git a/playground/rsc-vite/src/server/wrangler.toml b/playground/rsc-vite/src/server/wrangler.toml new file mode 100644 index 0000000000..18b72d3ee4 --- /dev/null +++ b/playground/rsc-vite/src/server/wrangler.toml @@ -0,0 +1,4 @@ +name = "server" +main = "./entry.server.tsx" +compatibility_date = "2024-12-05" +compatibility_flags = ["nodejs_compat"] diff --git a/playground/rsc-vite/src/ssr/entry.ssr.tsx b/playground/rsc-vite/src/ssr/entry.ssr.tsx new file mode 100644 index 0000000000..15d39493ec --- /dev/null +++ b/playground/rsc-vite/src/ssr/entry.ssr.tsx @@ -0,0 +1,40 @@ +/// + +// @ts-expect-error +import RSD from "@jacob-ebey/react-server-dom-vite/client"; +// @ts-expect-error +import RDS from "react-dom/server.edge"; +// @ts-expect-error +import { bootstrapModules, manifest } from "virtual:react-manifest"; + +import { routeServerRequest, ServerStaticRouter } from "react-router"; + +type CloudflareEnv = { + ASSETS: Fetcher; + SERVER: Fetcher; +}; + +export default { + async fetch(request, { SERVER }) { + const callServer = async (request: Request) => await SERVER.fetch(request); + try { + return await routeServerRequest( + request, + callServer, + (body) => RSD.createFromReadableStream(body, manifest), + async (payload) => { + return await RDS.renderToReadableStream( + , + { + bootstrapModules, + signal: request.signal, + } + ); + } + ); + } catch (reason) { + console.error(reason); + return new Response("Internal Server Error", { status: 500 }); + } + }, +} satisfies ExportedHandler; diff --git a/playground/rsc-vite/src/ssr/wrangler.toml b/playground/rsc-vite/src/ssr/wrangler.toml new file mode 100644 index 0000000000..f8c534067b --- /dev/null +++ b/playground/rsc-vite/src/ssr/wrangler.toml @@ -0,0 +1,6 @@ +name = "ssr" +main = "./entry.ssr.tsx" +compatibility_date = "2024-09-23" +compatibility_flags = ["nodejs_compat"] +assets = { binding = "ASSETS" } +services = [{ binding = "SERVER", service = "server" }] diff --git a/playground/rsc-vite/tsconfig.client.json b/playground/rsc-vite/tsconfig.client.json new file mode 100644 index 0000000000..4984367e57 --- /dev/null +++ b/playground/rsc-vite/tsconfig.client.json @@ -0,0 +1,26 @@ +{ + "include": ["framework", "src"], + "compilerOptions": { + "lib": ["ES2022", "DOM", "DOM.Iterable"], + "types": ["@cloudflare/workers-types", "@types/node", "vite/client"], + "rootDir": ".", + "paths": { + "~/*": ["./src/app/*"], + "framework/*": ["./framework/*"] + }, + "allowImportingTsExtensions": true, + "jsx": "react-jsx", + "esModuleInterop": false, + "skipLibCheck": true, + "target": "ES2022", + "resolveJsonModule": true, + "moduleDetection": "force", + "isolatedModules": true, + "verbatimModuleSyntax": true, + "strict": true, + "noUncheckedIndexedAccess": true, + "noImplicitOverride": true, + "module": "Preserve", + "noEmit": true + } +} diff --git a/playground/rsc-vite/tsconfig.json b/playground/rsc-vite/tsconfig.json new file mode 100644 index 0000000000..e748ae2236 --- /dev/null +++ b/playground/rsc-vite/tsconfig.json @@ -0,0 +1,7 @@ +{ + "files": [], + "references": [ + { "path": "./tsconfig.node.json" }, + { "path": "./tsconfig.client.json" } + ] +} diff --git a/playground/rsc-vite/tsconfig.node.json b/playground/rsc-vite/tsconfig.node.json new file mode 100644 index 0000000000..70add5e01e --- /dev/null +++ b/playground/rsc-vite/tsconfig.node.json @@ -0,0 +1,18 @@ +{ + "include": ["vite.config.ts", "__tests__"], + "compilerOptions": { + "esModuleInterop": false, + "skipLibCheck": true, + "target": "ES2022", + "resolveJsonModule": true, + "moduleDetection": "force", + "isolatedModules": true, + "verbatimModuleSyntax": true, + "strict": true, + "noUncheckedIndexedAccess": true, + "noImplicitOverride": true, + "module": "Preserve", + "lib": ["ES2022"], + "noEmit": true + } +} diff --git a/playground/rsc-vite/vite.config.ts b/playground/rsc-vite/vite.config.ts new file mode 100644 index 0000000000..f45c18ace6 --- /dev/null +++ b/playground/rsc-vite/vite.config.ts @@ -0,0 +1,52 @@ +import { cloudflare } from "@cloudflare/vite-plugin"; +import reactServerDOM from "@jacob-ebey/vite-react-server-dom"; +import { defineConfig } from "vite"; +import tsconfigPaths from "vite-tsconfig-paths"; + +export default defineConfig({ + resolve: { + external: ["cloudflare:workers"], + }, + environments: { + client: { + build: { + rollupOptions: { + input: "src/browser/entry.browser.tsx", + treeshake: { + moduleSideEffects: () => { + return false; + }, + }, + }, + }, + }, + }, + plugins: [ + tsconfigPaths({ configNames: ["tsconfig.client.json"] }), + reactServerDOM({ + browserEnvironment: "client", + serverEnvironments: ["server"], + ssrEnvironments: ["ssr"], + runtime: { + browser: { + importFrom: "framework/references.browser", + }, + server: { + importFrom: "framework/references.server", + }, + ssr: { + importFrom: "framework/references.ssr", + }, + }, + }), + cloudflare({ + persistState: true, + configPath: "src/ssr/wrangler.toml", + auxiliaryWorkers: [ + { + configPath: "src/server/wrangler.toml", + }, + ], + }), + ], +}); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3f9b983fee..9517cd532f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,7 +10,7 @@ overrides: jsdom: 22.1.0 react: 0.0.0-experimental-93b58361-20250209 react-dom: 0.0.0-experimental-93b58361-20250209 - workerd: 1.20240614.0 + workerd: 1.20250224.0 patchedDependencies: '@changesets/assemble-release-plan': @@ -53,7 +53,7 @@ importers: version: 1.1.3 '@mdx-js/rollup': specifier: ^3.0.0 - version: 3.0.1(rollup@4.24.0) + version: 3.0.1(rollup@4.34.8) '@octokit/core': specifier: ^4.2.4 version: 4.2.4 @@ -140,7 +140,7 @@ importers: version: 8.57.0 eslint-config-react-app: specifier: ^7.0.1 - version: 7.0.1(@babel/plugin-syntax-flow@7.18.6(@babel/core@7.24.3))(@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.24.3))(eslint@8.57.0)(jest@29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0))(typescript@5.4.5) + version: 7.0.1(@babel/plugin-syntax-flow@7.18.6(@babel/core@7.24.3))(@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.24.3))(eslint@8.57.0)(jest@29.7.0(@types/node@22.13.4)(babel-plugin-macros@3.1.0))(typescript@5.4.5) eslint-plugin-flowtype: specifier: ^8.0.3 version: 8.0.3(@babel/plugin-syntax-flow@7.18.6(@babel/core@7.24.3))(@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.24.3))(eslint@8.57.0) @@ -149,7 +149,7 @@ importers: version: 2.29.1(@typescript-eslint/parser@7.5.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0) eslint-plugin-jest: specifier: ^27.9.0 - version: 27.9.0(@typescript-eslint/eslint-plugin@7.5.0(@typescript-eslint/parser@7.5.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(jest@29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0))(typescript@5.4.5) + version: 27.9.0(@typescript-eslint/eslint-plugin@7.5.0(@typescript-eslint/parser@7.5.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(jest@29.7.0(@types/node@22.13.4)(babel-plugin-macros@3.1.0))(typescript@5.4.5) eslint-plugin-jsx-a11y: specifier: ^6.8.0 version: 6.8.0(eslint@8.57.0) @@ -158,7 +158,7 @@ importers: version: 7.34.1(eslint@8.57.0) eslint-plugin-react-hooks: specifier: next - version: 5.2.0-canary-a84862db-20250218(eslint@8.57.0) + version: 5.2.0-canary-ebc22ef7-20250225(eslint@8.57.0) fs-extra: specifier: ^10.1.0 version: 10.1.0 @@ -170,7 +170,7 @@ importers: version: 5.1.11 jest: specifier: ^29.6.4 - version: 29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0) + version: 29.7.0(@types/node@22.13.4)(babel-plugin-macros@3.1.0) jest-environment-jsdom: specifier: ^29.6.2 version: 29.6.2 @@ -227,13 +227,13 @@ importers: version: 3.1.1 vite: specifier: ^6.0.0 - version: 6.0.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) + version: 6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) vite-env-only: specifier: ^3.0.1 - version: 3.0.1(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)) + version: 3.0.1(vite@6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)) vite-tsconfig-paths: specifier: ^4.2.2 - version: 4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)) integration: dependencies: @@ -600,7 +600,7 @@ importers: version: 1.3.3 tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -637,7 +637,7 @@ importers: version: 6.0.1 tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -677,7 +677,7 @@ importers: version: link:../react-router tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -695,7 +695,7 @@ importers: version: link:../react-router tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -864,7 +864,7 @@ importers: version: 1.3.3 tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -876,7 +876,7 @@ importers: version: 0.14.9 wrangler: specifier: ^3.28.2 - version: 3.64.0(@cloudflare/workers-types@4.20240712.0) + version: 3.64.0(@cloudflare/workers-types@4.20250224.0) packages/react-router-dom: dependencies: @@ -892,7 +892,7 @@ importers: version: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -929,7 +929,7 @@ importers: version: 6.3.4 tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -948,7 +948,7 @@ importers: version: link:../react-router-dev tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -979,7 +979,7 @@ importers: version: link:../react-router tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -994,7 +994,7 @@ importers: version: link:../react-router-dev tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -1043,7 +1043,7 @@ importers: version: 0.5.10 tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -1282,7 +1282,7 @@ importers: version: 3.3.0 parcel: specifier: 2.0.0-canary.1777 - version: 2.0.0-canary.1777(@swc/helpers@0.5.15)(postcss@8.4.49)(terser@5.15.0)(typescript@5.4.5) + version: 2.0.0-canary.1777(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) path-browserify: specifier: ^1.0.0 version: 1.0.1 @@ -1296,6 +1296,61 @@ importers: specifier: ^0.11.0 version: 0.11.4 + playground/rsc-vite: + dependencies: + '@jacob-ebey/react-server-dom-vite': + specifier: 19.0.0-experimental.14 + version: 19.0.0-experimental.14(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209) + '@mjackson/node-fetch-server': + specifier: 0.6.1 + version: 0.6.1 + express: + specifier: ^4.21.2 + version: 4.21.2 + react: + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209 + react-dom: + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) + react-router: + specifier: workspace:* + version: link:../../packages/react-router + devDependencies: + '@biomejs/biome': + specifier: ^1.9.4 + version: 1.9.4 + '@cloudflare/vite-plugin': + specifier: 0.1.7 + version: 0.1.7(vite@6.2.0(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0))(workerd@1.20250224.0)(wrangler@3.111.0(@cloudflare/workers-types@4.20250224.0)) + '@cloudflare/workers-types': + specifier: ^4.20250224.0 + version: 4.20250224.0 + '@jacob-ebey/vite-react-server-dom': + specifier: 0.0.12 + version: 0.0.12(@jacob-ebey/react-server-dom-vite@19.0.0-experimental.14(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209))(rollup@4.34.8)(vite@6.2.0(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)) + '@types/express': + specifier: ^5.0.0 + version: 5.0.0 + '@types/node': + specifier: ^22.13.1 + version: 22.13.4 + '@types/react': + specifier: ^18.2.18 + version: 18.2.18 + '@types/react-dom': + specifier: ^18.2.7 + version: 18.2.7 + vite: + specifier: ^6.2.0 + version: 6.2.0(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) + vite-tsconfig-paths: + specifier: ^5.1.4 + version: 5.1.4(typescript@5.4.5)(vite@6.2.0(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)) + wrangler: + specifier: ^3.111.0 + version: 3.111.0(@cloudflare/workers-types@4.20250224.0) + playground/split-route-modules: dependencies: '@react-router/node': @@ -1398,14 +1453,30 @@ packages: resolution: {integrity: sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==} engines: {node: '>=6.9.0'} + '@babel/code-frame@7.26.2': + resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==} + engines: {node: '>=6.9.0'} + '@babel/compat-data@7.24.1': resolution: {integrity: sha512-Pc65opHDliVpRHuKfzI+gSA4zcgr65O4cl64fFJIWEEh8JoHIHh0Oez1Eo8Arz8zq/JhgKodQaxEwUPRtZylVA==} engines: {node: '>=6.9.0'} + '@babel/compat-data@7.26.8': + resolution: {integrity: sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==} + engines: {node: '>=6.9.0'} + '@babel/core@7.24.3': resolution: {integrity: sha512-5FcvN1JHw2sHJChotgx8Ek0lyuh4kCKelgMTTqhYJJtloNvUfpAFMeNQUtdlIaktwrSV9LtCdqwk48wL2wBacQ==} engines: {node: '>=6.9.0'} + '@babel/core@7.24.4': + resolution: {integrity: sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==} + engines: {node: '>=6.9.0'} + + '@babel/core@7.26.9': + resolution: {integrity: sha512-lWBYIrF7qK5+GjY5Uy+/hEgp8OJWOD/rpy74GplYRhEauvbHDeFB8t5hPOZxCZ0Oxf4Cc36tK51/l3ymJysrKw==} + engines: {node: '>=6.9.0'} + '@babel/eslint-parser@7.24.1': resolution: {integrity: sha512-d5guuzMlPeDfZIbpQ8+g1NaCNuAGBBGNECh0HVqz1sjOeVLh2CEaifuOysCH18URW6R7pqXINvf5PaR/dC6jLQ==} engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0} @@ -1417,6 +1488,10 @@ packages: resolution: {integrity: sha512-DfCRfZsBcrPEHUfuBMgbJ1Ut01Y/itOs+hY2nFLgqsqXd52/iSiVq5TITtUasIUgm+IIKdY2/1I7auiQOEeC9A==} engines: {node: '>=6.9.0'} + '@babel/generator@7.26.9': + resolution: {integrity: sha512-kEWdzjOAUMW4hAyrzJ0ZaTOu9OmpyDIQicIh0zg0EEcEkYXZb2TjtBhnHi2ViX7PKwZqF4xwqfAm299/QMP3lg==} + engines: {node: '>=6.9.0'} + '@babel/helper-annotate-as-pure@7.22.5': resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==} engines: {node: '>=6.9.0'} @@ -1429,6 +1504,10 @@ packages: resolution: {integrity: sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==} engines: {node: '>=6.9.0'} + '@babel/helper-compilation-targets@7.26.5': + resolution: {integrity: sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==} + engines: {node: '>=6.9.0'} + '@babel/helper-create-class-features-plugin@7.24.1': resolution: {integrity: sha512-1yJa9dX9g//V6fDebXoEfEsxkZHk3Hcbm+zLhyu6qVgYFLvmTALTeV+jNU9e5RnYtioBrGEOdoI2joMSNQ/+aA==} engines: {node: '>=6.9.0'} @@ -1471,12 +1550,22 @@ packages: resolution: {integrity: sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==} engines: {node: '>=6.9.0'} + '@babel/helper-module-imports@7.25.9': + resolution: {integrity: sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==} + engines: {node: '>=6.9.0'} + '@babel/helper-module-transforms@7.23.3': resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 + '@babel/helper-module-transforms@7.26.0': + resolution: {integrity: sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + '@babel/helper-optimise-call-expression@7.22.5': resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==} engines: {node: '>=6.9.0'} @@ -1485,6 +1574,10 @@ packages: resolution: {integrity: sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==} engines: {node: '>=6.9.0'} + '@babel/helper-plugin-utils@7.26.5': + resolution: {integrity: sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==} + engines: {node: '>=6.9.0'} + '@babel/helper-remap-async-to-generator@7.22.9': resolution: {integrity: sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==} engines: {node: '>=6.9.0'} @@ -1513,14 +1606,26 @@ packages: resolution: {integrity: sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==} engines: {node: '>=6.9.0'} + '@babel/helper-string-parser@7.25.9': + resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==} + engines: {node: '>=6.9.0'} + '@babel/helper-validator-identifier@7.22.20': resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==} engines: {node: '>=6.9.0'} + '@babel/helper-validator-identifier@7.25.9': + resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==} + engines: {node: '>=6.9.0'} + '@babel/helper-validator-option@7.23.5': resolution: {integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==} engines: {node: '>=6.9.0'} + '@babel/helper-validator-option@7.25.9': + resolution: {integrity: sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==} + engines: {node: '>=6.9.0'} + '@babel/helper-wrap-function@7.22.9': resolution: {integrity: sha512-sZ+QzfauuUEfxSEjKFmi3qDSHgLsTPK/pEpoD/qonZKOtTPTLbf59oabPQ4rKekt9lFcj/hTZaOhWwFYrgjk+Q==} engines: {node: '>=6.9.0'} @@ -1529,6 +1634,10 @@ packages: resolution: {integrity: sha512-BpU09QqEe6ZCHuIHFphEFgvNSrubve1FtyMton26ekZ85gRGi6LrTF7zArARp2YvyFxloeiRmtSCq5sjh1WqIg==} engines: {node: '>=6.9.0'} + '@babel/helpers@7.26.9': + resolution: {integrity: sha512-Mz/4+y8udxBKdmzt/UjPACs4G3j5SshJJEFFKxlCGPydG4JAHXxjWjAwjd09tf6oINvl1VfMJo+nB7H2YKQ0dA==} + engines: {node: '>=6.9.0'} + '@babel/highlight@7.24.2': resolution: {integrity: sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==} engines: {node: '>=6.9.0'} @@ -1538,6 +1647,11 @@ packages: engines: {node: '>=6.0.0'} hasBin: true + '@babel/parser@7.26.9': + resolution: {integrity: sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==} + engines: {node: '>=6.0.0'} + hasBin: true + '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.22.5': resolution: {integrity: sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==} engines: {node: '>=6.9.0'} @@ -1983,6 +2097,18 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 + '@babel/plugin-transform-react-jsx-self@7.25.9': + resolution: {integrity: sha512-y8quW6p0WHkEhmErnfe58r7x0A70uKphQm8Sp8cV7tjNQwK56sNVK0M73LK3WuYmsuyrftut4xAkjjgU0twaMg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + + '@babel/plugin-transform-react-jsx-source@7.25.9': + resolution: {integrity: sha512-+iqjT8xmXhhYv4/uiYd8FNQsraMFZIfxVSqxxVSZP0WbbSAWvBXAul0m/zu+7Vv4O/3WtApy9pmaTMiumEZgfg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + '@babel/plugin-transform-react-jsx@7.22.5': resolution: {integrity: sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==} engines: {node: '>=6.9.0'} @@ -2107,14 +2233,26 @@ packages: resolution: {integrity: sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==} engines: {node: '>=6.9.0'} + '@babel/template@7.26.9': + resolution: {integrity: sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==} + engines: {node: '>=6.9.0'} + '@babel/traverse@7.24.1': resolution: {integrity: sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==} engines: {node: '>=6.9.0'} + '@babel/traverse@7.26.9': + resolution: {integrity: sha512-ZYW7L+pL8ahU5fXmNbPF+iZFHCv5scFak7MZ9bwaRPLUhHh7QQEMjZUg0HevihoqCM5iSYHN61EyCoZvqC+bxg==} + engines: {node: '>=6.9.0'} + '@babel/types@7.24.0': resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==} engines: {node: '>=6.9.0'} + '@babel/types@7.26.9': + resolution: {integrity: sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==} + engines: {node: '>=6.9.0'} + '@bcoe/v8-coverage@0.2.3': resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} @@ -2230,32 +2368,47 @@ packages: resolution: {integrity: sha512-YLPHc8yASwjNkmcDMQMY35yiWjoKAKnhUbPRszBRS0YgH+IXtsMp61j+yTcnCE3oO2DgP0U3iejLC8FTtKDC8Q==} engines: {node: '>=16.13'} - '@cloudflare/workerd-darwin-64@1.20240614.0': - resolution: {integrity: sha512-i8jTfHNWIAjW1Lb2UnUbYCxvaNwFc9bQsPoRDzXZnQ9VoWN/FMbyB3FWX17rXOtSnqWUrIrimqqxumwCBACVBw==} + '@cloudflare/unenv-preset@1.1.1': + resolution: {integrity: sha512-8y7gFmXnOF9kycm8eIaL0rNBd5np3a/aLaG04pfFG4aEF0rIHAMiGFxQfg1ZIV77ApLHzPomr9/ixLbZWXwX3w==} + peerDependencies: + unenv: 2.0.0-rc.1 + workerd: 1.20250224.0 + peerDependenciesMeta: + workerd: + optional: true + + '@cloudflare/vite-plugin@0.1.7': + resolution: {integrity: sha512-s3j4eHvGsz2eTv78na1YZ0HvTgj78SZ9iq10p1SbgiEE4SXLOlqYCifJiNP32nUQga9678OUeHqdV39thkD9vQ==} + peerDependencies: + vite: ^6.1.0 + wrangler: ^3.101.0 + + '@cloudflare/workerd-darwin-64@1.20250224.0': + resolution: {integrity: sha512-sBbaAF2vgQ9+T50ik1ihekdepStBp0w4fvNghBfXIw1iWqfNWnypcjDMmi/7JhXJt2uBxBrSlXCvE5H7Gz+kbw==} engines: {node: '>=16'} cpu: [x64] os: [darwin] - '@cloudflare/workerd-darwin-arm64@1.20240614.0': - resolution: {integrity: sha512-jtZ3xeEqUtLSRKaOPh6s+pcATngpUJ+ZCctH7ul390E6sti6b3JZnszR3Ii0JSoRenNujjOfuzlSpakFhGCYGQ==} + '@cloudflare/workerd-darwin-arm64@1.20250224.0': + resolution: {integrity: sha512-naetGefgjAaDbEacpwaVruJXNwxmRRL7v3ppStgEiqAlPmTpQ/Edjn2SQ284QwOw3MvaVPHrWcaTBupUpkqCyg==} engines: {node: '>=16'} cpu: [arm64] os: [darwin] - '@cloudflare/workerd-linux-64@1.20240614.0': - resolution: {integrity: sha512-cRV7YsAjwT7TkQw3aknV+jNIh2aCJ9iCN2SXyS/3KIUCDwq71HhsjZxCWM9pQ8ZvhazX1DI1rmGk3WGXPuBpAw==} + '@cloudflare/workerd-linux-64@1.20250224.0': + resolution: {integrity: sha512-BtUvuj91rgB06TUAkLYvedghUA8nDFiLcY3GC7MXmWhxCxGmY4PWkrKq/+uHjrhwknCcXrE4aFsM28ja8EcAGA==} engines: {node: '>=16'} cpu: [x64] os: [linux] - '@cloudflare/workerd-linux-arm64@1.20240614.0': - resolution: {integrity: sha512-XxwPZktE9D0X00xdSGi8oOZQ+EUMRkXlsxCAQv8GF/kWh/wmtI2ODDtBFfyDSlT2aBTUAe2eFLdkTlBLjQgqAg==} + '@cloudflare/workerd-linux-arm64@1.20250224.0': + resolution: {integrity: sha512-Gr4MPNi+BvwjfWF7clx0dJY2Vm4suaW5FtAQwrfqJmPtN5zb/BP16VZxxnFRMy377dP7ycoxpKfZZ6Q8RVGvbA==} engines: {node: '>=16'} cpu: [arm64] os: [linux] - '@cloudflare/workerd-windows-64@1.20240614.0': - resolution: {integrity: sha512-T2ZvRGC3g7zbfXXiMURpu7ruX+gNu3Yz3S7zBOVNPi8SrHfeokxfyAzrk6Rr/kb+gjG2FCemTx3x6/mkG5KRFg==} + '@cloudflare/workerd-windows-64@1.20250224.0': + resolution: {integrity: sha512-x2iF1CsmYmmPEorWb1GRpAAouX5rRjmhuHMC259ojIlozR4G0LarlB9XfmeLEvtw537Ea0kJ6SOhjvUcWzxSvA==} engines: {node: '>=16'} cpu: [x64] os: [win32] @@ -2263,10 +2416,16 @@ packages: '@cloudflare/workers-types@4.20240712.0': resolution: {integrity: sha512-C+C0ZnkRrxR2tPkZKAXwBsWEse7bWaA7iMbaG6IKaxaPTo/5ilx7Ei3BkI2izxmOJMsC05VS1eFUf95urXzhmw==} + '@cloudflare/workers-types@4.20250224.0': + resolution: {integrity: sha512-j6ZwQ5G2moQRaEtGI2u5TBQhVXv/XwOS5jfBAheZHcpCM07zm8j0i8jZHHLq/6VA8e6VRjKohOyj5j6tZ1KHLQ==} + '@cspotcode/source-map-support@0.8.1': resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==} engines: {node: '>=12'} + '@emnapi/runtime@1.3.1': + resolution: {integrity: sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==} + '@emotion/hash@0.9.1': resolution: {integrity: sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==} @@ -3020,6 +3179,22 @@ packages: '@hapi/topo@5.1.0': resolution: {integrity: sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==} + '@hattip/adapter-node@0.0.49': + resolution: {integrity: sha512-BE+Y8Q4U0YcH34FZUYU4DssGKOaZLbNL0zK57Z41UZp0m9kS79ZIolBmjjpPhTVpIlRY3Rs+uhXbVXKk7mUcJA==} + + '@hattip/core@0.0.49': + resolution: {integrity: sha512-3/ZJtC17cv8m6Sph8+nw4exUp9yhEf2Shi7HK6AHSUSBtaaQXZ9rJBVxTfZj3PGNOR/P49UBXOym/52WYKFTJQ==} + + '@hattip/headers@0.0.49': + resolution: {integrity: sha512-rrB2lEhTf0+MNVt5WdW184Ky706F1Ze9Aazn/R8c+/FMUYF9yjem2CgXp49csPt3dALsecrnAUOHFiV0LrrHXA==} + + '@hattip/polyfills@0.0.49': + resolution: {integrity: sha512-5g7W5s6Gq+HDxwULGFQ861yAnEx3yd9V8GDwS96HBZ1nM1u93vN+KTuwXvNsV7Z3FJmCrD/pgU8WakvchclYuA==} + + '@hattip/walk@0.0.49': + resolution: {integrity: sha512-AgJgKLooZyQnzMfoFg5Mo/aHM+HGBC9ExpXIjNqGimYTRgNbL/K7X5EM1kR2JY90BNKk9lo6Usq1T/nWFdT7TQ==} + hasBin: true + '@humanwhocodes/config-array@0.11.14': resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==} engines: {node: '>=10.10.0'} @@ -3033,6 +3208,111 @@ packages: resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==} deprecated: Use @eslint/object-schema instead + '@img/sharp-darwin-arm64@0.33.5': + resolution: {integrity: sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [arm64] + os: [darwin] + + '@img/sharp-darwin-x64@0.33.5': + resolution: {integrity: sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [x64] + os: [darwin] + + '@img/sharp-libvips-darwin-arm64@1.0.4': + resolution: {integrity: sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==} + cpu: [arm64] + os: [darwin] + + '@img/sharp-libvips-darwin-x64@1.0.4': + resolution: {integrity: sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==} + cpu: [x64] + os: [darwin] + + '@img/sharp-libvips-linux-arm64@1.0.4': + resolution: {integrity: sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==} + cpu: [arm64] + os: [linux] + + '@img/sharp-libvips-linux-arm@1.0.5': + resolution: {integrity: sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==} + cpu: [arm] + os: [linux] + + '@img/sharp-libvips-linux-s390x@1.0.4': + resolution: {integrity: sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==} + cpu: [s390x] + os: [linux] + + '@img/sharp-libvips-linux-x64@1.0.4': + resolution: {integrity: sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==} + cpu: [x64] + os: [linux] + + '@img/sharp-libvips-linuxmusl-arm64@1.0.4': + resolution: {integrity: sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==} + cpu: [arm64] + os: [linux] + + '@img/sharp-libvips-linuxmusl-x64@1.0.4': + resolution: {integrity: sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==} + cpu: [x64] + os: [linux] + + '@img/sharp-linux-arm64@0.33.5': + resolution: {integrity: sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [arm64] + os: [linux] + + '@img/sharp-linux-arm@0.33.5': + resolution: {integrity: sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [arm] + os: [linux] + + '@img/sharp-linux-s390x@0.33.5': + resolution: {integrity: sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [s390x] + os: [linux] + + '@img/sharp-linux-x64@0.33.5': + resolution: {integrity: sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [x64] + os: [linux] + + '@img/sharp-linuxmusl-arm64@0.33.5': + resolution: {integrity: sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [arm64] + os: [linux] + + '@img/sharp-linuxmusl-x64@0.33.5': + resolution: {integrity: sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [x64] + os: [linux] + + '@img/sharp-wasm32@0.33.5': + resolution: {integrity: sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [wasm32] + + '@img/sharp-win32-ia32@0.33.5': + resolution: {integrity: sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [ia32] + os: [win32] + + '@img/sharp-win32-x64@0.33.5': + resolution: {integrity: sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [x64] + os: [win32] + '@isaacs/cliui@8.0.2': resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} engines: {node: '>=12'} @@ -3045,6 +3325,19 @@ packages: resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==} engines: {node: '>=8'} + '@jacob-ebey/react-server-dom-vite@19.0.0-experimental.14': + resolution: {integrity: sha512-4bBG0uLS/XuddOi1KjJb6j/A49rdEe62yzcFjd7jghQmPXT8jNinyIislylz9xupJB3TvHB8JGv5/PB+LPASHg==} + engines: {node: '>=0.10.0'} + peerDependencies: + react: 0.0.0-experimental-93b58361-20250209 + react-dom: 0.0.0-experimental-93b58361-20250209 + + '@jacob-ebey/vite-react-server-dom@0.0.12': + resolution: {integrity: sha512-XzaqcFlnXgRv2ZVyHJEhJGLvTsx0XCpnGqlHywzrp6XjUMujyRvEdNp4EGt8VGpGtH0o+TlS6YxLTc8MVH3jGQ==} + peerDependencies: + '@jacob-ebey/react-server-dom-vite': '*' + vite: ^6.0.0 + '@jest/console@29.7.0': resolution: {integrity: sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} @@ -3135,6 +3428,9 @@ packages: '@jridgewell/trace-mapping@0.3.9': resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==} + '@kamilkisiela/fast-url-parser@1.1.4': + resolution: {integrity: sha512-gbkePEBupNydxCelHCESvFSFM8XPh1Zs/OAVRW/rKpEqPAl5PbOM90Si8mv9bvnR53uPD2s/FiRxdvSejpRJew==} + '@lezer/common@1.2.3': resolution: {integrity: sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==} @@ -3192,6 +3488,9 @@ packages: '@mjackson/node-fetch-server@0.2.0': resolution: {integrity: sha512-EMlH1e30yzmTpGLQjlFmaDAjyOeZhng1/XCd7DExR8PNAnG/G1tyruZxEoUe11ClnwGhGrtsdnyyUx1frSzjng==} + '@mjackson/node-fetch-server@0.5.0': + resolution: {integrity: sha512-GZrkGuP3N7he0GdK9CCqpjabqsXjJa4tp0yKw973FoGAAOGE6WTcp3kcosRdeGYqtoFn7IEu84g3pItk4wRBFg==} + '@mjackson/node-fetch-server@0.6.1': resolution: {integrity: sha512-9ZJnk/DJjt805uv5PPv11haJIW+HHf3YEEyVXv+8iLQxLD/iXA68FH220XoiTPBC4gCg5q+IMadDw8qPqlA5wg==} @@ -3696,81 +3995,176 @@ packages: cpu: [arm] os: [android] + '@rollup/rollup-android-arm-eabi@4.34.8': + resolution: {integrity: sha512-q217OSE8DTp8AFHuNHXo0Y86e1wtlfVrXiAlwkIvGRQv9zbc6mE3sjIVfwI8sYUyNxwOg0j/Vm1RKM04JcWLJw==} + cpu: [arm] + os: [android] + '@rollup/rollup-android-arm64@4.24.0': resolution: {integrity: sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==} cpu: [arm64] os: [android] + '@rollup/rollup-android-arm64@4.34.8': + resolution: {integrity: sha512-Gigjz7mNWaOL9wCggvoK3jEIUUbGul656opstjaUSGC3eT0BM7PofdAJaBfPFWWkXNVAXbaQtC99OCg4sJv70Q==} + cpu: [arm64] + os: [android] + '@rollup/rollup-darwin-arm64@4.24.0': resolution: {integrity: sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==} cpu: [arm64] os: [darwin] + '@rollup/rollup-darwin-arm64@4.34.8': + resolution: {integrity: sha512-02rVdZ5tgdUNRxIUrFdcMBZQoaPMrxtwSb+/hOfBdqkatYHR3lZ2A2EGyHq2sGOd0Owk80oV3snlDASC24He3Q==} + cpu: [arm64] + os: [darwin] + '@rollup/rollup-darwin-x64@4.24.0': resolution: {integrity: sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==} cpu: [x64] os: [darwin] + '@rollup/rollup-darwin-x64@4.34.8': + resolution: {integrity: sha512-qIP/elwR/tq/dYRx3lgwK31jkZvMiD6qUtOycLhTzCvrjbZ3LjQnEM9rNhSGpbLXVJYQ3rq39A6Re0h9tU2ynw==} + cpu: [x64] + os: [darwin] + + '@rollup/rollup-freebsd-arm64@4.34.8': + resolution: {integrity: sha512-IQNVXL9iY6NniYbTaOKdrlVP3XIqazBgJOVkddzJlqnCpRi/yAeSOa8PLcECFSQochzqApIOE1GHNu3pCz+BDA==} + cpu: [arm64] + os: [freebsd] + + '@rollup/rollup-freebsd-x64@4.34.8': + resolution: {integrity: sha512-TYXcHghgnCqYFiE3FT5QwXtOZqDj5GmaFNTNt3jNC+vh22dc/ukG2cG+pi75QO4kACohZzidsq7yKTKwq/Jq7Q==} + cpu: [x64] + os: [freebsd] + '@rollup/rollup-linux-arm-gnueabihf@4.24.0': resolution: {integrity: sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==} cpu: [arm] os: [linux] + '@rollup/rollup-linux-arm-gnueabihf@4.34.8': + resolution: {integrity: sha512-A4iphFGNkWRd+5m3VIGuqHnG3MVnqKe7Al57u9mwgbyZ2/xF9Jio72MaY7xxh+Y87VAHmGQr73qoKL9HPbXj1g==} + cpu: [arm] + os: [linux] + '@rollup/rollup-linux-arm-musleabihf@4.24.0': resolution: {integrity: sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==} cpu: [arm] os: [linux] + '@rollup/rollup-linux-arm-musleabihf@4.34.8': + resolution: {integrity: sha512-S0lqKLfTm5u+QTxlFiAnb2J/2dgQqRy/XvziPtDd1rKZFXHTyYLoVL58M/XFwDI01AQCDIevGLbQrMAtdyanpA==} + cpu: [arm] + os: [linux] + '@rollup/rollup-linux-arm64-gnu@4.24.0': resolution: {integrity: sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==} cpu: [arm64] os: [linux] + '@rollup/rollup-linux-arm64-gnu@4.34.8': + resolution: {integrity: sha512-jpz9YOuPiSkL4G4pqKrus0pn9aYwpImGkosRKwNi+sJSkz+WU3anZe6hi73StLOQdfXYXC7hUfsQlTnjMd3s1A==} + cpu: [arm64] + os: [linux] + '@rollup/rollup-linux-arm64-musl@4.24.0': resolution: {integrity: sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==} cpu: [arm64] os: [linux] + '@rollup/rollup-linux-arm64-musl@4.34.8': + resolution: {integrity: sha512-KdSfaROOUJXgTVxJNAZ3KwkRc5nggDk+06P6lgi1HLv1hskgvxHUKZ4xtwHkVYJ1Rep4GNo+uEfycCRRxht7+Q==} + cpu: [arm64] + os: [linux] + + '@rollup/rollup-linux-loongarch64-gnu@4.34.8': + resolution: {integrity: sha512-NyF4gcxwkMFRjgXBM6g2lkT58OWztZvw5KkV2K0qqSnUEqCVcqdh2jN4gQrTn/YUpAcNKyFHfoOZEer9nwo6uQ==} + cpu: [loong64] + os: [linux] + '@rollup/rollup-linux-powerpc64le-gnu@4.24.0': resolution: {integrity: sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==} cpu: [ppc64] os: [linux] + '@rollup/rollup-linux-powerpc64le-gnu@4.34.8': + resolution: {integrity: sha512-LMJc999GkhGvktHU85zNTDImZVUCJ1z/MbAJTnviiWmmjyckP5aQsHtcujMjpNdMZPT2rQEDBlJfubhs3jsMfw==} + cpu: [ppc64] + os: [linux] + '@rollup/rollup-linux-riscv64-gnu@4.24.0': resolution: {integrity: sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==} cpu: [riscv64] os: [linux] + '@rollup/rollup-linux-riscv64-gnu@4.34.8': + resolution: {integrity: sha512-xAQCAHPj8nJq1PI3z8CIZzXuXCstquz7cIOL73HHdXiRcKk8Ywwqtx2wrIy23EcTn4aZ2fLJNBB8d0tQENPCmw==} + cpu: [riscv64] + os: [linux] + '@rollup/rollup-linux-s390x-gnu@4.24.0': resolution: {integrity: sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==} cpu: [s390x] os: [linux] + '@rollup/rollup-linux-s390x-gnu@4.34.8': + resolution: {integrity: sha512-DdePVk1NDEuc3fOe3dPPTb+rjMtuFw89gw6gVWxQFAuEqqSdDKnrwzZHrUYdac7A7dXl9Q2Vflxpme15gUWQFA==} + cpu: [s390x] + os: [linux] + '@rollup/rollup-linux-x64-gnu@4.24.0': resolution: {integrity: sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==} cpu: [x64] os: [linux] + '@rollup/rollup-linux-x64-gnu@4.34.8': + resolution: {integrity: sha512-8y7ED8gjxITUltTUEJLQdgpbPh1sUQ0kMTmufRF/Ns5tI9TNMNlhWtmPKKHCU0SilX+3MJkZ0zERYYGIVBYHIA==} + cpu: [x64] + os: [linux] + '@rollup/rollup-linux-x64-musl@4.24.0': resolution: {integrity: sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==} cpu: [x64] os: [linux] + '@rollup/rollup-linux-x64-musl@4.34.8': + resolution: {integrity: sha512-SCXcP0ZpGFIe7Ge+McxY5zKxiEI5ra+GT3QRxL0pMMtxPfpyLAKleZODi1zdRHkz5/BhueUrYtYVgubqe9JBNQ==} + cpu: [x64] + os: [linux] + '@rollup/rollup-win32-arm64-msvc@4.24.0': resolution: {integrity: sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==} cpu: [arm64] os: [win32] + '@rollup/rollup-win32-arm64-msvc@4.34.8': + resolution: {integrity: sha512-YHYsgzZgFJzTRbth4h7Or0m5O74Yda+hLin0irAIobkLQFRQd1qWmnoVfwmKm9TXIZVAD0nZ+GEb2ICicLyCnQ==} + cpu: [arm64] + os: [win32] + '@rollup/rollup-win32-ia32-msvc@4.24.0': resolution: {integrity: sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==} cpu: [ia32] os: [win32] + '@rollup/rollup-win32-ia32-msvc@4.34.8': + resolution: {integrity: sha512-r3NRQrXkHr4uWy5TOjTpTYojR9XmF0j/RYgKCef+Ag46FWUTltm5ziticv8LdNsDMehjJ543x/+TJAek/xBA2w==} + cpu: [ia32] + os: [win32] + '@rollup/rollup-win32-x64-msvc@4.24.0': resolution: {integrity: sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==} cpu: [x64] os: [win32] + '@rollup/rollup-win32-x64-msvc@4.34.8': + resolution: {integrity: sha512-U0FaE5O1BCpZSeE6gBl3c5ObhePQSfk9vDRToMmTkbhCOgW4jqvtS5LGyQ76L1fH8sM0keRp4uDTsbjiUyjk0g==} + cpu: [x64] + os: [win32] + '@rushstack/eslint-patch@1.10.1': resolution: {integrity: sha512-S3Kq8e7LqxkA9s7HKLqXGTGck1uwis5vAXan3FnU5yw1Ec5hsSGnq4s/UCaSqABPOnOTg7zASLyst7+ohgWexg==} @@ -4319,9 +4713,23 @@ packages: peerDependencies: vite: ^2.2.3 || ^3.0.0 || ^4.0.3 || ^5.0.0 + '@vitejs/plugin-react@4.3.4': + resolution: {integrity: sha512-SCCPBJtYLdE8PX/7ZQAs1QAZ8Jqwih+0VBLum1EGqmCCQal+MIUqLCzj3ZUy8ufbC0cAM4LRlSTm7IQJwWT4ug==} + engines: {node: ^14.18.0 || >=16.0.0} + peerDependencies: + vite: ^4.2.0 || ^5.0.0 || ^6.0.0 + '@web3-storage/multipart-parser@1.0.0': resolution: {integrity: sha512-BEO6al7BYqcnfX15W2cnGR+Q566ACXAT9UQykORCWW80lmkpWsnEob6zJS1ZVBKsSJC8+7vJkHwlp+lXG1UCdw==} + '@whatwg-node/fetch@0.9.23': + resolution: {integrity: sha512-7xlqWel9JsmxahJnYVUj/LLxWcnA93DR4c9xlw3U814jWTiYalryiH1qToik1hOxweKKRLi4haXHM5ycRksPBA==} + engines: {node: '>=18.0.0'} + + '@whatwg-node/node-fetch@0.6.0': + resolution: {integrity: sha512-tcZAhrpx6oVlkEsRngeTEEE7I5/QdLjeEz4IlekabGaESP7+Dkm/6a9KcF1KdCBB7mO9PXtBkwCuTCt8+UPg8Q==} + engines: {node: '>=18.0.0'} + '@xmldom/xmldom@0.8.10': resolution: {integrity: sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==} engines: {node: '>=10.0.0'} @@ -4346,6 +4754,10 @@ packages: peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 + acorn-walk@8.3.2: + resolution: {integrity: sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==} + engines: {node: '>=0.4.0'} + acorn-walk@8.3.3: resolution: {integrity: sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==} engines: {node: '>=0.4.0'} @@ -4355,6 +4767,11 @@ packages: engines: {node: '>=0.4.0'} hasBin: true + acorn@8.14.0: + resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==} + engines: {node: '>=0.4.0'} + hasBin: true + agent-base@6.0.2: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} @@ -4665,6 +5082,11 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true + browserslist@4.24.4: + resolution: {integrity: sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==} + engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} + hasBin: true + bser@2.1.1: resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==} @@ -4686,6 +5108,10 @@ packages: peerDependencies: esbuild: '>=0.18' + busboy@1.6.0: + resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==} + engines: {node: '>=10.16.0'} + bytes@3.0.0: resolution: {integrity: sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==} engines: {node: '>= 0.8'} @@ -4725,6 +5151,9 @@ packages: caniuse-lite@1.0.30001599: resolution: {integrity: sha512-LRAQHZ4yT1+f9LemSMeqdMpMxZcc4RMWdj4tiFe3G8tNkWK+E58g+/tzotb5cU6TbcVJLr4fySiAW7XmxQvZQA==} + caniuse-lite@1.0.30001701: + resolution: {integrity: sha512-faRs/AW3jA9nTwmJBSO1PQ6L/EOgsB5HMQQq4iCu5zhPgVVgO/pZRHlmatwijZKetFw8/Pr4q6dEN8sJuq8qTw==} + capnp-ts@0.7.0: resolution: {integrity: sha512-XKxXAC3HVPv7r674zP0VC3RTXz+/JKhfyw94ljvF80yynK6VkTnqE3jMuN8b3dUVmmc43TjyxjW4KTsmB3c86g==} @@ -4849,6 +5278,13 @@ packages: color-name@1.1.4: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} + color-string@1.9.1: + resolution: {integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==} + + color@4.2.3: + resolution: {integrity: sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==} + engines: {node: '>=12.5.0'} + combined-stream@1.0.8: resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==} engines: {node: '>= 0.8'} @@ -4881,6 +5317,9 @@ packages: concat-map@0.0.1: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} + confbox@0.1.8: + resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==} + confusing-browser-globals@1.0.11: resolution: {integrity: sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==} @@ -5264,6 +5703,9 @@ packages: electron-to-chromium@1.4.714: resolution: {integrity: sha512-OfnVHt+nMRH9Ua5koH/2gKlCAXbG+u1yXwLKyBVqNboBV34ZTwb846RUe8K5mtE1uhz0BXoMarZ13JCQr+sBtQ==} + electron-to-chromium@1.5.108: + resolution: {integrity: sha512-tiGxpQmvXBEzrfU5ertmbCV/nG5yqCkC1G4T1SIKP335Y5rjXzPWmijR6XcoGXZvVoo4dknfdNe4Tl7lcIROLg==} + emittery@0.13.1: resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==} engines: {node: '>=12'} @@ -5381,6 +5823,10 @@ packages: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} engines: {node: '>=6'} + escalade@3.2.0: + resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==} + engines: {node: '>=6'} + escape-html@1.0.3: resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==} @@ -5495,8 +5941,8 @@ packages: peerDependencies: eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 - eslint-plugin-react-hooks@5.2.0-canary-a84862db-20250218: - resolution: {integrity: sha512-vxpEdyHHefMT9MrTHIUq8dBGbxBxWN97RPKppPmK9zIX3En2fxnkQYgSiC4nje3USoPgOp4p+GTC8KkhfTNa7w==} + eslint-plugin-react-hooks@5.2.0-canary-ebc22ef7-20250225: + resolution: {integrity: sha512-0vka2fkSQy3neOTeMsTRdoSzLBIsT5zQ6GtcJcMSaWrc1rxZgVH1cBCRWWKugDVNpsLAtI31W5zLM7hbY99AuQ==} engines: {node: '>=10'} peerDependencies: eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0 @@ -5638,6 +6084,9 @@ packages: resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==} engines: {node: '>=4'} + fast-decode-uri-component@1.0.1: + resolution: {integrity: sha512-WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg==} + fast-deep-equal@3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} @@ -5655,6 +6104,9 @@ packages: fast-levenshtein@2.0.6: resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} + fast-querystring@1.1.2: + resolution: {integrity: sha512-g6KuKWmFXc0fID8WWH0jit4g0AGBoJhCkJMb1RmbsSEUNvQ+ZC8D6CUZ+GtF8nMzSPXnhiePyyqqipzNNEnHjg==} + fast-safe-stringify@2.1.1: resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==} @@ -6115,6 +6567,9 @@ packages: is-arrayish@0.2.1: resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} + is-arrayish@0.3.2: + resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==} + is-async-function@2.0.0: resolution: {integrity: sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==} engines: {node: '>= 0.4'} @@ -7119,6 +7574,11 @@ packages: engines: {node: '>=16.13'} hasBin: true + miniflare@3.20250214.1: + resolution: {integrity: sha512-NE66QV+2n9ZndaP5jgPlcVref3Arvizb+l2QqhgeXtKM5Orhi8UU2mijoiN3mHEUexKaBES2S1VubT4LDPqkxQ==} + engines: {node: '>=16.13'} + hasBin: true + minimatch@10.0.1: resolution: {integrity: sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==} engines: {node: 20 || >=22} @@ -7159,6 +7619,9 @@ packages: mlly@1.6.1: resolution: {integrity: sha512-vLgaHvaeunuOXHSmEbZ9izxPx3USsk8KCQ8iC+aTlp5sKRSoZvwhHh5L9VbKSaVC6sJDqbyohIS76E2VmHIPAA==} + mlly@1.7.4: + resolution: {integrity: sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==} + modern-ahocorasick@1.0.1: resolution: {integrity: sha512-yoe+JbhTClckZ67b2itRtistFKf8yPYelHLc7e5xAwtNAXxM6wJTUx2C7QeVSJFDzKT7bCIFyBVybPMKvmB9AA==} @@ -7212,6 +7675,11 @@ packages: engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true + nanoid@3.3.8: + resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==} + engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} + hasBin: true + natural-compare-lite@1.4.0: resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==} @@ -7269,6 +7737,9 @@ packages: node-releases@2.0.14: resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==} + node-releases@2.0.19: + resolution: {integrity: sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==} + node-webtokens@1.0.4: resolution: {integrity: sha512-Sla56CeSLWvPbwud2kogqf5edQtKNXZBtXDDpmOzAgNZjwETbK/Am6PXfs54iZPLBm8K8amZ9XWaCQwGqZmKyQ==} engines: {node: '>=6.6.0'} @@ -7357,6 +7828,9 @@ packages: resolution: {integrity: sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==} engines: {node: '>= 0.4'} + ohash@1.1.4: + resolution: {integrity: sha512-FlDryZAahJmEF3VR3w1KogSEdWX3WhA5GPakFx4J81kEAiHyLMpdLLElS8n8dfNadMgAne/MywcvmogzscVt4g==} + on-finished@2.3.0: resolution: {integrity: sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==} engines: {node: '>= 0.8'} @@ -7531,6 +8005,9 @@ packages: pathe@1.1.2: resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==} + pathe@2.0.3: + resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==} + peek-stream@1.1.3: resolution: {integrity: sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==} @@ -7576,6 +8053,9 @@ packages: pkg-types@1.0.3: resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==} + pkg-types@1.3.1: + resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==} + playwright-core@1.49.1: resolution: {integrity: sha512-BzmpVcs4kE2CH15rWfzpjzVGhWERJfmnXmniSyKeRZUs9Ws65m+RGIi7mjJK/euCegfn3i7jvqWeWyHe9y3Vgg==} engines: {node: '>=18'} @@ -7649,6 +8129,10 @@ packages: resolution: {integrity: sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==} engines: {node: ^10 || ^12 || >=14} + postcss@8.5.3: + resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==} + engines: {node: ^10 || ^12 || >=14} + posthtml-parser@0.11.0: resolution: {integrity: sha512-QecJtfLekJbWVo/dMAA+OSwY79wpRmbqS5TeXvXSX+f0c6pW4/SE6inzZ2qkU7oAMCPqIDkZDvd/bQsSFUnKyw==} engines: {node: '>=12'} @@ -7816,6 +8300,10 @@ packages: resolution: {integrity: sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==} engines: {node: '>=0.10.0'} + react-refresh@0.14.2: + resolution: {integrity: sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==} + engines: {node: '>=0.10.0'} + react-server-dom-parcel@0.0.0-experimental-93b58361-20250209: resolution: {integrity: sha512-ASAqPoho6m+5fb9SuJY8hcA7Il9QV72og4ZhA8Q3SYM8yZnE1PxvUpt84cipNg0RmmT6BiRX1FpbxhtfhPCyGQ==} engines: {node: '>=0.10.0'} @@ -8014,6 +8502,11 @@ packages: engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true + rollup@4.34.8: + resolution: {integrity: sha512-489gTVMzAYdiZHFVA/ig/iYFllCcWFHMvUHI1rpFmkoUtRlQxqh6/yiNqnYibjMZ2b/+FUQwldG+aLsEt6bglQ==} + engines: {node: '>=18.0.0', npm: '>=8.0.0'} + hasBin: true + rrweb-cssom@0.6.0: resolution: {integrity: sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==} @@ -8078,6 +8571,11 @@ packages: engines: {node: '>=10'} hasBin: true + semver@7.7.1: + resolution: {integrity: sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==} + engines: {node: '>=10'} + hasBin: true + send@0.18.0: resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==} engines: {node: '>= 0.8.0'} @@ -8118,6 +8616,10 @@ packages: resolution: {integrity: sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==} engines: {node: '>=8'} + sharp@0.33.5: + resolution: {integrity: sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + shebang-command@1.2.0: resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==} engines: {node: '>=0.10.0'} @@ -8156,6 +8658,9 @@ packages: resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} engines: {node: '>=14'} + simple-swizzle@0.2.2: + resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==} + sisteransi@1.0.5: resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} @@ -8272,6 +8777,10 @@ packages: stream-transform@2.1.3: resolution: {integrity: sha512-9GHUiM5hMiCi6Y03jD2ARC1ettBXkQBoQAe7nJsPknnI0ow10aXjTnew8QtYQmLjzn974BnmWEAJgCY6ZP1DeQ==} + streamsearch@1.1.0: + resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==} + engines: {node: '>=10.0.0'} + strict-event-emitter@0.2.8: resolution: {integrity: sha512-KDf/ujU8Zud3YaLtMCcTI4xkZlZVIYxTLr+XIULexP+77EEVWixeXroLUXQXiVtH4XH2W7jr/3PT1v3zBuvc3A==} @@ -8626,8 +9135,8 @@ packages: uc.micro@2.1.0: resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==} - ufo@1.5.3: - resolution: {integrity: sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==} + ufo@1.5.4: + resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==} uid-safe@2.1.5: resolution: {integrity: sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==} @@ -8646,6 +9155,10 @@ packages: resolution: {integrity: sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==} engines: {node: '>=14.0'} + undici@5.28.5: + resolution: {integrity: sha512-zICwjrDrcrUE0pyyJc1I2QzBkLM8FINsgOrt6WjA+BgajVq9Nxu2PbFFXUrAggLfDXlZGZBVZYw7WNV5KiBiBA==} + engines: {node: '>=14.0'} + undici@6.20.1: resolution: {integrity: sha512-AjQF1QsmqfJys+LXfGTNum+qw4S88CojRInG/6t31W/1fk6G59s92bnAvGz5Cmur+kQv2SURXEvvudLmbrE8QA==} engines: {node: '>=18.17'} @@ -8653,6 +9166,9 @@ packages: unenv-nightly@1.10.0-1717606461.a117952: resolution: {integrity: sha512-u3TfBX02WzbHTpaEfWEKwDijDSFAHcgXkayUZ+MVDrjhLFvgAJzFGTSTmwlEhwWi2exyRQey23ah9wELMM6etg==} + unenv@2.0.0-rc.1: + resolution: {integrity: sha512-PU5fb40H8X149s117aB4ytbORcCvlASdtF97tfls4BPIyj4PeVxvpSuy1jAptqYHqB0vb2w2sHvzM0XWcp2OKg==} + unicode-canonical-property-names-ecmascript@2.0.0: resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==} engines: {node: '>=4'} @@ -8730,12 +9246,25 @@ packages: resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==} engines: {node: '>= 0.8'} + unplugin-rsc@0.0.11: + resolution: {integrity: sha512-Sr/WGXBJ7Ur0lo7r/AqLWVufpcJ8DbtXl+zzzdJorEyp8uB2eRawYRIEmB6nqVIdEIJ9i6Iaysw3n+ng91IWFA==} + + unplugin@1.10.1: + resolution: {integrity: sha512-d6Mhq8RJeGA8UfKCu54Um4lFA0eSaRa3XxdAJg8tIdxbu1ubW0hBCZUL7yI2uGyYCRndvbK8FLHzqy2XKfeMsg==} + engines: {node: '>=14.0.0'} + update-browserslist-db@1.0.13: resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==} hasBin: true peerDependencies: browserslist: '>= 4.21.0' + update-browserslist-db@1.1.3: + resolution: {integrity: sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==} + hasBin: true + peerDependencies: + browserslist: '>= 4.21.0' + uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} @@ -8746,6 +9275,9 @@ packages: resolution: {integrity: sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==} engines: {node: '>= 0.4'} + urlpattern-polyfill@10.0.0: + resolution: {integrity: sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==} + util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} @@ -8835,6 +9367,14 @@ packages: vite: optional: true + vite-tsconfig-paths@5.1.4: + resolution: {integrity: sha512-cYj0LRuLV2c2sMqhqhGpaO3LretdtMn/BVX4cPLanIZuwwrkVl+lK84E/miEXkCHWXuq65rhNN4rXsBcOB3S4w==} + peerDependencies: + vite: '*' + peerDependenciesMeta: + vite: + optional: true + vite@5.1.3: resolution: {integrity: sha512-UfmUD36DKkqhi/F75RrxvPpry+9+tTkrXfMNZD+SboZqBCMsxKtO52XeGzzuh7ioz+Eo/SYDBbdb0Z7vgcDJew==} engines: {node: ^18.0.0 || >=20.0.0} @@ -8903,6 +9443,46 @@ packages: yaml: optional: true + vite@6.2.0: + resolution: {integrity: sha512-7dPxoo+WsT/64rDcwoOjk76XHj+TqNTIvHKcuMQ1k4/SeHDaQt5GFAeLYzrimZrMpn/O6DtdI03WUjdxuPM0oQ==} + engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} + hasBin: true + peerDependencies: + '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 + jiti: '>=1.21.0' + less: '*' + lightningcss: ^1.21.0 + sass: '*' + sass-embedded: '*' + stylus: '*' + sugarss: '*' + terser: ^5.16.0 + tsx: ^4.8.1 + yaml: ^2.4.2 + peerDependenciesMeta: + '@types/node': + optional: true + jiti: + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + sass-embedded: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + tsx: + optional: true + yaml: + optional: true + w3c-xmlserializer@4.0.0: resolution: {integrity: sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==} engines: {node: '>=14'} @@ -8938,6 +9518,13 @@ packages: resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==} engines: {node: '>=12'} + webpack-sources@3.2.3: + resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==} + engines: {node: '>=10.13.0'} + + webpack-virtual-modules@0.6.2: + resolution: {integrity: sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==} + whatwg-encoding@2.0.0: resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==} engines: {node: '>=12'} @@ -9005,11 +9592,21 @@ packages: engines: {node: '>=18.0.0'} hasBin: true - workerd@1.20240614.0: - resolution: {integrity: sha512-X2M5vohBM04PMSt97SFGesIMk4SOS21R2zQpwZN6wr+E6/GLnQM44S+gMPcA+mj5QJulvKJa9bdR1/CzKp+RrQ==} + workerd@1.20250224.0: + resolution: {integrity: sha512-NntMg1d9SSkbS4vGdjV5NZxe6FUrvJXY7UiQD7fBtCRVpoPpqz9bVgTq86zalMm+vz64lftzabKT4ka4Y9hejQ==} engines: {node: '>=16'} hasBin: true + wrangler@3.111.0: + resolution: {integrity: sha512-3j/Wq5aj/sCQRSmkjBLxbkIH7LCx0h2UnaxmhOplDjJmZty10lGRs/jGgaG/M/GEsDg5TJ7UHvBh3hSldgjfKg==} + engines: {node: '>=16.17.0'} + hasBin: true + peerDependencies: + '@cloudflare/workers-types': ^4.20250214.0 + peerDependenciesMeta: + '@cloudflare/workers-types': + optional: true + wrangler@3.64.0: resolution: {integrity: sha512-q2VQADJXzuOkXs9KIfPSx7UCZHBoxsqSNbJDLkc2pHpGmsyNQXsJRqjMoTg/Kls7O3K9A7EGnzGr7+Io2vE6AQ==} engines: {node: '>=16.17.0'} @@ -9110,9 +9707,15 @@ packages: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} + youch@3.2.3: + resolution: {integrity: sha512-ZBcWz/uzZaQVdCvfV4uk616Bbpf2ee+F/AvuKDR5EwX/Y4v06xWdtMluqTD7+KlZdM93lLm9gMZYo0sKBS0pgw==} + youch@3.3.3: resolution: {integrity: sha512-qSFXUk3UZBLfggAW3dJKg0BMblG5biqSF8M34E06o5CSsZtH92u9Hqmj2RzGiHDi64fhe83+4tENFP2DB6t6ZA==} + zod@3.22.3: + resolution: {integrity: sha512-EjIevzuJRiRPbVH4mGc8nApb/lVLKVpmUhAaR5R5doKGfAnGJ6Gr3CViAVjP+4FWSxCsybeWQdcgCtbX+7oZug==} + zod@3.23.8: resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==} @@ -9147,8 +9750,16 @@ snapshots: '@babel/highlight': 7.24.2 picocolors: 1.1.1 + '@babel/code-frame@7.26.2': + dependencies: + '@babel/helper-validator-identifier': 7.25.9 + js-tokens: 4.0.0 + picocolors: 1.1.1 + '@babel/compat-data@7.24.1': {} + '@babel/compat-data@7.26.8': {} + '@babel/core@7.24.3': dependencies: '@ampproject/remapping': 2.2.1 @@ -9169,6 +9780,46 @@ snapshots: transitivePeerDependencies: - supports-color + '@babel/core@7.24.4': + dependencies: + '@ampproject/remapping': 2.2.1 + '@babel/code-frame': 7.24.2 + '@babel/generator': 7.26.9 + '@babel/helper-compilation-targets': 7.23.6 + '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.4) + '@babel/helpers': 7.26.9 + '@babel/parser': 7.26.9 + '@babel/template': 7.24.0 + '@babel/traverse': 7.24.1 + '@babel/types': 7.24.0 + convert-source-map: 2.0.0 + debug: 4.4.0 + gensync: 1.0.0-beta.2 + json5: 2.2.3 + semver: 6.3.1 + transitivePeerDependencies: + - supports-color + + '@babel/core@7.26.9': + dependencies: + '@ampproject/remapping': 2.2.1 + '@babel/code-frame': 7.26.2 + '@babel/generator': 7.26.9 + '@babel/helper-compilation-targets': 7.26.5 + '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.9) + '@babel/helpers': 7.26.9 + '@babel/parser': 7.26.9 + '@babel/template': 7.26.9 + '@babel/traverse': 7.26.9 + '@babel/types': 7.26.9 + convert-source-map: 2.0.0 + debug: 4.4.0 + gensync: 1.0.0-beta.2 + json5: 2.2.3 + semver: 6.3.1 + transitivePeerDependencies: + - supports-color + '@babel/eslint-parser@7.24.1(@babel/core@7.24.3)(eslint@8.57.0)': dependencies: '@babel/core': 7.24.3 @@ -9184,6 +9835,14 @@ snapshots: '@jridgewell/trace-mapping': 0.3.25 jsesc: 2.5.2 + '@babel/generator@7.26.9': + dependencies: + '@babel/parser': 7.26.9 + '@babel/types': 7.26.9 + '@jridgewell/gen-mapping': 0.3.5 + '@jridgewell/trace-mapping': 0.3.25 + jsesc: 3.0.2 + '@babel/helper-annotate-as-pure@7.22.5': dependencies: '@babel/types': 7.24.0 @@ -9200,6 +9859,14 @@ snapshots: lru-cache: 5.1.1 semver: 6.3.1 + '@babel/helper-compilation-targets@7.26.5': + dependencies: + '@babel/compat-data': 7.26.8 + '@babel/helper-validator-option': 7.25.9 + browserslist: 4.24.4 + lru-cache: 5.1.1 + semver: 6.3.1 + '@babel/helper-create-class-features-plugin@7.24.1(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 @@ -9262,6 +9929,13 @@ snapshots: dependencies: '@babel/types': 7.24.0 + '@babel/helper-module-imports@7.25.9': + dependencies: + '@babel/traverse': 7.26.9 + '@babel/types': 7.26.9 + transitivePeerDependencies: + - supports-color + '@babel/helper-module-transforms@7.23.3(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 @@ -9271,12 +9945,32 @@ snapshots: '@babel/helper-split-export-declaration': 7.22.6 '@babel/helper-validator-identifier': 7.22.20 + '@babel/helper-module-transforms@7.23.3(@babel/core@7.24.4)': + dependencies: + '@babel/core': 7.24.4 + '@babel/helper-environment-visitor': 7.22.20 + '@babel/helper-module-imports': 7.24.3 + '@babel/helper-simple-access': 7.22.5 + '@babel/helper-split-export-declaration': 7.22.6 + '@babel/helper-validator-identifier': 7.22.20 + + '@babel/helper-module-transforms@7.26.0(@babel/core@7.26.9)': + dependencies: + '@babel/core': 7.26.9 + '@babel/helper-module-imports': 7.25.9 + '@babel/helper-validator-identifier': 7.25.9 + '@babel/traverse': 7.26.9 + transitivePeerDependencies: + - supports-color + '@babel/helper-optimise-call-expression@7.22.5': dependencies: '@babel/types': 7.24.0 '@babel/helper-plugin-utils@7.24.0': {} + '@babel/helper-plugin-utils@7.26.5': {} + '@babel/helper-remap-async-to-generator@7.22.9(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 @@ -9305,10 +9999,16 @@ snapshots: '@babel/helper-string-parser@7.24.1': {} + '@babel/helper-string-parser@7.25.9': {} + '@babel/helper-validator-identifier@7.22.20': {} + '@babel/helper-validator-identifier@7.25.9': {} + '@babel/helper-validator-option@7.23.5': {} + '@babel/helper-validator-option@7.25.9': {} + '@babel/helper-wrap-function@7.22.9': dependencies: '@babel/helper-function-name': 7.23.0 @@ -9323,6 +10023,11 @@ snapshots: transitivePeerDependencies: - supports-color + '@babel/helpers@7.26.9': + dependencies: + '@babel/template': 7.26.9 + '@babel/types': 7.26.9 + '@babel/highlight@7.24.2': dependencies: '@babel/helper-validator-identifier': 7.22.20 @@ -9334,6 +10039,10 @@ snapshots: dependencies: '@babel/types': 7.24.0 + '@babel/parser@7.26.9': + dependencies: + '@babel/types': 7.26.9 + '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 @@ -9772,6 +10481,16 @@ snapshots: '@babel/core': 7.24.3 '@babel/plugin-transform-react-jsx': 7.22.5(@babel/core@7.24.3) + '@babel/plugin-transform-react-jsx-self@7.25.9(@babel/core@7.26.9)': + dependencies: + '@babel/core': 7.26.9 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-react-jsx-source@7.25.9(@babel/core@7.26.9)': + dependencies: + '@babel/core': 7.26.9 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 @@ -9993,6 +10712,12 @@ snapshots: '@babel/parser': 7.24.1 '@babel/types': 7.24.0 + '@babel/template@7.26.9': + dependencies: + '@babel/code-frame': 7.26.2 + '@babel/parser': 7.26.9 + '@babel/types': 7.26.9 + '@babel/traverse@7.24.1': dependencies: '@babel/code-frame': 7.24.2 @@ -10008,12 +10733,29 @@ snapshots: transitivePeerDependencies: - supports-color + '@babel/traverse@7.26.9': + dependencies: + '@babel/code-frame': 7.26.2 + '@babel/generator': 7.26.9 + '@babel/parser': 7.26.9 + '@babel/template': 7.26.9 + '@babel/types': 7.26.9 + debug: 4.4.0 + globals: 11.12.0 + transitivePeerDependencies: + - supports-color + '@babel/types@7.24.0': dependencies: '@babel/helper-string-parser': 7.24.1 '@babel/helper-validator-identifier': 7.22.20 to-fast-properties: 2.0.0 + '@babel/types@7.26.9': + dependencies: + '@babel/helper-string-parser': 7.25.9 + '@babel/helper-validator-identifier': 7.25.9 + '@bcoe/v8-coverage@0.2.3': {} '@biomejs/biome@1.9.4': @@ -10211,27 +10953,54 @@ snapshots: dependencies: mime: 3.0.0 - '@cloudflare/workerd-darwin-64@1.20240614.0': + '@cloudflare/unenv-preset@1.1.1(unenv@2.0.0-rc.1)(workerd@1.20250224.0)': + dependencies: + unenv: 2.0.0-rc.1 + optionalDependencies: + workerd: 1.20250224.0 + + '@cloudflare/vite-plugin@0.1.7(vite@6.2.0(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0))(workerd@1.20250224.0)(wrangler@3.111.0(@cloudflare/workers-types@4.20250224.0))': + dependencies: + '@cloudflare/unenv-preset': 1.1.1(unenv@2.0.0-rc.1)(workerd@1.20250224.0) + '@hattip/adapter-node': 0.0.49 + miniflare: 3.20250214.1 + unenv: 2.0.0-rc.1 + vite: 6.2.0(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) + wrangler: 3.111.0(@cloudflare/workers-types@4.20250224.0) + ws: 8.18.0 + transitivePeerDependencies: + - bufferutil + - utf-8-validate + - workerd + + '@cloudflare/workerd-darwin-64@1.20250224.0': optional: true - '@cloudflare/workerd-darwin-arm64@1.20240614.0': + '@cloudflare/workerd-darwin-arm64@1.20250224.0': optional: true - '@cloudflare/workerd-linux-64@1.20240614.0': + '@cloudflare/workerd-linux-64@1.20250224.0': optional: true - '@cloudflare/workerd-linux-arm64@1.20240614.0': + '@cloudflare/workerd-linux-arm64@1.20250224.0': optional: true - '@cloudflare/workerd-windows-64@1.20240614.0': + '@cloudflare/workerd-windows-64@1.20250224.0': optional: true '@cloudflare/workers-types@4.20240712.0': {} + '@cloudflare/workers-types@4.20250224.0': {} + '@cspotcode/source-map-support@0.8.1': dependencies: '@jridgewell/trace-mapping': 0.3.9 + '@emnapi/runtime@1.3.1': + dependencies: + tslib: 2.8.1 + optional: true + '@emotion/hash@0.9.1': {} '@esbuild-plugins/node-globals-polyfill@0.2.3(esbuild@0.17.19)': @@ -10608,7 +11377,7 @@ snapshots: '@eslint/eslintrc@2.1.4': dependencies: ajv: 6.12.6 - debug: 4.3.7 + debug: 4.4.0 espree: 9.6.1 globals: 13.24.0 ignore: 5.3.1 @@ -10631,10 +11400,34 @@ snapshots: dependencies: '@hapi/hoek': 9.3.0 + '@hattip/adapter-node@0.0.49': + dependencies: + '@hattip/core': 0.0.49 + '@hattip/polyfills': 0.0.49 + '@hattip/walk': 0.0.49 + + '@hattip/core@0.0.49': {} + + '@hattip/headers@0.0.49': + dependencies: + '@hattip/core': 0.0.49 + + '@hattip/polyfills@0.0.49': + dependencies: + '@hattip/core': 0.0.49 + '@whatwg-node/fetch': 0.9.23 + node-fetch-native: 1.6.4 + + '@hattip/walk@0.0.49': + dependencies: + '@hattip/headers': 0.0.49 + cac: 6.7.14 + mime-types: 2.1.35 + '@humanwhocodes/config-array@0.11.14': dependencies: '@humanwhocodes/object-schema': 2.0.3 - debug: 4.3.7 + debug: 4.4.0 minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -10643,6 +11436,81 @@ snapshots: '@humanwhocodes/object-schema@2.0.3': {} + '@img/sharp-darwin-arm64@0.33.5': + optionalDependencies: + '@img/sharp-libvips-darwin-arm64': 1.0.4 + optional: true + + '@img/sharp-darwin-x64@0.33.5': + optionalDependencies: + '@img/sharp-libvips-darwin-x64': 1.0.4 + optional: true + + '@img/sharp-libvips-darwin-arm64@1.0.4': + optional: true + + '@img/sharp-libvips-darwin-x64@1.0.4': + optional: true + + '@img/sharp-libvips-linux-arm64@1.0.4': + optional: true + + '@img/sharp-libvips-linux-arm@1.0.5': + optional: true + + '@img/sharp-libvips-linux-s390x@1.0.4': + optional: true + + '@img/sharp-libvips-linux-x64@1.0.4': + optional: true + + '@img/sharp-libvips-linuxmusl-arm64@1.0.4': + optional: true + + '@img/sharp-libvips-linuxmusl-x64@1.0.4': + optional: true + + '@img/sharp-linux-arm64@0.33.5': + optionalDependencies: + '@img/sharp-libvips-linux-arm64': 1.0.4 + optional: true + + '@img/sharp-linux-arm@0.33.5': + optionalDependencies: + '@img/sharp-libvips-linux-arm': 1.0.5 + optional: true + + '@img/sharp-linux-s390x@0.33.5': + optionalDependencies: + '@img/sharp-libvips-linux-s390x': 1.0.4 + optional: true + + '@img/sharp-linux-x64@0.33.5': + optionalDependencies: + '@img/sharp-libvips-linux-x64': 1.0.4 + optional: true + + '@img/sharp-linuxmusl-arm64@0.33.5': + optionalDependencies: + '@img/sharp-libvips-linuxmusl-arm64': 1.0.4 + optional: true + + '@img/sharp-linuxmusl-x64@0.33.5': + optionalDependencies: + '@img/sharp-libvips-linuxmusl-x64': 1.0.4 + optional: true + + '@img/sharp-wasm32@0.33.5': + dependencies: + '@emnapi/runtime': 1.3.1 + optional: true + + '@img/sharp-win32-ia32@0.33.5': + optional: true + + '@img/sharp-win32-x64@0.33.5': + optional: true + '@isaacs/cliui@8.0.2': dependencies: string-width: 5.1.2 @@ -10662,10 +11530,26 @@ snapshots: '@istanbuljs/schema@0.1.3': {} + '@jacob-ebey/react-server-dom-vite@19.0.0-experimental.14(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209)': + dependencies: + react: 0.0.0-experimental-93b58361-20250209 + react-dom: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) + + '@jacob-ebey/vite-react-server-dom@0.0.12(@jacob-ebey/react-server-dom-vite@19.0.0-experimental.14(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209))(rollup@4.34.8)(vite@6.2.0(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0))': + dependencies: + '@jacob-ebey/react-server-dom-vite': 19.0.0-experimental.14(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209) + '@mjackson/node-fetch-server': 0.5.0 + '@vitejs/plugin-react': 4.3.4(vite@6.2.0(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)) + unplugin-rsc: 0.0.11(rollup@4.34.8) + vite: 6.2.0(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) + transitivePeerDependencies: + - rollup + - supports-color + '@jest/console@29.7.0': dependencies: '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 22.13.4 chalk: 4.1.2 jest-message-util: 29.7.0 jest-util: 29.7.0 @@ -10678,14 +11562,14 @@ snapshots: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 22.13.4 ansi-escapes: 4.3.2 chalk: 4.1.2 ci-info: 3.8.0 exit: 0.1.2 graceful-fs: 4.2.11 jest-changed-files: 29.7.0 - jest-config: 29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0) + jest-config: 29.7.0(@types/node@22.13.4)(babel-plugin-macros@3.1.0) jest-haste-map: 29.7.0 jest-message-util: 29.7.0 jest-regex-util: 29.6.3 @@ -10710,7 +11594,7 @@ snapshots: dependencies: '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 22.13.4 jest-mock: 29.7.0 '@jest/expect-utils@29.7.0': @@ -10728,7 +11612,7 @@ snapshots: dependencies: '@jest/types': 29.6.3 '@sinonjs/fake-timers': 10.0.2 - '@types/node': 20.11.30 + '@types/node': 22.13.4 jest-message-util: 29.7.0 jest-mock: 29.7.0 jest-util: 29.7.0 @@ -10750,7 +11634,7 @@ snapshots: '@jest/transform': 29.7.0 '@jest/types': 29.6.3 '@jridgewell/trace-mapping': 0.3.25 - '@types/node': 20.11.30 + '@types/node': 22.13.4 chalk: 4.1.2 collect-v8-coverage: 1.0.1 exit: 0.1.2 @@ -10820,7 +11704,7 @@ snapshots: '@jest/schemas': 29.6.3 '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 20.11.30 + '@types/node': 22.13.4 '@types/yargs': 17.0.24 chalk: 4.1.2 @@ -10852,6 +11736,8 @@ snapshots: '@jridgewell/resolve-uri': 3.1.0 '@jridgewell/sourcemap-codec': 1.4.15 + '@kamilkisiela/fast-url-parser@1.1.4': {} + '@lezer/common@1.2.3': {} '@lezer/lr@1.4.2': @@ -10920,11 +11806,11 @@ snapshots: transitivePeerDependencies: - supports-color - '@mdx-js/rollup@3.0.1(rollup@4.24.0)': + '@mdx-js/rollup@3.0.1(rollup@4.34.8)': dependencies: '@mdx-js/mdx': 3.0.1 - '@rollup/pluginutils': 5.1.0(rollup@4.24.0) - rollup: 4.24.0 + '@rollup/pluginutils': 5.1.0(rollup@4.34.8) + rollup: 4.34.8 source-map: 0.7.4 vfile: 6.0.1 transitivePeerDependencies: @@ -10938,6 +11824,8 @@ snapshots: '@mjackson/node-fetch-server@0.2.0': {} + '@mjackson/node-fetch-server@0.5.0': {} + '@mjackson/node-fetch-server@0.6.1': {} '@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.3': @@ -10968,7 +11856,7 @@ snapshots: '@open-draft/until': 1.0.3 '@types/debug': 4.1.12 '@xmldom/xmldom': 0.8.10 - debug: 4.3.7 + debug: 4.4.0 headers-polyfill: 3.2.5 outvariant: 1.4.3 strict-event-emitter: 0.2.8 @@ -11185,14 +12073,14 @@ snapshots: transitivePeerDependencies: - '@parcel/core' - '@parcel/config-default@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)(postcss@8.4.49)(terser@5.15.0)(typescript@5.4.5)': + '@parcel/config-default@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5)': dependencies: '@parcel/bundler-default': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) '@parcel/compressor-raw': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) '@parcel/core': 2.0.0-canary.1777(@swc/helpers@0.5.15) '@parcel/namer-default': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) '@parcel/optimizer-css': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/optimizer-htmlnano': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(postcss@8.4.49)(terser@5.15.0)(typescript@5.4.5) + '@parcel/optimizer-htmlnano': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) '@parcel/optimizer-image': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) '@parcel/optimizer-svgo': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) '@parcel/optimizer-swc': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) @@ -11317,7 +12205,7 @@ snapshots: '@parcel/rust': 2.13.4-canary.3402 '@parcel/utils': 2.0.0-canary.1779 nullthrows: 1.1.1 - semver: 7.5.4 + semver: 7.7.1 transitivePeerDependencies: - '@parcel/core' @@ -11333,12 +12221,12 @@ snapshots: transitivePeerDependencies: - '@parcel/core' - '@parcel/optimizer-htmlnano@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(postcss@8.4.49)(terser@5.15.0)(typescript@5.4.5)': + '@parcel/optimizer-htmlnano@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5)': dependencies: '@parcel/diagnostic': 2.0.0-canary.1779 '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) '@parcel/utils': 2.0.0-canary.1779 - htmlnano: 2.1.1(postcss@8.4.49)(terser@5.15.0)(typescript@5.4.5) + htmlnano: 2.1.1(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) nullthrows: 1.1.1 posthtml: 0.16.6 transitivePeerDependencies: @@ -11548,7 +12436,7 @@ snapshots: browserslist: 4.23.0 json5: 2.2.3 nullthrows: 1.1.1 - semver: 7.5.4 + semver: 7.7.1 transitivePeerDependencies: - '@parcel/core' @@ -11573,7 +12461,7 @@ snapshots: posthtml: 0.16.6 posthtml-parser: 0.12.1 posthtml-render: 3.0.0 - semver: 7.5.4 + semver: 7.7.1 srcset: 4.0.0 transitivePeerDependencies: - '@parcel/core' @@ -11599,7 +12487,7 @@ snapshots: browserslist: 4.23.0 nullthrows: 1.1.1 regenerator-runtime: 0.14.1 - semver: 7.5.4 + semver: 7.7.1 '@parcel/transformer-json@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': dependencies: @@ -11623,7 +12511,7 @@ snapshots: clone: 2.1.2 nullthrows: 1.1.1 postcss-value-parser: 4.2.0 - semver: 7.5.4 + semver: 7.7.1 transitivePeerDependencies: - '@parcel/core' @@ -11635,7 +12523,7 @@ snapshots: posthtml: 0.16.6 posthtml-parser: 0.12.1 posthtml-render: 3.0.0 - semver: 7.5.4 + semver: 7.7.1 transitivePeerDependencies: - '@parcel/core' @@ -11663,7 +12551,7 @@ snapshots: posthtml: 0.16.6 posthtml-parser: 0.12.1 posthtml-render: 3.0.0 - semver: 7.5.4 + semver: 7.7.1 transitivePeerDependencies: - '@parcel/core' @@ -11806,62 +12694,119 @@ snapshots: dependencies: web-streams-polyfill: 3.3.3 - '@rollup/pluginutils@5.1.0(rollup@4.24.0)': + '@rollup/pluginutils@5.1.0(rollup@4.34.8)': dependencies: '@types/estree': 1.0.6 estree-walker: 2.0.2 picomatch: 2.3.1 optionalDependencies: - rollup: 4.24.0 + rollup: 4.34.8 '@rollup/rollup-android-arm-eabi@4.24.0': optional: true + '@rollup/rollup-android-arm-eabi@4.34.8': + optional: true + '@rollup/rollup-android-arm64@4.24.0': optional: true + '@rollup/rollup-android-arm64@4.34.8': + optional: true + '@rollup/rollup-darwin-arm64@4.24.0': optional: true + '@rollup/rollup-darwin-arm64@4.34.8': + optional: true + '@rollup/rollup-darwin-x64@4.24.0': optional: true + '@rollup/rollup-darwin-x64@4.34.8': + optional: true + + '@rollup/rollup-freebsd-arm64@4.34.8': + optional: true + + '@rollup/rollup-freebsd-x64@4.34.8': + optional: true + '@rollup/rollup-linux-arm-gnueabihf@4.24.0': optional: true + '@rollup/rollup-linux-arm-gnueabihf@4.34.8': + optional: true + '@rollup/rollup-linux-arm-musleabihf@4.24.0': optional: true + '@rollup/rollup-linux-arm-musleabihf@4.34.8': + optional: true + '@rollup/rollup-linux-arm64-gnu@4.24.0': optional: true + '@rollup/rollup-linux-arm64-gnu@4.34.8': + optional: true + '@rollup/rollup-linux-arm64-musl@4.24.0': optional: true + '@rollup/rollup-linux-arm64-musl@4.34.8': + optional: true + + '@rollup/rollup-linux-loongarch64-gnu@4.34.8': + optional: true + '@rollup/rollup-linux-powerpc64le-gnu@4.24.0': optional: true + '@rollup/rollup-linux-powerpc64le-gnu@4.34.8': + optional: true + '@rollup/rollup-linux-riscv64-gnu@4.24.0': optional: true + '@rollup/rollup-linux-riscv64-gnu@4.34.8': + optional: true + '@rollup/rollup-linux-s390x-gnu@4.24.0': optional: true + '@rollup/rollup-linux-s390x-gnu@4.34.8': + optional: true + '@rollup/rollup-linux-x64-gnu@4.24.0': optional: true + '@rollup/rollup-linux-x64-gnu@4.34.8': + optional: true + '@rollup/rollup-linux-x64-musl@4.24.0': optional: true - '@rollup/rollup-win32-arm64-msvc@4.24.0': + '@rollup/rollup-linux-x64-musl@4.34.8': + optional: true + + '@rollup/rollup-win32-arm64-msvc@4.24.0': + optional: true + + '@rollup/rollup-win32-arm64-msvc@4.34.8': optional: true '@rollup/rollup-win32-ia32-msvc@4.24.0': optional: true + '@rollup/rollup-win32-ia32-msvc@4.34.8': + optional: true + '@rollup/rollup-win32-x64-msvc@4.24.0': optional: true + '@rollup/rollup-win32-x64-msvc@4.34.8': + optional: true + '@rushstack/eslint-patch@1.10.1': {} '@shikijs/core@1.22.2': @@ -12037,7 +12982,7 @@ snapshots: '@types/body-parser@1.19.5': dependencies: '@types/connect': 3.4.38 - '@types/node': 20.11.30 + '@types/node': 22.13.4 '@types/compression@1.7.5': dependencies: @@ -12045,7 +12990,7 @@ snapshots: '@types/connect@3.4.38': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.13.4 '@types/cookie@0.4.1': {} @@ -12055,7 +13000,7 @@ snapshots: '@types/cross-spawn@6.0.6': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.13.4 '@types/debug@4.1.12': dependencies: @@ -12071,7 +13016,7 @@ snapshots: '@types/express-serve-static-core@4.17.43': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.13.4 '@types/qs': 6.9.14 '@types/range-parser': 1.2.7 '@types/send': 0.17.4 @@ -12104,11 +13049,11 @@ snapshots: '@types/glob@7.2.0': dependencies: '@types/minimatch': 5.1.2 - '@types/node': 20.11.30 + '@types/node': 22.13.4 '@types/graceful-fs@4.1.6': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.13.4 '@types/gunzip-maybe@1.4.2': dependencies: @@ -12143,13 +13088,13 @@ snapshots: '@types/jsdom@20.0.1': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.13.4 '@types/tough-cookie': 4.0.2 parse5: 7.1.2 '@types/jsdom@21.1.1': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.13.4 '@types/tough-cookie': 4.0.2 parse5: 7.1.2 @@ -12161,7 +13106,7 @@ snapshots: '@types/jsonfile@6.1.1': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.13.4 '@types/lambda-tester@3.6.2': dependencies: @@ -12197,7 +13142,7 @@ snapshots: '@types/node-forge@1.3.11': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.13.4 '@types/node@12.20.55': {} @@ -12252,13 +13197,13 @@ snapshots: '@types/send@0.17.4': dependencies: '@types/mime': 1.3.5 - '@types/node': 20.11.30 + '@types/node': 22.13.4 '@types/serve-static@1.15.5': dependencies: '@types/http-errors': 2.0.4 '@types/mime': 3.0.4 - '@types/node': 20.11.30 + '@types/node': 22.13.4 '@types/set-cookie-parser@2.4.7': dependencies: @@ -12267,7 +13212,7 @@ snapshots: '@types/shelljs@0.8.15': dependencies: '@types/glob': 7.2.0 - '@types/node': 20.11.30 + '@types/node': 22.13.4 '@types/source-map-support@0.5.10': dependencies: @@ -12279,7 +13224,7 @@ snapshots: dependencies: '@types/cookiejar': 2.1.5 '@types/methods': 1.1.4 - '@types/node': 20.11.30 + '@types/node': 22.13.4 '@types/supertest@2.0.16': dependencies: @@ -12292,7 +13237,7 @@ snapshots: '@types/tar-stream@3.1.3': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.13.4 '@types/testing-library__jest-dom@5.14.5': dependencies: @@ -12431,7 +13376,7 @@ snapshots: debug: 4.4.0 globby: 11.1.0 is-glob: 4.0.3 - semver: 7.5.4 + semver: 7.7.1 tsutils: 3.21.0(typescript@5.4.5) optionalDependencies: typescript: 5.4.5 @@ -12577,8 +13522,31 @@ snapshots: - terser - ts-node + '@vitejs/plugin-react@4.3.4(vite@6.2.0(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0))': + dependencies: + '@babel/core': 7.26.9 + '@babel/plugin-transform-react-jsx-self': 7.25.9(@babel/core@7.26.9) + '@babel/plugin-transform-react-jsx-source': 7.25.9(@babel/core@7.26.9) + '@types/babel__core': 7.20.5 + react-refresh: 0.14.2 + vite: 6.2.0(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) + transitivePeerDependencies: + - supports-color + '@web3-storage/multipart-parser@1.0.0': {} + '@whatwg-node/fetch@0.9.23': + dependencies: + '@whatwg-node/node-fetch': 0.6.0 + urlpattern-polyfill: 10.0.0 + + '@whatwg-node/node-fetch@0.6.0': + dependencies: + '@kamilkisiela/fast-url-parser': 1.1.4 + busboy: 1.6.0 + fast-querystring: 1.1.2 + tslib: 2.8.1 + '@xmldom/xmldom@0.8.10': {} '@zxing/text-encoding@0.9.0': @@ -12599,12 +13567,20 @@ snapshots: dependencies: acorn: 8.11.3 + acorn-jsx@5.3.2(acorn@8.14.0): + dependencies: + acorn: 8.14.0 + + acorn-walk@8.3.2: {} + acorn-walk@8.3.3: dependencies: acorn: 8.11.3 acorn@8.11.3: {} + acorn@8.14.0: {} + agent-base@6.0.2: dependencies: debug: 4.4.0 @@ -12613,7 +13589,7 @@ snapshots: agent-base@7.1.1: dependencies: - debug: 4.3.7 + debug: 4.4.0 transitivePeerDependencies: - supports-color @@ -13036,6 +14012,13 @@ snapshots: node-releases: 2.0.14 update-browserslist-db: 1.0.13(browserslist@4.23.0) + browserslist@4.24.4: + dependencies: + caniuse-lite: 1.0.30001701 + electron-to-chromium: 1.5.108 + node-releases: 2.0.19 + update-browserslist-db: 1.1.3(browserslist@4.24.4) + bser@2.1.1: dependencies: node-int64: 0.4.0 @@ -13051,13 +14034,17 @@ snapshots: builtins@5.0.1: dependencies: - semver: 7.5.4 + semver: 7.7.1 bundle-require@5.0.0(esbuild@0.23.1): dependencies: esbuild: 0.23.1 load-tsconfig: 0.2.5 + busboy@1.6.0: + dependencies: + streamsearch: 1.1.0 + bytes@3.0.0: {} bytes@3.1.2: {} @@ -13088,9 +14075,11 @@ snapshots: caniuse-lite@1.0.30001599: {} + caniuse-lite@1.0.30001701: {} + capnp-ts@0.7.0: dependencies: - debug: 4.3.7 + debug: 4.4.0 tslib: 2.6.2 transitivePeerDependencies: - supports-color @@ -13224,6 +14213,18 @@ snapshots: color-name@1.1.4: {} + color-string@1.9.1: + dependencies: + color-name: 1.1.4 + simple-swizzle: 0.2.2 + optional: true + + color@4.2.3: + dependencies: + color-convert: 2.0.1 + color-string: 1.9.1 + optional: true + combined-stream@1.0.8: dependencies: delayed-stream: 1.0.0 @@ -13257,6 +14258,8 @@ snapshots: concat-map@0.0.1: {} + confbox@0.1.8: {} + confusing-browser-globals@1.0.11: {} consola@3.2.3: {} @@ -13310,13 +14313,13 @@ snapshots: optionalDependencies: typescript: 5.4.5 - create-jest@29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0): + create-jest@29.7.0(@types/node@22.13.4)(babel-plugin-macros@3.1.0): dependencies: '@jest/types': 29.6.3 chalk: 4.1.2 exit: 0.1.2 graceful-fs: 4.2.11 - jest-config: 29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0) + jest-config: 29.7.0(@types/node@22.13.4)(babel-plugin-macros@3.1.0) jest-util: 29.7.0 prompts: 2.4.2 transitivePeerDependencies: @@ -13601,6 +14604,8 @@ snapshots: electron-to-chromium@1.4.714: {} + electron-to-chromium@1.5.108: {} + emittery@0.13.1: {} emoji-regex@8.0.0: {} @@ -13874,6 +14879,8 @@ snapshots: escalade@3.1.1: {} + escalade@3.2.0: {} + escape-html@1.0.3: {} escape-string-regexp@1.0.5: {} @@ -13892,7 +14899,7 @@ snapshots: optionalDependencies: source-map: 0.6.1 - eslint-config-react-app@7.0.1(@babel/plugin-syntax-flow@7.18.6(@babel/core@7.24.3))(@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.24.3))(eslint@8.57.0)(jest@29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0))(typescript@5.4.5): + eslint-config-react-app@7.0.1(@babel/plugin-syntax-flow@7.18.6(@babel/core@7.24.3))(@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.24.3))(eslint@8.57.0)(jest@29.7.0(@types/node@22.13.4)(babel-plugin-macros@3.1.0))(typescript@5.4.5): dependencies: '@babel/core': 7.24.3 '@babel/eslint-parser': 7.24.1(@babel/core@7.24.3)(eslint@8.57.0) @@ -13904,7 +14911,7 @@ snapshots: eslint: 8.57.0 eslint-plugin-flowtype: 8.0.3(@babel/plugin-syntax-flow@7.18.6(@babel/core@7.24.3))(@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.24.3))(eslint@8.57.0) eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0) - eslint-plugin-jest: 25.7.0(@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(jest@29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0))(typescript@5.4.5) + eslint-plugin-jest: 25.7.0(@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(jest@29.7.0(@types/node@22.13.4)(babel-plugin-macros@3.1.0))(typescript@5.4.5) eslint-plugin-jsx-a11y: 6.8.0(eslint@8.57.0) eslint-plugin-react: 7.34.1(eslint@8.57.0) eslint-plugin-react-hooks: 4.6.0(eslint@8.57.0) @@ -14009,24 +15016,24 @@ snapshots: - eslint-import-resolver-webpack - supports-color - eslint-plugin-jest@25.7.0(@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(jest@29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0))(typescript@5.4.5): + eslint-plugin-jest@25.7.0(@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(jest@29.7.0(@types/node@22.13.4)(babel-plugin-macros@3.1.0))(typescript@5.4.5): dependencies: '@typescript-eslint/experimental-utils': 5.62.0(eslint@8.57.0)(typescript@5.4.5) eslint: 8.57.0 optionalDependencies: '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5) - jest: 29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0) + jest: 29.7.0(@types/node@22.13.4)(babel-plugin-macros@3.1.0) transitivePeerDependencies: - supports-color - typescript - eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.5.0(@typescript-eslint/parser@7.5.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(jest@29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0))(typescript@5.4.5): + eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.5.0(@typescript-eslint/parser@7.5.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(jest@29.7.0(@types/node@22.13.4)(babel-plugin-macros@3.1.0))(typescript@5.4.5): dependencies: '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.4.5) eslint: 8.57.0 optionalDependencies: '@typescript-eslint/eslint-plugin': 7.5.0(@typescript-eslint/parser@7.5.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5) - jest: 29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0) + jest: 29.7.0(@types/node@22.13.4)(babel-plugin-macros@3.1.0) transitivePeerDependencies: - supports-color - typescript @@ -14055,7 +15062,7 @@ snapshots: dependencies: eslint: 8.57.0 - eslint-plugin-react-hooks@5.2.0-canary-a84862db-20250218(eslint@8.57.0): + eslint-plugin-react-hooks@5.2.0-canary-ebc22ef7-20250225(eslint@8.57.0): dependencies: eslint: 8.57.0 @@ -14204,7 +15211,7 @@ snapshots: eval@0.1.8: dependencies: - '@types/node': 20.11.30 + '@types/node': 22.13.4 require-like: 0.1.2 event-target-shim@5.0.1: {} @@ -14317,6 +15324,8 @@ snapshots: iconv-lite: 0.4.24 tmp: 0.0.33 + fast-decode-uri-component@1.0.1: {} + fast-deep-equal@3.1.3: {} fast-glob@3.2.11: @@ -14339,6 +15348,10 @@ snapshots: fast-levenshtein@2.0.6: {} + fast-querystring@1.1.2: + dependencies: + fast-decode-uri-component: 1.0.1 + fast-safe-stringify@2.1.1: {} fastq@1.13.0: @@ -14728,13 +15741,13 @@ snapshots: html-void-elements@3.0.0: {} - htmlnano@2.1.1(postcss@8.4.49)(terser@5.15.0)(typescript@5.4.5): + htmlnano@2.1.1(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5): dependencies: cosmiconfig: 9.0.0(typescript@5.4.5) posthtml: 0.16.6 timsort: 0.3.0 optionalDependencies: - postcss: 8.4.49 + postcss: 8.5.3 terser: 5.15.0 transitivePeerDependencies: - typescript @@ -14772,7 +15785,7 @@ snapshots: http-proxy-agent@7.0.2: dependencies: agent-base: 7.1.1 - debug: 4.3.7 + debug: 4.4.0 transitivePeerDependencies: - supports-color @@ -14786,7 +15799,7 @@ snapshots: https-proxy-agent@7.0.5: dependencies: agent-base: 7.1.1 - debug: 4.3.7 + debug: 4.4.0 transitivePeerDependencies: - supports-color @@ -14883,6 +15896,9 @@ snapshots: is-arrayish@0.2.1: {} + is-arrayish@0.3.2: + optional: true + is-async-function@2.0.0: dependencies: has-tostringtag: 1.0.2 @@ -15058,7 +16074,7 @@ snapshots: '@babel/parser': 7.24.1 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.0 - semver: 7.5.4 + semver: 7.7.1 transitivePeerDependencies: - supports-color @@ -15113,7 +16129,7 @@ snapshots: '@jest/expect': 29.7.0 '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 22.13.4 chalk: 4.1.2 co: 4.6.0 dedent: 1.5.3(babel-plugin-macros@3.1.0) @@ -15133,16 +16149,16 @@ snapshots: - babel-plugin-macros - supports-color - jest-cli@29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0): + jest-cli@29.7.0(@types/node@22.13.4)(babel-plugin-macros@3.1.0): dependencies: '@jest/core': 29.7.0(babel-plugin-macros@3.1.0) '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 chalk: 4.1.2 - create-jest: 29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0) + create-jest: 29.7.0(@types/node@22.13.4)(babel-plugin-macros@3.1.0) exit: 0.1.2 import-local: 3.1.0 - jest-config: 29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0) + jest-config: 29.7.0(@types/node@22.13.4)(babel-plugin-macros@3.1.0) jest-util: 29.7.0 jest-validate: 29.7.0 yargs: 17.7.2 @@ -15152,7 +16168,7 @@ snapshots: - supports-color - ts-node - jest-config@29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0): + jest-config@29.7.0(@types/node@22.13.4)(babel-plugin-macros@3.1.0): dependencies: '@babel/core': 7.24.3 '@jest/test-sequencer': 29.7.0 @@ -15177,7 +16193,7 @@ snapshots: slash: 3.0.0 strip-json-comments: 3.1.1 optionalDependencies: - '@types/node': 20.11.30 + '@types/node': 22.13.4 transitivePeerDependencies: - babel-plugin-macros - supports-color @@ -15207,7 +16223,7 @@ snapshots: '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 '@types/jsdom': 20.0.1 - '@types/node': 20.11.30 + '@types/node': 22.13.4 jest-mock: 29.7.0 jest-util: 29.7.0 jsdom: 22.1.0 @@ -15221,7 +16237,7 @@ snapshots: '@jest/environment': 29.7.0 '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 22.13.4 jest-mock: 29.7.0 jest-util: 29.7.0 @@ -15231,7 +16247,7 @@ snapshots: dependencies: '@jest/types': 29.6.3 '@types/graceful-fs': 4.1.6 - '@types/node': 20.11.30 + '@types/node': 22.13.4 anymatch: 3.1.3 fb-watchman: 2.0.2 graceful-fs: 4.2.11 @@ -15270,7 +16286,7 @@ snapshots: jest-mock@29.7.0: dependencies: '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 22.13.4 jest-util: 29.7.0 jest-pnp-resolver@1.2.3(jest-resolve@29.7.0): @@ -15305,7 +16321,7 @@ snapshots: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 22.13.4 chalk: 4.1.2 emittery: 0.13.1 graceful-fs: 4.2.11 @@ -15333,7 +16349,7 @@ snapshots: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 22.13.4 chalk: 4.1.2 cjs-module-lexer: 1.2.2 collect-v8-coverage: 1.0.1 @@ -15372,14 +16388,14 @@ snapshots: jest-util: 29.7.0 natural-compare: 1.4.0 pretty-format: 29.7.0 - semver: 7.5.4 + semver: 7.7.1 transitivePeerDependencies: - supports-color jest-util@29.7.0: dependencies: '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 22.13.4 chalk: 4.1.2 ci-info: 3.8.0 graceful-fs: 4.2.11 @@ -15398,7 +16414,7 @@ snapshots: dependencies: '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 22.13.4 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.13.1 @@ -15407,17 +16423,17 @@ snapshots: jest-worker@29.7.0: dependencies: - '@types/node': 20.11.30 + '@types/node': 22.13.4 jest-util: 29.7.0 merge-stream: 2.0.0 supports-color: 8.1.1 - jest@29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0): + jest@29.7.0(@types/node@22.13.4)(babel-plugin-macros@3.1.0): dependencies: '@jest/core': 29.7.0(babel-plugin-macros@3.1.0) '@jest/types': 29.6.3 import-local: 3.1.0 - jest-cli: 29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0) + jest-cli: 29.7.0(@types/node@22.13.4)(babel-plugin-macros@3.1.0) transitivePeerDependencies: - '@types/node' - babel-plugin-macros @@ -16095,8 +17111,8 @@ snapshots: micromark-extension-mdxjs@3.0.0: dependencies: - acorn: 8.11.3 - acorn-jsx: 5.3.2(acorn@8.11.3) + acorn: 8.14.0 + acorn-jsx: 5.3.2(acorn@8.14.0) micromark-extension-mdx-expression: 3.0.0 micromark-extension-mdx-jsx: 3.0.0 micromark-extension-mdx-md: 2.0.0 @@ -16385,7 +17401,7 @@ snapshots: glob-to-regexp: 0.4.1 stoppable: 1.1.0 undici: 5.28.4 - workerd: 1.20240614.0 + workerd: 1.20250224.0 ws: 8.18.0 youch: 3.3.3 zod: 3.23.8 @@ -16394,6 +17410,23 @@ snapshots: - supports-color - utf-8-validate + miniflare@3.20250214.1: + dependencies: + '@cspotcode/source-map-support': 0.8.1 + acorn: 8.14.0 + acorn-walk: 8.3.2 + exit-hook: 2.2.1 + glob-to-regexp: 0.4.1 + stoppable: 1.1.0 + undici: 5.28.5 + workerd: 1.20250224.0 + ws: 8.18.0 + youch: 3.2.3 + zod: 3.22.3 + transitivePeerDependencies: + - bufferutil + - utf-8-validate + minimatch@10.0.1: dependencies: brace-expansion: 2.0.1 @@ -16430,10 +17463,17 @@ snapshots: mlly@1.6.1: dependencies: - acorn: 8.11.3 + acorn: 8.14.0 pathe: 1.1.2 pkg-types: 1.0.3 - ufo: 1.5.3 + ufo: 1.5.4 + + mlly@1.7.4: + dependencies: + acorn: 8.14.0 + pathe: 2.0.3 + pkg-types: 1.3.1 + ufo: 1.5.4 modern-ahocorasick@1.0.1: {} @@ -16510,6 +17550,8 @@ snapshots: nanoid@3.3.7: {} + nanoid@3.3.8: {} + natural-compare-lite@1.4.0: {} natural-compare@1.4.0: {} @@ -16560,6 +17602,8 @@ snapshots: node-releases@2.0.14: {} + node-releases@2.0.19: {} + node-webtokens@1.0.4: {} normalize-package-data@2.5.0: @@ -16580,7 +17624,7 @@ snapshots: npm-install-checks@6.3.0: dependencies: - semver: 7.5.4 + semver: 7.7.1 npm-normalize-package-bin@3.0.1: {} @@ -16588,7 +17632,7 @@ snapshots: dependencies: hosted-git-info: 6.1.1 proc-log: 3.0.0 - semver: 7.5.4 + semver: 7.7.1 validate-npm-package-name: 5.0.0 npm-pick-manifest@8.0.2: @@ -16596,7 +17640,7 @@ snapshots: npm-install-checks: 6.3.0 npm-normalize-package-bin: 3.0.1 npm-package-arg: 10.1.0 - semver: 7.5.4 + semver: 7.7.1 npm-run-all@4.1.5: dependencies: @@ -16668,6 +17712,8 @@ snapshots: define-properties: 1.2.1 es-object-atoms: 1.0.0 + ohash@1.1.4: {} + on-finished@2.3.0: dependencies: ee-first: 1.1.1 @@ -16749,7 +17795,7 @@ snapshots: dependencies: '@tootallnate/quickjs-emscripten': 0.23.0 agent-base: 7.1.1 - debug: 4.3.7 + debug: 4.4.0 get-uri: 6.0.3 http-proxy-agent: 7.0.2 https-proxy-agent: 7.0.5 @@ -16769,9 +17815,9 @@ snapshots: pako@1.0.11: {} - parcel@2.0.0-canary.1777(@swc/helpers@0.5.15)(postcss@8.4.49)(terser@5.15.0)(typescript@5.4.5): + parcel@2.0.0-canary.1777(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5): dependencies: - '@parcel/config-default': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)(postcss@8.4.49)(terser@5.15.0)(typescript@5.4.5) + '@parcel/config-default': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) '@parcel/core': 2.0.0-canary.1777(@swc/helpers@0.5.15) '@parcel/diagnostic': 2.0.0-canary.1779 '@parcel/events': 2.0.0-canary.1779 @@ -16876,6 +17922,8 @@ snapshots: pathe@1.1.2: {} + pathe@2.0.3: {} + peek-stream@1.1.3: dependencies: buffer-from: 1.1.2 @@ -16911,9 +17959,15 @@ snapshots: pkg-types@1.0.3: dependencies: jsonc-parser: 3.2.1 - mlly: 1.6.1 + mlly: 1.7.4 pathe: 1.1.2 + pkg-types@1.3.1: + dependencies: + confbox: 0.1.8 + mlly: 1.7.4 + pathe: 2.0.3 + playwright-core@1.49.1: {} playwright@1.49.1: @@ -16943,12 +17997,12 @@ snapshots: optionalDependencies: postcss: 8.4.49 - postcss-load-config@6.0.1(jiti@1.21.0)(postcss@8.4.49)(yaml@2.6.0): + postcss-load-config@6.0.1(jiti@1.21.0)(postcss@8.5.3)(yaml@2.6.0): dependencies: lilconfig: 3.1.1 optionalDependencies: jiti: 1.21.0 - postcss: 8.4.49 + postcss: 8.5.3 yaml: 2.6.0 postcss-nested@6.0.1(postcss@8.4.49): @@ -16969,6 +18023,12 @@ snapshots: picocolors: 1.1.1 source-map-js: 1.2.1 + postcss@8.5.3: + dependencies: + nanoid: 3.3.8 + picocolors: 1.1.1 + source-map-js: 1.2.1 + posthtml-parser@0.11.0: dependencies: htmlparser2: 7.2.0 @@ -17133,6 +18193,8 @@ snapshots: react-refresh@0.14.0: {} + react-refresh@0.14.2: {} + react-server-dom-parcel@0.0.0-experimental-93b58361-20250209(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209): dependencies: react: 0.0.0-experimental-93b58361-20250209 @@ -17400,6 +18462,31 @@ snapshots: '@rollup/rollup-win32-x64-msvc': 4.24.0 fsevents: 2.3.3 + rollup@4.34.8: + dependencies: + '@types/estree': 1.0.6 + optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.34.8 + '@rollup/rollup-android-arm64': 4.34.8 + '@rollup/rollup-darwin-arm64': 4.34.8 + '@rollup/rollup-darwin-x64': 4.34.8 + '@rollup/rollup-freebsd-arm64': 4.34.8 + '@rollup/rollup-freebsd-x64': 4.34.8 + '@rollup/rollup-linux-arm-gnueabihf': 4.34.8 + '@rollup/rollup-linux-arm-musleabihf': 4.34.8 + '@rollup/rollup-linux-arm64-gnu': 4.34.8 + '@rollup/rollup-linux-arm64-musl': 4.34.8 + '@rollup/rollup-linux-loongarch64-gnu': 4.34.8 + '@rollup/rollup-linux-powerpc64le-gnu': 4.34.8 + '@rollup/rollup-linux-riscv64-gnu': 4.34.8 + '@rollup/rollup-linux-s390x-gnu': 4.34.8 + '@rollup/rollup-linux-x64-gnu': 4.34.8 + '@rollup/rollup-linux-x64-musl': 4.34.8 + '@rollup/rollup-win32-arm64-msvc': 4.34.8 + '@rollup/rollup-win32-ia32-msvc': 4.34.8 + '@rollup/rollup-win32-x64-msvc': 4.34.8 + fsevents: 2.3.3 + rrweb-cssom@0.6.0: {} run-async@2.4.1: {} @@ -17460,6 +18547,8 @@ snapshots: dependencies: lru-cache: 6.0.0 + semver@7.7.1: {} + send@0.18.0: dependencies: debug: 2.6.9 @@ -17544,6 +18633,33 @@ snapshots: dependencies: kind-of: 6.0.3 + sharp@0.33.5: + dependencies: + color: 4.2.3 + detect-libc: 2.0.3 + semver: 7.7.1 + optionalDependencies: + '@img/sharp-darwin-arm64': 0.33.5 + '@img/sharp-darwin-x64': 0.33.5 + '@img/sharp-libvips-darwin-arm64': 1.0.4 + '@img/sharp-libvips-darwin-x64': 1.0.4 + '@img/sharp-libvips-linux-arm': 1.0.5 + '@img/sharp-libvips-linux-arm64': 1.0.4 + '@img/sharp-libvips-linux-s390x': 1.0.4 + '@img/sharp-libvips-linux-x64': 1.0.4 + '@img/sharp-libvips-linuxmusl-arm64': 1.0.4 + '@img/sharp-libvips-linuxmusl-x64': 1.0.4 + '@img/sharp-linux-arm': 0.33.5 + '@img/sharp-linux-arm64': 0.33.5 + '@img/sharp-linux-s390x': 0.33.5 + '@img/sharp-linux-x64': 0.33.5 + '@img/sharp-linuxmusl-arm64': 0.33.5 + '@img/sharp-linuxmusl-x64': 0.33.5 + '@img/sharp-wasm32': 0.33.5 + '@img/sharp-win32-ia32': 0.33.5 + '@img/sharp-win32-x64': 0.33.5 + optional: true + shebang-command@1.2.0: dependencies: shebang-regex: 1.0.0 @@ -17584,6 +18700,11 @@ snapshots: signal-exit@4.1.0: {} + simple-swizzle@0.2.2: + dependencies: + is-arrayish: 0.3.2 + optional: true + sisteransi@1.0.5: {} slash@3.0.0: {} @@ -17607,7 +18728,7 @@ snapshots: socks-proxy-agent@8.0.4: dependencies: agent-base: 7.1.1 - debug: 4.3.7 + debug: 4.4.0 socks: 2.8.3 transitivePeerDependencies: - supports-color @@ -17705,6 +18826,8 @@ snapshots: dependencies: mixme: 0.5.4 + streamsearch@1.1.0: {} + strict-event-emitter@0.2.8: dependencies: events: 3.3.0 @@ -17822,7 +18945,7 @@ snapshots: dependencies: component-emitter: 1.3.0 cookiejar: 2.1.4 - debug: 4.3.7 + debug: 4.4.0 fast-safe-stringify: 2.1.1 form-data: 4.0.0 formidable: 2.1.2 @@ -17903,7 +19026,7 @@ snapshots: terser@5.15.0: dependencies: '@jridgewell/source-map': 0.3.2 - acorn: 8.11.3 + acorn: 8.14.0 commander: 2.20.3 source-map-support: 0.5.21 optional: true @@ -18004,7 +19127,7 @@ snapshots: tsscmp@1.0.6: {} - tsup@8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.4.5)(yaml@2.6.0): + tsup@8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0): dependencies: bundle-require: 5.0.0(esbuild@0.23.1) cac: 6.7.14 @@ -18015,7 +19138,7 @@ snapshots: execa: 5.1.1 joycon: 3.1.1 picocolors: 1.1.1 - postcss-load-config: 6.0.1(jiti@1.21.0)(postcss@8.4.49)(yaml@2.6.0) + postcss-load-config: 6.0.1(jiti@1.21.0)(postcss@8.5.3)(yaml@2.6.0) resolve-from: 5.0.0 rollup: 4.24.0 source-map: 0.8.0-beta.0 @@ -18024,7 +19147,7 @@ snapshots: tree-kill: 1.2.2 optionalDependencies: '@swc/core': 1.10.18(@swc/helpers@0.5.15) - postcss: 8.4.49 + postcss: 8.5.3 typescript: 5.4.5 transitivePeerDependencies: - jiti @@ -18121,7 +19244,7 @@ snapshots: uc.micro@2.1.0: {} - ufo@1.5.3: {} + ufo@1.5.4: {} uid-safe@2.1.5: dependencies: @@ -18142,6 +19265,10 @@ snapshots: dependencies: '@fastify/busboy': 2.1.1 + undici@5.28.5: + dependencies: + '@fastify/busboy': 2.1.1 + undici@6.20.1: {} unenv-nightly@1.10.0-1717606461.a117952: @@ -18151,7 +19278,15 @@ snapshots: mime: 3.0.0 node-fetch-native: 1.6.4 pathe: 1.1.2 - ufo: 1.5.3 + ufo: 1.5.4 + + unenv@2.0.0-rc.1: + dependencies: + defu: 6.1.4 + mlly: 1.7.4 + ohash: 1.1.4 + pathe: 1.1.2 + ufo: 1.5.4 unicode-canonical-property-names-ecmascript@2.0.0: {} @@ -18251,12 +19386,37 @@ snapshots: unpipe@1.0.0: {} + unplugin-rsc@0.0.11(rollup@4.34.8): + dependencies: + '@babel/core': 7.24.4 + '@babel/helper-module-imports': 7.24.3 + '@babel/helper-plugin-utils': 7.24.0 + '@babel/traverse': 7.24.1 + '@rollup/pluginutils': 5.1.0(rollup@4.34.8) + unplugin: 1.10.1 + transitivePeerDependencies: + - rollup + - supports-color + + unplugin@1.10.1: + dependencies: + acorn: 8.11.3 + chokidar: 3.6.0 + webpack-sources: 3.2.3 + webpack-virtual-modules: 0.6.2 + update-browserslist-db@1.0.13(browserslist@4.23.0): dependencies: browserslist: 4.23.0 escalade: 3.1.1 picocolors: 1.1.1 + update-browserslist-db@1.1.3(browserslist@4.24.4): + dependencies: + browserslist: 4.24.4 + escalade: 3.2.0 + picocolors: 1.1.1 + uri-js@4.4.1: dependencies: punycode: 2.3.0 @@ -18271,6 +19431,8 @@ snapshots: punycode: 1.4.1 qs: 6.13.0 + urlpattern-polyfill@10.0.0: {} + util-deprecate@1.0.2: {} util@0.12.5: @@ -18355,19 +19517,6 @@ snapshots: transitivePeerDependencies: - supports-color - vite-env-only@3.0.1(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)): - dependencies: - '@babel/core': 7.24.3 - '@babel/generator': 7.24.1 - '@babel/parser': 7.24.1 - '@babel/traverse': 7.24.1 - '@babel/types': 7.24.0 - babel-dead-code-elimination: 1.0.6 - micromatch: 4.0.5 - vite: 6.0.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) - transitivePeerDependencies: - - supports-color - vite-env-only@3.0.1(vite@6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)): dependencies: '@babel/core': 7.24.3 @@ -18430,24 +19579,24 @@ snapshots: - supports-color - typescript - vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)): + vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)): dependencies: debug: 4.3.7 globrex: 0.1.2 tsconfck: 3.0.3(typescript@5.4.5) optionalDependencies: - vite: 6.0.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) + vite: 6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) transitivePeerDependencies: - supports-color - typescript - vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)): + vite-tsconfig-paths@5.1.4(typescript@5.4.5)(vite@6.2.0(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0)): dependencies: - debug: 4.3.7 + debug: 4.4.0 globrex: 0.1.2 tsconfck: 3.0.3(typescript@5.4.5) optionalDependencies: - vite: 6.0.2(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) + vite: 6.2.0(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0) transitivePeerDependencies: - supports-color - typescript @@ -18487,6 +19636,18 @@ snapshots: lightningcss: 1.29.1 yaml: 2.6.0 + vite@6.2.0(@types/node@22.13.4)(jiti@1.21.0)(lightningcss@1.29.1)(yaml@2.6.0): + dependencies: + esbuild: 0.25.0 + postcss: 8.5.3 + rollup: 4.34.8 + optionalDependencies: + '@types/node': 22.13.4 + fsevents: 2.3.3 + jiti: 1.21.0 + lightningcss: 1.29.1 + yaml: 2.6.0 + w3c-xmlserializer@4.0.0: dependencies: xml-name-validator: 4.0.0 @@ -18525,6 +19686,10 @@ snapshots: webidl-conversions@7.0.0: {} + webpack-sources@3.2.3: {} + + webpack-virtual-modules@0.6.2: {} + whatwg-encoding@2.0.0: dependencies: iconv-lite: 0.6.3 @@ -18618,13 +19783,32 @@ snapshots: jsonc-parser: 3.2.1 proper-lockfile: 4.1.2 - workerd@1.20240614.0: + workerd@1.20250224.0: + optionalDependencies: + '@cloudflare/workerd-darwin-64': 1.20250224.0 + '@cloudflare/workerd-darwin-arm64': 1.20250224.0 + '@cloudflare/workerd-linux-64': 1.20250224.0 + '@cloudflare/workerd-linux-arm64': 1.20250224.0 + '@cloudflare/workerd-windows-64': 1.20250224.0 + + wrangler@3.111.0(@cloudflare/workers-types@4.20250224.0): + dependencies: + '@cloudflare/kv-asset-handler': 0.3.4 + '@esbuild-plugins/node-globals-polyfill': 0.2.3(esbuild@0.17.19) + '@esbuild-plugins/node-modules-polyfill': 0.2.2(esbuild@0.17.19) + blake3-wasm: 2.1.5 + esbuild: 0.17.19 + miniflare: 3.20250214.1 + path-to-regexp: 6.3.0 + unenv: 2.0.0-rc.1 + workerd: 1.20250224.0 optionalDependencies: - '@cloudflare/workerd-darwin-64': 1.20240614.0 - '@cloudflare/workerd-darwin-arm64': 1.20240614.0 - '@cloudflare/workerd-linux-64': 1.20240614.0 - '@cloudflare/workerd-linux-arm64': 1.20240614.0 - '@cloudflare/workerd-windows-64': 1.20240614.0 + '@cloudflare/workers-types': 4.20250224.0 + fsevents: 2.3.3 + sharp: 0.33.5 + transitivePeerDependencies: + - bufferutil + - utf-8-validate wrangler@3.64.0(@cloudflare/workers-types@4.20240712.0): dependencies: @@ -18652,6 +19836,32 @@ snapshots: - supports-color - utf-8-validate + wrangler@3.64.0(@cloudflare/workers-types@4.20250224.0): + dependencies: + '@cloudflare/kv-asset-handler': 0.3.4 + '@esbuild-plugins/node-globals-polyfill': 0.2.3(esbuild@0.17.19) + '@esbuild-plugins/node-modules-polyfill': 0.2.2(esbuild@0.17.19) + blake3-wasm: 2.1.5 + chokidar: 3.6.0 + date-fns: 3.6.0 + esbuild: 0.17.19 + miniflare: 3.20240701.0 + nanoid: 3.3.7 + path-to-regexp: 6.3.0 + resolve: 1.22.8 + resolve.exports: 2.0.2 + selfsigned: 2.4.1 + source-map: 0.6.1 + unenv: unenv-nightly@1.10.0-1717606461.a117952 + xxhash-wasm: 1.0.2 + optionalDependencies: + '@cloudflare/workers-types': 4.20250224.0 + fsevents: 2.3.3 + transitivePeerDependencies: + - bufferutil + - supports-color + - utf-8-validate + wrap-ansi@6.2.0: dependencies: ansi-styles: 4.3.0 @@ -18734,12 +19944,20 @@ snapshots: yocto-queue@0.1.0: {} + youch@3.2.3: + dependencies: + cookie: 0.5.0 + mustache: 4.2.0 + stacktracey: 2.1.8 + youch@3.3.3: dependencies: cookie: 0.5.0 mustache: 4.2.0 stacktracey: 2.1.8 + zod@3.22.3: {} + zod@3.23.8: {} zwitch@2.0.4: {} From 8f55758f0a724588971c021f630de4910008ac51 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Fri, 7 Mar 2025 10:12:05 -0800 Subject: [PATCH 018/143] enable server first route components --- packages/react-router/lib/server.browser.tsx | 4 +- packages/react-router/lib/server.static.tsx | 2 +- packages/react-router/lib/server.ts | 74 +++++++++++++------ packages/react-router/server.ts | 12 ++- .../rsc-vite/.wrangler/deploy/config.json | 1 + playground/rsc-vite/package.json | 2 +- playground/rsc-vite/server.js | 25 +++++++ playground/rsc-vite/src/routes/home/home.tsx | 10 ++- playground/rsc-vite/src/routes/root/root.tsx | 43 ++++++++++- .../rsc-vite/src/server/entry.server.tsx | 3 +- playground/rsc-vite/tsconfig.client.json | 1 - playground/rsc-vite/vite.config.ts | 14 +++- 12 files changed, 159 insertions(+), 32 deletions(-) create mode 100644 playground/rsc-vite/.wrangler/deploy/config.json create mode 100644 playground/rsc-vite/server.js diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index e03e89c1f8..23a3924fd6 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -151,7 +151,9 @@ function createRouteFromServerManifest( return { id: match.id, action: match.hasAction || !!match.clientAction, - element: , + element: match.element ?? ( + + ), ErrorBoundary: match.ErrorBoundary, handle: match.handle, hasErrorBoundary: !!match.ErrorBoundary, diff --git a/packages/react-router/lib/server.static.tsx b/packages/react-router/lib/server.static.tsx index fdd589f44f..775371a21d 100644 --- a/packages/react-router/lib/server.static.tsx +++ b/packages/react-router/lib/server.static.tsx @@ -54,7 +54,7 @@ export function ServerStaticRouter({ payload }: { payload: ServerPayload }) { const route: DataRouteObject = { id: match.id, action: match.hasAction || !!match.clientAction, - element: ( + element: match.element ?? ( ), ErrorBoundary: match.ErrorBoundary, diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index 8ce69deb3c..5a208d5351 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -1,3 +1,5 @@ +import { createElement } from "react"; + import type { ClientActionFunction, ClientLoaderFunction, @@ -50,6 +52,7 @@ export type ServerRouteManifest = { clientAction?: ClientActionFunction; clientLoader?: ClientLoaderFunction; Component?: React.ComponentType; + element?: React.ReactElement | null; ErrorBoundary?: React.ComponentType; handle?: any; hasAction: boolean; @@ -126,10 +129,13 @@ export async function matchServerRequest( ...((await route.lazy()) as any), }; } + + const componentIsClientReference = isClientReference(route.default); + return { clientAction: route.clientAction, clientLoader: route.clientLoader, - Component: route.default, + Component: componentIsClientReference ? route.default : undefined, ErrorBoundary: route.ErrorBoundary, handle: route.handle, hasAction: !!route.action, @@ -176,26 +182,41 @@ export async function matchServerRequest( errors, loaderData: result.loaderData, location: result.location, - matches: result.matches.map((match) => ({ - clientAction: (match.route as any).clientAction, - clientLoader: (match.route as any).clientLoader, - Component: (match.route as any).default, - ErrorBoundary: (match.route as any).ErrorBoundary, - handle: (match.route as any).handle, - hasAction: !!match.route.action, - hasLoader: !!match.route.loader, - HydrateFallback: (match.route as any).HydrateFallback, - id: match.route.id, - index: match.route.index, - Layout: (match.route as any).Layout, - links: (match.route as any).links, - meta: (match.route as any).meta, - params: match.params, - path: match.route.path, - pathname: match.pathname, - pathnameBase: match.pathnameBase, - shouldRevalidate: (match.route as any).shouldRevalidate, - })), + matches: result.matches.map((match) => { + const componentIsClientReference = isClientReference( + (match.route as any).default + ); + + return { + clientAction: (match.route as any).clientAction, + clientLoader: (match.route as any).clientLoader, + Component: componentIsClientReference + ? (match.route as any).default + : undefined, + element: + (match.route as any).default && !componentIsClientReference + ? createElement((match.route as any).default, { + actionData: result.actionData?.[match.route.id], + loaderData: result.loaderData[match.route.id], + }) + : null, + ErrorBoundary: (match.route as any).ErrorBoundary, + handle: (match.route as any).handle, + hasAction: !!match.route.action, + hasLoader: !!match.route.loader, + HydrateFallback: (match.route as any).HydrateFallback, + id: match.route.id, + index: match.route.index, + Layout: (match.route as any).Layout, + links: (match.route as any).links, + meta: (match.route as any).meta, + params: match.params, + path: match.route.path, + pathname: match.pathname, + pathnameBase: match.pathnameBase, + shouldRevalidate: (match.route as any).shouldRevalidate, + }; + }), } satisfies ServerRenderPayload; return { @@ -276,3 +297,14 @@ export function isReactServerRequest(url: URL) { export function isManifestRequest(url: URL) { return url.pathname.endsWith(".manifest"); } + +const CLIENT_REFERENCE_TAG = Symbol.for("react.client.reference"); + +function isClientReference(obj: unknown) { + return ( + obj && + (typeof obj === "object" || typeof obj === "function") && + "$$typeof" in obj && + obj.$$typeof === CLIENT_REFERENCE_TAG + ); +} diff --git a/packages/react-router/server.ts b/packages/react-router/server.ts index f5681a80a4..c7fc606596 100644 --- a/packages/react-router/server.ts +++ b/packages/react-router/server.ts @@ -1,4 +1,14 @@ -export * from "react-router/client"; +import { + Link, + Links, + Meta, + NavLink, + Outlet, + Scripts, + ScrollRestoration, +} from "react-router/client"; + +export { Link, Links, Meta, NavLink, Outlet, Scripts, ScrollRestoration }; export { createStaticHandler } from "./lib/router/router"; export { matchRoutes } from "./lib/router/utils"; diff --git a/playground/rsc-vite/.wrangler/deploy/config.json b/playground/rsc-vite/.wrangler/deploy/config.json new file mode 100644 index 0000000000..bde383d850 --- /dev/null +++ b/playground/rsc-vite/.wrangler/deploy/config.json @@ -0,0 +1 @@ +{"configPath":"../../dist/ssr/wrangler.json","auxiliaryWorkers":[{"configPath":"../../dist/server/wrangler.json"}]} \ No newline at end of file diff --git a/playground/rsc-vite/package.json b/playground/rsc-vite/package.json index b002ed547f..f218880948 100644 --- a/playground/rsc-vite/package.json +++ b/playground/rsc-vite/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "vite", "build": "vite build", - "start": "node dist/server.js" + "start": "node server.js" }, "devDependencies": { "@biomejs/biome": "^1.9.4", diff --git a/playground/rsc-vite/server.js b/playground/rsc-vite/server.js new file mode 100644 index 0000000000..0bdb3ec01a --- /dev/null +++ b/playground/rsc-vite/server.js @@ -0,0 +1,25 @@ +import { createRequestListener } from "@mjackson/node-fetch-server"; +import express from "express"; + +import ssr from "./dist/ssr/entry.ssr.js"; +import server from "./dist/server/entry.server.js"; + +const app = express(); + +app.use(express.static("dist/client")); + +app.use( + createRequestListener((request) => { + return ssr.fetch(request, { + SERVER: { + fetch(request) { + return server.fetch(request); + }, + }, + }); + }) +); + +app.listen(3000, () => { + console.log("Server started on http://localhost:3000"); +}); diff --git a/playground/rsc-vite/src/routes/home/home.tsx b/playground/rsc-vite/src/routes/home/home.tsx index 22fffe84be..735ba72b67 100644 --- a/playground/rsc-vite/src/routes/home/home.tsx +++ b/playground/rsc-vite/src/routes/home/home.tsx @@ -1,7 +1,15 @@ -export { clientLoader, default } from "./home.client"; +export { clientLoader } from "./home.client"; export function loader() { return { message: "Hello Home!", }; } + +export default function Home({ + loaderData, +}: { + loaderData: Awaited>; +}) { + return

{loaderData.message}

; +} diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx index 347dbd2248..aba72a205a 100644 --- a/playground/rsc-vite/src/routes/root/root.tsx +++ b/playground/rsc-vite/src/routes/root/root.tsx @@ -1,4 +1,6 @@ -export { default, ErrorBoundary, Layout } from "./root.client"; +import { Link, Links, Outlet, ScrollRestoration } from "react-router"; + +export { ErrorBoundary, Layout } from "./root.client"; import { Counter } from "../../counter"; @@ -8,3 +10,42 @@ export function loader() { message: "Hello from the server!", }; } + +export default function Root({ + loaderData: { counter, message }, +}: { + loaderData: Awaited>; +}) { + return ( + +

{message}

+
    +
  • + Home +
    • +
  • + About +
    • +
+ {counter} + + + ); +} + +function Layout({ children }: { children: React.ReactNode }) { + return ( + + + + + React Server + + + + {children} + + + + ); +} diff --git a/playground/rsc-vite/src/server/entry.server.tsx b/playground/rsc-vite/src/server/entry.server.tsx index 41cc6d6ee4..104771ece7 100644 --- a/playground/rsc-vite/src/server/entry.server.tsx +++ b/playground/rsc-vite/src/server/entry.server.tsx @@ -1,6 +1,7 @@ /// -import { renderToReadableStream } from "framework/server"; +import { renderToReadableStream } from "../../framework/server"; + import { matchServerRequest } from "react-router"; import { routes } from "../routes"; diff --git a/playground/rsc-vite/tsconfig.client.json b/playground/rsc-vite/tsconfig.client.json index 4984367e57..8faea30be1 100644 --- a/playground/rsc-vite/tsconfig.client.json +++ b/playground/rsc-vite/tsconfig.client.json @@ -6,7 +6,6 @@ "rootDir": ".", "paths": { "~/*": ["./src/app/*"], - "framework/*": ["./framework/*"] }, "allowImportingTsExtensions": true, "jsx": "react-jsx", diff --git a/playground/rsc-vite/vite.config.ts b/playground/rsc-vite/vite.config.ts index f45c18ace6..d7f540d665 100644 --- a/playground/rsc-vite/vite.config.ts +++ b/playground/rsc-vite/vite.config.ts @@ -1,3 +1,5 @@ +import * as path from "node:path"; + import { cloudflare } from "@cloudflare/vite-plugin"; import reactServerDOM from "@jacob-ebey/vite-react-server-dom"; import { defineConfig } from "vite"; @@ -20,6 +22,12 @@ export default defineConfig({ }, }, }, + ssr: { + resolve: { noExternal: true }, + }, + server: { + resolve: { noExternal: true }, + }, }, plugins: [ tsconfigPaths({ configNames: ["tsconfig.client.json"] }), @@ -29,13 +37,13 @@ export default defineConfig({ ssrEnvironments: ["ssr"], runtime: { browser: { - importFrom: "framework/references.browser", + importFrom: path.resolve("./framework/references.browser.ts"), }, server: { - importFrom: "framework/references.server", + importFrom: path.resolve("./framework/references.server.ts"), }, ssr: { - importFrom: "framework/references.ssr", + importFrom: path.resolve("./framework/references.ssr.ts"), }, }, }), From a6297e7362b76a1b075cba40f5520eedd081862a Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Tue, 11 Mar 2025 14:37:07 -0700 Subject: [PATCH 019/143] feat: support patching routes from dataStrategy --- packages/react-router/lib/router/router.ts | 65 +++++--------------- packages/react-router/lib/router/utils.ts | 5 -- packages/react-router/lib/server.browser.tsx | 13 ++-- packages/react-router/lib/server.static.tsx | 38 +++++++----- playground/rsc-vite/src/routes/home/home.tsx | 11 +++- 5 files changed, 56 insertions(+), 76 deletions(-) diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts index 84f747578e..0abce8a72d 100644 --- a/packages/react-router/lib/router/router.ts +++ b/packages/react-router/lib/router/router.ts @@ -811,6 +811,7 @@ export function createRouter(init: RouterInit): Router { manifest ); let inFlightDataRoutes: AgnosticDataRouteObject[] | undefined; + let routesPatched = false; let basename = init.basename || "/"; let dataStrategyImpl = init.dataStrategy || defaultDataStrategy; let patchRoutesOnNavigationImpl = init.patchRoutesOnNavigation; @@ -1187,6 +1188,10 @@ export function createRouter(init: RouterInit): Router { newState: Partial>, { flushSync }: { flushSync?: boolean } = {} ): void { + if (routesPatched) { + newState.matches = matchRoutes(dataRoutes, location) ?? newState.matches; + } + // Deduce if we're in a loading/actionReload state: // - We have committed actionData in the store // - The current navigation was a mutation submission @@ -3264,6 +3269,8 @@ export function createRouter(init: RouterInit): Router { mapRouteProperties ); + routesPatched = true; + // If we are not in the middle of an HMR revalidation and we changed the // routes, provide a new identity and trigger a reflow via `updateState` // to re-run memoized `router.routes` dependencies. @@ -4480,64 +4487,20 @@ function patchRoutesImpl( childrenToPatch = routesToUse; } - // Don't patch in routes we already know about so that `patch` is idempotent - // to simplify user-land code. This is useful because we re-call the - // `patchRoutesOnNavigation` function for matched routes with params. - let uniqueChildren = children.filter( - (newRoute) => - !childrenToPatch.some((existingRoute) => - isSameRoute(newRoute, existingRoute) - ) - ); - let newRoutes = convertRoutesToDataRoutes( - uniqueChildren, + children, mapRouteProperties, [routeId || "_", "patch", String(childrenToPatch?.length || "0")], manifest ); - - childrenToPatch.push(...newRoutes); -} - -function isSameRoute( - newRoute: AgnosticRouteObject, - existingRoute: AgnosticRouteObject -): boolean { - // Most optimal check is by id - if ( - "id" in newRoute && - "id" in existingRoute && - newRoute.id === existingRoute.id - ) { - return true; - } - - // Second is by pathing differences - if ( - !( - newRoute.index === existingRoute.index && - newRoute.path === existingRoute.path && - newRoute.caseSensitive === existingRoute.caseSensitive - ) - ) { - return false; - } - - // Pathless layout routes are trickier since we need to check children. - // If they have no children then they're the same as far as we can tell - if ( - (!newRoute.children || newRoute.children.length === 0) && - (!existingRoute.children || existingRoute.children.length === 0) - ) { - return true; + const newIds = new Set(newRoutes.map((r) => r.id)); + for (let i = childrenToPatch.length - 1; i >= 0; i--) { + if (newIds.has(childrenToPatch[i].id)) { + childrenToPatch.splice(i, 1); + } } - // Otherwise, we look to see if every child in the new route is already - // represented in the existing route's children - return newRoute.children!.every((aChild, i) => - existingRoute.children?.some((bChild) => isSameRoute(aChild, bChild)) - ); + childrenToPatch.push(...newRoutes); } /** diff --git a/packages/react-router/lib/router/utils.ts b/packages/react-router/lib/router/utils.ts index e7a37af2e7..8ac3d0e9aa 100644 --- a/packages/react-router/lib/router/utils.ts +++ b/packages/react-router/lib/router/utils.ts @@ -520,11 +520,6 @@ export function convertRoutesToDataRoutes( route.index !== true || !route.children, `Cannot specify children on an index route` ); - invariant( - !manifest[id], - `Found a route id collision on id "${id}". Route ` + - "id's must be globally unique within Data Router usages" - ); if (isIndexRoute(route)) { let indexRoute: AgnosticDataIndexRouteObject = { diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index 23a3924fd6..b83fdd3970 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -147,13 +147,18 @@ export function ServerBrowserRouter({ function createRouteFromServerManifest( match: ServerRouteManifest -): DataRouteObject { +): DataRouteObject & { + rendered: { Component: any; element: any; Layout: any }; +} { return { id: match.id, action: match.hasAction || !!match.clientAction, - element: match.element ?? ( - - ), + rendered: { + Component: match.Component, + element: match.element, + Layout: match.Layout, + }, + element: , ErrorBoundary: match.ErrorBoundary, handle: match.handle, hasErrorBoundary: !!match.ErrorBoundary, diff --git a/packages/react-router/lib/server.static.tsx b/packages/react-router/lib/server.static.tsx index 775371a21d..7f2b5a0b09 100644 --- a/packages/react-router/lib/server.static.tsx +++ b/packages/react-router/lib/server.static.tsx @@ -1,22 +1,27 @@ import * as React from "react"; -import type { DataRouteObject } from "./context"; +import { RouteContext, type DataRouteObject } from "./context"; import { FrameworkContext } from "./dom/ssr/components"; import type { FrameworkContextObject } from "./dom/ssr/entry"; import { createStaticRouter, StaticRouterProvider } from "./dom/server"; import type { ServerPayload } from "./server"; -export function RouteWrapper({ - Component, - Layout, -}: { - Component?: React.ComponentType; - Layout?: React.ComponentType; -}) { +export function RouteWrapper({ id }: { id: string }) { + const ctx = React.useContext(RouteContext); + const match = ctx.matches.find((match) => match.route.id === id); + + if (!match) { + throw new Error(`No match found for route with id "${id}"`); + } + + const { Component, element, Layout } = (match as any).route.rendered as any; + return Layout ? ( - {Component ? : null} + {Component ? : element} ) : Component ? ( - ) : null; + ) : ( + element + ); } export function ServerStaticRouter({ payload }: { payload: ServerPayload }) { @@ -51,12 +56,17 @@ export function ServerStaticRouter({ payload }: { payload: ServerPayload }) { const router = createStaticRouter( payload.matches.reduceRight((previous, match) => { - const route: DataRouteObject = { + const route: DataRouteObject & { + rendered: { Component: any; element: any; Layout: any }; + } = { id: match.id, action: match.hasAction || !!match.clientAction, - element: match.element ?? ( - - ), + rendered: { + Component: match.Component, + element: match.element, + Layout: match.Layout, + }, + element: , ErrorBoundary: match.ErrorBoundary, handle: match.handle, hasErrorBoundary: !!match.ErrorBoundary, diff --git a/playground/rsc-vite/src/routes/home/home.tsx b/playground/rsc-vite/src/routes/home/home.tsx index 735ba72b67..39c80053ba 100644 --- a/playground/rsc-vite/src/routes/home/home.tsx +++ b/playground/rsc-vite/src/routes/home/home.tsx @@ -1,5 +1,7 @@ export { clientLoader } from "./home.client"; +import { Counter } from "../../counter"; + export function loader() { return { message: "Hello Home!", @@ -7,9 +9,14 @@ export function loader() { } export default function Home({ - loaderData, + loaderData: { message }, }: { loaderData: Awaited>; }) { - return

{loaderData.message}

; + return ( +
+

{message}

+ +
+ ); } From 4d6452dd9c24bf32a18d189361f440ed97c4de0b Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Tue, 11 Mar 2025 14:39:19 -0700 Subject: [PATCH 020/143] update home route to have dynamic data --- playground/rsc-vite/src/routes/home/home.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playground/rsc-vite/src/routes/home/home.tsx b/playground/rsc-vite/src/routes/home/home.tsx index 39c80053ba..77371aad32 100644 --- a/playground/rsc-vite/src/routes/home/home.tsx +++ b/playground/rsc-vite/src/routes/home/home.tsx @@ -4,7 +4,7 @@ import { Counter } from "../../counter"; export function loader() { return { - message: "Hello Home!", + message: "Hello Home!" + "!".repeat(Math.floor(Math.random() * 10)), }; } From 65136c12709ab87ab06ccaa46abf2d0c0e279114 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Tue, 11 Mar 2025 19:39:31 -0700 Subject: [PATCH 021/143] cleanup --- playground/rsc-vite/src/routes/root/root.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx index aba72a205a..11f7f21fdf 100644 --- a/playground/rsc-vite/src/routes/root/root.tsx +++ b/playground/rsc-vite/src/routes/root/root.tsx @@ -1,6 +1,6 @@ import { Link, Links, Outlet, ScrollRestoration } from "react-router"; -export { ErrorBoundary, Layout } from "./root.client"; +export { ErrorBoundary } from "./root.client"; import { Counter } from "../../counter"; From 0171386f9335e897217554b27a92708dc486e4d9 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Fri, 14 Mar 2025 10:27:59 -0700 Subject: [PATCH 022/143] mutate route tree --- packages/react-router/lib/router/router.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts index 0abce8a72d..42b01b257b 100644 --- a/packages/react-router/lib/router/router.ts +++ b/packages/react-router/lib/router/router.ts @@ -4496,7 +4496,11 @@ function patchRoutesImpl( const newIds = new Set(newRoutes.map((r) => r.id)); for (let i = childrenToPatch.length - 1; i >= 0; i--) { if (newIds.has(childrenToPatch[i].id)) { - childrenToPatch.splice(i, 1); + Object.assign( + childrenToPatch[i], + childrenToPatch.splice(i, 1)![0], + childrenToPatch[i] + ); } } From bb5a3a54ff962d8f10cb01b7ca2ed463c26281ef Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Tue, 18 Mar 2025 09:36:10 -0700 Subject: [PATCH 023/143] update parcel and fix module resolution --- package.json | 3 +- packages/react-router/client.js | 3 + packages/react-router/package.json | 3 +- .../re-write-server-build-import.mjs | 16 + packages/react-router/server.ts | 12 +- playground/rsc-parcel/package.json | 6 +- playground/rsc-vite/vite.config.ts | 19 +- pnpm-lock.yaml | 1086 +++++++++-------- 8 files changed, 632 insertions(+), 516 deletions(-) create mode 100644 packages/react-router/client.js create mode 100644 packages/react-router/re-write-server-build-import.mjs diff --git a/package.json b/package.json index 68498e89e2..d66c911f6c 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,8 @@ "unist-util-remove": "^3.1.0", "vite": "^6.0.0", "vite-env-only": "^3.0.1", - "vite-tsconfig-paths": "^4.2.2" + "vite-tsconfig-paths": "^4.2.2", + "react-server-dom-parcel": "0.0.0-experimental-93b58361-20250209" }, "engines": { "node": ">=20.0.0" diff --git a/packages/react-router/client.js b/packages/react-router/client.js new file mode 100644 index 0000000000..6953d2ead0 --- /dev/null +++ b/packages/react-router/client.js @@ -0,0 +1,3 @@ +const bundled = require("./dist/development/index.js"); + +module.exports = bundled; \ No newline at end of file diff --git a/packages/react-router/package.json b/packages/react-router/package.json index df03354b86..0af7102faa 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -98,8 +98,9 @@ }, "wireit": { "build": { - "command": "rimraf dist && tsup && tsup --config tsup.config.server.ts", + "command": "rimraf dist && tsup && tsup --config tsup.config.server.ts && node ./re-write-server-build-import.mjs", "files": [ + "re-write-server-build-import.mjs", "lib/**", "*.ts", "tsconfig.json", diff --git a/packages/react-router/re-write-server-build-import.mjs b/packages/react-router/re-write-server-build-import.mjs new file mode 100644 index 0000000000..d65bacd005 --- /dev/null +++ b/packages/react-router/re-write-server-build-import.mjs @@ -0,0 +1,16 @@ +// eslint-disable-next-line import/no-nodejs-modules +import * as fsp from "node:fs/promises"; + +const filesToRewrite = [ + "dist/development/server.js", + "dist/production/server.js", +]; + +for (const file of filesToRewrite) { + const contents = await fsp.readFile(file, "utf8"); + const newContents = contents.replaceAll( + "require('react-router/client')", + "require('./index.js')" + ); + await fsp.writeFile(file, newContents); +} diff --git a/packages/react-router/server.ts b/packages/react-router/server.ts index c7fc606596..f5681a80a4 100644 --- a/packages/react-router/server.ts +++ b/packages/react-router/server.ts @@ -1,14 +1,4 @@ -import { - Link, - Links, - Meta, - NavLink, - Outlet, - Scripts, - ScrollRestoration, -} from "react-router/client"; - -export { Link, Links, Meta, NavLink, Outlet, Scripts, ScrollRestoration }; +export * from "react-router/client"; export { createStaticHandler } from "./lib/router/router"; export { matchRoutes } from "./lib/router/utils"; diff --git a/playground/rsc-parcel/package.json b/playground/rsc-parcel/package.json index 5af62e5ff1..c48d93fab9 100644 --- a/playground/rsc-parcel/package.json +++ b/playground/rsc-parcel/package.json @@ -18,6 +18,8 @@ }, "devDependencies": { "@biomejs/biome": "^1.9.4", + "@parcel/packager-react-static": "2.14.0", + "@parcel/transformer-react-static": "2.14.0", "@types/express": "^5.0.0", "@types/node": "^22.13.1", "@types/parcel-env": "0.0.8", @@ -26,7 +28,7 @@ "browserify-zlib": "^0.2.0", "buffer": "^5.5.0||^6.0.0", "events": "^3.1.0", - "parcel": "2.0.0-canary.1777", + "parcel": "2.14.0", "path-browserify": "^1.0.0", "querystring-es3": "^0.2.1", "stream-http": "^3.1.0", @@ -34,7 +36,7 @@ }, "dependencies": { "@mjackson/node-fetch-server": "0.6.1", - "@parcel/runtime-rsc": "2.13.4-canary.3402", + "@parcel/runtime-rsc": "2.14.0", "express": "^4.21.2", "react": "0.0.0-experimental-93b58361-20250209", "react-dom": "0.0.0-experimental-93b58361-20250209", diff --git a/playground/rsc-vite/vite.config.ts b/playground/rsc-vite/vite.config.ts index d7f540d665..ac977e741c 100644 --- a/playground/rsc-vite/vite.config.ts +++ b/playground/rsc-vite/vite.config.ts @@ -6,6 +6,12 @@ import { defineConfig } from "vite"; import tsconfigPaths from "vite-tsconfig-paths"; export default defineConfig({ + build: { + minify: false, + }, + define: { + "process.env.NODE_ENV": JSON.stringify("development"), + }, resolve: { external: ["cloudflare:workers"], }, @@ -21,12 +27,21 @@ export default defineConfig({ }, }, }, + resolve: { + conditions: ["module-sync"], + }, }, ssr: { - resolve: { noExternal: true }, + resolve: { + noExternal: true, + conditions: ["module-sync"], + }, }, server: { - resolve: { noExternal: true }, + resolve: { + noExternal: true, + conditions: ["module-sync"], + }, }, }, plugins: [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9517cd532f..7cff4acac8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -189,6 +189,9 @@ importers: react-dom: specifier: 0.0.0-experimental-93b58361-20250209 version: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) + react-server-dom-parcel: + specifier: 0.0.0-experimental-93b58361-20250209 + version: 0.0.0-experimental-93b58361-20250209(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209) react-test-renderer: specifier: ^18.2.0 version: 18.2.0(react@0.0.0-experimental-93b58361-20250209) @@ -600,7 +603,7 @@ importers: version: 1.3.3 tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.11.11(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -637,7 +640,7 @@ importers: version: 6.0.1 tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.11.11(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -677,7 +680,7 @@ importers: version: link:../react-router tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.11.11(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -695,7 +698,7 @@ importers: version: link:../react-router tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.11.11(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -864,7 +867,7 @@ importers: version: 1.3.3 tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.11.11(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -892,7 +895,7 @@ importers: version: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.11.11(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -929,7 +932,7 @@ importers: version: 6.3.4 tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.11.11(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -948,7 +951,7 @@ importers: version: link:../react-router-dev tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.11.11(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -979,7 +982,7 @@ importers: version: link:../react-router tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.11.11(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -994,7 +997,7 @@ importers: version: link:../react-router-dev tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.11.11(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -1043,7 +1046,7 @@ importers: version: 0.5.10 tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.11.11(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -1235,8 +1238,8 @@ importers: specifier: 0.6.1 version: 0.6.1 '@parcel/runtime-rsc': - specifier: 2.13.4-canary.3402 - version: 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + specifier: 2.14.0 + version: 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) express: specifier: ^4.21.2 version: 4.21.2 @@ -1256,6 +1259,12 @@ importers: '@biomejs/biome': specifier: ^1.9.4 version: 1.9.4 + '@parcel/packager-react-static': + specifier: 2.14.0 + version: 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/transformer-react-static': + specifier: 2.14.0 + version: 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) '@types/express': specifier: ^5.0.0 version: 5.0.0 @@ -1281,8 +1290,8 @@ importers: specifier: ^3.1.0 version: 3.3.0 parcel: - specifier: 2.0.0-canary.1777 - version: 2.0.0-canary.1777(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) + specifier: 2.14.0 + version: 2.14.0(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) path-browserify: specifier: ^1.0.0 version: 1.0.1 @@ -3634,235 +3643,248 @@ packages: '@open-draft/until@1.0.3': resolution: {integrity: sha512-Aq58f5HiWdyDlFffbbSjAlv596h/cOnt2DO1w3DOC7OJ5EHs0hd/nycJfiu9RJbT6Yk6F1knnRRXNSpxoIVZ9Q==} - '@parcel/bundler-default@2.0.0-canary.1779': - resolution: {integrity: sha512-1ArMD7Ov3eTRUyPRj4ki3msaoqaNXVuVvCPs/fM8UO6LlLUh8J1m3559WWQVti50ji8noE6/W6ZuN4FGtbYe5g==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/bundler-default@2.14.0': + resolution: {integrity: sha512-MRPPFCoKm0/aUTJWR/22qiKEmn/D+8iJw7ex3jlSJQ613YktL3bhkB4BO8/BCDte0Jp65/rU6QfVQ8UZi8/gNA==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/cache@2.0.0-canary.1779': - resolution: {integrity: sha512-N5lhFIeplMZQMZeSa63lUq+OR99rADKFU3CG3AOLtfW3HzgL05LlMJvUhjvlSO67/40lX3CcMcltqHHEMgyQXA==} + '@parcel/cache@2.14.0': + resolution: {integrity: sha512-XkkEwCZ9W6BercNQ8JMgxJJnzSBhp9u8H1EKd91C14B83fpO8SOd8Y8lJ0BKhljVU+qwZjKnyxHa4Tx+vzFbfg==} engines: {node: '>= 16.0.0'} peerDependencies: - '@parcel/core': ^2.0.0-canary.1777+d6a4df370 + '@parcel/core': ^2.14.0 - '@parcel/codeframe@2.0.0-canary.1779': - resolution: {integrity: sha512-+GjVEZId3DRLIiqZtnh7xCtwBtnDutqhty50m7zrRpR03Y9uD+vwrdgJ7GyFIk+qVMRHY7bsp8ET054Q+BGleg==} + '@parcel/codeframe@2.14.0': + resolution: {integrity: sha512-WLG6d/6Pm7zk6V+DmOLTE/T9g1kfsmTZTVfPGJwRIF29ZRKGBLNX/FZvlHEg0g7gZtRHNHF/NGu9EMlJhTRasQ==} engines: {node: '>= 16.0.0'} - '@parcel/compressor-raw@2.13.4-canary.3402': - resolution: {integrity: sha512-j1rYTRuxbnBKsgNX0Qjn3T8L6MHNA8XG53lWrQhHD6s7/6gJT5tn/yJMKjwlxdF23r8sUZhjzFEnRsm9YxTXRQ==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/compressor-raw@2.14.0': + resolution: {integrity: sha512-6zjYgB5t0jTlp+h4BTJ3aouLEGmwD2NaE2GAD/vC0owfEy2c5syPTrp5KuZ3vBx6X9hukJFPXtb6kmxdp0Vbcw==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/config-default@2.0.0-canary.1779': - resolution: {integrity: sha512-4Grhn44qtBAK2+kaQ6yJtAny1zZqGbv34WhDqDsthl56N81VtAgmwqCaadAMsT+vf0rgL8nqVGITCPMtqNWvTg==} + '@parcel/config-default@2.14.0': + resolution: {integrity: sha512-ubFryF45Xnm93Msu9IzxaEytkqBzJV/uMMwn5Z26h+MlIpRNFiRHI3M27l/9cr/GRhd6TtmdjfyEEXbIauGGiQ==} peerDependencies: - '@parcel/core': ^2.0.0-canary.1777+d6a4df370 + '@parcel/core': ^2.14.0 - '@parcel/core@2.0.0-canary.1777': - resolution: {integrity: sha512-NC9JCB++8SDk70MV7MdsOh5h3EDnX6fSDsKAY79uv4Ho35ZD4HnbFEF44atjq/v1yYfPFDO+SIE4Dj48omVAVg==} + '@parcel/core@2.14.0': + resolution: {integrity: sha512-pcmDq/cCla9Umoqxmy9VxAZ9fWh5H0u12PSGEesyLZbiECVkN+jgo9PPnBr7gwWVc1K71pGo4e5C5QpyGcyHJg==} engines: {node: '>= 16.0.0'} - '@parcel/diagnostic@2.0.0-canary.1779': - resolution: {integrity: sha512-u5j3iihaOdOeTVeZfAdLHvVisvZxNLLOiVraCxIDCyUO0l7afT4McsR/WZiQeAsUt+uGWcNNeRqngf5uYt+HZw==} + '@parcel/diagnostic@2.14.0': + resolution: {integrity: sha512-Y7sLbpWIeNqMgtB+RIcvFia6QKYCckz7CO0sSsYi9A76HQDO+poSPXAdzWZbkZbfQCeKwKbLGEpbPLfEpTXiqA==} engines: {node: '>= 16.0.0'} - '@parcel/error-overlay@2.13.4-canary.3402': - resolution: {integrity: sha512-pZ8GBmQwbO0AyFsOQ9lFkWG3YQOZAAHmHRGaZrtgtp/ayk1Pr+z+/LEadhlfaSKOF+UyZrONP2YO+GoXjZ1mqA==} + '@parcel/error-overlay@2.14.0': + resolution: {integrity: sha512-Uh6rTPChbM5/1l9PpWSWep5TbOBiHeQN4Ab2M2MEqCsVl663laYdkiL1k2foPhv7Njr8MMMf5mbT5UiT8HsLlg==} engines: {node: '>= 16.0.0'} - '@parcel/events@2.0.0-canary.1779': - resolution: {integrity: sha512-vCb7o+IP2xtndK5yg8+IKVsGDjuRN7FQ1d0RNbFBQ/2PveAjDGyNlAzJGlDtdXmb6qt3p4LEn1zGUPnhzcfYgw==} + '@parcel/events@2.14.0': + resolution: {integrity: sha512-qkO4fWnFTjp0CP5U5H7kOJ2dluNcJJ+N94lIHRmtxV2wtQi9SeLLcDIklCekRrhKaCF6QXeXUet5ANso61FVrA==} engines: {node: '>= 16.0.0'} - '@parcel/feature-flags@2.13.4-canary.3402': - resolution: {integrity: sha512-Y8nxvWT5VKD2ZurbQ9Fp9nZ0yVnqhBYITYaoplrBGqSYPzvqjhzpLOYlsF3rs1mhBudRaJ/gEds5P/CIX9ZT3A==} + '@parcel/feature-flags@2.14.0': + resolution: {integrity: sha512-SzoIz7SjwVmS2BIUJeDM/me1rYaZzN1uLrr8KHvoJldTO484gQzlnRhN+pk5BTaHW5Jrg8oob2LQWBv9kymphg==} engines: {node: '>= 16.0.0'} - '@parcel/fs@2.0.0-canary.1779': - resolution: {integrity: sha512-UfgoaGgXTEd7XF2MKBP8hMRjnfXa/EzSPGkh+1ZydfE1Uj9zhkSj8k1sVAnc+0RJcSTd91pcI3YA4y+/3u9+tA==} + '@parcel/fs@2.14.0': + resolution: {integrity: sha512-r10003gyxvW1Qn/LTiNS2oCNPv22nLUW7dJIEEZb/0v8UNbzrZhVB7s+iBok2CNBg3AFPMi6W10jqnvkjOBB9Q==} engines: {node: '>= 16.0.0'} peerDependencies: - '@parcel/core': ^2.0.0-canary.1777+d6a4df370 + '@parcel/core': ^2.14.0 - '@parcel/graph@3.3.4-canary.3402': - resolution: {integrity: sha512-5DMqaCFL2R4yy5G2FDFmlJ0hOmbrQ12FRiw4f3hXmLnj9mUOsArGIyWnwlS4kRpVaSiEV3gTHqPsTjjYcBYBCQ==} + '@parcel/graph@3.4.0': + resolution: {integrity: sha512-S9kVoFmh9jlMO8XJS2Br4fW/hhLc1mKXSXKMrIQe5dqf7z9l3a0sl+dY9KJ0KFuiYKOxqhgWCuqj/nMvD+CZrA==} engines: {node: '>= 16.0.0'} - '@parcel/logger@2.0.0-canary.1779': - resolution: {integrity: sha512-MikuQupiNd1OkAsM30OHvGZ2ggsH/g5RXLO7LMOWf3SFCIjQpJt0wQcDqOZEkrhmtKcJn00pP/zW8iLD6FbQ5A==} + '@parcel/logger@2.14.0': + resolution: {integrity: sha512-dtWVz8oKVOpW1s013wDH8G2C8sv8ZuJ2JgTJHMV4sPPfX0KMHx04x0L8+JMmmo4mvjtrAy/lTKXh/yq2tvZnbA==} engines: {node: '>= 16.0.0'} - '@parcel/markdown-ansi@2.0.0-canary.1779': - resolution: {integrity: sha512-QR87Q5noaCuUFmHgjW2vWaW6TSZThLIWCf0Q+r7aAv/Wx8ZdwZJuY8EYtMVkFfNONmF+x6xZBXyflexhlNbTkg==} + '@parcel/markdown-ansi@2.14.0': + resolution: {integrity: sha512-6HlvNAwyBtbyI0A5BnU51Y+4gJEra7p8gKemCw5zU4cph4I822jkurAedQ6ffrDK7vFRSXBvY1Ab524rN9BfEQ==} engines: {node: '>= 16.0.0'} - '@parcel/namer-default@2.0.0-canary.1779': - resolution: {integrity: sha512-amBbywKlq27odaOXucaoJL838bAGOIz5rMsmFD/L0UWDZnLoHSGpftCAMBPD4qONaKlQ1ahqP14JsTJFhZJt4A==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/namer-default@2.14.0': + resolution: {integrity: sha512-jlKfS1k/xOwI5FyZB4Tw3J4clFj2RTjn/ZKgjNSfvjSMoAn05SOL9MJ1Po7p7b4W/FKV4fWgvh5UchRX8hasZw==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/node-resolver-core@3.4.4-canary.3402': - resolution: {integrity: sha512-F1mNOZqVTjk4dgvqvRBpzlKMtFynbXeXUWULpvzwre6zo1jupThtLwVSdNbLc/Mt9hDuR179kcAIldYMLNKOxQ==} + '@parcel/node-resolver-core@3.5.0': + resolution: {integrity: sha512-c6yWNh24k8F5+rgp1ekCKJ5Ftb8D4kl+1CzuWr6Yghcg+0hytwhNORrUsH4cp9yI/st13FcHUZTzRlllF47RQg==} engines: {node: '>= 16.0.0'} - '@parcel/optimizer-css@2.13.4-canary.3402': - resolution: {integrity: sha512-YYjLhWkWnmc0xTfSPjXkNIO47vhYSn95rqcZ1fYM21MSZYikxpVU9yw6hgKr0wUqlfp3ZtDeI61mmAS7qs3Gng==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/optimizer-css@2.14.0': + resolution: {integrity: sha512-Z0n8zKalRJyZWk0Td3Ki+73+RVnRr8TLdRguEgSmAF4Dqh14267OSkZBm9GwPb7MgVRCy/XS5xw4YGTZmdrDyw==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/optimizer-htmlnano@2.0.0-canary.1779': - resolution: {integrity: sha512-S84jC3xzmC9SK2na6mAridV7dXnrncoE+ObBvrtQDi6u3rzwjLvb/BJwBLC+tBuDwZZgx2a0r/mEestO7IjbKQ==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/optimizer-htmlnano@2.14.0': + resolution: {integrity: sha512-/VwHAxNF+9aLB8ehzL2rv6hKpOMQhYPU0KjTeBflgAWQMXAtdQknjBCXvzlXDc9hDJAewzQIRCUEg4MM6ZeKWQ==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/optimizer-image@2.13.4-canary.3402': - resolution: {integrity: sha512-BZt5rBlW5hrDx4oqKU4w8YCFXGYkelCknGr8SpZu2WL+TQmgzDNZpx6dI6H4DIgw9J6DXbLHSWT+K+2MzVlyAA==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/optimizer-image@2.14.0': + resolution: {integrity: sha512-XAwStyaLwUFUC8z/jrOXKTVGiVMZlokPI9A1yEJlnnXaI8SeARztVHz5ZBzLasSfOwBQCZqSukT+ZWTi/oJoGA==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} peerDependencies: - '@parcel/core': ^2.0.0-canary.1777+d6a4df370 + '@parcel/core': ^2.14.0 - '@parcel/optimizer-svgo@2.13.4-canary.3402': - resolution: {integrity: sha512-DcoTEaMucMgGbotheklVX+/8xvmLNvCbun2BklAOH3cBlMR3n0SXVyLuBteDL9A6nDzIAFI0NVoY6oa/Th7lhg==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/optimizer-svgo@2.14.0': + resolution: {integrity: sha512-EREtUqfqlvNTaNoO8AqhLYlyU65nhymgoCVPsLntb8azuUJfpBKN/AOTAV9bqLdsfeQal40d30T9OekO+sVUXQ==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/optimizer-swc@2.13.4-canary.3402': - resolution: {integrity: sha512-FyT+fFPIZ7Eg06nUWWroLiGoc/iQZbLNvHwnWL1hMYLmCxF1bPURThsWfAaXMA4kRJZcQpG9u6VjWAknClOQNA==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/optimizer-swc@2.14.0': + resolution: {integrity: sha512-IfwdEFlDw4uhuSNTtBLSfpoX0pYTz+QlofIQwkwqeBUdOJuPATPAM5c7UKNAlhON68rWuFkeprgLPKEFKGLqUQ==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/package-manager@2.0.0-canary.1779': - resolution: {integrity: sha512-4AJqcoDYWd4tzKnCEKswah57uLHIQ5PenMNCMmGE3cKB5r63vol/GV7bd04bndj0djVWxrDIXwfO8NjvB/Kinw==} + '@parcel/package-manager@2.14.0': + resolution: {integrity: sha512-raaAD51TrE1leeAL/FmonEEr9srpOo/1rvMf855iHfmArdARRDXAS8eh90G5+KrrxtC8O1fTxjdZJ98xAiKFUg==} engines: {node: '>= 16.0.0'} peerDependencies: - '@parcel/core': ^2.0.0-canary.1777+d6a4df370 + '@parcel/core': ^2.14.0 + + '@parcel/packager-css@2.14.0': + resolution: {integrity: sha512-5LbVo/mNFbCnD5kZegCQdLRJQqElJjBc5xzQs6ZZXoTpSEBZKGJkkIckK634ARgVgIt3CTCAB90DD3PPOwi58g==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/packager-css@2.0.0-canary.1779': - resolution: {integrity: sha512-yrKkFR+BwoWd8yS5w87dvZZMW90HdCwyL/GHRnID8uBPq8fgF5nWJojFuD7q1BSAxOtRrYkzV0rWw1T5cBc3WQ==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/packager-html@2.14.0': + resolution: {integrity: sha512-ln6kbAZpo+Q+JNIZ55H/aBc66uBV/8021YttS61/DoW35he/XmMOBPziNce9obDHYzyQSJPx+6ACSg6zebkE/Q==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/packager-html@2.0.0-canary.1779': - resolution: {integrity: sha512-QPdfaqjHN0whzTfpPJFoHvhNhfAnFVaYW813uCYFTo09q24cpRaV5m2XW5z4FQOkvoFuSRsTXWQAJDM43EnVVw==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/packager-js@2.14.0': + resolution: {integrity: sha512-gYqXIZNglwQCdkzcMM5KpKYApGCnZsV9+AM467IwAR073xDXWUJjJ28CKSXXCfickgB0VwRPivn2x/DhfCUKAg==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/packager-js@2.0.0-canary.1779': - resolution: {integrity: sha512-OOYQ0cdx9zjZzBpcnb8HhO0PmxLDVtck6X0Eifq8HGOfB4G7yzzDN3dtdAtPtuP/6OpG6sH++b1QnbS2ONP3AA==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/packager-raw@2.14.0': + resolution: {integrity: sha512-FShIKhExsfTNjKXJ73yKc7C4yk2cKZe2scaiVnDTUoPVaXeoU/OKOSixbI0krUrGh7KwEZ1pEJvXrEp7B+Sf/Q==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/packager-raw@2.0.0-canary.1779': - resolution: {integrity: sha512-z9w6N+Fo3tApZK+tZb3ewyHRCn+WzLKOuicp9WAgUzj6URs+q3LCtnfoKJjhD0SM+1GaykuoDNmLEcThi7ByTA==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/packager-react-static@2.14.0': + resolution: {integrity: sha512-wL00/d3FI0Sz7U1JF5BlZiHIaiGViT24DhSID12jlmI58NUQxbblxR8ln60Q6boUt9Ulr4H1V24Z3DEQdUYuLA==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/packager-svg@2.13.4-canary.3402': - resolution: {integrity: sha512-6VXQByd+YuNNqAQBUVj5dA9W72vaH1JIKmuSiWyQSO1LuQiaW0injV5Zhdx1mxO5JB0aT4+/LhnVvmGwJaOxww==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/packager-svg@2.14.0': + resolution: {integrity: sha512-ee7lbAg0rpjIKLEYM/hKgG8xt0P3ZWNfQb3QDnw3yIdp0kDADQbiswyKJEUDslBE4+Y4HxonSN48zK3UKleYGg==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/packager-wasm@2.13.4-canary.3402': - resolution: {integrity: sha512-e4UY662sKYMLuN7LJ8O5reyfQ7t+bqvDnJjQuT3h6OntFDgLUNYtdxuo0e/h9mTuGLtgvEgvwwAcuz3kH+LfRw==} - engines: {node: '>=16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/packager-wasm@2.14.0': + resolution: {integrity: sha512-OydfRDqJCeHVsblcPC11yUn2mrDzkp4HrD1QO2CT89nQbLvUFGKHDsP2VaXAAvuSRLFB46Dqa5ocCNdAHC8DZw==} + engines: {node: '>=16.0.0', parcel: ^2.14.0} - '@parcel/plugin@2.0.0-canary.1779': - resolution: {integrity: sha512-u9D0OhpWXy77UMJKpQS++Mdgb/nLDpD29y83ki/pxEA7pOLPMnQB7/j9f4+CBj7v3SdcaTuzKTKACOIaTGMXnQ==} + '@parcel/plugin@2.14.0': + resolution: {integrity: sha512-vlrxyErfpGcMyaEADi4EYCmV8T5RsiyhtzZKwUiLwNzfXTV0oICNzOAmVUoE42pcY70XtH1f/TWdN9dOKd3LQQ==} engines: {node: '>= 16.0.0'} - '@parcel/profiler@2.13.4-canary.3402': - resolution: {integrity: sha512-TrRyfij6Y6QHHX+ZaMvjkW3lIQYeoGRnVBTkbkXBzxBdGVgYbH+8KtW/PhCsJHwDIE51HuSDFQ1lSr2m1NXhQg==} + '@parcel/profiler@2.14.0': + resolution: {integrity: sha512-iRldBix80/zq1HWkGP3xAyN73n9i40oxNso3C4spx3xw+iQdJ3/+UG+tJXk21IZhjLx6Gze2fu/Mqgr3egxndw==} engines: {node: '>= 16.0.0'} - '@parcel/reporter-cli@2.0.0-canary.1779': - resolution: {integrity: sha512-NeVnlJgRXCaHOVttrP8Wja5be/FNgkXcAnEp3Z3yFGTzsWcSp5xTZRz4C1pe7KFJFT+01958ED72q8B7OTuJug==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/reporter-cli@2.14.0': + resolution: {integrity: sha512-WMrzOb7ZAuCWm7TR5gZ9Ey+TAXdlFcJVu4DjNK7AB8zIG8U6vYr0//JWRuduMGSbDSiKvLa7+9MVobwughkk0A==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/reporter-dev-server@2.0.0-canary.1779': - resolution: {integrity: sha512-Jk+ze98KecLc2SwCf21cCRYyk6m6uDeJcirkTjqBE2Ry4mCztNRNKYEVPfIeaEmNEymvIBWc1BKUPz1Kr4qyOg==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/reporter-dev-server@2.14.0': + resolution: {integrity: sha512-qBcvF6602xgO1mXr5TZcz+a3332PqaF/W/NV4Be/XEnp+eUdIhMXN2sFKhB5X7suSIeDrSzowB5KGACwzW5wVg==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/reporter-tracer@2.13.4-canary.3402': - resolution: {integrity: sha512-mbd2rkcjTnNANg0Rd3dss3OU0BqyjmClFW+ZAUp13by6CG2iEcVM20zRQeIHF0hqrbLIw0H5DhZwABJCdS5ylg==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/reporter-tracer@2.14.0': + resolution: {integrity: sha512-aSkkADkfKL5BRcgZ1ZNE/RIGcSD+YG57g61DfPYQdWQNwAjdusAtXH/94X5OkyylF2tfa1pdkXy934W/auoalQ==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/resolver-default@2.0.0-canary.1779': - resolution: {integrity: sha512-uZImvm9V+W2AJ/FLxgiMm1d3QBAMW5sibZ/L0UK4h+RwvB7+yge4bL1y9ak00L590sWa05UaU5mp209/CHucgA==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/resolver-default@2.14.0': + resolution: {integrity: sha512-MnkWE1NUA/V5qNSAYNF2zchiGcGngoY6tBa0ZEGZ6REojpjRAPW6Udya2/O3/7sPZh9wBytEGkaC2bpCtXij9w==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/runtime-browser-hmr@2.0.0-canary.1779': - resolution: {integrity: sha512-dzldU4gRob2Q1wEYYdmsFnQjKo0QVV4crXMtxdfjgCVjHRZOWlDziegCfKiRiOmbprEGlCNI+W3ceHRSGaON1Q==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/runtime-browser-hmr@2.14.0': + resolution: {integrity: sha512-dbME8ZOvgQZSMtpTzQUinhLNxi2CJKqRKEG28TnNfsyVa0MoYLR/TN4Q2RU/SRuQyhddmUN0bSWasn9Yu+dXVQ==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/runtime-js@2.0.0-canary.1779': - resolution: {integrity: sha512-PS7mmHPEsXgMPrBkxjTyO/tjKW/H7kv4nN1Nwow4Aof4/iF06t4Jbfl88nx7x3GLpOV8HPlqY1GLbwYRdLs2nA==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/runtime-js@2.14.0': + resolution: {integrity: sha512-k3+T2Rqbjg/0+3NPFVReEyu3CcjLHZWWmcDyAwuoRJb8H3XVfUbrTB18svN8Y99Rq+x+DEX3gLzsW++v/POSUA==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/runtime-rsc@2.13.4-canary.3402': - resolution: {integrity: sha512-sXr6V+lnrbWI4onmYjEmalAFRBckSEFbFDlCvubm+sWXalzxIP4yfSs/Q86Qq9IJTGlUMXkTafl2u7JZRg0qbA==} - engines: {node: '>= 12.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/runtime-rsc@2.14.0': + resolution: {integrity: sha512-BsvO5N0e8sprXA+LoJGeQkegH0oZ55Dlg+5Nx5lkTV920Ucei1IuwaUydcYBVgWbFt+o337CJP8Qbv5/7+yLtQ==} + engines: {node: '>= 12.0.0', parcel: ^2.14.0} - '@parcel/runtime-service-worker@2.13.4-canary.3402': - resolution: {integrity: sha512-lwAZUFsL8fpm/ZhlDmmxUvyjbMXg0DIqxQEuvfjsO7zHpDBdr4Jlg8s0G0NXIWN8G60cr5kw97nN4ANDeD9XaA==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/runtime-service-worker@2.14.0': + resolution: {integrity: sha512-WuYrpjoE6DPl6oWaSf3W3sgTa7JiSZ7fosQE89HxNC4rLaeOMjfBiOazhcVoi5qfAJwitIoONJD1IaO3qwP3AA==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/rust@2.13.4-canary.3402': - resolution: {integrity: sha512-ghMDyBXOl+2FV8mHHzqeOTmkqT/GjpFRwR5eANhkxicR48j7oQUmslJS9NBb0NnYxLVcbleZbAXWB3+YcpVAyA==} + '@parcel/rust@2.14.0': + resolution: {integrity: sha512-KIyUxZCLFkyqTn5NXDwXJidT0IZRb1f4kQRLPNfvObW1bwpZmNF9pSXr1rzRAfBvWtF9C/VFLc37AzcVKDti9Q==} engines: {node: '>= 16.0.0'} + peerDependencies: + napi-wasm: ^1.1.2 + peerDependenciesMeta: + napi-wasm: + optional: true '@parcel/source-map@2.1.1': resolution: {integrity: sha512-Ejx1P/mj+kMjQb8/y5XxDUn4reGdr+WyKYloBljpppUy8gs42T+BNoEOuRYqDVdgPc6NxduzIDoJS9pOFfV5Ew==} engines: {node: ^12.18.3 || >=14} - '@parcel/transformer-babel@2.0.0-canary.1779': - resolution: {integrity: sha512-bDMVODv6ogXtaeGQ+S7Lq857nhXqSPfYfBQmK2AvczchcJxs9B52Y2MI4heKG0B+qNifzSHcvegJwO+rv8HOtA==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/transformer-babel@2.14.0': + resolution: {integrity: sha512-K0SFVLhEVd5jglwps7MGhnwXnmhT6GBHMOmrVYf+xgJs5md8QN/i5GGfnbDJZEA+YStSda8ZaWR6jfCZGZxa2Q==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/transformer-css@2.0.0-canary.1779': - resolution: {integrity: sha512-22Y3XxPvo6ov+u5w/8+aoMCllJ6ApxoeSjbIyOvsmhYPZeHZbxIJ/2GtZJ4kaXrANCCUBwfV4B8mCTlsWe0GhA==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/transformer-css@2.14.0': + resolution: {integrity: sha512-Tsl9uDTaGL/2n+YfYc1n77D95eBVG7EE1dawUxRPPWgtM3CRb+loToLuCezDrh9qaKiX0FY4AyxdYhKXLsxYHw==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/transformer-html@2.0.0-canary.1779': - resolution: {integrity: sha512-jJ/75i0Ak+6nUu5L1YqCbLS/gBnaH86DXmCvfdxcjXlaQjaVzhbfRyHcGKqRsvM2zFO/7+7PGZ8cBFCbRAty9w==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/transformer-html@2.14.0': + resolution: {integrity: sha512-mAk9p/zxIOXMWmi7zdbDxG3YchK8HMMQ3L5l4VD41J5K3VQ/B8nnEqRRhAvtEl+nBbU1psIgcsOg+jkrevDikA==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/transformer-image@2.13.4-canary.3402': - resolution: {integrity: sha512-NpvRxaftesjov3iiykDNQxFInW9Ovpua5QgE6cBu+veM1PXZBzfacjyLaL+FEnGftSFoiGe0NP4MW8xNGZIdmw==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/transformer-image@2.14.0': + resolution: {integrity: sha512-TE/Gtz4GU+PtA/dGGbQbUGVAG/0XZwFcTZKP9kLZGnREAtMPTKfeIirum6Nn8IS/Xx5nWI52GpsmyYZXEm/T8g==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} peerDependencies: - '@parcel/core': ^2.0.0-canary.1777+d6a4df370 + '@parcel/core': ^2.14.0 - '@parcel/transformer-js@2.0.0-canary.1779': - resolution: {integrity: sha512-GSc6nVN511+Q0bCjWmucan43/9DJi6fKQEEqCIe2Fl/tG2i7R8gnf/ax0AJTDTHsIbULPDviVqUZVIrNyJilng==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/transformer-js@2.14.0': + resolution: {integrity: sha512-4acYA9uQ89Zz86+YHXk0m8Aq0FeYc4p0T8ODUiUbzofMKHhDmVKNzdIUYshCEcEdDfujdn472OmM7A4NPEfiEA==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} peerDependencies: - '@parcel/core': ^2.0.0-canary.1777+d6a4df370 + '@parcel/core': ^2.14.0 - '@parcel/transformer-json@2.0.0-canary.1779': - resolution: {integrity: sha512-eFpSC+AXIAaNq3/E5C/1PMfyA0XSnB/8nJwppXvdDFF72wB0mDCcdjDuvEoi91JlpRMoihSyA862mi+udb8q5Q==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/transformer-json@2.14.0': + resolution: {integrity: sha512-QnpJmdmnR/s9K5Jvpc+PDLWvy5JSjS7EqsVEp2YQV+xoO3SpT9BWh5kuFvtMPmWQubyiJrhmgpFhohw/t3bd0g==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/transformer-node@2.13.4-canary.3402': - resolution: {integrity: sha512-1xhaeJvWqbTtoz/r+rFIqz1OqfOn9ipH6vEb/ZumeWAc3DFaoNAcrZkqR3hlMnVRBbB1Ag4rPHSynqYROK0xnQ==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/transformer-node@2.14.0': + resolution: {integrity: sha512-AXTfC+U60AdTNsoaKBaxOdnY1B7XIqsBisdQDXzOtdb7xmYBvOVK4PmQPD7AUPVIg8uk0lmoBp9p/c1woh4rgQ==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/transformer-postcss@2.0.0-canary.1779': - resolution: {integrity: sha512-dc1NT21zYDujhTNGJeTxhj06p3VnGxxfsqD0xhZNKcbRH+ER6mC6WDarQEZyMqj2xrCSdqrUm1EAsWrxwgzm+A==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/transformer-postcss@2.14.0': + resolution: {integrity: sha512-ih5SM7YB8evNe/zOPauWrh8TGIYw4qdyKrMNLiSN5mGeWkBkVWaf8bM68GeLWtOkToFxue885Mjz+aJ2M7Jyuw==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/transformer-posthtml@2.0.0-canary.1779': - resolution: {integrity: sha512-9sdqH8N0bB0l0+u2uuLNTPPZth7L1m4kR+k+UujPlNjsApRzYrcwQTOGB4LgmF2BGtldzLIsm8s4Nfd/yuRGVw==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/transformer-posthtml@2.14.0': + resolution: {integrity: sha512-NhE4o67rRkhW1k/IYI8RivXjuIHMBhC6gcHFT96P4LfuMerJb5YzcKPE59XmfMjH4Ndr4nQaZmVN0NgptqNiAg==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/transformer-raw@2.0.0-canary.1779': - resolution: {integrity: sha512-FyQXX3ya8b610BLM7R9/A07dbk3aXigHYgjue3BqUigYm/f4zVwyfwXt/Rmk4eJ0anCsVTrLse5dVfOu8YpVQg==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/transformer-raw@2.14.0': + resolution: {integrity: sha512-Q0xYqHt5uQx/Lw/w5G91RF4g3hRKN1/lmIyGOVyBvElY6pYvkTSI6wz5VoXwOc1aMpffQTWUqLqifgBy9rZ0OA==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/transformer-react-refresh-wrap@2.0.0-canary.1779': - resolution: {integrity: sha512-fr92QZUitx1JhxNhSRYUkMu38NMwgYoN+X/ATHsJkbfwBb8AXtj7G0FJy6HmdjG5gPTqPvoBHRNXWTibCi8iUA==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/transformer-react-refresh-wrap@2.14.0': + resolution: {integrity: sha512-wy2INSD4tHUSkGnIb/X0rl94X0gV23oaOBvOswUvT1EjyfRJ4em+LaZYVnoZJOqwHIFUBrUaMThy4a7jNiwSog==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/transformer-svg@2.13.4-canary.3402': - resolution: {integrity: sha512-50eQefPx9DZmtRq6AOy+GDxk0GDYWpRjba85AgrkptGZsYK/M1oM6vU8M64Vw8qfZG3kdHPvIBEhgcpDbyEdiw==} - engines: {node: '>= 16.0.0', parcel: ^2.0.0-canary.1777+d6a4df370} + '@parcel/transformer-react-static@2.14.0': + resolution: {integrity: sha512-Ol/Bk7GYdb02jEN5tldFVem9ronQRN4Nw6oHjeltRoa3Mq+XVWMy4H2PgeGTzan676xgwrcApHDzgI6YvFw0vA==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/types-internal@2.13.4-canary.3402': - resolution: {integrity: sha512-E6hvTwWEQJzE+EuzKtfhcXumVe8Slf0kCDq4K1tQrX5sWmyVCJ74X4+kI8FaCy1VaonTkNpTxbKLPO81EBv7KQ==} + '@parcel/transformer-svg@2.14.0': + resolution: {integrity: sha512-T9unNRjjvXwO1/wIZbxBXU0ufRsVE2bb9cJgno0314liZFybAioXLNXZ7z8/mB1YAgVcHd1HPLjE+2X7y1wRfg==} + engines: {node: '>= 16.0.0', parcel: ^2.14.0} - '@parcel/types@2.0.0-canary.1779': - resolution: {integrity: sha512-bJr5W5WbPoyBuCN/7tC+7bjS8wvJYlLdATorvXlFSygta0KwdvhY7HhGAwCYYaKBIkmr0d4/qPvthIle7qnwVA==} + '@parcel/types-internal@2.14.0': + resolution: {integrity: sha512-JffGtI9dk4P0FyxVeKdm6PCEWVW4Z/3Q0CLEaXhG67pFz4j15pdqtdzQ3Xf42HIWW+jOZ4KFtDwbtF5+n+1lwA==} - '@parcel/utils@2.0.0-canary.1779': - resolution: {integrity: sha512-RGJx5T7dji0A8ErgkM7un4iqHF+9SCrtx3VE/dv16b0HLbJyLgCeZWH7osNknA/U7GSs/VJODvgdsV1Y9ktK9g==} + '@parcel/types@2.14.0': + resolution: {integrity: sha512-w5gqSN5FQiP9Xiv1DeCtr7Z+y3O/AhuBf38ZKQjGcxLUBFNmN2I5ulkZ2sj8xIQncYUwbYcv7TWxD/TuJJiBsA==} + + '@parcel/utils@2.14.0': + resolution: {integrity: sha512-hiXMDS2xzS/ZHqpvcoJCR4GxGLWEqd/UGB/z5wzJ6QVouhatBtYe7Ca3vQtwc/ki9JDeNZv6+QmiVqPmQWv6dA==} engines: {node: '>= 16.0.0'} '@parcel/watcher-android-arm64@2.5.1': @@ -3947,11 +3969,11 @@ packages: resolution: {integrity: sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==} engines: {node: '>= 10.0.0'} - '@parcel/workers@2.0.0-canary.1779': - resolution: {integrity: sha512-8SIZ/IX3AvHvf/6Ixd7ROdAvG2AxJSP0o2ooauEaG+caBkXo0694hKZjHF4q5lNcAqQQrTutqBG0fihiy+LrYA==} + '@parcel/workers@2.14.0': + resolution: {integrity: sha512-kte2OzI2L3lvZsJ9iu4qRmOT5fMhm6cdCS2oeAm8iN5btljrDCbjEqz35FSwfmxudIKBlfqI+89l5pnBou1Exw==} engines: {node: '>= 16.0.0'} peerDependencies: - '@parcel/core': ^2.0.0-canary.1777+d6a4df370 + '@parcel/core': ^2.14.0 '@pkgjs/parseargs@0.11.0': resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} @@ -4201,68 +4223,68 @@ packages: '@sinonjs/fake-timers@10.0.2': resolution: {integrity: sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==} - '@swc/core-darwin-arm64@1.10.18': - resolution: {integrity: sha512-FdGqzAIKVQJu8ROlnHElP59XAUsUzCFSNsou+tY/9ba+lhu8R9v0OI5wXiPErrKGZpQFMmx/BPqqhx3X4SuGNg==} + '@swc/core-darwin-arm64@1.11.11': + resolution: {integrity: sha512-vJcjGVDB8cZH7zyOkC0AfpFYI/7GHKG0NSsH3tpuKrmoAXJyCYspKPGid7FT53EAlWreN7+Pew+bukYf5j+Fmg==} engines: {node: '>=10'} cpu: [arm64] os: [darwin] - '@swc/core-darwin-x64@1.10.18': - resolution: {integrity: sha512-RZ73gZRituL/ZVLgrW6BYnQ5g8tuStG4cLUiPGJsUZpUm0ullSH6lHFvZTCBNFTfpQChG6eEhi2IdG6DwFp1lw==} + '@swc/core-darwin-x64@1.11.11': + resolution: {integrity: sha512-/N4dGdqEYvD48mCF3QBSycAbbQd3yoZ2YHSzYesQf8usNc2YpIhYqEH3sql02UsxTjEFOJSf1bxZABDdhbSl6A==} engines: {node: '>=10'} cpu: [x64] os: [darwin] - '@swc/core-linux-arm-gnueabihf@1.10.18': - resolution: {integrity: sha512-8iJqI3EkxJuuq21UHoen1VS+QlS23RvynRuk95K+Q2HBjygetztCGGEc+Xelx9a0uPkDaaAtFvds4JMDqb9SAA==} + '@swc/core-linux-arm-gnueabihf@1.11.11': + resolution: {integrity: sha512-hsBhKK+wVXdN3x9MrL5GW0yT8o9GxteE5zHAI2HJjRQel3HtW7m5Nvwaq+q8rwMf4YQRd8ydbvwl4iUOZx7i2Q==} engines: {node: '>=10'} cpu: [arm] os: [linux] - '@swc/core-linux-arm64-gnu@1.10.18': - resolution: {integrity: sha512-8f1kSktWzMB6PG+r8lOlCfXz5E8Qhsmfwonn77T/OfjvGwQaWrcoASh2cdjpk3dydbf8jsKGPQE1lSc7GyjXRQ==} + '@swc/core-linux-arm64-gnu@1.11.11': + resolution: {integrity: sha512-YOCdxsqbnn/HMPCNM6nrXUpSndLXMUssGTtzT7ffXqr7WuzRg2e170FVDVQFIkb08E7Ku5uOnnUVAChAJQbMOQ==} engines: {node: '>=10'} cpu: [arm64] os: [linux] - '@swc/core-linux-arm64-musl@1.10.18': - resolution: {integrity: sha512-4rv+E4VLdgQw6zjbTAauCAEExxChvxMpBUMCiZweTNPKbJJ2dY6BX2WGJ1ea8+RcgqR/Xysj3AFbOz1LBz6dGA==} + '@swc/core-linux-arm64-musl@1.11.11': + resolution: {integrity: sha512-nR2tfdQRRzwqR2XYw9NnBk9Fdvff/b8IiJzDL28gRR2QiJWLaE8LsRovtWrzCOYq6o5Uu9cJ3WbabWthLo4jLw==} engines: {node: '>=10'} cpu: [arm64] os: [linux] - '@swc/core-linux-x64-gnu@1.10.18': - resolution: {integrity: sha512-vTNmyRBVP+sZca+vtwygYPGTNudTU6Gl6XhaZZ7cEUTBr8xvSTgEmYXoK/2uzyXpaTUI4Bmtp1x81cGN0mMoLQ==} + '@swc/core-linux-x64-gnu@1.11.11': + resolution: {integrity: sha512-b4gBp5HA9xNWNC5gsYbdzGBJWx4vKSGybGMGOVWWuF+ynx10+0sA/o4XJGuNHm8TEDuNh9YLKf6QkIO8+GPJ1g==} engines: {node: '>=10'} cpu: [x64] os: [linux] - '@swc/core-linux-x64-musl@1.10.18': - resolution: {integrity: sha512-1TZPReKhFCeX776XaT6wegknfg+g3zODve+r4oslFHI+g7cInfWlxoGNDS3niPKyuafgCdOjme2g3OF+zzxfsQ==} + '@swc/core-linux-x64-musl@1.11.11': + resolution: {integrity: sha512-dEvqmQVswjNvMBwXNb8q5uSvhWrJLdttBSef3s6UC5oDSwOr00t3RQPzyS3n5qmGJ8UMTdPRmsopxmqaODISdg==} engines: {node: '>=10'} cpu: [x64] os: [linux] - '@swc/core-win32-arm64-msvc@1.10.18': - resolution: {integrity: sha512-o/2CsaWSN3bkzVQ6DA+BiFKSVEYvhWGA1h+wnL2zWmIDs2Knag54sOEXZkCaf8YQyZesGeXJtPEy9hh/vjJgkA==} + '@swc/core-win32-arm64-msvc@1.11.11': + resolution: {integrity: sha512-aZNZznem9WRnw2FbTqVpnclvl8Q2apOBW2B316gZK+qxbe+ktjOUnYaMhdCG3+BYggyIBDOnaJeQrXbKIMmNdw==} engines: {node: '>=10'} cpu: [arm64] os: [win32] - '@swc/core-win32-ia32-msvc@1.10.18': - resolution: {integrity: sha512-eTPASeJtk4mJDfWiYEiOC6OYUi/N7meHbNHcU8e+aKABonhXrIo/FmnTE8vsUtC6+jakT1TQBdiQ8fzJ1kJVwA==} + '@swc/core-win32-ia32-msvc@1.11.11': + resolution: {integrity: sha512-DjeJn/IfjgOddmJ8IBbWuDK53Fqw7UvOz7kyI/728CSdDYC3LXigzj3ZYs4VvyeOt+ZcQZUB2HA27edOifomGw==} engines: {node: '>=10'} cpu: [ia32] os: [win32] - '@swc/core-win32-x64-msvc@1.10.18': - resolution: {integrity: sha512-1Dud8CDBnc34wkBOboFBQud9YlV1bcIQtKSg7zC8LtwR3h+XAaCayZPkpGmmAlCv1DLQPvkF+s0JcaVC9mfffQ==} + '@swc/core-win32-x64-msvc@1.11.11': + resolution: {integrity: sha512-Gp/SLoeMtsU4n0uRoKDOlGrRC6wCfifq7bqLwSlAG8u8MyJYJCcwjg7ggm0rhLdC2vbiZ+lLVl3kkETp+JUvKg==} engines: {node: '>=10'} cpu: [x64] os: [win32] - '@swc/core@1.10.18': - resolution: {integrity: sha512-IUWKD6uQYGRy8w2X9EZrtYg1O3SCijlHbCXzMaHQYc1X7yjijQh4H3IVL9ssZZyVp2ZDfQZu4bD5DWxxvpyjvg==} + '@swc/core@1.11.11': + resolution: {integrity: sha512-pCVY2Wn6dV/labNvssk9b3Owi4WOYsapcbWm90XkIj4xH/56Z6gzja9fsU+4MdPuEfC2Smw835nZHcdCFGyX6A==} engines: {node: '>=10'} peerDependencies: '@swc/helpers': '*' @@ -4276,8 +4298,8 @@ packages: '@swc/helpers@0.5.15': resolution: {integrity: sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==} - '@swc/types@0.1.17': - resolution: {integrity: sha512-V5gRru+aD8YVyCOMAjMpWR1Ui577DD5KSJsHP8RAxopAH22jFz6GZd/qxqjO6MJHQhcsjvjOFXyDhyLQUnMveQ==} + '@swc/types@0.1.19': + resolution: {integrity: sha512-WkAZaAfj44kh/UFdAQcrMP1I0nwRqpt27u+08LMBYMqmQfwwMofYoMh/48NGkMMRfC4ynpfwRbJuu8ErfNloeA==} '@testing-library/dom@8.17.1': resolution: {integrity: sha512-KnH2MnJUzmFNPW6RIKfd+zf2Wue8mEKX0M3cpX6aKl5ZXrJM1/c/Pc8c2xDNYQCnJO48Sm5ITbMXgqTr3h4jxQ==} @@ -4795,11 +4817,6 @@ packages: resolution: {integrity: sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==} engines: {node: '>=12'} - ansi-html-community@0.0.8: - resolution: {integrity: sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==} - engines: {'0': node >= 0.8.0} - hasBin: true - ansi-regex@5.0.1: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} @@ -7922,8 +7939,8 @@ packages: pako@1.0.11: resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==} - parcel@2.0.0-canary.1777: - resolution: {integrity: sha512-PdgoJ84CcpN4ZCa/E6YsrEQ+A4ft9RVgK/UQeuUUuEDy4kU/iHMoi7FOlTmNH+HYlWvbEuRL+RM41n6sPzHwaQ==} + parcel@2.14.0: + resolution: {integrity: sha512-STnHivKaXYDOcLDXO3ScfrpgoM7UIoQk84yUj0DTMQAij6+/m2q8ItrVf2kHzxMj+UwP4JP7DbfVz9l6/K2nnQ==} engines: {node: '>= 16.0.0'} hasBin: true @@ -8510,6 +8527,9 @@ packages: rrweb-cssom@0.6.0: resolution: {integrity: sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==} + rsc-html-stream@0.0.4: + resolution: {integrity: sha512-1isiXIrlTI/vRLTvS3O4fMrO9qIHje1FSphufrIV5QfzHUgBDCZFwP9b8+rH63nbhxtcKTqfyziwM+2khfX0Uw==} + run-async@2.4.1: resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==} engines: {node: '>=0.12.0'} @@ -12044,73 +12064,78 @@ snapshots: '@open-draft/until@1.0.3': {} - '@parcel/bundler-default@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/bundler-default@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/graph': 3.3.4-canary.3402 - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/rust': 2.13.4-canary.3402 - '@parcel/utils': 2.0.0-canary.1779 + '@parcel/diagnostic': 2.14.0 + '@parcel/graph': 3.4.0 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/rust': 2.14.0 + '@parcel/utils': 2.14.0 nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/cache@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/cache@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/core': 2.0.0-canary.1777(@swc/helpers@0.5.15) - '@parcel/fs': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/logger': 2.0.0-canary.1779 - '@parcel/utils': 2.0.0-canary.1779 + '@parcel/core': 2.14.0(@swc/helpers@0.5.15) + '@parcel/fs': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/logger': 2.14.0 + '@parcel/utils': 2.14.0 lmdb: 2.8.5 + transitivePeerDependencies: + - napi-wasm - '@parcel/codeframe@2.0.0-canary.1779': + '@parcel/codeframe@2.14.0': dependencies: chalk: 4.1.2 - '@parcel/compressor-raw@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/compressor-raw@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) transitivePeerDependencies: - '@parcel/core' - - '@parcel/config-default@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5)': - dependencies: - '@parcel/bundler-default': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/compressor-raw': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/core': 2.0.0-canary.1777(@swc/helpers@0.5.15) - '@parcel/namer-default': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/optimizer-css': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/optimizer-htmlnano': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) - '@parcel/optimizer-image': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/optimizer-svgo': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/optimizer-swc': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) - '@parcel/packager-css': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/packager-html': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/packager-js': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/packager-raw': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/packager-svg': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/packager-wasm': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/reporter-dev-server': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/resolver-default': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/runtime-browser-hmr': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/runtime-js': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/runtime-rsc': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/runtime-service-worker': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/transformer-babel': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/transformer-css': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/transformer-html': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/transformer-image': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/transformer-js': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/transformer-json': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/transformer-node': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/transformer-postcss': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/transformer-posthtml': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/transformer-raw': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/transformer-react-refresh-wrap': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/transformer-svg': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + - napi-wasm + + '@parcel/config-default@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5)': + dependencies: + '@parcel/bundler-default': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/compressor-raw': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/core': 2.14.0(@swc/helpers@0.5.15) + '@parcel/namer-default': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/optimizer-css': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/optimizer-htmlnano': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) + '@parcel/optimizer-image': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/optimizer-svgo': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/optimizer-swc': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) + '@parcel/packager-css': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/packager-html': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/packager-js': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/packager-raw': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/packager-svg': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/packager-wasm': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/reporter-dev-server': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/resolver-default': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/runtime-browser-hmr': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/runtime-js': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/runtime-rsc': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/runtime-service-worker': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/transformer-babel': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/transformer-css': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/transformer-html': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/transformer-image': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/transformer-js': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/transformer-json': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/transformer-node': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/transformer-postcss': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/transformer-posthtml': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/transformer-raw': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/transformer-react-refresh-wrap': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/transformer-svg': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) transitivePeerDependencies: - '@swc/helpers' - cssnano + - napi-wasm - postcss - purgecss - relateurl @@ -12120,118 +12145,121 @@ snapshots: - typescript - uncss - '@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)': + '@parcel/core@2.14.0(@swc/helpers@0.5.15)': dependencies: '@mischnic/json-sourcemap': 0.1.1 - '@parcel/cache': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/events': 2.0.0-canary.1779 - '@parcel/feature-flags': 2.13.4-canary.3402 - '@parcel/fs': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/graph': 3.3.4-canary.3402 - '@parcel/logger': 2.0.0-canary.1779 - '@parcel/package-manager': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/profiler': 2.13.4-canary.3402 - '@parcel/rust': 2.13.4-canary.3402 + '@parcel/cache': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/diagnostic': 2.14.0 + '@parcel/events': 2.14.0 + '@parcel/feature-flags': 2.14.0 + '@parcel/fs': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/graph': 3.4.0 + '@parcel/logger': 2.14.0 + '@parcel/package-manager': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/profiler': 2.14.0 + '@parcel/rust': 2.14.0 '@parcel/source-map': 2.1.1 - '@parcel/types': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/utils': 2.0.0-canary.1779 - '@parcel/workers': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/types': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.0 + '@parcel/workers': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) base-x: 3.0.10 - browserslist: 4.23.0 + browserslist: 4.24.4 clone: 2.1.2 dotenv: 16.4.5 dotenv-expand: 11.0.7 json5: 2.2.3 msgpackr: 1.11.2 nullthrows: 1.1.1 - semver: 7.5.4 + semver: 7.7.1 transitivePeerDependencies: - '@swc/helpers' + - napi-wasm - '@parcel/diagnostic@2.0.0-canary.1779': + '@parcel/diagnostic@2.14.0': dependencies: '@mischnic/json-sourcemap': 0.1.1 nullthrows: 1.1.1 - '@parcel/error-overlay@2.13.4-canary.3402': - dependencies: - ansi-html-community: 0.0.8 - react: 0.0.0-experimental-93b58361-20250209 - react-dom: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) + '@parcel/error-overlay@2.14.0': {} - '@parcel/events@2.0.0-canary.1779': {} + '@parcel/events@2.14.0': {} - '@parcel/feature-flags@2.13.4-canary.3402': {} + '@parcel/feature-flags@2.14.0': {} - '@parcel/fs@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/fs@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/core': 2.0.0-canary.1777(@swc/helpers@0.5.15) - '@parcel/feature-flags': 2.13.4-canary.3402 - '@parcel/rust': 2.13.4-canary.3402 - '@parcel/types-internal': 2.13.4-canary.3402 - '@parcel/utils': 2.0.0-canary.1779 + '@parcel/core': 2.14.0(@swc/helpers@0.5.15) + '@parcel/feature-flags': 2.14.0 + '@parcel/rust': 2.14.0 + '@parcel/types-internal': 2.14.0 + '@parcel/utils': 2.14.0 '@parcel/watcher': 2.5.1 - '@parcel/workers': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/workers': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + transitivePeerDependencies: + - napi-wasm - '@parcel/graph@3.3.4-canary.3402': + '@parcel/graph@3.4.0': dependencies: - '@parcel/feature-flags': 2.13.4-canary.3402 + '@parcel/feature-flags': 2.14.0 nullthrows: 1.1.1 - '@parcel/logger@2.0.0-canary.1779': + '@parcel/logger@2.14.0': dependencies: - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/events': 2.0.0-canary.1779 + '@parcel/diagnostic': 2.14.0 + '@parcel/events': 2.14.0 - '@parcel/markdown-ansi@2.0.0-canary.1779': + '@parcel/markdown-ansi@2.14.0': dependencies: chalk: 4.1.2 - '@parcel/namer-default@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/namer-default@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/diagnostic': 2.14.0 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/node-resolver-core@3.4.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/node-resolver-core@3.5.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: '@mischnic/json-sourcemap': 0.1.1 - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/fs': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/rust': 2.13.4-canary.3402 - '@parcel/utils': 2.0.0-canary.1779 + '@parcel/diagnostic': 2.14.0 + '@parcel/fs': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/rust': 2.14.0 + '@parcel/utils': 2.14.0 nullthrows: 1.1.1 semver: 7.7.1 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/optimizer-css@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/optimizer-css@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/diagnostic': 2.14.0 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) '@parcel/source-map': 2.1.1 - '@parcel/utils': 2.0.0-canary.1779 - browserslist: 4.23.0 + '@parcel/utils': 2.14.0 + browserslist: 4.24.4 lightningcss: 1.29.1 nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/optimizer-htmlnano@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5)': + '@parcel/optimizer-htmlnano@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5)': dependencies: - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/utils': 2.0.0-canary.1779 + '@parcel/diagnostic': 2.14.0 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.0 htmlnano: 2.1.1(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) nullthrows: 1.1.1 posthtml: 0.16.6 transitivePeerDependencies: - '@parcel/core' - cssnano + - napi-wasm - postcss - purgecss - relateurl @@ -12241,222 +12269,257 @@ snapshots: - typescript - uncss - '@parcel/optimizer-image@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/optimizer-image@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/core': 2.0.0-canary.1777(@swc/helpers@0.5.15) - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/rust': 2.13.4-canary.3402 - '@parcel/utils': 2.0.0-canary.1779 - '@parcel/workers': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/core': 2.14.0(@swc/helpers@0.5.15) + '@parcel/diagnostic': 2.14.0 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/rust': 2.14.0 + '@parcel/utils': 2.14.0 + '@parcel/workers': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + transitivePeerDependencies: + - napi-wasm - '@parcel/optimizer-svgo@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/optimizer-svgo@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/utils': 2.0.0-canary.1779 + '@parcel/diagnostic': 2.14.0 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.0 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/optimizer-swc@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)': + '@parcel/optimizer-swc@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)': dependencies: - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/diagnostic': 2.14.0 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) '@parcel/source-map': 2.1.1 - '@parcel/utils': 2.0.0-canary.1779 - '@swc/core': 1.10.18(@swc/helpers@0.5.15) + '@parcel/utils': 2.14.0 + '@swc/core': 1.11.11(@swc/helpers@0.5.15) nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' - '@swc/helpers' - - '@parcel/package-manager@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)': - dependencies: - '@parcel/core': 2.0.0-canary.1777(@swc/helpers@0.5.15) - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/fs': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/logger': 2.0.0-canary.1779 - '@parcel/node-resolver-core': 3.4.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/types': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/utils': 2.0.0-canary.1779 - '@parcel/workers': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@swc/core': 1.10.18(@swc/helpers@0.5.15) - semver: 7.5.4 + - napi-wasm + + '@parcel/package-manager@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)': + dependencies: + '@parcel/core': 2.14.0(@swc/helpers@0.5.15) + '@parcel/diagnostic': 2.14.0 + '@parcel/fs': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/logger': 2.14.0 + '@parcel/node-resolver-core': 3.5.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/types': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.0 + '@parcel/workers': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@swc/core': 1.11.11(@swc/helpers@0.5.15) + semver: 7.7.1 transitivePeerDependencies: - '@swc/helpers' + - napi-wasm - '@parcel/packager-css@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/packager-css@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/diagnostic': 2.14.0 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) '@parcel/source-map': 2.1.1 - '@parcel/utils': 2.0.0-canary.1779 + '@parcel/utils': 2.14.0 lightningcss: 1.29.1 nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/packager-html@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/packager-html@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/types': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/utils': 2.0.0-canary.1779 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/types': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.0 nullthrows: 1.1.1 posthtml: 0.16.6 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/packager-js@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/packager-js@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/rust': 2.13.4-canary.3402 + '@parcel/diagnostic': 2.14.0 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/rust': 2.14.0 '@parcel/source-map': 2.1.1 - '@parcel/types': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/utils': 2.0.0-canary.1779 + '@parcel/types': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.0 globals: 13.24.0 nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' + - napi-wasm + + '@parcel/packager-raw@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + dependencies: + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm - '@parcel/packager-raw@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/packager-react-static@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/node-resolver-core': 3.5.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/rust': 2.14.0 + '@parcel/types': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.0 + nullthrows: 1.1.1 + rsc-html-stream: 0.0.4 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/packager-svg@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/packager-svg@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/types': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/utils': 2.0.0-canary.1779 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/types': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.0 posthtml: 0.16.6 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/packager-wasm@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/packager-wasm@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/plugin@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/plugin@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/types': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/types': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/profiler@2.13.4-canary.3402': + '@parcel/profiler@2.14.0': dependencies: - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/events': 2.0.0-canary.1779 - '@parcel/types-internal': 2.13.4-canary.3402 + '@parcel/diagnostic': 2.14.0 + '@parcel/events': 2.14.0 + '@parcel/types-internal': 2.14.0 chrome-trace-event: 1.0.4 - '@parcel/reporter-cli@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/reporter-cli@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/types': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/utils': 2.0.0-canary.1779 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/types': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.0 chalk: 4.1.2 term-size: 2.2.1 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/reporter-dev-server@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/reporter-dev-server@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/codeframe': 2.0.0-canary.1779 - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/codeframe': 2.14.0 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) '@parcel/source-map': 2.1.1 - '@parcel/utils': 2.0.0-canary.1779 + '@parcel/utils': 2.14.0 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/reporter-tracer@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/reporter-tracer@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/utils': 2.0.0-canary.1779 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.0 chrome-trace-event: 1.0.4 nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/resolver-default@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/resolver-default@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/node-resolver-core': 3.4.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/node-resolver-core': 3.5.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/runtime-browser-hmr@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/runtime-browser-hmr@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/utils': 2.0.0-canary.1779 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.0 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/runtime-js@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/runtime-js@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/utils': 2.0.0-canary.1779 + '@parcel/diagnostic': 2.14.0 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.0 nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/runtime-rsc@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/runtime-rsc@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/rust': 2.13.4-canary.3402 - '@parcel/utils': 2.0.0-canary.1779 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/rust': 2.14.0 + '@parcel/utils': 2.14.0 nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/runtime-service-worker@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/runtime-service-worker@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/utils': 2.0.0-canary.1779 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.0 nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/rust@2.13.4-canary.3402': {} + '@parcel/rust@2.14.0': {} '@parcel/source-map@2.1.1': dependencies: detect-libc: 1.0.3 - '@parcel/transformer-babel@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/transformer-babel@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/diagnostic': 2.14.0 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) '@parcel/source-map': 2.1.1 - '@parcel/utils': 2.0.0-canary.1779 - browserslist: 4.23.0 + '@parcel/utils': 2.14.0 + browserslist: 4.24.4 json5: 2.2.3 nullthrows: 1.1.1 semver: 7.7.1 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/transformer-css@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/transformer-css@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/diagnostic': 2.14.0 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) '@parcel/source-map': 2.1.1 - '@parcel/utils': 2.0.0-canary.1779 - browserslist: 4.23.0 + '@parcel/utils': 2.14.0 + browserslist: 4.24.4 lightningcss: 1.29.1 nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/transformer-html@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/transformer-html@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/rust': 2.13.4-canary.3402 + '@parcel/diagnostic': 2.14.0 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/rust': 2.14.0 nullthrows: 1.1.1 posthtml: 0.16.6 posthtml-parser: 0.12.1 @@ -12465,60 +12528,68 @@ snapshots: srcset: 4.0.0 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/transformer-image@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/transformer-image@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/core': 2.0.0-canary.1777(@swc/helpers@0.5.15) - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/utils': 2.0.0-canary.1779 - '@parcel/workers': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/core': 2.14.0(@swc/helpers@0.5.15) + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.0 + '@parcel/workers': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) nullthrows: 1.1.1 + transitivePeerDependencies: + - napi-wasm - '@parcel/transformer-js@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/transformer-js@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/core': 2.0.0-canary.1777(@swc/helpers@0.5.15) - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/rust': 2.13.4-canary.3402 + '@parcel/core': 2.14.0(@swc/helpers@0.5.15) + '@parcel/diagnostic': 2.14.0 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/rust': 2.14.0 '@parcel/source-map': 2.1.1 - '@parcel/utils': 2.0.0-canary.1779 - '@parcel/workers': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.0 + '@parcel/workers': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) '@swc/helpers': 0.5.15 - browserslist: 4.23.0 + browserslist: 4.24.4 nullthrows: 1.1.1 regenerator-runtime: 0.14.1 semver: 7.7.1 + transitivePeerDependencies: + - napi-wasm - '@parcel/transformer-json@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/transformer-json@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) json5: 2.2.3 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/transformer-node@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/transformer-node@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/transformer-postcss@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/transformer-postcss@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/rust': 2.13.4-canary.3402 - '@parcel/utils': 2.0.0-canary.1779 + '@parcel/diagnostic': 2.14.0 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/rust': 2.14.0 + '@parcel/utils': 2.14.0 clone: 2.1.2 nullthrows: 1.1.1 postcss-value-parser: 4.2.0 semver: 7.7.1 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/transformer-posthtml@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/transformer-posthtml@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/utils': 2.0.0-canary.1779 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.0 nullthrows: 1.1.1 posthtml: 0.16.6 posthtml-parser: 0.12.1 @@ -12526,27 +12597,37 @@ snapshots: semver: 7.7.1 transitivePeerDependencies: - '@parcel/core' + - napi-wasm + + '@parcel/transformer-raw@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + dependencies: + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm - '@parcel/transformer-raw@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/transformer-react-refresh-wrap@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/error-overlay': 2.14.0 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.0 + react-refresh: 0.14.2 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/transformer-react-refresh-wrap@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/transformer-react-static@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/error-overlay': 2.13.4-canary.3402 - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/utils': 2.0.0-canary.1779 - react-refresh: 0.14.0 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/transformer-svg@2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/transformer-svg@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/plugin': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/rust': 2.13.4-canary.3402 + '@parcel/diagnostic': 2.14.0 + '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/rust': 2.14.0 nullthrows: 1.1.1 posthtml: 0.16.6 posthtml-parser: 0.12.1 @@ -12554,31 +12635,35 @@ snapshots: semver: 7.7.1 transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/types-internal@2.13.4-canary.3402': + '@parcel/types-internal@2.14.0': dependencies: - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/feature-flags': 2.13.4-canary.3402 + '@parcel/diagnostic': 2.14.0 + '@parcel/feature-flags': 2.14.0 '@parcel/source-map': 2.1.1 utility-types: 3.11.0 - '@parcel/types@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/types@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/types-internal': 2.13.4-canary.3402 - '@parcel/workers': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) + '@parcel/types-internal': 2.14.0 + '@parcel/workers': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) transitivePeerDependencies: - '@parcel/core' + - napi-wasm - '@parcel/utils@2.0.0-canary.1779': + '@parcel/utils@2.14.0': dependencies: - '@parcel/codeframe': 2.0.0-canary.1779 - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/logger': 2.0.0-canary.1779 - '@parcel/markdown-ansi': 2.0.0-canary.1779 - '@parcel/rust': 2.13.4-canary.3402 + '@parcel/codeframe': 2.14.0 + '@parcel/diagnostic': 2.14.0 + '@parcel/logger': 2.14.0 + '@parcel/markdown-ansi': 2.14.0 + '@parcel/rust': 2.14.0 '@parcel/source-map': 2.1.1 chalk: 4.1.2 nullthrows: 1.1.1 + transitivePeerDependencies: + - napi-wasm '@parcel/watcher-android-arm64@2.5.1': optional: true @@ -12640,15 +12725,17 @@ snapshots: '@parcel/watcher-win32-ia32': 2.5.1 '@parcel/watcher-win32-x64': 2.5.1 - '@parcel/workers@2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))': + '@parcel/workers@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': dependencies: - '@parcel/core': 2.0.0-canary.1777(@swc/helpers@0.5.15) - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/logger': 2.0.0-canary.1779 - '@parcel/profiler': 2.13.4-canary.3402 - '@parcel/types-internal': 2.13.4-canary.3402 - '@parcel/utils': 2.0.0-canary.1779 + '@parcel/core': 2.14.0(@swc/helpers@0.5.15) + '@parcel/diagnostic': 2.14.0 + '@parcel/logger': 2.14.0 + '@parcel/profiler': 2.14.0 + '@parcel/types-internal': 2.14.0 + '@parcel/utils': 2.14.0 nullthrows: 1.1.1 + transitivePeerDependencies: + - napi-wasm '@pkgjs/parseargs@0.11.0': optional: true @@ -12854,51 +12941,51 @@ snapshots: dependencies: '@sinonjs/commons': 2.0.0 - '@swc/core-darwin-arm64@1.10.18': + '@swc/core-darwin-arm64@1.11.11': optional: true - '@swc/core-darwin-x64@1.10.18': + '@swc/core-darwin-x64@1.11.11': optional: true - '@swc/core-linux-arm-gnueabihf@1.10.18': + '@swc/core-linux-arm-gnueabihf@1.11.11': optional: true - '@swc/core-linux-arm64-gnu@1.10.18': + '@swc/core-linux-arm64-gnu@1.11.11': optional: true - '@swc/core-linux-arm64-musl@1.10.18': + '@swc/core-linux-arm64-musl@1.11.11': optional: true - '@swc/core-linux-x64-gnu@1.10.18': + '@swc/core-linux-x64-gnu@1.11.11': optional: true - '@swc/core-linux-x64-musl@1.10.18': + '@swc/core-linux-x64-musl@1.11.11': optional: true - '@swc/core-win32-arm64-msvc@1.10.18': + '@swc/core-win32-arm64-msvc@1.11.11': optional: true - '@swc/core-win32-ia32-msvc@1.10.18': + '@swc/core-win32-ia32-msvc@1.11.11': optional: true - '@swc/core-win32-x64-msvc@1.10.18': + '@swc/core-win32-x64-msvc@1.11.11': optional: true - '@swc/core@1.10.18(@swc/helpers@0.5.15)': + '@swc/core@1.11.11(@swc/helpers@0.5.15)': dependencies: '@swc/counter': 0.1.3 - '@swc/types': 0.1.17 + '@swc/types': 0.1.19 optionalDependencies: - '@swc/core-darwin-arm64': 1.10.18 - '@swc/core-darwin-x64': 1.10.18 - '@swc/core-linux-arm-gnueabihf': 1.10.18 - '@swc/core-linux-arm64-gnu': 1.10.18 - '@swc/core-linux-arm64-musl': 1.10.18 - '@swc/core-linux-x64-gnu': 1.10.18 - '@swc/core-linux-x64-musl': 1.10.18 - '@swc/core-win32-arm64-msvc': 1.10.18 - '@swc/core-win32-ia32-msvc': 1.10.18 - '@swc/core-win32-x64-msvc': 1.10.18 + '@swc/core-darwin-arm64': 1.11.11 + '@swc/core-darwin-x64': 1.11.11 + '@swc/core-linux-arm-gnueabihf': 1.11.11 + '@swc/core-linux-arm64-gnu': 1.11.11 + '@swc/core-linux-arm64-musl': 1.11.11 + '@swc/core-linux-x64-gnu': 1.11.11 + '@swc/core-linux-x64-musl': 1.11.11 + '@swc/core-win32-arm64-msvc': 1.11.11 + '@swc/core-win32-ia32-msvc': 1.11.11 + '@swc/core-win32-x64-msvc': 1.11.11 '@swc/helpers': 0.5.15 '@swc/counter@0.1.3': {} @@ -12907,7 +12994,7 @@ snapshots: dependencies: tslib: 2.8.1 - '@swc/types@0.1.17': + '@swc/types@0.1.19': dependencies: '@swc/counter': 0.1.3 @@ -13610,8 +13697,6 @@ snapshots: dependencies: type-fest: 1.4.0 - ansi-html-community@0.0.8: {} - ansi-regex@5.0.1: {} ansi-regex@6.0.1: {} @@ -17815,26 +17900,27 @@ snapshots: pako@1.0.11: {} - parcel@2.0.0-canary.1777(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5): - dependencies: - '@parcel/config-default': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) - '@parcel/core': 2.0.0-canary.1777(@swc/helpers@0.5.15) - '@parcel/diagnostic': 2.0.0-canary.1779 - '@parcel/events': 2.0.0-canary.1779 - '@parcel/feature-flags': 2.13.4-canary.3402 - '@parcel/fs': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/logger': 2.0.0-canary.1779 - '@parcel/package-manager': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) - '@parcel/reporter-cli': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/reporter-dev-server': 2.0.0-canary.1779(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/reporter-tracer': 2.13.4-canary.3402(@parcel/core@2.0.0-canary.1777(@swc/helpers@0.5.15)) - '@parcel/utils': 2.0.0-canary.1779 + parcel@2.14.0(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5): + dependencies: + '@parcel/config-default': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) + '@parcel/core': 2.14.0(@swc/helpers@0.5.15) + '@parcel/diagnostic': 2.14.0 + '@parcel/events': 2.14.0 + '@parcel/feature-flags': 2.14.0 + '@parcel/fs': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/logger': 2.14.0 + '@parcel/package-manager': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) + '@parcel/reporter-cli': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/reporter-dev-server': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/reporter-tracer': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.0 chalk: 4.1.2 commander: 12.1.0 get-port: 4.2.0 transitivePeerDependencies: - '@swc/helpers' - cssnano + - napi-wasm - postcss - purgecss - relateurl @@ -18489,6 +18575,8 @@ snapshots: rrweb-cssom@0.6.0: {} + rsc-html-stream@0.0.4: {} + run-async@2.4.1: {} run-parallel@1.2.0: @@ -19127,7 +19215,7 @@ snapshots: tsscmp@1.0.6: {} - tsup@8.3.0(@swc/core@1.10.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0): + tsup@8.3.0(@swc/core@1.11.11(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(typescript@5.4.5)(yaml@2.6.0): dependencies: bundle-require: 5.0.0(esbuild@0.23.1) cac: 6.7.14 @@ -19146,7 +19234,7 @@ snapshots: tinyglobby: 0.2.9 tree-kill: 1.2.2 optionalDependencies: - '@swc/core': 1.10.18(@swc/helpers@0.5.15) + '@swc/core': 1.11.11(@swc/helpers@0.5.15) postcss: 8.5.3 typescript: 5.4.5 transitivePeerDependencies: From 4d5aa15258e647cebdae56025076a389229ee551 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Wed, 19 Mar 2025 09:22:53 -0700 Subject: [PATCH 024/143] update parcel, revert import re-write --- packages/react-router/package.json | 2 +- .../re-write-server-build-import.mjs | 16 - playground/rsc-parcel/package.json | 8 +- pnpm-lock.yaml | 866 +++++++++--------- 4 files changed, 438 insertions(+), 454 deletions(-) delete mode 100644 packages/react-router/re-write-server-build-import.mjs diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 0af7102faa..997eded692 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -98,7 +98,7 @@ }, "wireit": { "build": { - "command": "rimraf dist && tsup && tsup --config tsup.config.server.ts && node ./re-write-server-build-import.mjs", + "command": "rimraf dist && tsup && tsup --config tsup.config.server.ts", "files": [ "re-write-server-build-import.mjs", "lib/**", diff --git a/packages/react-router/re-write-server-build-import.mjs b/packages/react-router/re-write-server-build-import.mjs deleted file mode 100644 index d65bacd005..0000000000 --- a/packages/react-router/re-write-server-build-import.mjs +++ /dev/null @@ -1,16 +0,0 @@ -// eslint-disable-next-line import/no-nodejs-modules -import * as fsp from "node:fs/promises"; - -const filesToRewrite = [ - "dist/development/server.js", - "dist/production/server.js", -]; - -for (const file of filesToRewrite) { - const contents = await fsp.readFile(file, "utf8"); - const newContents = contents.replaceAll( - "require('react-router/client')", - "require('./index.js')" - ); - await fsp.writeFile(file, newContents); -} diff --git a/playground/rsc-parcel/package.json b/playground/rsc-parcel/package.json index c48d93fab9..b3d27a7894 100644 --- a/playground/rsc-parcel/package.json +++ b/playground/rsc-parcel/package.json @@ -18,8 +18,8 @@ }, "devDependencies": { "@biomejs/biome": "^1.9.4", - "@parcel/packager-react-static": "2.14.0", - "@parcel/transformer-react-static": "2.14.0", + "@parcel/packager-react-static": "2.14.1", + "@parcel/transformer-react-static": "2.14.1", "@types/express": "^5.0.0", "@types/node": "^22.13.1", "@types/parcel-env": "0.0.8", @@ -28,7 +28,7 @@ "browserify-zlib": "^0.2.0", "buffer": "^5.5.0||^6.0.0", "events": "^3.1.0", - "parcel": "2.14.0", + "parcel": "2.14.1", "path-browserify": "^1.0.0", "querystring-es3": "^0.2.1", "stream-http": "^3.1.0", @@ -36,7 +36,7 @@ }, "dependencies": { "@mjackson/node-fetch-server": "0.6.1", - "@parcel/runtime-rsc": "2.14.0", + "@parcel/runtime-rsc": "2.14.1", "express": "^4.21.2", "react": "0.0.0-experimental-93b58361-20250209", "react-dom": "0.0.0-experimental-93b58361-20250209", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7cff4acac8..8c9e317bba 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1238,8 +1238,8 @@ importers: specifier: 0.6.1 version: 0.6.1 '@parcel/runtime-rsc': - specifier: 2.14.0 - version: 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + specifier: 2.14.1 + version: 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) express: specifier: ^4.21.2 version: 4.21.2 @@ -1260,11 +1260,11 @@ importers: specifier: ^1.9.4 version: 1.9.4 '@parcel/packager-react-static': - specifier: 2.14.0 - version: 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + specifier: 2.14.1 + version: 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) '@parcel/transformer-react-static': - specifier: 2.14.0 - version: 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + specifier: 2.14.1 + version: 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) '@types/express': specifier: ^5.0.0 version: 5.0.0 @@ -1290,8 +1290,8 @@ importers: specifier: ^3.1.0 version: 3.3.0 parcel: - specifier: 2.14.0 - version: 2.14.0(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) + specifier: 2.14.1 + version: 2.14.1(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) path-browserify: specifier: ^1.0.0 version: 1.0.1 @@ -3643,173 +3643,173 @@ packages: '@open-draft/until@1.0.3': resolution: {integrity: sha512-Aq58f5HiWdyDlFffbbSjAlv596h/cOnt2DO1w3DOC7OJ5EHs0hd/nycJfiu9RJbT6Yk6F1knnRRXNSpxoIVZ9Q==} - '@parcel/bundler-default@2.14.0': - resolution: {integrity: sha512-MRPPFCoKm0/aUTJWR/22qiKEmn/D+8iJw7ex3jlSJQ613YktL3bhkB4BO8/BCDte0Jp65/rU6QfVQ8UZi8/gNA==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/bundler-default@2.14.1': + resolution: {integrity: sha512-xFS97cO9TdQgNf1M7N1c5M8Z/kWiIC91ufwabnRWFt5NTaT6NCXusOKcqw/kpJOBKgZcO1kjNvQ95HE3EG85rw==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/cache@2.14.0': - resolution: {integrity: sha512-XkkEwCZ9W6BercNQ8JMgxJJnzSBhp9u8H1EKd91C14B83fpO8SOd8Y8lJ0BKhljVU+qwZjKnyxHa4Tx+vzFbfg==} + '@parcel/cache@2.14.1': + resolution: {integrity: sha512-oFJfIK6QfxY35XYsDaOyFWH3eKEbzU4CXTsUVAkpH1PbX0DTko3eZ4D+xWapRRaAQIMfL+xfUWmsL4njYCQqZQ==} engines: {node: '>= 16.0.0'} peerDependencies: - '@parcel/core': ^2.14.0 + '@parcel/core': ^2.14.1 - '@parcel/codeframe@2.14.0': - resolution: {integrity: sha512-WLG6d/6Pm7zk6V+DmOLTE/T9g1kfsmTZTVfPGJwRIF29ZRKGBLNX/FZvlHEg0g7gZtRHNHF/NGu9EMlJhTRasQ==} + '@parcel/codeframe@2.14.1': + resolution: {integrity: sha512-n5IdtgxuukSTJ5/fq/69S5Rm9KBSg/dhpE4oRkyUEtkgEwTLpG2c6rmYtWem1yGIc80Z4BRvP9vgmYAEHHXSwA==} engines: {node: '>= 16.0.0'} - '@parcel/compressor-raw@2.14.0': - resolution: {integrity: sha512-6zjYgB5t0jTlp+h4BTJ3aouLEGmwD2NaE2GAD/vC0owfEy2c5syPTrp5KuZ3vBx6X9hukJFPXtb6kmxdp0Vbcw==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/compressor-raw@2.14.1': + resolution: {integrity: sha512-lo/MJIOaEhjhgC3H0eMvqWpd1J2CxTErIl7T4MIIwzgNBdXHJe39ErkiJYaelh/q15uQVnc5dXx3VSu/YgWDXg==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/config-default@2.14.0': - resolution: {integrity: sha512-ubFryF45Xnm93Msu9IzxaEytkqBzJV/uMMwn5Z26h+MlIpRNFiRHI3M27l/9cr/GRhd6TtmdjfyEEXbIauGGiQ==} + '@parcel/config-default@2.14.1': + resolution: {integrity: sha512-rM+SqYmgzrg59XH8c41fC6lggFWRYm1tQ/NvrLB4QuKzLqh2RSLa8rNkuR7bDGo1Bq7ore0WjjFDv87MXsWJkg==} peerDependencies: - '@parcel/core': ^2.14.0 + '@parcel/core': ^2.14.1 - '@parcel/core@2.14.0': - resolution: {integrity: sha512-pcmDq/cCla9Umoqxmy9VxAZ9fWh5H0u12PSGEesyLZbiECVkN+jgo9PPnBr7gwWVc1K71pGo4e5C5QpyGcyHJg==} + '@parcel/core@2.14.1': + resolution: {integrity: sha512-vw7Uc2hZgXEDCHyPzeV+IPqC9mUtCbVSJ4lXP9Ri49mdLV7Hazb9iCN4mNld7sCMtG2f6fEqfwsD9r2zGyntgw==} engines: {node: '>= 16.0.0'} - '@parcel/diagnostic@2.14.0': - resolution: {integrity: sha512-Y7sLbpWIeNqMgtB+RIcvFia6QKYCckz7CO0sSsYi9A76HQDO+poSPXAdzWZbkZbfQCeKwKbLGEpbPLfEpTXiqA==} + '@parcel/diagnostic@2.14.1': + resolution: {integrity: sha512-1miPY3EFMlaRRXEEi9kqqVih8jxCIrmpeQTgnFcamX7TypAlGKaFjn0FTOYL1FXexVHETiVFzmNOWVe+EUJF6A==} engines: {node: '>= 16.0.0'} - '@parcel/error-overlay@2.14.0': - resolution: {integrity: sha512-Uh6rTPChbM5/1l9PpWSWep5TbOBiHeQN4Ab2M2MEqCsVl663laYdkiL1k2foPhv7Njr8MMMf5mbT5UiT8HsLlg==} + '@parcel/error-overlay@2.14.1': + resolution: {integrity: sha512-9HyBBOjR+xp8OWSwOV0DRmWduKEtR+PKjdwc3+PIP9LQ4p9WL/uUcGG57LCdU4UKih8befCRN0qs7iMQU1OSxg==} engines: {node: '>= 16.0.0'} - '@parcel/events@2.14.0': - resolution: {integrity: sha512-qkO4fWnFTjp0CP5U5H7kOJ2dluNcJJ+N94lIHRmtxV2wtQi9SeLLcDIklCekRrhKaCF6QXeXUet5ANso61FVrA==} + '@parcel/events@2.14.1': + resolution: {integrity: sha512-DG4xxp1x/ky7aHbz2GpwPBAkbI4pTfEWGukXh6bTyp/8TJl6LHvQxZkNszBoOwPF+D9vKH+Cm1ZS+iLX1HCnaA==} engines: {node: '>= 16.0.0'} - '@parcel/feature-flags@2.14.0': - resolution: {integrity: sha512-SzoIz7SjwVmS2BIUJeDM/me1rYaZzN1uLrr8KHvoJldTO484gQzlnRhN+pk5BTaHW5Jrg8oob2LQWBv9kymphg==} + '@parcel/feature-flags@2.14.1': + resolution: {integrity: sha512-SiFWEONfIIM42+J4IFQnAgVOuqOPqZLc+6kHX8bmSBYAA6PVkwfjI8GVwcFm0qzo9HYylwuHwzrAdByv5FFodA==} engines: {node: '>= 16.0.0'} - '@parcel/fs@2.14.0': - resolution: {integrity: sha512-r10003gyxvW1Qn/LTiNS2oCNPv22nLUW7dJIEEZb/0v8UNbzrZhVB7s+iBok2CNBg3AFPMi6W10jqnvkjOBB9Q==} + '@parcel/fs@2.14.1': + resolution: {integrity: sha512-qLKjKdE+8d+HycrUSbWf2pLmfi2g4p23HkEMwxOPnbu+OQ9deyrODbfhMNVQNSGDztNDjw53YF4+c5Y+DCtXUw==} engines: {node: '>= 16.0.0'} peerDependencies: - '@parcel/core': ^2.14.0 + '@parcel/core': ^2.14.1 - '@parcel/graph@3.4.0': - resolution: {integrity: sha512-S9kVoFmh9jlMO8XJS2Br4fW/hhLc1mKXSXKMrIQe5dqf7z9l3a0sl+dY9KJ0KFuiYKOxqhgWCuqj/nMvD+CZrA==} + '@parcel/graph@3.4.1': + resolution: {integrity: sha512-4kaHLJ0HfMo9OT3dEUlLLArMa3YYCYEDs7b1juXPUYS6VEPfxebdAw6gcF2KlC/TMUP7SbU9dsauPfOc1ttXcQ==} engines: {node: '>= 16.0.0'} - '@parcel/logger@2.14.0': - resolution: {integrity: sha512-dtWVz8oKVOpW1s013wDH8G2C8sv8ZuJ2JgTJHMV4sPPfX0KMHx04x0L8+JMmmo4mvjtrAy/lTKXh/yq2tvZnbA==} + '@parcel/logger@2.14.1': + resolution: {integrity: sha512-jksQTCuVW7HWB75HShnliGs+lwbirv9ajCQtEwtOMFlZMCEplu0Pp6GxNG467r9EWzCf55yGwnZw7F6Fs1Oqgg==} engines: {node: '>= 16.0.0'} - '@parcel/markdown-ansi@2.14.0': - resolution: {integrity: sha512-6HlvNAwyBtbyI0A5BnU51Y+4gJEra7p8gKemCw5zU4cph4I822jkurAedQ6ffrDK7vFRSXBvY1Ab524rN9BfEQ==} + '@parcel/markdown-ansi@2.14.1': + resolution: {integrity: sha512-cxeM6w9861HTMuxEhhPDznCwPd/MxbIJpqp5z9E8+L3Syso0qa7ot5z5Lm3DSfDVh0Dnpi7srC8QpJkOqCl4yw==} engines: {node: '>= 16.0.0'} - '@parcel/namer-default@2.14.0': - resolution: {integrity: sha512-jlKfS1k/xOwI5FyZB4Tw3J4clFj2RTjn/ZKgjNSfvjSMoAn05SOL9MJ1Po7p7b4W/FKV4fWgvh5UchRX8hasZw==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/namer-default@2.14.1': + resolution: {integrity: sha512-6Hq4TuQblYhqzpi7eVHLa2RJ0OGq5MiR6KofAwpz4gDF1H8UVR85KGzFLRRk73nAqMZi45Yqs8f4FHtTOJzksw==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/node-resolver-core@3.5.0': - resolution: {integrity: sha512-c6yWNh24k8F5+rgp1ekCKJ5Ftb8D4kl+1CzuWr6Yghcg+0hytwhNORrUsH4cp9yI/st13FcHUZTzRlllF47RQg==} + '@parcel/node-resolver-core@3.5.1': + resolution: {integrity: sha512-FiZUbTmEfoWIRKYmmx2baPlusIdW9gKPRowXp+YWb436aFxbk06rf8pS4uCkODN61RZEg6WPHOo0rLVcylbOSw==} engines: {node: '>= 16.0.0'} - '@parcel/optimizer-css@2.14.0': - resolution: {integrity: sha512-Z0n8zKalRJyZWk0Td3Ki+73+RVnRr8TLdRguEgSmAF4Dqh14267OSkZBm9GwPb7MgVRCy/XS5xw4YGTZmdrDyw==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/optimizer-css@2.14.1': + resolution: {integrity: sha512-uerUTAFzer23wDD+CeGDxRSpGJrpYNU7RIkvUKrWBaYPG2ztKQ4NWWZ7/xVL8EdU6TilRec6xihrONFUE1Pa3Q==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/optimizer-htmlnano@2.14.0': - resolution: {integrity: sha512-/VwHAxNF+9aLB8ehzL2rv6hKpOMQhYPU0KjTeBflgAWQMXAtdQknjBCXvzlXDc9hDJAewzQIRCUEg4MM6ZeKWQ==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/optimizer-htmlnano@2.14.1': + resolution: {integrity: sha512-m9qmJD1yC5/KfXz/6dk8QdVFug3iSXhkABIo51iPHezabRNKxBscQHvaYjRGptJdTgqe04vz8Wf1l4iLpKWM2w==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/optimizer-image@2.14.0': - resolution: {integrity: sha512-XAwStyaLwUFUC8z/jrOXKTVGiVMZlokPI9A1yEJlnnXaI8SeARztVHz5ZBzLasSfOwBQCZqSukT+ZWTi/oJoGA==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/optimizer-image@2.14.1': + resolution: {integrity: sha512-Ut3LyQjh4bZw2sfS0gB2LaVo7cRYqXMb2UX3l8c57jZUfHjqG3eweiZtl7cM3sbOLjj7Z79BSj9JJ67OJS6ATQ==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} peerDependencies: - '@parcel/core': ^2.14.0 + '@parcel/core': ^2.14.1 - '@parcel/optimizer-svgo@2.14.0': - resolution: {integrity: sha512-EREtUqfqlvNTaNoO8AqhLYlyU65nhymgoCVPsLntb8azuUJfpBKN/AOTAV9bqLdsfeQal40d30T9OekO+sVUXQ==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/optimizer-svgo@2.14.1': + resolution: {integrity: sha512-pMQ2vHLRO4eOUYzc1aNa+U3EET2CoXNP9eHzMEXD9ikbcuU699LWhQ9f0g94q/tCEPiDDU7fYFVRk5z9rYJ4xg==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/optimizer-swc@2.14.0': - resolution: {integrity: sha512-IfwdEFlDw4uhuSNTtBLSfpoX0pYTz+QlofIQwkwqeBUdOJuPATPAM5c7UKNAlhON68rWuFkeprgLPKEFKGLqUQ==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/optimizer-swc@2.14.1': + resolution: {integrity: sha512-oNtXoW/o9zWXhcoZ4taaIot3l5jSy9RzKXWzKLtrMHkljyifIcxJ7DfgMfr2v1ToCFYRitdtQ4s0Y9dDOvjlqw==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/package-manager@2.14.0': - resolution: {integrity: sha512-raaAD51TrE1leeAL/FmonEEr9srpOo/1rvMf855iHfmArdARRDXAS8eh90G5+KrrxtC8O1fTxjdZJ98xAiKFUg==} + '@parcel/package-manager@2.14.1': + resolution: {integrity: sha512-zLjPJpKhj+3Yqy9HN1Kp7fTot2BqTG3wxFoVRI5vdKqMeC9PT+UexdctU0sx90aeXcs3dF6yl944nVPlMZW8qA==} engines: {node: '>= 16.0.0'} peerDependencies: - '@parcel/core': ^2.14.0 + '@parcel/core': ^2.14.1 - '@parcel/packager-css@2.14.0': - resolution: {integrity: sha512-5LbVo/mNFbCnD5kZegCQdLRJQqElJjBc5xzQs6ZZXoTpSEBZKGJkkIckK634ARgVgIt3CTCAB90DD3PPOwi58g==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/packager-css@2.14.1': + resolution: {integrity: sha512-SUVnX8cFHApmU0xA4rard3h1gR4tN7MeB7w1JtO+BgTLdxHBAG/rzqh22T7pJuwc+XJ8x+8CSh1vYkrIuL9Dow==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/packager-html@2.14.0': - resolution: {integrity: sha512-ln6kbAZpo+Q+JNIZ55H/aBc66uBV/8021YttS61/DoW35he/XmMOBPziNce9obDHYzyQSJPx+6ACSg6zebkE/Q==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/packager-html@2.14.1': + resolution: {integrity: sha512-66vTBsQw9Tob/9uqOfXmGaJX83HG/Y7ymPcB2MqFSiZMKWz6jQSolwycHi386l2t1Lf71tMmFF9hrTzD4WHqgQ==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/packager-js@2.14.0': - resolution: {integrity: sha512-gYqXIZNglwQCdkzcMM5KpKYApGCnZsV9+AM467IwAR073xDXWUJjJ28CKSXXCfickgB0VwRPivn2x/DhfCUKAg==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/packager-js@2.14.1': + resolution: {integrity: sha512-NLK9eI876hedSvq95H3Wpk4eaGbPSmSr3fCuAOwfysMh0fO0mzpxzEj7aMK2SariSYLtBLkkeR42QJGe/qzqpA==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/packager-raw@2.14.0': - resolution: {integrity: sha512-FShIKhExsfTNjKXJ73yKc7C4yk2cKZe2scaiVnDTUoPVaXeoU/OKOSixbI0krUrGh7KwEZ1pEJvXrEp7B+Sf/Q==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/packager-raw@2.14.1': + resolution: {integrity: sha512-R36Awv/TuLIeQSK7l+GX7XEDYR3otutmMBGgZJg4w9Y8P0E26fViNELqzA9CIJq5qBHAC48eOd+V2IGh0RV9GQ==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/packager-react-static@2.14.0': - resolution: {integrity: sha512-wL00/d3FI0Sz7U1JF5BlZiHIaiGViT24DhSID12jlmI58NUQxbblxR8ln60Q6boUt9Ulr4H1V24Z3DEQdUYuLA==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/packager-react-static@2.14.1': + resolution: {integrity: sha512-dDPQ4xFSZ1XEirqhYimexmtOH6KBhw0bPRinNtpZak6iKOmNbg65LwDayBDMKQyU4wOvXjMh1Psr+5APQ0fDRw==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/packager-svg@2.14.0': - resolution: {integrity: sha512-ee7lbAg0rpjIKLEYM/hKgG8xt0P3ZWNfQb3QDnw3yIdp0kDADQbiswyKJEUDslBE4+Y4HxonSN48zK3UKleYGg==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/packager-svg@2.14.1': + resolution: {integrity: sha512-5s/PSwVd8K92ksML50gGxUPs1WVOfGDoMHBqZbJP21FyTJSqV1e+qDvdjSSWGDImGL79ZAB5gVHguxuonsnAlw==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/packager-wasm@2.14.0': - resolution: {integrity: sha512-OydfRDqJCeHVsblcPC11yUn2mrDzkp4HrD1QO2CT89nQbLvUFGKHDsP2VaXAAvuSRLFB46Dqa5ocCNdAHC8DZw==} - engines: {node: '>=16.0.0', parcel: ^2.14.0} + '@parcel/packager-wasm@2.14.1': + resolution: {integrity: sha512-crMF0j3zgDgPuUQoXP19bZ2kr1JxwOkEb1uz3l52qzb+bU8mNn500MBh/oNv5Kz3LsmeNFF0QMpAjpCWYyWp8Q==} + engines: {node: '>=16.0.0', parcel: ^2.14.1} - '@parcel/plugin@2.14.0': - resolution: {integrity: sha512-vlrxyErfpGcMyaEADi4EYCmV8T5RsiyhtzZKwUiLwNzfXTV0oICNzOAmVUoE42pcY70XtH1f/TWdN9dOKd3LQQ==} + '@parcel/plugin@2.14.1': + resolution: {integrity: sha512-zWqQF+YnCNjOd1lc2nWWdjhr6zNJGV1WFE05W3WSJgyfyes8s4HB0FzShTqJ+R9FQdmYWPmRuxO8hC3lwLSQDg==} engines: {node: '>= 16.0.0'} - '@parcel/profiler@2.14.0': - resolution: {integrity: sha512-iRldBix80/zq1HWkGP3xAyN73n9i40oxNso3C4spx3xw+iQdJ3/+UG+tJXk21IZhjLx6Gze2fu/Mqgr3egxndw==} + '@parcel/profiler@2.14.1': + resolution: {integrity: sha512-qrR+RqXfF1IXJdddMoJaAhFnl6pen1CBoobP8p78pZ2SAefo8gyXnTG4Kgr6ff0VJER03U7o0bL1dI9ooHHhDA==} engines: {node: '>= 16.0.0'} - '@parcel/reporter-cli@2.14.0': - resolution: {integrity: sha512-WMrzOb7ZAuCWm7TR5gZ9Ey+TAXdlFcJVu4DjNK7AB8zIG8U6vYr0//JWRuduMGSbDSiKvLa7+9MVobwughkk0A==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/reporter-cli@2.14.1': + resolution: {integrity: sha512-wNG2JbwpJ5qLRPhwoXgm0LxRNjePRflFzfgwX1NlSKwJp7FtNoczraTt8lZPtoM5e1ChzS2ggKz5XUnYhLQa9A==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/reporter-dev-server@2.14.0': - resolution: {integrity: sha512-qBcvF6602xgO1mXr5TZcz+a3332PqaF/W/NV4Be/XEnp+eUdIhMXN2sFKhB5X7suSIeDrSzowB5KGACwzW5wVg==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/reporter-dev-server@2.14.1': + resolution: {integrity: sha512-7bCBNcSNBlsoeDX5JHFTeqRDzGxggEkOqX/HMN0rkp9R1wUOKPu9ik1hHXKjknUOsLYJ/lvHbecLZFaTMBOYIQ==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/reporter-tracer@2.14.0': - resolution: {integrity: sha512-aSkkADkfKL5BRcgZ1ZNE/RIGcSD+YG57g61DfPYQdWQNwAjdusAtXH/94X5OkyylF2tfa1pdkXy934W/auoalQ==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/reporter-tracer@2.14.1': + resolution: {integrity: sha512-RBFoP3pVXhRMkatZcNNvl/NbJNS4LVPz2Oy+0pVL18pbMEan2O8HpVbELnUbeWi1995IGBEp2DMGZMAw4qV51A==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/resolver-default@2.14.0': - resolution: {integrity: sha512-MnkWE1NUA/V5qNSAYNF2zchiGcGngoY6tBa0ZEGZ6REojpjRAPW6Udya2/O3/7sPZh9wBytEGkaC2bpCtXij9w==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/resolver-default@2.14.1': + resolution: {integrity: sha512-wRdd/3ws3q82WxJ+ton41C1XiXvlJKW1xIklyvVAu9Bxqvru6N0L8zM6sWBdy305gwfyVq4pBBRUCJu7YxkkUQ==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/runtime-browser-hmr@2.14.0': - resolution: {integrity: sha512-dbME8ZOvgQZSMtpTzQUinhLNxi2CJKqRKEG28TnNfsyVa0MoYLR/TN4Q2RU/SRuQyhddmUN0bSWasn9Yu+dXVQ==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/runtime-browser-hmr@2.14.1': + resolution: {integrity: sha512-HaRMkQhco25klcTKfqL6UD6iRA+fkurbbsEo0p7gSfy9d6HoPS7Sml7duddQ13eBIcbTdYVclucwSIuoDFNoqQ==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/runtime-js@2.14.0': - resolution: {integrity: sha512-k3+T2Rqbjg/0+3NPFVReEyu3CcjLHZWWmcDyAwuoRJb8H3XVfUbrTB18svN8Y99Rq+x+DEX3gLzsW++v/POSUA==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/runtime-js@2.14.1': + resolution: {integrity: sha512-YxSpJI5IQTo9ltKPXV9WueOD7z/uNaa9Fcl17OQ/cBgapDBRWqzBgewSSRJPySQt6gWcWdZWTqeeG2OTCRUQOw==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/runtime-rsc@2.14.0': - resolution: {integrity: sha512-BsvO5N0e8sprXA+LoJGeQkegH0oZ55Dlg+5Nx5lkTV920Ucei1IuwaUydcYBVgWbFt+o337CJP8Qbv5/7+yLtQ==} - engines: {node: '>= 12.0.0', parcel: ^2.14.0} + '@parcel/runtime-rsc@2.14.1': + resolution: {integrity: sha512-rmvs02ilOkvFjblhQsJL8c8jJjFpQl88xm8owyH2eVpqNdqfyHtpCWHnDjsoKmvjfRTf6143W7w9kLqNb2UNnA==} + engines: {node: '>= 12.0.0', parcel: ^2.14.1} - '@parcel/runtime-service-worker@2.14.0': - resolution: {integrity: sha512-WuYrpjoE6DPl6oWaSf3W3sgTa7JiSZ7fosQE89HxNC4rLaeOMjfBiOazhcVoi5qfAJwitIoONJD1IaO3qwP3AA==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/runtime-service-worker@2.14.1': + resolution: {integrity: sha512-Dz0tLHrECfzgNBfKm54QWBPsdvchFo4n2FBn4GWss0TYS4QMFrHWgc2YuRwVForXm2yS8/qoLignvM3gH8PLKg==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/rust@2.14.0': - resolution: {integrity: sha512-KIyUxZCLFkyqTn5NXDwXJidT0IZRb1f4kQRLPNfvObW1bwpZmNF9pSXr1rzRAfBvWtF9C/VFLc37AzcVKDti9Q==} + '@parcel/rust@2.14.1': + resolution: {integrity: sha512-BGFV+bS72zlzaHQAEobm/9shcW+lvQb0rAdmJJg2C3lGlqeaGks+iEIkH0wHTFzJJ1MpKgew7I3k096La0CjTw==} engines: {node: '>= 16.0.0'} peerDependencies: napi-wasm: ^1.1.2 @@ -3821,70 +3821,70 @@ packages: resolution: {integrity: sha512-Ejx1P/mj+kMjQb8/y5XxDUn4reGdr+WyKYloBljpppUy8gs42T+BNoEOuRYqDVdgPc6NxduzIDoJS9pOFfV5Ew==} engines: {node: ^12.18.3 || >=14} - '@parcel/transformer-babel@2.14.0': - resolution: {integrity: sha512-K0SFVLhEVd5jglwps7MGhnwXnmhT6GBHMOmrVYf+xgJs5md8QN/i5GGfnbDJZEA+YStSda8ZaWR6jfCZGZxa2Q==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/transformer-babel@2.14.1': + resolution: {integrity: sha512-WmCidhpNhbL4qWdnNFWS0F+GtYSY8k7X4wi9vYrGcFsh2jilsYoTm4BV91CUZtKfhxpYq7n1X+tknY4cOP8Isg==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/transformer-css@2.14.0': - resolution: {integrity: sha512-Tsl9uDTaGL/2n+YfYc1n77D95eBVG7EE1dawUxRPPWgtM3CRb+loToLuCezDrh9qaKiX0FY4AyxdYhKXLsxYHw==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/transformer-css@2.14.1': + resolution: {integrity: sha512-v8kP/V1sOKEukie1veZxxcITJNJiuktNzZuCxR5G/yaJMOU57dTP8oVHGiTRr/eA6A3CRzYjeSWEWvaR3ruQRw==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/transformer-html@2.14.0': - resolution: {integrity: sha512-mAk9p/zxIOXMWmi7zdbDxG3YchK8HMMQ3L5l4VD41J5K3VQ/B8nnEqRRhAvtEl+nBbU1psIgcsOg+jkrevDikA==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/transformer-html@2.14.1': + resolution: {integrity: sha512-Q7WKi3zfgP+3QNLFqnuypRLcJBP3PMgL5mClXdIhoyY4D0xpTBoq3NCr4DfdATChrUO6NZm6BcgDVmF04KfYnQ==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/transformer-image@2.14.0': - resolution: {integrity: sha512-TE/Gtz4GU+PtA/dGGbQbUGVAG/0XZwFcTZKP9kLZGnREAtMPTKfeIirum6Nn8IS/Xx5nWI52GpsmyYZXEm/T8g==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/transformer-image@2.14.1': + resolution: {integrity: sha512-ese7UQAb6KbC4qaPKqejNyx7Jsru8PlWMMcSgiw7o7BnHVqHP8d7MbwlokgxIo0uE/0zMFlEgKdNKtsoj+AEkQ==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} peerDependencies: - '@parcel/core': ^2.14.0 + '@parcel/core': ^2.14.1 - '@parcel/transformer-js@2.14.0': - resolution: {integrity: sha512-4acYA9uQ89Zz86+YHXk0m8Aq0FeYc4p0T8ODUiUbzofMKHhDmVKNzdIUYshCEcEdDfujdn472OmM7A4NPEfiEA==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/transformer-js@2.14.1': + resolution: {integrity: sha512-Zy60nRvZEabNCOTbChh/RbOpk03s5ozLMOXCAIv1VYRTSZmQFjSlIiwlaNgPjRIn2xpf+2c1y4eslk9z7RPy0w==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} peerDependencies: - '@parcel/core': ^2.14.0 + '@parcel/core': ^2.14.1 - '@parcel/transformer-json@2.14.0': - resolution: {integrity: sha512-QnpJmdmnR/s9K5Jvpc+PDLWvy5JSjS7EqsVEp2YQV+xoO3SpT9BWh5kuFvtMPmWQubyiJrhmgpFhohw/t3bd0g==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/transformer-json@2.14.1': + resolution: {integrity: sha512-oAjq78dt0Z8BbetH7edXSHVolL1DwMvEeqIPJfNybwyuKh3mwWvgbFgeurr3J5B268FXCMYmIgt63wactPnbcQ==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/transformer-node@2.14.0': - resolution: {integrity: sha512-AXTfC+U60AdTNsoaKBaxOdnY1B7XIqsBisdQDXzOtdb7xmYBvOVK4PmQPD7AUPVIg8uk0lmoBp9p/c1woh4rgQ==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/transformer-node@2.14.1': + resolution: {integrity: sha512-vl0m/k5eGxUe8kb9I56yhNrcrsfaWyn3+bUuLiX2jB4VA+F3qnN5N2V7wskmdGia4G4X174ICYCKQU+fLlDuFg==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/transformer-postcss@2.14.0': - resolution: {integrity: sha512-ih5SM7YB8evNe/zOPauWrh8TGIYw4qdyKrMNLiSN5mGeWkBkVWaf8bM68GeLWtOkToFxue885Mjz+aJ2M7Jyuw==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/transformer-postcss@2.14.1': + resolution: {integrity: sha512-YkRLmglO9gGq4Ds/KFFPTU2VpsKcMPi5gcPp1ZGlvJQYXjjMXhHksDsOgDWiPXA+aQuTk9truO93QPdOol3U3w==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/transformer-posthtml@2.14.0': - resolution: {integrity: sha512-NhE4o67rRkhW1k/IYI8RivXjuIHMBhC6gcHFT96P4LfuMerJb5YzcKPE59XmfMjH4Ndr4nQaZmVN0NgptqNiAg==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/transformer-posthtml@2.14.1': + resolution: {integrity: sha512-i+CjFA1oGUYH2+gmwa58FsYAd/pHNdkdVRZgzFLeIcYmpZfl0opSwAwZ+5udhnYxed9Mlj77jmSzVK6GpVDYoQ==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/transformer-raw@2.14.0': - resolution: {integrity: sha512-Q0xYqHt5uQx/Lw/w5G91RF4g3hRKN1/lmIyGOVyBvElY6pYvkTSI6wz5VoXwOc1aMpffQTWUqLqifgBy9rZ0OA==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/transformer-raw@2.14.1': + resolution: {integrity: sha512-OTO3n341HGHyrW4oKVC3InRiurjbPBTWbbX8mtyvfVcGMbs6PkU0jF1rVmO9gOsAOV5vn5AKowQ9eLMJ4xtLvQ==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/transformer-react-refresh-wrap@2.14.0': - resolution: {integrity: sha512-wy2INSD4tHUSkGnIb/X0rl94X0gV23oaOBvOswUvT1EjyfRJ4em+LaZYVnoZJOqwHIFUBrUaMThy4a7jNiwSog==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/transformer-react-refresh-wrap@2.14.1': + resolution: {integrity: sha512-Cke32thu4UE0Kbld1mqtw9a/Fxa67pu7BlDHvJTZvQrpAfbsev2RJM7GYYFn9KwmUqavV7GJjHHsjxGBc7JsZw==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/transformer-react-static@2.14.0': - resolution: {integrity: sha512-Ol/Bk7GYdb02jEN5tldFVem9ronQRN4Nw6oHjeltRoa3Mq+XVWMy4H2PgeGTzan676xgwrcApHDzgI6YvFw0vA==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/transformer-react-static@2.14.1': + resolution: {integrity: sha512-nYgvqvToAyuRYpLA1X0VwqnoHqFOIGMpRGsMl2xBIOu5v7UODHChMc1G2vvT0S+6KL0aPytXA1jpfNbRRcXdbg==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/transformer-svg@2.14.0': - resolution: {integrity: sha512-T9unNRjjvXwO1/wIZbxBXU0ufRsVE2bb9cJgno0314liZFybAioXLNXZ7z8/mB1YAgVcHd1HPLjE+2X7y1wRfg==} - engines: {node: '>= 16.0.0', parcel: ^2.14.0} + '@parcel/transformer-svg@2.14.1': + resolution: {integrity: sha512-AglOlBE8p7b5hzNM62LcslMbC73Yke8eMIsW9wm3By6/vIjW5GevAA99mrx5OhX+SKn4iJI1fAXoZ+2cP0TxJw==} + engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/types-internal@2.14.0': - resolution: {integrity: sha512-JffGtI9dk4P0FyxVeKdm6PCEWVW4Z/3Q0CLEaXhG67pFz4j15pdqtdzQ3Xf42HIWW+jOZ4KFtDwbtF5+n+1lwA==} + '@parcel/types-internal@2.14.1': + resolution: {integrity: sha512-oBQfuUrNSx9ZB8HpHpMr3y0SRst5NKIsYlzx8uwHlt8A3c/4PS+apI6jamyt905grdCOpZYhNls+pY1HmhAtRA==} - '@parcel/types@2.14.0': - resolution: {integrity: sha512-w5gqSN5FQiP9Xiv1DeCtr7Z+y3O/AhuBf38ZKQjGcxLUBFNmN2I5ulkZ2sj8xIQncYUwbYcv7TWxD/TuJJiBsA==} + '@parcel/types@2.14.1': + resolution: {integrity: sha512-qlF96JPNYAwApUxcLEXDH5YJDQLQJsEVXNYTHXSaXR0qDybaCmo5104BcAU4R7Czic5NhGhFBScVvtwTyW2Vqg==} - '@parcel/utils@2.14.0': - resolution: {integrity: sha512-hiXMDS2xzS/ZHqpvcoJCR4GxGLWEqd/UGB/z5wzJ6QVouhatBtYe7Ca3vQtwc/ki9JDeNZv6+QmiVqPmQWv6dA==} + '@parcel/utils@2.14.1': + resolution: {integrity: sha512-1178E3Dw6CjEeq6oyOfs/rNfceCQ2t4qKGpiPXGV//3k/ZDEwT4VR/f0FS0S6T1EMePrp0E0KAMQ9Zz0vrHhIA==} engines: {node: '>= 16.0.0'} '@parcel/watcher-android-arm64@2.5.1': @@ -3969,11 +3969,11 @@ packages: resolution: {integrity: sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==} engines: {node: '>= 10.0.0'} - '@parcel/workers@2.14.0': - resolution: {integrity: sha512-kte2OzI2L3lvZsJ9iu4qRmOT5fMhm6cdCS2oeAm8iN5btljrDCbjEqz35FSwfmxudIKBlfqI+89l5pnBou1Exw==} + '@parcel/workers@2.14.1': + resolution: {integrity: sha512-i0mui7kSLAPT0B0/5+YUjbP38F8e8C5QDVritAW1lbRe5XCqkvO+nU4PRsjyP5mvXVhoFVCe7UycbD2D/lrogA==} engines: {node: '>= 16.0.0'} peerDependencies: - '@parcel/core': ^2.14.0 + '@parcel/core': ^2.14.1 '@pkgjs/parseargs@0.11.0': resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} @@ -7939,8 +7939,8 @@ packages: pako@1.0.11: resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==} - parcel@2.14.0: - resolution: {integrity: sha512-STnHivKaXYDOcLDXO3ScfrpgoM7UIoQk84yUj0DTMQAij6+/m2q8ItrVf2kHzxMj+UwP4JP7DbfVz9l6/K2nnQ==} + parcel@2.14.1: + resolution: {integrity: sha512-fkqepRAxXBDPrI0omfbG2AInCGJVyxlBqVPxc/+qsW+JbyIED0ZgPgSCpvLuzTW00A2LO1/4k6oDWvTU2D84Dw==} engines: {node: '>= 16.0.0'} hasBin: true @@ -12064,74 +12064,74 @@ snapshots: '@open-draft/until@1.0.3': {} - '@parcel/bundler-default@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/bundler-default@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.14.0 - '@parcel/graph': 3.4.0 - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/rust': 2.14.0 - '@parcel/utils': 2.14.0 + '@parcel/diagnostic': 2.14.1 + '@parcel/graph': 3.4.1 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/rust': 2.14.1 + '@parcel/utils': 2.14.1 nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/cache@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/cache@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/core': 2.14.0(@swc/helpers@0.5.15) - '@parcel/fs': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/logger': 2.14.0 - '@parcel/utils': 2.14.0 + '@parcel/core': 2.14.1(@swc/helpers@0.5.15) + '@parcel/fs': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/logger': 2.14.1 + '@parcel/utils': 2.14.1 lmdb: 2.8.5 transitivePeerDependencies: - napi-wasm - '@parcel/codeframe@2.14.0': + '@parcel/codeframe@2.14.1': dependencies: chalk: 4.1.2 - '@parcel/compressor-raw@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/compressor-raw@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/config-default@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5)': - dependencies: - '@parcel/bundler-default': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/compressor-raw': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/core': 2.14.0(@swc/helpers@0.5.15) - '@parcel/namer-default': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/optimizer-css': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/optimizer-htmlnano': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) - '@parcel/optimizer-image': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/optimizer-svgo': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/optimizer-swc': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) - '@parcel/packager-css': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/packager-html': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/packager-js': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/packager-raw': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/packager-svg': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/packager-wasm': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/reporter-dev-server': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/resolver-default': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/runtime-browser-hmr': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/runtime-js': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/runtime-rsc': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/runtime-service-worker': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/transformer-babel': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/transformer-css': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/transformer-html': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/transformer-image': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/transformer-js': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/transformer-json': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/transformer-node': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/transformer-postcss': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/transformer-posthtml': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/transformer-raw': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/transformer-react-refresh-wrap': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/transformer-svg': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/config-default@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5)': + dependencies: + '@parcel/bundler-default': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/compressor-raw': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/core': 2.14.1(@swc/helpers@0.5.15) + '@parcel/namer-default': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/optimizer-css': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/optimizer-htmlnano': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) + '@parcel/optimizer-image': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/optimizer-svgo': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/optimizer-swc': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) + '@parcel/packager-css': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/packager-html': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/packager-js': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/packager-raw': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/packager-svg': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/packager-wasm': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/reporter-dev-server': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/resolver-default': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/runtime-browser-hmr': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/runtime-js': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/runtime-rsc': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/runtime-service-worker': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/transformer-babel': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/transformer-css': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/transformer-html': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/transformer-image': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/transformer-js': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/transformer-json': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/transformer-node': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/transformer-postcss': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/transformer-posthtml': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/transformer-raw': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/transformer-react-refresh-wrap': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/transformer-svg': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) transitivePeerDependencies: - '@swc/helpers' - cssnano @@ -12145,24 +12145,24 @@ snapshots: - typescript - uncss - '@parcel/core@2.14.0(@swc/helpers@0.5.15)': + '@parcel/core@2.14.1(@swc/helpers@0.5.15)': dependencies: '@mischnic/json-sourcemap': 0.1.1 - '@parcel/cache': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/diagnostic': 2.14.0 - '@parcel/events': 2.14.0 - '@parcel/feature-flags': 2.14.0 - '@parcel/fs': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/graph': 3.4.0 - '@parcel/logger': 2.14.0 - '@parcel/package-manager': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/profiler': 2.14.0 - '@parcel/rust': 2.14.0 + '@parcel/cache': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/diagnostic': 2.14.1 + '@parcel/events': 2.14.1 + '@parcel/feature-flags': 2.14.1 + '@parcel/fs': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/graph': 3.4.1 + '@parcel/logger': 2.14.1 + '@parcel/package-manager': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/profiler': 2.14.1 + '@parcel/rust': 2.14.1 '@parcel/source-map': 2.1.1 - '@parcel/types': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/utils': 2.14.0 - '@parcel/workers': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/types': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.1 + '@parcel/workers': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) base-x: 3.0.10 browserslist: 4.24.4 clone: 2.1.2 @@ -12176,71 +12176,71 @@ snapshots: - '@swc/helpers' - napi-wasm - '@parcel/diagnostic@2.14.0': + '@parcel/diagnostic@2.14.1': dependencies: '@mischnic/json-sourcemap': 0.1.1 nullthrows: 1.1.1 - '@parcel/error-overlay@2.14.0': {} + '@parcel/error-overlay@2.14.1': {} - '@parcel/events@2.14.0': {} + '@parcel/events@2.14.1': {} - '@parcel/feature-flags@2.14.0': {} + '@parcel/feature-flags@2.14.1': {} - '@parcel/fs@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/fs@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/core': 2.14.0(@swc/helpers@0.5.15) - '@parcel/feature-flags': 2.14.0 - '@parcel/rust': 2.14.0 - '@parcel/types-internal': 2.14.0 - '@parcel/utils': 2.14.0 + '@parcel/core': 2.14.1(@swc/helpers@0.5.15) + '@parcel/feature-flags': 2.14.1 + '@parcel/rust': 2.14.1 + '@parcel/types-internal': 2.14.1 + '@parcel/utils': 2.14.1 '@parcel/watcher': 2.5.1 - '@parcel/workers': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/workers': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) transitivePeerDependencies: - napi-wasm - '@parcel/graph@3.4.0': + '@parcel/graph@3.4.1': dependencies: - '@parcel/feature-flags': 2.14.0 + '@parcel/feature-flags': 2.14.1 nullthrows: 1.1.1 - '@parcel/logger@2.14.0': + '@parcel/logger@2.14.1': dependencies: - '@parcel/diagnostic': 2.14.0 - '@parcel/events': 2.14.0 + '@parcel/diagnostic': 2.14.1 + '@parcel/events': 2.14.1 - '@parcel/markdown-ansi@2.14.0': + '@parcel/markdown-ansi@2.14.1': dependencies: chalk: 4.1.2 - '@parcel/namer-default@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/namer-default@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.14.0 - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/diagnostic': 2.14.1 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/node-resolver-core@3.5.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/node-resolver-core@3.5.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@mischnic/json-sourcemap': 0.1.1 - '@parcel/diagnostic': 2.14.0 - '@parcel/fs': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/rust': 2.14.0 - '@parcel/utils': 2.14.0 + '@parcel/diagnostic': 2.14.1 + '@parcel/fs': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/rust': 2.14.1 + '@parcel/utils': 2.14.1 nullthrows: 1.1.1 semver: 7.7.1 transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/optimizer-css@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/optimizer-css@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.14.0 - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/diagnostic': 2.14.1 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) '@parcel/source-map': 2.1.1 - '@parcel/utils': 2.14.0 + '@parcel/utils': 2.14.1 browserslist: 4.24.4 lightningcss: 1.29.1 nullthrows: 1.1.1 @@ -12248,11 +12248,11 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/optimizer-htmlnano@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5)': + '@parcel/optimizer-htmlnano@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5)': dependencies: - '@parcel/diagnostic': 2.14.0 - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/utils': 2.14.0 + '@parcel/diagnostic': 2.14.1 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.1 htmlnano: 2.1.1(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) nullthrows: 1.1.1 posthtml: 0.16.6 @@ -12269,32 +12269,32 @@ snapshots: - typescript - uncss - '@parcel/optimizer-image@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/optimizer-image@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/core': 2.14.0(@swc/helpers@0.5.15) - '@parcel/diagnostic': 2.14.0 - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/rust': 2.14.0 - '@parcel/utils': 2.14.0 - '@parcel/workers': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/core': 2.14.1(@swc/helpers@0.5.15) + '@parcel/diagnostic': 2.14.1 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/rust': 2.14.1 + '@parcel/utils': 2.14.1 + '@parcel/workers': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) transitivePeerDependencies: - napi-wasm - '@parcel/optimizer-svgo@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/optimizer-svgo@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.14.0 - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/utils': 2.14.0 + '@parcel/diagnostic': 2.14.1 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.1 transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/optimizer-swc@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)': + '@parcel/optimizer-swc@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)': dependencies: - '@parcel/diagnostic': 2.14.0 - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/diagnostic': 2.14.1 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) '@parcel/source-map': 2.1.1 - '@parcel/utils': 2.14.0 + '@parcel/utils': 2.14.1 '@swc/core': 1.11.11(@swc/helpers@0.5.15) nullthrows: 1.1.1 transitivePeerDependencies: @@ -12302,198 +12302,198 @@ snapshots: - '@swc/helpers' - napi-wasm - '@parcel/package-manager@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)': + '@parcel/package-manager@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)': dependencies: - '@parcel/core': 2.14.0(@swc/helpers@0.5.15) - '@parcel/diagnostic': 2.14.0 - '@parcel/fs': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/logger': 2.14.0 - '@parcel/node-resolver-core': 3.5.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/types': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/utils': 2.14.0 - '@parcel/workers': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/core': 2.14.1(@swc/helpers@0.5.15) + '@parcel/diagnostic': 2.14.1 + '@parcel/fs': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/logger': 2.14.1 + '@parcel/node-resolver-core': 3.5.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/types': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.1 + '@parcel/workers': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) '@swc/core': 1.11.11(@swc/helpers@0.5.15) semver: 7.7.1 transitivePeerDependencies: - '@swc/helpers' - napi-wasm - '@parcel/packager-css@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/packager-css@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.14.0 - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/diagnostic': 2.14.1 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) '@parcel/source-map': 2.1.1 - '@parcel/utils': 2.14.0 + '@parcel/utils': 2.14.1 lightningcss: 1.29.1 nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/packager-html@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/packager-html@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/types': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/utils': 2.14.0 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/types': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.1 nullthrows: 1.1.1 posthtml: 0.16.6 transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/packager-js@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/packager-js@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.14.0 - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/rust': 2.14.0 + '@parcel/diagnostic': 2.14.1 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/rust': 2.14.1 '@parcel/source-map': 2.1.1 - '@parcel/types': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/utils': 2.14.0 + '@parcel/types': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.1 globals: 13.24.0 nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/packager-raw@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/packager-raw@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/packager-react-static@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/packager-react-static@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/node-resolver-core': 3.5.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/rust': 2.14.0 - '@parcel/types': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/utils': 2.14.0 + '@parcel/node-resolver-core': 3.5.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/rust': 2.14.1 + '@parcel/types': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.1 nullthrows: 1.1.1 rsc-html-stream: 0.0.4 transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/packager-svg@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/packager-svg@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/types': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/utils': 2.14.0 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/types': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.1 posthtml: 0.16.6 transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/packager-wasm@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/packager-wasm@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/plugin@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/plugin@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/types': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/types': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/profiler@2.14.0': + '@parcel/profiler@2.14.1': dependencies: - '@parcel/diagnostic': 2.14.0 - '@parcel/events': 2.14.0 - '@parcel/types-internal': 2.14.0 + '@parcel/diagnostic': 2.14.1 + '@parcel/events': 2.14.1 + '@parcel/types-internal': 2.14.1 chrome-trace-event: 1.0.4 - '@parcel/reporter-cli@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/reporter-cli@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/types': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/utils': 2.14.0 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/types': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.1 chalk: 4.1.2 term-size: 2.2.1 transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/reporter-dev-server@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/reporter-dev-server@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/codeframe': 2.14.0 - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/codeframe': 2.14.1 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) '@parcel/source-map': 2.1.1 - '@parcel/utils': 2.14.0 + '@parcel/utils': 2.14.1 transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/reporter-tracer@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/reporter-tracer@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/utils': 2.14.0 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.1 chrome-trace-event: 1.0.4 nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/resolver-default@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/resolver-default@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/node-resolver-core': 3.5.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/node-resolver-core': 3.5.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/runtime-browser-hmr@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/runtime-browser-hmr@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/utils': 2.14.0 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.1 transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/runtime-js@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/runtime-js@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.14.0 - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/utils': 2.14.0 + '@parcel/diagnostic': 2.14.1 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.1 nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/runtime-rsc@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/runtime-rsc@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/rust': 2.14.0 - '@parcel/utils': 2.14.0 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/rust': 2.14.1 + '@parcel/utils': 2.14.1 nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/runtime-service-worker@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/runtime-service-worker@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/utils': 2.14.0 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.1 nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/rust@2.14.0': {} + '@parcel/rust@2.14.1': {} '@parcel/source-map@2.1.1': dependencies: detect-libc: 1.0.3 - '@parcel/transformer-babel@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/transformer-babel@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.14.0 - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/diagnostic': 2.14.1 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) '@parcel/source-map': 2.1.1 - '@parcel/utils': 2.14.0 + '@parcel/utils': 2.14.1 browserslist: 4.24.4 json5: 2.2.3 nullthrows: 1.1.1 @@ -12502,12 +12502,12 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-css@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/transformer-css@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.14.0 - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/diagnostic': 2.14.1 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) '@parcel/source-map': 2.1.1 - '@parcel/utils': 2.14.0 + '@parcel/utils': 2.14.1 browserslist: 4.24.4 lightningcss: 1.29.1 nullthrows: 1.1.1 @@ -12515,11 +12515,11 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-html@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/transformer-html@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.14.0 - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/rust': 2.14.0 + '@parcel/diagnostic': 2.14.1 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/rust': 2.14.1 nullthrows: 1.1.1 posthtml: 0.16.6 posthtml-parser: 0.12.1 @@ -12530,25 +12530,25 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-image@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/transformer-image@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/core': 2.14.0(@swc/helpers@0.5.15) - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/utils': 2.14.0 - '@parcel/workers': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/core': 2.14.1(@swc/helpers@0.5.15) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.1 + '@parcel/workers': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) nullthrows: 1.1.1 transitivePeerDependencies: - napi-wasm - '@parcel/transformer-js@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/transformer-js@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/core': 2.14.0(@swc/helpers@0.5.15) - '@parcel/diagnostic': 2.14.0 - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/rust': 2.14.0 + '@parcel/core': 2.14.1(@swc/helpers@0.5.15) + '@parcel/diagnostic': 2.14.1 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/rust': 2.14.1 '@parcel/source-map': 2.1.1 - '@parcel/utils': 2.14.0 - '@parcel/workers': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.1 + '@parcel/workers': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) '@swc/helpers': 0.5.15 browserslist: 4.24.4 nullthrows: 1.1.1 @@ -12557,27 +12557,27 @@ snapshots: transitivePeerDependencies: - napi-wasm - '@parcel/transformer-json@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/transformer-json@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) json5: 2.2.3 transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/transformer-node@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/transformer-node@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/transformer-postcss@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/transformer-postcss@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.14.0 - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/rust': 2.14.0 - '@parcel/utils': 2.14.0 + '@parcel/diagnostic': 2.14.1 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/rust': 2.14.1 + '@parcel/utils': 2.14.1 clone: 2.1.2 nullthrows: 1.1.1 postcss-value-parser: 4.2.0 @@ -12586,10 +12586,10 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-posthtml@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/transformer-posthtml@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/utils': 2.14.0 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.1 nullthrows: 1.1.1 posthtml: 0.16.6 posthtml-parser: 0.12.1 @@ -12599,35 +12599,35 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-raw@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/transformer-raw@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/transformer-react-refresh-wrap@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/transformer-react-refresh-wrap@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/error-overlay': 2.14.0 - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/utils': 2.14.0 + '@parcel/error-overlay': 2.14.1 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.1 react-refresh: 0.14.2 transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/transformer-react-static@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/transformer-react-static@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/transformer-svg@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/transformer-svg@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/diagnostic': 2.14.0 - '@parcel/plugin': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/rust': 2.14.0 + '@parcel/diagnostic': 2.14.1 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/rust': 2.14.1 nullthrows: 1.1.1 posthtml: 0.16.6 posthtml-parser: 0.12.1 @@ -12637,28 +12637,28 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/types-internal@2.14.0': + '@parcel/types-internal@2.14.1': dependencies: - '@parcel/diagnostic': 2.14.0 - '@parcel/feature-flags': 2.14.0 + '@parcel/diagnostic': 2.14.1 + '@parcel/feature-flags': 2.14.1 '@parcel/source-map': 2.1.1 utility-types: 3.11.0 - '@parcel/types@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/types@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/types-internal': 2.14.0 - '@parcel/workers': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) + '@parcel/types-internal': 2.14.1 + '@parcel/workers': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/utils@2.14.0': + '@parcel/utils@2.14.1': dependencies: - '@parcel/codeframe': 2.14.0 - '@parcel/diagnostic': 2.14.0 - '@parcel/logger': 2.14.0 - '@parcel/markdown-ansi': 2.14.0 - '@parcel/rust': 2.14.0 + '@parcel/codeframe': 2.14.1 + '@parcel/diagnostic': 2.14.1 + '@parcel/logger': 2.14.1 + '@parcel/markdown-ansi': 2.14.1 + '@parcel/rust': 2.14.1 '@parcel/source-map': 2.1.1 chalk: 4.1.2 nullthrows: 1.1.1 @@ -12725,14 +12725,14 @@ snapshots: '@parcel/watcher-win32-ia32': 2.5.1 '@parcel/watcher-win32-x64': 2.5.1 - '@parcel/workers@2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))': + '@parcel/workers@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: - '@parcel/core': 2.14.0(@swc/helpers@0.5.15) - '@parcel/diagnostic': 2.14.0 - '@parcel/logger': 2.14.0 - '@parcel/profiler': 2.14.0 - '@parcel/types-internal': 2.14.0 - '@parcel/utils': 2.14.0 + '@parcel/core': 2.14.1(@swc/helpers@0.5.15) + '@parcel/diagnostic': 2.14.1 + '@parcel/logger': 2.14.1 + '@parcel/profiler': 2.14.1 + '@parcel/types-internal': 2.14.1 + '@parcel/utils': 2.14.1 nullthrows: 1.1.1 transitivePeerDependencies: - napi-wasm @@ -17900,20 +17900,20 @@ snapshots: pako@1.0.11: {} - parcel@2.14.0(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5): - dependencies: - '@parcel/config-default': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) - '@parcel/core': 2.14.0(@swc/helpers@0.5.15) - '@parcel/diagnostic': 2.14.0 - '@parcel/events': 2.14.0 - '@parcel/feature-flags': 2.14.0 - '@parcel/fs': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/logger': 2.14.0 - '@parcel/package-manager': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) - '@parcel/reporter-cli': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/reporter-dev-server': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/reporter-tracer': 2.14.0(@parcel/core@2.14.0(@swc/helpers@0.5.15)) - '@parcel/utils': 2.14.0 + parcel@2.14.1(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5): + dependencies: + '@parcel/config-default': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) + '@parcel/core': 2.14.1(@swc/helpers@0.5.15) + '@parcel/diagnostic': 2.14.1 + '@parcel/events': 2.14.1 + '@parcel/feature-flags': 2.14.1 + '@parcel/fs': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/logger': 2.14.1 + '@parcel/package-manager': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) + '@parcel/reporter-cli': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/reporter-dev-server': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/reporter-tracer': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/utils': 2.14.1 chalk: 4.1.2 commander: 12.1.0 get-port: 4.2.0 From 4849e20fc5d932c42514a9b06130d55fb2c3e1db Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Tue, 25 Mar 2025 14:58:00 -0700 Subject: [PATCH 025/143] update deps for tests to begin to be migrated to React 19. --- package.json | 12 +++---- pnpm-lock.yaml | 85 +++++++++++++++++++++++++------------------------- 2 files changed, 49 insertions(+), 48 deletions(-) diff --git a/package.json b/package.json index d66c911f6c..e63afa3402 100644 --- a/package.json +++ b/package.json @@ -61,17 +61,17 @@ "@playwright/test": "^1.49.1", "@remix-run/changelog-github": "^0.0.5", "@testing-library/jest-dom": "5.17.0", - "@testing-library/react": "^13.4.0", - "@testing-library/user-event": "^14.5.2", + "@testing-library/react": "^16.2.0", + "@testing-library/user-event": "^14.6.1", "@types/cross-spawn": "^6.0.2", "@types/fs-extra": "^8.1.2", "@types/glob": "7.2.0", "@types/jest": "^29.5.4", "@types/jsdom": "^21.1.1", "@types/jsonfile": "^6.1.1", - "@types/react": "^18.2.18", - "@types/react-dom": "^18.2.7", - "@types/react-test-renderer": "^18.0.0", + "@types/react": "^19.0.12", + "@types/react-dom": "^19.0.4", + "@types/react-test-renderer": "^19.0.0", "@types/semver": "^7.5.0", "@types/shelljs": "^0.8.11", "@types/wait-on": "^5.3.2", @@ -99,7 +99,7 @@ "prompts": "^2.4.2", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-test-renderer": "^18.2.0", + "react-test-renderer": "^19.0.0", "remark-gfm": "3.0.1", "remark-parse": "^10.0.1", "remark-stringify": "^10.0.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8c9e317bba..c7251231f3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -76,11 +76,11 @@ importers: specifier: 5.17.0 version: 5.17.0 '@testing-library/react': - specifier: ^13.4.0 - version: 13.4.0(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209) + specifier: ^16.2.0 + version: 16.2.0(@testing-library/dom@8.17.1)(@types/react-dom@18.2.7)(@types/react@18.2.18)(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209) '@testing-library/user-event': - specifier: ^14.5.2 - version: 14.5.2(@testing-library/dom@8.17.1) + specifier: ^14.6.1 + version: 14.6.1(@testing-library/dom@8.17.1) '@types/cross-spawn': specifier: ^6.0.2 version: 6.0.6 @@ -106,8 +106,8 @@ importers: specifier: ^18.2.7 version: 18.2.7 '@types/react-test-renderer': - specifier: ^18.0.0 - version: 18.0.0 + specifier: ^19.0.0 + version: 19.0.0 '@types/semver': specifier: ^7.5.0 version: 7.5.0 @@ -193,8 +193,8 @@ importers: specifier: 0.0.0-experimental-93b58361-20250209 version: 0.0.0-experimental-93b58361-20250209(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209) react-test-renderer: - specifier: ^18.2.0 - version: 18.2.0(react@0.0.0-experimental-93b58361-20250209) + specifier: ^19.0.0 + version: 19.0.0(react@0.0.0-experimental-93b58361-20250209) remark-gfm: specifier: 3.0.1 version: 3.0.1 @@ -4309,15 +4309,23 @@ packages: resolution: {integrity: sha512-ynmNeT7asXyH3aSVv4vvX4Rb+0qjOhdNHnO/3vuZNqPmhDpV/+rCSGwQ7bLcmU2cJ4dvoheIO85LQj0IbJHEtg==} engines: {node: '>=8', npm: '>=6', yarn: '>=1'} - '@testing-library/react@13.4.0': - resolution: {integrity: sha512-sXOGON+WNTh3MLE9rve97ftaZukN3oNf2KjDy7YTx6hcTO2uuLHuCGynMDhFwGw/jYf4OJ2Qk0i4i79qMNNkyw==} - engines: {node: '>=12'} + '@testing-library/react@16.2.0': + resolution: {integrity: sha512-2cSskAvA1QNtKc8Y9VJQRv0tm3hLVgxRGDB+KYhIaPQJ1I+RHbhIXcM+zClKXzMes/wshsMVzf4B9vS4IZpqDQ==} + engines: {node: '>=18'} peerDependencies: + '@testing-library/dom': ^10.0.0 + '@types/react': ^18.2.18 + '@types/react-dom': ^18.2.7 react: 0.0.0-experimental-93b58361-20250209 react-dom: 0.0.0-experimental-93b58361-20250209 + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true - '@testing-library/user-event@14.5.2': - resolution: {integrity: sha512-YAh82Wh4TIrxYLmfGcixwD18oIjyC1pFQC2Y01F2lzV2HTMiYrI0nze0FD0ocB//CKS/7jIUgae+adPqxK5yCQ==} + '@testing-library/user-event@14.6.1': + resolution: {integrity: sha512-vq7fv0rnt+QTXgPxr5Hjc210p6YKq2kmdziLgnsZGgLJ9e6VAShx1pACLuRjd/AS/sr7phAR58OIIpf0LlmQNw==} engines: {node: '>=12', npm: '>=6'} peerDependencies: '@testing-library/dom': '>=7.21.4' @@ -4527,8 +4535,8 @@ packages: '@types/react-dom@18.2.7': resolution: {integrity: sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==} - '@types/react-test-renderer@18.0.0': - resolution: {integrity: sha512-C7/5FBJ3g3sqUahguGi03O79b8afNeSD6T8/GU50oQrJCU0bVCCGQHaGKUbg2Ce8VQEEqTw8/HiS6lXHHdgkdQ==} + '@types/react-test-renderer@19.0.0': + resolution: {integrity: sha512-qDVnNybqFm2eZKJ4jD34EvRd6VHD67KjgnWaEMM0Id9L22EpWe3nOSVKHWL1XWRCxUWe3lhXwlEeCKD1BlJCQA==} '@types/react@18.2.18': resolution: {integrity: sha512-da4NTSeBv/P34xoZPhtcLkmZuJ+oYaCxHmyHzwaDQo9RQPBeXV+06gEk2FpqEcsX9XrnNLvRpVh6bdavDSjtiQ==} @@ -8313,6 +8321,9 @@ packages: react-is@18.2.0: resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==} + react-is@19.0.0: + resolution: {integrity: sha512-H91OHcwjZsbq3ClIDHMzBShc1rotbfACdWENsmEf0IFvZ3FgGPtdHMcsv45bQ1hAbgdfiA8SnxTKfDS+x/8m2g==} + react-refresh@0.14.0: resolution: {integrity: sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==} engines: {node: '>=0.10.0'} @@ -8328,13 +8339,8 @@ packages: react: 0.0.0-experimental-93b58361-20250209 react-dom: 0.0.0-experimental-93b58361-20250209 - react-shallow-renderer@16.15.0: - resolution: {integrity: sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA==} - peerDependencies: - react: 0.0.0-experimental-93b58361-20250209 - - react-test-renderer@18.2.0: - resolution: {integrity: sha512-JWD+aQ0lh2gvh4NM3bBM42Kx+XybOxCpgYK7F8ugAlpaTSnWsX+39Z4XkOykGZAHrjwwTZT3x3KxswVWxHPUqA==} + react-test-renderer@19.0.0: + resolution: {integrity: sha512-oX5u9rOQlHzqrE/64CNr0HB0uWxkCQmZNSfozlYvwE71TLVgeZxVf0IjouGEr1v7r1kcDifdAJBeOhdhxsG/DA==} peerDependencies: react: 0.0.0-experimental-93b58361-20250209 @@ -8571,8 +8577,8 @@ packages: scheduler@0.0.0-experimental-93b58361-20250209: resolution: {integrity: sha512-/jHVwrXds2Amuht81tUvUBZsziu1rzbtd1TYnDWmFU+tHWeRGOw88DjGcUrWRGJem63nDzVZwl0wY+flJXj6JQ==} - scheduler@0.23.0: - resolution: {integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==} + scheduler@0.25.0: + resolution: {integrity: sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==} selfsigned@2.4.1: resolution: {integrity: sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==} @@ -13000,7 +13006,7 @@ snapshots: '@testing-library/dom@8.17.1': dependencies: - '@babel/code-frame': 7.24.2 + '@babel/code-frame': 7.26.2 '@babel/runtime': 7.24.1 '@types/aria-query': 4.2.2 aria-query: 5.3.0 @@ -13021,15 +13027,17 @@ snapshots: lodash: 4.17.21 redent: 3.0.0 - '@testing-library/react@13.4.0(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209)': + '@testing-library/react@16.2.0(@testing-library/dom@8.17.1)(@types/react-dom@18.2.7)(@types/react@18.2.18)(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209)': dependencies: '@babel/runtime': 7.24.1 '@testing-library/dom': 8.17.1 - '@types/react-dom': 18.2.7 react: 0.0.0-experimental-93b58361-20250209 react-dom: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) + optionalDependencies: + '@types/react': 18.2.18 + '@types/react-dom': 18.2.7 - '@testing-library/user-event@14.5.2(@testing-library/dom@8.17.1)': + '@testing-library/user-event@14.6.1(@testing-library/dom@8.17.1)': dependencies: '@testing-library/dom': 8.17.1 @@ -13263,7 +13271,7 @@ snapshots: dependencies: '@types/react': 18.2.18 - '@types/react-test-renderer@18.0.0': + '@types/react-test-renderer@19.0.0': dependencies: '@types/react': 18.2.18 @@ -18277,6 +18285,8 @@ snapshots: react-is@18.2.0: {} + react-is@19.0.0: {} + react-refresh@0.14.0: {} react-refresh@0.14.2: {} @@ -18286,18 +18296,11 @@ snapshots: react: 0.0.0-experimental-93b58361-20250209 react-dom: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) - react-shallow-renderer@16.15.0(react@0.0.0-experimental-93b58361-20250209): + react-test-renderer@19.0.0(react@0.0.0-experimental-93b58361-20250209): dependencies: - object-assign: 4.1.1 react: 0.0.0-experimental-93b58361-20250209 - react-is: 18.2.0 - - react-test-renderer@18.2.0(react@0.0.0-experimental-93b58361-20250209): - dependencies: - react: 0.0.0-experimental-93b58361-20250209 - react-is: 18.2.0 - react-shallow-renderer: 16.15.0(react@0.0.0-experimental-93b58361-20250209) - scheduler: 0.23.0 + react-is: 19.0.0 + scheduler: 0.25.0 react@0.0.0-experimental-93b58361-20250209: {} @@ -18618,9 +18621,7 @@ snapshots: scheduler@0.0.0-experimental-93b58361-20250209: {} - scheduler@0.23.0: - dependencies: - loose-envify: 1.4.0 + scheduler@0.25.0: {} selfsigned@2.4.1: dependencies: From 48ac62f59816e3ebc9e3d46548d525acf1b95f73 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Wed, 9 Apr 2025 15:53:22 -0400 Subject: [PATCH 026/143] Add future flag values --- packages/react-router/lib/server.browser.tsx | 6 +++++- packages/react-router/lib/server.static.tsx | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index b83fdd3970..61d97f0cee 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -118,7 +118,11 @@ export function ServerBrowserRouter({ }).initialize(); const frameworkContext: FrameworkContextObject = { - future: {}, + future: { + // TODO: Update these + unstable_middleware: false, + unstable_subResourceIntegrity: false, + }, isSpaMode: true, ssr: true, criticalCss: "", diff --git a/packages/react-router/lib/server.static.tsx b/packages/react-router/lib/server.static.tsx index 7f2b5a0b09..38865bf049 100644 --- a/packages/react-router/lib/server.static.tsx +++ b/packages/react-router/lib/server.static.tsx @@ -85,7 +85,11 @@ export function ServerStaticRouter({ payload }: { payload: ServerPayload }) { ); const frameworkContext: FrameworkContextObject = { - future: {}, + future: { + // TODO: Update these + unstable_middleware: false, + unstable_subResourceIntegrity: false, + }, isSpaMode: false, ssr: false, criticalCss: "", From 858e9d457406ab94fa5176075f2042e873fc151e Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Wed, 9 Apr 2025 13:13:12 -0700 Subject: [PATCH 027/143] remove overrides --- playground/rsc-vite/package.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/playground/rsc-vite/package.json b/playground/rsc-vite/package.json index f218880948..8f715d449f 100644 --- a/playground/rsc-vite/package.json +++ b/playground/rsc-vite/package.json @@ -27,11 +27,5 @@ "react": "^19.0.0", "react-dom": "^19.0.0", "react-router": "workspace:*" - }, - "pnpm": { - "overrides": { - "react": "^19.0.0", - "react-dom": "^19.0.0" - } } } From 6eab18dbeae40dc2cd2d591325490385479bcea2 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Wed, 9 Apr 2025 15:55:00 -0700 Subject: [PATCH 028/143] fix error boundaries --- packages/react-router/lib/server.browser.tsx | 48 +++++++++++++------ .../rsc-vite/src/routes/about/about.tsx | 1 + 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index 61d97f0cee..6214561c1c 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -4,7 +4,7 @@ import type { DataRouteObject } from "./context"; import { FrameworkContext } from "./dom/ssr/components"; import type { FrameworkContextObject } from "./dom/ssr/entry"; import { createBrowserHistory } from "./router/history"; -import { createRouter } from "./router/router"; +import { type Router, createRouter } from "./router/router"; import type { ServerPayload, ServerRouteManifest } from "./server"; import { RouteWrapper } from "./server.static"; @@ -12,20 +12,24 @@ export type DecodeServerResponseFunction = ( body: ReadableStream ) => Promise; -let router: ReturnType | undefined; +declare global { + interface Window { + __router: Router; + } +} -export function ServerBrowserRouter({ +function createRouterFromPayload({ decode, payload, }: { - decode: DecodeServerResponseFunction; payload: ServerPayload; + decode: DecodeServerResponseFunction; }) { - if (payload.type !== "render") return null; + if (window.__router) return window.__router; - // TODO: Make this a singleton? Re-create this when the payload changes? - // At a minimum, update the singleton with new state when the payload changes. - const routes = payload.matches.reduceRight((previous, match) => { + if (payload.type !== "render") throw new Error("Invalid payload type"); + + let routes = payload.matches.reduceRight((previous, match) => { const route: DataRouteObject = createRouteFromServerManifest(match); if (previous.length > 0) { route.children = previous; @@ -33,7 +37,7 @@ export function ServerBrowserRouter({ return [route]; }, [] as DataRouteObject[]); - router ??= createRouter({ + return (window.__router = createRouter({ basename: payload.basename, history: createBrowserHistory(), hydrationData: { @@ -41,7 +45,7 @@ export function ServerBrowserRouter({ errors: payload.errors, loaderData: payload.loaderData, }, - routes: routes, + routes, async patchRoutesOnNavigation({ patch, path, signal }) { const response = await fetch(`${path}.manifest`, { signal }); if (!response.body || response.status < 200 || response.status >= 300) { @@ -59,7 +63,7 @@ export function ServerBrowserRouter({ } }, async dataStrategy({ matches, request }) { - if (!router) { + if (!window.__router) { throw new Error("No router"); } @@ -83,7 +87,7 @@ export function ServerBrowserRouter({ let lastMatch: ServerRouteManifest | undefined; for (const match of payload.matches) { - router.patchRoutes(lastMatch?.id ?? null, [ + window.__router.patchRoutes(lastMatch?.id ?? null, [ createRouteFromServerManifest(match), ]); lastMatch = match; @@ -115,7 +119,23 @@ export function ServerBrowserRouter({ return res; }, - }).initialize(); + }).initialize()); +} + +export function ServerBrowserRouter({ + decode, + payload, +}: { + decode: DecodeServerResponseFunction; + payload: ServerPayload; +}) { + if (payload.type !== "render") throw new Error("Invalid payload type"); + + let router = React.useMemo( + () => createRouterFromPayload({ decode, payload }), + // eslint-disable-next-line react-hooks/exhaustive-deps + [] + ); const frameworkContext: FrameworkContextObject = { future: { @@ -163,7 +183,7 @@ function createRouteFromServerManifest( Layout: match.Layout, }, element: , - ErrorBoundary: match.ErrorBoundary, + errorElement: match.ErrorBoundary ? : undefined, handle: match.handle, hasErrorBoundary: !!match.ErrorBoundary, HydrateFallback: match.HydrateFallback, diff --git a/playground/rsc-vite/src/routes/about/about.tsx b/playground/rsc-vite/src/routes/about/about.tsx index 815c50903d..890e7c7e0d 100644 --- a/playground/rsc-vite/src/routes/about/about.tsx +++ b/playground/rsc-vite/src/routes/about/about.tsx @@ -1,6 +1,7 @@ export { clientLoader, default } from "./about.client"; export function loader() { + throw new Error("Oops"); return { message: "Hello About!", }; From 2914b1d4631fc3c7605089c4375086bf5bd1b8d9 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Wed, 9 Apr 2025 18:11:07 -0700 Subject: [PATCH 029/143] - fixup Layout - simplify payload --- packages/react-router/lib/server.browser.tsx | 29 ++++--- packages/react-router/lib/server.static.tsx | 40 ++------- packages/react-router/lib/server.ts | 89 +++++++++++--------- playground/rsc-vite/src/routes/root/root.tsx | 6 +- 4 files changed, 75 insertions(+), 89 deletions(-) diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index 6214561c1c..7c8b904c1b 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -6,7 +6,6 @@ import type { FrameworkContextObject } from "./dom/ssr/entry"; import { createBrowserHistory } from "./router/history"; import { type Router, createRouter } from "./router/router"; import type { ServerPayload, ServerRouteManifest } from "./server"; -import { RouteWrapper } from "./server.static"; export type DecodeServerResponseFunction = ( body: ReadableStream @@ -112,10 +111,19 @@ function createRouterFromPayload({ return payload[dataKey]?.[match.route.id]; }); - return [match.route.id, result]; + return [ + match.route.id, + payload.errors?.[match.route.id] + ? { + type: "error", + result: payload.errors[match.route.id], + } + : result, + ]; }) )), ]); + console.log({ res }); return res; }, @@ -171,22 +179,15 @@ export function ServerBrowserRouter({ function createRouteFromServerManifest( match: ServerRouteManifest -): DataRouteObject & { - rendered: { Component: any; element: any; Layout: any }; -} { +): DataRouteObject { return { id: match.id, action: match.hasAction || !!match.clientAction, - rendered: { - Component: match.Component, - element: match.element, - Layout: match.Layout, - }, - element: , - errorElement: match.ErrorBoundary ? : undefined, + element: match.element, + errorElement: match.errorElement, handle: match.handle, - hasErrorBoundary: !!match.ErrorBoundary, - HydrateFallback: match.HydrateFallback, + hasErrorBoundary: match.hasErrorBoundary, + hydrateFallbackElement: match.hydrateFallbackElement, index: match.index, loader: match.hasLoader || !!match.clientLoader, path: match.path, diff --git a/packages/react-router/lib/server.static.tsx b/packages/react-router/lib/server.static.tsx index 38865bf049..59d4cbfe72 100644 --- a/packages/react-router/lib/server.static.tsx +++ b/packages/react-router/lib/server.static.tsx @@ -1,29 +1,10 @@ import * as React from "react"; -import { RouteContext, type DataRouteObject } from "./context"; +import { type DataRouteObject } from "./context"; import { FrameworkContext } from "./dom/ssr/components"; import type { FrameworkContextObject } from "./dom/ssr/entry"; import { createStaticRouter, StaticRouterProvider } from "./dom/server"; import type { ServerPayload } from "./server"; -export function RouteWrapper({ id }: { id: string }) { - const ctx = React.useContext(RouteContext); - const match = ctx.matches.find((match) => match.route.id === id); - - if (!match) { - throw new Error(`No match found for route with id "${id}"`); - } - - const { Component, element, Layout } = (match as any).route.rendered as any; - - return Layout ? ( - {Component ? : element} - ) : Component ? ( - - ) : ( - element - ); -} - export function ServerStaticRouter({ payload }: { payload: ServerPayload }) { if (payload.type !== "render") return null; @@ -45,7 +26,7 @@ export function ServerStaticRouter({ payload }: { payload: ServerPayload }) { id: match.id, action: match.hasAction || !!match.clientAction, handle: match.handle, - hasErrorBoundary: !!match.ErrorBoundary, + hasErrorBoundary: match.hasErrorBoundary, loader: match.hasLoader || !!match.clientLoader, index: match.index, path: match.path, @@ -56,21 +37,14 @@ export function ServerStaticRouter({ payload }: { payload: ServerPayload }) { const router = createStaticRouter( payload.matches.reduceRight((previous, match) => { - const route: DataRouteObject & { - rendered: { Component: any; element: any; Layout: any }; - } = { + const route: DataRouteObject = { id: match.id, action: match.hasAction || !!match.clientAction, - rendered: { - Component: match.Component, - element: match.element, - Layout: match.Layout, - }, - element: , - ErrorBoundary: match.ErrorBoundary, + element: match.element, + errorElement: match.errorElement, handle: match.handle, - hasErrorBoundary: !!match.ErrorBoundary, - HydrateFallback: match.HydrateFallback, + hasErrorBoundary: !!match.errorElement, + hydrateFallbackElement: match.hydrateFallbackElement, index: match.index, loader: match.hasLoader || !!match.clientLoader, path: match.path, diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index 5a208d5351..4926002c21 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -1,4 +1,4 @@ -import { createElement } from "react"; +import * as React from "react"; import type { ClientActionFunction, @@ -51,16 +51,15 @@ export type ServerRouteObject = ServerRouteObjectBase & { export type ServerRouteManifest = { clientAction?: ClientActionFunction; clientLoader?: ClientLoaderFunction; - Component?: React.ComponentType; - element?: React.ReactElement | null; - ErrorBoundary?: React.ComponentType; + element?: React.ReactElement; + errorElement?: React.ReactElement; handle?: any; hasAction: boolean; + hasErrorBoundary: boolean; hasLoader: boolean; - HydrateFallback?: React.ComponentType; + hydrateFallbackElement?: React.ReactElement; id: string; index?: boolean; - Layout?: React.ComponentType; links?: LinksFunction; meta?: MetaFunction; path?: string; @@ -130,21 +129,16 @@ export async function matchServerRequest( }; } - const componentIsClientReference = isClientReference(route.default); - return { clientAction: route.clientAction, clientLoader: route.clientLoader, - Component: componentIsClientReference ? route.default : undefined, - ErrorBoundary: route.ErrorBoundary, handle: route.handle, hasAction: !!route.action, + hasErrorBoundary: !!route.ErrorBoundary, hasLoader: !!route.loader, - HydrateFallback: route.HydrateFallback, id: route.id, path: route.path, index: "index" in route ? route.index : undefined, - Layout: route.Layout, links: route.links, meta: route.meta, }; @@ -183,31 +177,59 @@ export async function matchServerRequest( loaderData: result.loaderData, location: result.location, matches: result.matches.map((match) => { - const componentIsClientReference = isClientReference( - (match.route as any).default - ); + const Layout = (match.route as any).Layout || React.Fragment; + const Component = (match.route as any).default; + const ErrorBoundary = (match.route as any).ErrorBoundary; + const HydrateFallback = (match.route as any).HydrateFallback; + const element = Component + ? React.createElement( + Layout, + { + loaderData: result.loaderData[match.route.id], + actionData: result.actionData?.[match.route.id], + }, + React.createElement(Component, { + loaderData: result.loaderData[match.route.id], + actionData: result.actionData?.[match.route.id], + }) + ) + : undefined; + const errorElement = ErrorBoundary + ? React.createElement( + Layout, + { + loaderData: result.loaderData[match.route.id], + actionData: result.actionData?.[match.route.id], + }, + React.createElement(ErrorBoundary) + ) + : undefined; + const hydrateFallbackElement = HydrateFallback + ? React.createElement( + Layout, + { + loaderData: result.loaderData[match.route.id], + actionData: result.actionData?.[match.route.id], + }, + React.createElement(HydrateFallback, { + loaderData: result.loaderData[match.route.id], + actionData: result.actionData?.[match.route.id], + }) + ) + : undefined; return { clientAction: (match.route as any).clientAction, clientLoader: (match.route as any).clientLoader, - Component: componentIsClientReference - ? (match.route as any).default - : undefined, - element: - (match.route as any).default && !componentIsClientReference - ? createElement((match.route as any).default, { - actionData: result.actionData?.[match.route.id], - loaderData: result.loaderData[match.route.id], - }) - : null, - ErrorBoundary: (match.route as any).ErrorBoundary, + element, + errorElement, handle: (match.route as any).handle, hasAction: !!match.route.action, + hasErrorBoundary: !!(match.route as any).ErrorBoundary, hasLoader: !!match.route.loader, - HydrateFallback: (match.route as any).HydrateFallback, + hydrateFallbackElement, id: match.route.id, index: match.route.index, - Layout: (match.route as any).Layout, links: (match.route as any).links, meta: (match.route as any).meta, params: match.params, @@ -297,14 +319,3 @@ export function isReactServerRequest(url: URL) { export function isManifestRequest(url: URL) { return url.pathname.endsWith(".manifest"); } - -const CLIENT_REFERENCE_TAG = Symbol.for("react.client.reference"); - -function isClientReference(obj: unknown) { - return ( - obj && - (typeof obj === "object" || typeof obj === "function") && - "$$typeof" in obj && - obj.$$typeof === CLIENT_REFERENCE_TAG - ); -} diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx index 11f7f21fdf..dffa5a6595 100644 --- a/playground/rsc-vite/src/routes/root/root.tsx +++ b/playground/rsc-vite/src/routes/root/root.tsx @@ -17,7 +17,7 @@ export default function Root({ loaderData: Awaited>; }) { return ( - + <>

{message}

  • @@ -29,11 +29,11 @@ export default function Root({
{counter} - + ); } -function Layout({ children }: { children: React.ReactNode }) { +export function Layout({ children }: { children: React.ReactNode }) { return ( From 3cee45f6b390da740e1df4814277ec302da5f658 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Wed, 9 Apr 2025 19:27:43 -0700 Subject: [PATCH 030/143] make root a complete server route --- .../rsc-vite/src/routes/about/about.tsx | 2 +- .../rsc-vite/src/routes/root/root.client.tsx | 51 ------------------- playground/rsc-vite/src/routes/root/root.tsx | 25 +++++---- 3 files changed, 16 insertions(+), 62 deletions(-) delete mode 100644 playground/rsc-vite/src/routes/root/root.client.tsx diff --git a/playground/rsc-vite/src/routes/about/about.tsx b/playground/rsc-vite/src/routes/about/about.tsx index 890e7c7e0d..9316973b40 100644 --- a/playground/rsc-vite/src/routes/about/about.tsx +++ b/playground/rsc-vite/src/routes/about/about.tsx @@ -1,7 +1,7 @@ export { clientLoader, default } from "./about.client"; export function loader() { - throw new Error("Oops"); + // throw new Error("Oops"); return { message: "Hello About!", }; diff --git a/playground/rsc-vite/src/routes/root/root.client.tsx b/playground/rsc-vite/src/routes/root/root.client.tsx deleted file mode 100644 index d5e190d168..0000000000 --- a/playground/rsc-vite/src/routes/root/root.client.tsx +++ /dev/null @@ -1,51 +0,0 @@ -"use client"; - -import { - Link, - Links, - Outlet, - ScrollRestoration, - useLoaderData, -} from "react-router"; - -import type { loader } from "./root"; - -export function Layout({ children }: { children: React.ReactNode }) { - return ( - - - - - React Server - - - - {children} - - - - ); -} - -export default function Root() { - const { counter, message } = useLoaderData(); - return ( - <> -

{message}

-
    -
  • - Home -
    • -
  • - About -
    • -
- {counter} - - - ); -} - -export function ErrorBoundary() { - return

Something went wrong!

; -} diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx index dffa5a6595..c36aa3fdcb 100644 --- a/playground/rsc-vite/src/routes/root/root.tsx +++ b/playground/rsc-vite/src/routes/root/root.tsx @@ -1,7 +1,5 @@ import { Link, Links, Outlet, ScrollRestoration } from "react-router"; -export { ErrorBoundary } from "./root.client"; - import { Counter } from "../../counter"; export function loader() { @@ -19,20 +17,16 @@ export default function Root({ return ( <>

{message}

-
    -
  • - Home -
    • -
  • - About -
    • -
{counter} ); } +export function ErrorBoundary() { + return

Something went wrong!

; +} + export function Layout({ children }: { children: React.ReactNode }) { return ( @@ -43,6 +37,17 @@ export function Layout({ children }: { children: React.ReactNode }) { +
+
    +
  • + Home +
    • +
  • + About +
    • +
+ +
{children} From 0ade1f4610fbf700508c81c179e45ff0b2738e4a Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Wed, 9 Apr 2025 19:32:27 -0700 Subject: [PATCH 031/143] remove log --- packages/react-router/lib/server.browser.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index 7c8b904c1b..63c9ea9e58 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -123,7 +123,6 @@ function createRouterFromPayload({ }) )), ]); - console.log({ res }); return res; }, From 49d6214de2db989720602cabf18a89a30da0f7d2 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Wed, 9 Apr 2025 21:37:04 -0700 Subject: [PATCH 032/143] make sure data() function works when thrown --- packages/react-router/server.ts | 2 +- playground/rsc-vite/src/routes/about/about.tsx | 5 ++++- .../rsc-vite/src/routes/root/root.client.tsx | 18 ++++++++++++++++++ playground/rsc-vite/src/routes/root/root.tsx | 8 +++++++- 4 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 playground/rsc-vite/src/routes/root/root.client.tsx diff --git a/packages/react-router/server.ts b/packages/react-router/server.ts index f5681a80a4..d90fcfe7be 100644 --- a/packages/react-router/server.ts +++ b/packages/react-router/server.ts @@ -1,7 +1,7 @@ export * from "react-router/client"; export { createStaticHandler } from "./lib/router/router"; -export { matchRoutes } from "./lib/router/utils"; +export { data, matchRoutes } from "./lib/router/utils"; export type { ServerMatch, diff --git a/playground/rsc-vite/src/routes/about/about.tsx b/playground/rsc-vite/src/routes/about/about.tsx index 9316973b40..e7342d144a 100644 --- a/playground/rsc-vite/src/routes/about/about.tsx +++ b/playground/rsc-vite/src/routes/about/about.tsx @@ -1,7 +1,10 @@ +import { data } from "react-router"; + export { clientLoader, default } from "./about.client"; export function loader() { - // throw new Error("Oops"); + // throw new Error("oops"); + // throw data("This is a test error", 404); return { message: "Hello About!", }; diff --git a/playground/rsc-vite/src/routes/root/root.client.tsx b/playground/rsc-vite/src/routes/root/root.client.tsx new file mode 100644 index 0000000000..6e2a7b91b3 --- /dev/null +++ b/playground/rsc-vite/src/routes/root/root.client.tsx @@ -0,0 +1,18 @@ +"use client"; + +import { isRouteErrorResponse, useRouteError } from "react-router"; + +const reportedErrors = new Set(); + +export function ErrorReporter() { + const error = useRouteError(); + + const routeError = isRouteErrorResponse(error); + + if (!routeError && !reportedErrors.has(error)) { + reportedErrors.add(error); + console.log(error); + } + + return null; +} diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx index c36aa3fdcb..b12d6b1505 100644 --- a/playground/rsc-vite/src/routes/root/root.tsx +++ b/playground/rsc-vite/src/routes/root/root.tsx @@ -1,6 +1,7 @@ import { Link, Links, Outlet, ScrollRestoration } from "react-router"; import { Counter } from "../../counter"; +import { ErrorReporter } from "./root.client"; export function loader() { return { @@ -24,7 +25,12 @@ export default function Root({ } export function ErrorBoundary() { - return

Something went wrong!

; + return ( + <> +

Something went wrong!

+ + + ); } export function Layout({ children }: { children: React.ReactNode }) { From f0a243f05e260d56250ad1da7ba68778457fa1a9 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Thu, 10 Apr 2025 11:38:12 -0700 Subject: [PATCH 033/143] feat: initial server actions --- packages/react-router/index.ts | 11 +- packages/react-router/lib/router/router.ts | 19 +++ packages/react-router/lib/server.browser.tsx | 44 +++++++ packages/react-router/lib/server.ts | 115 +++++++++++++----- packages/react-router/package.json | 1 + playground/rsc-vite/framework/server.ts | 7 ++ .../rsc-vite/src/browser/entry.browser.tsx | 24 ++-- .../src/routes/about/about.client.tsx | 4 + .../rsc-vite/src/routes/about/about.tsx | 2 +- playground/rsc-vite/src/routes/home/home.tsx | 8 ++ .../rsc-vite/src/routes/root/root.client.tsx | 9 ++ .../rsc-vite/src/server/entry.server.tsx | 23 +++- 12 files changed, 226 insertions(+), 41 deletions(-) diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts index 67cb207eb1..46e634b3f1 100644 --- a/packages/react-router/index.ts +++ b/packages/react-router/index.ts @@ -368,8 +368,12 @@ export { ServerMode as UNSAFE_ServerMode } from "./lib/server-runtime/mode"; export { useScrollRestoration as UNSAFE_useScrollRestoration } from "./lib/dom/lib"; export type { + DecodeCallServerFunction, + ServerManifestPayload, ServerMatch, ServerPayload, + ServerRenderPayload, + ServerRouteManifest, ServerRouteMatch, ServerRouteObject, } from "./lib/server"; @@ -378,7 +382,10 @@ export { matchServerRequest, routeServerRequest, } from "./lib/server"; -export type { DecodeServerResponseFunction } from "./lib/server.browser"; -export { ServerBrowserRouter } from "./lib/server.browser"; +export type { + DecodeServerResponseFunction, + EncodeActionFunction, +} from "./lib/server.browser"; +export { createCallServer, ServerBrowserRouter } from "./lib/server.browser"; export { ServerStaticRouter } from "./lib/server.static"; export { getServerStream } from "./lib/html-stream/browser"; diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts index dfa6dcfbbe..7ce9165c73 100644 --- a/packages/react-router/lib/router/router.ts +++ b/packages/react-router/lib/router/router.ts @@ -270,6 +270,14 @@ export interface Router { */ _internalSetRoutes(routes: AgnosticRouteObject[]): void; + /** + * @private + * PRIVATE - DO NOT USE + * + * Cause subscribers to re-render. This is used to force a re-render. + */ + _internalReflow(): void; + /** * @private * PRIVATE - DO NOT USE @@ -1212,6 +1220,7 @@ export function createRouter(init: RouterInit): Router { ): void { if (routesPatched) { newState.matches = matchRoutes(dataRoutes, location) ?? newState.matches; + routesPatched = false; } // Deduce if we're in a loading/actionReload state: @@ -3350,6 +3359,7 @@ export function createRouter(init: RouterInit): Router { routesPatched = true; + console.log({ isNonHMR }); // If we are not in the middle of an HMR revalidation and we changed the // routes, provide a new identity and trigger a reflow via `updateState` // to re-run memoized `router.routes` dependencies. @@ -3397,6 +3407,15 @@ export function createRouter(init: RouterInit): Router { // TODO: Remove setRoutes, it's temporary to avoid dealing with // updating the tree while validating the update algorithm. _internalSetRoutes, + _internalReflow() { + const newState: Partial = {}; + if (routesPatched) { + newState.matches = + matchRoutes(dataRoutes, location) ?? newState.matches; + routesPatched = false; + } + updateState(newState); + }, }; return router; diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index 63c9ea9e58..e91a1d0f34 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -1,4 +1,5 @@ import * as React from "react"; + import { RouterProvider } from "./components"; import type { DataRouteObject } from "./context"; import { FrameworkContext } from "./dom/ssr/components"; @@ -11,12 +12,55 @@ export type DecodeServerResponseFunction = ( body: ReadableStream ) => Promise; +export type EncodeActionFunction = (args: unknown[]) => Promise; + declare global { interface Window { __router: Router; } } +export function createCallServer({ + decode, + encodeAction, +}: { + decode: DecodeServerResponseFunction; + encodeAction: EncodeActionFunction; +}) { + return async (id: string, args: unknown[]) => { + const response = await fetch(location.href, { + body: await encodeAction(args), + method: "POST", + headers: { + Accept: "text/x-component", + "rsc-action-id": id, + }, + }); + if (!response.body) { + throw new Error("No response body"); + } + const payload = await decode(response.body); + + if (payload.type !== "render") { + throw new Error("Unexpected payload type"); + } + + let lastMatch: ServerRouteManifest | undefined; + for (const match of payload.matches) { + window.__router.patchRoutes(lastMatch?.id ?? null, [ + createRouteFromServerManifest(match), + ]); + lastMatch = match; + } + + React.startTransition(() => { + window.__router._internalReflow(); + }); + + return payload.actionResult; + }; +} + function createRouterFromPayload({ decode, payload, diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index 4926002c21..488d186b07 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -82,6 +82,7 @@ export type ServerRenderPayload = { location: Location; matches: ServerRouteMatch[]; nonce?: string; + actionResult?: unknown; }; export type ServerManifestPayload = { @@ -97,10 +98,22 @@ export type ServerMatch = { payload: ServerPayload; }; -export async function matchServerRequest( - request: Request, - routes: ServerRouteObject[] -): Promise { +export type DecodeCallServerFunction = ( + id: string, + reply: FormData | string +) => Promise<() => Promise>; + +export async function matchServerRequest({ + decodeCallServer, + onError, + request, + routes, +}: { + decodeCallServer?: DecodeCallServerFunction; + onError?: (error: unknown) => void; + request: Request; + routes: ServerRouteObject[]; +}): Promise { const url = new URL(request.url); if (isManifestRequest(url)) { @@ -148,35 +161,68 @@ export async function matchServerRequest( }; } + let actionResult: unknown | undefined; + const actionId = request.headers.get("rsc-action-id"); + if (actionId) { + // TODO: Handle action + if (!decodeCallServer) { + throw new Error( + "Cannot handle enhanced server action without a decodeCallServer function" + ); + } + + const reply = canDecodeWithFormData(request.headers.get("Content-Type")) + ? await request.formData() + : await request.text(); + const serverAction = await decodeCallServer(actionId, reply); + + actionResult = serverAction(); + try { + // Wait for actions to finish regardless of state + await actionResult; + } catch (error) { + // The error is propagated to the client through the result promise in the stream + onError?.(error); + } + + request = new Request(request.url, { + method: "GET", + headers: request.headers, + signal: request.signal, + }); + } + const handler = createStaticHandler(routes as AgnosticRouteObject[]); - const result = await handler.query(request); + const staticContext = await handler.query(request); - if (result instanceof Response) { - const headers = new Headers(result.headers); + if (staticContext instanceof Response) { + const headers = new Headers(staticContext.headers); headers.set("Vary", "Content-Type"); headers.set("x-react-router-error", "true"); - return result; + return staticContext; } - const errors = result.errors + const errors = staticContext.errors ? Object.fromEntries( - Object.entries(result.errors).map(([key, error]) => [ + Object.entries(staticContext.errors).map(([key, error]) => [ key, isRouteErrorResponse(error) ? Object.fromEntries(Object.entries(error)) : error, ]) ) - : result.errors; + : staticContext.errors; const payload = { type: "render", - actionData: result.actionData, - deepestRenderedBoundaryId: result._deepestRenderedBoundaryId ?? undefined, + actionData: staticContext.actionData, + actionResult, + deepestRenderedBoundaryId: + staticContext._deepestRenderedBoundaryId ?? undefined, errors, - loaderData: result.loaderData, - location: result.location, - matches: result.matches.map((match) => { + loaderData: staticContext.loaderData, + location: staticContext.location, + matches: staticContext.matches.map((match) => { const Layout = (match.route as any).Layout || React.Fragment; const Component = (match.route as any).default; const ErrorBoundary = (match.route as any).ErrorBoundary; @@ -185,12 +231,12 @@ export async function matchServerRequest( ? React.createElement( Layout, { - loaderData: result.loaderData[match.route.id], - actionData: result.actionData?.[match.route.id], + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], }, React.createElement(Component, { - loaderData: result.loaderData[match.route.id], - actionData: result.actionData?.[match.route.id], + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], }) ) : undefined; @@ -198,8 +244,8 @@ export async function matchServerRequest( ? React.createElement( Layout, { - loaderData: result.loaderData[match.route.id], - actionData: result.actionData?.[match.route.id], + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], }, React.createElement(ErrorBoundary) ) @@ -208,12 +254,12 @@ export async function matchServerRequest( ? React.createElement( Layout, { - loaderData: result.loaderData[match.route.id], - actionData: result.actionData?.[match.route.id], + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], }, React.createElement(HydrateFallback, { - loaderData: result.loaderData[match.route.id], - actionData: result.actionData?.[match.route.id], + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], }) ) : undefined; @@ -242,7 +288,7 @@ export async function matchServerRequest( } satisfies ServerRenderPayload; return { - statusCode: result.statusCode, + statusCode: staticContext.statusCode, headers: new Headers({ "Content-Type": "text/x-component", Vary: "Content-Type", @@ -262,6 +308,11 @@ export async function routeServerRequest( const url = new URL(request.url); let serverRequest = request; const isDataRequest = isReactServerRequest(url); + const respondWithRSCPayload = + isDataRequest || + isManifestRequest(url) || + request.headers.has("rsc-action-id"); + if (isDataRequest) { const serverURL = new URL(request.url); serverURL.pathname = serverURL.pathname.replace(/\.rsc$/, ""); @@ -276,7 +327,7 @@ export async function routeServerRequest( const serverResponse = await requestServer(serverRequest); - if (isDataRequest || isManifestRequest(url)) { + if (respondWithRSCPayload) { return serverResponse; } @@ -319,3 +370,11 @@ export function isReactServerRequest(url: URL) { export function isManifestRequest(url: URL) { return url.pathname.endsWith(".manifest"); } + +function canDecodeWithFormData(contentType: string | null) { + if (!contentType) return false; + return ( + contentType.match(/\bapplication\/x-www-form-urlencoded\b/) || + contentType.match(/\bmultipart\/form-data\b/) + ); +} diff --git a/packages/react-router/package.json b/packages/react-router/package.json index a069cb8e93..8f02003346 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -94,6 +94,7 @@ }, "scripts": { "build": "wireit", + "watch": "tsup --watch & tsup --config tsup.config.server.ts --watch", "typecheck": "tsc" }, "wireit": { diff --git a/playground/rsc-vite/framework/server.ts b/playground/rsc-vite/framework/server.ts index 67411cf5aa..f1dad8db46 100644 --- a/playground/rsc-vite/framework/server.ts +++ b/playground/rsc-vite/framework/server.ts @@ -10,3 +10,10 @@ export function renderToReadableStream(payload: any) { pipe(new stream.PassThrough()) ) as ReadableStream; } + +export function decodeReply( + reply: FormData | string, + options?: any +): unknown[] { + return RSD.decodeReply(reply, manifest, options); +} diff --git a/playground/rsc-vite/src/browser/entry.browser.tsx b/playground/rsc-vite/src/browser/entry.browser.tsx index 0d75ec30ea..2ac5b529a0 100644 --- a/playground/rsc-vite/src/browser/entry.browser.tsx +++ b/playground/rsc-vite/src/browser/entry.browser.tsx @@ -1,26 +1,36 @@ import { startTransition, StrictMode } from "react"; import { hydrateRoot } from "react-dom/client"; -// @ts-expect-error - no types -import { createFromReadableStream } from "@jacob-ebey/react-server-dom-vite/client"; +import { + createFromReadableStream, + encodeReply, + // @ts-expect-error - no types +} from "@jacob-ebey/react-server-dom-vite/client"; // @ts-expect-error - no types yet import { manifest } from "virtual:react-manifest"; import { + type DecodeServerResponseFunction, + type EncodeActionFunction, type ServerPayload, + createCallServer, getServerStream, ServerBrowserRouter, } from "react-router"; -createFromReadableStream(getServerStream(), manifest).then( +const encodeAction: EncodeActionFunction = (args: unknown[]) => encodeReply(args); + +const decode: DecodeServerResponseFunction = (body) => + createFromReadableStream(body, manifest, { callServer }); + +const callServer = createCallServer({ decode, encodeAction }); + +createFromReadableStream(getServerStream(), manifest, { callServer }).then( (payload: ServerPayload) => { startTransition(() => { hydrateRoot( document, - createFromReadableStream(body, manifest)} - payload={payload} - /> + ); }); diff --git a/playground/rsc-vite/src/routes/about/about.client.tsx b/playground/rsc-vite/src/routes/about/about.client.tsx index a3137b4067..4adae17d32 100644 --- a/playground/rsc-vite/src/routes/about/about.client.tsx +++ b/playground/rsc-vite/src/routes/about/about.client.tsx @@ -39,3 +39,7 @@ export default function About() { ); } + +export function ErrorBoundary() { + return

Oooops

; +} diff --git a/playground/rsc-vite/src/routes/about/about.tsx b/playground/rsc-vite/src/routes/about/about.tsx index e7342d144a..0388ef13c0 100644 --- a/playground/rsc-vite/src/routes/about/about.tsx +++ b/playground/rsc-vite/src/routes/about/about.tsx @@ -1,6 +1,6 @@ import { data } from "react-router"; -export { clientLoader, default } from "./about.client"; +export { ErrorBoundary, clientLoader, default } from "./about.client"; export function loader() { // throw new Error("oops"); diff --git a/playground/rsc-vite/src/routes/home/home.tsx b/playground/rsc-vite/src/routes/home/home.tsx index 77371aad32..5d451c65c6 100644 --- a/playground/rsc-vite/src/routes/home/home.tsx +++ b/playground/rsc-vite/src/routes/home/home.tsx @@ -13,10 +13,18 @@ export default function Home({ }: { loaderData: Awaited>; }) { + const logOnServer = () => { + "use server"; + console.log(message); + }; + return (

{message}

+
+ +
); } diff --git a/playground/rsc-vite/src/routes/root/root.client.tsx b/playground/rsc-vite/src/routes/root/root.client.tsx index 6e2a7b91b3..fa0c2ec648 100644 --- a/playground/rsc-vite/src/routes/root/root.client.tsx +++ b/playground/rsc-vite/src/routes/root/root.client.tsx @@ -16,3 +16,12 @@ export function ErrorReporter() { return null; } + +export function ErrorBoundary() { + return ( + <> +

Something went wrong!

+ + + ); +} diff --git a/playground/rsc-vite/src/server/entry.server.tsx b/playground/rsc-vite/src/server/entry.server.tsx index 104771ece7..fc421906c0 100644 --- a/playground/rsc-vite/src/server/entry.server.tsx +++ b/playground/rsc-vite/src/server/entry.server.tsx @@ -1,14 +1,31 @@ /// -import { renderToReadableStream } from "../../framework/server"; +import { decodeReply, renderToReadableStream } from "../../framework/server"; +// @ts-expect-error - no types yet +import { manifest } from "virtual:react-manifest"; -import { matchServerRequest } from "react-router"; +import { + type DecodeCallServerFunction, + matchServerRequest, +} from "react-router"; import { routes } from "../routes"; +const decodeCallServer: DecodeCallServerFunction = async (actionId, reply) => { + const args = await decodeReply(reply); + const reference = manifest.resolveServerReference(actionId); + await reference.preload(); + const action = reference.get() as (...args: unknown[]) => Promise; + return action.bind(null, ...args); +}; + export default { async fetch(request, env) { - const match = await matchServerRequest(request, routes); + const match = await matchServerRequest({ + decodeCallServer, + request, + routes, + }); if (match instanceof Response) { return match; } From 992195302995086166e9a00c5fe733e9f4aeacee Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Thu, 10 Apr 2025 11:50:44 -0700 Subject: [PATCH 034/143] note on cancellation --- packages/react-router/lib/server.browser.tsx | 25 ++++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index e91a1d0f34..819fadd7b2 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -28,6 +28,9 @@ export function createCallServer({ encodeAction: EncodeActionFunction; }) { return async (id: string, args: unknown[]) => { + // TODO: Expose internal "loadID" (incrementingLoadId) to use as a key? + const locationKey = window.__router.state.location.key; + const response = await fetch(location.href, { body: await encodeAction(args), method: "POST", @@ -45,17 +48,19 @@ export function createCallServer({ throw new Error("Unexpected payload type"); } - let lastMatch: ServerRouteManifest | undefined; - for (const match of payload.matches) { - window.__router.patchRoutes(lastMatch?.id ?? null, [ - createRouteFromServerManifest(match), - ]); - lastMatch = match; - } + if (locationKey === window.__router.state.location.key) { + let lastMatch: ServerRouteManifest | undefined; + for (const match of payload.matches) { + window.__router.patchRoutes(lastMatch?.id ?? null, [ + createRouteFromServerManifest(match), + ]); + lastMatch = match; + } - React.startTransition(() => { - window.__router._internalReflow(); - }); + React.startTransition(() => { + window.__router._internalReflow(); + }); + } return payload.actionResult; }; From 254f97eed23a32e821d03a7c56c7cb0b59d0fcb2 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Thu, 10 Apr 2025 13:36:59 -0700 Subject: [PATCH 035/143] better action revalidation support --- packages/react-router/lib/dom/server.tsx | 3 + packages/react-router/lib/router/router.ts | 8 +- packages/react-router/lib/server.browser.tsx | 59 ++++- packages/react-router/lib/server.ts | 239 ++++++++++-------- .../rsc-vite/src/routes/about/about.tsx | 2 +- 5 files changed, 187 insertions(+), 124 deletions(-) diff --git a/packages/react-router/lib/dom/server.tsx b/packages/react-router/lib/dom/server.tsx index f24d9cb85e..3c03a9034f 100644 --- a/packages/react-router/lib/dom/server.tsx +++ b/packages/react-router/lib/dom/server.tsx @@ -374,6 +374,9 @@ export function createStaticRouter( _internalSetRoutes() { throw msg("_internalSetRoutes"); }, + _internalSetStateDoNotUseOrYouWillBreakYourApp() { + throw msg("_internalSetStateDoNotUseOrYouWillBreakYourApp"); + }, }; } diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts index 7ce9165c73..4e907e2a04 100644 --- a/packages/react-router/lib/router/router.ts +++ b/packages/react-router/lib/router/router.ts @@ -276,7 +276,9 @@ export interface Router { * * Cause subscribers to re-render. This is used to force a re-render. */ - _internalReflow(): void; + _internalSetStateDoNotUseOrYouWillBreakYourApp( + state: Partial + ): void; /** * @private @@ -3359,7 +3361,6 @@ export function createRouter(init: RouterInit): Router { routesPatched = true; - console.log({ isNonHMR }); // If we are not in the middle of an HMR revalidation and we changed the // routes, provide a new identity and trigger a reflow via `updateState` // to re-run memoized `router.routes` dependencies. @@ -3407,8 +3408,7 @@ export function createRouter(init: RouterInit): Router { // TODO: Remove setRoutes, it's temporary to avoid dealing with // updating the tree while validating the update algorithm. _internalSetRoutes, - _internalReflow() { - const newState: Partial = {}; + _internalSetStateDoNotUseOrYouWillBreakYourApp(newState) { if (routesPatched) { newState.matches = matchRoutes(dataRoutes, location) ?? newState.matches; diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index 819fadd7b2..e8ff7b5994 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -27,9 +27,12 @@ export function createCallServer({ decode: DecodeServerResponseFunction; encodeAction: EncodeActionFunction; }) { + let actionCounter = 0; + let landedActionId: number = 0; + return async (id: string, args: unknown[]) => { - // TODO: Expose internal "loadID" (incrementingLoadId) to use as a key? - const locationKey = window.__router.state.location.key; + let actionId = ++actionCounter; + const locationKey = window.__router.state.loaderData; const response = await fetch(location.href, { body: await encodeAction(args), @@ -44,22 +47,50 @@ export function createCallServer({ } const payload = await decode(response.body); - if (payload.type !== "render") { + if (payload.type !== "action") { throw new Error("Unexpected payload type"); } - if (locationKey === window.__router.state.location.key) { - let lastMatch: ServerRouteManifest | undefined; - for (const match of payload.matches) { - window.__router.patchRoutes(lastMatch?.id ?? null, [ - createRouteFromServerManifest(match), - ]); - lastMatch = match; - } + if (payload.rerender) { + (async () => { + const rendered = await payload.rerender; + if (!rendered) return; + if ( + actionId > landedActionId && + locationKey === window.__router.state.loaderData + ) { + landedActionId = actionId; + let lastMatch: ServerRouteManifest | undefined; + for (const match of rendered.matches) { + window.__router.patchRoutes(lastMatch?.id ?? null, [ + createRouteFromServerManifest(match), + ]); + lastMatch = match; + } - React.startTransition(() => { - window.__router._internalReflow(); - }); + React.startTransition(() => { + window.__router._internalSetStateDoNotUseOrYouWillBreakYourApp({ + actionData: Object.assign( + {}, + window.__router.state.actionData, + rendered.actionData + ), + loaderData: Object.assign( + {}, + window.__router.state.loaderData, + rendered.loaderData + ), + errors: rendered.errors + ? Object.assign( + {}, + window.__router.state.errors, + rendered.errors + ) + : null, + }); + }); + } + })(); } return payload.actionResult; diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index 488d186b07..0294649566 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -82,7 +82,6 @@ export type ServerRenderPayload = { location: Location; matches: ServerRouteMatch[]; nonce?: string; - actionResult?: unknown; }; export type ServerManifestPayload = { @@ -90,7 +89,16 @@ export type ServerManifestPayload = { matches: ServerRouteManifest[]; }; -export type ServerPayload = ServerRenderPayload | ServerManifestPayload; +export type ServerActionPayload = { + type: "action"; + actionResult: Promise; + rerender?: Promise; +}; + +export type ServerPayload = + | ServerRenderPayload + | ServerManifestPayload + | ServerActionPayload; export type ServerMatch = { statusCode: number; @@ -161,7 +169,8 @@ export async function matchServerRequest({ }; } - let actionResult: unknown | undefined; + let statusCode = 200; + let actionResult: Promise | undefined; const actionId = request.headers.get("rsc-action-id"); if (actionId) { // TODO: Handle action @@ -176,7 +185,7 @@ export async function matchServerRequest({ : await request.text(); const serverAction = await decodeCallServer(actionId, reply); - actionResult = serverAction(); + actionResult = Promise.resolve(serverAction()); try { // Wait for actions to finish regardless of state await actionResult; @@ -192,109 +201,129 @@ export async function matchServerRequest({ }); } - const handler = createStaticHandler(routes as AgnosticRouteObject[]); - const staticContext = await handler.query(request); - - if (staticContext instanceof Response) { - const headers = new Headers(staticContext.headers); - headers.set("Vary", "Content-Type"); - headers.set("x-react-router-error", "true"); - return staticContext; - } + const getRenderPayload = async ( + action?: boolean + ): Promise => { + const handler = createStaticHandler(routes as AgnosticRouteObject[]); + const staticContext = await handler.query(request); + + if (staticContext instanceof Response) { + // TODO: Properlly handle this case + const headers = new Headers(staticContext.headers); + headers.set("Vary", "Content-Type"); + headers.set("x-react-router-error", "true"); + throw staticContext; + } + statusCode = staticContext.statusCode ?? statusCode; + + const errors = staticContext.errors + ? Object.fromEntries( + Object.entries(staticContext.errors).map(([key, error]) => [ + key, + isRouteErrorResponse(error) + ? Object.fromEntries(Object.entries(error)) + : error, + ]) + ) + : staticContext.errors; + + const payload = { + type: "render", + actionData: staticContext.actionData, + deepestRenderedBoundaryId: + staticContext._deepestRenderedBoundaryId ?? undefined, + errors, + loaderData: staticContext.loaderData, + location: staticContext.location, + matches: staticContext.matches.map((match) => { + const Layout = (match.route as any).Layout || React.Fragment; + const Component = (match.route as any).default; + const ErrorBoundary = (match.route as any).ErrorBoundary; + const HydrateFallback = (match.route as any).HydrateFallback; + const element = Component + ? React.createElement( + Layout, + { + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], + }, + React.createElement(Component, { + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], + }) + ) + : undefined; + const errorElement = ErrorBoundary + ? React.createElement( + Layout, + { + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], + }, + React.createElement(ErrorBoundary) + ) + : undefined; + const hydrateFallbackElement = HydrateFallback + ? React.createElement( + Layout, + { + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], + }, + React.createElement(HydrateFallback, { + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], + }) + ) + : undefined; + + return { + clientAction: (match.route as any).clientAction, + clientLoader: (match.route as any).clientLoader, + element, + errorElement, + handle: (match.route as any).handle, + hasAction: !!match.route.action, + hasErrorBoundary: !!(match.route as any).ErrorBoundary, + hasLoader: !!match.route.loader, + hydrateFallbackElement, + id: match.route.id, + index: match.route.index, + links: (match.route as any).links, + meta: (match.route as any).meta, + params: match.params, + path: match.route.path, + pathname: match.pathname, + pathnameBase: match.pathnameBase, + shouldRevalidate: (match.route as any).shouldRevalidate, + }; + }), + } satisfies ServerRenderPayload; - const errors = staticContext.errors - ? Object.fromEntries( - Object.entries(staticContext.errors).map(([key, error]) => [ - key, - isRouteErrorResponse(error) - ? Object.fromEntries(Object.entries(error)) - : error, - ]) - ) - : staticContext.errors; - - const payload = { - type: "render", - actionData: staticContext.actionData, - actionResult, - deepestRenderedBoundaryId: - staticContext._deepestRenderedBoundaryId ?? undefined, - errors, - loaderData: staticContext.loaderData, - location: staticContext.location, - matches: staticContext.matches.map((match) => { - const Layout = (match.route as any).Layout || React.Fragment; - const Component = (match.route as any).default; - const ErrorBoundary = (match.route as any).ErrorBoundary; - const HydrateFallback = (match.route as any).HydrateFallback; - const element = Component - ? React.createElement( - Layout, - { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }, - React.createElement(Component, { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }) - ) - : undefined; - const errorElement = ErrorBoundary - ? React.createElement( - Layout, - { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }, - React.createElement(ErrorBoundary) - ) - : undefined; - const hydrateFallbackElement = HydrateFallback - ? React.createElement( - Layout, - { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }, - React.createElement(HydrateFallback, { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }) - ) - : undefined; - - return { - clientAction: (match.route as any).clientAction, - clientLoader: (match.route as any).clientLoader, - element, - errorElement, - handle: (match.route as any).handle, - hasAction: !!match.route.action, - hasErrorBoundary: !!(match.route as any).ErrorBoundary, - hasLoader: !!match.route.loader, - hydrateFallbackElement, - id: match.route.id, - index: match.route.index, - links: (match.route as any).links, - meta: (match.route as any).meta, - params: match.params, - path: match.route.path, - pathname: match.pathname, - pathnameBase: match.pathnameBase, - shouldRevalidate: (match.route as any).shouldRevalidate, - }; - }), - } satisfies ServerRenderPayload; - - return { - statusCode: staticContext.statusCode, - headers: new Headers({ - "Content-Type": "text/x-component", - Vary: "Content-Type", - }), - payload, + return payload; }; + + try { + return { + statusCode, + headers: new Headers({ + "Content-Type": "text/x-component", + Vary: "Content-Type", + }), + payload: actionResult + ? { + type: "action", + actionResult, + rerender: getRenderPayload(true), + } + : await getRenderPayload(), + }; + } catch (error) { + if (typeof error === "object" && error instanceof Response) { + return error; + } + throw error; + } } export async function routeServerRequest( diff --git a/playground/rsc-vite/src/routes/about/about.tsx b/playground/rsc-vite/src/routes/about/about.tsx index 0388ef13c0..4221b266ef 100644 --- a/playground/rsc-vite/src/routes/about/about.tsx +++ b/playground/rsc-vite/src/routes/about/about.tsx @@ -6,6 +6,6 @@ export function loader() { // throw new Error("oops"); // throw data("This is a test error", 404); return { - message: "Hello About!", + message: "Hello About!" + "!".repeat(Math.floor(Math.random() * 10)), }; } From 38e06268e96c755adf11c8fef2ccceaef8d0511d Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Thu, 10 Apr 2025 15:39:20 -0700 Subject: [PATCH 036/143] prep for async initialization --- packages/react-router/index.ts | 2 +- packages/react-router/lib/server.browser.tsx | 37 ++++++++++++++----- packages/react-router/lib/server.static.tsx | 3 +- packages/react-router/lib/server.ts | 24 ++++++------ .../src/routes/about/about.client.tsx | 7 +++- .../rsc-vite/src/routes/about/about.tsx | 7 +++- .../rsc-vite/src/routes/root/root.client.tsx | 11 +----- playground/rsc-vite/src/routes/root/root.tsx | 13 ++++++- 8 files changed, 67 insertions(+), 37 deletions(-) diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts index 46e634b3f1..4cfdace50a 100644 --- a/packages/react-router/index.ts +++ b/packages/react-router/index.ts @@ -373,7 +373,7 @@ export type { ServerMatch, ServerPayload, ServerRenderPayload, - ServerRouteManifest, + RenderedRoute as ServerRouteManifest, ServerRouteMatch, ServerRouteObject, } from "./lib/server"; diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index e8ff7b5994..4587eecea7 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -6,7 +6,7 @@ import { FrameworkContext } from "./dom/ssr/components"; import type { FrameworkContextObject } from "./dom/ssr/entry"; import { createBrowserHistory } from "./router/history"; import { type Router, createRouter } from "./router/router"; -import type { ServerPayload, ServerRouteManifest } from "./server"; +import type { ServerPayload, RenderedRoute } from "./server"; export type DecodeServerResponseFunction = ( body: ReadableStream @@ -17,6 +17,7 @@ export type EncodeActionFunction = (args: unknown[]) => Promise; declare global { interface Window { __router: Router; + __routerInitPromise?: Promise; } } @@ -60,7 +61,7 @@ export function createCallServer({ locationKey === window.__router.state.loaderData ) { landedActionId = actionId; - let lastMatch: ServerRouteManifest | undefined; + let lastMatch: RenderedRoute | undefined; for (const match of rendered.matches) { window.__router.patchRoutes(lastMatch?.id ?? null, [ createRouteFromServerManifest(match), @@ -116,7 +117,7 @@ function createRouterFromPayload({ return [route]; }, [] as DataRouteObject[]); - return (window.__router = createRouter({ + window.__router = createRouter({ basename: payload.basename, history: createBrowserHistory(), hydrationData: { @@ -135,13 +136,14 @@ function createRouterFromPayload({ throw new Error("Failed to patch routes on navigation"); } - let lastMatch: ServerRouteManifest | undefined; + let lastMatch: RenderedRoute | undefined; for (const match of payload.matches) { patch(lastMatch?.id ?? null, [createRouteFromServerManifest(match)]); lastMatch = match; } }, async dataStrategy({ matches, request }) { + await Promise.resolve(); if (!window.__router) { throw new Error("No router"); } @@ -164,7 +166,7 @@ function createRouterFromPayload({ throw new Error("Unexpected payload type"); } - let lastMatch: ServerRouteManifest | undefined; + let lastMatch: RenderedRoute | undefined; for (const match of payload.matches) { window.__router.patchRoutes(lastMatch?.id ?? null, [ createRouteFromServerManifest(match), @@ -206,7 +208,21 @@ function createRouterFromPayload({ return res; }, - }).initialize()); + }).initialize(); + + if (!window.__router.state.initialized) { + window.__routerInitPromise = new Promise((resolve) => { + const unsubscribe = window.__router.subscribe((state) => { + if (state.initialized) { + window.__routerInitPromise = undefined; + unsubscribe(); + resolve(); + } + }); + }); + } + + return window.__router; } export function ServerBrowserRouter({ @@ -224,6 +240,11 @@ export function ServerBrowserRouter({ [] ); + console.log(window.__routerInitPromise); + if (window.__routerInitPromise) { + throw window.__routerInitPromise; + } + const frameworkContext: FrameworkContextObject = { future: { // TODO: Update these @@ -256,9 +277,7 @@ export function ServerBrowserRouter({ ); } -function createRouteFromServerManifest( - match: ServerRouteManifest -): DataRouteObject { +function createRouteFromServerManifest(match: RenderedRoute): DataRouteObject { return { id: match.id, action: match.hasAction || !!match.clientAction, diff --git a/packages/react-router/lib/server.static.tsx b/packages/react-router/lib/server.static.tsx index 59d4cbfe72..2cb33c93f0 100644 --- a/packages/react-router/lib/server.static.tsx +++ b/packages/react-router/lib/server.static.tsx @@ -17,7 +17,6 @@ export function ServerStaticRouter({ payload }: { payload: ServerPayload }) { loaderHeaders: {}, location: payload.location, statusCode: 200, - _deepestRenderedBoundaryId: payload.deepestRenderedBoundaryId, matches: payload.matches.map((match) => ({ params: match.params, pathname: match.pathname, @@ -65,7 +64,7 @@ export function ServerStaticRouter({ payload }: { payload: ServerPayload }) { unstable_subResourceIntegrity: false, }, isSpaMode: false, - ssr: false, + ssr: true, criticalCss: "", manifest: { routes: { diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index 0294649566..3d5e2ff782 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -10,14 +10,14 @@ import { injectRSCPayload } from "./html-stream/server"; import type { Location } from "./router/history"; import { createStaticHandler } from "./router/router"; import { - isRouteErrorResponse, - matchRoutes, type ActionFunction, type AgnosticRouteObject, type LazyRouteFunction, type LoaderFunction, type Params, type ShouldRevalidateFunction, + isRouteErrorResponse, + matchRoutes, } from "./router/utils"; type ServerRouteObjectBase = { @@ -48,7 +48,7 @@ export type ServerRouteObject = ServerRouteObjectBase & { } ); -export type ServerRouteManifest = { +export type RenderedRoute = { clientAction?: ClientActionFunction; clientLoader?: ClientLoaderFunction; element?: React.ReactElement; @@ -66,7 +66,7 @@ export type ServerRouteManifest = { shouldRevalidate?: ShouldRevalidateFunction; }; -export type ServerRouteMatch = ServerRouteManifest & { +export type ServerRouteMatch = RenderedRoute & { params: Params; pathname: string; pathnameBase: string; @@ -76,7 +76,6 @@ export type ServerRenderPayload = { type: "render"; actionData: Record | null; basename?: string; - deepestRenderedBoundaryId?: string; errors: Record | null; loaderData: Record; location: Location; @@ -86,7 +85,7 @@ export type ServerRenderPayload = { export type ServerManifestPayload = { type: "manifest"; - matches: ServerRouteManifest[]; + matches: RenderedRoute[]; }; export type ServerActionPayload = { @@ -147,6 +146,9 @@ export async function matchServerRequest({ route = { ...route, ...((await route.lazy()) as any), + path: route.path, + index: (route as any).index, + id: route.id, }; } @@ -201,10 +203,8 @@ export async function matchServerRequest({ }); } - const getRenderPayload = async ( - action?: boolean - ): Promise => { - const handler = createStaticHandler(routes as AgnosticRouteObject[]); + const getRenderPayload = async (): Promise => { + const handler = createStaticHandler(routes); const staticContext = await handler.query(request); if (staticContext instanceof Response) { @@ -230,8 +230,6 @@ export async function matchServerRequest({ const payload = { type: "render", actionData: staticContext.actionData, - deepestRenderedBoundaryId: - staticContext._deepestRenderedBoundaryId ?? undefined, errors, loaderData: staticContext.loaderData, location: staticContext.location, @@ -314,7 +312,7 @@ export async function matchServerRequest({ ? { type: "action", actionResult, - rerender: getRenderPayload(true), + rerender: getRenderPayload(), } : await getRenderPayload(), }; diff --git a/playground/rsc-vite/src/routes/about/about.client.tsx b/playground/rsc-vite/src/routes/about/about.client.tsx index 4adae17d32..10ef390a87 100644 --- a/playground/rsc-vite/src/routes/about/about.client.tsx +++ b/playground/rsc-vite/src/routes/about/about.client.tsx @@ -1,6 +1,10 @@ "use client"; -import { type ClientLoaderFunctionArgs, useLoaderData } from "react-router"; +import { + type ClientLoaderFunctionArgs, + useLoaderData, + useRouteError, +} from "react-router"; import { Counter } from "../../counter"; @@ -41,5 +45,6 @@ export default function About() { } export function ErrorBoundary() { + console.log(useRouteError()); return

Oooops

; } diff --git a/playground/rsc-vite/src/routes/about/about.tsx b/playground/rsc-vite/src/routes/about/about.tsx index 4221b266ef..458f83df49 100644 --- a/playground/rsc-vite/src/routes/about/about.tsx +++ b/playground/rsc-vite/src/routes/about/about.tsx @@ -1,6 +1,11 @@ import { data } from "react-router"; -export { ErrorBoundary, clientLoader, default } from "./about.client"; +export { + ErrorBoundary, + clientLazy, + clientLoader, + default, +} from "./about.client"; export function loader() { // throw new Error("oops"); diff --git a/playground/rsc-vite/src/routes/root/root.client.tsx b/playground/rsc-vite/src/routes/root/root.client.tsx index fa0c2ec648..4e0042c3ea 100644 --- a/playground/rsc-vite/src/routes/root/root.client.tsx +++ b/playground/rsc-vite/src/routes/root/root.client.tsx @@ -1,18 +1,11 @@ "use client"; -import { isRouteErrorResponse, useRouteError } from "react-router"; - -const reportedErrors = new Set(); +import { useRouteError } from "react-router"; export function ErrorReporter() { const error = useRouteError(); - const routeError = isRouteErrorResponse(error); - - if (!routeError && !reportedErrors.has(error)) { - reportedErrors.add(error); - console.log(error); - } + console.log(error); return null; } diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx index b12d6b1505..1c2d2b9dc5 100644 --- a/playground/rsc-vite/src/routes/root/root.tsx +++ b/playground/rsc-vite/src/routes/root/root.tsx @@ -1,4 +1,10 @@ -import { Link, Links, Outlet, ScrollRestoration } from "react-router"; +import { + Link, + Links, + Outlet, + ScrollRestoration, + useRouteError, +} from "react-router"; import { Counter } from "../../counter"; import { ErrorReporter } from "./root.client"; @@ -24,7 +30,12 @@ export default function Root({ ); } +export function HydrateFallback() { + return

Loading...

; +} + export function ErrorBoundary() { + console.log(useRouteError()); return ( <>

Something went wrong!

From b019439889355b534e4b163330a24d1d1e6629df Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Thu, 10 Apr 2025 15:40:51 -0700 Subject: [PATCH 037/143] remove log --- packages/react-router/lib/server.browser.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index 4587eecea7..0f9ebecf78 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -240,7 +240,6 @@ export function ServerBrowserRouter({ [] ); - console.log(window.__routerInitPromise); if (window.__routerInitPromise) { throw window.__routerInitPromise; } From ec5fa316ae073cdc7bb9297a15d4cce673a4b373 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Fri, 11 Apr 2025 10:54:56 -0700 Subject: [PATCH 038/143] remove log --- playground/rsc-vite/src/routes/root/root.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx index 1c2d2b9dc5..4cc5654e6a 100644 --- a/playground/rsc-vite/src/routes/root/root.tsx +++ b/playground/rsc-vite/src/routes/root/root.tsx @@ -35,7 +35,6 @@ export function HydrateFallback() { } export function ErrorBoundary() { - console.log(useRouteError()); return ( <>

Something went wrong!

From 7095511e0bf4cd202d3e85b665af59a69b09db71 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Fri, 11 Apr 2025 14:41:44 -0400 Subject: [PATCH 039/143] First pass of wiring up shared dataStrategy --- packages/react-router/index.ts | 2 +- .../lib/dom-export/hydrated-router.tsx | 20 +- .../react-router/lib/dom/ssr/components.tsx | 2 +- .../react-router/lib/dom/ssr/single-fetch.tsx | 55 +++-- packages/react-router/lib/router/router.ts | 2 +- packages/react-router/lib/server.browser.tsx | 233 ++++++++++++------ packages/react-router/lib/server.ts | 150 ++++++----- .../rsc-vite/src/routes/about/about.tsx | 2 +- playground/rsc-vite/src/routes/root/root.tsx | 8 +- 9 files changed, 289 insertions(+), 185 deletions(-) diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts index 4cfdace50a..737e24f8e9 100644 --- a/packages/react-router/index.ts +++ b/packages/react-router/index.ts @@ -353,7 +353,7 @@ export { } from "./lib/dom/ssr/routes"; /** @internal */ -export { getSingleFetchDataStrategy as UNSAFE_getSingleFetchDataStrategy } from "./lib/dom/ssr/single-fetch"; +export { getTurboStreamSingleFetchDataStrategy as UNSAFE_getTurboStreamSingleFetchDataStrategy } from "./lib/dom/ssr/single-fetch"; /** @internal */ export { diff --git a/packages/react-router/lib/dom-export/hydrated-router.tsx b/packages/react-router/lib/dom-export/hydrated-router.tsx index ea3dddc7db..4acde5d6c5 100644 --- a/packages/react-router/lib/dom-export/hydrated-router.tsx +++ b/packages/react-router/lib/dom-export/hydrated-router.tsx @@ -16,7 +16,7 @@ import { UNSAFE_createClientRoutes as createClientRoutes, UNSAFE_createRouter as createRouter, UNSAFE_deserializeErrors as deserializeErrors, - UNSAFE_getSingleFetchDataStrategy as getSingleFetchDataStrategy, + UNSAFE_getTurboStreamSingleFetchDataStrategy as getTurboStreamSingleFetchDataStrategy, UNSAFE_getPatchRoutesOnNavigationFunction as getPatchRoutesOnNavigationFunction, UNSAFE_shouldHydrateRouteLoader as shouldHydrateRouteLoader, UNSAFE_useFogOFWarDiscovery as useFogOFWarDiscovery, @@ -207,22 +207,10 @@ function createHydratedRouter({ future: { unstable_middleware: ssrInfo.context.future.unstable_middleware, }, - dataStrategy: getSingleFetchDataStrategy( + dataStrategy: getTurboStreamSingleFetchDataStrategy( () => router, - (routeId: string) => { - let manifestRoute = ssrInfo!.manifest.routes[routeId]; - invariant(manifestRoute, "Route not found in manifest/routeModules"); - let routeModule = ssrInfo!.routeModules[routeId]; - return { - hasLoader: manifestRoute.hasLoader, - hasClientLoader: manifestRoute.hasClientLoader, - // In some cases the module may not be loaded yet and we don't care - // if it's got shouldRevalidate or not - hasShouldRevalidate: routeModule - ? routeModule.shouldRevalidate != null - : undefined, - }; - }, + ssrInfo.manifest, + ssrInfo.routeModules, ssrInfo.context.ssr, ssrInfo.context.basename ), diff --git a/packages/react-router/lib/dom/ssr/components.tsx b/packages/react-router/lib/dom/ssr/components.tsx index 0f4e39c7e9..eff5b578ff 100644 --- a/packages/react-router/lib/dom/ssr/components.tsx +++ b/packages/react-router/lib/dom/ssr/components.tsx @@ -388,7 +388,7 @@ function PrefetchPageLinksImpl({ return []; } - let url = singleFetchUrl(page, basename); + let url = singleFetchUrl(page, basename, ".data"); // When one or more routes have opted out, we add a _routes param to // limit the loaders to those that have a server loader and did not // opt out diff --git a/packages/react-router/lib/dom/ssr/single-fetch.tsx b/packages/react-router/lib/dom/ssr/single-fetch.tsx index 8c79d276d7..78d965b7b7 100644 --- a/packages/react-router/lib/dom/ssr/single-fetch.tsx +++ b/packages/react-router/lib/dom/ssr/single-fetch.tsx @@ -15,9 +15,11 @@ import { stripBasename, } from "../../router/utils"; import { createRequestInit } from "./data"; -import type { EntryContext } from "./entry"; +import type { AssetsManifest, EntryContext } from "./entry"; import { escapeHtml } from "./markup"; import invariant from "./invariant"; +import type { RouteModules } from "./routeModules"; +import type { DataRouteMatch } from "../../context"; export const SingleFetchRedirectSymbol = Symbol("SingleFetchRedirect"); @@ -30,7 +32,7 @@ export type SingleFetchRedirectResult = { }; // Shared/serializable type used by both turbo-stream and RSC implementations -type DecodedSingleFetchResults = +export type DecodedSingleFetchResults = | { routes: { [key: string]: SingleFetchResult } } | { redirect: SingleFetchRedirectResult }; @@ -147,27 +149,37 @@ export function StreamTransfer({ } } -type GetRouteInfoFunction = (routeId: string) => { +export type GetRouteInfoFunction = (match: DataRouteMatch) => { hasLoader: boolean; - hasClientLoader: boolean; // TODO: Can this be read from match.route? - hasShouldRevalidate: boolean | undefined; // TODO: Can this be read from match.route? + hasClientLoader: boolean; + hasShouldRevalidate: boolean; }; -type FetchAndDecodeFunction = ( +export type FetchAndDecodeFunction = ( request: Request, basename: string | undefined, targetRoutes?: string[] ) => Promise<{ status: number; data: DecodedSingleFetchResults }>; -export function getSingleFetchDataStrategy( +export function getTurboStreamSingleFetchDataStrategy( getRouter: () => DataRouter, - getRouteInfo: GetRouteInfoFunction, + manifest: AssetsManifest, + routeModules: RouteModules, ssr: boolean, basename: string | undefined ): DataStrategyFunction { let dataStrategy = getSingleFetchDataStrategyImpl( getRouter, - getRouteInfo, + (match: DataRouteMatch) => { + let manifestRoute = manifest.routes[match.route.id]; + invariant(manifestRoute, "Route not found in manifest"); + let routeModule = routeModules[match.route.id]; + return { + hasLoader: manifestRoute.hasLoader, + hasClientLoader: manifestRoute.hasClientLoader, + hasShouldRevalidate: Boolean(routeModule?.shouldRevalidate), + }; + }, fetchAndDecodeViaTurboStream, ssr, basename @@ -192,7 +204,7 @@ export function getSingleFetchDataStrategyImpl( } let foundRevalidatingServerLoader = matches.some((m) => { - let { hasLoader, hasClientLoader } = getRouteInfo(m.route.id); + let { hasLoader, hasClientLoader } = getRouteInfo(m); return m.unstable_shouldCallHandler() && hasLoader && !hasClientLoader; }); if (!ssr && !foundRevalidatingServerLoader) { @@ -301,7 +313,7 @@ async function nonSsrStrategy( matchesToLoad.map((m) => m.resolve(async (handler) => { try { - let { hasClientLoader } = getRouteInfo(m.route.id); + let { hasClientLoader } = getRouteInfo(m); // Need to pass through a `singleFetch` override handler so // clientLoader's can still call server loaders through `.data` // requests @@ -355,7 +367,7 @@ async function singleFetchLoaderNavigationStrategy( routeDfds[i].resolve(); let routeId = m.route.id; let { hasLoader, hasClientLoader, hasShouldRevalidate } = - getRouteInfo(routeId); + getRouteInfo(m); let defaultShouldRevalidate = !m.unstable_shouldRevalidateArgs || @@ -464,7 +476,7 @@ async function singleFetchLoaderFetcherStrategy( return { [fetcherMatch.route.id]: result }; } -function stripIndexParam(url: URL) { +export function stripIndexParam(url: URL) { let indexValues = url.searchParams.getAll("index"); url.searchParams.delete("index"); let indexValuesToKeep = []; @@ -482,7 +494,8 @@ function stripIndexParam(url: URL) { export function singleFetchUrl( reqUrl: URL | string, - basename: string | undefined + basename: string | undefined, + extension: string ) { let url = typeof reqUrl === "string" @@ -497,22 +510,22 @@ export function singleFetchUrl( : reqUrl; if (url.pathname === "/") { - url.pathname = "_root.data"; + url.pathname = `_root.${extension}`; } else if (basename && stripBasename(url.pathname, basename) === "/") { - url.pathname = `${basename.replace(/\/$/, "")}/_root.data`; + url.pathname = `${basename.replace(/\/$/, "")}/_root.${extension}`; } else { - url.pathname = `${url.pathname.replace(/\/$/, "")}.data`; + url.pathname = `${url.pathname.replace(/\/$/, "")}.${extension}`; } return url; } -async function fetchAndDecodeViaTurboStream( +const fetchAndDecodeViaTurboStream: FetchAndDecodeFunction = async ( request: Request, basename: string | undefined, targetRoutes?: string[] -): Promise<{ status: number; data: DecodedSingleFetchResults }> { - let url = singleFetchUrl(request.url, basename); +): Promise<{ status: number; data: DecodedSingleFetchResults }> => { + let url = singleFetchUrl(request.url, basename, "data"); if (request.method === "GET") { url = stripIndexParam(url); if (targetRoutes) { @@ -573,7 +586,7 @@ async function fetchAndDecodeViaTurboStream( // bit restrictive. throw new Error("Unable to decode turbo-stream response"); } -} +}; // Note: If you change this function please change the corresponding // encodeViaTurboStream function in server-runtime diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts index 6f837f7e2c..2145350c88 100644 --- a/packages/react-router/lib/router/router.ts +++ b/packages/react-router/lib/router/router.ts @@ -6350,7 +6350,7 @@ function isValidMethod(method: string): method is FormMethod { return validRequestMethods.has(method.toUpperCase() as FormMethod); } -function isMutationMethod(method: string): method is MutationFormMethod { +export function isMutationMethod(method: string): method is MutationFormMethod { return validMutationMethods.has(method.toUpperCase() as MutationFormMethod); } diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index 0f9ebecf78..c25ffca396 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -1,12 +1,24 @@ import * as React from "react"; import { RouterProvider } from "./components"; -import type { DataRouteObject } from "./context"; +import type { DataRouteMatch, DataRouteObject } from "./context"; import { FrameworkContext } from "./dom/ssr/components"; import type { FrameworkContextObject } from "./dom/ssr/entry"; -import { createBrowserHistory } from "./router/history"; -import { type Router, createRouter } from "./router/router"; +import { createBrowserHistory, invariant } from "./router/history"; +import type { Router as DataRouter } from "./router/router"; +import { createRouter, isMutationMethod } from "./router/router"; import type { ServerPayload, RenderedRoute } from "./server"; +import { ErrorResponseImpl, type DataStrategyFunction } from "./router/utils"; +import type { + DecodedSingleFetchResults, + FetchAndDecodeFunction, +} from "./dom/ssr/single-fetch"; +import { + getSingleFetchDataStrategyImpl, + singleFetchUrl, + stripIndexParam, +} from "./dom/ssr/single-fetch"; +import { createRequestInit } from "./dom/ssr/data"; export type DecodeServerResponseFunction = ( body: ReadableStream @@ -16,7 +28,7 @@ export type EncodeActionFunction = (args: unknown[]) => Promise; declare global { interface Window { - __router: Router; + __router: DataRouter; __routerInitPromise?: Promise; } } @@ -142,87 +154,138 @@ function createRouterFromPayload({ lastMatch = match; } }, - async dataStrategy({ matches, request }) { - await Promise.resolve(); - if (!window.__router) { - throw new Error("No router"); - } + // FIXME: Pass `build.ssr` and `build.basename` into this function + dataStrategy: getRSCSingleFetchDataStrategy( + () => window.__router, + true, + undefined, + decode + ), + }).initialize(); - // TODO: Implement this - const url = new URL(request.url); - url.pathname += ".rsc"; - const response = await fetch(url, { - body: request.body, - headers: request.headers, - method: request.method, - referrer: request.referrer, - signal: request.signal, + if (!window.__router.state.initialized) { + window.__routerInitPromise = new Promise((resolve) => { + const unsubscribe = window.__router.subscribe((state) => { + if (state.initialized) { + window.__routerInitPromise = undefined; + unsubscribe(); + resolve(); + } }); - if (!response.body) { - throw new Error("No response body"); + }); + } + + return window.__router; +} + +export function getRSCSingleFetchDataStrategy( + getRouter: () => DataRouter, + ssr: boolean, + basename: string | undefined, + decode: DecodeServerResponseFunction +): DataStrategyFunction { + // create map + let dataStrategy = getSingleFetchDataStrategyImpl( + getRouter, + (match: DataRouteMatch) => { + // TODO: Clean this up with a shared type + let M = match as DataRouteMatch & { + route: DataRouteObject & { + hasLoader: boolean; + hasClientLoader: boolean; + hasAction: boolean; + hasClientAction: boolean; + hasShouldRevalidate: boolean; + }; + }; + return { + hasLoader: M.route.hasLoader, + hasClientLoader: M.route.hasClientLoader, + hasAction: M.route.hasAction, + hasClientAction: M.route.hasClientAction, + hasShouldRevalidate: M.route.hasShouldRevalidate, + }; + }, + // pass map into fetchAndDecode so it can add payloads + getFetchAndDecodeViaRSC(decode), + ssr, + basename + ); + return async (args) => args.unstable_runClientMiddleware(dataStrategy); + // return async (args) => args.unstable_runClientMiddleware(async () => { + // let results = await dataStrategy() + // // patch into router from all payloads in map + // return results; + // }); +} + +function getFetchAndDecodeViaRSC( + decode: DecodeServerResponseFunction +): FetchAndDecodeFunction { + return async ( + request: Request, + basename: string | undefined, + targetRoutes?: string[] + ) => { + // + let url = singleFetchUrl(request.url, basename, "rsc"); + if (request.method === "GET") { + url = stripIndexParam(url); + if (targetRoutes) { + url.searchParams.set("_routes", targetRoutes.join(",")); } - const payload = await decode(response.body); + } + + let res = await fetch(url, await createRequestInit(request)); + + // If this 404'd without hitting the running server (most likely in a + // pre-rendered app using a CDN), then bubble a standard 404 ErrorResponse + if (res.status === 404 && !res.headers.has("X-Remix-Response")) { + throw new ErrorResponseImpl(404, "Not Found", true); + } + + invariant(res.body, "No response body to decode"); + + try { + const payload = await decode(res.body); if (payload.type !== "render") { throw new Error("Unexpected payload type"); } let lastMatch: RenderedRoute | undefined; for (const match of payload.matches) { + // TODO: We can't do this per-request here because when clientLoaders + // come into play we'll have filtered matches coming back on the payloads. + // + // TODO: Don't blow away prior routes window.__router.patchRoutes(lastMatch?.id ?? null, [ createRouteFromServerManifest(match), ]); lastMatch = match; } - const dataKey = - request.method === "GET" || request.method === "HEAD" - ? "loaderData" - : "actionData"; - - const res = Object.fromEntries([ - ...Object.entries(payload[dataKey] ?? {}).map(([id, value]) => [ - id, - { - type: "data", - result: value, - }, - ]), - ...(await Promise.all( - matches.map(async (match) => { - const result = await match.resolve(async () => { - return payload[dataKey]?.[match.route.id]; - }); - - return [ - match.route.id, - payload.errors?.[match.route.id] - ? { - type: "error", - result: payload.errors[match.route.id], - } - : result, - ]; - }) - )), - ]); - - return res; - }, - }).initialize(); - - if (!window.__router.state.initialized) { - window.__routerInitPromise = new Promise((resolve) => { - const unsubscribe = window.__router.subscribe((state) => { - if (state.initialized) { - window.__routerInitPromise = undefined; - unsubscribe(); - resolve(); + let results: DecodedSingleFetchResults = { routes: {} }; + const dataKey = isMutationMethod(request.method) + ? "actionData" + : "loaderData"; + for (let [routeId, data] of Object.entries(payload[dataKey] || {})) { + results.routes[routeId] = { data }; + } + if (payload.errors) { + for (let [routeId, error] of Object.entries(payload.errors)) { + results.routes[routeId] = { error }; } - }); - }); - } - - return window.__router; + } + return { status: res.status, data: results }; + } catch (e) { + // Can't clone after consuming the body via decode so we can't include the + // body here. In an ideal world we'd look for an RSC content type here, + // or even X-Remix-Response but then folks can't statically deploy their + // prerendered .rsc files to a CDN unless they can tell that CDN to add + // special headers to those certain files - which is a bit restrictive. + throw new Error("Unable to decode RSC response"); + } + }; } export function ServerBrowserRouter({ @@ -276,7 +339,15 @@ export function ServerBrowserRouter({ ); } -function createRouteFromServerManifest(match: RenderedRoute): DataRouteObject { +function createRouteFromServerManifest( + match: RenderedRoute +): DataRouteObject & { + hasLoader: boolean; + hasClientLoader: boolean; + hasAction: boolean; + hasClientAction: boolean; + hasShouldRevalidate: boolean; +} { return { id: match.id, action: match.hasAction || !!match.clientAction, @@ -286,8 +357,28 @@ function createRouteFromServerManifest(match: RenderedRoute): DataRouteObject { hasErrorBoundary: match.hasErrorBoundary, hydrateFallbackElement: match.hydrateFallbackElement, index: match.index, - loader: match.hasLoader || !!match.clientLoader, + loader: + // prettier-ignore + match.clientLoader ? (args, singleFetch) => { + return match.clientLoader!({ + ...args, + async serverLoader() { + invariant(typeof singleFetch === "function", "Invalid singleFetch parameter"); + return singleFetch(); + }, + }); + } : + match.hasLoader ? (args, singleFetch) => { + invariant(typeof singleFetch === "function", "Invalid singleFetch parameter"); + return singleFetch(); + } : + undefined, path: match.path, shouldRevalidate: match.shouldRevalidate, + hasLoader: match.hasLoader, + hasClientLoader: match.clientLoader != null, + hasAction: match.hasAction, + hasClientAction: match.clientAction != null, + hasShouldRevalidate: match.shouldRevalidate != null, }; } diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index 3d5e2ff782..91def0626c 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -205,10 +205,23 @@ export async function matchServerRequest({ const getRenderPayload = async (): Promise => { const handler = createStaticHandler(routes); - const staticContext = await handler.query(request); + + let url = new URL(request.url); + let routeIdsToLoad = url.searchParams.has("_routes") + ? url.searchParams.get("_routes")!.split(",") + : null; + + const staticContext = await handler.query(request, { + skipLoaderErrorBubbling: true, + ...(routeIdsToLoad + ? { + filterMatchesToLoad: (m) => routeIdsToLoad!.includes(m.route.id), + } + : null), + }); if (staticContext instanceof Response) { - // TODO: Properlly handle this case + // TODO: Properly handle this case const headers = new Headers(staticContext.headers); headers.set("Vary", "Content-Type"); headers.set("x-react-router-error", "true"); @@ -233,69 +246,71 @@ export async function matchServerRequest({ errors, loaderData: staticContext.loaderData, location: staticContext.location, - matches: staticContext.matches.map((match) => { - const Layout = (match.route as any).Layout || React.Fragment; - const Component = (match.route as any).default; - const ErrorBoundary = (match.route as any).ErrorBoundary; - const HydrateFallback = (match.route as any).HydrateFallback; - const element = Component - ? React.createElement( - Layout, - { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }, - React.createElement(Component, { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }) - ) - : undefined; - const errorElement = ErrorBoundary - ? React.createElement( - Layout, - { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }, - React.createElement(ErrorBoundary) - ) - : undefined; - const hydrateFallbackElement = HydrateFallback - ? React.createElement( - Layout, - { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }, - React.createElement(HydrateFallback, { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }) - ) - : undefined; - - return { - clientAction: (match.route as any).clientAction, - clientLoader: (match.route as any).clientLoader, - element, - errorElement, - handle: (match.route as any).handle, - hasAction: !!match.route.action, - hasErrorBoundary: !!(match.route as any).ErrorBoundary, - hasLoader: !!match.route.loader, - hydrateFallbackElement, - id: match.route.id, - index: match.route.index, - links: (match.route as any).links, - meta: (match.route as any).meta, - params: match.params, - path: match.route.path, - pathname: match.pathname, - pathnameBase: match.pathnameBase, - shouldRevalidate: (match.route as any).shouldRevalidate, - }; - }), + matches: staticContext.matches + .filter((m) => !routeIdsToLoad || routeIdsToLoad.includes(m.route.id)) + .map((match) => { + const Layout = (match.route as any).Layout || React.Fragment; + const Component = (match.route as any).default; + const ErrorBoundary = (match.route as any).ErrorBoundary; + const HydrateFallback = (match.route as any).HydrateFallback; + const element = Component + ? React.createElement( + Layout, + { + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], + }, + React.createElement(Component, { + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], + }) + ) + : undefined; + const errorElement = ErrorBoundary + ? React.createElement( + Layout, + { + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], + }, + React.createElement(ErrorBoundary) + ) + : undefined; + const hydrateFallbackElement = HydrateFallback + ? React.createElement( + Layout, + { + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], + }, + React.createElement(HydrateFallback, { + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], + }) + ) + : undefined; + + return { + clientAction: (match.route as any).clientAction, + clientLoader: (match.route as any).clientLoader, + element, + errorElement, + handle: (match.route as any).handle, + hasAction: !!match.route.action, + hasErrorBoundary: !!(match.route as any).ErrorBoundary, + hasLoader: !!match.route.loader, + hydrateFallbackElement, + id: match.route.id, + index: match.route.index, + links: (match.route as any).links, + meta: (match.route as any).meta, + params: match.params, + path: match.route.path, + pathname: match.pathname, + pathnameBase: match.pathnameBase, + shouldRevalidate: (match.route as any).shouldRevalidate, + }; + }), } satisfies ServerRenderPayload; return payload; @@ -342,7 +357,10 @@ export async function routeServerRequest( if (isDataRequest) { const serverURL = new URL(request.url); - serverURL.pathname = serverURL.pathname.replace(/\.rsc$/, ""); + serverURL.pathname = serverURL.pathname.replace(/(_root)?\.rsc$/, ""); + if (!isDataRequest) { + serverURL.searchParams.delete("_routes"); + } serverRequest = new Request(serverURL, { body: request.body, duplex: request.body ? "half" : undefined, diff --git a/playground/rsc-vite/src/routes/about/about.tsx b/playground/rsc-vite/src/routes/about/about.tsx index 458f83df49..466983cb9f 100644 --- a/playground/rsc-vite/src/routes/about/about.tsx +++ b/playground/rsc-vite/src/routes/about/about.tsx @@ -2,7 +2,7 @@ import { data } from "react-router"; export { ErrorBoundary, - clientLazy, + // clientLazy, clientLoader, default, } from "./about.client"; diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx index 4cc5654e6a..4c565fe6e4 100644 --- a/playground/rsc-vite/src/routes/root/root.tsx +++ b/playground/rsc-vite/src/routes/root/root.tsx @@ -1,10 +1,4 @@ -import { - Link, - Links, - Outlet, - ScrollRestoration, - useRouteError, -} from "react-router"; +import { Link, Links, Outlet, ScrollRestoration } from "react-router"; import { Counter } from "../../counter"; import { ErrorReporter } from "./root.client"; From b1f4d3bc73b234beefd8f04b6ba96c289434ce79 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Fri, 11 Apr 2025 20:42:03 -0700 Subject: [PATCH 040/143] support for shouldRevalidate --- packages/react-router/lib/router/router.ts | 43 ++++-- packages/react-router/lib/server.browser.tsx | 54 ++++--- packages/react-router/lib/server.ts | 138 +++++++++--------- .../rsc-vite/src/routes/root/root.client.tsx | 4 + playground/rsc-vite/src/routes/root/root.tsx | 2 + 5 files changed, 146 insertions(+), 95 deletions(-) diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts index 2145350c88..8865bd531a 100644 --- a/packages/react-router/lib/router/router.ts +++ b/packages/react-router/lib/router/router.ts @@ -4909,9 +4909,26 @@ function patchRoutesImpl( manifest: RouteManifest, mapRouteProperties: MapRoutePropertiesFunction ) { + const findRouteRecursively = ( + id: string, + routes: AgnosticDataRouteObject[] = routesToUse + ): AgnosticDataRouteObject | null => { + for (const route of routes) { + if (route.id === id) { + return route; + } + if (route.children) { + const found = findRouteRecursively(id, route.children); + if (found) { + return found; + } + } + } + return null; + }; let childrenToPatch: AgnosticDataRouteObject[]; if (routeId) { - let route = manifest[routeId]; + let route = findRouteRecursively(routeId); invariant( route, `No route found to patch children into: routeId = ${routeId}` @@ -4930,18 +4947,22 @@ function patchRoutesImpl( [routeId || "_", "patch", String(childrenToPatch?.length || "0")], manifest ); - const newIds = new Set(newRoutes.map((r) => r.id)); - for (let i = childrenToPatch.length - 1; i >= 0; i--) { - if (newIds.has(childrenToPatch[i].id)) { - Object.assign( - childrenToPatch[i], - childrenToPatch.splice(i, 1)![0], - childrenToPatch[i] - ); + + for (const newRoute of newRoutes) { + const existingRoute = childrenToPatch.find((r) => r.id === newRoute.id); + if (existingRoute) { + let anyRoute: any = newRoute; + if (anyRoute.element) { + Object.assign(existingRoute, newRoute, { + element: anyRoute.element, + errorElement: anyRoute.errorElement, + hydrateFallbackElement: anyRoute.hydrateFallbackElement, + }); + } + } else { + childrenToPatch.push(newRoute); } } - - childrenToPatch.push(...newRoutes); } const lazyRoutePropertyCache = new WeakMap< diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index c25ffca396..ef1edd14ba 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -138,7 +138,7 @@ function createRouterFromPayload({ loaderData: payload.loaderData, }, routes, - async patchRoutesOnNavigation({ patch, path, signal }) { + async patchRoutesOnNavigation({ matches, patch, path, signal }) { const response = await fetch(`${path}.manifest`, { signal }); if (!response.body || response.status < 200 || response.status >= 300) { return; @@ -148,6 +148,7 @@ function createRouterFromPayload({ throw new Error("Failed to patch routes on navigation"); } + const existingIds = new Set(matches.map((m) => m.route.id)); let lastMatch: RenderedRoute | undefined; for (const match of payload.matches) { patch(lastMatch?.id ?? null, [createRouteFromServerManifest(match)]); @@ -178,6 +179,7 @@ function createRouterFromPayload({ return window.__router; } +const requestRenderedRouteCache = new WeakMap(); export function getRSCSingleFetchDataStrategy( getRouter: () => DataRouter, ssr: boolean, @@ -211,12 +213,23 @@ export function getRSCSingleFetchDataStrategy( ssr, basename ); - return async (args) => args.unstable_runClientMiddleware(dataStrategy); - // return async (args) => args.unstable_runClientMiddleware(async () => { - // let results = await dataStrategy() - // // patch into router from all payloads in map - // return results; - // }); + // return async (args) => args.unstable_runClientMiddleware(dataStrategy); + return async (args) => + args.unstable_runClientMiddleware(async () => { + const renderedRoutes: RenderedRoute[] = []; + requestRenderedRouteCache.set(args.request, renderedRoutes); + let results = await dataStrategy(args); + // patch into router from all payloads in map + const renderedRouteById = new Map(renderedRoutes.map((r) => [r.id, r])); + for (const match of args.matches) { + const rendered = renderedRouteById.get(match.route.id); + if (!rendered) continue; + window.__router.patchRoutes(rendered.parentId ?? null, [ + createRouteFromServerManifest(rendered), + ]); + } + return results; + }); } function getFetchAndDecodeViaRSC( @@ -227,7 +240,9 @@ function getFetchAndDecodeViaRSC( basename: string | undefined, targetRoutes?: string[] ) => { - // + const renderedRoutes = requestRenderedRouteCache.get(request); + invariant(renderedRoutes, "No rendered routes cache for request"); + let url = singleFetchUrl(request.url, basename, "rsc"); if (request.method === "GET") { url = stripIndexParam(url); @@ -252,17 +267,18 @@ function getFetchAndDecodeViaRSC( throw new Error("Unexpected payload type"); } - let lastMatch: RenderedRoute | undefined; - for (const match of payload.matches) { - // TODO: We can't do this per-request here because when clientLoaders - // come into play we'll have filtered matches coming back on the payloads. - // - // TODO: Don't blow away prior routes - window.__router.patchRoutes(lastMatch?.id ?? null, [ - createRouteFromServerManifest(match), - ]); - lastMatch = match; - } + renderedRoutes.push(...payload.matches); + // let lastMatch: RenderedRoute | undefined; + // for (const match of payload.matches) { + // // TODO: We can't do this per-request here because when clientLoaders + // // come into play we'll have filtered matches coming back on the payloads. + // // + // // TODO: Don't blow away prior routes + // window.__router.patchRoutes(lastMatch?.id ?? null, [ + // createRouteFromServerManifest(match), + // ]); + // lastMatch = match; + // } let results: DecodedSingleFetchResults = { routes: {} }; const dataKey = isMutationMethod(request.method) diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index 91def0626c..0106f72057 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -18,6 +18,7 @@ import { type ShouldRevalidateFunction, isRouteErrorResponse, matchRoutes, + AgnosticDataRouteMatch, } from "./router/utils"; type ServerRouteObjectBase = { @@ -62,6 +63,7 @@ export type RenderedRoute = { index?: boolean; links?: LinksFunction; meta?: MetaFunction; + parentId?: string; path?: string; shouldRevalidate?: ShouldRevalidateFunction; }; @@ -240,77 +242,83 @@ export async function matchServerRequest({ ) : staticContext.errors; + let lastMatch: AgnosticDataRouteMatch | null = null; + const matches = staticContext.matches.map((match) => { + const Layout = (match.route as any).Layout || React.Fragment; + const Component = (match.route as any).default; + const ErrorBoundary = (match.route as any).ErrorBoundary; + const HydrateFallback = (match.route as any).HydrateFallback; + const element = Component + ? React.createElement( + Layout, + { + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], + }, + React.createElement(Component, { + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], + }) + ) + : undefined; + const errorElement = ErrorBoundary + ? React.createElement( + Layout, + { + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], + }, + React.createElement(ErrorBoundary) + ) + : undefined; + const hydrateFallbackElement = HydrateFallback + ? React.createElement( + Layout, + { + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], + }, + React.createElement(HydrateFallback, { + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], + }) + ) + : undefined; + + let result = { + clientAction: (match.route as any).clientAction, + clientLoader: (match.route as any).clientLoader, + element, + errorElement, + handle: (match.route as any).handle, + hasAction: !!match.route.action, + hasErrorBoundary: !!(match.route as any).ErrorBoundary, + hasLoader: !!match.route.loader, + hydrateFallbackElement, + id: match.route.id, + index: match.route.index, + links: (match.route as any).links, + meta: (match.route as any).meta, + params: match.params, + parentId: lastMatch?.route.id, + path: match.route.path, + pathname: match.pathname, + pathnameBase: match.pathnameBase, + shouldRevalidate: (match.route as any).shouldRevalidate, + }; + lastMatch = match; + return result; + }); + const payload = { type: "render", actionData: staticContext.actionData, errors, loaderData: staticContext.loaderData, location: staticContext.location, - matches: staticContext.matches - .filter((m) => !routeIdsToLoad || routeIdsToLoad.includes(m.route.id)) - .map((match) => { - const Layout = (match.route as any).Layout || React.Fragment; - const Component = (match.route as any).default; - const ErrorBoundary = (match.route as any).ErrorBoundary; - const HydrateFallback = (match.route as any).HydrateFallback; - const element = Component - ? React.createElement( - Layout, - { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }, - React.createElement(Component, { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }) - ) - : undefined; - const errorElement = ErrorBoundary - ? React.createElement( - Layout, - { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }, - React.createElement(ErrorBoundary) - ) - : undefined; - const hydrateFallbackElement = HydrateFallback - ? React.createElement( - Layout, - { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }, - React.createElement(HydrateFallback, { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }) - ) - : undefined; - - return { - clientAction: (match.route as any).clientAction, - clientLoader: (match.route as any).clientLoader, - element, - errorElement, - handle: (match.route as any).handle, - hasAction: !!match.route.action, - hasErrorBoundary: !!(match.route as any).ErrorBoundary, - hasLoader: !!match.route.loader, - hydrateFallbackElement, - id: match.route.id, - index: match.route.index, - links: (match.route as any).links, - meta: (match.route as any).meta, - params: match.params, - path: match.route.path, - pathname: match.pathname, - pathnameBase: match.pathnameBase, - shouldRevalidate: (match.route as any).shouldRevalidate, - }; - }), + matches: matches.filter( + (m) => !routeIdsToLoad || routeIdsToLoad.includes(m.id) + ), } satisfies ServerRenderPayload; return payload; diff --git a/playground/rsc-vite/src/routes/root/root.client.tsx b/playground/rsc-vite/src/routes/root/root.client.tsx index 4e0042c3ea..6744475e54 100644 --- a/playground/rsc-vite/src/routes/root/root.client.tsx +++ b/playground/rsc-vite/src/routes/root/root.client.tsx @@ -18,3 +18,7 @@ export function ErrorBoundary() { ); } + +export function shouldRevalidate() { + return false; +} diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx index 4c565fe6e4..ff1637bcb6 100644 --- a/playground/rsc-vite/src/routes/root/root.tsx +++ b/playground/rsc-vite/src/routes/root/root.tsx @@ -3,6 +3,8 @@ import { Link, Links, Outlet, ScrollRestoration } from "react-router"; import { Counter } from "../../counter"; import { ErrorReporter } from "./root.client"; +export { shouldRevalidate } from "./root.client"; + export function loader() { return { counter: , From 8e3eac76846038b28e38cf4182b9aca396dc9fdd Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Fri, 11 Apr 2025 20:58:49 -0700 Subject: [PATCH 041/143] cleanup --- playground/rsc-vite/package.json | 1 + playground/rsc-vite/server.js | 2 ++ playground/rsc-vite/vite.config.ts | 6 ------ pnpm-lock.yaml | 25 +++++++++++++++++++++++++ 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/playground/rsc-vite/package.json b/playground/rsc-vite/package.json index 8f715d449f..784ee1e525 100644 --- a/playground/rsc-vite/package.json +++ b/playground/rsc-vite/package.json @@ -23,6 +23,7 @@ "dependencies": { "@jacob-ebey/react-server-dom-vite": "19.0.0-experimental.14", "@mjackson/node-fetch-server": "0.6.1", + "compression": "^1.8.0", "express": "^4.21.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/playground/rsc-vite/server.js b/playground/rsc-vite/server.js index 0bdb3ec01a..720b3553b3 100644 --- a/playground/rsc-vite/server.js +++ b/playground/rsc-vite/server.js @@ -1,4 +1,5 @@ import { createRequestListener } from "@mjackson/node-fetch-server"; +import compression from "compression"; import express from "express"; import ssr from "./dist/ssr/entry.ssr.js"; @@ -6,6 +7,7 @@ import server from "./dist/server/entry.server.js"; const app = express(); +app.use(compression()); app.use(express.static("dist/client")); app.use( diff --git a/playground/rsc-vite/vite.config.ts b/playground/rsc-vite/vite.config.ts index ac977e741c..3a4a900c4c 100644 --- a/playground/rsc-vite/vite.config.ts +++ b/playground/rsc-vite/vite.config.ts @@ -6,12 +6,6 @@ import { defineConfig } from "vite"; import tsconfigPaths from "vite-tsconfig-paths"; export default defineConfig({ - build: { - minify: false, - }, - define: { - "process.env.NODE_ENV": JSON.stringify("development"), - }, resolve: { external: ["cloudflare:workers"], }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8f73c6c785..d06200d301 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1463,6 +1463,9 @@ importers: '@mjackson/node-fetch-server': specifier: 0.6.1 version: 0.6.1 + compression: + specifier: ^1.8.0 + version: 1.8.0 express: specifier: ^4.21.2 version: 4.21.2 @@ -5686,6 +5689,10 @@ packages: resolution: {integrity: sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==} engines: {node: '>= 0.8.0'} + compression@1.8.0: + resolution: {integrity: sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==} + engines: {node: '>= 0.8.0'} + concat-map@0.0.1: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} @@ -8125,6 +8132,10 @@ packages: resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==} engines: {node: '>= 0.6'} + negotiator@0.6.4: + resolution: {integrity: sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==} + engines: {node: '>= 0.6'} + netmask@2.0.2: resolution: {integrity: sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==} engines: {node: '>= 0.4.0'} @@ -14997,6 +15008,18 @@ snapshots: transitivePeerDependencies: - supports-color + compression@1.8.0: + dependencies: + bytes: 3.1.2 + compressible: 2.0.18 + debug: 2.6.9 + negotiator: 0.6.4 + on-headers: 1.0.2 + safe-buffer: 5.2.1 + vary: 1.1.2 + transitivePeerDependencies: + - supports-color + concat-map@0.0.1: {} confbox@0.1.8: {} @@ -18392,6 +18415,8 @@ snapshots: negotiator@0.6.3: {} + negotiator@0.6.4: {} + netmask@2.0.2: {} nice-try@1.0.5: {} From 630603d8d13e14023c359e056c81cdd0ee016f17 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Fri, 11 Apr 2025 21:17:43 -0700 Subject: [PATCH 042/143] feat:! type: module make the parcel playground work again --- packages/react-router/package.json | 64 ++++------------------- playground/rsc-parcel/src/react-server.ts | 5 +- 2 files changed, 13 insertions(+), 56 deletions(-) diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 8f02003346..47ae72e7bc 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,7 @@ { "name": "react-router", "version": "7.5.0", + "type": "module", "description": "Declarative routing for React", "keywords": [ "react", @@ -24,71 +25,24 @@ "exports": { ".": { "react-server": { - "node": { - "types": "./dist/development/server.d.ts", - "module-sync": "./dist/development/server.mjs", - "default": "./dist/development/server.js" - }, - "import": { - "types": "./dist/development/server.d.mts", - "default": "./dist/development/server.mjs" - }, - "default": { - "types": "./dist/development/server.d.ts", - "default": "./dist/development/server.js" - } + "types": "./dist/development/server.d.mts", + "default": "./dist/development/server.mjs" }, - "node": { - "types": "./dist/development/index.d.ts", - "module-sync": "./dist/development/index.mjs", - "default": "./dist/development/index.js" - }, - "import": { + "default": { "types": "./dist/development/index.d.mts", "default": "./dist/development/index.mjs" - }, - "default": { - "types": "./dist/development/index.d.ts", - "default": "./dist/development/index.js" } }, "./client": { - "node": { - "types": "./dist/development/index.d.ts", - "module-sync": "./dist/development/index.mjs", - "default": "./dist/development/index.js" - }, - "import": { - "types": "./dist/development/index.d.mts", - "default": "./dist/development/index.mjs" - }, - "default": { - "types": "./dist/development/index.d.ts", - "default": "./dist/development/index.js" - } + "types": "./dist/development/index.d.mts", + "default": "./dist/development/index.mjs" }, "./route-module": { - "import": { - "types": "./dist/development/lib/types/route-module.d.mts" - }, - "default": { - "types": "./dist/development/lib/types/route-module.d.ts" - } + "types": "./dist/development/lib/types/route-module.d.mts" }, "./dom": { - "node": { - "types": "./dist/development/dom-export.d.ts", - "module-sync": "./dist/development/dom-export.mjs", - "default": "./dist/development/dom-export.js" - }, - "import": { - "types": "./dist/development/dom-export.d.mts", - "default": "./dist/development/dom-export.mjs" - }, - "default": { - "types": "./dist/development/dom-export.d.ts", - "default": "./dist/development/dom-export.js" - } + "types": "./dist/development/dom-export.d.mts", + "default": "./dist/development/dom-export.mjs" }, "./package.json": "./package.json" }, diff --git a/playground/rsc-parcel/src/react-server.ts b/playground/rsc-parcel/src/react-server.ts index 4b58944045..874b9fde34 100644 --- a/playground/rsc-parcel/src/react-server.ts +++ b/playground/rsc-parcel/src/react-server.ts @@ -9,7 +9,10 @@ import { renderToReadableStream } from "react-server-dom-parcel/server.edge"; import { routes } from "./routes"; export async function callServer(request: Request) { - const match = await matchServerRequest(request, routes); + const match = await matchServerRequest({ + request, + routes, + }); if (match instanceof Response) { return match; } From 99d4212c0a182d7532360b933ed0861b484df688 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Fri, 11 Apr 2025 21:31:08 -0700 Subject: [PATCH 043/143] fix build --- packages/react-router/server.ts | 1 + packages/react-router/tsconfig.json | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/react-router/server.ts b/packages/react-router/server.ts index d90fcfe7be..df053730a8 100644 --- a/packages/react-router/server.ts +++ b/packages/react-router/server.ts @@ -1,3 +1,4 @@ +// @ts-ignore export * from "react-router/client"; export { createStaticHandler } from "./lib/router/router"; diff --git a/packages/react-router/tsconfig.json b/packages/react-router/tsconfig.json index 8f3cb49e34..a5f00fa2e4 100644 --- a/packages/react-router/tsconfig.json +++ b/packages/react-router/tsconfig.json @@ -4,8 +4,8 @@ "compilerOptions": { "lib": ["ES2020", "DOM", "DOM.Iterable"], "target": "ES2020", - "module": "Node16", - "moduleResolution": "Node16", + "module": "es2020", + "moduleResolution": "bundler", "strict": true, "jsx": "react", From 213e4b1786725eb0add65fd9da632798afe6afbc Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Fri, 11 Apr 2025 21:38:09 -0700 Subject: [PATCH 044/143] revert module changes --- packages/react-router/lib/server.ts | 2 +- packages/react-router/package.json | 64 +++++++++++++++++++++++++---- packages/react-router/tsconfig.json | 4 +- 3 files changed, 58 insertions(+), 12 deletions(-) diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index 0106f72057..61d6b45b50 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -11,6 +11,7 @@ import type { Location } from "./router/history"; import { createStaticHandler } from "./router/router"; import { type ActionFunction, + type AgnosticDataRouteMatch, type AgnosticRouteObject, type LazyRouteFunction, type LoaderFunction, @@ -18,7 +19,6 @@ import { type ShouldRevalidateFunction, isRouteErrorResponse, matchRoutes, - AgnosticDataRouteMatch, } from "./router/utils"; type ServerRouteObjectBase = { diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 47ae72e7bc..8f02003346 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,7 +1,6 @@ { "name": "react-router", "version": "7.5.0", - "type": "module", "description": "Declarative routing for React", "keywords": [ "react", @@ -25,24 +24,71 @@ "exports": { ".": { "react-server": { - "types": "./dist/development/server.d.mts", - "default": "./dist/development/server.mjs" + "node": { + "types": "./dist/development/server.d.ts", + "module-sync": "./dist/development/server.mjs", + "default": "./dist/development/server.js" + }, + "import": { + "types": "./dist/development/server.d.mts", + "default": "./dist/development/server.mjs" + }, + "default": { + "types": "./dist/development/server.d.ts", + "default": "./dist/development/server.js" + } }, - "default": { + "node": { + "types": "./dist/development/index.d.ts", + "module-sync": "./dist/development/index.mjs", + "default": "./dist/development/index.js" + }, + "import": { "types": "./dist/development/index.d.mts", "default": "./dist/development/index.mjs" + }, + "default": { + "types": "./dist/development/index.d.ts", + "default": "./dist/development/index.js" } }, "./client": { - "types": "./dist/development/index.d.mts", - "default": "./dist/development/index.mjs" + "node": { + "types": "./dist/development/index.d.ts", + "module-sync": "./dist/development/index.mjs", + "default": "./dist/development/index.js" + }, + "import": { + "types": "./dist/development/index.d.mts", + "default": "./dist/development/index.mjs" + }, + "default": { + "types": "./dist/development/index.d.ts", + "default": "./dist/development/index.js" + } }, "./route-module": { - "types": "./dist/development/lib/types/route-module.d.mts" + "import": { + "types": "./dist/development/lib/types/route-module.d.mts" + }, + "default": { + "types": "./dist/development/lib/types/route-module.d.ts" + } }, "./dom": { - "types": "./dist/development/dom-export.d.mts", - "default": "./dist/development/dom-export.mjs" + "node": { + "types": "./dist/development/dom-export.d.ts", + "module-sync": "./dist/development/dom-export.mjs", + "default": "./dist/development/dom-export.js" + }, + "import": { + "types": "./dist/development/dom-export.d.mts", + "default": "./dist/development/dom-export.mjs" + }, + "default": { + "types": "./dist/development/dom-export.d.ts", + "default": "./dist/development/dom-export.js" + } }, "./package.json": "./package.json" }, diff --git a/packages/react-router/tsconfig.json b/packages/react-router/tsconfig.json index a5f00fa2e4..8f3cb49e34 100644 --- a/packages/react-router/tsconfig.json +++ b/packages/react-router/tsconfig.json @@ -4,8 +4,8 @@ "compilerOptions": { "lib": ["ES2020", "DOM", "DOM.Iterable"], "target": "ES2020", - "module": "es2020", - "moduleResolution": "bundler", + "module": "Node16", + "moduleResolution": "Node16", "strict": true, "jsx": "react", From 7f3242e372f35bc9e92afdff182618d6bd79d26a Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Mon, 14 Apr 2025 12:39:40 -0400 Subject: [PATCH 045/143] Minor playground updates --- playground/rsc-vite/src/counter.tsx | 11 ++++--- .../src/routes/about/about.client.tsx | 14 ++++---- .../rsc-vite/src/routes/about/about.tsx | 2 +- playground/rsc-vite/src/routes/home/home.tsx | 13 ++++---- playground/rsc-vite/src/routes/root/root.tsx | 33 +++++++++---------- 5 files changed, 36 insertions(+), 37 deletions(-) diff --git a/playground/rsc-vite/src/counter.tsx b/playground/rsc-vite/src/counter.tsx index 7a5b69a098..a7ecda6819 100644 --- a/playground/rsc-vite/src/counter.tsx +++ b/playground/rsc-vite/src/counter.tsx @@ -7,11 +7,12 @@ export function Counter() { return (
-

Counter

-

Current count: {count}

- +

+ Counter: {count}{" "} + +

); } diff --git a/playground/rsc-vite/src/routes/about/about.client.tsx b/playground/rsc-vite/src/routes/about/about.client.tsx index 10ef390a87..d2908bf985 100644 --- a/playground/rsc-vite/src/routes/about/about.client.tsx +++ b/playground/rsc-vite/src/routes/about/about.client.tsx @@ -26,21 +26,19 @@ export async function clientLoader({ serverLoader }: ClientLoaderFunctionArgs) { const res = await serverLoader(); return { - client: true, - ...res, + message: res.message + " (mutated in clientLoader)", }; } export default function About() { - const { client, message } = useLoaderData(); + const loaderData = useLoaderData(); return ( -
-

- {message} {String(client)} -

+
+

About Route

+

Loader data: {loaderData.message}

-
+ ); } diff --git a/playground/rsc-vite/src/routes/about/about.tsx b/playground/rsc-vite/src/routes/about/about.tsx index 466983cb9f..28fa805f0b 100644 --- a/playground/rsc-vite/src/routes/about/about.tsx +++ b/playground/rsc-vite/src/routes/about/about.tsx @@ -11,6 +11,6 @@ export function loader() { // throw new Error("oops"); // throw data("This is a test error", 404); return { - message: "Hello About!" + "!".repeat(Math.floor(Math.random() * 10)), + message: `About route loader ran at ${new Date().toISOString()}`, }; } diff --git a/playground/rsc-vite/src/routes/home/home.tsx b/playground/rsc-vite/src/routes/home/home.tsx index 5d451c65c6..d81af8f7fc 100644 --- a/playground/rsc-vite/src/routes/home/home.tsx +++ b/playground/rsc-vite/src/routes/home/home.tsx @@ -4,27 +4,28 @@ import { Counter } from "../../counter"; export function loader() { return { - message: "Hello Home!" + "!".repeat(Math.floor(Math.random() * 10)), + message: `Home route loader ran at ${new Date().toISOString()}`, }; } export default function Home({ - loaderData: { message }, + loaderData, }: { loaderData: Awaited>; }) { const logOnServer = () => { "use server"; - console.log(message); + console.log(loaderData.message); }; return ( -
-

{message}

+
+

Home Route

+

Loader data: {loaderData.message}

-
+ ); } diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx index ff1637bcb6..eef1121387 100644 --- a/playground/rsc-vite/src/routes/root/root.tsx +++ b/playground/rsc-vite/src/routes/root/root.tsx @@ -8,21 +8,22 @@ export { shouldRevalidate } from "./root.client"; export function loader() { return { counter: , - message: "Hello from the server!", + message: `Root route loader ran at ${new Date().toISOString()}`, }; } export default function Root({ - loaderData: { counter, message }, + loaderData, }: { loaderData: Awaited>; }) { return ( - <> -

{message}

- {counter} +
+

Root Route

+

Loader data: {loaderData.message}

+ {loaderData.counter} - +
); } @@ -49,18 +50,16 @@ export function Layout({ children }: { children: React.ReactNode }) { -
-
    -
  • - Home -
    • -
  • - About -
    • -
+
+
+ Home + {" | "} + About +
+

Root Layout

-
- {children} + {children} + From d129b6d238b91d2e242f65d5f940ba91bebe1513 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Mon, 14 Apr 2025 13:15:13 -0400 Subject: [PATCH 046/143] Add unstable parameter for in-place element mutations --- packages/react-router/lib/router/router.ts | 172 ++++++++++++++----- packages/react-router/lib/router/utils.ts | 11 +- packages/react-router/lib/server.browser.tsx | 47 +++-- 3 files changed, 161 insertions(+), 69 deletions(-) diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts index 8865bd531a..143b6b20a4 100644 --- a/packages/react-router/lib/router/router.ts +++ b/packages/react-router/lib/router/router.ts @@ -1,4 +1,4 @@ -import type { DataRouteMatch } from "../context"; +import type { DataRouteMatch, RouteObject } from "../context"; import type { History, Location, Path, To } from "./history"; import { Action as NavigationType, @@ -258,8 +258,15 @@ export interface Router { * @param routeId The parent route id or a callback function accepting `patch` * to perform batch patching * @param children The additional children routes + * @param allowElementMutations Allow mutation or route elements on existing routes. + * Intended for RSC-usage only. */ - patchRoutes(routeId: string | null, children: AgnosticRouteObject[]): void; + patchRoutes( + routeId: string | null, + children: AgnosticRouteObject[], + // TODO: Does this need ro be a future flag or is the new API ok? + unstable_allowElementMutations?: boolean + ): void; /** * @private @@ -3287,7 +3294,8 @@ export function createRouter(init: RouterInit): Router { children, routesToUse, localManifest, - mapRouteProperties + mapRouteProperties, + false ); }, }); @@ -3348,7 +3356,8 @@ export function createRouter(init: RouterInit): Router { function patchRoutes( routeId: string | null, - children: AgnosticRouteObject[] + children: AgnosticRouteObject[], + unstable_allowElementMutations = false ): void { let isNonHMR = inFlightDataRoutes == null; let routesToUse = inFlightDataRoutes || dataRoutes; @@ -3357,7 +3366,8 @@ export function createRouter(init: RouterInit): Router { children, routesToUse, manifest, - mapRouteProperties + mapRouteProperties, + unstable_allowElementMutations ); routesPatched = true; @@ -4907,28 +4917,13 @@ function patchRoutesImpl( children: AgnosticRouteObject[], routesToUse: AgnosticDataRouteObject[], manifest: RouteManifest, - mapRouteProperties: MapRoutePropertiesFunction + mapRouteProperties: MapRoutePropertiesFunction, + allowElementMutations: boolean ) { - const findRouteRecursively = ( - id: string, - routes: AgnosticDataRouteObject[] = routesToUse - ): AgnosticDataRouteObject | null => { - for (const route of routes) { - if (route.id === id) { - return route; - } - if (route.children) { - const found = findRouteRecursively(id, route.children); - if (found) { - return found; - } - } - } - return null; - }; let childrenToPatch: AgnosticDataRouteObject[]; if (routeId) { - let route = findRouteRecursively(routeId); + // TODO: Can we enhance the manifest to make this an O(1) lookup? + let route = findRouteRecursively(routeId, routesToUse); invariant( route, `No route found to patch children into: routeId = ${routeId}` @@ -4941,28 +4936,123 @@ function patchRoutesImpl( childrenToPatch = routesToUse; } - let newRoutes = convertRoutesToDataRoutes( - children, - mapRouteProperties, - [routeId || "_", "patch", String(childrenToPatch?.length || "0")], - manifest + // Don't patch in routes we already know about so that `patch` is idempotent + // to simplify user-land code. This is useful because we re-call the + // `patchRoutesOnNavigation` function for matched routes with params. + let uniqueChildren: AgnosticRouteObject[] = []; + let existingChildren: { + existingRoute: AgnosticRouteObject; + newRoute: AgnosticRouteObject; + }[] = []; + children.forEach((newRoute) => { + let existingRoute = childrenToPatch.find((existingRoute) => + isSameRoute(newRoute, existingRoute) ); - - for (const newRoute of newRoutes) { - const existingRoute = childrenToPatch.find((r) => r.id === newRoute.id); if (existingRoute) { - let anyRoute: any = newRoute; - if (anyRoute.element) { - Object.assign(existingRoute, newRoute, { - element: anyRoute.element, - errorElement: anyRoute.errorElement, - hydrateFallbackElement: anyRoute.hydrateFallbackElement, - }); - } + existingChildren.push({ existingRoute, newRoute }); } else { - childrenToPatch.push(newRoute); + uniqueChildren.push(newRoute); + } + }); + + if (uniqueChildren.length > 0) { + // Patch in new children + childrenToPatch.push( + ...convertRoutesToDataRoutes( + uniqueChildren, + mapRouteProperties, + [routeId || "_", "patch", String(childrenToPatch?.length || "0")], + manifest + ) + ); + } + + // When flag is enabled we allow mutations of elements on exiting routes + if (allowElementMutations && existingChildren.length > 0) { + for (let i = 0; i < existingChildren.length; i++) { + let { existingRoute, newRoute } = existingChildren[i]; + let existingRouteAny = existingRoute as RouteObject; + // All this will end up doing for these scenarios is adding `hasErrorBoundary` + // to the route. There's no need for Component->element conversions since + // we're already dealing with elements here + let [newRouteAny] = convertRoutesToDataRoutes( + [newRoute], + mapRouteProperties, + [], // Doesn't matter for mutated routes since they already have an id + manifest, + true + ) as RouteObject[]; + Object.assign(existingRouteAny, { + element: newRouteAny.element + ? newRouteAny.element + : existingRouteAny.element, + errorElement: newRouteAny.errorElement + ? newRouteAny.errorElement + : existingRouteAny.errorElement, + hydrateFallbackElement: newRouteAny.hydrateFallbackElement + ? newRouteAny.hydrateFallbackElement + : existingRouteAny.hydrateFallbackElement, + }); + } + } +} + +function isSameRoute( + newRoute: AgnosticRouteObject, + existingRoute: AgnosticRouteObject +): boolean { + // Most optimal check is by id + if ( + "id" in newRoute && + "id" in existingRoute && + newRoute.id === existingRoute.id + ) { + return true; + } + + // Second is by pathing differences + if ( + !( + newRoute.index === existingRoute.index && + newRoute.path === existingRoute.path && + newRoute.caseSensitive === existingRoute.caseSensitive + ) + ) { + return false; + } + + // Pathless layout routes are trickier since we need to check children. + // If they have no children then they're the same as far as we can tell + if ( + (!newRoute.children || newRoute.children.length === 0) && + (!existingRoute.children || existingRoute.children.length === 0) + ) { + return true; + } + + // Otherwise, we look to see if every child in the new route is already + // represented in the existing route's children + return newRoute.children!.every((aChild, i) => + existingRoute.children?.some((bChild) => isSameRoute(aChild, bChild)) + ); +} + +function findRouteRecursively( + id: string, + routes: AgnosticDataRouteObject[] +): AgnosticDataRouteObject | null { + for (const route of routes) { + if (route.id === id) { + return route; + } + if (route.children) { + const found = findRouteRecursively(id, route.children); + if (found) { + return found; + } } } + return null; } const lazyRoutePropertyCache = new WeakMap< diff --git a/packages/react-router/lib/router/utils.ts b/packages/react-router/lib/router/utils.ts index eb513549f4..c3844dc8c0 100644 --- a/packages/react-router/lib/router/utils.ts +++ b/packages/react-router/lib/router/utils.ts @@ -658,7 +658,8 @@ export function convertRoutesToDataRoutes( routes: AgnosticRouteObject[], mapRouteProperties: MapRoutePropertiesFunction, parentPath: string[] = [], - manifest: RouteManifest = {} + manifest: RouteManifest = {}, + allowInPlaceMutations = false ): AgnosticDataRouteObject[] { return routes.map((route, index) => { let treePath = [...parentPath, String(index)]; @@ -667,6 +668,11 @@ export function convertRoutesToDataRoutes( route.index !== true || !route.children, `Cannot specify children on an index route` ); + invariant( + allowInPlaceMutations || !manifest[id], + `Found a route id collision on id "${id}". Route ` + + "id's must be globally unique within Data Router usages" + ); if (isIndexRoute(route)) { let indexRoute: AgnosticDataIndexRouteObject = { @@ -690,7 +696,8 @@ export function convertRoutesToDataRoutes( route.children, mapRouteProperties, treePath, - manifest + manifest, + allowInPlaceMutations ); } diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index ef1edd14ba..40b366d281 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -75,9 +75,11 @@ export function createCallServer({ landedActionId = actionId; let lastMatch: RenderedRoute | undefined; for (const match of rendered.matches) { - window.__router.patchRoutes(lastMatch?.id ?? null, [ - createRouteFromServerManifest(match), - ]); + window.__router.patchRoutes( + lastMatch?.id ?? null, + [createRouteFromServerManifest(match)], + true + ); lastMatch = match; } @@ -139,21 +141,23 @@ function createRouterFromPayload({ }, routes, async patchRoutesOnNavigation({ matches, patch, path, signal }) { - const response = await fetch(`${path}.manifest`, { signal }); + let response = await fetch(`${path}.manifest`, { signal }); if (!response.body || response.status < 200 || response.status >= 300) { - return; + throw new Error("Unable to fetch new route matches from the server"); } - const payload = await decode(response.body); + + let payload = await decode(response.body); if (payload.type !== "manifest") { throw new Error("Failed to patch routes on navigation"); } - const existingIds = new Set(matches.map((m) => m.route.id)); - let lastMatch: RenderedRoute | undefined; - for (const match of payload.matches) { - patch(lastMatch?.id ?? null, [createRouteFromServerManifest(match)]); - lastMatch = match; - } + // Without the `allowElementMutations` flag, this will no-op if the route + // already exists so we can just call it for all returned matches + payload.matches.forEach((match, i) => + patch(payload.matches[i - 1]?.id ?? null, [ + createRouteFromServerManifest(match), + ]) + ); }, // FIXME: Pass `build.ssr` and `build.basename` into this function dataStrategy: getRSCSingleFetchDataStrategy( @@ -224,9 +228,11 @@ export function getRSCSingleFetchDataStrategy( for (const match of args.matches) { const rendered = renderedRouteById.get(match.route.id); if (!rendered) continue; - window.__router.patchRoutes(rendered.parentId ?? null, [ - createRouteFromServerManifest(rendered), - ]); + window.__router.patchRoutes( + rendered.parentId ?? null, + [createRouteFromServerManifest(rendered)], + true + ); } return results; }); @@ -268,17 +274,6 @@ function getFetchAndDecodeViaRSC( } renderedRoutes.push(...payload.matches); - // let lastMatch: RenderedRoute | undefined; - // for (const match of payload.matches) { - // // TODO: We can't do this per-request here because when clientLoaders - // // come into play we'll have filtered matches coming back on the payloads. - // // - // // TODO: Don't blow away prior routes - // window.__router.patchRoutes(lastMatch?.id ?? null, [ - // createRouteFromServerManifest(match), - // ]); - // lastMatch = match; - // } let results: DecodedSingleFetchResults = { routes: {} }; const dataKey = isMutationMethod(request.method) From eaf8dfda6185c8d2b61c3e72d1d4986a0640e30f Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Mon, 14 Apr 2025 13:16:56 -0400 Subject: [PATCH 047/143] cleanup --- packages/react-router/lib/router/router.ts | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts index 143b6b20a4..c91590df8f 100644 --- a/packages/react-router/lib/router/router.ts +++ b/packages/react-router/lib/router/router.ts @@ -4947,7 +4947,7 @@ function patchRoutesImpl( children.forEach((newRoute) => { let existingRoute = childrenToPatch.find((existingRoute) => isSameRoute(newRoute, existingRoute) - ); + ); if (existingRoute) { existingChildren.push({ existingRoute, newRoute }); } else { @@ -4956,15 +4956,13 @@ function patchRoutesImpl( }); if (uniqueChildren.length > 0) { - // Patch in new children - childrenToPatch.push( - ...convertRoutesToDataRoutes( - uniqueChildren, - mapRouteProperties, - [routeId || "_", "patch", String(childrenToPatch?.length || "0")], - manifest - ) + let newRoutes = convertRoutesToDataRoutes( + uniqueChildren, + mapRouteProperties, + [routeId || "_", "patch", String(childrenToPatch?.length || "0")], + manifest ); + childrenToPatch.push(...newRoutes); } // When flag is enabled we allow mutations of elements on exiting routes From 20b7cfc352937ae01f6f742f5f65fe8415de59ae Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Mon, 14 Apr 2025 14:54:19 -0400 Subject: [PATCH 048/143] Switch to use context instead of a WeakMap for renderedRoutes --- .../react-router/lib/dom/ssr/single-fetch.tsx | 46 +++++++++---------- packages/react-router/lib/server.browser.tsx | 44 +++++++++++++----- playground/rsc-vite/src/routes/home/home.tsx | 5 +- .../rsc-vite/src/routes/root/root.client.tsx | 4 +- 4 files changed, 60 insertions(+), 39 deletions(-) diff --git a/packages/react-router/lib/dom/ssr/single-fetch.tsx b/packages/react-router/lib/dom/ssr/single-fetch.tsx index 78d965b7b7..fb578ab48c 100644 --- a/packages/react-router/lib/dom/ssr/single-fetch.tsx +++ b/packages/react-router/lib/dom/ssr/single-fetch.tsx @@ -6,6 +6,7 @@ import type { DataStrategyFunction, DataStrategyFunctionArgs, DataStrategyResult, + unstable_RouterContextProvider, } from "../../router/utils"; import { ErrorResponseImpl, @@ -156,7 +157,7 @@ export type GetRouteInfoFunction = (match: DataRouteMatch) => { }; export type FetchAndDecodeFunction = ( - request: Request, + args: DataStrategyFunctionArgs, basename: string | undefined, targetRoutes?: string[] ) => Promise<{ status: number; data: DecodedSingleFetchResults }>; @@ -245,12 +246,7 @@ export function getSingleFetchDataStrategyImpl( // Fetcher loads are singular calls to one loader if (fetcherKey) { - return singleFetchLoaderFetcherStrategy( - request, - matches, - fetchAndDecode, - basename - ); + return singleFetchLoaderFetcherStrategy(args, fetchAndDecode, basename); } // Navigational loads are more complex... @@ -268,16 +264,16 @@ export function getSingleFetchDataStrategyImpl( // Actions are simple since they're singular calls to the server for both // navigations and fetchers) async function singleFetchActionStrategy( - { request, matches }: DataStrategyFunctionArgs, + args: DataStrategyFunctionArgs, fetchAndDecode: FetchAndDecodeFunction, basename: string | undefined ) { - let actionMatch = matches.find((m) => m.unstable_shouldCallHandler()); + let actionMatch = args.matches.find((m) => m.unstable_shouldCallHandler()); invariant(actionMatch, "No action match found"); let actionStatus: number | undefined = undefined; let result = await actionMatch.resolve(async (handler) => { let result = await handler(async () => { - let { data, status } = await fetchAndDecode(request, basename, [ + let { data, status } = await fetchAndDecode(args, basename, [ actionMatch!.route.id, ]); actionStatus = status; @@ -302,12 +298,14 @@ async function singleFetchActionStrategy( // We want to opt-out of Single Fetch when we aren't in SSR mode async function nonSsrStrategy( - { request, matches }: DataStrategyFunctionArgs, + args: DataStrategyFunctionArgs, getRouteInfo: GetRouteInfoFunction, fetchAndDecode: FetchAndDecodeFunction, basename: string | undefined ) { - let matchesToLoad = matches.filter((m) => m.unstable_shouldCallHandler()); + let matchesToLoad = args.matches.filter((m) => + m.unstable_shouldCallHandler() + ); let results: Record = {}; await Promise.all( matchesToLoad.map((m) => @@ -320,9 +318,7 @@ async function nonSsrStrategy( let routeId = m.route.id; let result = hasClientLoader ? await handler(async () => { - let { data } = await fetchAndDecode(request, basename, [ - routeId, - ]); + let { data } = await fetchAndDecode(args, basename, [routeId]); return unwrapSingleFetchResult(data, routeId); }) : await handler(); @@ -339,7 +335,7 @@ async function nonSsrStrategy( // Loaders are trickier since we only want to hit the server once, so we // create a singular promise for all server-loader routes to latch onto. async function singleFetchLoaderNavigationStrategy( - { request, matches }: DataStrategyFunctionArgs, + args: DataStrategyFunctionArgs, router: DataRouter, getRouteInfo: GetRouteInfoFunction, fetchAndDecode: FetchAndDecodeFunction, @@ -353,7 +349,7 @@ async function singleFetchLoaderNavigationStrategy( let foundOptOutRoute = false; // Deferreds per-route so we can be sure they've all loaded via `match.resolve()` - let routeDfds = matches.map(() => createDeferred()); + let routeDfds = args.matches.map(() => createDeferred()); // Deferred we'll use for the singleular call to the server let singleFetchDfd = createDeferred(); @@ -362,7 +358,7 @@ async function singleFetchLoaderNavigationStrategy( let results: Record = {}; let resolvePromise = Promise.all( - matches.map(async (m, i) => + args.matches.map(async (m, i) => m.resolve(async (handler) => { routeDfds[i].resolve(); let routeId = m.route.id; @@ -392,7 +388,7 @@ async function singleFetchLoaderNavigationStrategy( } try { let result = await handler(async () => { - let { data } = await fetchAndDecode(request, basename, [routeId]); + let { data } = await fetchAndDecode(args, basename, [routeId]); return unwrapSingleFetchResult(data, routeId); }); @@ -445,7 +441,7 @@ async function singleFetchLoaderNavigationStrategy( ? [...routesParams.keys()] : undefined; try { - let data = await fetchAndDecode(request, basename, targetRoutes); + let data = await fetchAndDecode(args, basename, targetRoutes); singleFetchDfd.resolve(data.data); } catch (e) { singleFetchDfd.reject(e); @@ -459,17 +455,16 @@ async function singleFetchLoaderNavigationStrategy( // Fetcher loader calls are much simpler than navigational loader calls async function singleFetchLoaderFetcherStrategy( - request: Request, - matches: DataStrategyFunctionArgs["matches"], + args: DataStrategyFunctionArgs, fetchAndDecode: FetchAndDecodeFunction, basename: string | undefined ) { - let fetcherMatch = matches.find((m) => m.unstable_shouldCallHandler()); + let fetcherMatch = args.matches.find((m) => m.unstable_shouldCallHandler()); invariant(fetcherMatch, "No fetcher match found"); let routeId = fetcherMatch.route.id; let result = await fetcherMatch.resolve(async (handler) => handler(async () => { - let { data } = await fetchAndDecode(request, basename, [routeId]); + let { data } = await fetchAndDecode(args, basename, [routeId]); return unwrapSingleFetchResult(data, routeId); }) ); @@ -521,10 +516,11 @@ export function singleFetchUrl( } const fetchAndDecodeViaTurboStream: FetchAndDecodeFunction = async ( - request: Request, + args: DataStrategyFunctionArgs, basename: string | undefined, targetRoutes?: string[] ): Promise<{ status: number; data: DecodedSingleFetchResults }> => { + let { request } = args; let url = singleFetchUrl(request.url, basename, "data"); if (request.method === "GET") { url = stripIndexParam(url); diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index 40b366d281..3e50705acc 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -8,7 +8,12 @@ import { createBrowserHistory, invariant } from "./router/history"; import type { Router as DataRouter } from "./router/router"; import { createRouter, isMutationMethod } from "./router/router"; import type { ServerPayload, RenderedRoute } from "./server"; -import { ErrorResponseImpl, type DataStrategyFunction } from "./router/utils"; +import type { + DataStrategyFunction, + DataStrategyFunctionArgs, + unstable_RouterContextProvider, +} from "./router/utils"; +import { ErrorResponseImpl, unstable_createContext } from "./router/utils"; import type { DecodedSingleFetchResults, FetchAndDecodeFunction, @@ -140,7 +145,7 @@ function createRouterFromPayload({ loaderData: payload.loaderData, }, routes, - async patchRoutesOnNavigation({ matches, patch, path, signal }) { + async patchRoutesOnNavigation({ patch, path, signal }) { let response = await fetch(`${path}.manifest`, { signal }); if (!response.body || response.status < 200 || response.status >= 300) { throw new Error("Unable to fetch new route matches from the server"); @@ -183,7 +188,8 @@ function createRouterFromPayload({ return window.__router; } -const requestRenderedRouteCache = new WeakMap(); +const renderedRoutesContext = unstable_createContext(); + export function getRSCSingleFetchDataStrategy( getRouter: () => DataRouter, ssr: boolean, @@ -220,11 +226,22 @@ export function getRSCSingleFetchDataStrategy( // return async (args) => args.unstable_runClientMiddleware(dataStrategy); return async (args) => args.unstable_runClientMiddleware(async () => { - const renderedRoutes: RenderedRoute[] = []; - requestRenderedRouteCache.set(args.request, renderedRoutes); + // Before we run the dataStrategy, create a place to stick rendered routes + // from the payload so we can patch them into the router after all loaders + // have completed. Need to do this since we may have multiple fetch + // requests returning multiple server payloads (due to clientLoaders, fine + // grained revalidation, etc.). This lets us stitch them all together and + // patch them all at the end + // This cast should be fine since this is always run client side and + // `context` is always of this type on the client -- unlike on the server + // in framework mode when it could be `AppLoadContext` + let context = args.context as unstable_RouterContextProvider; + context.set(renderedRoutesContext, []); let results = await dataStrategy(args); // patch into router from all payloads in map - const renderedRouteById = new Map(renderedRoutes.map((r) => [r.id, r])); + const renderedRouteById = new Map( + context.get(renderedRoutesContext).map((r) => [r.id, r]) + ); for (const match of args.matches) { const rendered = renderedRouteById.get(match.route.id); if (!rendered) continue; @@ -242,13 +259,11 @@ function getFetchAndDecodeViaRSC( decode: DecodeServerResponseFunction ): FetchAndDecodeFunction { return async ( - request: Request, + args: DataStrategyFunctionArgs, basename: string | undefined, targetRoutes?: string[] ) => { - const renderedRoutes = requestRenderedRouteCache.get(request); - invariant(renderedRoutes, "No rendered routes cache for request"); - + let { request, context } = args; let url = singleFetchUrl(request.url, basename, "rsc"); if (request.method === "GET") { url = stripIndexParam(url); @@ -273,7 +288,14 @@ function getFetchAndDecodeViaRSC( throw new Error("Unexpected payload type"); } - renderedRoutes.push(...payload.matches); + // Track routes rendered per-single-fetch call so we can gather them up + // and patch them in together at the end. This cast should be fine since + // this is always run client side and `context` is always of this type on + // the client -- unlike on the server in framework mode when it could be + // `AppLoadContext` + (context as unstable_RouterContextProvider) + .get(renderedRoutesContext) + .push(...payload.matches); let results: DecodedSingleFetchResults = { routes: {} }; const dataKey = isMutationMethod(request.method) diff --git a/playground/rsc-vite/src/routes/home/home.tsx b/playground/rsc-vite/src/routes/home/home.tsx index d81af8f7fc..a21812567e 100644 --- a/playground/rsc-vite/src/routes/home/home.tsx +++ b/playground/rsc-vite/src/routes/home/home.tsx @@ -15,7 +15,10 @@ export default function Home({ }) { const logOnServer = () => { "use server"; - console.log(loaderData.message); + console.log("Running action on server!"); + console.log( + ` loader data to prove that scoped vars work: ${loaderData.message}` + ); }; return ( diff --git a/playground/rsc-vite/src/routes/root/root.client.tsx b/playground/rsc-vite/src/routes/root/root.client.tsx index 6744475e54..e6eda4c65b 100644 --- a/playground/rsc-vite/src/routes/root/root.client.tsx +++ b/playground/rsc-vite/src/routes/root/root.client.tsx @@ -19,6 +19,6 @@ export function ErrorBoundary() { ); } -export function shouldRevalidate() { - return false; +export function shouldRevalidate({ nextUrl }: { nextUrl: URL }) { + return !nextUrl.pathname.endsWith("/about"); } From 427df65268f1ab5b19ca323090fa4c8106d3e5d7 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Mon, 14 Apr 2025 15:19:18 -0400 Subject: [PATCH 049/143] Remove routesPatched logic with auto-update --- packages/react-router/lib/router/router.ts | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts index c91590df8f..a5252efa7f 100644 --- a/packages/react-router/lib/router/router.ts +++ b/packages/react-router/lib/router/router.ts @@ -850,7 +850,6 @@ export function createRouter(init: RouterInit): Router { manifest ); let inFlightDataRoutes: AgnosticDataRouteObject[] | undefined; - let routesPatched = false; let basename = init.basename || "/"; let dataStrategyImpl = init.dataStrategy || defaultDataStrategyWithMiddleware; @@ -1168,6 +1167,15 @@ export function createRouter(init: RouterInit): Router { viewTransitionOpts?: ViewTransitionOpts; } = {} ): void { + // We may have patched routes during the navigation and if so we need to + // get references to the latest elements here + if (newState.matches) { + newState.matches = newState.matches.map((m) => { + let route = manifest[m.route.id]!; + return { ...m, route }; + }); + } + state = { ...state, ...newState, @@ -1227,11 +1235,6 @@ export function createRouter(init: RouterInit): Router { newState: Partial>, { flushSync }: { flushSync?: boolean } = {} ): void { - if (routesPatched) { - newState.matches = matchRoutes(dataRoutes, location) ?? newState.matches; - routesPatched = false; - } - // Deduce if we're in a loading/actionReload state: // - We have committed actionData in the store // - The current navigation was a mutation submission @@ -3370,8 +3373,6 @@ export function createRouter(init: RouterInit): Router { unstable_allowElementMutations ); - routesPatched = true; - // If we are not in the middle of an HMR revalidation and we changed the // routes, provide a new identity and trigger a reflow via `updateState` // to re-run memoized `router.routes` dependencies. @@ -3420,11 +3421,6 @@ export function createRouter(init: RouterInit): Router { // updating the tree while validating the update algorithm. _internalSetRoutes, _internalSetStateDoNotUseOrYouWillBreakYourApp(newState) { - if (routesPatched) { - newState.matches = - matchRoutes(dataRoutes, location) ?? newState.matches; - routesPatched = false; - } updateState(newState); }, }; From 768bcad1e2674e2b88cb02cde956e9a3811b11cc Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Mon, 14 Apr 2025 16:44:42 -0400 Subject: [PATCH 050/143] Add support for actions --- packages/react-router/lib/server.browser.tsx | 59 ++++++++++--------- packages/react-router/lib/server.ts | 19 ++---- .../src/routes/about/about.client.tsx | 18 +++++- .../rsc-vite/src/routes/about/about.tsx | 9 +++ 4 files changed, 62 insertions(+), 43 deletions(-) diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index 3e50705acc..4c654688b0 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -90,11 +90,6 @@ export function createCallServer({ React.startTransition(() => { window.__router._internalSetStateDoNotUseOrYouWillBreakYourApp({ - actionData: Object.assign( - {}, - window.__router.state.actionData, - rendered.actionData - ), loaderData: Object.assign( {}, window.__router.state.loaderData, @@ -223,7 +218,6 @@ export function getRSCSingleFetchDataStrategy( ssr, basename ); - // return async (args) => args.unstable_runClientMiddleware(dataStrategy); return async (args) => args.unstable_runClientMiddleware(async () => { // Before we run the dataStrategy, create a place to stick rendered routes @@ -244,12 +238,13 @@ export function getRSCSingleFetchDataStrategy( ); for (const match of args.matches) { const rendered = renderedRouteById.get(match.route.id); - if (!rendered) continue; - window.__router.patchRoutes( - rendered.parentId ?? null, - [createRouteFromServerManifest(rendered)], - true - ); + if (rendered) { + window.__router.patchRoutes( + rendered.parentId ?? null, + [createRouteFromServerManifest(rendered)], + true + ); + } } return results; }); @@ -383,29 +378,30 @@ function createRouteFromServerManifest( } { return { id: match.id, - action: match.hasAction || !!match.clientAction, element: match.element, errorElement: match.errorElement, handle: match.handle, hasErrorBoundary: match.hasErrorBoundary, hydrateFallbackElement: match.hydrateFallbackElement, index: match.index, - loader: - // prettier-ignore - match.clientLoader ? (args, singleFetch) => { - return match.clientLoader!({ - ...args, - async serverLoader() { - invariant(typeof singleFetch === "function", "Invalid singleFetch parameter"); - return singleFetch(); - }, - }); - } : - match.hasLoader ? (args, singleFetch) => { - invariant(typeof singleFetch === "function", "Invalid singleFetch parameter"); - return singleFetch(); - } : - undefined, + loader: match.clientLoader + ? (args, singleFetch) => + match.clientLoader!({ + ...args, + serverLoader: () => callSingleFetch(singleFetch), + }) + : match.hasLoader + ? (_, singleFetch) => callSingleFetch(singleFetch) + : undefined, + action: match.clientAction + ? (args, singleFetch) => + match.clientAction!({ + ...args, + serverAction: () => callSingleFetch(singleFetch), + }) + : match.hasAction + ? (_, singleFetch) => callSingleFetch(singleFetch) + : undefined, path: match.path, shouldRevalidate: match.shouldRevalidate, hasLoader: match.hasLoader, @@ -415,3 +411,8 @@ function createRouteFromServerManifest( hasShouldRevalidate: match.shouldRevalidate != null, }; } + +function callSingleFetch(singleFetch: unknown) { + invariant(typeof singleFetch === "function", "Invalid singleFetch parameter"); + return singleFetch(); +} diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index 61d6b45b50..a7cfd1d092 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -251,10 +251,7 @@ export async function matchServerRequest({ const element = Component ? React.createElement( Layout, - { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }, + null, React.createElement(Component, { loaderData: staticContext.loaderData[match.route.id], actionData: staticContext.actionData?.[match.route.id], @@ -264,20 +261,16 @@ export async function matchServerRequest({ const errorElement = ErrorBoundary ? React.createElement( Layout, - { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }, - React.createElement(ErrorBoundary) + null, + React.createElement(ErrorBoundary, { + error: staticContext.errors?.[match.route.id], + }) ) : undefined; const hydrateFallbackElement = HydrateFallback ? React.createElement( Layout, - { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }, + null, React.createElement(HydrateFallback, { loaderData: staticContext.loaderData[match.route.id], actionData: staticContext.actionData?.[match.route.id], diff --git a/playground/rsc-vite/src/routes/about/about.client.tsx b/playground/rsc-vite/src/routes/about/about.client.tsx index d2908bf985..436aa41f62 100644 --- a/playground/rsc-vite/src/routes/about/about.client.tsx +++ b/playground/rsc-vite/src/routes/about/about.client.tsx @@ -4,11 +4,14 @@ import { type ClientLoaderFunctionArgs, useLoaderData, useRouteError, + Form, + useActionData, + type ClientActionFunctionArgs, } from "react-router"; import { Counter } from "../../counter"; -import type { loader } from "./about"; +import type { action, loader } from "./about"; // TODO: Investigate using lazy as a preload method for split route chunk modules // export function lazy() { @@ -22,6 +25,14 @@ import type { loader } from "./about"; // ); // } +export async function clientAction({ serverAction }: ClientActionFunctionArgs) { + console.log("action"); + let data = await serverAction(); + return { + message: data.message + " (mutated by client)", + }; +} + export async function clientLoader({ serverLoader }: ClientLoaderFunctionArgs) { const res = await serverLoader(); @@ -32,12 +43,17 @@ export async function clientLoader({ serverLoader }: ClientLoaderFunctionArgs) { export default function About() { const loaderData = useLoaderData(); + const actionData = useActionData(); return (

About Route

Loader data: {loaderData.message}

+
+ + {actionData ?

{actionData.message}

: null} +
); } diff --git a/playground/rsc-vite/src/routes/about/about.tsx b/playground/rsc-vite/src/routes/about/about.tsx index 28fa805f0b..04a36a9c59 100644 --- a/playground/rsc-vite/src/routes/about/about.tsx +++ b/playground/rsc-vite/src/routes/about/about.tsx @@ -4,9 +4,18 @@ export { ErrorBoundary, // clientLazy, clientLoader, + clientAction, default, } from "./about.client"; +export function action() { + // throw new Error("oops"); + // throw data("This is a test error", 404); + return { + message: `About route action ran at ${new Date().toISOString()}`, + }; +} + export function loader() { // throw new Error("oops"); // throw data("This is a test error", 404); From e38f49c9d817a948cc0ad4581379705b9677f436 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Mon, 14 Apr 2025 15:17:58 -0700 Subject: [PATCH 051/143] fix: skip revalidation for actions feat: add `module` export condition --- packages/react-router/lib/server.ts | 7 ++++++- packages/react-router/package.json | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index a7cfd1d092..bf31dc041a 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -208,13 +208,18 @@ export async function matchServerRequest({ const getRenderPayload = async (): Promise => { const handler = createStaticHandler(routes); + let method = request.method.toUpperCase(); + let skipRevalidation = method !== "GET" && method !== "HEAD"; let url = new URL(request.url); - let routeIdsToLoad = url.searchParams.has("_routes") + let routeIdsToLoad = skipRevalidation + ? [] + : url.searchParams.has("_routes") ? url.searchParams.get("_routes")!.split(",") : null; const staticContext = await handler.query(request, { skipLoaderErrorBubbling: true, + skipRevalidation, ...(routeIdsToLoad ? { filterMatchesToLoad: (m) => routeIdsToLoad!.includes(m.route.id), diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 73c50da1e7..69f1bb0d6f 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -26,9 +26,14 @@ "react-server": { "node": { "types": "./dist/development/server.d.ts", + "module": "./dist/development/server.mjs", "module-sync": "./dist/development/server.mjs", "default": "./dist/development/server.js" }, + "module": { + "types": "./dist/development/server.d.mts", + "default": "./dist/development/server.mjs" + }, "import": { "types": "./dist/development/server.d.mts", "default": "./dist/development/server.mjs" @@ -40,9 +45,14 @@ }, "node": { "types": "./dist/development/index.d.ts", + "module": "./dist/development/index.mjs", "module-sync": "./dist/development/index.mjs", "default": "./dist/development/index.js" }, + "module": { + "types": "./dist/development/index.d.mts", + "default": "./dist/development/index.mjs" + }, "import": { "types": "./dist/development/index.d.mts", "default": "./dist/development/index.mjs" @@ -58,6 +68,10 @@ "module-sync": "./dist/development/index.mjs", "default": "./dist/development/index.js" }, + "module": { + "types": "./dist/development/index.d.mts", + "default": "./dist/development/index.mjs" + }, "import": { "types": "./dist/development/index.d.mts", "default": "./dist/development/index.mjs" @@ -78,9 +92,14 @@ "./dom": { "node": { "types": "./dist/development/dom-export.d.ts", + "module": "./dist/development/dom-export.mjs", "module-sync": "./dist/development/dom-export.mjs", "default": "./dist/development/dom-export.js" }, + "module": { + "types": "./dist/development/dom-export.d.mts", + "default": "./dist/development/dom-export.mjs" + }, "import": { "types": "./dist/development/dom-export.d.mts", "default": "./dist/development/dom-export.mjs" @@ -113,6 +132,7 @@ } }, "dependencies": { + "@types/cookie": "^0.6.0", "cookie": "^1.0.1", "set-cookie-parser": "^2.6.0", "turbo-stream": "2.4.0" From 0be18542ae2403c6d1b7bef830fbbe3592b9875f Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Mon, 14 Apr 2025 15:20:21 -0700 Subject: [PATCH 052/143] update lockfile --- pnpm-lock.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 94a15d5170..2d468a7292 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -738,6 +738,9 @@ importers: packages/react-router: dependencies: + '@types/cookie': + specifier: ^0.6.0 + version: 0.6.0 cookie: specifier: ^1.0.1 version: 1.0.1 @@ -4847,6 +4850,9 @@ packages: '@types/cookie@0.4.1': resolution: {integrity: sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==} + '@types/cookie@0.6.0': + resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==} + '@types/cookiejar@2.1.5': resolution: {integrity: sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==} @@ -13963,6 +13969,8 @@ snapshots: '@types/cookie@0.4.1': {} + '@types/cookie@0.6.0': {} + '@types/cookiejar@2.1.5': {} '@types/cross-spawn@6.0.6': From 6edd9373d8396d7d0332301f2a3b3a40d6dd70de Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Tue, 15 Apr 2025 11:48:41 -0400 Subject: [PATCH 053/143] Decouple query flags from matches rendering --- packages/react-router/lib/server.ts | 163 ++++++++++++++-------------- 1 file changed, 84 insertions(+), 79 deletions(-) diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index bf31dc041a..37f5d971b7 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -8,7 +8,7 @@ import type { } from "./dom/ssr/routeModules"; import { injectRSCPayload } from "./html-stream/server"; import type { Location } from "./router/history"; -import { createStaticHandler } from "./router/router"; +import { createStaticHandler, isMutationMethod } from "./router/router"; import { type ActionFunction, type AgnosticDataRouteMatch, @@ -208,22 +208,21 @@ export async function matchServerRequest({ const getRenderPayload = async (): Promise => { const handler = createStaticHandler(routes); - let method = request.method.toUpperCase(); - let skipRevalidation = method !== "GET" && method !== "HEAD"; - let url = new URL(request.url); - let routeIdsToLoad = skipRevalidation - ? [] - : url.searchParams.has("_routes") - ? url.searchParams.get("_routes")!.split(",") - : null; + // If this is a RR submission, we just want the `actionData` but don't want + // to call any loaders or render any components back in the response - that + // will happen in the subsequent revalidation request + let isSubmission = isMutationMethod(request.method); + let searchParams = new URL(request.url).searchParams; + let routeIdsToLoad = + !isSubmission && searchParams.has("_routes") + ? searchParams.get("_routes")!.split(",") + : null; const staticContext = await handler.query(request, { skipLoaderErrorBubbling: true, - skipRevalidation, + skipRevalidation: isSubmission, ...(routeIdsToLoad - ? { - filterMatchesToLoad: (m) => routeIdsToLoad!.includes(m.route.id), - } + ? { filterMatchesToLoad: (m) => routeIdsToLoad!.includes(m.route.id) } : null), }); @@ -234,6 +233,7 @@ export async function matchServerRequest({ headers.set("x-react-router-error", "true"); throw staticContext; } + statusCode = staticContext.statusCode ?? statusCode; const errors = staticContext.errors @@ -247,77 +247,82 @@ export async function matchServerRequest({ ) : staticContext.errors; - let lastMatch: AgnosticDataRouteMatch | null = null; - const matches = staticContext.matches.map((match) => { - const Layout = (match.route as any).Layout || React.Fragment; - const Component = (match.route as any).default; - const ErrorBoundary = (match.route as any).ErrorBoundary; - const HydrateFallback = (match.route as any).HydrateFallback; - const element = Component - ? React.createElement( - Layout, - null, - React.createElement(Component, { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }) - ) - : undefined; - const errorElement = ErrorBoundary - ? React.createElement( - Layout, - null, - React.createElement(ErrorBoundary, { - error: staticContext.errors?.[match.route.id], - }) - ) - : undefined; - const hydrateFallbackElement = HydrateFallback - ? React.createElement( - Layout, - null, - React.createElement(HydrateFallback, { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }) - ) - : undefined; - - let result = { - clientAction: (match.route as any).clientAction, - clientLoader: (match.route as any).clientLoader, - element, - errorElement, - handle: (match.route as any).handle, - hasAction: !!match.route.action, - hasErrorBoundary: !!(match.route as any).ErrorBoundary, - hasLoader: !!match.route.loader, - hydrateFallbackElement, - id: match.route.id, - index: match.route.index, - links: (match.route as any).links, - meta: (match.route as any).meta, - params: match.params, - parentId: lastMatch?.route.id, - path: match.route.path, - pathname: match.pathname, - pathnameBase: match.pathnameBase, - shouldRevalidate: (match.route as any).shouldRevalidate, - }; - lastMatch = match; - return result; - }); - - const payload = { + const payload: ServerRenderPayload = { type: "render", actionData: staticContext.actionData, errors, loaderData: staticContext.loaderData, location: staticContext.location, - matches: matches.filter( - (m) => !routeIdsToLoad || routeIdsToLoad.includes(m.id) - ), - } satisfies ServerRenderPayload; + matches: [], + }; + + // Short circuit without matches on submissions + if (isSubmission) { + return payload; + } + + let lastMatch: AgnosticDataRouteMatch | null = null; + payload.matches = staticContext.matches + .filter((m) => !routeIdsToLoad || routeIdsToLoad.includes(m.id)) + .map((match) => { + const Layout = (match.route as any).Layout || React.Fragment; + const Component = (match.route as any).default; + const ErrorBoundary = (match.route as any).ErrorBoundary; + const HydrateFallback = (match.route as any).HydrateFallback; + const element = Component + ? React.createElement( + Layout, + null, + React.createElement(Component, { + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], + }) + ) + : undefined; + const errorElement = ErrorBoundary + ? React.createElement( + Layout, + null, + React.createElement(ErrorBoundary, { + error: staticContext.errors?.[match.route.id], + }) + ) + : undefined; + const hydrateFallbackElement = HydrateFallback + ? React.createElement( + Layout, + null, + React.createElement(HydrateFallback, { + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], + }) + ) + : undefined; + + let result = { + clientAction: (match.route as any).clientAction, + clientLoader: (match.route as any).clientLoader, + element, + errorElement, + handle: (match.route as any).handle, + hasAction: !!match.route.action, + hasErrorBoundary: !!(match.route as any).ErrorBoundary, + hasLoader: !!match.route.loader, + hydrateFallbackElement, + id: match.route.id, + index: match.route.index, + links: (match.route as any).links, + meta: (match.route as any).meta, + params: match.params, + parentId: lastMatch?.route.id, + path: match.route.path, + pathname: match.pathname, + pathnameBase: match.pathnameBase, + shouldRevalidate: (match.route as any).shouldRevalidate, + }; + lastMatch = match; + return result; + }); return payload; }; From 319856e98c74c73b5d4bdd961bda0873123c65ae Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Tue, 15 Apr 2025 11:55:53 -0400 Subject: [PATCH 054/143] oops --- packages/react-router/lib/server.ts | 124 ++++++++++++++-------------- 1 file changed, 63 insertions(+), 61 deletions(-) diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index 37f5d971b7..2f84f2e47b 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -262,67 +262,69 @@ export async function matchServerRequest({ } let lastMatch: AgnosticDataRouteMatch | null = null; - payload.matches = staticContext.matches - .filter((m) => !routeIdsToLoad || routeIdsToLoad.includes(m.id)) - .map((match) => { - const Layout = (match.route as any).Layout || React.Fragment; - const Component = (match.route as any).default; - const ErrorBoundary = (match.route as any).ErrorBoundary; - const HydrateFallback = (match.route as any).HydrateFallback; - const element = Component - ? React.createElement( - Layout, - null, - React.createElement(Component, { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }) - ) - : undefined; - const errorElement = ErrorBoundary - ? React.createElement( - Layout, - null, - React.createElement(ErrorBoundary, { - error: staticContext.errors?.[match.route.id], - }) - ) - : undefined; - const hydrateFallbackElement = HydrateFallback - ? React.createElement( - Layout, - null, - React.createElement(HydrateFallback, { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }) - ) - : undefined; - - let result = { - clientAction: (match.route as any).clientAction, - clientLoader: (match.route as any).clientLoader, - element, - errorElement, - handle: (match.route as any).handle, - hasAction: !!match.route.action, - hasErrorBoundary: !!(match.route as any).ErrorBoundary, - hasLoader: !!match.route.loader, - hydrateFallbackElement, - id: match.route.id, - index: match.route.index, - links: (match.route as any).links, - meta: (match.route as any).meta, - params: match.params, - parentId: lastMatch?.route.id, - path: match.route.path, - pathname: match.pathname, - pathnameBase: match.pathnameBase, - shouldRevalidate: (match.route as any).shouldRevalidate, - }; - lastMatch = match; - return result; - }); + let matches = staticContext.matches.map((match) => { + const Layout = (match.route as any).Layout || React.Fragment; + const Component = (match.route as any).default; + const ErrorBoundary = (match.route as any).ErrorBoundary; + const HydrateFallback = (match.route as any).HydrateFallback; + const element = Component + ? React.createElement( + Layout, + null, + React.createElement(Component, { + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], + }) + ) + : undefined; + const errorElement = ErrorBoundary + ? React.createElement( + Layout, + null, + React.createElement(ErrorBoundary, { + error: staticContext.errors?.[match.route.id], + }) + ) + : undefined; + const hydrateFallbackElement = HydrateFallback + ? React.createElement( + Layout, + null, + React.createElement(HydrateFallback, { + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], + }) + ) + : undefined; + + let result = { + clientAction: (match.route as any).clientAction, + clientLoader: (match.route as any).clientLoader, + element, + errorElement, + handle: (match.route as any).handle, + hasAction: !!match.route.action, + hasErrorBoundary: !!(match.route as any).ErrorBoundary, + hasLoader: !!match.route.loader, + hydrateFallbackElement, + id: match.route.id, + index: match.route.index, + links: (match.route as any).links, + meta: (match.route as any).meta, + params: match.params, + parentId: lastMatch?.route.id, + path: match.route.path, + pathname: match.pathname, + pathnameBase: match.pathnameBase, + shouldRevalidate: (match.route as any).shouldRevalidate, + }; + lastMatch = match; + return result; + }); + + payload.matches = routeIdsToLoad + ? matches.filter((m) => routeIdsToLoad.includes(m.id)) + : matches; return payload; }; From 55e1d7dcdceff13c08a7049768eb1bad1ff5ddae Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Tue, 15 Apr 2025 13:33:43 -0400 Subject: [PATCH 055/143] Wire up clientLoader.hydrate behavior --- packages/react-router/index.ts | 3 + .../lib/dom-export/hydrated-router.tsx | 57 ++------ .../react-router/lib/dom/ssr/hydration.tsx | 66 +++++++++ packages/react-router/lib/dom/ssr/routes.tsx | 22 +-- packages/react-router/lib/dom/ssr/server.tsx | 7 +- packages/react-router/lib/server.browser.tsx | 132 +++++++++++++----- packages/react-router/lib/server.ts | 7 + .../src/routes/about/about.client.tsx | 3 +- 8 files changed, 207 insertions(+), 90 deletions(-) create mode 100644 packages/react-router/lib/dom/ssr/hydration.tsx diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts index 737e24f8e9..3e40b13797 100644 --- a/packages/react-router/index.ts +++ b/packages/react-router/index.ts @@ -342,6 +342,9 @@ export { useFogOFWarDiscovery as UNSAFE_useFogOFWarDiscovery, } from "./lib/dom/ssr/fog-of-war"; +/** @internal */ +export { getHydrationData as UNSAFE_getHydrationData } from "./lib/dom/ssr/hydration"; + /** @internal */ export type { RouteModules as UNSAFE_RouteModules } from "./lib/dom/ssr/routeModules"; diff --git a/packages/react-router/lib/dom-export/hydrated-router.tsx b/packages/react-router/lib/dom-export/hydrated-router.tsx index 4acde5d6c5..bffb98b92b 100644 --- a/packages/react-router/lib/dom-export/hydrated-router.tsx +++ b/packages/react-router/lib/dom-export/hydrated-router.tsx @@ -8,6 +8,7 @@ import type { RouterInit, } from "react-router"; import { + UNSAFE_getHydrationData as getHydrationData, UNSAFE_invariant as invariant, UNSAFE_FrameworkContext as FrameworkContext, UNSAFE_decodeViaTurboStream as decodeViaTurboStream, @@ -18,12 +19,10 @@ import { UNSAFE_deserializeErrors as deserializeErrors, UNSAFE_getTurboStreamSingleFetchDataStrategy as getTurboStreamSingleFetchDataStrategy, UNSAFE_getPatchRoutesOnNavigationFunction as getPatchRoutesOnNavigationFunction, - UNSAFE_shouldHydrateRouteLoader as shouldHydrateRouteLoader, UNSAFE_useFogOFWarDiscovery as useFogOFWarDiscovery, UNSAFE_mapRouteProperties as mapRouteProperties, UNSAFE_hydrationRouteProperties as hydrationRouteProperties, UNSAFE_createClientRoutesWithHMRRevalidationOptOut as createClientRoutesWithHMRRevalidationOptOut, - matchRoutes, } from "react-router"; import { RouterProvider } from "./dom-router-provider"; @@ -126,9 +125,9 @@ function createHydratedRouter({ ); let hydrationData: HydrationState | undefined = undefined; - let loaderData = ssrInfo.context.state.loaderData; // In SPA mode we only hydrate build-time root loader data if (ssrInfo.context.isSpaMode) { + let { loaderData } = ssrInfo.context.state; if ( ssrInfo.manifest.routes.root?.hasLoader && loaderData && @@ -141,51 +140,17 @@ function createHydratedRouter({ }; } } else { - // Create a shallow clone of `loaderData` we can mutate for partial hydration. - // When a route exports a `clientLoader` and a `HydrateFallback`, the SSR will - // render the fallback so we need the client to do the same for hydration. - // The server loader data has already been exposed to these route `clientLoader`'s - // in `createClientRoutes` above, so we need to clear out the version we pass to - // `createBrowserRouter` so it initializes and runs the client loaders. - hydrationData = { - ...ssrInfo.context.state, - loaderData: { ...loaderData }, - }; - let initialMatches = matchRoutes( + hydrationData = getHydrationData( + ssrInfo.context.state, routes, - window.location, - window.__reactRouterContext?.basename + (routeId) => ({ + clientLoader: ssrInfo!.routeModules[routeId]?.clientLoader, + hasLoader: ssrInfo!.manifest.routes[routeId]?.hasLoader === true, + hasHydrateFallback: + ssrInfo!.routeModules[routeId]?.HydrateFallback != null, + }), + ssrInfo.context.isSpaMode ); - if (initialMatches) { - for (let match of initialMatches) { - let routeId = match.route.id; - let route = ssrInfo.routeModules[routeId]; - let manifestRoute = ssrInfo.manifest.routes[routeId]; - // Clear out the loaderData to avoid rendering the route component when the - // route opted into clientLoader hydration and either: - // * gave us a HydrateFallback - // * or doesn't have a server loader and we have no data to render - if ( - route && - manifestRoute && - shouldHydrateRouteLoader( - manifestRoute, - route, - ssrInfo.context.isSpaMode - ) && - (route.HydrateFallback || !manifestRoute.hasLoader) - ) { - delete hydrationData.loaderData![routeId]; - } else if (manifestRoute && !manifestRoute.hasLoader) { - // Since every Remix route gets a `loader` on the client side to load - // the route JS module, we need to add a `null` value to `loaderData` - // for any routes that don't have server loaders so our partial - // hydration logic doesn't kick off the route module loaders during - // hydration - hydrationData.loaderData![routeId] = null; - } - } - } if (hydrationData && hydrationData.errors) { // TODO: De-dup this or remove entirely in v7 where single fetch is the diff --git a/packages/react-router/lib/dom/ssr/hydration.tsx b/packages/react-router/lib/dom/ssr/hydration.tsx new file mode 100644 index 0000000000..c5b737d477 --- /dev/null +++ b/packages/react-router/lib/dom/ssr/hydration.tsx @@ -0,0 +1,66 @@ +import type { DataRouteObject } from "../../context"; +import type { Router as DataRouter, HydrationState } from "../../router/router"; +import { matchRoutes } from "../../router/utils"; +import { shouldHydrateRouteLoader } from "./routes"; +import type { ClientLoaderFunction } from "./routeModules"; + +export function getHydrationData( + state: { + loaderData?: DataRouter["state"]["loaderData"]; + actionData?: DataRouter["state"]["actionData"]; + errors?: DataRouter["state"]["errors"]; + }, + routes: DataRouteObject[], + getRouteInfo: (routeId: string) => { + clientLoader: ClientLoaderFunction | undefined; + hasLoader: boolean; + hasHydrateFallback: boolean; + }, + isSpaMode: boolean +): HydrationState { + // Create a shallow clone of `loaderData` we can mutate for partial hydration. + // When a route exports a `clientLoader` and a `HydrateFallback`, the SSR will + // render the fallback so we need the client to do the same for hydration. + // The server loader data has already been exposed to these route `clientLoader`'s + // in `createClientRoutes` above, so we need to clear out the version we pass to + // `createBrowserRouter` so it initializes and runs the client loaders. + let hydrationData = { + ...state, + loaderData: { ...state.loaderData }, + }; + let initialMatches = matchRoutes( + routes, + window.location, + window.__reactRouterContext?.basename + ); + if (initialMatches) { + for (let match of initialMatches) { + let routeId = match.route.id; + let routeInfo = getRouteInfo(routeId); + // Clear out the loaderData to avoid rendering the route component when the + // route opted into clientLoader hydration and either: + // * gave us a HydrateFallback + // * or doesn't have a server loader and we have no data to render + if ( + shouldHydrateRouteLoader( + routeId, + routeInfo.clientLoader, + routeInfo.hasLoader, + isSpaMode + ) && + (routeInfo.hasHydrateFallback || !routeInfo.hasLoader) + ) { + delete hydrationData.loaderData![routeId]; + } else if (!routeInfo.hasLoader) { + // Since every Remix route gets a `loader` on the client side to load + // the route JS module, we need to add a `null` value to `loaderData` + // for any routes that don't have server loaders so our partial + // hydration logic doesn't kick off the route module loaders during + // hydration + hydrationData.loaderData![routeId] = null; + } + } + } + + return hydrationData; +} diff --git a/packages/react-router/lib/dom/ssr/routes.tsx b/packages/react-router/lib/dom/ssr/routes.tsx index 985b3246ac..39f5ca9b6c 100644 --- a/packages/react-router/lib/dom/ssr/routes.tsx +++ b/packages/react-router/lib/dom/ssr/routes.tsx @@ -9,7 +9,11 @@ import type { ShouldRevalidateFunctionArgs, } from "../../router/utils"; import { ErrorResponseImpl, compilePath } from "../../router/utils"; -import type { RouteModule, RouteModules } from "./routeModules"; +import type { + ClientLoaderFunction, + RouteModule, + RouteModules, +} from "./routeModules"; import { loadRouteModule } from "./routeModules"; import type { FutureConfig } from "./entry"; import { prefetchRouteCss, prefetchStyleLinks } from "./links"; @@ -382,8 +386,9 @@ export function createClientRoutes( // Let React Router know whether to run this on hydration dataRoute.loader.hydrate = shouldHydrateRouteLoader( - route, - routeModule, + route.id, + routeModule.clientLoader, + route.hasLoader, isSpaMode ); @@ -676,13 +681,14 @@ function getRouteModuleComponent(routeModule: RouteModule) { } export function shouldHydrateRouteLoader( - route: EntryRoute, - routeModule: RouteModule, + routeId: string, + clientLoader: ClientLoaderFunction | undefined, + hasLoader: boolean, isSpaMode: boolean ) { return ( - (isSpaMode && route.id !== "root") || - (routeModule.clientLoader != null && - (routeModule.clientLoader.hydrate === true || route.hasLoader !== true)) + (isSpaMode && routeId !== "root") || + (clientLoader != null && + (clientLoader.hydrate === true || hasLoader !== true)) ); } diff --git a/packages/react-router/lib/dom/ssr/server.tsx b/packages/react-router/lib/dom/ssr/server.tsx index 9bf9582e46..7b54e4a37e 100644 --- a/packages/react-router/lib/dom/ssr/server.tsx +++ b/packages/react-router/lib/dom/ssr/server.tsx @@ -57,7 +57,12 @@ export function ServerRouter({ if ( route && manifestRoute && - shouldHydrateRouteLoader(manifestRoute, route, context.isSpaMode) && + shouldHydrateRouteLoader( + routeId, + route.clientLoader, + manifestRoute.hasLoader, + context.isSpaMode + ) && (route.HydrateFallback || !manifestRoute.hasLoader) ) { delete context.staticHandlerContext.loaderData[routeId]; diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index 4c654688b0..963fddfa33 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -7,10 +7,16 @@ import type { FrameworkContextObject } from "./dom/ssr/entry"; import { createBrowserHistory, invariant } from "./router/history"; import type { Router as DataRouter } from "./router/router"; import { createRouter, isMutationMethod } from "./router/router"; -import type { ServerPayload, RenderedRoute } from "./server"; import type { + ServerPayload, + RenderedRoute, + ServerRenderPayload, +} from "./server"; +import type { + ActionFunction, DataStrategyFunction, DataStrategyFunctionArgs, + LoaderFunction, unstable_RouterContextProvider, } from "./router/utils"; import { ErrorResponseImpl, unstable_createContext } from "./router/utils"; @@ -24,6 +30,8 @@ import { stripIndexParam, } from "./dom/ssr/single-fetch"; import { createRequestInit } from "./dom/ssr/data"; +import { getHydrationData } from "./dom/ssr/hydration"; +import { shouldHydrateRouteLoader } from "./dom/ssr/routes"; export type DecodeServerResponseFunction = ( body: ReadableStream @@ -34,7 +42,7 @@ export type EncodeActionFunction = (args: unknown[]) => Promise; declare global { interface Window { __router: DataRouter; - __routerInitPromise?: Promise; + __routerInitialized: boolean; } } @@ -124,7 +132,10 @@ function createRouterFromPayload({ if (payload.type !== "render") throw new Error("Invalid payload type"); let routes = payload.matches.reduceRight((previous, match) => { - const route: DataRouteObject = createRouteFromServerManifest(match); + const route: DataRouteObject = createRouteFromServerManifest( + match, + payload + ); if (previous.length > 0) { route.children = previous; } @@ -132,14 +143,27 @@ function createRouterFromPayload({ }, [] as DataRouteObject[]); window.__router = createRouter({ + routes, basename: payload.basename, history: createBrowserHistory(), - hydrationData: { - actionData: payload.actionData, - errors: payload.errors, - loaderData: payload.loaderData, - }, - routes, + hydrationData: getHydrationData( + { + loaderData: payload.loaderData, + actionData: payload.actionData, + errors: payload.errors, + }, + routes, + (routeId) => { + let match = payload.matches.find((m) => m.id === routeId); + invariant(match, "Route not found in payload"); + return { + clientLoader: match.clientLoader, + hasLoader: match.hasLoader, + hasHydrateFallback: match.hydrateFallbackElement != null, + }; + }, + false + ), async patchRoutesOnNavigation({ patch, path, signal }) { let response = await fetch(`${path}.manifest`, { signal }); if (!response.body || response.status < 200 || response.status >= 300) { @@ -166,18 +190,15 @@ function createRouterFromPayload({ undefined, decode ), - }).initialize(); - - if (!window.__router.state.initialized) { - window.__routerInitPromise = new Promise((resolve) => { - const unsubscribe = window.__router.subscribe((state) => { - if (state.initialized) { - window.__routerInitPromise = undefined; - unsubscribe(); - resolve(); - } - }); - }); + }); + + // We can call initialize() immediately if the router doesn't have any + // loaders to run on hydration + if (window.__router.state.initialized) { + window.__routerInitialized = true; + window.__router.initialize(); + } else { + window.__routerInitialized = false; } return window.__router; @@ -331,9 +352,14 @@ export function ServerBrowserRouter({ [] ); - if (window.__routerInitPromise) { - throw window.__routerInitPromise; - } + React.useLayoutEffect(() => { + // If we had to run clientLoaders on hydration, we delay initialization until + // after we've hydrated to avoid hydration issues from synchronous client loaders + if (!window.__routerInitialized) { + window.__routerInitialized = true; + window.__router.initialize(); + } + }, []); const frameworkContext: FrameworkContextObject = { future: { @@ -367,16 +393,26 @@ export function ServerBrowserRouter({ ); } -function createRouteFromServerManifest( - match: RenderedRoute -): DataRouteObject & { +type DataRouteObjectWithManifestInfo = DataRouteObject & { hasLoader: boolean; hasClientLoader: boolean; hasAction: boolean; hasClientAction: boolean; hasShouldRevalidate: boolean; -} { - return { +}; + +function createRouteFromServerManifest( + match: RenderedRoute, + payload?: ServerRenderPayload +): DataRouteObjectWithManifestInfo { + let hasInitialData = payload && match.id in payload.loaderData; + let initialData = payload?.loaderData[match.id]; + let hasInitialError = payload?.errors && match.id in payload.errors; + let initialError = payload?.errors?.[match.id]; + let isHydrationRequest = + match.clientLoader?.hydrate === true || !match.hasLoader; + + let dataRoute: DataRouteObjectWithManifestInfo = { id: match.id, element: match.element, errorElement: match.errorElement, @@ -385,11 +421,28 @@ function createRouteFromServerManifest( hydrateFallbackElement: match.hydrateFallbackElement, index: match.index, loader: match.clientLoader - ? (args, singleFetch) => - match.clientLoader!({ - ...args, - serverLoader: () => callSingleFetch(singleFetch), - }) + ? async (args, singleFetch) => { + try { + let result = await match.clientLoader!({ + ...args, + serverLoader: () => { + // On the first call, resolve with the server result + if (isHydrationRequest) { + if (hasInitialData) { + return initialData; + } + if (hasInitialError) { + throw initialError; + } + } + return callSingleFetch(singleFetch); + }, + }); + return result; + } finally { + isHydrationRequest = false; + } + } : match.hasLoader ? (_, singleFetch) => callSingleFetch(singleFetch) : undefined, @@ -410,6 +463,17 @@ function createRouteFromServerManifest( hasClientAction: match.clientAction != null, hasShouldRevalidate: match.shouldRevalidate != null, }; + + if (typeof dataRoute.loader === "function") { + dataRoute.loader.hydrate = shouldHydrateRouteLoader( + match.id, + match.clientLoader, + match.hasLoader, + false + ); + } + + return dataRoute; } function callSingleFetch(singleFetch: unknown) { diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index 2f84f2e47b..3c076d8522 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -267,6 +267,8 @@ export async function matchServerRequest({ const Component = (match.route as any).default; const ErrorBoundary = (match.route as any).ErrorBoundary; const HydrateFallback = (match.route as any).HydrateFallback; + // TODO: DRY this up once it's fully fleshed out + // TODO: Align this with the fields passed in with-props.tsx const element = Component ? React.createElement( Layout, @@ -295,6 +297,11 @@ export async function matchServerRequest({ actionData: staticContext.actionData?.[match.route.id], }) ) + : match.route.id === "root" + ? // FIXME: This should use the `RemixRootDefaultErrorBoundary` but that + // currently uses a hook internally so it fails during RSC. Restructure + // so it can be used safely in an RSC render pass. + React.createElement("p", null, "Loading!") : undefined; let result = { diff --git a/playground/rsc-vite/src/routes/about/about.client.tsx b/playground/rsc-vite/src/routes/about/about.client.tsx index 436aa41f62..7350b8ebdc 100644 --- a/playground/rsc-vite/src/routes/about/about.client.tsx +++ b/playground/rsc-vite/src/routes/about/about.client.tsx @@ -35,12 +35,13 @@ export async function clientAction({ serverAction }: ClientActionFunctionArgs) { export async function clientLoader({ serverLoader }: ClientLoaderFunctionArgs) { const res = await serverLoader(); - return { message: res.message + " (mutated in clientLoader)", }; } +clientLoader.hydrate = true; + export default function About() { const loaderData = useLoaderData(); const actionData = useActionData(); From e31bc7e4cab185c14e7a33f4dd8fcaa93601fe56 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Tue, 15 Apr 2025 17:07:36 -0400 Subject: [PATCH 056/143] Fix some issues with serverLoader and error boundaries --- packages/react-router/lib/server.browser.tsx | 29 +++- packages/react-router/lib/server.ts | 159 ++++++++++-------- playground/rsc-vite/src/routes.ts | 1 + .../src/routes/about/about.client.tsx | 16 +- .../rsc-vite/src/routes/root/root.client.tsx | 4 +- playground/rsc-vite/src/routes/root/root.tsx | 2 +- 6 files changed, 137 insertions(+), 74 deletions(-) diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index 963fddfa33..6aac8a443b 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -426,6 +426,11 @@ function createRouteFromServerManifest( let result = await match.clientLoader!({ ...args, serverLoader: () => { + preventInvalidServerHandlerCall( + "loader", + match.id, + match.hasLoader + ); // On the first call, resolve with the server result if (isHydrationRequest) { if (hasInitialData) { @@ -450,7 +455,14 @@ function createRouteFromServerManifest( ? (args, singleFetch) => match.clientAction!({ ...args, - serverAction: () => callSingleFetch(singleFetch), + serverAction: async () => { + preventInvalidServerHandlerCall( + "loader", + match.id, + match.hasLoader + ); + return await callSingleFetch(singleFetch); + }, }) : match.hasAction ? (_, singleFetch) => callSingleFetch(singleFetch) @@ -480,3 +492,18 @@ function callSingleFetch(singleFetch: unknown) { invariant(typeof singleFetch === "function", "Invalid singleFetch parameter"); return singleFetch(); } + +function preventInvalidServerHandlerCall( + type: "action" | "loader", + routeId: string, + hasHandler: boolean +) { + if (!hasHandler) { + let fn = type === "action" ? "serverAction()" : "serverLoader()"; + let msg = + `You are trying to call ${fn} on a route that does not have a server ` + + `${type} (routeId: "${routeId}")`; + console.error(msg); + throw new ErrorResponseImpl(400, "Bad Request", new Error(msg), true); + } +} diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index 3c076d8522..4a91c6e8e0 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -145,21 +145,32 @@ export async function matchServerRequest({ matches.map(async (match) => { let route = match.route as ServerRouteObject; if ("lazy" in route && route.lazy) { - route = { - ...route, + Object.assign(route, { ...((await route.lazy()) as any), path: route.path, index: (route as any).index, id: route.id, - }; + }); } + const Layout = (match.route as any).Layout || React.Fragment; + // We send errorElement early in the manifest so we have it client + // side for any client-side errors thrown during dataStrategy + const errorElement = route.ErrorBoundary + ? React.createElement( + Layout, + null, + React.createElement(route.ErrorBoundary) + ) + : undefined; + return { clientAction: route.clientAction, clientLoader: route.clientLoader, handle: route.handle, hasAction: !!route.action, hasErrorBoundary: !!route.ErrorBoundary, + errorElement, hasLoader: !!route.loader, id: route.id, path: route.path, @@ -262,72 +273,82 @@ export async function matchServerRequest({ } let lastMatch: AgnosticDataRouteMatch | null = null; - let matches = staticContext.matches.map((match) => { - const Layout = (match.route as any).Layout || React.Fragment; - const Component = (match.route as any).default; - const ErrorBoundary = (match.route as any).ErrorBoundary; - const HydrateFallback = (match.route as any).HydrateFallback; - // TODO: DRY this up once it's fully fleshed out - // TODO: Align this with the fields passed in with-props.tsx - const element = Component - ? React.createElement( - Layout, - null, - React.createElement(Component, { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }) - ) - : undefined; - const errorElement = ErrorBoundary - ? React.createElement( - Layout, - null, - React.createElement(ErrorBoundary, { - error: staticContext.errors?.[match.route.id], - }) - ) - : undefined; - const hydrateFallbackElement = HydrateFallback - ? React.createElement( - Layout, - null, - React.createElement(HydrateFallback, { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }) - ) - : match.route.id === "root" - ? // FIXME: This should use the `RemixRootDefaultErrorBoundary` but that - // currently uses a hook internally so it fails during RSC. Restructure - // so it can be used safely in an RSC render pass. - React.createElement("p", null, "Loading!") - : undefined; - - let result = { - clientAction: (match.route as any).clientAction, - clientLoader: (match.route as any).clientLoader, - element, - errorElement, - handle: (match.route as any).handle, - hasAction: !!match.route.action, - hasErrorBoundary: !!(match.route as any).ErrorBoundary, - hasLoader: !!match.route.loader, - hydrateFallbackElement, - id: match.route.id, - index: match.route.index, - links: (match.route as any).links, - meta: (match.route as any).meta, - params: match.params, - parentId: lastMatch?.route.id, - path: match.route.path, - pathname: match.pathname, - pathnameBase: match.pathnameBase, - shouldRevalidate: (match.route as any).shouldRevalidate, - }; - lastMatch = match; - return result; - }); + let matches = await Promise.all( + staticContext.matches.map(async (match) => { + if ("lazy" in match.route && match.route.lazy) { + Object.assign(match.route, { + // @ts-expect-error - FIXME: Fix the types here + ...((await match.route.lazy()) as any), + path: match.route.path, + index: (match.route as any).index, + id: match.route.id, + }); + } + + const Layout = (match.route as any).Layout || React.Fragment; + const Component = (match.route as any).default; + const ErrorBoundary = (match.route as any).ErrorBoundary; + const HydrateFallback = (match.route as any).HydrateFallback; + // TODO: DRY this up once it's fully fleshed out + // TODO: Align this with the fields passed in with-props.tsx + const element = Component + ? React.createElement( + Layout, + null, + React.createElement(Component, { + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], + }) + ) + : undefined; + const errorElement = ErrorBoundary + ? React.createElement( + Layout, + null, + React.createElement(ErrorBoundary) + ) + : undefined; + const hydrateFallbackElement = HydrateFallback + ? React.createElement( + Layout, + null, + React.createElement(HydrateFallback, { + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], + }) + ) + : match.route.id === "root" + ? // FIXME: This should use the `RemixRootDefaultErrorBoundary` but that + // currently uses a hook internally so it fails during RSC. Restructure + // so it can be used safely in an RSC render pass. + React.createElement("p", null, "Loading!") + : undefined; + + let result = { + clientAction: (match.route as any).clientAction, + clientLoader: (match.route as any).clientLoader, + element, + errorElement, + handle: (match.route as any).handle, + hasAction: !!match.route.action, + hasErrorBoundary: !!(match.route as any).ErrorBoundary, + hasLoader: !!match.route.loader, + hydrateFallbackElement, + id: match.route.id, + index: match.route.index, + links: (match.route as any).links, + meta: (match.route as any).meta, + params: match.params, + parentId: lastMatch?.route.id, + path: match.route.path, + pathname: match.pathname, + pathnameBase: match.pathnameBase, + shouldRevalidate: (match.route as any).shouldRevalidate, + }; + lastMatch = match; + return result; + }) + ); payload.matches = routeIdsToLoad ? matches.filter((m) => routeIdsToLoad.includes(m.id)) diff --git a/playground/rsc-vite/src/routes.ts b/playground/rsc-vite/src/routes.ts index 424f37e5ee..927ee424d4 100644 --- a/playground/rsc-vite/src/routes.ts +++ b/playground/rsc-vite/src/routes.ts @@ -3,6 +3,7 @@ import type { ServerRouteObject } from "react-router"; export const routes = [ { id: "root", + path: "", // requiredCSS: ["/index.css"], lazy: () => import("./routes/root/root"), children: [ diff --git a/playground/rsc-vite/src/routes/about/about.client.tsx b/playground/rsc-vite/src/routes/about/about.client.tsx index 7350b8ebdc..654d4ea537 100644 --- a/playground/rsc-vite/src/routes/about/about.client.tsx +++ b/playground/rsc-vite/src/routes/about/about.client.tsx @@ -7,6 +7,7 @@ import { Form, useActionData, type ClientActionFunctionArgs, + isRouteErrorResponse, } from "react-router"; import { Counter } from "../../counter"; @@ -60,6 +61,17 @@ export default function About() { } export function ErrorBoundary() { - console.log(useRouteError()); - return

Oooops

; + let error = useRouteError(); + return ( + <> +

Oooops

+ {isRouteErrorResponse(error) ? ( +

+ {error.status} {error.statusText} {error.data} +

+ ) : ( +

{String(error)}

+ )} + + ); } diff --git a/playground/rsc-vite/src/routes/root/root.client.tsx b/playground/rsc-vite/src/routes/root/root.client.tsx index e6eda4c65b..8032cf1dcf 100644 --- a/playground/rsc-vite/src/routes/root/root.client.tsx +++ b/playground/rsc-vite/src/routes/root/root.client.tsx @@ -5,7 +5,9 @@ import { useRouteError } from "react-router"; export function ErrorReporter() { const error = useRouteError(); - console.log(error); + if (typeof document !== "undefined") { + console.log(error); + } return null; } diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx index eef1121387..bb56f59064 100644 --- a/playground/rsc-vite/src/routes/root/root.tsx +++ b/playground/rsc-vite/src/routes/root/root.tsx @@ -34,7 +34,7 @@ export function HydrateFallback() { export function ErrorBoundary() { return ( <> -

Something went wrong!

+

Root - Something went wrong!

); From 3ccddfacd5c454624d2d59a54c053cd81997a214 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Tue, 15 Apr 2025 18:08:27 -0700 Subject: [PATCH 057/143] fix: discover index routes in reverse --- .../__tests__/router/lazy-discovery-test.ts | 57 +++++++++++++++++++ packages/react-router/lib/router/router.ts | 6 +- 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/packages/react-router/__tests__/router/lazy-discovery-test.ts b/packages/react-router/__tests__/router/lazy-discovery-test.ts index 13b84c3793..59d0f7c975 100644 --- a/packages/react-router/__tests__/router/lazy-discovery-test.ts +++ b/packages/react-router/__tests__/router/lazy-discovery-test.ts @@ -19,6 +19,63 @@ describe("Lazy Route Discovery (Fog of War)", () => { router = null; }); + it("discovers child route at a depth of 0 for root layout (GET navigation)", async () => { + let indexDfd = createDeferred(); + let loaderDfd = createDeferred(); + let indexLoaderDfd = createDeferred(); + + router = createRouter({ + history: createMemoryHistory({ initialEntries: ["/child"] }), + routes: [ + { + id: "parent", + path: "", + children: [ + { + id: "child", + path: "child", + loader: () => loaderDfd.promise, + }, + ], + }, + ], + async patchRoutesOnNavigation({ patch }) { + let children = await indexDfd.promise; + patch("parent", children); + }, + }); + + router.navigate("/"); + expect(router.state.navigation).toMatchObject({ + state: "loading", + location: { pathname: "/" }, + }); + + indexDfd.resolve([ + { + id: "index", + index: true, + loader: () => indexLoaderDfd.promise, + }, + ]); + expect(router.state.navigation).toMatchObject({ + state: "loading", + location: { pathname: "/" }, + }); + + indexLoaderDfd.resolve("INDEX"); + await tick(); + + expect(router.state.location.pathname).toBe("/"); + expect(router.state.loaderData).toEqual({ + index: "INDEX", + }); + expect(router.state.matches.map((m) => m.route.id)).toEqual([ + "parent", + "index", + ]); + }); + it("discovers child route at a depth of 1 (GET navigation)", async () => { let childrenDfd = createDeferred(); let loaderDfd = createDeferred(); diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts index a5252efa7f..55e8affe12 100644 --- a/packages/react-router/lib/router/router.ts +++ b/packages/react-router/lib/router/router.ts @@ -3236,7 +3236,11 @@ export function createRouter(init: RouterInit): Router { return { active: true, matches: fogMatches || [] }; } else { - if (Object.keys(matches[0].params).length > 0) { + let lastRoute = matches.slice(-1)[0]; + if ( + Object.keys(matches[0].params).length > 0 || + (!lastRoute?.route.index && lastRoute?.route.path === "") + ) { // If we matched a dynamic param or a splat, it might only be because // we haven't yet discovered other routes that would match with a // higher score. Call patchRoutesOnNavigation just to be sure From 996e5f2f3699ca92691b6e9b47ee084c1630e1b0 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Tue, 15 Apr 2025 18:25:41 -0700 Subject: [PATCH 058/143] don't render element when route has error --- packages/react-router/lib/server.ts | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index 4a91c6e8e0..d58a3da38d 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -52,7 +52,7 @@ export type ServerRouteObject = ServerRouteObjectBase & { export type RenderedRoute = { clientAction?: ClientActionFunction; clientLoader?: ClientLoaderFunction; - element?: React.ReactElement; + element?: React.ReactElement | false; errorElement?: React.ReactElement; handle?: any; hasAction: boolean; @@ -292,14 +292,16 @@ export async function matchServerRequest({ // TODO: DRY this up once it's fully fleshed out // TODO: Align this with the fields passed in with-props.tsx const element = Component - ? React.createElement( - Layout, - null, - React.createElement(Component, { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }) - ) + ? staticContext.errors?.[match.route.id] + ? (false as const) + : React.createElement( + Layout, + null, + React.createElement(Component, { + loaderData: staticContext.loaderData[match.route.id], + actionData: staticContext.actionData?.[match.route.id], + }) + ) : undefined; const errorElement = ErrorBoundary ? React.createElement( From fcc3ad4ec7a800eba4371c9a45bf7447c1035f38 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Tue, 15 Apr 2025 19:02:51 -0700 Subject: [PATCH 059/143] add explicit export for react server --- packages/react-router/index.ts | 10 ---- packages/react-router/lib/server.ts | 2 +- packages/react-router/package.json | 59 +++++++------------ packages/react-router/server.ts | 7 ++- playground/rsc-vite/src/routes.ts | 2 +- .../rsc-vite/src/server/entry.server.tsx | 2 +- 6 files changed, 27 insertions(+), 55 deletions(-) diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts index 3e40b13797..de93bea69e 100644 --- a/packages/react-router/index.ts +++ b/packages/react-router/index.ts @@ -370,16 +370,6 @@ export { ServerMode as UNSAFE_ServerMode } from "./lib/server-runtime/mode"; /** @internal */ export { useScrollRestoration as UNSAFE_useScrollRestoration } from "./lib/dom/lib"; -export type { - DecodeCallServerFunction, - ServerManifestPayload, - ServerMatch, - ServerPayload, - ServerRenderPayload, - RenderedRoute as ServerRouteManifest, - ServerRouteMatch, - ServerRouteObject, -} from "./lib/server"; export { isReactServerRequest, matchServerRequest, diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index d58a3da38d..8473ada42b 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -39,7 +39,7 @@ type ServerRouteObjectBase = { export type ServerRouteObject = ServerRouteObjectBase & { id: string; path?: string; - lazy?: LazyRouteFunction; + lazy?: () => Promise; } & ( | { index: true; diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 69f1bb0d6f..cadb55f90f 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -23,26 +23,6 @@ "module": "./dist/development/index.mjs", "exports": { ".": { - "react-server": { - "node": { - "types": "./dist/development/server.d.ts", - "module": "./dist/development/server.mjs", - "module-sync": "./dist/development/server.mjs", - "default": "./dist/development/server.js" - }, - "module": { - "types": "./dist/development/server.d.mts", - "default": "./dist/development/server.mjs" - }, - "import": { - "types": "./dist/development/server.d.mts", - "default": "./dist/development/server.mjs" - }, - "default": { - "types": "./dist/development/server.d.ts", - "default": "./dist/development/server.js" - } - }, "node": { "types": "./dist/development/index.d.ts", "module": "./dist/development/index.mjs", @@ -62,25 +42,6 @@ "default": "./dist/development/index.js" } }, - "./client": { - "node": { - "types": "./dist/development/index.d.ts", - "module-sync": "./dist/development/index.mjs", - "default": "./dist/development/index.js" - }, - "module": { - "types": "./dist/development/index.d.mts", - "default": "./dist/development/index.mjs" - }, - "import": { - "types": "./dist/development/index.d.mts", - "default": "./dist/development/index.mjs" - }, - "default": { - "types": "./dist/development/index.d.ts", - "default": "./dist/development/index.js" - } - }, "./route-module": { "import": { "types": "./dist/development/lib/types/route-module.d.mts" @@ -109,6 +70,26 @@ "default": "./dist/development/dom-export.js" } }, + "./server": { + "node": { + "types": "./dist/development/server.d.ts", + "module": "./dist/development/server.mjs", + "module-sync": "./dist/development/server.mjs", + "default": "./dist/development/server.js" + }, + "module": { + "types": "./dist/development/server.d.mts", + "default": "./dist/development/server.mjs" + }, + "import": { + "types": "./dist/development/server.d.mts", + "default": "./dist/development/server.mjs" + }, + "default": { + "types": "./dist/development/server.d.ts", + "default": "./dist/development/server.js" + } + }, "./package.json": "./package.json" }, "scripts": { diff --git a/packages/react-router/server.ts b/packages/react-router/server.ts index df053730a8..f6a9782fa5 100644 --- a/packages/react-router/server.ts +++ b/packages/react-router/server.ts @@ -1,12 +1,13 @@ -// @ts-ignore -export * from "react-router/client"; - export { createStaticHandler } from "./lib/router/router"; export { data, matchRoutes } from "./lib/router/utils"; export type { + DecodeCallServerFunction, + ServerManifestPayload, ServerMatch, ServerPayload, + ServerRenderPayload, + RenderedRoute as ServerRouteManifest, ServerRouteMatch, ServerRouteObject, } from "./lib/server"; diff --git a/playground/rsc-vite/src/routes.ts b/playground/rsc-vite/src/routes.ts index 927ee424d4..0a2e1478c2 100644 --- a/playground/rsc-vite/src/routes.ts +++ b/playground/rsc-vite/src/routes.ts @@ -1,4 +1,4 @@ -import type { ServerRouteObject } from "react-router"; +import type { ServerRouteObject } from "react-router/server"; export const routes = [ { diff --git a/playground/rsc-vite/src/server/entry.server.tsx b/playground/rsc-vite/src/server/entry.server.tsx index fc421906c0..abf7793db5 100644 --- a/playground/rsc-vite/src/server/entry.server.tsx +++ b/playground/rsc-vite/src/server/entry.server.tsx @@ -7,7 +7,7 @@ import { manifest } from "virtual:react-manifest"; import { type DecodeCallServerFunction, matchServerRequest, -} from "react-router"; +} from "react-router/server"; import { routes } from "../routes"; From e0e92e3b15f87ee551240745007b80678de68224 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Tue, 15 Apr 2025 19:12:52 -0700 Subject: [PATCH 060/143] fixup exports --- packages/react-router/index.ts | 11 ++- packages/react-router/lib/server.static.tsx | 79 +++++++++++++++++++++ packages/react-router/lib/server.ts | 69 ------------------ packages/react-router/server.ts | 6 +- 4 files changed, 85 insertions(+), 80 deletions(-) diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts index de93bea69e..b70666fe99 100644 --- a/packages/react-router/index.ts +++ b/packages/react-router/index.ts @@ -370,15 +370,14 @@ export { ServerMode as UNSAFE_ServerMode } from "./lib/server-runtime/mode"; /** @internal */ export { useScrollRestoration as UNSAFE_useScrollRestoration } from "./lib/dom/lib"; -export { - isReactServerRequest, - matchServerRequest, - routeServerRequest, -} from "./lib/server"; export type { DecodeServerResponseFunction, EncodeActionFunction, } from "./lib/server.browser"; export { createCallServer, ServerBrowserRouter } from "./lib/server.browser"; -export { ServerStaticRouter } from "./lib/server.static"; +export { + isReactServerRequest, + routeServerRequest, + ServerStaticRouter, +} from "./lib/server.static"; export { getServerStream } from "./lib/html-stream/browser"; diff --git a/packages/react-router/lib/server.static.tsx b/packages/react-router/lib/server.static.tsx index 2cb33c93f0..80b81864b5 100644 --- a/packages/react-router/lib/server.static.tsx +++ b/packages/react-router/lib/server.static.tsx @@ -3,8 +3,79 @@ import { type DataRouteObject } from "./context"; import { FrameworkContext } from "./dom/ssr/components"; import type { FrameworkContextObject } from "./dom/ssr/entry"; import { createStaticRouter, StaticRouterProvider } from "./dom/server"; +import { injectRSCPayload } from "./html-stream/server"; import type { ServerPayload } from "./server"; +export async function routeServerRequest( + request: Request, + requestServer: (request: Request) => Promise, + decode: (body: ReadableStream) => Promise, + renderHTML: ( + payload: ServerPayload + ) => ReadableStream | Promise> +) { + const url = new URL(request.url); + let serverRequest = request; + const isDataRequest = isReactServerRequest(url); + const respondWithRSCPayload = + isDataRequest || + isManifestRequest(url) || + request.headers.has("rsc-action-id"); + + if (isDataRequest) { + const serverURL = new URL(request.url); + serverURL.pathname = serverURL.pathname.replace(/(_root)?\.rsc$/, ""); + if (!isDataRequest) { + serverURL.searchParams.delete("_routes"); + } + serverRequest = new Request(serverURL, { + body: request.body, + duplex: request.body ? "half" : undefined, + headers: request.headers, + method: request.method, + signal: request.signal, + } as RequestInit & { duplex?: "half" }); + } + + const serverResponse = await requestServer(serverRequest); + + if (respondWithRSCPayload) { + return serverResponse; + } + + if (!serverResponse.body) { + throw new Error("Missing body in server response"); + } + + const serverResponseB = serverResponse.clone(); + if (!serverResponseB.body) { + throw new Error("Failed to clone server response"); + } + + const payload = (await decode(serverResponse.body)) as ServerPayload; + // TODO: Handle redirect payloads + + const html = await renderHTML(payload); + + try { + const body = html.pipeThrough(injectRSCPayload(serverResponseB.body)); + + const headers = new Headers(serverResponse.headers); + headers.set("Content-Type", "text/html"); + + return new Response(body, { + status: serverResponse.status, + headers, + }); + } catch (reason) { + throw reason; + // TODO: Track deepest rendered boundary and re-try + // Figure out how / if we need to transport the error, + // or if we can just re-try on the client to reach + // the correct boundary. + } +} + export function ServerStaticRouter({ payload }: { payload: ServerPayload }) { if (payload.type !== "render") return null; @@ -93,3 +164,11 @@ export function ServerStaticRouter({ payload }: { payload: ServerPayload }) { ); } + +export function isReactServerRequest(url: URL) { + return url.pathname.endsWith(".rsc"); +} + +export function isManifestRequest(url: URL) { + return url.pathname.endsWith(".manifest"); +} diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index 8473ada42b..ec337a1089 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -6,14 +6,12 @@ import type { LinksFunction, MetaFunction, } from "./dom/ssr/routeModules"; -import { injectRSCPayload } from "./html-stream/server"; import type { Location } from "./router/history"; import { createStaticHandler, isMutationMethod } from "./router/router"; import { type ActionFunction, type AgnosticDataRouteMatch, type AgnosticRouteObject, - type LazyRouteFunction, type LoaderFunction, type Params, type ShouldRevalidateFunction, @@ -382,74 +380,7 @@ export async function matchServerRequest({ } } -export async function routeServerRequest( - request: Request, - requestServer: (request: Request) => Promise, - decode: (body: ReadableStream) => Promise, - renderHTML: ( - payload: ServerPayload - ) => ReadableStream | Promise> -) { - const url = new URL(request.url); - let serverRequest = request; - const isDataRequest = isReactServerRequest(url); - const respondWithRSCPayload = - isDataRequest || - isManifestRequest(url) || - request.headers.has("rsc-action-id"); - - if (isDataRequest) { - const serverURL = new URL(request.url); - serverURL.pathname = serverURL.pathname.replace(/(_root)?\.rsc$/, ""); - if (!isDataRequest) { - serverURL.searchParams.delete("_routes"); - } - serverRequest = new Request(serverURL, { - body: request.body, - duplex: request.body ? "half" : undefined, - headers: request.headers, - method: request.method, - signal: request.signal, - } as RequestInit & { duplex?: "half" }); - } - - const serverResponse = await requestServer(serverRequest); - - if (respondWithRSCPayload) { - return serverResponse; - } - - if (!serverResponse.body) { - throw new Error("Missing body in server response"); - } - const serverResponseB = serverResponse.clone(); - if (!serverResponseB.body) { - throw new Error("Failed to clone server response"); - } - - const payload = (await decode(serverResponse.body)) as ServerRenderPayload; - - const html = await renderHTML(payload); - - try { - const body = html.pipeThrough(injectRSCPayload(serverResponseB.body)); - - const headers = new Headers(serverResponse.headers); - headers.set("Content-Type", "text/html"); - - return new Response(body, { - status: serverResponse.status, - headers, - }); - } catch (reason) { - throw reason; - // TODO: Track deepest rendered boundary and re-try - // Figure out how / if we need to transport the error, - // or if we can just re-try on the client to reach - // the correct boundary. - } -} export function isReactServerRequest(url: URL) { return url.pathname.endsWith(".rsc"); diff --git a/packages/react-router/server.ts b/packages/react-router/server.ts index f6a9782fa5..f494a30144 100644 --- a/packages/react-router/server.ts +++ b/packages/react-router/server.ts @@ -11,8 +11,4 @@ export type { ServerRouteMatch, ServerRouteObject, } from "./lib/server"; -export { - isReactServerRequest, - matchServerRequest, - routeServerRequest, -} from "./lib/server"; +export { isReactServerRequest, matchServerRequest } from "./lib/server"; From 36a5255b6db030078a7496784c6f6ac27a9308f4 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Tue, 15 Apr 2025 21:02:46 -0700 Subject: [PATCH 061/143] cleanup lazy function --- packages/react-router/lib/server.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index ec337a1089..4832b53c58 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -149,6 +149,7 @@ export async function matchServerRequest({ index: (route as any).index, id: route.id, }); + route.lazy = undefined; } const Layout = (match.route as any).Layout || React.Fragment; @@ -281,6 +282,7 @@ export async function matchServerRequest({ index: (match.route as any).index, id: match.route.id, }); + match.route.lazy = undefined; } const Layout = (match.route as any).Layout || React.Fragment; @@ -380,8 +382,6 @@ export async function matchServerRequest({ } } - - export function isReactServerRequest(url: URL) { return url.pathname.endsWith(".rsc"); } From 97b588859ca45f65723800cf36573d40a00101ae Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Wed, 16 Apr 2025 13:25:27 -0400 Subject: [PATCH 062/143] Handle scenarios when no loader exists --- packages/react-router/lib/dom/ssr/single-fetch.tsx | 8 +++++--- packages/react-router/lib/router/router.ts | 2 +- packages/react-router/lib/server.browser.tsx | 10 ++++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/packages/react-router/lib/dom/ssr/single-fetch.tsx b/packages/react-router/lib/dom/ssr/single-fetch.tsx index 4f98401b02..8fa6c9720e 100644 --- a/packages/react-router/lib/dom/ssr/single-fetch.tsx +++ b/packages/react-router/lib/dom/ssr/single-fetch.tsx @@ -432,7 +432,7 @@ async function singleFetchLoaderNavigationStrategy( (!router.state.initialized || routesParams.size === 0) && !window.__reactRouterHdrActive ) { - singleFetchDfd.resolve({}); + singleFetchDfd.resolve({ routes: {} }); } else { // When routes have opted out, add a `_routes` param to filter server loaders // Skipped in `ssr:false` because we expect to be loading static `.data` files @@ -663,12 +663,14 @@ function unwrapSingleFetchResult( } let routeResult = result.routes[routeId]; - if ("error" in routeResult) { + if (!routeResult) { + return undefined; + } else if ("error" in routeResult) { throw routeResult.error; } else if ("data" in routeResult) { return routeResult.data; } else { - throw new Error(`No response found for routeId "${routeId}"`); + throw new Error(`Invalid response found for routeId "${routeId}"`); } } diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts index 55e8affe12..b76a589aba 100644 --- a/packages/react-router/lib/router/router.ts +++ b/packages/react-router/lib/router/router.ts @@ -5578,7 +5578,7 @@ function getDataStrategyMatch( isUsingNewApi || shouldLoad || (handlerOverride && - request.method === "GET" && + !isMutationMethod(request.method) && (match.route.lazy || match.route.loader)) ) { return callLoaderOrAction({ diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index 6aac8a443b..bbb8aa6a77 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -448,9 +448,9 @@ function createRouteFromServerManifest( isHydrationRequest = false; } } - : match.hasLoader - ? (_, singleFetch) => callSingleFetch(singleFetch) - : undefined, + : // We always make the call in this RSC world since even if we don't + // have a `loader` we may need to get the `element` implementation + (_, singleFetch) => callSingleFetch(singleFetch), action: match.clientAction ? (args, singleFetch) => match.clientAction!({ @@ -469,7 +469,9 @@ function createRouteFromServerManifest( : undefined, path: match.path, shouldRevalidate: match.shouldRevalidate, - hasLoader: match.hasLoader, + // We always have a "loader" in this RSC world since even if we don't + // have a `loader` we may need to get the `element` implementation + hasLoader: true, hasClientLoader: match.clientLoader != null, hasAction: match.hasAction, hasClientAction: match.clientAction != null, From 8e3c86bc47ad29af42b849c0e7983d71be16de6f Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Wed, 16 Apr 2025 13:29:05 -0400 Subject: [PATCH 063/143] Revert "fix: discover index routes in reverse" This reverts commit 3ccddfacd5c454624d2d59a54c053cd81997a214. --- .../__tests__/router/lazy-discovery-test.ts | 57 ------------------- packages/react-router/lib/router/router.ts | 6 +- 2 files changed, 1 insertion(+), 62 deletions(-) diff --git a/packages/react-router/__tests__/router/lazy-discovery-test.ts b/packages/react-router/__tests__/router/lazy-discovery-test.ts index 59d0f7c975..13b84c3793 100644 --- a/packages/react-router/__tests__/router/lazy-discovery-test.ts +++ b/packages/react-router/__tests__/router/lazy-discovery-test.ts @@ -19,63 +19,6 @@ describe("Lazy Route Discovery (Fog of War)", () => { router = null; }); - it("discovers child route at a depth of 0 for root layout (GET navigation)", async () => { - let indexDfd = createDeferred(); - let loaderDfd = createDeferred(); - let indexLoaderDfd = createDeferred(); - - router = createRouter({ - history: createMemoryHistory({ initialEntries: ["/child"] }), - routes: [ - { - id: "parent", - path: "", - children: [ - { - id: "child", - path: "child", - loader: () => loaderDfd.promise, - }, - ], - }, - ], - async patchRoutesOnNavigation({ patch }) { - let children = await indexDfd.promise; - patch("parent", children); - }, - }); - - router.navigate("/"); - expect(router.state.navigation).toMatchObject({ - state: "loading", - location: { pathname: "/" }, - }); - - indexDfd.resolve([ - { - id: "index", - index: true, - loader: () => indexLoaderDfd.promise, - }, - ]); - expect(router.state.navigation).toMatchObject({ - state: "loading", - location: { pathname: "/" }, - }); - - indexLoaderDfd.resolve("INDEX"); - await tick(); - - expect(router.state.location.pathname).toBe("/"); - expect(router.state.loaderData).toEqual({ - index: "INDEX", - }); - expect(router.state.matches.map((m) => m.route.id)).toEqual([ - "parent", - "index", - ]); - }); - it("discovers child route at a depth of 1 (GET navigation)", async () => { let childrenDfd = createDeferred(); let loaderDfd = createDeferred(); diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts index b76a589aba..f684680e97 100644 --- a/packages/react-router/lib/router/router.ts +++ b/packages/react-router/lib/router/router.ts @@ -3236,11 +3236,7 @@ export function createRouter(init: RouterInit): Router { return { active: true, matches: fogMatches || [] }; } else { - let lastRoute = matches.slice(-1)[0]; - if ( - Object.keys(matches[0].params).length > 0 || - (!lastRoute?.route.index && lastRoute?.route.path === "") - ) { + if (Object.keys(matches[0].params).length > 0) { // If we matched a dynamic param or a splat, it might only be because // we haven't yet discovered other routes that would match with a // higher score. Call patchRoutesOnNavigation just to be sure From 355d676cf1b06901680c08e07a50f768b5e31003 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Wed, 16 Apr 2025 14:36:21 -0400 Subject: [PATCH 064/143] Handle eager pathless/index route patches --- packages/react-router/lib/server.browser.tsx | 17 ++ packages/react-router/lib/server.ts | 165 +++++++++++++----- playground/rsc-vite/src/routes.ts | 17 ++ .../rsc-vite/src/routes/child/child.tsx | 20 +++ .../src/routes/parent-index/parent-index.tsx | 20 +++ .../rsc-vite/src/routes/parent/parent.tsx | 21 +++ playground/rsc-vite/src/routes/root/root.tsx | 4 + 7 files changed, 216 insertions(+), 48 deletions(-) create mode 100644 playground/rsc-vite/src/routes/child/child.tsx create mode 100644 playground/rsc-vite/src/routes/parent-index/parent-index.tsx create mode 100644 playground/rsc-vite/src/routes/parent/parent.tsx diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index bbb8aa6a77..40483bf1fd 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -131,6 +131,14 @@ function createRouterFromPayload({ if (payload.type !== "render") throw new Error("Invalid payload type"); + let patches = new Map(); + payload.patches.forEach((patch) => { + invariant(patch.parentId, "Invalid patch parentId"); + if (!patches.has(patch.parentId)) { + patches.set(patch.parentId, []); + } + patches.get(patch.parentId)?.push(patch); + }); let routes = payload.matches.reduceRight((previous, match) => { const route: DataRouteObject = createRouteFromServerManifest( match, @@ -138,6 +146,12 @@ function createRouterFromPayload({ ); if (previous.length > 0) { route.children = previous; + let childrenToPatch = patches.get(match.id); + if (childrenToPatch) { + route.children.push( + ...childrenToPatch.map((r) => createRouteFromServerManifest(r)) + ); + } } return [route]; }, [] as DataRouteObject[]); @@ -182,6 +196,9 @@ function createRouterFromPayload({ createRouteFromServerManifest(match), ]) ); + payload.patches.forEach((p) => { + patch(p.parentId ?? null, [createRouteFromServerManifest(p)]); + }); }, // FIXME: Pass `build.ssr` and `build.basename` into this function dataStrategy: getRSCSingleFetchDataStrategy( diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index 4832b53c58..cac2d0d699 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -11,13 +11,13 @@ import { createStaticHandler, isMutationMethod } from "./router/router"; import { type ActionFunction, type AgnosticDataRouteMatch, - type AgnosticRouteObject, type LoaderFunction, type Params, type ShouldRevalidateFunction, isRouteErrorResponse, matchRoutes, } from "./router/utils"; +import type { RouteMatch } from "./context"; type ServerRouteObjectBase = { action?: ActionFunction; @@ -80,12 +80,21 @@ export type ServerRenderPayload = { loaderData: Record; location: Location; matches: ServerRouteMatch[]; + // Additional routes we should patch into the router for subsequent navigatons. + // Mostly a collection of pathless/index routes that may be needed for complete + // matching on upward navigations. + patches: RenderedRoute[]; nonce?: string; }; export type ServerManifestPayload = { type: "manifest"; + // Current rendered matches matches: RenderedRoute[]; + // Additional routes we should patch into the router for subsequent navigations. + // Mostly a collection of pathless/index routes that may be needed for complete + // matching on upward navigations. + patches: RenderedRoute[]; }; export type ServerActionPayload = { @@ -125,12 +134,13 @@ export async function matchServerRequest({ if (isManifestRequest(url)) { const matches = matchRoutes( - routes as AgnosticRouteObject[], + routes, url.pathname.replace(/\.manifest$/, "") ); if (!matches?.length) { return new Response("Not found", { status: 404 }); } + return { statusCode: 200, headers: new Headers({ @@ -140,44 +150,12 @@ export async function matchServerRequest({ payload: { type: "manifest", matches: await Promise.all( - matches.map(async (match) => { - let route = match.route as ServerRouteObject; - if ("lazy" in route && route.lazy) { - Object.assign(route, { - ...((await route.lazy()) as any), - path: route.path, - index: (route as any).index, - id: route.id, - }); - route.lazy = undefined; - } - - const Layout = (match.route as any).Layout || React.Fragment; - // We send errorElement early in the manifest so we have it client - // side for any client-side errors thrown during dataStrategy - const errorElement = route.ErrorBoundary - ? React.createElement( - Layout, - null, - React.createElement(route.ErrorBoundary) - ) - : undefined; - - return { - clientAction: route.clientAction, - clientLoader: route.clientLoader, - handle: route.handle, - hasAction: !!route.action, - hasErrorBoundary: !!route.ErrorBoundary, - errorElement, - hasLoader: !!route.loader, - id: route.id, - path: route.path, - index: "index" in route ? route.index : undefined, - links: route.links, - meta: route.meta, - }; - }) + matches.map((m, i) => getRoute(m.route, matches[i - 1]?.route.id)) + ), + patches: await getAdditionalRoutePatches( + url.pathname, + routes, + matches.map((m) => m.route.id) ), } satisfies ServerManifestPayload, }; @@ -257,18 +235,21 @@ export async function matchServerRequest({ ) : staticContext.errors; - const payload: ServerRenderPayload = { + const payload: Omit = { type: "render", actionData: staticContext.actionData, errors, loaderData: staticContext.loaderData, location: staticContext.location, - matches: [], }; // Short circuit without matches on submissions if (isSubmission) { - return payload; + return { + ...payload, + matches: [], + patches: [], + }; } let lastMatch: AgnosticDataRouteMatch | null = null; @@ -352,11 +333,17 @@ export async function matchServerRequest({ }) ); - payload.matches = routeIdsToLoad - ? matches.filter((m) => routeIdsToLoad.includes(m.id)) - : matches; - - return payload; + return { + ...payload, + matches: routeIdsToLoad + ? matches.filter((m) => routeIdsToLoad.includes(m.id)) + : matches, + patches: await getAdditionalRoutePatches( + staticContext.location.pathname, + routes, + matches.map((m) => m.id) + ), + }; }; try { @@ -382,6 +369,88 @@ export async function matchServerRequest({ } } +async function getRoute( + route: ServerRouteObject, + parentId: string | undefined +): Promise { + if ("lazy" in route && route.lazy) { + Object.assign(route, { + ...((await route.lazy()) as any), + path: route.path, + index: (route as any).index, + id: route.id, + }); + route.lazy = undefined; + } + + const Layout = (route as any).Layout || React.Fragment; + // We send errorElement early in the manifest so we have it client + // side for any client-side errors thrown during dataStrategy + const errorElement = route.ErrorBoundary + ? React.createElement( + Layout, + null, + React.createElement(route.ErrorBoundary) + ) + : undefined; + + return { + clientAction: route.clientAction, + clientLoader: route.clientLoader, + handle: route.handle, + hasAction: !!route.action, + hasErrorBoundary: !!route.ErrorBoundary, + errorElement, + hasLoader: !!route.loader, + id: route.id, + parentId, + path: route.path, + index: "index" in route ? route.index : undefined, + links: route.links, + meta: route.meta, + }; +} + +async function getAdditionalRoutePatches( + pathname: string, + routes: ServerRouteObject[], + matchedRouteIds: string[] +): Promise { + let patchRouteMatches = new Map< + string, + ServerRouteObject & { parentId: string | undefined } + >(); + let segments = pathname.split("/").filter(Boolean); + let paths: string[] = ["/"]; + + // We've already matched to the last segment + segments.pop(); + + // Traverse each path for our parents and match in case they have pathless/index + // children we need to include in the initial manifest + while (segments.length > 0) { + paths.push(`/${segments.join("/")}`); + segments.pop(); + } + + paths.forEach((path) => { + let matches = matchRoutes(routes, path) || []; + matches.forEach((m, i) => + patchRouteMatches.set(m.route.id, { + ...m.route, + parentId: matches[i - 1]?.route.id, + }) + ); + }); + + let patches = await Promise.all( + [...patchRouteMatches.values()] + .filter((route) => !matchedRouteIds.some((id) => id === route.id)) + .map((route) => getRoute(route, route.parentId)) + ); + return patches; +} + export function isReactServerRequest(url: URL) { return url.pathname.endsWith(".rsc"); } diff --git a/playground/rsc-vite/src/routes.ts b/playground/rsc-vite/src/routes.ts index 0a2e1478c2..45d29ec378 100644 --- a/playground/rsc-vite/src/routes.ts +++ b/playground/rsc-vite/src/routes.ts @@ -17,6 +17,23 @@ export const routes = [ path: "about", lazy: () => import("./routes/about/about"), }, + { + id: "parent", + path: "parent", + lazy: () => import("./routes/parent/parent"), + children: [ + { + id: "parent-index", + index: true, + lazy: () => import("./routes/parent-index/parent-index"), + }, + { + id: "child", + path: "child", + lazy: () => import("./routes/child/child"), + }, + ], + }, ], }, ] satisfies ServerRouteObject[]; diff --git a/playground/rsc-vite/src/routes/child/child.tsx b/playground/rsc-vite/src/routes/child/child.tsx new file mode 100644 index 0000000000..fdd3f10ccf --- /dev/null +++ b/playground/rsc-vite/src/routes/child/child.tsx @@ -0,0 +1,20 @@ +import { Outlet } from "react-router"; + +export function loader() { + return { + message: `Child route loader ran at ${new Date().toISOString()}`, + }; +} + +export default function Component({ + loaderData, +}: { + loaderData: Awaited>; +}) { + return ( +
+

Child Route

+

Loader data: {loaderData.message}

+
+ ); +} diff --git a/playground/rsc-vite/src/routes/parent-index/parent-index.tsx b/playground/rsc-vite/src/routes/parent-index/parent-index.tsx new file mode 100644 index 0000000000..086ec064a8 --- /dev/null +++ b/playground/rsc-vite/src/routes/parent-index/parent-index.tsx @@ -0,0 +1,20 @@ +import { Outlet } from "react-router"; + +export function loader() { + return { + message: `Parent Index route loader ran at ${new Date().toISOString()}`, + }; +} + +export default function Component({ + loaderData, +}: { + loaderData: Awaited>; +}) { + return ( +
+

Parent Index Route

+

Loader data: {loaderData.message}

+
+ ); +} diff --git a/playground/rsc-vite/src/routes/parent/parent.tsx b/playground/rsc-vite/src/routes/parent/parent.tsx new file mode 100644 index 0000000000..780d4cdc9f --- /dev/null +++ b/playground/rsc-vite/src/routes/parent/parent.tsx @@ -0,0 +1,21 @@ +import { Outlet } from "react-router"; + +export function loader() { + return { + message: `Parent route loader ran at ${new Date().toISOString()}`, + }; +} + +export default function Component({ + loaderData, +}: { + loaderData: Awaited>; +}) { + return ( +
+

Parent Route

+

Loader data: {loaderData.message}

+ +
+ ); +} diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx index bb56f59064..fcedb8d0cd 100644 --- a/playground/rsc-vite/src/routes/root/root.tsx +++ b/playground/rsc-vite/src/routes/root/root.tsx @@ -55,6 +55,10 @@ export function Layout({ children }: { children: React.ReactNode }) { Home {" | "} About + {" | "} + Parent + {" | "} + Child

Root Layout

From 84d23723187f5781b7722804f7a6dc13a60cd88c Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Wed, 16 Apr 2025 11:41:59 -0700 Subject: [PATCH 065/143] implement redirects --- packages/react-router/lib/server.browser.tsx | 64 ++++++++++++++------ packages/react-router/lib/server.static.tsx | 10 ++- packages/react-router/lib/server.ts | 30 ++++++--- packages/react-router/server.ts | 8 ++- playground/rsc-vite/src/routes.ts | 5 ++ playground/rsc-vite/src/routes/redirect.ts | 5 ++ playground/rsc-vite/src/routes/root/root.tsx | 2 + 7 files changed, 97 insertions(+), 27 deletions(-) create mode 100644 playground/rsc-vite/src/routes/redirect.ts diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index 40483bf1fd..e26c22b3c9 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -13,10 +13,8 @@ import type { ServerRenderPayload, } from "./server"; import type { - ActionFunction, DataStrategyFunction, DataStrategyFunctionArgs, - LoaderFunction, unstable_RouterContextProvider, } from "./router/utils"; import { ErrorResponseImpl, unstable_createContext } from "./router/utils"; @@ -43,6 +41,7 @@ declare global { interface Window { __router: DataRouter; __routerInitialized: boolean; + __routerActionID: number; } } @@ -53,12 +52,10 @@ export function createCallServer({ decode: DecodeServerResponseFunction; encodeAction: EncodeActionFunction; }) { - let actionCounter = 0; - let landedActionId: number = 0; - + let landedActionId = 0; return async (id: string, args: unknown[]) => { - let actionId = ++actionCounter; - const locationKey = window.__router.state.loaderData; + let actionId = (window.__routerActionID = + (window.__routerActionID ??= 0) + 1); const response = await fetch(location.href, { body: await encodeAction(args), @@ -79,15 +76,25 @@ export function createCallServer({ if (payload.rerender) { (async () => { - const rendered = await payload.rerender; - if (!rendered) return; - if ( - actionId > landedActionId && - locationKey === window.__router.state.loaderData - ) { + const rerender = await payload.rerender; + if (!rerender) return; + + if (landedActionId < actionId && window.__routerActionID <= actionId) { landedActionId = actionId; + + if (rerender.type === "redirect") { + if (rerender.reload) { + window.location.href = rerender.location; + return; + } + window.__router.navigate(rerender.location, { + replace: rerender.replace, + }); + return; + } + let lastMatch: RenderedRoute | undefined; - for (const match of rendered.matches) { + for (const match of rerender.matches) { window.__router.patchRoutes( lastMatch?.id ?? null, [createRouteFromServerManifest(match)], @@ -95,19 +102,20 @@ export function createCallServer({ ); lastMatch = match; } + window.__router._internalSetStateDoNotUseOrYouWillBreakYourApp({}); React.startTransition(() => { window.__router._internalSetStateDoNotUseOrYouWillBreakYourApp({ loaderData: Object.assign( {}, window.__router.state.loaderData, - rendered.loaderData + rerender.loaderData ), - errors: rendered.errors + errors: rerender.errors ? Object.assign( {}, window.__router.state.errors, - rendered.errors + rerender.errors ) : null, }); @@ -218,6 +226,13 @@ function createRouterFromPayload({ window.__routerInitialized = false; } + let lastLocationKey = window.__router.state.location.key; + window.__router.subscribe(({ location }) => { + if (location.key !== lastLocationKey) { + window.__routerActionID = (window.__routerActionID ??= 0) + 1; + } + }); + return window.__router; } @@ -317,6 +332,21 @@ function getFetchAndDecodeViaRSC( try { const payload = await decode(res.body); + if (payload.type === "redirect") { + return { + status: res.status, + data: { + redirect: { + redirect: payload.location, + reload: false, + replace: payload.replace, + revalidate: false, + status: payload.status, + }, + }, + }; + } + if (payload.type !== "render") { throw new Error("Unexpected payload type"); } diff --git a/packages/react-router/lib/server.static.tsx b/packages/react-router/lib/server.static.tsx index 80b81864b5..2076e78948 100644 --- a/packages/react-router/lib/server.static.tsx +++ b/packages/react-router/lib/server.static.tsx @@ -53,7 +53,15 @@ export async function routeServerRequest( } const payload = (await decode(serverResponse.body)) as ServerPayload; - // TODO: Handle redirect payloads + + if (payload.type === "redirect") { + return new Response(null, { + status: payload.status, + headers: { + Location: payload.location, + }, + }); + } const html = await renderHTML(payload); diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index cac2d0d699..941a284c70 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -100,13 +100,22 @@ export type ServerManifestPayload = { export type ServerActionPayload = { type: "action"; actionResult: Promise; - rerender?: Promise; + rerender?: Promise; +}; + +export type ServerRedirectPayload = { + type: "redirect"; + status: number; + location: string; + replace: boolean; + reload: boolean; }; export type ServerPayload = | ServerRenderPayload | ServerManifestPayload - | ServerActionPayload; + | ServerActionPayload + | ServerRedirectPayload; export type ServerMatch = { statusCode: number; @@ -193,7 +202,9 @@ export async function matchServerRequest({ }); } - const getRenderPayload = async (): Promise => { + const getRenderPayload = async (): Promise< + ServerRenderPayload | ServerRedirectPayload + > => { const handler = createStaticHandler(routes); // If this is a RR submission, we just want the `actionData` but don't want @@ -215,11 +226,14 @@ export async function matchServerRequest({ }); if (staticContext instanceof Response) { - // TODO: Properly handle this case - const headers = new Headers(staticContext.headers); - headers.set("Vary", "Content-Type"); - headers.set("x-react-router-error", "true"); - throw staticContext; + console.log(Object.fromEntries(staticContext.headers)); + return { + type: "redirect", + location: staticContext.headers.get("Location") || "", + reload: staticContext.headers.get("x-remix-reload-document") === "true", + replace: staticContext.headers.get("x-remix-replace") === "true", + status: staticContext.status, + }; } statusCode = staticContext.statusCode ?? statusCode; diff --git a/packages/react-router/server.ts b/packages/react-router/server.ts index f494a30144..d108ed8dba 100644 --- a/packages/react-router/server.ts +++ b/packages/react-router/server.ts @@ -1,5 +1,11 @@ export { createStaticHandler } from "./lib/router/router"; -export { data, matchRoutes } from "./lib/router/utils"; +export { + data, + matchRoutes, + redirect, + redirectDocument, + replace, +} from "./lib/router/utils"; export type { DecodeCallServerFunction, diff --git a/playground/rsc-vite/src/routes.ts b/playground/rsc-vite/src/routes.ts index 45d29ec378..328bf30ef2 100644 --- a/playground/rsc-vite/src/routes.ts +++ b/playground/rsc-vite/src/routes.ts @@ -34,6 +34,11 @@ export const routes = [ }, ], }, + { + id: "redirect", + path: "redirect", + lazy: () => import("./routes/redirect"), + }, ], }, ] satisfies ServerRouteObject[]; diff --git a/playground/rsc-vite/src/routes/redirect.ts b/playground/rsc-vite/src/routes/redirect.ts new file mode 100644 index 0000000000..7bb8103a74 --- /dev/null +++ b/playground/rsc-vite/src/routes/redirect.ts @@ -0,0 +1,5 @@ +import { redirect, redirectDocument, replace } from "react-router/server"; + +export function loader() { + throw redirectDocument("/about?redirected"); +} diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx index fcedb8d0cd..b83fd9fc75 100644 --- a/playground/rsc-vite/src/routes/root/root.tsx +++ b/playground/rsc-vite/src/routes/root/root.tsx @@ -59,6 +59,8 @@ export function Layout({ children }: { children: React.ReactNode }) { Parent {" | "} Child + {" | "} + Redirect

Root Layout

From 25335bddc942b098c6a40fdf9c9faefd3c75f39e Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Wed, 16 Apr 2025 11:43:17 -0700 Subject: [PATCH 066/143] remove log --- packages/react-router/lib/server.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index 941a284c70..6f8228d422 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -226,7 +226,6 @@ export async function matchServerRequest({ }); if (staticContext instanceof Response) { - console.log(Object.fromEntries(staticContext.headers)); return { type: "redirect", location: staticContext.headers.get("Location") || "", From 0fd8a0272437f58f7fdaf729bc508090671cfa74 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Wed, 16 Apr 2025 17:25:03 -0400 Subject: [PATCH 067/143] Add some timeouts and navigaiton state --- playground/rsc-vite/public/favicon.ico | Bin 0 -> 15086 bytes playground/rsc-vite/src/routes/about/about.tsx | 6 ++++-- playground/rsc-vite/src/routes/child/child.tsx | 12 ++++-------- .../rsc-vite/src/routes/home/home.client.tsx | 14 ++++++++++++++ playground/rsc-vite/src/routes/home/home.tsx | 16 ++++++++-------- .../src/routes/parent-index/parent-index.tsx | 5 ++--- .../rsc-vite/src/routes/root/root.client.tsx | 7 ++++++- playground/rsc-vite/src/routes/root/root.tsx | 6 ++++-- 8 files changed, 42 insertions(+), 24 deletions(-) create mode 100644 playground/rsc-vite/public/favicon.ico diff --git a/playground/rsc-vite/public/favicon.ico b/playground/rsc-vite/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..5dbdfcddcb14182535f6d32d1c900681321b1aa3 GIT binary patch literal 15086 zcmeI33v3ic7{|AFEmuJ-;v>ep_G*NPi6KM`qNryCe1PIJ8siIN1WZ(7qVa)RVtmC% z)Ch?tN+afMKm;5@rvorJk zcXnoOc4q51HBQnQH_jn!cAg&XI1?PlX>Kl^k8qq0;zkha`kY$Fxt#=KNJAE9CMdpW zqr4#g8`nTw191(+H4xW8Tmyru2I^3=J1G3emPxkPXA=3{vvuvse_WWSshqaqls^-m zgB7q8&Vk*aYRe?sn$n53dGH#%3y%^vxv{pL*-h0Z4bmb_(k6{FL7HWIz(V*HT#IcS z-wE{)+0x1U!RUPt3gB97%p}@oHxF4|6S*+Yw=_tLtxZ~`S=z6J?O^AfU>7qOX`JNBbV&8+bO0%@fhQitKIJ^O^ zpgIa__qD_y07t@DFlBJ)8SP_#^j{6jpaXt{U%=dx!qu=4u7^21lWEYHPPY5U3TcoQ zX_7W+lvZi>TapNk_X>k-KO%MC9iZp>1E`N34gHKd9tK&){jq2~7OsJ>!G0FzxQFw6G zm&Vb(2#-T|rM|n3>uAsG_hnbvUKFf3#ay@u4uTzia~NY%XgCHfx4^To4BDU@)HlV? z@EN=g^ymETa1sQK{kRwyE4Ax8?wT&GvaG@ASO}{&a17&^v`y z!oPdiSiia^oov(Z)QhG2&|FgE{M9_4hJROGbnj>#$~ZF$-G^|zPj*QApltKe?;u;uKHJ~-V!=VLkg7Kgct)l7u39f@%VG8e3f$N-B zAu3a4%ZGf)r+jPAYCSLt73m_J3}p>}6Tx0j(wg4vvKhP!DzgiWANiE;Ppvp}P2W@m z-VbYn+NXFF?6ngef5CfY6ZwKnWvNV4z6s^~yMXw2i5mv}jC$6$46g?G|CPAu{W5qF zDobS=zb2ILX9D827g*NtGe5w;>frjanY{f)hrBP_2ehBt1?`~ypvg_Ot4x1V+43P@Ve8>qd)9NX_jWdLo`Zfy zoeam9)@Dpym{4m@+LNxXBPjPKA7{3a&H+~xQvr>C_A;7=JrfK~$M2pCh>|xLz>W6SCs4qC|#V`)# z)0C|?$o>jzh<|-cpf

K7osU{Xp5PG4-K+L2G=)c3f&}H&M3wo7TlO_UJjQ-Oq&_ zjAc9=nNIYz{c3zxOiS5UfcE1}8#iI4@uy;$Q7>}u`j+OU0N<*Ezx$k{x_27+{s2Eg z`^=rhtIzCm!_UcJ?Db~Lh-=_))PT3{Q0{Mwdq;0>ZL%l3+;B&4!&xm#%HYAK|;b456Iv&&f$VQHf` z>$*K9w8T+paVwc7fLfMlhQ4)*zL_SG{~v4QR;IuX-(oRtYAhWOlh`NLoX0k$RUYMi z2Y!bqpdN}wz8q`-%>&Le@q|jFw92ErW-hma-le?S z-@OZt2EEUm4wLsuEMkt4zlyy29_3S50JAcQHTtgTC{P~%-mvCTzrjXOc|{}N`Cz`W zSj7CrXfa7lcsU0J(0uSX6G`54t^7}+OLM0n(|g4waOQ}bd3%!XLh?NX9|8G_|06Ie zD5F1)w5I~!et7lA{G^;uf7aqT`KE&2qx9|~O;s6t!gb`+zVLJyT2T)l*8l(j literal 0 HcmV?d00001 diff --git a/playground/rsc-vite/src/routes/about/about.tsx b/playground/rsc-vite/src/routes/about/about.tsx index 04a36a9c59..8a5a8911ea 100644 --- a/playground/rsc-vite/src/routes/about/about.tsx +++ b/playground/rsc-vite/src/routes/about/about.tsx @@ -8,17 +8,19 @@ export { default, } from "./about.client"; -export function action() { +export async function action() { // throw new Error("oops"); // throw data("This is a test error", 404); + await new Promise((r) => setTimeout(r, 500)); return { message: `About route action ran at ${new Date().toISOString()}`, }; } -export function loader() { +export async function loader() { // throw new Error("oops"); // throw data("This is a test error", 404); + await new Promise((r) => setTimeout(r, 500)); return { message: `About route loader ran at ${new Date().toISOString()}`, }; diff --git a/playground/rsc-vite/src/routes/child/child.tsx b/playground/rsc-vite/src/routes/child/child.tsx index fdd3f10ccf..25fc9b01f0 100644 --- a/playground/rsc-vite/src/routes/child/child.tsx +++ b/playground/rsc-vite/src/routes/child/child.tsx @@ -1,16 +1,12 @@ -import { Outlet } from "react-router"; - -export function loader() { +async function loader() { + await new Promise((r) => setTimeout(r, 500)); return { message: `Child route loader ran at ${new Date().toISOString()}`, }; } -export default function Component({ - loaderData, -}: { - loaderData: Awaited>; -}) { +export default async function Component() { + let loaderData = await loader(); return (

Child Route

diff --git a/playground/rsc-vite/src/routes/home/home.client.tsx b/playground/rsc-vite/src/routes/home/home.client.tsx index d2865e5bd3..02c1ee4780 100644 --- a/playground/rsc-vite/src/routes/home/home.client.tsx +++ b/playground/rsc-vite/src/routes/home/home.client.tsx @@ -1,5 +1,6 @@ "use client"; +import * as React from "react"; import { type ClientLoaderFunctionArgs, useLoaderData } from "react-router"; import { Counter } from "../../counter"; @@ -27,3 +28,16 @@ export default function Home() { ); } + +export function HomeForm({ fn }: { fn: () => unknown }) { + const [state, formAction, isPending] = React.useActionState(fn, null); + + return ( +
+ + {state ?

Action state: {state}

: null} +
+ ); +} diff --git a/playground/rsc-vite/src/routes/home/home.tsx b/playground/rsc-vite/src/routes/home/home.tsx index a21812567e..77e6e273ca 100644 --- a/playground/rsc-vite/src/routes/home/home.tsx +++ b/playground/rsc-vite/src/routes/home/home.tsx @@ -1,8 +1,10 @@ +import { HomeForm } from "./home.client"; export { clientLoader } from "./home.client"; import { Counter } from "../../counter"; -export function loader() { +export async function loader() { + await new Promise((r) => setTimeout(r, 500)); return { message: `Home route loader ran at ${new Date().toISOString()}`, }; @@ -13,12 +15,12 @@ export default function Home({ }: { loaderData: Awaited>; }) { - const logOnServer = () => { + const logOnServer = async () => { "use server"; + await new Promise((r) => setTimeout(r, 500)); console.log("Running action on server!"); - console.log( - ` loader data to prove that scoped vars work: ${loaderData.message}` - ); + console.log(` data to prove that scoped vars work: ${loaderData.message}`); + return new Date().toISOString(); }; return ( @@ -26,9 +28,7 @@ export default function Home({

Home Route

Loader data: {loaderData.message}

-
- -
+
); } diff --git a/playground/rsc-vite/src/routes/parent-index/parent-index.tsx b/playground/rsc-vite/src/routes/parent-index/parent-index.tsx index 086ec064a8..f9498fd7ae 100644 --- a/playground/rsc-vite/src/routes/parent-index/parent-index.tsx +++ b/playground/rsc-vite/src/routes/parent-index/parent-index.tsx @@ -1,6 +1,5 @@ -import { Outlet } from "react-router"; - -export function loader() { +export async function loader() { + await new Promise((r) => setTimeout(r, 500)); return { message: `Parent Index route loader ran at ${new Date().toISOString()}`, }; diff --git a/playground/rsc-vite/src/routes/root/root.client.tsx b/playground/rsc-vite/src/routes/root/root.client.tsx index 8032cf1dcf..fe7ed941d1 100644 --- a/playground/rsc-vite/src/routes/root/root.client.tsx +++ b/playground/rsc-vite/src/routes/root/root.client.tsx @@ -1,6 +1,6 @@ "use client"; -import { useRouteError } from "react-router"; +import { useRouteError, useNavigation } from "react-router"; export function ErrorReporter() { const error = useRouteError(); @@ -12,6 +12,11 @@ export function ErrorReporter() { return null; } +export function NavigationState() { + let navigation = useNavigation(); + return

Navigation state: {navigation.state}

; +} + export function ErrorBoundary() { return ( <> diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx index b83fd9fc75..efc77a5d04 100644 --- a/playground/rsc-vite/src/routes/root/root.tsx +++ b/playground/rsc-vite/src/routes/root/root.tsx @@ -1,11 +1,12 @@ import { Link, Links, Outlet, ScrollRestoration } from "react-router"; import { Counter } from "../../counter"; -import { ErrorReporter } from "./root.client"; +import { ErrorReporter, NavigationState } from "./root.client"; export { shouldRevalidate } from "./root.client"; -export function loader() { +export async function loader() { + await new Promise((r) => setTimeout(r, 500)); return { counter: , message: `Root route loader ran at ${new Date().toISOString()}`, @@ -63,6 +64,7 @@ export function Layout({ children }: { children: React.ReactNode }) { Redirect

Root Layout

+ {children} From 7f6ba43a011ce119af2bbd99d202293541274364 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Thu, 17 Apr 2025 11:55:04 -0700 Subject: [PATCH 068/143] always return a payload --- packages/react-router/lib/server.ts | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index 6f8228d422..a1aae78619 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -138,7 +138,7 @@ export async function matchServerRequest({ onError?: (error: unknown) => void; request: Request; routes: ServerRouteObject[]; -}): Promise { +}): Promise { const url = new URL(request.url); if (isManifestRequest(url)) { @@ -146,9 +146,6 @@ export async function matchServerRequest({ routes, url.pathname.replace(/\.manifest$/, "") ); - if (!matches?.length) { - return new Response("Not found", { status: 404 }); - } return { statusCode: 200, @@ -159,12 +156,13 @@ export async function matchServerRequest({ payload: { type: "manifest", matches: await Promise.all( - matches.map((m, i) => getRoute(m.route, matches[i - 1]?.route.id)) + matches?.map((m, i) => getRoute(m.route, matches[i - 1]?.route.id)) ?? + [] ), patches: await getAdditionalRoutePatches( url.pathname, routes, - matches.map((m) => m.route.id) + matches?.map((m) => m.route.id) ?? [] ), } satisfies ServerManifestPayload, }; @@ -375,9 +373,6 @@ export async function matchServerRequest({ : await getRenderPayload(), }; } catch (error) { - if (typeof error === "object" && error instanceof Response) { - return error; - } throw error; } } From be5fb2cb9b399dfb16b1247d63ab7a10609c5ece Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Thu, 17 Apr 2025 12:57:24 -0700 Subject: [PATCH 069/143] fix stream issue allow server state to flow through --- packages/react-router/lib/html-stream/server.ts | 2 +- packages/react-router/lib/server.browser.tsx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/react-router/lib/html-stream/server.ts b/packages/react-router/lib/html-stream/server.ts index 16419d4758..3b2bbedb0c 100644 --- a/packages/react-router/lib/html-stream/server.ts +++ b/packages/react-router/lib/html-stream/server.ts @@ -20,7 +20,7 @@ export function injectRSCPayload(rscStream: ReadableStream) { controller: TransformStreamDefaultController ) { for (let chunk of buffered) { - let buf = decoder.decode(chunk); + let buf = decoder.decode(chunk, { stream: true }); if (buf.endsWith(trailer)) { buf = buf.slice(0, -trailer.length); } diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index e26c22b3c9..890a3c7a32 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -226,9 +226,9 @@ function createRouterFromPayload({ window.__routerInitialized = false; } - let lastLocationKey = window.__router.state.location.key; - window.__router.subscribe(({ location }) => { - if (location.key !== lastLocationKey) { + let lastLoaderData: unknown = undefined; + window.__router.subscribe(({ loaderData, actionData }) => { + if (lastLoaderData !== loaderData) { window.__routerActionID = (window.__routerActionID ??= 0) + 1; } }); From eda7a8cf361d67226b90fc84fb56afc0a108298d Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Thu, 17 Apr 2025 16:59:32 -0400 Subject: [PATCH 070/143] fix --- packages/react-router/lib/server.browser.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/server.browser.tsx index 890a3c7a32..32555620df 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/server.browser.tsx @@ -184,6 +184,8 @@ function createRouterFromPayload({ hasHydrateFallback: match.hydrateFallbackElement != null, }; }, + payload.location, + undefined, false ), async patchRoutesOnNavigation({ patch, path, signal }) { From 4cf80072874ea4960adf80d7dfbf9d11fe1ca561 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Thu, 17 Apr 2025 18:41:56 -0700 Subject: [PATCH 071/143] feat: add support for progressive enhanced actions --- packages/react-router/lib/server.ts | 35 ++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index a1aae78619..ec1fa339c9 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -17,7 +17,6 @@ import { isRouteErrorResponse, matchRoutes, } from "./router/utils"; -import type { RouteMatch } from "./context"; type ServerRouteObjectBase = { action?: ActionFunction; @@ -128,13 +127,19 @@ export type DecodeCallServerFunction = ( reply: FormData | string ) => Promise<() => Promise>; +export type DecodeFormActionFunction = ( + formData: FormData +) => Promise<() => Promise>; + export async function matchServerRequest({ decodeCallServer, + decodeFormAction, onError, request, routes, }: { decodeCallServer?: DecodeCallServerFunction; + decodeFormAction?: DecodeFormActionFunction; onError?: (error: unknown) => void; request: Request; routes: ServerRouteObject[]; @@ -200,6 +205,34 @@ export async function matchServerRequest({ }); } + if (request.method === "POST") { + const formData = await request.formData(); + if ( + Array.from(formData.values()).some( + (value) => typeof value === "string" && value.startsWith("$ACTION_ID_") + ) + ) { + if (!decodeFormAction) { + throw new Error( + "Cannot handle form actions without a decodeFormAction function" + ); + } + + const action = await decodeFormAction(formData); + try { + await action(); + } catch (error) { + onError?.(error); + } + + request = new Request(request.url, { + method: "GET", + headers: request.headers, + signal: request.signal, + }); + } + } + const getRenderPayload = async (): Promise< ServerRenderPayload | ServerRedirectPayload > => { From b9264dc6aa82306179e647cfec9b78f06cc0e66d Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Thu, 17 Apr 2025 19:00:04 -0700 Subject: [PATCH 072/143] export type --- packages/react-router/server.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/react-router/server.ts b/packages/react-router/server.ts index d108ed8dba..96734bc208 100644 --- a/packages/react-router/server.ts +++ b/packages/react-router/server.ts @@ -9,6 +9,7 @@ export { export type { DecodeCallServerFunction, + DecodeFormActionFunction, ServerManifestPayload, ServerMatch, ServerPayload, From 573acd4d4f9184462849b02b60e34e8e385e3ff3 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Thu, 17 Apr 2025 19:01:31 -0700 Subject: [PATCH 073/143] update progressive actions --- packages/react-router/lib/server.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/server.ts index ec1fa339c9..43a9487fd7 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/server.ts @@ -208,9 +208,7 @@ export async function matchServerRequest({ if (request.method === "POST") { const formData = await request.formData(); if ( - Array.from(formData.values()).some( - (value) => typeof value === "string" && value.startsWith("$ACTION_ID_") - ) + Array.from(formData.keys()).some((key) => key.startsWith("$ACTION_ID_")) ) { if (!decodeFormAction) { throw new Error( From f0cc45f82194e38a09f0592b1b1f53dae20d8ed7 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Thu, 17 Apr 2025 17:21:05 -0400 Subject: [PATCH 074/143] RSC renames --- packages/react-router/index.ts | 12 +++---- .../{server.browser.tsx => rsc/browser.tsx} | 32 +++++++++---------- .../lib/{ => rsc}/html-stream/browser.ts | 0 .../lib/{ => rsc}/html-stream/server.ts | 0 .../lib/{server.ts => rsc/server.rsc.ts} | 10 +++--- .../{server.static.tsx => rsc/server.ssr.tsx} | 14 ++++---- packages/react-router/package.json | 26 +++++++-------- .../react-router/{server.ts => rsc-export.ts} | 7 ++-- ...up.config.server.ts => tsup.config.rsc.ts} | 2 +- playground/rsc-parcel/package.json | 6 ++-- .../src/{browser.tsx => entry.browser.tsx} | 9 ++---- .../src/{react-server.ts => entry.rsc.ts} | 6 ++-- .../src/{server.tsx => entry.ssr.tsx} | 8 ++--- .../src/routes/about/about.client.tsx | 5 ++- .../src/routes/home/home.client.tsx | 5 ++- ...references.server.ts => references.rsc.ts} | 0 .../rsc-vite/src/browser/entry.browser.tsx | 9 +++--- playground/rsc-vite/src/routes.ts | 2 +- playground/rsc-vite/src/routes/redirect.ts | 2 +- .../entry.server.tsx => rsc/entry.rsc.tsx} | 6 ++-- .../src/{server => rsc}/wrangler.toml | 2 +- playground/rsc-vite/src/ssr/entry.ssr.tsx | 6 ++-- playground/rsc-vite/vite.config.ts | 4 +-- 23 files changed, 86 insertions(+), 87 deletions(-) rename packages/react-router/lib/{server.browser.tsx => rsc/browser.tsx} (95%) rename packages/react-router/lib/{ => rsc}/html-stream/browser.ts (100%) rename packages/react-router/lib/{ => rsc}/html-stream/server.ts (100%) rename packages/react-router/lib/{server.ts => rsc/server.rsc.ts} (98%) rename packages/react-router/lib/{server.static.tsx => rsc/server.ssr.tsx} (91%) rename packages/react-router/{server.ts => rsc-export.ts} (76%) rename packages/react-router/{tsup.config.server.ts => tsup.config.rsc.ts} (97%) rename playground/rsc-parcel/src/{browser.tsx => entry.browser.tsx} (80%) rename playground/rsc-parcel/src/{react-server.ts => entry.rsc.ts} (76%) rename playground/rsc-parcel/src/{server.tsx => entry.ssr.tsx} (82%) rename playground/rsc-vite/framework/{references.server.ts => references.rsc.ts} (100%) rename playground/rsc-vite/src/{server/entry.server.tsx => rsc/entry.rsc.tsx} (90%) rename playground/rsc-vite/src/{server => rsc}/wrangler.toml (76%) diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts index b70666fe99..f5aa0b4ca0 100644 --- a/packages/react-router/index.ts +++ b/packages/react-router/index.ts @@ -373,11 +373,11 @@ export { useScrollRestoration as UNSAFE_useScrollRestoration } from "./lib/dom/l export type { DecodeServerResponseFunction, EncodeActionFunction, -} from "./lib/server.browser"; -export { createCallServer, ServerBrowserRouter } from "./lib/server.browser"; +} from "./lib/rsc/browser"; +export { createCallServer, RSCHydratedRouter } from "./lib/rsc/browser"; export { isReactServerRequest, - routeServerRequest, - ServerStaticRouter, -} from "./lib/server.static"; -export { getServerStream } from "./lib/html-stream/browser"; + routeRSCServerRequest, + RSCStaticRouter, +} from "./lib/rsc/server.ssr"; +export { getServerStream } from "./lib/rsc/html-stream/browser"; diff --git a/packages/react-router/lib/server.browser.tsx b/packages/react-router/lib/rsc/browser.tsx similarity index 95% rename from packages/react-router/lib/server.browser.tsx rename to packages/react-router/lib/rsc/browser.tsx index 32555620df..594b71c8b8 100644 --- a/packages/react-router/lib/server.browser.tsx +++ b/packages/react-router/lib/rsc/browser.tsx @@ -1,35 +1,35 @@ import * as React from "react"; -import { RouterProvider } from "./components"; -import type { DataRouteMatch, DataRouteObject } from "./context"; -import { FrameworkContext } from "./dom/ssr/components"; -import type { FrameworkContextObject } from "./dom/ssr/entry"; -import { createBrowserHistory, invariant } from "./router/history"; -import type { Router as DataRouter } from "./router/router"; -import { createRouter, isMutationMethod } from "./router/router"; +import { RouterProvider } from "../components"; +import type { DataRouteMatch, DataRouteObject } from "../context"; +import { FrameworkContext } from "../dom/ssr/components"; +import type { FrameworkContextObject } from "../dom/ssr/entry"; +import { createBrowserHistory, invariant } from "../router/history"; +import type { Router as DataRouter } from "../router/router"; +import { createRouter, isMutationMethod } from "../router/router"; import type { ServerPayload, RenderedRoute, ServerRenderPayload, -} from "./server"; +} from "./server.rsc"; import type { DataStrategyFunction, DataStrategyFunctionArgs, unstable_RouterContextProvider, -} from "./router/utils"; -import { ErrorResponseImpl, unstable_createContext } from "./router/utils"; +} from "../router/utils"; +import { ErrorResponseImpl, unstable_createContext } from "../router/utils"; import type { DecodedSingleFetchResults, FetchAndDecodeFunction, -} from "./dom/ssr/single-fetch"; +} from "../dom/ssr/single-fetch"; import { getSingleFetchDataStrategyImpl, singleFetchUrl, stripIndexParam, -} from "./dom/ssr/single-fetch"; -import { createRequestInit } from "./dom/ssr/data"; -import { getHydrationData } from "./dom/ssr/hydration"; -import { shouldHydrateRouteLoader } from "./dom/ssr/routes"; +} from "../dom/ssr/single-fetch"; +import { createRequestInit } from "../dom/ssr/data"; +import { getHydrationData } from "../dom/ssr/hydration"; +import { shouldHydrateRouteLoader } from "../dom/ssr/routes"; export type DecodeServerResponseFunction = ( body: ReadableStream @@ -386,7 +386,7 @@ function getFetchAndDecodeViaRSC( }; } -export function ServerBrowserRouter({ +export function RSCHydratedRouter({ decode, payload, }: { diff --git a/packages/react-router/lib/html-stream/browser.ts b/packages/react-router/lib/rsc/html-stream/browser.ts similarity index 100% rename from packages/react-router/lib/html-stream/browser.ts rename to packages/react-router/lib/rsc/html-stream/browser.ts diff --git a/packages/react-router/lib/html-stream/server.ts b/packages/react-router/lib/rsc/html-stream/server.ts similarity index 100% rename from packages/react-router/lib/html-stream/server.ts rename to packages/react-router/lib/rsc/html-stream/server.ts diff --git a/packages/react-router/lib/server.ts b/packages/react-router/lib/rsc/server.rsc.ts similarity index 98% rename from packages/react-router/lib/server.ts rename to packages/react-router/lib/rsc/server.rsc.ts index 43a9487fd7..943b827213 100644 --- a/packages/react-router/lib/server.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -5,9 +5,9 @@ import type { ClientLoaderFunction, LinksFunction, MetaFunction, -} from "./dom/ssr/routeModules"; -import type { Location } from "./router/history"; -import { createStaticHandler, isMutationMethod } from "./router/router"; +} from "../dom/ssr/routeModules"; +import type { Location } from "../router/history"; +import { createStaticHandler, isMutationMethod } from "../router/router"; import { type ActionFunction, type AgnosticDataRouteMatch, @@ -16,7 +16,7 @@ import { type ShouldRevalidateFunction, isRouteErrorResponse, matchRoutes, -} from "./router/utils"; +} from "../router/utils"; type ServerRouteObjectBase = { action?: ActionFunction; @@ -131,7 +131,7 @@ export type DecodeFormActionFunction = ( formData: FormData ) => Promise<() => Promise>; -export async function matchServerRequest({ +export async function matchRSCServerRequest({ decodeCallServer, decodeFormAction, onError, diff --git a/packages/react-router/lib/server.static.tsx b/packages/react-router/lib/rsc/server.ssr.tsx similarity index 91% rename from packages/react-router/lib/server.static.tsx rename to packages/react-router/lib/rsc/server.ssr.tsx index 2076e78948..5a0daa9555 100644 --- a/packages/react-router/lib/server.static.tsx +++ b/packages/react-router/lib/rsc/server.ssr.tsx @@ -1,12 +1,12 @@ import * as React from "react"; -import { type DataRouteObject } from "./context"; -import { FrameworkContext } from "./dom/ssr/components"; -import type { FrameworkContextObject } from "./dom/ssr/entry"; -import { createStaticRouter, StaticRouterProvider } from "./dom/server"; +import { type DataRouteObject } from "../context"; +import { FrameworkContext } from "../dom/ssr/components"; +import type { FrameworkContextObject } from "../dom/ssr/entry"; +import { createStaticRouter, StaticRouterProvider } from "../dom/server"; import { injectRSCPayload } from "./html-stream/server"; -import type { ServerPayload } from "./server"; +import type { ServerPayload } from "./server.rsc"; -export async function routeServerRequest( +export async function routeRSCServerRequest( request: Request, requestServer: (request: Request) => Promise, decode: (body: ReadableStream) => Promise, @@ -84,7 +84,7 @@ export async function routeServerRequest( } } -export function ServerStaticRouter({ payload }: { payload: ServerPayload }) { +export function RSCStaticRouter({ payload }: { payload: ServerPayload }) { if (payload.type !== "render") return null; const context = { diff --git a/packages/react-router/package.json b/packages/react-router/package.json index c433f97a25..220405db51 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -70,36 +70,36 @@ "default": "./dist/development/dom-export.js" } }, - "./server": { + "./rsc": { "node": { - "types": "./dist/development/server.d.ts", - "module": "./dist/development/server.mjs", - "module-sync": "./dist/development/server.mjs", - "default": "./dist/development/server.js" + "types": "./dist/development/rsc-export.d.ts", + "module": "./dist/development/rsc-export.mjs", + "module-sync": "./dist/development/rsc-export.mjs", + "default": "./dist/development/rsc-export.js" }, "module": { - "types": "./dist/development/server.d.mts", - "default": "./dist/development/server.mjs" + "types": "./dist/development/rsc-export.d.mts", + "default": "./dist/development/rsc-export.mjs" }, "import": { - "types": "./dist/development/server.d.mts", - "default": "./dist/development/server.mjs" + "types": "./dist/development/rsc-export.d.mts", + "default": "./dist/development/rsc-export.mjs" }, "default": { - "types": "./dist/development/server.d.ts", - "default": "./dist/development/server.js" + "types": "./dist/development/rsc-export.d.ts", + "default": "./dist/development/rsc-export.js" } }, "./package.json": "./package.json" }, "scripts": { "build": "wireit", - "watch": "tsup --watch & tsup --config tsup.config.server.ts --watch", + "watch": "tsup --watch & tsup --config tsup.config.rsc.ts --watch", "typecheck": "tsc" }, "wireit": { "build": { - "command": "rimraf dist && tsup && tsup --config tsup.config.server.ts", + "command": "rimraf dist && tsup && tsup --config tsup.config.rsc.ts", "files": [ "re-write-server-build-import.mjs", "lib/**", diff --git a/packages/react-router/server.ts b/packages/react-router/rsc-export.ts similarity index 76% rename from packages/react-router/server.ts rename to packages/react-router/rsc-export.ts index 96734bc208..ccb67dc5a3 100644 --- a/packages/react-router/server.ts +++ b/packages/react-router/rsc-export.ts @@ -17,5 +17,8 @@ export type { RenderedRoute as ServerRouteManifest, ServerRouteMatch, ServerRouteObject, -} from "./lib/server"; -export { isReactServerRequest, matchServerRequest } from "./lib/server"; +} from "./lib/rsc/server.rsc"; +export { + isReactServerRequest, + matchRSCServerRequest, +} from "./lib/rsc/server.rsc"; diff --git a/packages/react-router/tsup.config.server.ts b/packages/react-router/tsup.config.rsc.ts similarity index 97% rename from packages/react-router/tsup.config.server.ts rename to packages/react-router/tsup.config.rsc.ts index 39c319e709..7ff7f1f606 100644 --- a/packages/react-router/tsup.config.server.ts +++ b/packages/react-router/tsup.config.rsc.ts @@ -5,7 +5,7 @@ import { createBanner } from "../../build.utils.js"; import pkg from "./package.json"; -const entry = ["server.ts"]; +const entry = ["rsc-export.ts"]; const external = ["react-router/client"]; const config = (enableDevWarnings: boolean) => diff --git a/playground/rsc-parcel/package.json b/playground/rsc-parcel/package.json index b3d27a7894..50e34973fd 100644 --- a/playground/rsc-parcel/package.json +++ b/playground/rsc-parcel/package.json @@ -1,7 +1,7 @@ { "name": "@playground/rsc-parcel", "private": true, - "source": "src/server.tsx", + "source": "src/entry.ssr.tsx", "server": "dist/server.js", "targets": { "server": { @@ -12,8 +12,8 @@ } }, "scripts": { - "dev": "parcel", - "build": "parcel build", + "dev": "parcel --no-cache", + "build": "parcel build --no-cache", "start": "node dist/server.js" }, "devDependencies": { diff --git a/playground/rsc-parcel/src/browser.tsx b/playground/rsc-parcel/src/entry.browser.tsx similarity index 80% rename from playground/rsc-parcel/src/browser.tsx rename to playground/rsc-parcel/src/entry.browser.tsx index 2463563684..40a96f821f 100644 --- a/playground/rsc-parcel/src/browser.tsx +++ b/playground/rsc-parcel/src/entry.browser.tsx @@ -5,11 +5,8 @@ import { hydrateRoot } from "react-dom/client"; // @ts-expect-error import { createFromReadableStream } from "react-server-dom-parcel/client"; -import { - type ServerPayload, - getServerStream, - ServerBrowserRouter, -} from "react-router"; +import { getServerStream, RSCHydratedRouter } from "react-router"; +import { type ServerPayload } from "react-router/rsc"; createFromReadableStream( getServerStream(), @@ -24,7 +21,7 @@ createFromReadableStream( hydrateRoot( document, - diff --git a/playground/rsc-parcel/src/react-server.ts b/playground/rsc-parcel/src/entry.rsc.ts similarity index 76% rename from playground/rsc-parcel/src/react-server.ts rename to playground/rsc-parcel/src/entry.rsc.ts index 874b9fde34..19cbb51354 100644 --- a/playground/rsc-parcel/src/react-server.ts +++ b/playground/rsc-parcel/src/entry.rsc.ts @@ -1,15 +1,15 @@ "use server-entry"; -import "./browser"; +import "./entry.browser"; -import { matchServerRequest } from "react-router"; +import { matchRSCServerRequest } from "react-router/rsc"; // @ts-expect-error import { renderToReadableStream } from "react-server-dom-parcel/server.edge"; import { routes } from "./routes"; export async function callServer(request: Request) { - const match = await matchServerRequest({ + const match = await matchRSCServerRequest({ request, routes, }); diff --git a/playground/rsc-parcel/src/server.tsx b/playground/rsc-parcel/src/entry.ssr.tsx similarity index 82% rename from playground/rsc-parcel/src/server.tsx rename to playground/rsc-parcel/src/entry.ssr.tsx index c1899392c2..c1be4a31cb 100644 --- a/playground/rsc-parcel/src/server.tsx +++ b/playground/rsc-parcel/src/entry.ssr.tsx @@ -10,11 +10,11 @@ import { renderToReadableStream as renderHTMLToReadableStream } from "react-dom/ env: "react-client", }; -import { routeServerRequest, ServerStaticRouter,type ServerPayload } from "react-router" with { +import { routeRSCServerRequest, RSCStaticRouter } from "react-router" with { env: "react-client", }; -import { callServer } from "./react-server" with { +import { callServer } from "./entry.rsc" with { env: "react-server", }; @@ -24,13 +24,13 @@ app.use(express.static("dist")); app.use( createRequestListener(async (request) => { - return routeServerRequest( + return routeRSCServerRequest( request, callServer, createFromReadableStream, async (payload) => { return await renderHTMLToReadableStream( - , + , { bootstrapScriptContent: ( callServer as unknown as { bootstrapScript: string } diff --git a/playground/rsc-parcel/src/routes/about/about.client.tsx b/playground/rsc-parcel/src/routes/about/about.client.tsx index a3137b4067..abc11f3e4c 100644 --- a/playground/rsc-parcel/src/routes/about/about.client.tsx +++ b/playground/rsc-parcel/src/routes/about/about.client.tsx @@ -32,9 +32,8 @@ export default function About() { return (
-

- {message} {String(client)} -

+

{message}

+

Did client loader run? {client ? "Yes" : "No"}

); diff --git a/playground/rsc-parcel/src/routes/home/home.client.tsx b/playground/rsc-parcel/src/routes/home/home.client.tsx index d2865e5bd3..d9e598b71a 100644 --- a/playground/rsc-parcel/src/routes/home/home.client.tsx +++ b/playground/rsc-parcel/src/routes/home/home.client.tsx @@ -20,9 +20,8 @@ export default function Home() { return (
-

- {message} {String(client)} -

+

{message}

+

Did client loader run? {client ? "Yes" : "No"}

); diff --git a/playground/rsc-vite/framework/references.server.ts b/playground/rsc-vite/framework/references.rsc.ts similarity index 100% rename from playground/rsc-vite/framework/references.server.ts rename to playground/rsc-vite/framework/references.rsc.ts diff --git a/playground/rsc-vite/src/browser/entry.browser.tsx b/playground/rsc-vite/src/browser/entry.browser.tsx index 2ac5b529a0..144736bf35 100644 --- a/playground/rsc-vite/src/browser/entry.browser.tsx +++ b/playground/rsc-vite/src/browser/entry.browser.tsx @@ -11,13 +11,14 @@ import { manifest } from "virtual:react-manifest"; import { type DecodeServerResponseFunction, type EncodeActionFunction, - type ServerPayload, createCallServer, getServerStream, - ServerBrowserRouter, + RSCHydratedRouter, } from "react-router"; +import { type ServerPayload } from "react-router/rsc"; -const encodeAction: EncodeActionFunction = (args: unknown[]) => encodeReply(args); +const encodeAction: EncodeActionFunction = (args: unknown[]) => + encodeReply(args); const decode: DecodeServerResponseFunction = (body) => createFromReadableStream(body, manifest, { callServer }); @@ -30,7 +31,7 @@ createFromReadableStream(getServerStream(), manifest, { callServer }).then( hydrateRoot( document, - + ); }); diff --git a/playground/rsc-vite/src/routes.ts b/playground/rsc-vite/src/routes.ts index 328bf30ef2..c54a332be4 100644 --- a/playground/rsc-vite/src/routes.ts +++ b/playground/rsc-vite/src/routes.ts @@ -1,4 +1,4 @@ -import type { ServerRouteObject } from "react-router/server"; +import type { ServerRouteObject } from "react-router/rsc"; export const routes = [ { diff --git a/playground/rsc-vite/src/routes/redirect.ts b/playground/rsc-vite/src/routes/redirect.ts index 7bb8103a74..8967cec561 100644 --- a/playground/rsc-vite/src/routes/redirect.ts +++ b/playground/rsc-vite/src/routes/redirect.ts @@ -1,4 +1,4 @@ -import { redirect, redirectDocument, replace } from "react-router/server"; +import { redirect, redirectDocument, replace } from "react-router/rsc"; export function loader() { throw redirectDocument("/about?redirected"); diff --git a/playground/rsc-vite/src/server/entry.server.tsx b/playground/rsc-vite/src/rsc/entry.rsc.tsx similarity index 90% rename from playground/rsc-vite/src/server/entry.server.tsx rename to playground/rsc-vite/src/rsc/entry.rsc.tsx index abf7793db5..6c7c11acfb 100644 --- a/playground/rsc-vite/src/server/entry.server.tsx +++ b/playground/rsc-vite/src/rsc/entry.rsc.tsx @@ -6,8 +6,8 @@ import { manifest } from "virtual:react-manifest"; import { type DecodeCallServerFunction, - matchServerRequest, -} from "react-router/server"; + matchRSCServerRequest, +} from "react-router/rsc"; import { routes } from "../routes"; @@ -21,7 +21,7 @@ const decodeCallServer: DecodeCallServerFunction = async (actionId, reply) => { export default { async fetch(request, env) { - const match = await matchServerRequest({ + const match = await matchRSCServerRequest({ decodeCallServer, request, routes, diff --git a/playground/rsc-vite/src/server/wrangler.toml b/playground/rsc-vite/src/rsc/wrangler.toml similarity index 76% rename from playground/rsc-vite/src/server/wrangler.toml rename to playground/rsc-vite/src/rsc/wrangler.toml index 18b72d3ee4..6d22f08fed 100644 --- a/playground/rsc-vite/src/server/wrangler.toml +++ b/playground/rsc-vite/src/rsc/wrangler.toml @@ -1,4 +1,4 @@ name = "server" -main = "./entry.server.tsx" +main = "./entry.rsc.tsx" compatibility_date = "2024-12-05" compatibility_flags = ["nodejs_compat"] diff --git a/playground/rsc-vite/src/ssr/entry.ssr.tsx b/playground/rsc-vite/src/ssr/entry.ssr.tsx index 15d39493ec..7e2d2e2255 100644 --- a/playground/rsc-vite/src/ssr/entry.ssr.tsx +++ b/playground/rsc-vite/src/ssr/entry.ssr.tsx @@ -7,7 +7,7 @@ import RDS from "react-dom/server.edge"; // @ts-expect-error import { bootstrapModules, manifest } from "virtual:react-manifest"; -import { routeServerRequest, ServerStaticRouter } from "react-router"; +import { routeRSCServerRequest, RSCStaticRouter } from "react-router"; type CloudflareEnv = { ASSETS: Fetcher; @@ -18,13 +18,13 @@ export default { async fetch(request, { SERVER }) { const callServer = async (request: Request) => await SERVER.fetch(request); try { - return await routeServerRequest( + return await routeRSCServerRequest( request, callServer, (body) => RSD.createFromReadableStream(body, manifest), async (payload) => { return await RDS.renderToReadableStream( - , + , { bootstrapModules, signal: request.signal, diff --git a/playground/rsc-vite/vite.config.ts b/playground/rsc-vite/vite.config.ts index 3a4a900c4c..ac0673c423 100644 --- a/playground/rsc-vite/vite.config.ts +++ b/playground/rsc-vite/vite.config.ts @@ -49,7 +49,7 @@ export default defineConfig({ importFrom: path.resolve("./framework/references.browser.ts"), }, server: { - importFrom: path.resolve("./framework/references.server.ts"), + importFrom: path.resolve("./framework/references.rsc.ts"), }, ssr: { importFrom: path.resolve("./framework/references.ssr.ts"), @@ -61,7 +61,7 @@ export default defineConfig({ configPath: "src/ssr/wrangler.toml", auxiliaryWorkers: [ { - configPath: "src/server/wrangler.toml", + configPath: "src/rsc/wrangler.toml", }, ], }), From a31699f378c933b05f5ec4f912e92aeb6396e41c Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Fri, 18 Apr 2025 12:33:47 -0400 Subject: [PATCH 075/143] Code cleanups/diff reductions --- .vscode/settings.json | 18 +---- packages/react-router/client.js | 3 - packages/react-router/index.ts | 21 +++--- .../react-router/lib/dom/ssr/single-fetch.tsx | 7 +- packages/react-router/lib/router/router.ts | 68 ++++++++----------- packages/react-router/lib/rsc/server.rsc.ts | 13 ++++ packages/react-router/package.json | 12 ---- packages/react-router/rsc-export.ts | 5 +- playground/rsc-vite/server.js | 2 +- pnpm-lock.yaml | 8 --- 10 files changed, 58 insertions(+), 99 deletions(-) delete mode 100644 packages/react-router/client.js diff --git a/.vscode/settings.json b/.vscode/settings.json index 4e0cf8a198..fae8e3d8a9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,20 +1,4 @@ { "typescript.tsdk": "node_modules/typescript/lib", - "typescript.enablePromptUseWorkspaceTsdk": true, - "editor.defaultFormatter": "esbenp.prettier-vscode", - "[json]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[jsonc]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[typescript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[typescriptreact]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[javascript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - } + "typescript.enablePromptUseWorkspaceTsdk": true } diff --git a/packages/react-router/client.js b/packages/react-router/client.js deleted file mode 100644 index 6953d2ead0..0000000000 --- a/packages/react-router/client.js +++ /dev/null @@ -1,3 +0,0 @@ -const bundled = require("./dist/development/index.js"); - -module.exports = bundled; \ No newline at end of file diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts index f5aa0b4ca0..17bc0ffd75 100644 --- a/packages/react-router/index.ts +++ b/packages/react-router/index.ts @@ -282,6 +282,15 @@ export type { unstable_SerializesTo } from "./lib/types/serializes-to.ts"; export type { Register } from "./lib/types/register"; export { href } from "./lib/href"; +// RSC +export type { + DecodeServerResponseFunction, + EncodeActionFunction, +} from "./lib/rsc/browser"; +export { createCallServer, RSCHydratedRouter } from "./lib/rsc/browser"; +export { routeRSCServerRequest, RSCStaticRouter } from "./lib/rsc/server.ssr"; +export { getServerStream } from "./lib/rsc/html-stream/browser"; + /////////////////////////////////////////////////////////////////////////////// // DANGER! PLEASE READ ME! // We provide these exports as an escape hatch in the event that you need any @@ -369,15 +378,3 @@ export { ServerMode as UNSAFE_ServerMode } from "./lib/server-runtime/mode"; /** @internal */ export { useScrollRestoration as UNSAFE_useScrollRestoration } from "./lib/dom/lib"; - -export type { - DecodeServerResponseFunction, - EncodeActionFunction, -} from "./lib/rsc/browser"; -export { createCallServer, RSCHydratedRouter } from "./lib/rsc/browser"; -export { - isReactServerRequest, - routeRSCServerRequest, - RSCStaticRouter, -} from "./lib/rsc/server.ssr"; -export { getServerStream } from "./lib/rsc/html-stream/browser"; diff --git a/packages/react-router/lib/dom/ssr/single-fetch.tsx b/packages/react-router/lib/dom/ssr/single-fetch.tsx index 9415e06f6f..04256f1818 100644 --- a/packages/react-router/lib/dom/ssr/single-fetch.tsx +++ b/packages/react-router/lib/dom/ssr/single-fetch.tsx @@ -150,7 +150,7 @@ export function StreamTransfer({ } } -export type GetRouteInfoFunction = (match: DataRouteMatch) => { +type GetRouteInfoFunction = (match: DataRouteMatch) => { hasLoader: boolean; hasClientLoader: boolean; hasShouldRevalidate: boolean; @@ -663,9 +663,8 @@ function unwrapSingleFetchResult( } let routeResult = result.routes[routeId]; - if (!routeResult) { - return undefined; - } else if ("error" in routeResult) { + invariant(routeResult, `No response found for routeId "${routeId}"`); + if ("error" in routeResult) { throw routeResult.error; } else if ("data" in routeResult) { return routeResult.data; diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts index f684680e97..ddcb7f4712 100644 --- a/packages/react-router/lib/router/router.ts +++ b/packages/react-router/lib/router/router.ts @@ -258,13 +258,13 @@ export interface Router { * @param routeId The parent route id or a callback function accepting `patch` * to perform batch patching * @param children The additional children routes - * @param allowElementMutations Allow mutation or route elements on existing routes. - * Intended for RSC-usage only. + * @param unstable_allowElementMutations Allow mutation or route elements on + * existing routes. Intended for RSC-usage + * only. */ patchRoutes( routeId: string | null, children: AgnosticRouteObject[], - // TODO: Does this need ro be a future flag or is the new API ok? unstable_allowElementMutations?: boolean ): void; @@ -1171,8 +1171,19 @@ export function createRouter(init: RouterInit): Router { // get references to the latest elements here if (newState.matches) { newState.matches = newState.matches.map((m) => { - let route = manifest[m.route.id]!; - return { ...m, route }; + let route = manifest[m.route.id]! as RouteObject; + let matchRoute = m.route as RouteObject; + if ( + matchRoute.element !== route.element || + matchRoute.errorElement !== route.errorElement || + matchRoute.hydrateFallbackElement !== route.hydrateFallbackElement + ) { + return { + ...m, + route: route as AgnosticDataRouteObject, + }; + } + return m; }); } @@ -4918,8 +4929,7 @@ function patchRoutesImpl( ) { let childrenToPatch: AgnosticDataRouteObject[]; if (routeId) { - // TODO: Can we enhance the manifest to make this an O(1) lookup? - let route = findRouteRecursively(routeId, routesToUse); + let route = manifest[routeId]; invariant( route, `No route found to patch children into: routeId = ${routeId}` @@ -4965,27 +4975,27 @@ function patchRoutesImpl( if (allowElementMutations && existingChildren.length > 0) { for (let i = 0; i < existingChildren.length; i++) { let { existingRoute, newRoute } = existingChildren[i]; - let existingRouteAny = existingRoute as RouteObject; + let existingRouteTyped = existingRoute as RouteObject; // All this will end up doing for these scenarios is adding `hasErrorBoundary` // to the route. There's no need for Component->element conversions since // we're already dealing with elements here - let [newRouteAny] = convertRoutesToDataRoutes( + let [newRouteTyped] = convertRoutesToDataRoutes( [newRoute], mapRouteProperties, [], // Doesn't matter for mutated routes since they already have an id - manifest, + {}, // Don't touch the manifest here since we're updating in place true ) as RouteObject[]; - Object.assign(existingRouteAny, { - element: newRouteAny.element - ? newRouteAny.element - : existingRouteAny.element, - errorElement: newRouteAny.errorElement - ? newRouteAny.errorElement - : existingRouteAny.errorElement, - hydrateFallbackElement: newRouteAny.hydrateFallbackElement - ? newRouteAny.hydrateFallbackElement - : existingRouteAny.hydrateFallbackElement, + Object.assign(existingRouteTyped, { + element: newRouteTyped.element + ? newRouteTyped.element + : existingRouteTyped.element, + errorElement: newRouteTyped.errorElement + ? newRouteTyped.errorElement + : existingRouteTyped.errorElement, + hydrateFallbackElement: newRouteTyped.hydrateFallbackElement + ? newRouteTyped.hydrateFallbackElement + : existingRouteTyped.hydrateFallbackElement, }); } } @@ -5031,24 +5041,6 @@ function isSameRoute( ); } -function findRouteRecursively( - id: string, - routes: AgnosticDataRouteObject[] -): AgnosticDataRouteObject | null { - for (const route of routes) { - if (route.id === id) { - return route; - } - if (route.children) { - const found = findRouteRecursively(id, route.children); - if (found) { - return found; - } - } - } - return null; -} - const lazyRoutePropertyCache = new WeakMap< AgnosticDataRouteObject, Partial>> diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index 943b827213..72d04bec19 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -277,6 +277,19 @@ export async function matchRSCServerRequest({ ) : staticContext.errors; + // In the RSC world we set `hasLoader:true` eve if a route doesn't have a + // loader so that we always make the single fetch call to get the rendered + // `element`. We add a `null`value for any of the routes that don't + // actually have a loader so the single fetch logic can find a result for + // the route. This is a bit of a hack but allows us to re-use all the + // existing logic. This can go away if we ever fork off and re-implement a + // standalone RSC `dataStrategy` + staticContext.matches.forEach((m) => { + if (!(m.route.id in staticContext.loaderData)) { + staticContext.loaderData[m.route.id] = null; + } + }); + const payload: Omit = { type: "render", actionData: staticContext.actionData, diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 220405db51..3672405e72 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -25,14 +25,9 @@ ".": { "node": { "types": "./dist/development/index.d.ts", - "module": "./dist/development/index.mjs", "module-sync": "./dist/development/index.mjs", "default": "./dist/development/index.js" }, - "module": { - "types": "./dist/development/index.d.mts", - "default": "./dist/development/index.mjs" - }, "import": { "types": "./dist/development/index.d.mts", "default": "./dist/development/index.mjs" @@ -53,14 +48,9 @@ "./dom": { "node": { "types": "./dist/development/dom-export.d.ts", - "module": "./dist/development/dom-export.mjs", "module-sync": "./dist/development/dom-export.mjs", "default": "./dist/development/dom-export.js" }, - "module": { - "types": "./dist/development/dom-export.d.mts", - "default": "./dist/development/dom-export.mjs" - }, "import": { "types": "./dist/development/dom-export.d.mts", "default": "./dist/development/dom-export.mjs" @@ -101,7 +91,6 @@ "build": { "command": "rimraf dist && tsup && tsup --config tsup.config.rsc.ts", "files": [ - "re-write-server-build-import.mjs", "lib/**", "*.ts", "tsconfig.json", @@ -113,7 +102,6 @@ } }, "dependencies": { - "@types/cookie": "^0.6.0", "cookie": "^1.0.1", "set-cookie-parser": "^2.6.0", "turbo-stream": "2.4.0" diff --git a/packages/react-router/rsc-export.ts b/packages/react-router/rsc-export.ts index ccb67dc5a3..61d5ec18b1 100644 --- a/packages/react-router/rsc-export.ts +++ b/packages/react-router/rsc-export.ts @@ -18,7 +18,4 @@ export type { ServerRouteMatch, ServerRouteObject, } from "./lib/rsc/server.rsc"; -export { - isReactServerRequest, - matchRSCServerRequest, -} from "./lib/rsc/server.rsc"; +export { matchRSCServerRequest } from "./lib/rsc/server.rsc"; diff --git a/playground/rsc-vite/server.js b/playground/rsc-vite/server.js index 720b3553b3..6da9cd7bfa 100644 --- a/playground/rsc-vite/server.js +++ b/playground/rsc-vite/server.js @@ -3,7 +3,7 @@ import compression from "compression"; import express from "express"; import ssr from "./dist/ssr/entry.ssr.js"; -import server from "./dist/server/entry.server.js"; +import server from "./dist/server/entry.rsc.js"; const app = express(); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2d468a7292..94a15d5170 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -738,9 +738,6 @@ importers: packages/react-router: dependencies: - '@types/cookie': - specifier: ^0.6.0 - version: 0.6.0 cookie: specifier: ^1.0.1 version: 1.0.1 @@ -4850,9 +4847,6 @@ packages: '@types/cookie@0.4.1': resolution: {integrity: sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==} - '@types/cookie@0.6.0': - resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==} - '@types/cookiejar@2.1.5': resolution: {integrity: sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==} @@ -13969,8 +13963,6 @@ snapshots: '@types/cookie@0.4.1': {} - '@types/cookie@0.6.0': {} - '@types/cookiejar@2.1.5': {} '@types/cross-spawn@6.0.6': From 201a701e7dea3883ba0b0d4da659f10b871df96b Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Fri, 18 Apr 2025 12:54:00 -0400 Subject: [PATCH 076/143] Don't include patches on SPA navigation render payloads --- packages/react-router/lib/rsc/browser.tsx | 2 +- packages/react-router/lib/rsc/server.rsc.ts | 30 +++++++++++--------- packages/react-router/lib/rsc/server.ssr.tsx | 7 ++--- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/packages/react-router/lib/rsc/browser.tsx b/packages/react-router/lib/rsc/browser.tsx index 594b71c8b8..3779126382 100644 --- a/packages/react-router/lib/rsc/browser.tsx +++ b/packages/react-router/lib/rsc/browser.tsx @@ -140,7 +140,7 @@ function createRouterFromPayload({ if (payload.type !== "render") throw new Error("Invalid payload type"); let patches = new Map(); - payload.patches.forEach((patch) => { + payload.patches?.forEach((patch) => { invariant(patch.parentId, "Invalid patch parentId"); if (!patches.has(patch.parentId)) { patches.set(patch.parentId, []); diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index 72d04bec19..733211f22d 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -79,10 +79,11 @@ export type ServerRenderPayload = { loaderData: Record; location: Location; matches: ServerRouteMatch[]; - // Additional routes we should patch into the router for subsequent navigatons. + // Additional routes we should patch into the router for subsequent navigations. // Mostly a collection of pathless/index routes that may be needed for complete - // matching on upward navigations. - patches: RenderedRoute[]; + // matching on upward navigations. Only needed on the initial document request, + // for SPA navigations the manifest call will handle these patches. + patches?: RenderedRoute[]; nonce?: string; }; @@ -145,6 +146,7 @@ export async function matchRSCServerRequest({ routes: ServerRouteObject[]; }): Promise { const url = new URL(request.url); + let isDataRequest = request.headers.has("X-React-Router-Data-Request"); if (isManifestRequest(url)) { const matches = matchRoutes( @@ -231,9 +233,9 @@ export async function matchRSCServerRequest({ } } - const getRenderPayload = async (): Promise< - ServerRenderPayload | ServerRedirectPayload - > => { + const getRenderPayload = async ( + isDataRequest: boolean + ): Promise => { const handler = createStaticHandler(routes); // If this is a RR submission, we just want the `actionData` but don't want @@ -393,11 +395,13 @@ export async function matchRSCServerRequest({ matches: routeIdsToLoad ? matches.filter((m) => routeIdsToLoad.includes(m.id)) : matches, - patches: await getAdditionalRoutePatches( - staticContext.location.pathname, - routes, - matches.map((m) => m.id) - ), + patches: !isDataRequest + ? await getAdditionalRoutePatches( + staticContext.location.pathname, + routes, + matches.map((m) => m.id) + ) + : undefined, }; }; @@ -412,9 +416,9 @@ export async function matchRSCServerRequest({ ? { type: "action", actionResult, - rerender: getRenderPayload(), + rerender: getRenderPayload(isDataRequest), } - : await getRenderPayload(), + : await getRenderPayload(isDataRequest), }; } catch (error) { throw error; diff --git a/packages/react-router/lib/rsc/server.ssr.tsx b/packages/react-router/lib/rsc/server.ssr.tsx index 5a0daa9555..d63222c934 100644 --- a/packages/react-router/lib/rsc/server.ssr.tsx +++ b/packages/react-router/lib/rsc/server.ssr.tsx @@ -25,13 +25,12 @@ export async function routeRSCServerRequest( if (isDataRequest) { const serverURL = new URL(request.url); serverURL.pathname = serverURL.pathname.replace(/(_root)?\.rsc$/, ""); - if (!isDataRequest) { - serverURL.searchParams.delete("_routes"); - } + let headers = new Headers(request.headers); + headers.set("X-React-Router-Data-Request", "true"); serverRequest = new Request(serverURL, { body: request.body, duplex: request.body ? "half" : undefined, - headers: request.headers, + headers, method: request.method, signal: request.signal, } as RequestInit & { duplex?: "half" }); From 21f6f89a803c76ad9d0e00b7d0b98352b431561d Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Fri, 18 Apr 2025 13:01:40 -0400 Subject: [PATCH 077/143] Clean uip a few todos --- packages/react-router/lib/rsc/browser.tsx | 9 +++------ packages/react-router/lib/rsc/server.rsc.ts | 1 - packages/react-router/lib/rsc/server.ssr.tsx | 9 +++------ .../rsc-parcel/src/routes/about/about.client.tsx | 12 ------------ .../rsc-vite/src/routes/about/about.client.tsx | 12 ------------ 5 files changed, 6 insertions(+), 37 deletions(-) diff --git a/packages/react-router/lib/rsc/browser.tsx b/packages/react-router/lib/rsc/browser.tsx index 3779126382..12fd6c5cb2 100644 --- a/packages/react-router/lib/rsc/browser.tsx +++ b/packages/react-router/lib/rsc/browser.tsx @@ -412,7 +412,8 @@ export function RSCHydratedRouter({ const frameworkContext: FrameworkContextObject = { future: { - // TODO: Update these + // These flags have no runtime impact so can always be false. If we add + // flags that drive runtime behavior they'll need to be proxied through. unstable_middleware: false, unstable_subResourceIntegrity: false, }, @@ -420,11 +421,7 @@ export function RSCHydratedRouter({ ssr: true, criticalCss: "", manifest: { - routes: { - // root: { - // css: [] - // }, - }, + routes: {}, version: "1", url: "", entry: { diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index 733211f22d..d877989215 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -179,7 +179,6 @@ export async function matchRSCServerRequest({ let actionResult: Promise | undefined; const actionId = request.headers.get("rsc-action-id"); if (actionId) { - // TODO: Handle action if (!decodeCallServer) { throw new Error( "Cannot handle enhanced server action without a decodeCallServer function" diff --git a/packages/react-router/lib/rsc/server.ssr.tsx b/packages/react-router/lib/rsc/server.ssr.tsx index d63222c934..a4b2a7df01 100644 --- a/packages/react-router/lib/rsc/server.ssr.tsx +++ b/packages/react-router/lib/rsc/server.ssr.tsx @@ -137,7 +137,8 @@ export function RSCStaticRouter({ payload }: { payload: ServerPayload }) { const frameworkContext: FrameworkContextObject = { future: { - // TODO: Update these + // These flags have no runtime impact so can always be false. If we add + // flags that drive runtime behavior they'll need to be proxied through. unstable_middleware: false, unstable_subResourceIntegrity: false, }, @@ -145,11 +146,7 @@ export function RSCStaticRouter({ payload }: { payload: ServerPayload }) { ssr: true, criticalCss: "", manifest: { - routes: { - // root: { - // css: [] - // }, - }, + routes: {}, version: "1", url: "", entry: { diff --git a/playground/rsc-parcel/src/routes/about/about.client.tsx b/playground/rsc-parcel/src/routes/about/about.client.tsx index abc11f3e4c..b3be63676c 100644 --- a/playground/rsc-parcel/src/routes/about/about.client.tsx +++ b/playground/rsc-parcel/src/routes/about/about.client.tsx @@ -6,18 +6,6 @@ import { Counter } from "../../counter"; import type { loader } from "./about"; -// TODO: Investigate using lazy as a preload method for split route chunk modules -// export function lazy() { -// import("./about.client.tsx?route-chunk=clientLoader"); -// import("./about.client.tsx?route-chunk=clientAction"); -// return {}; -// } -// export async function clientLoader(...args) { -// return import("./about.client.tsx?route-chunk=clientLoader").then((mod) => -// mod.clientLoader(...args) -// ); -// } - export async function clientLoader({ serverLoader }: ClientLoaderFunctionArgs) { const res = await serverLoader(); diff --git a/playground/rsc-vite/src/routes/about/about.client.tsx b/playground/rsc-vite/src/routes/about/about.client.tsx index 654d4ea537..cba0f37cde 100644 --- a/playground/rsc-vite/src/routes/about/about.client.tsx +++ b/playground/rsc-vite/src/routes/about/about.client.tsx @@ -14,18 +14,6 @@ import { Counter } from "../../counter"; import type { action, loader } from "./about"; -// TODO: Investigate using lazy as a preload method for split route chunk modules -// export function lazy() { -// import("./about.client.tsx?route-chunk=clientLoader"); -// import("./about.client.tsx?route-chunk=clientAction"); -// return {}; -// } -// export async function clientLoader(...args) { -// return import("./about.client.tsx?route-chunk=clientLoader").then((mod) => -// mod.clientLoader(...args) -// ); -// } - export async function clientAction({ serverAction }: ClientActionFunctionArgs) { console.log("action"); let data = await serverAction(); From 856ae8c29dd4f343284d941f6f2bff746cebc1d3 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Fri, 18 Apr 2025 14:44:03 -0400 Subject: [PATCH 078/143] Wire up headers --- packages/react-router/lib/rsc/server.rsc.ts | 99 ++++++++++++------- .../lib/server-runtime/headers.ts | 33 +++---- .../react-router/lib/server-runtime/server.ts | 5 +- .../lib/server-runtime/single-fetch.ts | 10 +- .../rsc-vite/src/routes/about/about.tsx | 31 +++++- playground/rsc-vite/src/routes/root/root.tsx | 4 + 6 files changed, 123 insertions(+), 59 deletions(-) diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index d877989215..cb7f1a5ea6 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -3,6 +3,7 @@ import * as React from "react"; import type { ClientActionFunction, ClientLoaderFunction, + HeadersFunction, LinksFunction, MetaFunction, } from "../dom/ssr/routeModules"; @@ -17,6 +18,8 @@ import { isRouteErrorResponse, matchRoutes, } from "../router/utils"; +import { getDocumentHeaders } from "../server-runtime/headers"; +import type { RouteMatch } from "../context"; type ServerRouteObjectBase = { action?: ActionFunction; @@ -25,6 +28,7 @@ type ServerRouteObjectBase = { default?: React.ComponentType; ErrorBoundary?: React.ComponentType; handle?: any; + headers?: HeadersFunction; HydrateFallback?: React.ComponentType; Layout?: React.ComponentType; links?: LinksFunction; @@ -234,7 +238,10 @@ export async function matchRSCServerRequest({ const getRenderPayload = async ( isDataRequest: boolean - ): Promise => { + ): Promise<{ + headers?: Headers; + payload: ServerRenderPayload | ServerRedirectPayload; + }> => { const handler = createStaticHandler(routes); // If this is a RR submission, we just want the `actionData` but don't want @@ -257,11 +264,14 @@ export async function matchRSCServerRequest({ if (staticContext instanceof Response) { return { - type: "redirect", - location: staticContext.headers.get("Location") || "", - reload: staticContext.headers.get("x-remix-reload-document") === "true", - replace: staticContext.headers.get("x-remix-replace") === "true", - status: staticContext.status, + payload: { + type: "redirect", + location: staticContext.headers.get("Location") || "", + reload: + staticContext.headers.get("x-remix-reload-document") === "true", + replace: staticContext.headers.get("x-remix-replace") === "true", + status: staticContext.status, + }, }; } @@ -291,6 +301,11 @@ export async function matchRSCServerRequest({ } }); + let headers = getDocumentHeaders( + staticContext, + (match) => (match as RouteMatch).route.headers + ); + const payload: Omit = { type: "render", actionData: staticContext.actionData, @@ -302,9 +317,12 @@ export async function matchRSCServerRequest({ // Short circuit without matches on submissions if (isSubmission) { return { - ...payload, - matches: [], - patches: [], + headers, + payload: { + ...payload, + matches: [], + patches: [], + }, }; } @@ -390,35 +408,48 @@ export async function matchRSCServerRequest({ ); return { - ...payload, - matches: routeIdsToLoad - ? matches.filter((m) => routeIdsToLoad.includes(m.id)) - : matches, - patches: !isDataRequest - ? await getAdditionalRoutePatches( - staticContext.location.pathname, - routes, - matches.map((m) => m.id) - ) - : undefined, + headers, + payload: { + ...payload, + matches: routeIdsToLoad + ? matches.filter((m) => routeIdsToLoad.includes(m.id)) + : matches, + patches: !isDataRequest + ? await getAdditionalRoutePatches( + staticContext.location.pathname, + routes, + matches.map((m) => m.id) + ) + : undefined, + }, }; }; try { - return { - statusCode, - headers: new Headers({ - "Content-Type": "text/x-component", - Vary: "Content-Type", - }), - payload: actionResult - ? { - type: "action", - actionResult, - rerender: getRenderPayload(isDataRequest), - } - : await getRenderPayload(isDataRequest), - }; + if (actionResult !== undefined) { + return { + statusCode, + headers: new Headers({ + "Content-Type": "text/x-component", + Vary: "Content-Type", + }), + payload: { + type: "action", + actionResult, + rerender: getRenderPayload(isDataRequest).then((r) => r.payload), + }, + }; + } else { + let { headers, payload } = await getRenderPayload(isDataRequest); + headers ||= new Headers(); + headers.set("Content-Type", "text/x-component"); + headers.set("Vary", "Content-Type"); + return { + statusCode, + headers, + payload, + }; + } } catch (error) { throw error; } diff --git a/packages/react-router/lib/server-runtime/headers.ts b/packages/react-router/lib/server-runtime/headers.ts index d9b5d52231..9d2cb72df9 100644 --- a/packages/react-router/lib/server-runtime/headers.ts +++ b/packages/react-router/lib/server-runtime/headers.ts @@ -1,12 +1,12 @@ import { splitCookiesString } from "set-cookie-parser"; -import type { ServerBuild } from "./build"; import type { StaticHandlerContext } from "../router/router"; -import invariant from "./invariant"; +import type { DataRouteMatch } from "../context"; +import type { ServerRouteModule } from "../dom/ssr/routeModules"; export function getDocumentHeaders( - build: ServerBuild, - context: StaticHandlerContext + context: StaticHandlerContext, + getRouteHeadersFn: (match: DataRouteMatch) => ServerRouteModule["headers"] ): Headers { let boundaryIdx = context.errors ? context.matches.findIndex((m) => context.errors![m.route.id]) @@ -38,9 +38,6 @@ export function getDocumentHeaders( return matches.reduce((parentHeaders, match, idx) => { let { id } = match.route; - let route = build.routes[id]; - invariant(route, `Route with id "${id}" not found in build`); - let routeModule = route.module; let loaderHeaders = context.loaderHeaders[id] || new Headers(); let actionHeaders = context.actionHeaders[id] || new Headers(); @@ -56,8 +53,10 @@ export function getDocumentHeaders( errorHeaders !== loaderHeaders && errorHeaders !== actionHeaders; + let headersFn = getRouteHeadersFn(match); + // Use the parent headers for any route without a `headers` export - if (routeModule.headers == null) { + if (headersFn == null) { let headers = new Headers(parentHeaders); if (includeErrorCookies) { prependCookies(errorHeaders!, headers); @@ -68,16 +67,14 @@ export function getDocumentHeaders( } let headers = new Headers( - routeModule.headers - ? typeof routeModule.headers === "function" - ? routeModule.headers({ - loaderHeaders, - parentHeaders, - actionHeaders, - errorHeaders: includeErrorHeaders ? errorHeaders : undefined, - }) - : routeModule.headers - : undefined + typeof headersFn === "function" + ? headersFn({ + loaderHeaders, + parentHeaders, + actionHeaders, + errorHeaders: includeErrorHeaders ? errorHeaders : undefined, + }) + : headersFn ); // Automatically preserve Set-Cookie headers from bubbled responses, diff --git a/packages/react-router/lib/server-runtime/server.ts b/packages/react-router/lib/server-runtime/server.ts index 5cba00bcd4..2feaf198d9 100644 --- a/packages/react-router/lib/server-runtime/server.ts +++ b/packages/react-router/lib/server-runtime/server.ts @@ -448,7 +448,10 @@ async function handleDocumentRequest( return context; } - let headers = getDocumentHeaders(build, context); + let headers = getDocumentHeaders( + context, + (m) => build.routes[m.route.id]?.module.headers + ); // Skip response body for unsupported status codes if (SERVER_NO_BODY_STATUS_CODES.has(context.statusCode)) { diff --git a/packages/react-router/lib/server-runtime/single-fetch.ts b/packages/react-router/lib/server-runtime/single-fetch.ts index 21c2d84538..8b2ec1c73a 100644 --- a/packages/react-router/lib/server-runtime/single-fetch.ts +++ b/packages/react-router/lib/server-runtime/single-fetch.ts @@ -62,7 +62,10 @@ export async function singleFetchAction( }); function respond(context: StaticHandlerContext) { - let headers = getDocumentHeaders(build, context); + let headers = getDocumentHeaders( + context, + (m) => build.routes[m.route.id]?.module.headers + ); if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) { return generateSingleFetchResponse(request, build, serverMode, { @@ -161,7 +164,10 @@ export async function singleFetchLoaders( let loadRouteIds = routesParam ? new Set(routesParam.split(",")) : null; function respond(context: StaticHandlerContext) { - let headers = getDocumentHeaders(build, context); + let headers = getDocumentHeaders( + context, + (m) => build.routes[m.route.id]?.module.headers + ); if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) { return generateSingleFetchResponse(request, build, serverMode, { diff --git a/playground/rsc-vite/src/routes/about/about.tsx b/playground/rsc-vite/src/routes/about/about.tsx index 8a5a8911ea..6f5efddeef 100644 --- a/playground/rsc-vite/src/routes/about/about.tsx +++ b/playground/rsc-vite/src/routes/about/about.tsx @@ -1,4 +1,4 @@ -import { data } from "react-router"; +import { data } from "react-router/rsc"; export { ErrorBoundary, @@ -8,6 +8,20 @@ export { default, } from "./about.client"; +export function headers({ + parentHeaders, + loaderHeaders, +}: { + parentHeaders: Headers; + loaderHeaders: Headers; +}) { + let headers = new Headers(parentHeaders); + loaderHeaders.forEach((value, name) => { + headers.append(name, value); + }); + return headers; +} + export async function action() { // throw new Error("oops"); // throw data("This is a test error", 404); @@ -21,7 +35,16 @@ export async function loader() { // throw new Error("oops"); // throw data("This is a test error", 404); await new Promise((r) => setTimeout(r, 500)); - return { - message: `About route loader ran at ${new Date().toISOString()}`, - }; + return data( + { + message: `About route loader ran at ${new Date().toISOString()}`, + }, + { + status: 201, + headers: { + "x-root": "override", + "x-about": "yes", + }, + } + ); } diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx index efc77a5d04..e1406e0531 100644 --- a/playground/rsc-vite/src/routes/root/root.tsx +++ b/playground/rsc-vite/src/routes/root/root.tsx @@ -5,6 +5,10 @@ import { ErrorReporter, NavigationState } from "./root.client"; export { shouldRevalidate } from "./root.client"; +export function headers() { + return new Headers({ "x-root": "yes" }); +} + export async function loader() { await new Promise((r) => setTimeout(r, 500)); return { From 3b3f4b74ee1d541ec0868d5d786e2d954cce3a85 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Fri, 18 Apr 2025 15:48:10 -0400 Subject: [PATCH 079/143] Add back module export conditions --- packages/react-router/package.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 3672405e72..ebc650f88e 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -25,9 +25,14 @@ ".": { "node": { "types": "./dist/development/index.d.ts", + "module": "./dist/development/index.mjs", "module-sync": "./dist/development/index.mjs", "default": "./dist/development/index.js" }, + "module": { + "types": "./dist/development/index.d.mts", + "default": "./dist/development/index.mjs" + }, "import": { "types": "./dist/development/index.d.mts", "default": "./dist/development/index.mjs" @@ -48,9 +53,14 @@ "./dom": { "node": { "types": "./dist/development/dom-export.d.ts", + "module": "./dist/development/dom-export.mjs", "module-sync": "./dist/development/dom-export.mjs", "default": "./dist/development/dom-export.js" }, + "module": { + "types": "./dist/development/dom-export.d.mts", + "default": "./dist/development/dom-export.mjs" + }, "import": { "types": "./dist/development/dom-export.d.mts", "default": "./dist/development/dom-export.mjs" From 1a5899f7eba1e2ce334d681a71c225d52dafad14 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Fri, 18 Apr 2025 16:30:52 -0400 Subject: [PATCH 080/143] Loosen check on loaderData existence --- packages/react-router/lib/rsc/server.rsc.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index cb7f1a5ea6..65ebd853ae 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -296,7 +296,7 @@ export async function matchRSCServerRequest({ // existing logic. This can go away if we ever fork off and re-implement a // standalone RSC `dataStrategy` staticContext.matches.forEach((m) => { - if (!(m.route.id in staticContext.loaderData)) { + if (staticContext.loaderData[m.route.id] === undefined) { staticContext.loaderData[m.route.id] = null; } }); From 692ce42b6c7d1e2d7ddc43213585154fc1dfeabc Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Wed, 23 Apr 2025 16:27:23 +1000 Subject: [PATCH 081/143] Align component props --- packages/react-router/index.ts | 5 ++ packages/react-router/lib/components.tsx | 66 +++++++++++++++++++++ packages/react-router/lib/rsc/server.rsc.ts | 62 +++++++++++++++---- packages/react-router/tsup.config.rsc.ts | 2 +- 4 files changed, 123 insertions(+), 12 deletions(-) diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts index 17bc0ffd75..145d4bc965 100644 --- a/packages/react-router/index.ts +++ b/packages/react-router/index.ts @@ -290,6 +290,11 @@ export type { export { createCallServer, RSCHydratedRouter } from "./lib/rsc/browser"; export { routeRSCServerRequest, RSCStaticRouter } from "./lib/rsc/server.ssr"; export { getServerStream } from "./lib/rsc/html-stream/browser"; +export { + WithRouteComponentProps as UNSAFE_WithRouteComponentProps, + WithHydrateFallbackProps as UNSAFE_WithHydrateFallbackProps, + WithErrorBoundaryProps as UNSAFE_WithErrorBoundaryProps, +} from "./lib/components"; /////////////////////////////////////////////////////////////////////////////// // DANGER! PLEASE READ ME! diff --git a/packages/react-router/lib/components.tsx b/packages/react-router/lib/components.tsx index f0a7346e47..c58a1d1369 100644 --- a/packages/react-router/lib/components.tsx +++ b/packages/react-router/lib/components.tsx @@ -52,11 +52,16 @@ import { } from "./context"; import { _renderMatches, + useActionData, useAsyncValue, useInRouterContext, + useLoaderData, useLocation, + useMatches, useNavigate, useOutlet, + useParams, + useRouteError, useRoutes, useRoutesImpl, } from "./hooks"; @@ -1135,6 +1140,67 @@ function ResolveAwait({ return <>{toRender}; } +export type RouteComponentProps = { + loaderData: ReturnType; + actionData: ReturnType; + params: ReturnType; + matches: ReturnType; +}; + +export function WithRouteComponentProps({ + Component, +}: { + Component: React.ComponentType; +}) { + let props: RouteComponentProps = { + loaderData: useLoaderData(), + actionData: useActionData(), + params: useParams(), + matches: useMatches(), + }; + return React.createElement(Component, props); +} + +export type HydrateFallbackProps = { + loaderData: ReturnType; + actionData: ReturnType; + params: ReturnType; +}; + +export function WithHydrateFallbackProps({ + HydrateFallback, +}: { + HydrateFallback: React.ComponentType; +}) { + let props: HydrateFallbackProps = { + loaderData: useLoaderData(), + actionData: useActionData(), + params: useParams(), + }; + return React.createElement(HydrateFallback, props); +} + +export type ErrorBoundaryProps = { + loaderData: ReturnType; + actionData: ReturnType; + params: ReturnType; + error: ReturnType; +}; + +export function WithErrorBoundaryProps({ + ErrorBoundary, +}: { + ErrorBoundary: React.ComponentType; +}) { + let props: ErrorBoundaryProps = { + loaderData: useLoaderData(), + actionData: useActionData(), + params: useParams(), + error: useRouteError(), + }; + return React.createElement(ErrorBoundary, props); +} + /////////////////////////////////////////////////////////////////////////////// // UTILS /////////////////////////////////////////////////////////////////////////////// diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index 65ebd853ae..bd94537a21 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -17,9 +17,20 @@ import { type ShouldRevalidateFunction, isRouteErrorResponse, matchRoutes, + convertRouteMatchToUiMatch, } from "../router/utils"; import { getDocumentHeaders } from "../server-runtime/headers"; import type { RouteMatch } from "../context"; +import type { + RouteComponentProps, + HydrateFallbackProps, + ErrorBoundaryProps, +} from "../components"; +import { + UNSAFE_WithRouteComponentProps as WithRouteComponentProps, + UNSAFE_WithHydrateFallbackProps as WithHydrateFallbackProps, + UNSAFE_WithErrorBoundaryProps as WithErrorBoundaryProps, +} from "react-router"; type ServerRouteObjectBase = { action?: ActionFunction; @@ -344,35 +355,64 @@ export async function matchRSCServerRequest({ const Component = (match.route as any).default; const ErrorBoundary = (match.route as any).ErrorBoundary; const HydrateFallback = (match.route as any).HydrateFallback; + const loaderData = staticContext.loaderData[match.route.id]; + const actionData = staticContext.actionData?.[match.route.id]; + const params = match.params; // TODO: DRY this up once it's fully fleshed out - // TODO: Align this with the fields passed in with-props.tsx const element = Component ? staticContext.errors?.[match.route.id] ? (false as const) : React.createElement( Layout, null, - React.createElement(Component, { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }) + typeof Component === "function" + ? React.createElement(Component, { + loaderData, + actionData, + params, + matches: staticContext.matches.map((match) => + convertRouteMatchToUiMatch( + match, + staticContext.loaderData + ) + ), + } satisfies RouteComponentProps) + : React.createElement(WithRouteComponentProps, { + Component, + }) ) : undefined; const errorElement = ErrorBoundary ? React.createElement( Layout, null, - React.createElement(ErrorBoundary) + typeof ErrorBoundary === "function" + ? React.createElement(ErrorBoundary, { + loaderData, + actionData, + params, + error: [...staticContext.matches] + .reverse() + .find((match) => staticContext.errors?.[match.route.id]), + } satisfies ErrorBoundaryProps) + : React.createElement(WithErrorBoundaryProps, { + ErrorBoundary, + }) ) : undefined; const hydrateFallbackElement = HydrateFallback ? React.createElement( Layout, null, - React.createElement(HydrateFallback, { - loaderData: staticContext.loaderData[match.route.id], - actionData: staticContext.actionData?.[match.route.id], - }) + typeof HydrateFallback === "function" + ? React.createElement(HydrateFallback, { + loaderData, + actionData, + params, + } satisfies HydrateFallbackProps) + : React.createElement(WithHydrateFallbackProps, { + HydrateFallback, + }) ) : match.route.id === "root" ? // FIXME: This should use the `RemixRootDefaultErrorBoundary` but that @@ -395,7 +435,7 @@ export async function matchRSCServerRequest({ index: match.route.index, links: (match.route as any).links, meta: (match.route as any).meta, - params: match.params, + params, parentId: lastMatch?.route.id, path: match.route.path, pathname: match.pathname, diff --git a/packages/react-router/tsup.config.rsc.ts b/packages/react-router/tsup.config.rsc.ts index 7ff7f1f606..efbca173c2 100644 --- a/packages/react-router/tsup.config.rsc.ts +++ b/packages/react-router/tsup.config.rsc.ts @@ -6,7 +6,7 @@ import { createBanner } from "../../build.utils.js"; import pkg from "./package.json"; const entry = ["rsc-export.ts"]; -const external = ["react-router/client"]; +const external = ["react-router"]; const config = (enableDevWarnings: boolean) => defineConfig([ From 54021f573ca229d3b5d314b12213a08ad499dc80 Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Thu, 24 Apr 2025 14:01:30 +1000 Subject: [PATCH 082/143] Fix client component check, refactor --- packages/react-router/lib/components.tsx | 18 +++++------ packages/react-router/lib/rsc/server.rsc.ts | 36 ++++++++++++--------- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/packages/react-router/lib/components.tsx b/packages/react-router/lib/components.tsx index c58a1d1369..d0b0657384 100644 --- a/packages/react-router/lib/components.tsx +++ b/packages/react-router/lib/components.tsx @@ -1148,9 +1148,9 @@ export type RouteComponentProps = { }; export function WithRouteComponentProps({ - Component, + children, }: { - Component: React.ComponentType; + children: React.ReactElement; }) { let props: RouteComponentProps = { loaderData: useLoaderData(), @@ -1158,7 +1158,7 @@ export function WithRouteComponentProps({ params: useParams(), matches: useMatches(), }; - return React.createElement(Component, props); + return React.cloneElement(children, props); } export type HydrateFallbackProps = { @@ -1168,16 +1168,16 @@ export type HydrateFallbackProps = { }; export function WithHydrateFallbackProps({ - HydrateFallback, + children, }: { - HydrateFallback: React.ComponentType; + children: React.ReactElement; }) { let props: HydrateFallbackProps = { loaderData: useLoaderData(), actionData: useActionData(), params: useParams(), }; - return React.createElement(HydrateFallback, props); + return React.cloneElement(children, props); } export type ErrorBoundaryProps = { @@ -1188,9 +1188,9 @@ export type ErrorBoundaryProps = { }; export function WithErrorBoundaryProps({ - ErrorBoundary, + children, }: { - ErrorBoundary: React.ComponentType; + children: React.ReactElement; }) { let props: ErrorBoundaryProps = { loaderData: useLoaderData(), @@ -1198,7 +1198,7 @@ export function WithErrorBoundaryProps({ params: useParams(), error: useRouteError(), }; - return React.createElement(ErrorBoundary, props); + return React.cloneElement(children, props); } /////////////////////////////////////////////////////////////////////////////// diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index bd94537a21..acc88789dc 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -365,8 +365,13 @@ export async function matchRSCServerRequest({ : React.createElement( Layout, null, - typeof Component === "function" - ? React.createElement(Component, { + Component.$$typeof === Symbol.for("react.client.reference") + ? React.createElement( + WithRouteComponentProps, + null, + React.createElement(Component) + ) + : React.createElement(Component, { loaderData, actionData, params, @@ -377,17 +382,19 @@ export async function matchRSCServerRequest({ ) ), } satisfies RouteComponentProps) - : React.createElement(WithRouteComponentProps, { - Component, - }) ) : undefined; const errorElement = ErrorBoundary ? React.createElement( Layout, null, - typeof ErrorBoundary === "function" - ? React.createElement(ErrorBoundary, { + Component.$$typeof === Symbol.for("react.client.reference") + ? React.createElement( + WithErrorBoundaryProps, + null, + React.createElement(ErrorBoundary) + ) + : React.createElement(ErrorBoundary, { loaderData, actionData, params, @@ -395,24 +402,23 @@ export async function matchRSCServerRequest({ .reverse() .find((match) => staticContext.errors?.[match.route.id]), } satisfies ErrorBoundaryProps) - : React.createElement(WithErrorBoundaryProps, { - ErrorBoundary, - }) ) : undefined; const hydrateFallbackElement = HydrateFallback ? React.createElement( Layout, null, - typeof HydrateFallback === "function" - ? React.createElement(HydrateFallback, { + Component.$$typeof === Symbol.for("react.client.reference") + ? React.createElement( + WithHydrateFallbackProps, + null, + React.createElement(HydrateFallback) + ) + : React.createElement(HydrateFallback, { loaderData, actionData, params, } satisfies HydrateFallbackProps) - : React.createElement(WithHydrateFallbackProps, { - HydrateFallback, - }) ) : match.route.id === "root" ? // FIXME: This should use the `RemixRootDefaultErrorBoundary` but that From afafbf6b213d2d5d82791dd240d24c42814e41b7 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Tue, 6 May 2025 08:10:28 +0700 Subject: [PATCH 083/143] fix: better flush assets as they are discovered for a flatter network. (#13467) --- packages/react-router/lib/rsc/server.ssr.tsx | 44 +++++++++++++------- packages/react-router/tsup.config.rsc.ts | 5 +-- packages/react-router/tsup.config.ts | 5 +-- playground/rsc-vite/src/ssr/entry.ssr.tsx | 4 +- 4 files changed, 36 insertions(+), 22 deletions(-) diff --git a/packages/react-router/lib/rsc/server.ssr.tsx b/packages/react-router/lib/rsc/server.ssr.tsx index a4b2a7df01..6465f9d2d5 100644 --- a/packages/react-router/lib/rsc/server.ssr.tsx +++ b/packages/react-router/lib/rsc/server.ssr.tsx @@ -11,7 +11,7 @@ export async function routeRSCServerRequest( requestServer: (request: Request) => Promise, decode: (body: ReadableStream) => Promise, renderHTML: ( - payload: ServerPayload + getPayload: () => Promise ) => ReadableStream | Promise> ) { const url = new URL(request.url); @@ -51,20 +51,17 @@ export async function routeRSCServerRequest( throw new Error("Failed to clone server response"); } - const payload = (await decode(serverResponse.body)) as ServerPayload; - - if (payload.type === "redirect") { - return new Response(null, { - status: payload.status, - headers: { - Location: payload.location, - }, - }); - } - - const html = await renderHTML(payload); + const body = serverResponse.body; + let payloadPromise: Promise; + const getPayload = async () => { + if (payloadPromise) return payloadPromise; + payloadPromise = decode(body); + return payloadPromise; + }; try { + const html = await renderHTML(getPayload); + const body = html.pipeThrough(injectRSCPayload(serverResponseB.body)); const headers = new Headers(serverResponse.headers); @@ -75,6 +72,9 @@ export async function routeRSCServerRequest( headers, }); } catch (reason) { + if (reason instanceof Response) { + return reason; + } throw reason; // TODO: Track deepest rendered boundary and re-try // Figure out how / if we need to transport the error, @@ -83,7 +83,23 @@ export async function routeRSCServerRequest( } } -export function RSCStaticRouter({ payload }: { payload: ServerPayload }) { +export function RSCStaticRouter({ + getPayload, +}: { + getPayload: () => Promise; +}) { + // @ts-expect-error - need to update the React types + const payload = React.use(getPayload()) as ServerPayload; + + if (payload.type === "redirect") { + throw new Response(null, { + status: payload.status, + headers: { + Location: payload.location, + }, + }); + } + if (payload.type !== "render") return null; const context = { diff --git a/packages/react-router/tsup.config.rsc.ts b/packages/react-router/tsup.config.rsc.ts index efbca173c2..de39df1cd1 100644 --- a/packages/react-router/tsup.config.rsc.ts +++ b/packages/react-router/tsup.config.rsc.ts @@ -1,4 +1,4 @@ -import { defineConfig } from "tsup"; +import { defineConfig, type Options } from "tsup"; // @ts-ignore - out of scope import { createBanner } from "../../build.utils.js"; @@ -43,10 +43,9 @@ const config = (enableDevWarnings: boolean) => }, treeshake: true, }, - ]); + ]) as Options[]; export default defineConfig([ - // @ts-expect-error ...config(false), ...config(true), ]); diff --git a/packages/react-router/tsup.config.ts b/packages/react-router/tsup.config.ts index 5d93e3e81b..d1ff5c1549 100644 --- a/packages/react-router/tsup.config.ts +++ b/packages/react-router/tsup.config.ts @@ -1,4 +1,4 @@ -import { defineConfig } from "tsup"; +import { defineConfig, type Options } from "tsup"; // @ts-ignore - out of scope import { createBanner } from "../../build.utils.js"; @@ -38,10 +38,9 @@ const config = (enableDevWarnings: boolean) => __DEV__: JSON.stringify(enableDevWarnings), }, }, - ]); + ]) as Options[]; export default defineConfig([ - // @ts-expect-error ...config(false), ...config(true), ]); diff --git a/playground/rsc-vite/src/ssr/entry.ssr.tsx b/playground/rsc-vite/src/ssr/entry.ssr.tsx index 7e2d2e2255..edc4c8e8cc 100644 --- a/playground/rsc-vite/src/ssr/entry.ssr.tsx +++ b/playground/rsc-vite/src/ssr/entry.ssr.tsx @@ -22,9 +22,9 @@ export default { request, callServer, (body) => RSD.createFromReadableStream(body, manifest), - async (payload) => { + async (getPayload) => { return await RDS.renderToReadableStream( - , + , { bootstrapModules, signal: request.signal, From a490e56e0aa58361ec8196775f803c7959832238 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Tue, 6 May 2025 15:10:13 -0400 Subject: [PATCH 084/143] Fix singleFetchUrl parameter --- packages/react-router/lib/dom/ssr/components.tsx | 2 +- packages/react-router/lib/dom/ssr/single-fetch.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-router/lib/dom/ssr/components.tsx b/packages/react-router/lib/dom/ssr/components.tsx index eff5b578ff..69b0aa5e22 100644 --- a/packages/react-router/lib/dom/ssr/components.tsx +++ b/packages/react-router/lib/dom/ssr/components.tsx @@ -388,7 +388,7 @@ function PrefetchPageLinksImpl({ return []; } - let url = singleFetchUrl(page, basename, ".data"); + let url = singleFetchUrl(page, basename, "data"); // When one or more routes have opted out, we add a _routes param to // limit the loaders to those that have a server loader and did not // opt out diff --git a/packages/react-router/lib/dom/ssr/single-fetch.tsx b/packages/react-router/lib/dom/ssr/single-fetch.tsx index 04256f1818..13d453b5b1 100644 --- a/packages/react-router/lib/dom/ssr/single-fetch.tsx +++ b/packages/react-router/lib/dom/ssr/single-fetch.tsx @@ -490,7 +490,7 @@ export function stripIndexParam(url: URL) { export function singleFetchUrl( reqUrl: URL | string, basename: string | undefined, - extension: string + extension: "data" | "rsc" ) { let url = typeof reqUrl === "string" From e988dc6020d7453c2eea852436a53c7be4a6d7d6 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Fri, 25 Apr 2025 15:32:47 -0400 Subject: [PATCH 085/143] RSC middleware --- packages/react-router/lib/router/router.ts | 30 +- packages/react-router/lib/rsc/server.rsc.ts | 503 +++++++++++-------- packages/react-router/rsc-export.ts | 25 + playground/rsc-parcel/src/entry.rsc.ts | 20 +- playground/rsc-vite/src/routes/root/root.tsx | 9 + playground/rsc-vite/src/rsc/entry.rsc.tsx | 20 +- 6 files changed, 361 insertions(+), 246 deletions(-) diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts index ddcb7f4712..79e5e49fa9 100644 --- a/packages/react-router/lib/router/router.ts +++ b/packages/react-router/lib/router/router.ts @@ -5378,11 +5378,31 @@ export async function runMiddlewarePipeline( handlerResult: undefined, }; try { - let tuples = matches.flatMap((m) => - m.route.unstable_middleware - ? m.route.unstable_middleware.map((fn) => [m.route.id, fn]) - : [] - ) as [string, unstable_MiddlewareFunction][]; + // This causes a runtime error in parcel :/ + // @parcel/reporter-dev-server: TypeError: 'get' on proxy: property 'prototype' is a read-only and non-configurable data property on the proxy target but the proxy did not + // return its actual value (expected '[object Array]' but got '[object Array]') + // @parcel/reporter-dev-server: at Proxy.map () + // @parcel/reporter-dev-server: at Object.apply + // (.../node_modules/.pnpm/@parcel+runtime-rsc@2.14.4_@parcel+core@2.14.4_@swc+helpers@0.5.15_/node_modules/@parcel/runtime-rsc/rsc-helpers.jsx:62:30) + // @parcel/reporter-dev-server: at + // (.../node_modules/.pnpm/react-router@0.0.0-experimental-e56aa53bc_react-dom@19.1.0_react@19.1.0__react@19.1.0/node_modules/react-router/dist/development/rsc-export.mjs:1434:72) + // @parcel/reporter-dev-server: at Array.flatMap () + + // let tuples = matches.flatMap((m) => + // m.route.unstable_middleware + // ? m.route.unstable_middleware.map((fn) => [m.route.id, fn]) + // : [] + // ) as [string, unstable_MiddlewareFunction][]; + + let tuples: [string, unstable_MiddlewareFunction][] = []; + for (let m of matches) { + if (m.route.unstable_middleware) { + for (let fn of m.route.unstable_middleware) { + let tuple: [string, unstable_MiddlewareFunction] = [m.route.id, fn]; + tuples.push(tuple); + } + } + } let result = await callRouteMiddleware( { request, params, context }, tuples, diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index acc88789dc..b0aa03e191 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -7,8 +7,14 @@ import type { LinksFunction, MetaFunction, } from "../dom/ssr/routeModules"; -import type { Location } from "../router/history"; -import { createStaticHandler, isMutationMethod } from "../router/router"; +import { type Location } from "../router/history"; +import { + type StaticHandler, + createStaticHandler, + isMutationMethod, + isResponse, + isRedirectResponse, +} from "../router/router"; import { type ActionFunction, type AgnosticDataRouteMatch, @@ -153,14 +159,19 @@ export async function matchRSCServerRequest({ onError, request, routes, + generateResponse, }: { decodeCallServer?: DecodeCallServerFunction; decodeFormAction?: DecodeFormActionFunction; onError?: (error: unknown) => void; request: Request; routes: ServerRouteObject[]; -}): Promise { + generateResponse: (match: ServerMatch) => Response; +}): Promise { const url = new URL(request.url); + // TODO: Can this be done with a pathname extension instead of a header? + // If not, make sure we strip this at the SSR server and it can only be set + // by us to avoid cache-poisoning attempts let isDataRequest = request.headers.has("X-React-Router-Data-Request"); if (isManifestRequest(url)) { @@ -169,7 +180,7 @@ export async function matchRSCServerRequest({ url.pathname.replace(/\.manifest$/, "") ); - return { + return generateResponse({ statusCode: 200, headers: new Headers({ "Content-Type": "text/x-component", @@ -186,8 +197,8 @@ export async function matchRSCServerRequest({ routes, matches?.map((m) => m.route.id) ?? [] ), - } satisfies ServerManifestPayload, - }; + }, + }); } let statusCode = 200; @@ -248,13 +259,9 @@ export async function matchRSCServerRequest({ } const getRenderPayload = async ( - isDataRequest: boolean - ): Promise<{ - headers?: Headers; - payload: ServerRenderPayload | ServerRedirectPayload; - }> => { - const handler = createStaticHandler(routes); - + isDataRequest: boolean, + actionResult?: Promise + ): Promise => { // If this is a RR submission, we just want the `actionData` but don't want // to call any loaders or render any components back in the response - that // will happen in the subsequent revalidation request @@ -265,236 +272,284 @@ export async function matchRSCServerRequest({ ? searchParams.get("_routes")!.split(",") : null; - const staticContext = await handler.query(request, { - skipLoaderErrorBubbling: true, - skipRevalidation: isSubmission, - ...(routeIdsToLoad - ? { filterMatchesToLoad: (m) => routeIdsToLoad!.includes(m.route.id) } - : null), - }); - - if (staticContext instanceof Response) { - return { - payload: { - type: "redirect", - location: staticContext.headers.get("Location") || "", - reload: - staticContext.headers.get("x-remix-reload-document") === "true", - replace: staticContext.headers.get("x-remix-replace") === "true", - status: staticContext.status, - }, - }; - } - - statusCode = staticContext.statusCode ?? statusCode; - - const errors = staticContext.errors - ? Object.fromEntries( - Object.entries(staticContext.errors).map(([key, error]) => [ - key, - isRouteErrorResponse(error) - ? Object.fromEntries(Object.entries(error)) - : error, - ]) - ) - : staticContext.errors; - - // In the RSC world we set `hasLoader:true` eve if a route doesn't have a - // loader so that we always make the single fetch call to get the rendered - // `element`. We add a `null`value for any of the routes that don't - // actually have a loader so the single fetch logic can find a result for - // the route. This is a bit of a hack but allows us to re-use all the - // existing logic. This can go away if we ever fork off and re-implement a - // standalone RSC `dataStrategy` - staticContext.matches.forEach((m) => { - if (staticContext.loaderData[m.route.id] === undefined) { - staticContext.loaderData[m.route.id] = null; + const respond: ( + ctx: Awaited> + ) => Promise = async (staticContext) => { + if (staticContext instanceof Response) { + return generateResponse({ + statusCode, + headers: new Headers({ + "Content-Type": "text/x-component", + Vary: "Content-Type", + }), + payload: { + type: "redirect", + location: staticContext.headers.get("Location") || "", + reload: + staticContext.headers.get("x-remix-reload-document") === "true", + replace: staticContext.headers.get("x-remix-replace") === "true", + status: staticContext.status, + }, + }); } - }); - let headers = getDocumentHeaders( - staticContext, - (match) => (match as RouteMatch).route.headers - ); + statusCode = staticContext.statusCode ?? statusCode; + + const errors = staticContext.errors + ? Object.fromEntries( + Object.entries(staticContext.errors).map(([key, error]) => [ + key, + isRouteErrorResponse(error) + ? Object.fromEntries(Object.entries(error)) + : error, + ]) + ) + : staticContext.errors; + + // In the RSC world we set `hasLoader:true` eve if a route doesn't have a + // loader so that we always make the single fetch call to get the rendered + // `element`. We add a `null`value for any of the routes that don't + // actually have a loader so the single fetch logic can find a result for + // the route. This is a bit of a hack but allows us to re-use all the + // existing logic. This can go away if we ever fork off and re-implement a + // standalone RSC `dataStrategy` + staticContext.matches.forEach((m) => { + if (staticContext.loaderData[m.route.id] === undefined) { + staticContext.loaderData[m.route.id] = null; + } + }); - const payload: Omit = { - type: "render", - actionData: staticContext.actionData, - errors, - loaderData: staticContext.loaderData, - location: staticContext.location, - }; + let headers = getDocumentHeaders( + staticContext, + (match) => + (match as RouteMatch).route.headers + ); - // Short circuit without matches on submissions - if (isSubmission) { - return { - headers, - payload: { - ...payload, - matches: [], - patches: [], - }, + const payload: Omit = { + type: "render", + actionData: staticContext.actionData, + errors, + loaderData: staticContext.loaderData, + location: staticContext.location, }; - } - let lastMatch: AgnosticDataRouteMatch | null = null; - let matches = await Promise.all( - staticContext.matches.map(async (match) => { - if ("lazy" in match.route && match.route.lazy) { - Object.assign(match.route, { - // @ts-expect-error - FIXME: Fix the types here - ...((await match.route.lazy()) as any), - path: match.route.path, - index: (match.route as any).index, - id: match.route.id, - }); - match.route.lazy = undefined; - } + // Short circuit without matches on submissions + if (isSubmission) { + return generateResponse({ + statusCode, + headers, + payload: { + ...payload, + matches: [], + patches: [], + }, + }); + } - const Layout = (match.route as any).Layout || React.Fragment; - const Component = (match.route as any).default; - const ErrorBoundary = (match.route as any).ErrorBoundary; - const HydrateFallback = (match.route as any).HydrateFallback; - const loaderData = staticContext.loaderData[match.route.id]; - const actionData = staticContext.actionData?.[match.route.id]; - const params = match.params; - // TODO: DRY this up once it's fully fleshed out - const element = Component - ? staticContext.errors?.[match.route.id] - ? (false as const) - : React.createElement( + let lastMatch: AgnosticDataRouteMatch | null = null; + let matchesPromise = Promise.all( + staticContext.matches.map(async (match) => { + if ("lazy" in match.route && match.route.lazy) { + Object.assign(match.route, { + // @ts-expect-error - FIXME: Fix the types here + ...((await match.route.lazy()) as any), + path: match.route.path, + index: (match.route as any).index, + id: match.route.id, + }); + match.route.lazy = undefined; + } + + const Layout = (match.route as any).Layout || React.Fragment; + const Component = (match.route as any).default; + const ErrorBoundary = (match.route as any).ErrorBoundary; + const HydrateFallback = (match.route as any).HydrateFallback; + const loaderData = staticContext.loaderData[match.route.id]; + const actionData = staticContext.actionData?.[match.route.id]; + const params = match.params; + // TODO: DRY this up once it's fully fleshed out + const element = Component + ? staticContext.errors?.[match.route.id] + ? (false as const) + : React.createElement( + Layout, + null, + Component.$$typeof === Symbol.for("react.client.reference") + ? React.createElement( + WithRouteComponentProps, + null, + React.createElement(Component) + ) + : React.createElement(Component, { + loaderData, + actionData, + params, + matches: staticContext.matches.map((match) => + convertRouteMatchToUiMatch( + match, + staticContext.loaderData + ) + ), + } satisfies RouteComponentProps) + ) + : undefined; + const errorElement = ErrorBoundary + ? React.createElement( Layout, null, Component.$$typeof === Symbol.for("react.client.reference") ? React.createElement( - WithRouteComponentProps, + WithErrorBoundaryProps, null, - React.createElement(Component) + React.createElement(ErrorBoundary) ) - : React.createElement(Component, { + : React.createElement(ErrorBoundary, { loaderData, actionData, params, - matches: staticContext.matches.map((match) => - convertRouteMatchToUiMatch( - match, - staticContext.loaderData - ) - ), - } satisfies RouteComponentProps) + error: [...staticContext.matches] + .reverse() + .find( + (match) => staticContext.errors?.[match.route.id] + ), + } satisfies ErrorBoundaryProps) ) - : undefined; - const errorElement = ErrorBoundary - ? React.createElement( - Layout, - null, - Component.$$typeof === Symbol.for("react.client.reference") - ? React.createElement( - WithErrorBoundaryProps, - null, - React.createElement(ErrorBoundary) - ) - : React.createElement(ErrorBoundary, { - loaderData, - actionData, - params, - error: [...staticContext.matches] - .reverse() - .find((match) => staticContext.errors?.[match.route.id]), - } satisfies ErrorBoundaryProps) - ) - : undefined; - const hydrateFallbackElement = HydrateFallback - ? React.createElement( - Layout, - null, - Component.$$typeof === Symbol.for("react.client.reference") - ? React.createElement( - WithHydrateFallbackProps, - null, - React.createElement(HydrateFallback) - ) - : React.createElement(HydrateFallback, { - loaderData, - actionData, - params, - } satisfies HydrateFallbackProps) - ) - : match.route.id === "root" - ? // FIXME: This should use the `RemixRootDefaultErrorBoundary` but that - // currently uses a hook internally so it fails during RSC. Restructure - // so it can be used safely in an RSC render pass. - React.createElement("p", null, "Loading!") - : undefined; - - let result = { - clientAction: (match.route as any).clientAction, - clientLoader: (match.route as any).clientLoader, - element, - errorElement, - handle: (match.route as any).handle, - hasAction: !!match.route.action, - hasErrorBoundary: !!(match.route as any).ErrorBoundary, - hasLoader: !!match.route.loader, - hydrateFallbackElement, - id: match.route.id, - index: match.route.index, - links: (match.route as any).links, - meta: (match.route as any).meta, - params, - parentId: lastMatch?.route.id, - path: match.route.path, - pathname: match.pathname, - pathnameBase: match.pathnameBase, - shouldRevalidate: (match.route as any).shouldRevalidate, + : undefined; + const hydrateFallbackElement = HydrateFallback + ? React.createElement( + Layout, + null, + Component.$$typeof === Symbol.for("react.client.reference") + ? React.createElement( + WithHydrateFallbackProps, + null, + React.createElement(HydrateFallback) + ) + : React.createElement(HydrateFallback, { + loaderData, + actionData, + params, + } satisfies HydrateFallbackProps) + ) + : match.route.id === "root" + ? // FIXME: This should use the `RemixRootDefaultErrorBoundary` but that + // currently uses a hook internally so it fails during RSC. Restructure + // so it can be used safely in an RSC render pass. + React.createElement("p", null, "Loading!") + : undefined; + + let result = { + clientAction: (match.route as any).clientAction, + clientLoader: (match.route as any).clientLoader, + element, + errorElement, + handle: (match.route as any).handle, + hasAction: !!match.route.action, + hasErrorBoundary: !!(match.route as any).ErrorBoundary, + hasLoader: !!match.route.loader, + hydrateFallbackElement, + id: match.route.id, + index: match.route.index, + links: (match.route as any).links, + meta: (match.route as any).meta, + params, + parentId: lastMatch?.route.id, + path: match.route.path, + pathname: match.pathname, + pathnameBase: match.pathnameBase, + shouldRevalidate: (match.route as any).shouldRevalidate, + }; + lastMatch = match; + return result; + }) + ); + + const getPayload = async () => { + const matches = await matchesPromise; + return { + ...payload, + matches: routeIdsToLoad + ? matches.filter((m) => routeIdsToLoad.includes(m.id)) + : matches, + patches: !isDataRequest + ? await getAdditionalRoutePatches( + staticContext.location.pathname, + routes, + matches.map((m) => m.id) + ) + : undefined, }; - lastMatch = match; - return result; - }) - ); + }; - return { - headers, - payload: { - ...payload, - matches: routeIdsToLoad - ? matches.filter((m) => routeIdsToLoad.includes(m.id)) - : matches, - patches: !isDataRequest - ? await getAdditionalRoutePatches( - staticContext.location.pathname, - routes, - matches.map((m) => m.id) - ) - : undefined, - }, + if (actionResult) { + return generateResponse({ + statusCode, + headers, + payload: { + type: "action", + actionResult, + rerender: getPayload(), + }, + }); + } else { + return generateResponse({ + statusCode, + headers, + payload: await getPayload(), + }); + } }; - }; - try { - if (actionResult !== undefined) { - return { + // Explode lazy functions out the routes so we can use middleware + // TODO: This isn't ideal but we can't do it through `lazy()` in the router, + // and if we move to `lazy: {}` then we lose all the other things from the + // `ServerRouteObject` like `Layout` etc. + let matches = matchRoutes(routes, url.pathname); + if (matches) { + await Promise.all(matches.map((m) => explodeLazyRoute(m.route))); + } + + // Create the handler here with exploded routes + const handler = createStaticHandler(routes); + + const result = await handler.query(request, { + skipLoaderErrorBubbling: true, + skipRevalidation: isSubmission, + ...(routeIdsToLoad + ? { filterMatchesToLoad: (m) => routeIdsToLoad!.includes(m.route.id) } + : null), + unstable_respond: respond, + }); + if (isRedirectResponse(result)) { + return generateResponse({ statusCode, headers: new Headers({ "Content-Type": "text/x-component", Vary: "Content-Type", }), payload: { - type: "action", - actionResult, - rerender: getRenderPayload(isDataRequest).then((r) => r.payload), + type: "redirect", + location: result.headers.get("Location") || "", + reload: result.headers.get("x-remix-reload-document") === "true", + replace: result.headers.get("x-remix-replace") === "true", + status: result.status, }, - }; + }); + } + // while middleware is still unstable, we don't run the middleware pipeline + // if no routes have middleware, so we still might need to convert context + // to a response here + return isResponse(result) ? result : respond(result); + }; + + try { + if (actionResult) { + let res = await getRenderPayload(isDataRequest, actionResult); + return res; } else { - let { headers, payload } = await getRenderPayload(isDataRequest); - headers ||= new Headers(); - headers.set("Content-Type", "text/x-component"); - headers.set("Vary", "Content-Type"); - return { - statusCode, - headers, - payload, - }; + let res = await getRenderPayload(isDataRequest); + + return res; } } catch (error) { throw error; @@ -505,15 +560,7 @@ async function getRoute( route: ServerRouteObject, parentId: string | undefined ): Promise { - if ("lazy" in route && route.lazy) { - Object.assign(route, { - ...((await route.lazy()) as any), - path: route.path, - index: (route as any).index, - id: route.id, - }); - route.lazy = undefined; - } + await explodeLazyRoute(route); const Layout = (route as any).Layout || React.Fragment; // We send errorElement early in the manifest so we have it client @@ -543,6 +590,16 @@ async function getRoute( }; } +async function explodeLazyRoute(route: ServerRouteObject) { + if ("lazy" in route && route.lazy) { + let impl = (await route.lazy()) as any; + for (let [k, v] of Object.entries(impl)) { + route[k as keyof ServerRouteObject] = v; + } + route.lazy = undefined; + } +} + async function getAdditionalRoutePatches( pathname: string, routes: ServerRouteObject[], diff --git a/packages/react-router/rsc-export.ts b/packages/react-router/rsc-export.ts index 61d5ec18b1..5c2510b695 100644 --- a/packages/react-router/rsc-export.ts +++ b/packages/react-router/rsc-export.ts @@ -7,6 +7,31 @@ export { replace, } from "./lib/router/utils"; +export type { + Cookie, + CookieOptions, + CookieParseOptions, + CookieSerializeOptions, + CookieSignatureOptions, + IsCookieFunction, +} from "./lib/server-runtime/cookies"; +export { createCookie, isCookie } from "./lib/server-runtime/cookies"; +export type { + IsSessionFunction, + Session, + SessionData, + SessionIdStorageStrategy, + SessionStorage, + FlashSessionData, +} from "./lib/server-runtime/sessions"; +export { + createSession, + createSessionStorage, + isSession, +} from "./lib/server-runtime/sessions"; +export { createCookieSessionStorage } from "./lib/server-runtime/sessions/cookieStorage"; +export { createMemorySessionStorage } from "./lib/server-runtime/sessions/memoryStorage"; + export type { DecodeCallServerFunction, DecodeFormActionFunction, diff --git a/playground/rsc-parcel/src/entry.rsc.ts b/playground/rsc-parcel/src/entry.rsc.ts index 19cbb51354..12982499cc 100644 --- a/playground/rsc-parcel/src/entry.rsc.ts +++ b/playground/rsc-parcel/src/entry.rsc.ts @@ -8,17 +8,19 @@ import { renderToReadableStream } from "react-server-dom-parcel/server.edge"; import { routes } from "./routes"; -export async function callServer(request: Request) { - const match = await matchRSCServerRequest({ +export function callServer(request: Request) { + return matchRSCServerRequest({ request, routes, - }); - if (match instanceof Response) { - return match; - } + generateResponse(match) { + if (match instanceof Response) { + return match; + } - return new Response(renderToReadableStream(match.payload), { - status: match.statusCode, - headers: match.headers, + return new Response(renderToReadableStream(match.payload), { + status: match.statusCode, + headers: match.headers, + }); + }, }); } diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx index e1406e0531..9c6fb96a30 100644 --- a/playground/rsc-vite/src/routes/root/root.tsx +++ b/playground/rsc-vite/src/routes/root/root.tsx @@ -9,6 +9,15 @@ export function headers() { return new Headers({ "x-root": "yes" }); } +export const unstable_middleware = [ + async ({ request, context }, next) => { + console.log("start middleware on RSC server"); + let res = await next(); + console.log("end middleware on RSC server"); + return res; + }, +]; + export async function loader() { await new Promise((r) => setTimeout(r, 500)); return { diff --git a/playground/rsc-vite/src/rsc/entry.rsc.tsx b/playground/rsc-vite/src/rsc/entry.rsc.tsx index 6c7c11acfb..542f65ac02 100644 --- a/playground/rsc-vite/src/rsc/entry.rsc.tsx +++ b/playground/rsc-vite/src/rsc/entry.rsc.tsx @@ -20,19 +20,21 @@ const decodeCallServer: DecodeCallServerFunction = async (actionId, reply) => { }; export default { - async fetch(request, env) { - const match = await matchRSCServerRequest({ + fetch(request, env) { + return matchRSCServerRequest({ decodeCallServer, request, routes, - }); - if (match instanceof Response) { - return match; - } + generateResponse(match) { + if (match instanceof Response) { + return match; + } - return new Response(renderToReadableStream(match.payload), { - status: match.statusCode, - headers: match.headers, + return new Response(renderToReadableStream(match.payload), { + status: match.statusCode, + headers: match.headers, + }); + }, }); }, } satisfies ExportedHandler; From 1fb0df7f3cc2f89be99af434a224a98d29b1274d Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Fri, 9 May 2025 16:09:55 -0400 Subject: [PATCH 086/143] RSC Server Code Cleanup (#13577) --- packages/react-router/lib/rsc/server.rsc.ts | 685 +++++++++++--------- 1 file changed, 363 insertions(+), 322 deletions(-) diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index b0aa03e191..774125975c 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -9,11 +9,11 @@ import type { } from "../dom/ssr/routeModules"; import { type Location } from "../router/history"; import { - type StaticHandler, createStaticHandler, isMutationMethod, isResponse, isRedirectResponse, + type StaticHandlerContext, } from "../router/router"; import { type ActionFunction, @@ -169,40 +169,86 @@ export async function matchRSCServerRequest({ generateResponse: (match: ServerMatch) => Response; }): Promise { const url = new URL(request.url); - // TODO: Can this be done with a pathname extension instead of a header? - // If not, make sure we strip this at the SSR server and it can only be set - // by us to avoid cache-poisoning attempts - let isDataRequest = request.headers.has("X-React-Router-Data-Request"); if (isManifestRequest(url)) { - const matches = matchRoutes( + let response = await generateManifestResponse( routes, - url.pathname.replace(/\.manifest$/, "") + request, + generateResponse ); - - return generateResponse({ - statusCode: 200, - headers: new Headers({ - "Content-Type": "text/x-component", - Vary: "Content-Type", - }), - payload: { - type: "manifest", - matches: await Promise.all( - matches?.map((m, i) => getRoute(m.route, matches[i - 1]?.route.id)) ?? - [] - ), - patches: await getAdditionalRoutePatches( - url.pathname, - routes, - matches?.map((m) => m.route.id) ?? [] - ), - }, - }); + return response; } - let statusCode = 200; let actionResult: Promise | undefined; + if (request.headers.get("rsc-action-id") || request.method === "POST") { + let result = await processServerAction( + request, + decodeCallServer, + decodeFormAction, + onError + ); + if (result) { + actionResult = result.actionResult ?? undefined; + request = result.revalidationRequest ?? request; + } + } + + try { + let response = await getRenderPayload( + request, + routes, + generateResponse, + actionResult + ); + return response; + } catch (error) { + throw error; + } +} + +async function generateManifestResponse( + routes: ServerRouteObject[], + request: Request, + generateResponse: (match: ServerMatch) => Response +) { + let url = new URL(request.url); + const matches = matchRoutes(routes, url.pathname.replace(/\.manifest$/, "")); + + return generateResponse({ + statusCode: 200, + headers: new Headers({ + "Content-Type": "text/x-component", + Vary: "Content-Type", + }), + payload: { + type: "manifest", + matches: await Promise.all( + matches?.map((m, i) => getRoute(m.route, matches[i - 1]?.route.id)) ?? + [] + ), + patches: await getAdditionalRoutePatches( + url.pathname, + routes, + matches?.map((m) => m.route.id) ?? [] + ), + }, + }); +} + +async function processServerAction( + request: Request, + decodeCallServer: DecodeCallServerFunction | undefined, + decodeFormAction: DecodeFormActionFunction | undefined, + onError: ((error: unknown) => void) | undefined +): Promise< + { revalidationRequest: Request; actionResult?: Promise } | undefined +> { + const revalidationRequest = () => + new Request(request.url, { + method: "GET", + headers: request.headers, + signal: request.signal, + }); const actionId = request.headers.get("rsc-action-id"); if (actionId) { if (!decodeCallServer) { @@ -216,7 +262,7 @@ export async function matchRSCServerRequest({ : await request.text(); const serverAction = await decodeCallServer(actionId, reply); - actionResult = Promise.resolve(serverAction()); + let actionResult = Promise.resolve(serverAction()); try { // Wait for actions to finish regardless of state await actionResult; @@ -224,12 +270,7 @@ export async function matchRSCServerRequest({ // The error is propagated to the client through the result promise in the stream onError?.(error); } - - request = new Request(request.url, { - method: "GET", - headers: request.headers, - signal: request.signal, - }); + return { revalidationRequest: revalidationRequest(), actionResult }; } if (request.method === "POST") { @@ -242,317 +283,317 @@ export async function matchRSCServerRequest({ "Cannot handle form actions without a decodeFormAction function" ); } - const action = await decodeFormAction(formData); try { await action(); } catch (error) { onError?.(error); } - - request = new Request(request.url, { - method: "GET", - headers: request.headers, - signal: request.signal, - }); + return { revalidationRequest: revalidationRequest() }; } } +} - const getRenderPayload = async ( - isDataRequest: boolean, - actionResult?: Promise - ): Promise => { - // If this is a RR submission, we just want the `actionData` but don't want - // to call any loaders or render any components back in the response - that - // will happen in the subsequent revalidation request - let isSubmission = isMutationMethod(request.method); - let searchParams = new URL(request.url).searchParams; - let routeIdsToLoad = - !isSubmission && searchParams.has("_routes") - ? searchParams.get("_routes")!.split(",") - : null; - - const respond: ( - ctx: Awaited> - ) => Promise = async (staticContext) => { - if (staticContext instanceof Response) { - return generateResponse({ - statusCode, - headers: new Headers({ - "Content-Type": "text/x-component", - Vary: "Content-Type", - }), - payload: { - type: "redirect", - location: staticContext.headers.get("Location") || "", - reload: - staticContext.headers.get("x-remix-reload-document") === "true", - replace: staticContext.headers.get("x-remix-replace") === "true", - status: staticContext.status, - }, - }); +async function getRenderPayload( + request: Request, + routes: ServerRouteObject[], + generateResponse: (match: ServerMatch) => Response, + actionResult?: Promise +): Promise { + // If this is a RR submission, we just want the `actionData` but don't want + // to call any loaders or render any components back in the response - that + // will happen in the subsequent revalidation request + let statusCode = 200; + let url = new URL(request.url); + // TODO: Can this be done with a pathname extension instead of a header? + // If not, make sure we strip this at the SSR server and it can only be set + // by us to avoid cache-poisoning attempts + let isDataRequest = request.headers.has("X-React-Router-Data-Request"); + let isSubmission = isMutationMethod(request.method); + let routeIdsToLoad = + !isSubmission && url.searchParams.has("_routes") + ? url.searchParams.get("_routes")!.split(",") + : null; + + // Explode lazy functions out the routes so we can use middleware + // TODO: This isn't ideal but we can't do it through `lazy()` in the router, + // and if we move to `lazy: {}` then we lose all the other things from the + // `ServerRouteObject` like `Layout` etc. + let matches = matchRoutes(routes, url.pathname); + if (matches) { + await Promise.all(matches.map((m) => explodeLazyRoute(m.route))); + } + + // Create the handler here with exploded routes + const handler = createStaticHandler(routes); + const respond = (staticContext: StaticHandlerContext) => + generateStaticContextResponse( + routes, + generateResponse, + statusCode, + routeIdsToLoad, + isDataRequest, + isSubmission, + actionResult, + staticContext + ); + + const result = await handler.query(request, { + skipLoaderErrorBubbling: true, + skipRevalidation: isSubmission, + ...(routeIdsToLoad + ? { filterMatchesToLoad: (m) => routeIdsToLoad!.includes(m.route.id) } + : null), + unstable_respond(result) { + if (isResponse(result)) { + return generateRedirectResponse(statusCode, result, generateResponse); } + return respond(result); + }, + }); - statusCode = staticContext.statusCode ?? statusCode; + if (isRedirectResponse(result)) { + return generateRedirectResponse(statusCode, result, generateResponse); + } - const errors = staticContext.errors - ? Object.fromEntries( - Object.entries(staticContext.errors).map(([key, error]) => [ - key, - isRouteErrorResponse(error) - ? Object.fromEntries(Object.entries(error)) - : error, - ]) - ) - : staticContext.errors; - - // In the RSC world we set `hasLoader:true` eve if a route doesn't have a - // loader so that we always make the single fetch call to get the rendered - // `element`. We add a `null`value for any of the routes that don't - // actually have a loader so the single fetch logic can find a result for - // the route. This is a bit of a hack but allows us to re-use all the - // existing logic. This can go away if we ever fork off and re-implement a - // standalone RSC `dataStrategy` - staticContext.matches.forEach((m) => { - if (staticContext.loaderData[m.route.id] === undefined) { - staticContext.loaderData[m.route.id] = null; - } - }); - - let headers = getDocumentHeaders( - staticContext, - (match) => - (match as RouteMatch).route.headers - ); + // while middleware is still unstable, we don't run the middleware pipeline + // if no routes have middleware, so we still might need to convert context + // to a response here + return isResponse(result) ? result : respond(result); +} - const payload: Omit = { - type: "render", - actionData: staticContext.actionData, - errors, - loaderData: staticContext.loaderData, - location: staticContext.location, - }; +function generateRedirectResponse( + statusCode: number, + response: Response, + generateResponse: (match: ServerMatch) => Response +) { + return generateResponse({ + statusCode, + headers: new Headers({ + "Content-Type": "text/x-component", + Vary: "Content-Type", + }), + payload: { + type: "redirect", + location: response.headers.get("Location") || "", + reload: response.headers.get("X-Remix-Reload-Document") === "true", + replace: response.headers.get("X-Remix-Replace") === "true", + status: response.status, + }, + }); +} + +async function generateStaticContextResponse( + routes: ServerRouteObject[], + generateResponse: (match: ServerMatch) => Response, + statusCode: number, + routeIdsToLoad: string[] | null, + isDataRequest: boolean, + isSubmission: boolean, + actionResult: Promise | undefined, + staticContext: StaticHandlerContext +): Promise { + statusCode = staticContext.statusCode ?? statusCode; + + const errors = staticContext.errors + ? Object.fromEntries( + Object.entries(staticContext.errors).map(([key, error]) => [ + key, + isRouteErrorResponse(error) + ? Object.fromEntries(Object.entries(error)) + : error, + ]) + ) + : staticContext.errors; + + // In the RSC world we set `hasLoader:true` eve if a route doesn't have a + // loader so that we always make the single fetch call to get the rendered + // `element`. We add a `null`value for any of the routes that don't + // actually have a loader so the single fetch logic can find a result for + // the route. This is a bit of a hack but allows us to re-use all the + // existing logic. This can go away if we ever fork off and re-implement a + // standalone RSC `dataStrategy` + staticContext.matches.forEach((m) => { + if (staticContext.loaderData[m.route.id] === undefined) { + staticContext.loaderData[m.route.id] = null; + } + }); + + let headers = getDocumentHeaders( + staticContext, + (match) => (match as RouteMatch).route.headers + ); - // Short circuit without matches on submissions - if (isSubmission) { - return generateResponse({ - statusCode, - headers, - payload: { - ...payload, - matches: [], - patches: [], - }, + const payload: Omit = { + type: "render", + actionData: staticContext.actionData, + errors, + loaderData: staticContext.loaderData, + location: staticContext.location, + }; + + // Short circuit without matches on submissions + if (isSubmission) { + return generateResponse({ + statusCode, + headers, + payload: { + ...payload, + matches: [], + patches: [], + }, + }); + } + + let lastMatch: AgnosticDataRouteMatch | null = null; + let matchesPromise = Promise.all( + staticContext.matches.map(async (match) => { + if ("lazy" in match.route && match.route.lazy) { + Object.assign(match.route, { + // @ts-expect-error - FIXME: Fix the types here + ...((await match.route.lazy()) as any), + path: match.route.path, + index: (match.route as any).index, + id: match.route.id, }); + match.route.lazy = undefined; } - let lastMatch: AgnosticDataRouteMatch | null = null; - let matchesPromise = Promise.all( - staticContext.matches.map(async (match) => { - if ("lazy" in match.route && match.route.lazy) { - Object.assign(match.route, { - // @ts-expect-error - FIXME: Fix the types here - ...((await match.route.lazy()) as any), - path: match.route.path, - index: (match.route as any).index, - id: match.route.id, - }); - match.route.lazy = undefined; - } - - const Layout = (match.route as any).Layout || React.Fragment; - const Component = (match.route as any).default; - const ErrorBoundary = (match.route as any).ErrorBoundary; - const HydrateFallback = (match.route as any).HydrateFallback; - const loaderData = staticContext.loaderData[match.route.id]; - const actionData = staticContext.actionData?.[match.route.id]; - const params = match.params; - // TODO: DRY this up once it's fully fleshed out - const element = Component - ? staticContext.errors?.[match.route.id] - ? (false as const) - : React.createElement( - Layout, - null, - Component.$$typeof === Symbol.for("react.client.reference") - ? React.createElement( - WithRouteComponentProps, - null, - React.createElement(Component) + const Layout = (match.route as any).Layout || React.Fragment; + const Component = (match.route as any).default; + const ErrorBoundary = (match.route as any).ErrorBoundary; + const HydrateFallback = (match.route as any).HydrateFallback; + const loaderData = staticContext.loaderData[match.route.id]; + const actionData = staticContext.actionData?.[match.route.id]; + const params = match.params; + // TODO: DRY this up once it's fully fleshed out + const element = Component + ? staticContext.errors?.[match.route.id] + ? (false as const) + : React.createElement( + Layout, + null, + Component.$$typeof === Symbol.for("react.client.reference") + ? React.createElement( + WithRouteComponentProps, + null, + React.createElement(Component) + ) + : React.createElement(Component, { + loaderData, + actionData, + params, + matches: staticContext.matches.map((match) => + convertRouteMatchToUiMatch( + match, + staticContext.loaderData ) - : React.createElement(Component, { - loaderData, - actionData, - params, - matches: staticContext.matches.map((match) => - convertRouteMatchToUiMatch( - match, - staticContext.loaderData - ) - ), - } satisfies RouteComponentProps) + ), + } satisfies RouteComponentProps) + ) + : undefined; + const errorElement = ErrorBoundary + ? React.createElement( + Layout, + null, + Component.$$typeof === Symbol.for("react.client.reference") + ? React.createElement( + WithErrorBoundaryProps, + null, + React.createElement(ErrorBoundary) ) - : undefined; - const errorElement = ErrorBoundary - ? React.createElement( - Layout, - null, - Component.$$typeof === Symbol.for("react.client.reference") - ? React.createElement( - WithErrorBoundaryProps, - null, - React.createElement(ErrorBoundary) - ) - : React.createElement(ErrorBoundary, { - loaderData, - actionData, - params, - error: [...staticContext.matches] - .reverse() - .find( - (match) => staticContext.errors?.[match.route.id] - ), - } satisfies ErrorBoundaryProps) - ) - : undefined; - const hydrateFallbackElement = HydrateFallback - ? React.createElement( - Layout, - null, - Component.$$typeof === Symbol.for("react.client.reference") - ? React.createElement( - WithHydrateFallbackProps, - null, - React.createElement(HydrateFallback) - ) - : React.createElement(HydrateFallback, { - loaderData, - actionData, - params, - } satisfies HydrateFallbackProps) - ) - : match.route.id === "root" - ? // FIXME: This should use the `RemixRootDefaultErrorBoundary` but that - // currently uses a hook internally so it fails during RSC. Restructure - // so it can be used safely in an RSC render pass. - React.createElement("p", null, "Loading!") - : undefined; - - let result = { - clientAction: (match.route as any).clientAction, - clientLoader: (match.route as any).clientLoader, - element, - errorElement, - handle: (match.route as any).handle, - hasAction: !!match.route.action, - hasErrorBoundary: !!(match.route as any).ErrorBoundary, - hasLoader: !!match.route.loader, - hydrateFallbackElement, - id: match.route.id, - index: match.route.index, - links: (match.route as any).links, - meta: (match.route as any).meta, - params, - parentId: lastMatch?.route.id, - path: match.route.path, - pathname: match.pathname, - pathnameBase: match.pathnameBase, - shouldRevalidate: (match.route as any).shouldRevalidate, - }; - lastMatch = match; - return result; - }) - ); - - const getPayload = async () => { - const matches = await matchesPromise; - return { - ...payload, - matches: routeIdsToLoad - ? matches.filter((m) => routeIdsToLoad.includes(m.id)) - : matches, - patches: !isDataRequest - ? await getAdditionalRoutePatches( - staticContext.location.pathname, - routes, - matches.map((m) => m.id) - ) - : undefined, - }; + : React.createElement(ErrorBoundary, { + loaderData, + actionData, + params, + error: [...staticContext.matches] + .reverse() + .find((match) => staticContext.errors?.[match.route.id]), + } satisfies ErrorBoundaryProps) + ) + : undefined; + const hydrateFallbackElement = HydrateFallback + ? React.createElement( + Layout, + null, + Component.$$typeof === Symbol.for("react.client.reference") + ? React.createElement( + WithHydrateFallbackProps, + null, + React.createElement(HydrateFallback) + ) + : React.createElement(HydrateFallback, { + loaderData, + actionData, + params, + } satisfies HydrateFallbackProps) + ) + : match.route.id === "root" + ? // FIXME: This should use the `RemixRootDefaultErrorBoundary` but that + // currently uses a hook internally so it fails during RSC. Restructure + // so it can be used safely in an RSC render pass. + React.createElement("p", null, "Loading!") + : undefined; + + let result = { + clientAction: (match.route as any).clientAction, + clientLoader: (match.route as any).clientLoader, + element, + errorElement, + handle: (match.route as any).handle, + hasAction: !!match.route.action, + hasErrorBoundary: !!(match.route as any).ErrorBoundary, + hasLoader: !!match.route.loader, + hydrateFallbackElement, + id: match.route.id, + index: match.route.index, + links: (match.route as any).links, + meta: (match.route as any).meta, + params, + parentId: lastMatch?.route.id, + path: match.route.path, + pathname: match.pathname, + pathnameBase: match.pathnameBase, + shouldRevalidate: (match.route as any).shouldRevalidate, }; + lastMatch = match; + return result; + }) + ); - if (actionResult) { - return generateResponse({ - statusCode, - headers, - payload: { - type: "action", - actionResult, - rerender: getPayload(), - }, - }); - } else { - return generateResponse({ - statusCode, - headers, - payload: await getPayload(), - }); - } + const getPayload = async () => { + const matches = await matchesPromise; + return { + ...payload, + matches: routeIdsToLoad + ? matches.filter((m) => routeIdsToLoad.includes(m.id)) + : matches, + patches: !isDataRequest + ? await getAdditionalRoutePatches( + staticContext.location.pathname, + routes, + matches.map((m) => m.id) + ) + : undefined, }; - - // Explode lazy functions out the routes so we can use middleware - // TODO: This isn't ideal but we can't do it through `lazy()` in the router, - // and if we move to `lazy: {}` then we lose all the other things from the - // `ServerRouteObject` like `Layout` etc. - let matches = matchRoutes(routes, url.pathname); - if (matches) { - await Promise.all(matches.map((m) => explodeLazyRoute(m.route))); - } - - // Create the handler here with exploded routes - const handler = createStaticHandler(routes); - - const result = await handler.query(request, { - skipLoaderErrorBubbling: true, - skipRevalidation: isSubmission, - ...(routeIdsToLoad - ? { filterMatchesToLoad: (m) => routeIdsToLoad!.includes(m.route.id) } - : null), - unstable_respond: respond, - }); - if (isRedirectResponse(result)) { - return generateResponse({ - statusCode, - headers: new Headers({ - "Content-Type": "text/x-component", - Vary: "Content-Type", - }), - payload: { - type: "redirect", - location: result.headers.get("Location") || "", - reload: result.headers.get("x-remix-reload-document") === "true", - replace: result.headers.get("x-remix-replace") === "true", - status: result.status, - }, - }); - } - // while middleware is still unstable, we don't run the middleware pipeline - // if no routes have middleware, so we still might need to convert context - // to a response here - return isResponse(result) ? result : respond(result); }; - try { - if (actionResult) { - let res = await getRenderPayload(isDataRequest, actionResult); - return res; - } else { - let res = await getRenderPayload(isDataRequest); - - return res; - } - } catch (error) { - throw error; + if (actionResult) { + return generateResponse({ + statusCode, + headers, + payload: { + type: "action", + actionResult, + rerender: getPayload(), + }, + }); + } else { + return generateResponse({ + statusCode, + headers, + payload: await getPayload(), + }); } } From d1d9344adfb45338af467f9602aafe95bd726b3a Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Mon, 12 May 2025 18:41:06 +1000 Subject: [PATCH 087/143] Fix Parcel RSC playground (#13587) --- packages/react-router/index.ts | 6 +- packages/react-router/lib/components.tsx | 31 +++++++++- packages/react-router/lib/rsc/server.rsc.ts | 47 ++++++++------- playground/rsc-parcel/src/entry.browser.tsx | 59 ++++++++++-------- playground/rsc-parcel/src/entry.rsc.ts | 38 +++++++++--- playground/rsc-parcel/src/entry.ssr.tsx | 67 +++++++++------------ playground/rsc-parcel/src/routes.ts | 5 +- playground/rsc-parcel/tsconfig.json | 20 +++--- 8 files changed, 160 insertions(+), 113 deletions(-) diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts index 145d4bc965..812f4baa02 100644 --- a/packages/react-router/index.ts +++ b/packages/react-router/index.ts @@ -290,11 +290,7 @@ export type { export { createCallServer, RSCHydratedRouter } from "./lib/rsc/browser"; export { routeRSCServerRequest, RSCStaticRouter } from "./lib/rsc/server.ssr"; export { getServerStream } from "./lib/rsc/html-stream/browser"; -export { - WithRouteComponentProps as UNSAFE_WithRouteComponentProps, - WithHydrateFallbackProps as UNSAFE_WithHydrateFallbackProps, - WithErrorBoundaryProps as UNSAFE_WithErrorBoundaryProps, -} from "./lib/components"; +export { ClientComponentPropsProvider as unstable_ClientComponentPropsProvider } from "./lib/components"; /////////////////////////////////////////////////////////////////////////////// // DANGER! PLEASE READ ME! diff --git a/packages/react-router/lib/components.tsx b/packages/react-router/lib/components.tsx index d0b0657384..c27d1c88b5 100644 --- a/packages/react-router/lib/components.tsx +++ b/packages/react-router/lib/components.tsx @@ -1147,7 +1147,7 @@ export type RouteComponentProps = { matches: ReturnType; }; -export function WithRouteComponentProps({ +function RouteComponentPropsProvider({ children, }: { children: React.ReactElement; @@ -1167,7 +1167,7 @@ export type HydrateFallbackProps = { params: ReturnType; }; -export function WithHydrateFallbackProps({ +function HydrateFallbackPropsProvider({ children, }: { children: React.ReactElement; @@ -1187,7 +1187,7 @@ export type ErrorBoundaryProps = { error: ReturnType; }; -export function WithErrorBoundaryProps({ +function ErrorBoundaryPropsProvider({ children, }: { children: React.ReactElement; @@ -1201,6 +1201,31 @@ export function WithErrorBoundaryProps({ return React.cloneElement(children, props); } +const clientComponentPropsProvidersByType = { + Component: RouteComponentPropsProvider, + ErrorBoundary: ErrorBoundaryPropsProvider, + HydrateFallback: HydrateFallbackPropsProvider, +} as const; + +export function ClientComponentPropsProvider({ + __type: type, + children, +}: { + __type: keyof typeof clientComponentPropsProvidersByType; + children: React.ReactElement; +}) { + const Provider = clientComponentPropsProvidersByType[type]; + + if (!Provider) { + throw new Error(`Invalid type: ${type}`); + } + + return {children}; +} + +export type ClientComponentPropsProviderType = + typeof ClientComponentPropsProvider; + /////////////////////////////////////////////////////////////////////////////// // UTILS /////////////////////////////////////////////////////////////////////////////// diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index 774125975c..248c6212ef 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -31,12 +31,8 @@ import type { RouteComponentProps, HydrateFallbackProps, ErrorBoundaryProps, + ClientComponentPropsProviderType, } from "../components"; -import { - UNSAFE_WithRouteComponentProps as WithRouteComponentProps, - UNSAFE_WithHydrateFallbackProps as WithHydrateFallbackProps, - UNSAFE_WithErrorBoundaryProps as WithErrorBoundaryProps, -} from "react-router"; type ServerRouteObjectBase = { action?: ActionFunction; @@ -160,6 +156,7 @@ export async function matchRSCServerRequest({ request, routes, generateResponse, + unstable_ClientComponentPropsProvider: ClientComponentPropsProvider, }: { decodeCallServer?: DecodeCallServerFunction; decodeFormAction?: DecodeFormActionFunction; @@ -167,6 +164,7 @@ export async function matchRSCServerRequest({ request: Request; routes: ServerRouteObject[]; generateResponse: (match: ServerMatch) => Response; + unstable_ClientComponentPropsProvider?: ClientComponentPropsProviderType; }): Promise { const url = new URL(request.url); @@ -198,6 +196,7 @@ export async function matchRSCServerRequest({ request, routes, generateResponse, + ClientComponentPropsProvider, actionResult ); return response; @@ -298,6 +297,7 @@ async function getRenderPayload( request: Request, routes: ServerRouteObject[], generateResponse: (match: ServerMatch) => Response, + ClientComponentPropsProvider?: ClientComponentPropsProviderType, actionResult?: Promise ): Promise { // If this is a RR submission, we just want the `actionData` but don't want @@ -335,7 +335,8 @@ async function getRenderPayload( isDataRequest, isSubmission, actionResult, - staticContext + staticContext, + ClientComponentPropsProvider ); const result = await handler.query(request, { @@ -391,7 +392,8 @@ async function generateStaticContextResponse( isDataRequest: boolean, isSubmission: boolean, actionResult: Promise | undefined, - staticContext: StaticHandlerContext + staticContext: StaticHandlerContext, + ClientComponentPropsProviderArg?: ClientComponentPropsProviderType ): Promise { statusCode = staticContext.statusCode ?? statusCode; @@ -432,6 +434,10 @@ async function generateStaticContextResponse( location: staticContext.location, }; + const ClientComponentPropsProvider = + ClientComponentPropsProviderArg ?? + (await import("react-router")).unstable_ClientComponentPropsProvider; + // Short circuit without matches on submissions if (isSubmission) { return generateResponse({ @@ -474,11 +480,10 @@ async function generateStaticContextResponse( Layout, null, Component.$$typeof === Symbol.for("react.client.reference") - ? React.createElement( - WithRouteComponentProps, - null, - React.createElement(Component) - ) + ? React.createElement(ClientComponentPropsProvider, { + __type: "Component", + children: React.createElement(Component), + }) : React.createElement(Component, { loaderData, actionData, @@ -497,11 +502,10 @@ async function generateStaticContextResponse( Layout, null, Component.$$typeof === Symbol.for("react.client.reference") - ? React.createElement( - WithErrorBoundaryProps, - null, - React.createElement(ErrorBoundary) - ) + ? React.createElement(ClientComponentPropsProvider, { + __type: "ErrorBoundary", + children: React.createElement(ErrorBoundary), + }) : React.createElement(ErrorBoundary, { loaderData, actionData, @@ -517,11 +521,10 @@ async function generateStaticContextResponse( Layout, null, Component.$$typeof === Symbol.for("react.client.reference") - ? React.createElement( - WithHydrateFallbackProps, - null, - React.createElement(HydrateFallback) - ) + ? React.createElement(ClientComponentPropsProvider, { + __type: "HydrateFallback", + children: React.createElement(HydrateFallback), + }) : React.createElement(HydrateFallback, { loaderData, actionData, diff --git a/playground/rsc-parcel/src/entry.browser.tsx b/playground/rsc-parcel/src/entry.browser.tsx index 40a96f821f..2f412c8596 100644 --- a/playground/rsc-parcel/src/entry.browser.tsx +++ b/playground/rsc-parcel/src/entry.browser.tsx @@ -1,31 +1,40 @@ "use client-entry"; -import { startTransition, StrictMode } from "react"; +import * as React from "react"; import { hydrateRoot } from "react-dom/client"; -// @ts-expect-error -import { createFromReadableStream } from "react-server-dom-parcel/client"; +import { + createCallServer, + getServerStream, + RSCHydratedRouter, +} from "react-router"; +import type { ServerPayload } from "react-router/rsc"; +import { + createFromReadableStream, + encodeReply, + setServerCallback, + // @ts-expect-error +} from "react-server-dom-parcel/client"; -import { getServerStream, RSCHydratedRouter } from "react-router"; -import { type ServerPayload } from "react-router/rsc"; +const callServer = createCallServer({ + decode: (body) => createFromReadableStream(body, { callServer }), + encodeAction: (args) => encodeReply(args), +}); + +setServerCallback(callServer); -createFromReadableStream( - getServerStream(), - { assets: "manifest" }, - { - temporaryReferences: { - clientId: () =>
Client ID
, - }, +createFromReadableStream(getServerStream(), { assets: "manifest" }).then( + (payload: ServerPayload) => { + React.startTransition(() => { + hydrateRoot( + document, + + + + ); + }); } -).then((payload: ServerPayload) => { - startTransition(() => { - hydrateRoot( - document, - - - - ); - }); -}); +); diff --git a/playground/rsc-parcel/src/entry.rsc.ts b/playground/rsc-parcel/src/entry.rsc.ts index 12982499cc..ce1ad473b7 100644 --- a/playground/rsc-parcel/src/entry.rsc.ts +++ b/playground/rsc-parcel/src/entry.rsc.ts @@ -1,22 +1,42 @@ "use server-entry"; -import "./entry.browser"; - -import { matchRSCServerRequest } from "react-router/rsc"; -// @ts-expect-error -import { renderToReadableStream } from "react-server-dom-parcel/server.edge"; +import { + decodeAction, + decodeReply, + loadServerAction, + renderToReadableStream, + // @ts-expect-error +} from "react-server-dom-parcel/server.edge"; +import { + type DecodeCallServerFunction, + type DecodeFormActionFunction, + matchRSCServerRequest, +} from "react-router/rsc"; +import { unstable_ClientComponentPropsProvider } from "react-router" assert { env: "client" }; import { routes } from "./routes"; +import "./entry.browser.tsx"; + +const decodeCallServer: DecodeCallServerFunction = async (actionId, reply) => { + const args = await decodeReply(reply); + const action = await loadServerAction(actionId); + return action.bind(null, ...args); +}; + +const decodeFormAction: DecodeFormActionFunction = async (formData) => { + return await decodeAction(formData); +}; + export function callServer(request: Request) { return matchRSCServerRequest({ + decodeCallServer, + decodeFormAction, request, + // @ts-expect-error routes, + unstable_ClientComponentPropsProvider, generateResponse(match) { - if (match instanceof Response) { - return match; - } - return new Response(renderToReadableStream(match.payload), { status: match.statusCode, headers: match.headers, diff --git a/playground/rsc-parcel/src/entry.ssr.tsx b/playground/rsc-parcel/src/entry.ssr.tsx index c1be4a31cb..a59f66e252 100644 --- a/playground/rsc-parcel/src/entry.ssr.tsx +++ b/playground/rsc-parcel/src/entry.ssr.tsx @@ -1,45 +1,38 @@ import { createRequestListener } from "@mjackson/node-fetch-server"; import express from "express"; - -// @ts-expect-error -import { createFromReadableStream } from "react-server-dom-parcel/client.edge" with { - env: "react-client", -}; +// @ts-expect-error - no types +import { renderToReadableStream as renderHTMLToReadableStream } from "react-dom/server.edge" assert { env: "react-client" }; +import { + routeRSCServerRequest, + RSCStaticRouter, +} from "react-router" assert { env: "react-client" }; // @ts-expect-error -import { renderToReadableStream as renderHTMLToReadableStream } from "react-dom/server.edge" with { - env: "react-client", -}; - -import { routeRSCServerRequest, RSCStaticRouter } from "react-router" with { - env: "react-client", -}; +import { createFromReadableStream } from "react-server-dom-parcel/client.edge" assert { env: "react-client" }; -import { callServer } from "./entry.rsc" with { - env: "react-server", -}; +import { callServer } from "./entry.rsc" assert { env: "react-server" }; const app = express(); -app.use(express.static("dist")); +app.use("/client", express.static("dist/client")); app.use( - createRequestListener(async (request) => { - return routeRSCServerRequest( - request, - callServer, - createFromReadableStream, - async (payload) => { - return await renderHTMLToReadableStream( - , - { - bootstrapScriptContent: ( - callServer as unknown as { bootstrapScript: string } - ).bootstrapScript, - }, - ); - } - ); - }), + createRequestListener(async (request) => { + return routeRSCServerRequest( + request, + callServer, + createFromReadableStream, + async (getPayload) => { + return await renderHTMLToReadableStream( + , + { + bootstrapScriptContent: ( + callServer as unknown as { bootstrapScript: string } + ).bootstrapScript, + } + ); + } + ); + }) ); const server = app.listen(3001); @@ -47,9 +40,9 @@ console.log("Server listening on port 3001"); // Restart the server when it changes. if (module.hot) { - module.hot.dispose(() => { - server.close(); - }); + module.hot.dispose(() => { + server.close(); + }); - module.hot.accept(); + module.hot.accept(); } diff --git a/playground/rsc-parcel/src/routes.ts b/playground/rsc-parcel/src/routes.ts index 424f37e5ee..3afe40bbe3 100644 --- a/playground/rsc-parcel/src/routes.ts +++ b/playground/rsc-parcel/src/routes.ts @@ -1,19 +1,20 @@ -import type { ServerRouteObject } from "react-router"; +import type { ServerRouteObject } from "react-router/rsc"; export const routes = [ { id: "root", - // requiredCSS: ["/index.css"], lazy: () => import("./routes/root/root"), children: [ { id: "home", index: true, + // @ts-expect-error lazy: () => import("./routes/home/home"), }, { id: "about", path: "about", + // @ts-expect-error lazy: () => import("./routes/about/about"), }, ], diff --git a/playground/rsc-parcel/tsconfig.json b/playground/rsc-parcel/tsconfig.json index 5593ae70d9..739ac74a41 100644 --- a/playground/rsc-parcel/tsconfig.json +++ b/playground/rsc-parcel/tsconfig.json @@ -1,12 +1,12 @@ { - "compilerOptions": { - "strict": true, - "jsx": "react-jsx", - "allowSyntheticDefaultImports": true, - "moduleResolution": "node", - "module": "esnext", - "isolatedModules": true, - "esModuleInterop": true, - "target": "es2022" - } + "compilerOptions": { + "strict": true, + "jsx": "react-jsx", + "allowSyntheticDefaultImports": true, + "moduleResolution": "bundler", + "module": "esnext", + "isolatedModules": true, + "esModuleInterop": true, + "target": "es2022" + } } From ba05c30f1dd4c655f48e20f5a56290f1901a6332 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Mon, 12 May 2025 11:59:49 -0400 Subject: [PATCH 088/143] Remove parcel bug workaround --- packages/react-router/lib/router/router.ts | 30 ++++------------------ 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts index 79e5e49fa9..ddcb7f4712 100644 --- a/packages/react-router/lib/router/router.ts +++ b/packages/react-router/lib/router/router.ts @@ -5378,31 +5378,11 @@ export async function runMiddlewarePipeline( handlerResult: undefined, }; try { - // This causes a runtime error in parcel :/ - // @parcel/reporter-dev-server: TypeError: 'get' on proxy: property 'prototype' is a read-only and non-configurable data property on the proxy target but the proxy did not - // return its actual value (expected '[object Array]' but got '[object Array]') - // @parcel/reporter-dev-server: at Proxy.map () - // @parcel/reporter-dev-server: at Object.apply - // (.../node_modules/.pnpm/@parcel+runtime-rsc@2.14.4_@parcel+core@2.14.4_@swc+helpers@0.5.15_/node_modules/@parcel/runtime-rsc/rsc-helpers.jsx:62:30) - // @parcel/reporter-dev-server: at - // (.../node_modules/.pnpm/react-router@0.0.0-experimental-e56aa53bc_react-dom@19.1.0_react@19.1.0__react@19.1.0/node_modules/react-router/dist/development/rsc-export.mjs:1434:72) - // @parcel/reporter-dev-server: at Array.flatMap () - - // let tuples = matches.flatMap((m) => - // m.route.unstable_middleware - // ? m.route.unstable_middleware.map((fn) => [m.route.id, fn]) - // : [] - // ) as [string, unstable_MiddlewareFunction][]; - - let tuples: [string, unstable_MiddlewareFunction][] = []; - for (let m of matches) { - if (m.route.unstable_middleware) { - for (let fn of m.route.unstable_middleware) { - let tuple: [string, unstable_MiddlewareFunction] = [m.route.id, fn]; - tuples.push(tuple); - } - } - } + let tuples = matches.flatMap((m) => + m.route.unstable_middleware + ? m.route.unstable_middleware.map((fn) => [m.route.id, fn]) + : [] + ) as [string, unstable_MiddlewareFunction][]; let result = await callRouteMiddleware( { request, params, context }, tuples, From 3027cd41f4fcdfc1c577f338eb44fbd2c45ea934 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Mon, 12 May 2025 14:25:59 -0400 Subject: [PATCH 089/143] Update rsc-parcel playground to use stable react 19 --- package.json | 2 +- playground/rsc-parcel/package.json | 13 ++----- playground/rsc-parcel/src/entry.ssr.tsx | 4 +- pnpm-lock.yaml | 52 +++++++------------------ 4 files changed, 19 insertions(+), 52 deletions(-) diff --git a/package.json b/package.json index 3a56863423..6341217c68 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,7 @@ "vite": "^6.1.0", "vite-env-only": "^3.0.1", "vite-tsconfig-paths": "^4.2.2", - "react-server-dom-parcel": "0.0.0-experimental-93b58361-20250209" + "react-server-dom-parcel": "^19.1.0" }, "engines": { "node": ">=20.0.0" diff --git a/playground/rsc-parcel/package.json b/playground/rsc-parcel/package.json index 50e34973fd..30edab1d8e 100644 --- a/playground/rsc-parcel/package.json +++ b/playground/rsc-parcel/package.json @@ -38,16 +38,9 @@ "@mjackson/node-fetch-server": "0.6.1", "@parcel/runtime-rsc": "2.14.1", "express": "^4.21.2", - "react": "0.0.0-experimental-93b58361-20250209", - "react-dom": "0.0.0-experimental-93b58361-20250209", + "react": "^19.0.0", + "react-dom": "^19.0.0", "react-router": "workspace:*", - "react-server-dom-parcel": "0.0.0-experimental-93b58361-20250209" - }, - "pnpm": { - "overrides": { - "react": "0.0.0-experimental-93b58361-20250209", - "react-dom": "0.0.0-experimental-93b58361-20250209", - "react-server-dom-parcel": "0.0.0-experimental-93b58361-20250209" - } + "react-server-dom-parcel": "^19.0.0" } } diff --git a/playground/rsc-parcel/src/entry.ssr.tsx b/playground/rsc-parcel/src/entry.ssr.tsx index a59f66e252..e872b9d3d0 100644 --- a/playground/rsc-parcel/src/entry.ssr.tsx +++ b/playground/rsc-parcel/src/entry.ssr.tsx @@ -35,8 +35,8 @@ app.use( }) ); -const server = app.listen(3001); -console.log("Server listening on port 3001"); +const server = app.listen(3000); +console.log("Server listening on port 3000"); // Restart the server when it changes. if (module.hot) { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dc88ce4331..46661fc912 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -189,8 +189,8 @@ importers: specifier: ^19.1.0 version: 19.1.0(react@19.1.0) react-server-dom-parcel: - specifier: 0.0.0-experimental-93b58361-20250209 - version: 0.0.0-experimental-93b58361-20250209(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + specifier: ^19.1.0 + version: 19.1.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0) react-test-renderer: specifier: ^19.1.0 version: 19.1.0(react@19.1.0) @@ -1457,17 +1457,17 @@ importers: specifier: ^4.21.2 version: 4.21.2 react: - specifier: 0.0.0-experimental-93b58361-20250209 - version: 0.0.0-experimental-93b58361-20250209 + specifier: ^19.0.0 + version: 19.1.0 react-dom: - specifier: 0.0.0-experimental-93b58361-20250209 - version: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) + specifier: ^19.0.0 + version: 19.1.0(react@19.1.0) react-router: specifier: workspace:* version: link:../../packages/react-router react-server-dom-parcel: - specifier: 0.0.0-experimental-93b58361-20250209 - version: 0.0.0-experimental-93b58361-20250209(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209) + specifier: ^19.0.0 + version: 19.1.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0) devDependencies: '@biomejs/biome': specifier: ^1.9.4 @@ -8860,11 +8860,6 @@ packages: resolution: {integrity: sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==} engines: {node: '>= 0.8'} - react-dom@0.0.0-experimental-93b58361-20250209: - resolution: {integrity: sha512-6DCQYyF220WyHjR3sbcoDkWlXf+2IEwPWoAAB+k328c+ETElboMP5e5FUVwAorpK6UaWgKuqeXbm7B3NLIixTQ==} - peerDependencies: - react: 0.0.0-experimental-93b58361-20250209 - react-dom@19.1.0: resolution: {integrity: sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g==} peerDependencies: @@ -8881,22 +8876,18 @@ packages: resolution: {integrity: sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==} engines: {node: '>=0.10.0'} - react-server-dom-parcel@0.0.0-experimental-93b58361-20250209: - resolution: {integrity: sha512-ASAqPoho6m+5fb9SuJY8hcA7Il9QV72og4ZhA8Q3SYM8yZnE1PxvUpt84cipNg0RmmT6BiRX1FpbxhtfhPCyGQ==} + react-server-dom-parcel@19.1.0: + resolution: {integrity: sha512-JkfPt/yV1ru8J1CTM0PD74HZZRQTjdoTU5eg2r6Xjn/TmFRS2J/4QsKdwu2X8NsA+ADnPHI8wKCgBh1HCmRr/A==} engines: {node: '>=0.10.0'} peerDependencies: - react: 0.0.0-experimental-93b58361-20250209 - react-dom: 0.0.0-experimental-93b58361-20250209 + react: ^19.1.0 + react-dom: ^19.1.0 react-test-renderer@19.1.0: resolution: {integrity: sha512-jXkSl3CpvPYEF+p/eGDLB4sPoDX8pKkYvRl9+rR8HxLY0X04vW7hCm1/0zHoUSjPZ3bDa+wXWNTDVIw/R8aDVw==} peerDependencies: react: ^19.1.0 - react@0.0.0-experimental-93b58361-20250209: - resolution: {integrity: sha512-/XlQy7qjc/uVVhsqtty/kO7ZONu0fOFGPgN55HosxJTkiqm1KThznjYk6QKT6xowLEE8elrQ2qFePQ2M2t5oGQ==} - engines: {node: '>=0.10.0'} - react@19.1.0: resolution: {integrity: sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==} engines: {node: '>=0.10.0'} @@ -9220,9 +9211,6 @@ packages: resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==} engines: {node: '>=v12.22.7'} - scheduler@0.0.0-experimental-93b58361-20250209: - resolution: {integrity: sha512-/jHVwrXds2Amuht81tUvUBZsziu1rzbtd1TYnDWmFU+tHWeRGOw88DjGcUrWRGJem63nDzVZwl0wY+flJXj6JQ==} - scheduler@0.26.0: resolution: {integrity: sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA==} @@ -19247,11 +19235,6 @@ snapshots: iconv-lite: 0.4.24 unpipe: 1.0.0 - react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209): - dependencies: - react: 0.0.0-experimental-93b58361-20250209 - scheduler: 0.0.0-experimental-93b58361-20250209 - react-dom@19.1.0(react@19.1.0): dependencies: react: 19.1.0 @@ -19263,12 +19246,7 @@ snapshots: react-refresh@0.14.2: {} - react-server-dom-parcel@0.0.0-experimental-93b58361-20250209(react-dom@0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209))(react@0.0.0-experimental-93b58361-20250209): - dependencies: - react: 0.0.0-experimental-93b58361-20250209 - react-dom: 0.0.0-experimental-93b58361-20250209(react@0.0.0-experimental-93b58361-20250209) - - react-server-dom-parcel@0.0.0-experimental-93b58361-20250209(react-dom@19.1.0(react@19.1.0))(react@19.1.0): + react-server-dom-parcel@19.1.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0): dependencies: react: 19.1.0 react-dom: 19.1.0(react@19.1.0) @@ -19279,8 +19257,6 @@ snapshots: react-is: 19.1.0 scheduler: 0.26.0 - react@0.0.0-experimental-93b58361-20250209: {} - react@19.1.0: {} read-cache@1.0.0: @@ -19673,8 +19649,6 @@ snapshots: dependencies: xmlchars: 2.2.0 - scheduler@0.0.0-experimental-93b58361-20250209: {} - scheduler@0.26.0: {} semver@5.7.1: {} From 8866dded16a9ad15c4e943aa3dc65756b360fc8b Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Mon, 12 May 2025 10:11:34 -0400 Subject: [PATCH 090/143] Properly handle errors thrown from loaders/actions/middleware --- packages/react-router/lib/rsc/server.rsc.ts | 27 +++++++++++++------ playground/rsc-vite/server.js | 5 ++++ .../rsc-vite/src/routes/root/root.client.tsx | 23 ++++++++++++++-- playground/rsc-vite/vite.config.ts | 18 ++++++++++++- 4 files changed, 62 insertions(+), 11 deletions(-) diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index 248c6212ef..42e51adf60 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -186,7 +186,10 @@ export async function matchRSCServerRequest({ onError ); if (result) { + // Only enhanced server actions return a result actionResult = result.actionResult ?? undefined; + // Both enhanced server actions and non-enhanced $ACTION_ID_ submissions + // return a new GET request for revalidation request = result.revalidationRequest ?? request; } } @@ -199,6 +202,9 @@ export async function matchRSCServerRequest({ ClientComponentPropsProvider, actionResult ); + // The front end uses this to know whether a 404 status came from app code + // or 404'd and never reached the origin server + response.headers.set("X-Remix-Response", "yes"); return response; } catch (error) { throw error; @@ -242,12 +248,13 @@ async function processServerAction( ): Promise< { revalidationRequest: Request; actionResult?: Promise } | undefined > { - const revalidationRequest = () => + const getRevalidationRequest = () => new Request(request.url, { method: "GET", headers: request.headers, signal: request.signal, }); + const actionId = request.headers.get("rsc-action-id"); if (actionId) { if (!decodeCallServer) { @@ -269,14 +276,15 @@ async function processServerAction( // The error is propagated to the client through the result promise in the stream onError?.(error); } - return { revalidationRequest: revalidationRequest(), actionResult }; + return { + actionResult, + revalidationRequest: getRevalidationRequest(), + }; } if (request.method === "POST") { const formData = await request.formData(); - if ( - Array.from(formData.keys()).some((key) => key.startsWith("$ACTION_ID_")) - ) { + if (Array.from(formData.keys()).some((k) => k.startsWith("$ACTION_ID_"))) { if (!decodeFormAction) { throw new Error( "Cannot handle form actions without a decodeFormAction function" @@ -288,7 +296,9 @@ async function processServerAction( } catch (error) { onError?.(error); } - return { revalidationRequest: revalidationRequest() }; + return { + revalidationRequest: getRevalidationRequest(), + }; } } } @@ -340,7 +350,7 @@ async function getRenderPayload( ); const result = await handler.query(request, { - skipLoaderErrorBubbling: true, + skipLoaderErrorBubbling: isDataRequest, skipRevalidation: isSubmission, ...(routeIdsToLoad ? { filterMatchesToLoad: (m) => routeIdsToLoad!.includes(m.route.id) } @@ -592,10 +602,11 @@ async function generateStaticContextResponse( }, }); } else { + let payload = await getPayload(); return generateResponse({ statusCode, headers, - payload: await getPayload(), + payload, }); } } diff --git a/playground/rsc-vite/server.js b/playground/rsc-vite/server.js index 6da9cd7bfa..3fdbde058a 100644 --- a/playground/rsc-vite/server.js +++ b/playground/rsc-vite/server.js @@ -10,6 +10,11 @@ const app = express(); app.use(compression()); app.use(express.static("dist/client")); +app.get("/.well-known/appspecific/com.chrome.devtools.json", (req, res) => { + res.status(404); + res.end(); +}); + app.use( createRequestListener((request) => { return ssr.fetch(request, { diff --git a/playground/rsc-vite/src/routes/root/root.client.tsx b/playground/rsc-vite/src/routes/root/root.client.tsx index fe7ed941d1..ae047706b2 100644 --- a/playground/rsc-vite/src/routes/root/root.client.tsx +++ b/playground/rsc-vite/src/routes/root/root.client.tsx @@ -1,6 +1,10 @@ "use client"; -import { useRouteError, useNavigation } from "react-router"; +import { + useRouteError, + useNavigation, + isRouteErrorResponse, +} from "react-router"; export function ErrorReporter() { const error = useRouteError(); @@ -9,7 +13,22 @@ export function ErrorReporter() { console.log(error); } - return null; + if (isRouteErrorResponse(error)) { + return ( +
+

Error Response

+

Status: {error.status}

+

Data: {JSON.stringify(error.data)}

+
+ ); + } + + return ( +
+

Error

+

{error instanceof Error ? error.message : String(error)}

+
+ ); } export function NavigationState() { diff --git a/playground/rsc-vite/vite.config.ts b/playground/rsc-vite/vite.config.ts index ac0673c423..9781133fa0 100644 --- a/playground/rsc-vite/vite.config.ts +++ b/playground/rsc-vite/vite.config.ts @@ -2,7 +2,7 @@ import * as path from "node:path"; import { cloudflare } from "@cloudflare/vite-plugin"; import reactServerDOM from "@jacob-ebey/vite-react-server-dom"; -import { defineConfig } from "vite"; +import { defineConfig, type ViteDevServer } from "vite"; import tsconfigPaths from "vite-tsconfig-paths"; export default defineConfig({ @@ -39,6 +39,7 @@ export default defineConfig({ }, }, plugins: [ + stupidChromeDevtoolsRequest(), tsconfigPaths({ configNames: ["tsconfig.client.json"] }), reactServerDOM({ browserEnvironment: "client", @@ -67,3 +68,18 @@ export default defineConfig({ }), ], }); + +function stupidChromeDevtoolsRequest() { + return { + name: "stupid-chrome-devtools-request", + configureServer(server: ViteDevServer) { + server.middlewares.use( + "/.well-known/appspecific/com.chrome.devtools.json", + (_, res) => { + res.statusCode = 404; + res.end("Not Found"); + } + ); + }, + }; +} From 28626d62ef07d29c1542b07a0e2b1eb2b2eaed82 Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Tue, 13 May 2025 10:32:56 +1000 Subject: [PATCH 091/143] Remove dynamic `react-router` import from RSC code (#13597) --- packages/react-router/lib/rsc/server.rsc.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index 42e51adf60..d4a463e913 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -1,4 +1,5 @@ import * as React from "react"; +import * as reactRouterClient from "react-router"; import type { ClientActionFunction, @@ -403,7 +404,7 @@ async function generateStaticContextResponse( isSubmission: boolean, actionResult: Promise | undefined, staticContext: StaticHandlerContext, - ClientComponentPropsProviderArg?: ClientComponentPropsProviderType + ClientComponentPropsProvider: ClientComponentPropsProviderType = reactRouterClient.unstable_ClientComponentPropsProvider ): Promise { statusCode = staticContext.statusCode ?? statusCode; @@ -444,10 +445,6 @@ async function generateStaticContextResponse( location: staticContext.location, }; - const ClientComponentPropsProvider = - ClientComponentPropsProviderArg ?? - (await import("react-router")).unstable_ClientComponentPropsProvider; - // Short circuit without matches on submissions if (isSubmission) { return generateResponse({ From 24f5d5ba8802d22c50c1f6ef58140b3f124519dc Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Tue, 13 May 2025 18:56:58 +1000 Subject: [PATCH 092/143] Remove client component wrappers (#13599) --- packages/react-router/index.ts | 1 - packages/react-router/lib/components.tsx | 86 --------------------- packages/react-router/lib/rsc/server.rsc.ts | 76 ++++++------------ playground/rsc-parcel/src/entry.rsc.ts | 2 - 4 files changed, 23 insertions(+), 142 deletions(-) diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts index 812f4baa02..17bc0ffd75 100644 --- a/packages/react-router/index.ts +++ b/packages/react-router/index.ts @@ -290,7 +290,6 @@ export type { export { createCallServer, RSCHydratedRouter } from "./lib/rsc/browser"; export { routeRSCServerRequest, RSCStaticRouter } from "./lib/rsc/server.ssr"; export { getServerStream } from "./lib/rsc/html-stream/browser"; -export { ClientComponentPropsProvider as unstable_ClientComponentPropsProvider } from "./lib/components"; /////////////////////////////////////////////////////////////////////////////// // DANGER! PLEASE READ ME! diff --git a/packages/react-router/lib/components.tsx b/packages/react-router/lib/components.tsx index 3267a05aab..3f790d4bfd 100644 --- a/packages/react-router/lib/components.tsx +++ b/packages/react-router/lib/components.tsx @@ -1137,92 +1137,6 @@ function ResolveAwait({ return <>{toRender}; } -export type RouteComponentProps = { - loaderData: ReturnType; - actionData: ReturnType; - params: ReturnType; - matches: ReturnType; -}; - -function RouteComponentPropsProvider({ - children, -}: { - children: React.ReactElement; -}) { - let props: RouteComponentProps = { - loaderData: useLoaderData(), - actionData: useActionData(), - params: useParams(), - matches: useMatches(), - }; - return React.cloneElement(children, props); -} - -export type HydrateFallbackProps = { - loaderData: ReturnType; - actionData: ReturnType; - params: ReturnType; -}; - -function HydrateFallbackPropsProvider({ - children, -}: { - children: React.ReactElement; -}) { - let props: HydrateFallbackProps = { - loaderData: useLoaderData(), - actionData: useActionData(), - params: useParams(), - }; - return React.cloneElement(children, props); -} - -export type ErrorBoundaryProps = { - loaderData: ReturnType; - actionData: ReturnType; - params: ReturnType; - error: ReturnType; -}; - -function ErrorBoundaryPropsProvider({ - children, -}: { - children: React.ReactElement; -}) { - let props: ErrorBoundaryProps = { - loaderData: useLoaderData(), - actionData: useActionData(), - params: useParams(), - error: useRouteError(), - }; - return React.cloneElement(children, props); -} - -const clientComponentPropsProvidersByType = { - Component: RouteComponentPropsProvider, - ErrorBoundary: ErrorBoundaryPropsProvider, - HydrateFallback: HydrateFallbackPropsProvider, -} as const; - -export function ClientComponentPropsProvider({ - __type: type, - children, -}: { - __type: keyof typeof clientComponentPropsProvidersByType; - children: React.ReactElement; -}) { - const Provider = clientComponentPropsProvidersByType[type]; - - if (!Provider) { - throw new Error(`Invalid type: ${type}`); - } - - return {children}; -} - -export type ClientComponentPropsProviderType = - typeof ClientComponentPropsProvider; - /////////////////////////////////////////////////////////////////////////////// // UTILS /////////////////////////////////////////////////////////////////////////////// diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index d4a463e913..a09cf67785 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -28,12 +28,6 @@ import { } from "../router/utils"; import { getDocumentHeaders } from "../server-runtime/headers"; import type { RouteMatch } from "../context"; -import type { - RouteComponentProps, - HydrateFallbackProps, - ErrorBoundaryProps, - ClientComponentPropsProviderType, -} from "../components"; type ServerRouteObjectBase = { action?: ActionFunction; @@ -157,7 +151,6 @@ export async function matchRSCServerRequest({ request, routes, generateResponse, - unstable_ClientComponentPropsProvider: ClientComponentPropsProvider, }: { decodeCallServer?: DecodeCallServerFunction; decodeFormAction?: DecodeFormActionFunction; @@ -165,7 +158,6 @@ export async function matchRSCServerRequest({ request: Request; routes: ServerRouteObject[]; generateResponse: (match: ServerMatch) => Response; - unstable_ClientComponentPropsProvider?: ClientComponentPropsProviderType; }): Promise { const url = new URL(request.url); @@ -200,7 +192,6 @@ export async function matchRSCServerRequest({ request, routes, generateResponse, - ClientComponentPropsProvider, actionResult ); // The front end uses this to know whether a 404 status came from app code @@ -308,7 +299,6 @@ async function getRenderPayload( request: Request, routes: ServerRouteObject[], generateResponse: (match: ServerMatch) => Response, - ClientComponentPropsProvider?: ClientComponentPropsProviderType, actionResult?: Promise ): Promise { // If this is a RR submission, we just want the `actionData` but don't want @@ -346,8 +336,7 @@ async function getRenderPayload( isDataRequest, isSubmission, actionResult, - staticContext, - ClientComponentPropsProvider + staticContext ); const result = await handler.query(request, { @@ -403,8 +392,7 @@ async function generateStaticContextResponse( isDataRequest: boolean, isSubmission: boolean, actionResult: Promise | undefined, - staticContext: StaticHandlerContext, - ClientComponentPropsProvider: ClientComponentPropsProviderType = reactRouterClient.unstable_ClientComponentPropsProvider + staticContext: StaticHandlerContext ): Promise { statusCode = staticContext.statusCode ?? statusCode; @@ -486,57 +474,39 @@ async function generateStaticContextResponse( : React.createElement( Layout, null, - Component.$$typeof === Symbol.for("react.client.reference") - ? React.createElement(ClientComponentPropsProvider, { - __type: "Component", - children: React.createElement(Component), - }) - : React.createElement(Component, { - loaderData, - actionData, - params, - matches: staticContext.matches.map((match) => - convertRouteMatchToUiMatch( - match, - staticContext.loaderData - ) - ), - } satisfies RouteComponentProps) + React.createElement(Component, { + loaderData, + actionData, + params, + matches: staticContext.matches.map((match) => + convertRouteMatchToUiMatch(match, staticContext.loaderData) + ), + }) ) : undefined; const errorElement = ErrorBoundary ? React.createElement( Layout, null, - Component.$$typeof === Symbol.for("react.client.reference") - ? React.createElement(ClientComponentPropsProvider, { - __type: "ErrorBoundary", - children: React.createElement(ErrorBoundary), - }) - : React.createElement(ErrorBoundary, { - loaderData, - actionData, - params, - error: [...staticContext.matches] - .reverse() - .find((match) => staticContext.errors?.[match.route.id]), - } satisfies ErrorBoundaryProps) + React.createElement(ErrorBoundary, { + loaderData, + actionData, + params, + error: [...staticContext.matches] + .reverse() + .find((match) => staticContext.errors?.[match.route.id]), + }) ) : undefined; const hydrateFallbackElement = HydrateFallback ? React.createElement( Layout, null, - Component.$$typeof === Symbol.for("react.client.reference") - ? React.createElement(ClientComponentPropsProvider, { - __type: "HydrateFallback", - children: React.createElement(HydrateFallback), - }) - : React.createElement(HydrateFallback, { - loaderData, - actionData, - params, - } satisfies HydrateFallbackProps) + React.createElement(HydrateFallback, { + loaderData, + actionData, + params, + }) ) : match.route.id === "root" ? // FIXME: This should use the `RemixRootDefaultErrorBoundary` but that diff --git a/playground/rsc-parcel/src/entry.rsc.ts b/playground/rsc-parcel/src/entry.rsc.ts index ce1ad473b7..9080e93ebc 100644 --- a/playground/rsc-parcel/src/entry.rsc.ts +++ b/playground/rsc-parcel/src/entry.rsc.ts @@ -12,7 +12,6 @@ import { type DecodeFormActionFunction, matchRSCServerRequest, } from "react-router/rsc"; -import { unstable_ClientComponentPropsProvider } from "react-router" assert { env: "client" }; import { routes } from "./routes"; @@ -35,7 +34,6 @@ export function callServer(request: Request) { request, // @ts-expect-error routes, - unstable_ClientComponentPropsProvider, generateResponse(match) { return new Response(renderToReadableStream(match.payload), { status: match.statusCode, From 5c7b7f7cf57f0fa2bde23441cb96b3f147e00871 Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Tue, 13 May 2025 20:15:44 +1000 Subject: [PATCH 093/143] Use object for `routeRSCServerRequest` args (#13600) --- packages/react-router/lib/rsc/server.ssr.tsx | 19 ++++++++++++------- playground/rsc-parcel/src/entry.ssr.tsx | 10 +++++----- playground/rsc-vite/src/ssr/entry.ssr.tsx | 10 +++++----- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/packages/react-router/lib/rsc/server.ssr.tsx b/packages/react-router/lib/rsc/server.ssr.tsx index 54110e961c..120f8f6eb2 100644 --- a/packages/react-router/lib/rsc/server.ssr.tsx +++ b/packages/react-router/lib/rsc/server.ssr.tsx @@ -6,14 +6,19 @@ import { createStaticRouter, StaticRouterProvider } from "../dom/server"; import { injectRSCPayload } from "./html-stream/server"; import type { ServerPayload } from "./server.rsc"; -export async function routeRSCServerRequest( - request: Request, - requestServer: (request: Request) => Promise, - decode: (body: ReadableStream) => Promise, +export async function routeRSCServerRequest({ + request, + callServer, + decode, + renderHTML, +}: { + request: Request; + callServer: (request: Request) => Promise; + decode: (body: ReadableStream) => Promise; renderHTML: ( getPayload: () => Promise - ) => ReadableStream | Promise> -) { + ) => ReadableStream | Promise>; +}) { const url = new URL(request.url); let serverRequest = request; const isDataRequest = isReactServerRequest(url); @@ -36,7 +41,7 @@ export async function routeRSCServerRequest( } as RequestInit & { duplex?: "half" }); } - const serverResponse = await requestServer(serverRequest); + const serverResponse = await callServer(serverRequest); if (respondWithRSCPayload) { return serverResponse; diff --git a/playground/rsc-parcel/src/entry.ssr.tsx b/playground/rsc-parcel/src/entry.ssr.tsx index e872b9d3d0..32c9e6d6ca 100644 --- a/playground/rsc-parcel/src/entry.ssr.tsx +++ b/playground/rsc-parcel/src/entry.ssr.tsx @@ -17,11 +17,11 @@ app.use("/client", express.static("dist/client")); app.use( createRequestListener(async (request) => { - return routeRSCServerRequest( + return routeRSCServerRequest({ request, callServer, - createFromReadableStream, - async (getPayload) => { + decode: createFromReadableStream, + async renderHTML(getPayload) { return await renderHTMLToReadableStream( , { @@ -30,8 +30,8 @@ app.use( ).bootstrapScript, } ); - } - ); + }, + }); }) ); diff --git a/playground/rsc-vite/src/ssr/entry.ssr.tsx b/playground/rsc-vite/src/ssr/entry.ssr.tsx index edc4c8e8cc..45040b4e0d 100644 --- a/playground/rsc-vite/src/ssr/entry.ssr.tsx +++ b/playground/rsc-vite/src/ssr/entry.ssr.tsx @@ -18,11 +18,11 @@ export default { async fetch(request, { SERVER }) { const callServer = async (request: Request) => await SERVER.fetch(request); try { - return await routeRSCServerRequest( + return await routeRSCServerRequest({ request, callServer, - (body) => RSD.createFromReadableStream(body, manifest), - async (getPayload) => { + decode: (body) => RSD.createFromReadableStream(body, manifest), + async renderHTML(getPayload) { return await RDS.renderToReadableStream( , { @@ -30,8 +30,8 @@ export default { signal: request.signal, } ); - } - ); + }, + }); } catch (reason) { console.error(reason); return new Response("Internal Server Error", { status: 500 }); From 1398c7a8171468d1db5607004e3c9d682eec971e Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Tue, 13 May 2025 16:19:02 -0400 Subject: [PATCH 094/143] Support middleware on RSC server actions --- packages/react-router/lib/router/router.ts | 102 +++++++++++++++++-- packages/react-router/lib/rsc/server.rsc.ts | 89 ++++++++-------- playground/rsc-vite/src/routes/root/root.tsx | 4 +- 3 files changed, 145 insertions(+), 50 deletions(-) diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts index 867b7e3609..50e7ad3547 100644 --- a/packages/react-router/lib/router/router.ts +++ b/packages/react-router/lib/router/router.ts @@ -437,6 +437,10 @@ export interface StaticHandler { unstable_respond?: ( staticContext: StaticHandlerContext ) => MaybePromise; + unstable_stream?: ( + context: unstable_RouterContextProvider, + query: (r: Request) => Promise + ) => MaybePromise; } ): Promise; queryRoute( @@ -3531,6 +3535,7 @@ export function createStaticHandler( skipLoaderErrorBubbling, skipRevalidation, dataStrategy, + unstable_stream: stream, unstable_respond: respond, }: Parameters[1] = {} ): Promise { @@ -3583,12 +3588,14 @@ export function createStaticHandler( } if ( - respond && - matches.some( - (m) => - m.route.unstable_middleware || - (typeof m.route.lazy === "object" && m.route.lazy.unstable_middleware) - ) + stream || + (respond && + matches.some( + (m) => + m.route.unstable_middleware || + (typeof m.route.lazy === "object" && + m.route.lazy.unstable_middleware) + )) ) { invariant( requestContext instanceof unstable_RouterContextProvider, @@ -3613,6 +3620,78 @@ export function createStaticHandler( }, true, async () => { + /** + * TODO: stream() is a potential breaking change to the unstable_respond() + * API, implemented as a sibling option for now so as not to break + * any existing middleware logic. + * + * stream() gives us 3 things: + * - It _always_ runs the middleware pipeline down to the stream() + * function even if middleware doesn't exist + * - we can now insert arbitrary logic at the end of the middleware + * chain (inside the leaf next() call) such as running a server + * action and let route middlewares apply to that action. + * - We have control over the calling./awaiting of query() which + * theoretically would allow us to send down the actionResult + * immediately and then stream the entirety of the query/staticContext + * info. That has other implications though which we may not want, + * such as not being able to leverage headers(), or respect + * redirects from loaders after a server action, etc. + * - If we decide this isn't warranted than the stream implementation + * can simplify and potentially even collapse back into respond() + * + * Another totally different approach (larger LOE) would be to extract + * static handler middleware to be fully composable: + * + * // Current behavior + * let res = handler.middleware(request, (context) => { + * let results = handler.query(request, context); + * return generateResponse({ + * type: 'render', + * payload: results + * }); + * }) + * + * // RSC Server Action behavior + * let res = handler.middleware(request, (context) => { + * let actionResult = serverAction(request); + * let revalidationRequest = new Request(...) + * let payloadPromise = handler.query(revalidationRequest, context) + * .then(context => getPayload(context)); + * return generateResponse({ + * type: 'action', + * actionResult,, + * rerender: payloadPromise + * }); + * }) + **/ + if (stream) { + let res = await stream( + requestContext as unstable_RouterContextProvider, + async (revalidationRequest: Request) => { + let result = await queryImpl( + revalidationRequest, + location, + matches!, + requestContext, + dataStrategy || null, + skipLoaderErrorBubbling === true, + null, + filterMatchesToLoad || null, + skipRevalidation === true + ); + + return isResponse(result) + ? result + : { location, basename, ...result }; + } + ); + return res; + } + + // Should always be true given the if statement above + invariant(respond, "Expected respond to be defined"); + let result = await queryImpl( request, location, @@ -3638,6 +3717,17 @@ export function createStaticHandler( return res; }, async (error, routeId) => { + if (stream) { + // FIXME: Implement! + invariant( + false, + "stream() Not implemented for middleware errors yet" + ); + } + + // Should always be true given the if statement above + invariant(respond, "Expected respond to be defined"); + if (isResponse(error)) { return error; } diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index a09cf67785..f9a6088927 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -28,6 +28,7 @@ import { } from "../router/utils"; import { getDocumentHeaders } from "../server-runtime/headers"; import type { RouteMatch } from "../context"; +import invariant from "../server-runtime/invariant"; type ServerRouteObjectBase = { action?: ActionFunction; @@ -170,37 +171,18 @@ export async function matchRSCServerRequest({ return response; } - let actionResult: Promise | undefined; - if (request.headers.get("rsc-action-id") || request.method === "POST") { - let result = await processServerAction( - request, - decodeCallServer, - decodeFormAction, - onError - ); - if (result) { - // Only enhanced server actions return a result - actionResult = result.actionResult ?? undefined; - // Both enhanced server actions and non-enhanced $ACTION_ID_ submissions - // return a new GET request for revalidation - request = result.revalidationRequest ?? request; - } - } - - try { - let response = await getRenderPayload( - request, - routes, - generateResponse, - actionResult - ); - // The front end uses this to know whether a 404 status came from app code - // or 404'd and never reached the origin server - response.headers.set("X-Remix-Response", "yes"); - return response; - } catch (error) { - throw error; - } + let response = await getRenderPayload( + request, + routes, + decodeCallServer, + decodeFormAction, + onError, + generateResponse + ); + // The front end uses this to know whether a 404 status came from app code + // or 404'd and never reached the origin server + response.headers.set("X-Remix-Response", "yes"); + return response; } async function generateManifestResponse( @@ -298,6 +280,9 @@ async function processServerAction( async function getRenderPayload( request: Request, routes: ServerRouteObject[], + decodeCallServer: DecodeCallServerFunction | undefined, + decodeFormAction: DecodeFormActionFunction | undefined, + onError: ((error: unknown) => void) | undefined, generateResponse: (match: ServerMatch) => Response, actionResult?: Promise ): Promise { @@ -327,7 +312,10 @@ async function getRenderPayload( // Create the handler here with exploded routes const handler = createStaticHandler(routes); - const respond = (staticContext: StaticHandlerContext) => + const respond = ( + staticContext: StaticHandlerContext, + actionResult?: Promise | undefined + ) => generateStaticContextResponse( routes, generateResponse, @@ -345,11 +333,30 @@ async function getRenderPayload( ...(routeIdsToLoad ? { filterMatchesToLoad: (m) => routeIdsToLoad!.includes(m.route.id) } : null), - unstable_respond(result) { - if (isResponse(result)) { - return generateRedirectResponse(statusCode, result, generateResponse); + async unstable_stream(context, query) { + let actionResult: Promise | undefined; + if (request.method === "POST") { + let result = await processServerAction( + request, + decodeCallServer, + decodeFormAction, + onError + ); + actionResult = result?.actionResult; + request = result?.revalidationRequest ?? request; } - return respond(result); + + let staticContext = await query(request); + + if (isResponse(staticContext)) { + return generateRedirectResponse( + statusCode, + staticContext, + generateResponse + ); + } + + return respond(staticContext, actionResult); }, }); @@ -357,10 +364,8 @@ async function getRenderPayload( return generateRedirectResponse(statusCode, result, generateResponse); } - // while middleware is still unstable, we don't run the middleware pipeline - // if no routes have middleware, so we still might need to convert context - // to a response here - return isResponse(result) ? result : respond(result); + invariant(isResponse(result), "Expected a response from query"); + return result; } function generateRedirectResponse( @@ -409,7 +414,7 @@ async function generateStaticContextResponse( // In the RSC world we set `hasLoader:true` eve if a route doesn't have a // loader so that we always make the single fetch call to get the rendered - // `element`. We add a `null`value for any of the routes that don't + // `element`. We add a `null` value for any of the routes that don't // actually have a loader so the single fetch logic can find a result for // the route. This is a bit of a hack but allows us to re-use all the // existing logic. This can go away if we ever fork off and re-implement a @@ -434,7 +439,7 @@ async function generateStaticContextResponse( }; // Short circuit without matches on submissions - if (isSubmission) { + if (!actionResult && isSubmission) { return generateResponse({ statusCode, headers, diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx index 9c6fb96a30..9be565ccc9 100644 --- a/playground/rsc-vite/src/routes/root/root.tsx +++ b/playground/rsc-vite/src/routes/root/root.tsx @@ -11,9 +11,9 @@ export function headers() { export const unstable_middleware = [ async ({ request, context }, next) => { - console.log("start middleware on RSC server"); + console.log(">>> RSC middleware", request.url); let res = await next(); - console.log("end middleware on RSC server"); + console.log("<<< RSC middleware", request.url); return res; }, ]; From 19ee16c3e1e859f16d99c855f2a5cb6ab52952da Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Tue, 13 May 2025 16:53:42 -0400 Subject: [PATCH 095/143] Ensure stream is called on 404/405 errors --- packages/react-router/lib/router/router.ts | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts index 50e7ad3547..2852ed466f 100644 --- a/packages/react-router/lib/router/router.ts +++ b/packages/react-router/lib/router/router.ts @@ -3566,7 +3566,13 @@ export function createStaticHandler( loaderHeaders: {}, actionHeaders: {}, }; - return respond ? respond(staticContext) : staticContext; + return stream + ? stream(requestContext as unstable_RouterContextProvider, () => + Promise.resolve(staticContext) + ) + : respond + ? respond(staticContext) + : staticContext; } else if (!matches) { let error = getInternalRouterError(404, { pathname: location.pathname }); let { matches: notFoundMatches, route } = @@ -3584,7 +3590,13 @@ export function createStaticHandler( loaderHeaders: {}, actionHeaders: {}, }; - return respond ? respond(staticContext) : staticContext; + return stream + ? stream(requestContext as unstable_RouterContextProvider, () => + Promise.resolve(staticContext) + ) + : respond + ? respond(staticContext) + : staticContext; } if ( From 3f68c7c209b736f84c2c949d72c430c2e692db88 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Tue, 13 May 2025 17:05:29 -0400 Subject: [PATCH 096/143] Handle middleware errors via stream --- packages/react-router/lib/router/router.ts | 65 ++++++++++------------ 1 file changed, 29 insertions(+), 36 deletions(-) diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts index 2852ed466f..9b06511b2c 100644 --- a/packages/react-router/lib/router/router.ts +++ b/packages/react-router/lib/router/router.ts @@ -3548,6 +3548,18 @@ export function createStaticHandler( ? requestContext : new unstable_RouterContextProvider(); + let respondOrStreamStaticContext = ( + ctx: StaticHandlerContext + ): MaybePromise | undefined => { + return stream + ? stream(requestContext as unstable_RouterContextProvider, () => + Promise.resolve(ctx) + ) + : respond + ? respond(ctx) + : undefined; + }; + // SSR supports HEAD requests while SPA doesn't if (!isValidMethod(method) && method !== "HEAD") { let error = getInternalRouterError(405, { method }); @@ -3566,13 +3578,7 @@ export function createStaticHandler( loaderHeaders: {}, actionHeaders: {}, }; - return stream - ? stream(requestContext as unstable_RouterContextProvider, () => - Promise.resolve(staticContext) - ) - : respond - ? respond(staticContext) - : staticContext; + return respondOrStreamStaticContext(staticContext) || staticContext; } else if (!matches) { let error = getInternalRouterError(404, { pathname: location.pathname }); let { matches: notFoundMatches, route } = @@ -3590,13 +3596,7 @@ export function createStaticHandler( loaderHeaders: {}, actionHeaders: {}, }; - return stream - ? stream(requestContext as unstable_RouterContextProvider, () => - Promise.resolve(staticContext) - ) - : respond - ? respond(staticContext) - : staticContext; + return respondOrStreamStaticContext(staticContext) || staticContext; } if ( @@ -3729,17 +3729,6 @@ export function createStaticHandler( return res; }, async (error, routeId) => { - if (stream) { - // FIXME: Implement! - invariant( - false, - "stream() Not implemented for middleware errors yet" - ); - } - - // Should always be true given the if statement above - invariant(respond, "Expected respond to be defined"); - if (isResponse(error)) { return error; } @@ -3756,15 +3745,16 @@ export function createStaticHandler( renderedStaticContext.loaderData[routeId] = undefined; } - return respond( - getStaticContextFromError( - dataRoutes, - renderedStaticContext, - error, - skipLoaderErrorBubbling - ? routeId - : findNearestBoundary(matches, routeId).route.id - ) + let staticContext = getStaticContextFromError( + dataRoutes, + renderedStaticContext, + error, + skipLoaderErrorBubbling + ? routeId + : findNearestBoundary(matches, routeId).route.id + ); + return ( + respondOrStreamStaticContext(staticContext) || staticContext ); } else { // We never even got to the handlers, so we've got no data - @@ -3782,7 +3772,7 @@ export function createStaticHandler( )?.route.id || routeId ).route.id; - return respond({ + let staticContext: StaticHandlerContext = { matches: matches!, location, basename, @@ -3794,7 +3784,10 @@ export function createStaticHandler( statusCode: isRouteErrorResponse(error) ? error.status : 500, actionHeaders: {}, loaderHeaders: {}, - }); + }; + return ( + respondOrStreamStaticContext(staticContext) || staticContext + ); } } ); From 6e7c213d3b6882cd8f8b4cf38eef2c638d0fcbe6 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Wed, 14 May 2025 15:53:15 -0400 Subject: [PATCH 097/143] Skip rendering server components that won't surface to the UI --- packages/react-router/lib/rsc/server.rsc.ts | 105 ++++++++++++-------- 1 file changed, 65 insertions(+), 40 deletions(-) diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index f9a6088927..99fb5a51a6 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -283,8 +283,7 @@ async function getRenderPayload( decodeCallServer: DecodeCallServerFunction | undefined, decodeFormAction: DecodeFormActionFunction | undefined, onError: ((error: unknown) => void) | undefined, - generateResponse: (match: ServerMatch) => Response, - actionResult?: Promise + generateResponse: (match: ServerMatch) => Response ): Promise { // If this is a RR submission, we just want the `actionData` but don't want // to call any loaders or render any components back in the response - that @@ -312,20 +311,6 @@ async function getRenderPayload( // Create the handler here with exploded routes const handler = createStaticHandler(routes); - const respond = ( - staticContext: StaticHandlerContext, - actionResult?: Promise | undefined - ) => - generateStaticContextResponse( - routes, - generateResponse, - statusCode, - routeIdsToLoad, - isDataRequest, - isSubmission, - actionResult, - staticContext - ); const result = await handler.query(request, { skipLoaderErrorBubbling: isDataRequest, @@ -334,6 +319,10 @@ async function getRenderPayload( ? { filterMatchesToLoad: (m) => routeIdsToLoad!.includes(m.route.id) } : null), async unstable_stream(context, query) { + // If this is an RSC server action, process that and then call query as a + // revalidation. If this is a RR Form/Fetcher submission, + // `processServerAction` will fall through as a no-op and we'll pass the + // POST `request` to `query` and process our action there. let actionResult: Promise | undefined; if (request.method === "POST") { let result = await processServerAction( @@ -356,7 +345,16 @@ async function getRenderPayload( ); } - return respond(staticContext, actionResult); + return generateStaticContextResponse( + routes, + generateResponse, + statusCode, + routeIdsToLoad, + isDataRequest, + isSubmission, + actionResult, + staticContext + ); }, }); @@ -401,16 +399,16 @@ async function generateStaticContextResponse( ): Promise { statusCode = staticContext.statusCode ?? statusCode; - const errors = staticContext.errors - ? Object.fromEntries( - Object.entries(staticContext.errors).map(([key, error]) => [ - key, - isRouteErrorResponse(error) - ? Object.fromEntries(Object.entries(error)) - : error, - ]) - ) - : staticContext.errors; + if (staticContext.errors) { + staticContext.errors = Object.fromEntries( + Object.entries(staticContext.errors).map(([key, error]) => [ + key, + isRouteErrorResponse(error) + ? Object.fromEntries(Object.entries(error)) + : error, + ]) + ); + } // In the RSC world we set `hasLoader:true` eve if a route doesn't have a // loader so that we always make the single fetch call to get the rendered @@ -433,7 +431,7 @@ async function generateStaticContextResponse( const payload: Omit = { type: "render", actionData: staticContext.actionData, - errors, + errors: staticContext.errors, loaderData: staticContext.loaderData, location: staticContext.location, }; @@ -451,9 +449,27 @@ async function generateStaticContextResponse( }); } - let lastMatch: AgnosticDataRouteMatch | null = null; + // Figure out how deep we want to render server components based on any + // triggered error boundaries and/or `routeIdsToLoad` + let deepestRenderedRouteIdx = staticContext.matches.length - 1; + // Capture parentIds for assignment on the ServerRouteMatch later + let parentIds: Record = {}; + + staticContext.matches.forEach((m, i) => { + if (i > 0) { + parentIds[m.route.id] = staticContext.matches[i - 1].route.id; + } + if ( + staticContext.errors && + m.route.id in staticContext.errors && + deepestRenderedRouteIdx > i + ) { + deepestRenderedRouteIdx = i; + } + }); + let matchesPromise = Promise.all( - staticContext.matches.map(async (match) => { + staticContext.matches.map(async (match, i) => { if ("lazy" in match.route && match.route.lazy) { Object.assign(match.route, { // @ts-expect-error - FIXME: Fix the types here @@ -473,10 +489,20 @@ async function generateStaticContextResponse( const actionData = staticContext.actionData?.[match.route.id]; const params = match.params; // TODO: DRY this up once it's fully fleshed out + + // Only bother rendering Server Components for routes that we're surfacing, + // so nothing at/below an error boundary and prune routes if included in + // `routeIdsToLoad`. This is specifically important when a middleware + // or loader throws and we don't have any `loaderData` to pass through as + // props leading to render-time errors of the server component + let shouldRenderComponent = + i <= deepestRenderedRouteIdx && + (!routeIdsToLoad || routeIdsToLoad.includes(match.route.id)) && + (!staticContext.errors || !(match.route.id in staticContext.errors)); + const element = Component - ? staticContext.errors?.[match.route.id] - ? (false as const) - : React.createElement( + ? shouldRenderComponent + ? React.createElement( Layout, null, React.createElement(Component, { @@ -488,6 +514,9 @@ async function generateStaticContextResponse( ), }) ) + : // TODO: Is this necessary? In my quick testing undefined seemed to + // work as well so we could eliminate the nested ternary + (false as const) : undefined; const errorElement = ErrorBoundary ? React.createElement( @@ -520,7 +549,7 @@ async function generateStaticContextResponse( React.createElement("p", null, "Loading!") : undefined; - let result = { + return { clientAction: (match.route as any).clientAction, clientLoader: (match.route as any).clientLoader, element, @@ -535,14 +564,12 @@ async function generateStaticContextResponse( links: (match.route as any).links, meta: (match.route as any).meta, params, - parentId: lastMatch?.route.id, + parentId: parentIds[match.route.id], path: match.route.path, pathname: match.pathname, pathnameBase: match.pathnameBase, shouldRevalidate: (match.route as any).shouldRevalidate, }; - lastMatch = match; - return result; }) ); @@ -550,9 +577,7 @@ async function generateStaticContextResponse( const matches = await matchesPromise; return { ...payload, - matches: routeIdsToLoad - ? matches.filter((m) => routeIdsToLoad.includes(m.id)) - : matches, + matches, patches: !isDataRequest ? await getAdditionalRoutePatches( staticContext.location.pathname, From 00bea5e61a764f43dfcec948b6c9a89e683c918d Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Wed, 14 May 2025 15:58:23 -0400 Subject: [PATCH 098/143] Minor cleanups to server.rsc (#13609) --- packages/react-router/lib/rsc/server.rsc.ts | 336 +++++++++++--------- 1 file changed, 182 insertions(+), 154 deletions(-) diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index 99fb5a51a6..342a9f01e1 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -171,7 +171,7 @@ export async function matchRSCServerRequest({ return response; } - let response = await getRenderPayload( + let response = await generateRenderResponse( request, routes, decodeCallServer, @@ -191,7 +191,18 @@ async function generateManifestResponse( generateResponse: (match: ServerMatch) => Response ) { let url = new URL(request.url); - const matches = matchRoutes(routes, url.pathname.replace(/\.manifest$/, "")); + let matches = matchRoutes(routes, url.pathname.replace(/\.manifest$/, "")); + let payload: ServerManifestPayload = { + type: "manifest", + matches: await Promise.all( + matches?.map((m, i) => getRoute(m.route, matches[i - 1]?.route.id)) ?? [] + ), + patches: await getAdditionalRoutePatches( + url.pathname, + routes, + matches?.map((m) => m.route.id) ?? [] + ), + }; return generateResponse({ statusCode: 200, @@ -199,18 +210,7 @@ async function generateManifestResponse( "Content-Type": "text/x-component", Vary: "Content-Type", }), - payload: { - type: "manifest", - matches: await Promise.all( - matches?.map((m, i) => getRoute(m.route, matches[i - 1]?.route.id)) ?? - [] - ), - patches: await getAdditionalRoutePatches( - url.pathname, - routes, - matches?.map((m) => m.route.id) ?? [] - ), - }, + payload, }); } @@ -277,7 +277,7 @@ async function processServerAction( } } -async function getRenderPayload( +async function generateRenderResponse( request: Request, routes: ServerRouteObject[], decodeCallServer: DecodeCallServerFunction | undefined, @@ -371,19 +371,20 @@ function generateRedirectResponse( response: Response, generateResponse: (match: ServerMatch) => Response ) { + let payload: ServerRedirectPayload = { + type: "redirect", + location: response.headers.get("Location") || "", + reload: response.headers.get("X-Remix-Reload-Document") === "true", + replace: response.headers.get("X-Remix-Replace") === "true", + status: response.status, + }; return generateResponse({ statusCode, headers: new Headers({ "Content-Type": "text/x-component", Vary: "Content-Type", }), - payload: { - type: "redirect", - location: response.headers.get("Location") || "", - reload: response.headers.get("X-Remix-Reload-Document") === "true", - replace: response.headers.get("X-Remix-Replace") === "true", - status: response.status, - }, + payload, }); } @@ -428,7 +429,7 @@ async function generateStaticContextResponse( (match) => (match as RouteMatch).route.headers ); - const payload: Omit = { + const baseRenderPayload: Omit = { type: "render", actionData: staticContext.actionData, errors: staticContext.errors, @@ -436,19 +437,51 @@ async function generateStaticContextResponse( location: staticContext.location, }; - // Short circuit without matches on submissions - if (!actionResult && isSubmission) { - return generateResponse({ - statusCode, - headers, - payload: { - ...payload, - matches: [], - patches: [], - }, - }); + const renderPayloadPromise = () => + getRenderPayload( + baseRenderPayload, + routes, + routeIdsToLoad, + isDataRequest, + staticContext + ); + + let payload: ServerRenderPayload | ServerActionPayload; + + if (actionResult) { + // Don't await the payload so we can stream down the actionResult immediately + payload = { + type: "action", + actionResult, + rerender: renderPayloadPromise(), + }; + } else if (isSubmission) { + // Short circuit without matches on non server-action submissions since + // we'll revalidate in a separate request + payload = { + ...baseRenderPayload, + matches: [], + patches: [], + }; + } else { + // Await the full RSC render on all normal requests + payload = await renderPayloadPromise(); } + return generateResponse({ + statusCode, + headers, + payload, + }); +} + +async function getRenderPayload( + baseRenderPayload: Omit, + routes: ServerRouteObject[], + routeIdsToLoad: string[] | null, + isDataRequest: boolean, + staticContext: StaticHandlerContext +) { // Figure out how deep we want to render server components based on any // triggered error boundaries and/or `routeIdsToLoad` let deepestRenderedRouteIdx = staticContext.matches.length - 1; @@ -469,27 +502,7 @@ async function generateStaticContextResponse( }); let matchesPromise = Promise.all( - staticContext.matches.map(async (match, i) => { - if ("lazy" in match.route && match.route.lazy) { - Object.assign(match.route, { - // @ts-expect-error - FIXME: Fix the types here - ...((await match.route.lazy()) as any), - path: match.route.path, - index: (match.route as any).index, - id: match.route.id, - }); - match.route.lazy = undefined; - } - - const Layout = (match.route as any).Layout || React.Fragment; - const Component = (match.route as any).default; - const ErrorBoundary = (match.route as any).ErrorBoundary; - const HydrateFallback = (match.route as any).HydrateFallback; - const loaderData = staticContext.loaderData[match.route.id]; - const actionData = staticContext.actionData?.[match.route.id]; - const params = match.params; - // TODO: DRY this up once it's fully fleshed out - + staticContext.matches.map((match, i) => { // Only bother rendering Server Components for routes that we're surfacing, // so nothing at/below an error boundary and prune routes if included in // `routeIdsToLoad`. This is specifically important when a middleware @@ -500,112 +513,127 @@ async function generateStaticContextResponse( (!routeIdsToLoad || routeIdsToLoad.includes(match.route.id)) && (!staticContext.errors || !(match.route.id in staticContext.errors)); - const element = Component - ? shouldRenderComponent - ? React.createElement( - Layout, - null, - React.createElement(Component, { - loaderData, - actionData, - params, - matches: staticContext.matches.map((match) => - convertRouteMatchToUiMatch(match, staticContext.loaderData) - ), - }) - ) - : // TODO: Is this necessary? In my quick testing undefined seemed to - // work as well so we could eliminate the nested ternary - (false as const) - : undefined; - const errorElement = ErrorBoundary - ? React.createElement( - Layout, - null, - React.createElement(ErrorBoundary, { - loaderData, - actionData, - params, - error: [...staticContext.matches] - .reverse() - .find((match) => staticContext.errors?.[match.route.id]), - }) - ) - : undefined; - const hydrateFallbackElement = HydrateFallback - ? React.createElement( - Layout, - null, - React.createElement(HydrateFallback, { - loaderData, - actionData, - params, - }) - ) - : match.route.id === "root" - ? // FIXME: This should use the `RemixRootDefaultErrorBoundary` but that - // currently uses a hook internally so it fails during RSC. Restructure - // so it can be used safely in an RSC render pass. - React.createElement("p", null, "Loading!") - : undefined; - - return { - clientAction: (match.route as any).clientAction, - clientLoader: (match.route as any).clientLoader, - element, - errorElement, - handle: (match.route as any).handle, - hasAction: !!match.route.action, - hasErrorBoundary: !!(match.route as any).ErrorBoundary, - hasLoader: !!match.route.loader, - hydrateFallbackElement, - id: match.route.id, - index: match.route.index, - links: (match.route as any).links, - meta: (match.route as any).meta, - params, - parentId: parentIds[match.route.id], - path: match.route.path, - pathname: match.pathname, - pathnameBase: match.pathnameBase, - shouldRevalidate: (match.route as any).shouldRevalidate, - }; + return getServerRouteMatch( + staticContext, + match, + shouldRenderComponent, + parentIds[match.route.id] + ); }) ); - const getPayload = async () => { - const matches = await matchesPromise; - return { - ...payload, - matches, - patches: !isDataRequest - ? await getAdditionalRoutePatches( - staticContext.location.pathname, - routes, - matches.map((m) => m.id) - ) - : undefined, - }; + let patchesPromise = !isDataRequest + ? getAdditionalRoutePatches( + staticContext.location.pathname, + routes, + staticContext.matches.map((m) => m.route.id) + ) + : undefined; + + let [matches, patches] = await Promise.all([matchesPromise, patchesPromise]); + + return { + ...baseRenderPayload, + matches, + patches, }; +} - if (actionResult) { - return generateResponse({ - statusCode, - headers, - payload: { - type: "action", - actionResult, - rerender: getPayload(), - }, - }); - } else { - let payload = await getPayload(); - return generateResponse({ - statusCode, - headers, - payload, +async function getServerRouteMatch( + staticContext: StaticHandlerContext, + match: AgnosticDataRouteMatch, + shouldRenderComponent: boolean, + parentId: string | undefined +) { + if ("lazy" in match.route && match.route.lazy) { + Object.assign(match.route, { + // @ts-expect-error - FIXME: Fix the types here + ...((await match.route.lazy()) as any), + path: match.route.path, + index: (match.route as any).index, + id: match.route.id, }); + match.route.lazy = undefined; } + + const Layout = (match.route as any).Layout || React.Fragment; + const Component = (match.route as any).default; + const ErrorBoundary = (match.route as any).ErrorBoundary; + const HydrateFallback = (match.route as any).HydrateFallback; + const loaderData = staticContext.loaderData[match.route.id]; + const actionData = staticContext.actionData?.[match.route.id]; + const params = match.params; + // TODO: DRY this up once it's fully fleshed out + const element = Component + ? shouldRenderComponent + ? React.createElement( + Layout, + null, + React.createElement(Component, { + loaderData, + actionData, + params, + matches: staticContext.matches.map((match) => + convertRouteMatchToUiMatch(match, staticContext.loaderData) + ), + }) + ) + : // TODO: Is this necessary? In my quick testing undefined seemed to + // work as well so we could eliminate the nested ternary + (false as const) + : undefined; + const errorElement = ErrorBoundary + ? React.createElement( + Layout, + null, + React.createElement(ErrorBoundary, { + loaderData, + actionData, + params, + error: [...staticContext.matches] + .reverse() + .find((match) => staticContext.errors?.[match.route.id]), + }) + ) + : undefined; + const hydrateFallbackElement = HydrateFallback + ? React.createElement( + Layout, + null, + React.createElement(HydrateFallback, { + loaderData, + actionData, + params, + }) + ) + : match.route.id === "root" + ? // FIXME: This should use the `RemixRootDefaultErrorBoundary` but that + // currently uses a hook internally so it fails during RSC. Restructure + // so it can be used safely in an RSC render pass. + React.createElement("p", null, "Loading!") + : undefined; + + return { + clientAction: (match.route as any).clientAction, + clientLoader: (match.route as any).clientLoader, + element, + errorElement, + handle: (match.route as any).handle, + hasAction: !!match.route.action, + hasErrorBoundary: !!(match.route as any).ErrorBoundary, + hasLoader: !!match.route.loader, + hydrateFallbackElement, + id: match.route.id, + index: match.route.index, + links: (match.route as any).links, + meta: (match.route as any).meta, + params, + parentId, + path: match.route.path, + pathname: match.pathname, + pathnameBase: match.pathnameBase, + shouldRevalidate: (match.route as any).shouldRevalidate, + }; } async function getRoute( From d1966d4d09ac6e7e3d04da96730ac6a7926d540b Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Wed, 14 May 2025 16:39:40 -0400 Subject: [PATCH 099/143] PAss context provider to server components as a prop --- packages/react-router/lib/rsc/server.rsc.ts | 30 ++++++++++++++------ packages/react-router/rsc-export.ts | 7 +++++ playground/rsc-vite/src/routes/root/root.tsx | 13 ++++++++- 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index 342a9f01e1..358fabf4d8 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -1,5 +1,4 @@ import * as React from "react"; -import * as reactRouterClient from "react-router"; import type { ClientActionFunction, @@ -25,6 +24,7 @@ import { isRouteErrorResponse, matchRoutes, convertRouteMatchToUiMatch, + unstable_RouterContextProvider, } from "../router/utils"; import { getDocumentHeaders } from "../server-runtime/headers"; import type { RouteMatch } from "../context"; @@ -195,7 +195,9 @@ async function generateManifestResponse( let payload: ServerManifestPayload = { type: "manifest", matches: await Promise.all( - matches?.map((m, i) => getRoute(m.route, matches[i - 1]?.route.id)) ?? [] + matches?.map((m, i) => + getManifestRoute(m.route, matches[i - 1]?.route.id) + ) ?? [] ), patches: await getAdditionalRoutePatches( url.pathname, @@ -318,7 +320,7 @@ async function generateRenderResponse( ...(routeIdsToLoad ? { filterMatchesToLoad: (m) => routeIdsToLoad!.includes(m.route.id) } : null), - async unstable_stream(context, query) { + async unstable_stream(contextProvider, query) { // If this is an RSC server action, process that and then call query as a // revalidation. If this is a RR Form/Fetcher submission, // `processServerAction` will fall through as a no-op and we'll pass the @@ -353,7 +355,8 @@ async function generateRenderResponse( isDataRequest, isSubmission, actionResult, - staticContext + staticContext, + contextProvider ); }, }); @@ -396,7 +399,8 @@ async function generateStaticContextResponse( isDataRequest: boolean, isSubmission: boolean, actionResult: Promise | undefined, - staticContext: StaticHandlerContext + staticContext: StaticHandlerContext, + contextProvider: unstable_RouterContextProvider ): Promise { statusCode = staticContext.statusCode ?? statusCode; @@ -443,7 +447,8 @@ async function generateStaticContextResponse( routes, routeIdsToLoad, isDataRequest, - staticContext + staticContext, + contextProvider ); let payload: ServerRenderPayload | ServerActionPayload; @@ -480,7 +485,8 @@ async function getRenderPayload( routes: ServerRouteObject[], routeIdsToLoad: string[] | null, isDataRequest: boolean, - staticContext: StaticHandlerContext + staticContext: StaticHandlerContext, + contextProvider: unstable_RouterContextProvider ) { // Figure out how deep we want to render server components based on any // triggered error boundaries and/or `routeIdsToLoad` @@ -515,6 +521,7 @@ async function getRenderPayload( return getServerRouteMatch( staticContext, + contextProvider, match, shouldRenderComponent, parentIds[match.route.id] @@ -541,6 +548,7 @@ async function getRenderPayload( async function getServerRouteMatch( staticContext: StaticHandlerContext, + contextProvider: unstable_RouterContextProvider, match: AgnosticDataRouteMatch, shouldRenderComponent: boolean, parentId: string | undefined @@ -570,6 +578,10 @@ async function getServerRouteMatch( Layout, null, React.createElement(Component, { + // Pass context to server components so it can be used for data loading + ...(Component.$$typeof === Symbol.for("react.client.reference") + ? {} + : { context: contextProvider }), loaderData, actionData, params, @@ -636,7 +648,7 @@ async function getServerRouteMatch( }; } -async function getRoute( +async function getManifestRoute( route: ServerRouteObject, parentId: string | undefined ): Promise { @@ -715,7 +727,7 @@ async function getAdditionalRoutePatches( let patches = await Promise.all( [...patchRouteMatches.values()] .filter((route) => !matchedRouteIds.some((id) => id === route.id)) - .map((route) => getRoute(route, route.parentId)) + .map((route) => getManifestRoute(route, route.parentId)) ); return patches; } diff --git a/packages/react-router/rsc-export.ts b/packages/react-router/rsc-export.ts index 5c2510b695..794ac3c72d 100644 --- a/packages/react-router/rsc-export.ts +++ b/packages/react-router/rsc-export.ts @@ -1,10 +1,17 @@ export { createStaticHandler } from "./lib/router/router"; +export type { + unstable_MiddlewareFunction, + unstable_MiddlewareNextFunction, + unstable_RouterContext, + unstable_RouterContextProvider, +} from "./lib/router/utils"; export { data, matchRoutes, redirect, redirectDocument, replace, + unstable_createContext, } from "./lib/router/utils"; export type { diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx index 9be565ccc9..97f5bd1b61 100644 --- a/playground/rsc-vite/src/routes/root/root.tsx +++ b/playground/rsc-vite/src/routes/root/root.tsx @@ -1,4 +1,9 @@ import { Link, Links, Outlet, ScrollRestoration } from "react-router"; +import { + type unstable_MiddlewareFunction, + type unstable_RouterContextProvider, + unstable_createContext, +} from "react-router/rsc"; import { Counter } from "../../counter"; import { ErrorReporter, NavigationState } from "./root.client"; @@ -9,9 +14,12 @@ export function headers() { return new Headers({ "x-root": "yes" }); } -export const unstable_middleware = [ +let stringContext = unstable_createContext(); + +export const unstable_middleware: unstable_MiddlewareFunction[] = [ async ({ request, context }, next) => { console.log(">>> RSC middleware", request.url); + context.set(stringContext, "Value from middleware"); let res = await next(); console.log("<<< RSC middleware", request.url); return res; @@ -27,13 +35,16 @@ export async function loader() { } export default function Root({ + context, loaderData, }: { + context: unstable_RouterContextProvider; loaderData: Awaited>; }) { return (

Root Route

+

Context value: {context.get(stringContext)}

Loader data: {loaderData.message}

{loaderData.counter} From e152ee51cca76de1ab15570cb96032b7513848e1 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Wed, 14 May 2025 16:43:06 -0400 Subject: [PATCH 100/143] Simplify RSC server element creation --- packages/react-router/lib/rsc/server.rsc.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index 358fabf4d8..b64da9c1af 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -572,8 +572,8 @@ async function getServerRouteMatch( const actionData = staticContext.actionData?.[match.route.id]; const params = match.params; // TODO: DRY this up once it's fully fleshed out - const element = Component - ? shouldRenderComponent + const element = + Component && shouldRenderComponent ? React.createElement( Layout, null, @@ -590,10 +590,7 @@ async function getServerRouteMatch( ), }) ) - : // TODO: Is this necessary? In my quick testing undefined seemed to - // work as well so we could eliminate the nested ternary - (false as const) - : undefined; + : undefined; const errorElement = ErrorBoundary ? React.createElement( Layout, From 552e70c6a929f35d7538a30dc3b1204da0e30838 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Wed, 14 May 2025 16:55:46 -0400 Subject: [PATCH 101/143] Add hydrate option to routeRSCServerRequest --- packages/react-router/lib/rsc/server.ssr.tsx | 22 +++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/packages/react-router/lib/rsc/server.ssr.tsx b/packages/react-router/lib/rsc/server.ssr.tsx index 120f8f6eb2..0b6c950b57 100644 --- a/packages/react-router/lib/rsc/server.ssr.tsx +++ b/packages/react-router/lib/rsc/server.ssr.tsx @@ -11,6 +11,7 @@ export async function routeRSCServerRequest({ callServer, decode, renderHTML, + hydrate, }: { request: Request; callServer: (request: Request) => Promise; @@ -18,6 +19,7 @@ export async function routeRSCServerRequest({ renderHTML: ( getPayload: () => Promise ) => ReadableStream | Promise>; + hydrate?: boolean; }) { const url = new URL(request.url); let serverRequest = request; @@ -51,11 +53,6 @@ export async function routeRSCServerRequest({ throw new Error("Missing body in server response"); } - const serverResponseB = serverResponse.clone(); - if (!serverResponseB.body) { - throw new Error("Failed to clone server response"); - } - const body = serverResponse.body; let payloadPromise: Promise; const getPayload = async () => { @@ -67,11 +64,22 @@ export async function routeRSCServerRequest({ try { const html = await renderHTML(getPayload); - const body = html.pipeThrough(injectRSCPayload(serverResponseB.body)); - const headers = new Headers(serverResponse.headers); headers.set("Content-Type", "text/html"); + if (hydrate === false) { + return new Response(html, { + status: serverResponse.status, + headers, + }); + } + + const serverResponseB = serverResponse.clone(); + if (!serverResponseB.body) { + throw new Error("Failed to clone server response"); + } + + const body = html.pipeThrough(injectRSCPayload(serverResponseB.body)); return new Response(body, { status: serverResponse.status, headers, From d31afa40c4a120eb97b911431f496b33cbabda80 Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Thu, 15 May 2025 10:56:31 +1000 Subject: [PATCH 102/143] Fix error when cloning RSC server response (#13610) --- packages/react-router/lib/rsc/server.rsc.ts | 2 +- packages/react-router/lib/rsc/server.ssr.tsx | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index b64da9c1af..ae65b483fd 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -21,10 +21,10 @@ import { type LoaderFunction, type Params, type ShouldRevalidateFunction, + type unstable_RouterContextProvider, isRouteErrorResponse, matchRoutes, convertRouteMatchToUiMatch, - unstable_RouterContextProvider, } from "../router/utils"; import { getDocumentHeaders } from "../server-runtime/headers"; import type { RouteMatch } from "../context"; diff --git a/packages/react-router/lib/rsc/server.ssr.tsx b/packages/react-router/lib/rsc/server.ssr.tsx index 0b6c950b57..ddff7de457 100644 --- a/packages/react-router/lib/rsc/server.ssr.tsx +++ b/packages/react-router/lib/rsc/server.ssr.tsx @@ -11,7 +11,7 @@ export async function routeRSCServerRequest({ callServer, decode, renderHTML, - hydrate, + hydrate = true, }: { request: Request; callServer: (request: Request) => Promise; @@ -53,6 +53,11 @@ export async function routeRSCServerRequest({ throw new Error("Missing body in server response"); } + let serverResponseB: Response | null = null; + if (hydrate) { + serverResponseB = serverResponse.clone(); + } + const body = serverResponse.body; let payloadPromise: Promise; const getPayload = async () => { @@ -67,15 +72,14 @@ export async function routeRSCServerRequest({ const headers = new Headers(serverResponse.headers); headers.set("Content-Type", "text/html"); - if (hydrate === false) { + if (!hydrate) { return new Response(html, { status: serverResponse.status, headers, }); } - const serverResponseB = serverResponse.clone(); - if (!serverResponseB.body) { + if (!serverResponseB?.body) { throw new Error("Failed to clone server response"); } From 0ff7099dd135d1f4691776d3e8ec616fffe95b1a Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Thu, 15 May 2025 11:36:07 +1000 Subject: [PATCH 103/143] Log localhost URL when starting Parcel RSC playground --- playground/rsc-parcel/src/entry.ssr.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playground/rsc-parcel/src/entry.ssr.tsx b/playground/rsc-parcel/src/entry.ssr.tsx index 32c9e6d6ca..55df1059aa 100644 --- a/playground/rsc-parcel/src/entry.ssr.tsx +++ b/playground/rsc-parcel/src/entry.ssr.tsx @@ -36,7 +36,7 @@ app.use( ); const server = app.listen(3000); -console.log("Server listening on port 3000"); +console.log("Server listening on port 3000 (http://localhost:3000)"); // Restart the server when it changes. if (module.hot) { From 1dcf5c831956283c3f89f4ac614cb730133a583c Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Thu, 15 May 2025 13:20:51 +1000 Subject: [PATCH 104/143] Fix RSC ErrorBoundary error prop (#13611) --- packages/react-router/lib/rsc/server.rsc.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index ae65b483fd..d33777a823 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -591,6 +591,15 @@ async function getServerRouteMatch( }) ) : undefined; + let error: unknown = undefined; + if (ErrorBoundary && staticContext.errors) { + for (const match of [...staticContext.matches].reverse()) { + if (match.route.id in staticContext.errors) { + error = staticContext.errors[match.route.id]; + break; + } + } + } const errorElement = ErrorBoundary ? React.createElement( Layout, @@ -599,9 +608,7 @@ async function getServerRouteMatch( loaderData, actionData, params, - error: [...staticContext.matches] - .reverse() - .find((match) => staticContext.errors?.[match.route.id]), + error, }) ) : undefined; From f1dd850aa6d059b90351065f273756ba24859a4a Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Thu, 15 May 2025 12:19:22 -0400 Subject: [PATCH 105/143] Fix JS-disabled server action submission --- packages/react-router/lib/rsc/server.rsc.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index d33777a823..67076d61c9 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -460,7 +460,7 @@ async function generateStaticContextResponse( actionResult, rerender: renderPayloadPromise(), }; - } else if (isSubmission) { + } else if (isSubmission && isDataRequest) { // Short circuit without matches on non server-action submissions since // we'll revalidate in a separate request payload = { From 689fd7daa770ed21088969f6cc1a81a804ee7b62 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Thu, 15 May 2025 16:00:42 -0400 Subject: [PATCH 106/143] Initial RSC playwright tests --- integration/helpers/rsc-parcel/.gitignore | 1 + integration/helpers/rsc-parcel/package.json | 45 + .../helpers/rsc-parcel/public/favicon.ico | Bin 0 -> 15086 bytes .../helpers/rsc-parcel/src/entry.browser.tsx | 40 + .../helpers/rsc-parcel/src/entry.rsc.ts | 44 + .../helpers/rsc-parcel/src/entry.ssr.tsx | 56 + integration/helpers/rsc-parcel/src/routes.ts | 16 + .../helpers/rsc-parcel/src/routes/home.tsx | 3 + .../helpers/rsc-parcel/src/routes/root.tsx | 22 + integration/helpers/rsc-parcel/tsconfig.json | 12 + .../rsc-vite/.wrangler/deploy/config.json | 1 + .../rsc-vite/framework/references.browser.ts | 12 + .../rsc-vite/framework/references.rsc.ts | 5 + .../rsc-vite/framework/references.ssr.ts | 4 + .../helpers/rsc-vite/framework/server.ts | 19 + integration/helpers/rsc-vite/package.json | 32 + .../helpers/rsc-vite/public/favicon.ico | Bin 0 -> 15086 bytes integration/helpers/rsc-vite/server.js | 39 + .../helpers/rsc-vite/src/entry.browser.tsx | 39 + .../helpers/rsc-vite/src/entry.rsc.tsx | 38 + .../helpers/rsc-vite/src/entry.ssr.tsx | 40 + integration/helpers/rsc-vite/src/routes.ts | 16 + .../helpers/rsc-vite/src/routes/home.tsx | 3 + .../helpers/rsc-vite/src/routes/root.tsx | 22 + .../helpers/rsc-vite/src/wrangler.rsc.toml | 4 + .../helpers/rsc-vite/src/wrangler.ssr.toml | 6 + .../helpers/rsc-vite/tsconfig.client.json | 25 + integration/helpers/rsc-vite/tsconfig.json | 7 + .../helpers/rsc-vite/tsconfig.node.json | 18 + integration/helpers/rsc-vite/vite.config.ts | 85 + integration/helpers/vite.ts | 6 +- integration/rsc/rsc-test.ts | 110 + pnpm-lock.yaml | 2800 ++++++++++++++--- 33 files changed, 3195 insertions(+), 375 deletions(-) create mode 100644 integration/helpers/rsc-parcel/.gitignore create mode 100644 integration/helpers/rsc-parcel/package.json create mode 100644 integration/helpers/rsc-parcel/public/favicon.ico create mode 100644 integration/helpers/rsc-parcel/src/entry.browser.tsx create mode 100644 integration/helpers/rsc-parcel/src/entry.rsc.ts create mode 100644 integration/helpers/rsc-parcel/src/entry.ssr.tsx create mode 100644 integration/helpers/rsc-parcel/src/routes.ts create mode 100644 integration/helpers/rsc-parcel/src/routes/home.tsx create mode 100644 integration/helpers/rsc-parcel/src/routes/root.tsx create mode 100644 integration/helpers/rsc-parcel/tsconfig.json create mode 100644 integration/helpers/rsc-vite/.wrangler/deploy/config.json create mode 100644 integration/helpers/rsc-vite/framework/references.browser.ts create mode 100644 integration/helpers/rsc-vite/framework/references.rsc.ts create mode 100644 integration/helpers/rsc-vite/framework/references.ssr.ts create mode 100644 integration/helpers/rsc-vite/framework/server.ts create mode 100644 integration/helpers/rsc-vite/package.json create mode 100644 integration/helpers/rsc-vite/public/favicon.ico create mode 100644 integration/helpers/rsc-vite/server.js create mode 100644 integration/helpers/rsc-vite/src/entry.browser.tsx create mode 100644 integration/helpers/rsc-vite/src/entry.rsc.tsx create mode 100644 integration/helpers/rsc-vite/src/entry.ssr.tsx create mode 100644 integration/helpers/rsc-vite/src/routes.ts create mode 100644 integration/helpers/rsc-vite/src/routes/home.tsx create mode 100644 integration/helpers/rsc-vite/src/routes/root.tsx create mode 100644 integration/helpers/rsc-vite/src/wrangler.rsc.toml create mode 100644 integration/helpers/rsc-vite/src/wrangler.ssr.toml create mode 100644 integration/helpers/rsc-vite/tsconfig.client.json create mode 100644 integration/helpers/rsc-vite/tsconfig.json create mode 100644 integration/helpers/rsc-vite/tsconfig.node.json create mode 100644 integration/helpers/rsc-vite/vite.config.ts create mode 100644 integration/rsc/rsc-test.ts diff --git a/integration/helpers/rsc-parcel/.gitignore b/integration/helpers/rsc-parcel/.gitignore new file mode 100644 index 0000000000..77738287f0 --- /dev/null +++ b/integration/helpers/rsc-parcel/.gitignore @@ -0,0 +1 @@ +dist/ \ No newline at end of file diff --git a/integration/helpers/rsc-parcel/package.json b/integration/helpers/rsc-parcel/package.json new file mode 100644 index 0000000000..78b5ebcf98 --- /dev/null +++ b/integration/helpers/rsc-parcel/package.json @@ -0,0 +1,45 @@ +{ + "name": "@playground/rsc-parcel", + "private": true, + "source": "src/entry.ssr.tsx", + "server": "dist/server.js", + "targets": { + "server": { + "context": "react-server", + "includeNodeModules": { + "express": false + } + } + }, + "scripts": { + "dev": "parcel --no-cache", + "build": "parcel build --no-cache --no-optimize", + "start": "node dist/server.js" + }, + "devDependencies": { + "@parcel/packager-react-static": "2.15.0", + "@parcel/transformer-react-static": "2.15.0", + "@types/express": "^5.0.0", + "@types/node": "^22.13.1", + "@types/parcel-env": "0.0.8", + "@types/react-dom": "^19.0.3", + "@types/react": "^19.0.8", + "browserify-zlib": "^0.2.0", + "buffer": "^5.5.0||^6.0.0", + "events": "^3.1.0", + "parcel": "2.15.0", + "path-browserify": "^1.0.0", + "querystring-es3": "^0.2.1", + "stream-http": "^3.1.0", + "url": "^0.11.0" + }, + "dependencies": { + "@mjackson/node-fetch-server": "0.6.1", + "@parcel/runtime-rsc": "2.15.0", + "express": "^4.21.2", + "react": "^19.1.0", + "react-dom": "^19.1.0", + "react-router": "workspace:*", + "react-server-dom-parcel": "^19.1.0" + } +} diff --git a/integration/helpers/rsc-parcel/public/favicon.ico b/integration/helpers/rsc-parcel/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..5dbdfcddcb14182535f6d32d1c900681321b1aa3 GIT binary patch literal 15086 zcmeI33v3ic7{|AFEmuJ-;v>ep_G*NPi6KM`qNryCe1PIJ8siIN1WZ(7qVa)RVtmC% z)Ch?tN+afMKm;5@rvorJk zcXnoOc4q51HBQnQH_jn!cAg&XI1?PlX>Kl^k8qq0;zkha`kY$Fxt#=KNJAE9CMdpW zqr4#g8`nTw191(+H4xW8Tmyru2I^3=J1G3emPxkPXA=3{vvuvse_WWSshqaqls^-m zgB7q8&Vk*aYRe?sn$n53dGH#%3y%^vxv{pL*-h0Z4bmb_(k6{FL7HWIz(V*HT#IcS z-wE{)+0x1U!RUPt3gB97%p}@oHxF4|6S*+Yw=_tLtxZ~`S=z6J?O^AfU>7qOX`JNBbV&8+bO0%@fhQitKIJ^O^ zpgIa__qD_y07t@DFlBJ)8SP_#^j{6jpaXt{U%=dx!qu=4u7^21lWEYHPPY5U3TcoQ zX_7W+lvZi>TapNk_X>k-KO%MC9iZp>1E`N34gHKd9tK&){jq2~7OsJ>!G0FzxQFw6G zm&Vb(2#-T|rM|n3>uAsG_hnbvUKFf3#ay@u4uTzia~NY%XgCHfx4^To4BDU@)HlV? z@EN=g^ymETa1sQK{kRwyE4Ax8?wT&GvaG@ASO}{&a17&^v`y z!oPdiSiia^oov(Z)QhG2&|FgE{M9_4hJROGbnj>#$~ZF$-G^|zPj*QApltKe?;u;uKHJ~-V!=VLkg7Kgct)l7u39f@%VG8e3f$N-B zAu3a4%ZGf)r+jPAYCSLt73m_J3}p>}6Tx0j(wg4vvKhP!DzgiWANiE;Ppvp}P2W@m z-VbYn+NXFF?6ngef5CfY6ZwKnWvNV4z6s^~yMXw2i5mv}jC$6$46g?G|CPAu{W5qF zDobS=zb2ILX9D827g*NtGe5w;>frjanY{f)hrBP_2ehBt1?`~ypvg_Ot4x1V+43P@Ve8>qd)9NX_jWdLo`Zfy zoeam9)@Dpym{4m@+LNxXBPjPKA7{3a&H+~xQvr>C_A;7=JrfK~$M2pCh>|xLz>W6SCs4qC|#V`)# z)0C|?$o>jzh<|-cpf

K7osU{Xp5PG4-K+L2G=)c3f&}H&M3wo7TlO_UJjQ-Oq&_ zjAc9=nNIYz{c3zxOiS5UfcE1}8#iI4@uy;$Q7>}u`j+OU0N<*Ezx$k{x_27+{s2Eg z`^=rhtIzCm!_UcJ?Db~Lh-=_))PT3{Q0{Mwdq;0>ZL%l3+;B&4!&xm#%HYAK|;b456Iv&&f$VQHf` z>$*K9w8T+paVwc7fLfMlhQ4)*zL_SG{~v4QR;IuX-(oRtYAhWOlh`NLoX0k$RUYMi z2Y!bqpdN}wz8q`-%>&Le@q|jFw92ErW-hma-le?S z-@OZt2EEUm4wLsuEMkt4zlyy29_3S50JAcQHTtgTC{P~%-mvCTzrjXOc|{}N`Cz`W zSj7CrXfa7lcsU0J(0uSX6G`54t^7}+OLM0n(|g4waOQ}bd3%!XLh?NX9|8G_|06Ie zD5F1)w5I~!et7lA{G^;uf7aqT`KE&2qx9|~O;s6t!gb`+zVLJyT2T)l*8l(j literal 0 HcmV?d00001 diff --git a/integration/helpers/rsc-parcel/src/entry.browser.tsx b/integration/helpers/rsc-parcel/src/entry.browser.tsx new file mode 100644 index 0000000000..2f412c8596 --- /dev/null +++ b/integration/helpers/rsc-parcel/src/entry.browser.tsx @@ -0,0 +1,40 @@ +"use client-entry"; + +import * as React from "react"; +import { hydrateRoot } from "react-dom/client"; +import { + createCallServer, + getServerStream, + RSCHydratedRouter, +} from "react-router"; +import type { ServerPayload } from "react-router/rsc"; +import { + createFromReadableStream, + encodeReply, + setServerCallback, + // @ts-expect-error +} from "react-server-dom-parcel/client"; + +const callServer = createCallServer({ + decode: (body) => createFromReadableStream(body, { callServer }), + encodeAction: (args) => encodeReply(args), +}); + +setServerCallback(callServer); + +createFromReadableStream(getServerStream(), { assets: "manifest" }).then( + (payload: ServerPayload) => { + React.startTransition(() => { + hydrateRoot( + document, + + + + ); + }); + } +); diff --git a/integration/helpers/rsc-parcel/src/entry.rsc.ts b/integration/helpers/rsc-parcel/src/entry.rsc.ts new file mode 100644 index 0000000000..9080e93ebc --- /dev/null +++ b/integration/helpers/rsc-parcel/src/entry.rsc.ts @@ -0,0 +1,44 @@ +"use server-entry"; + +import { + decodeAction, + decodeReply, + loadServerAction, + renderToReadableStream, + // @ts-expect-error +} from "react-server-dom-parcel/server.edge"; +import { + type DecodeCallServerFunction, + type DecodeFormActionFunction, + matchRSCServerRequest, +} from "react-router/rsc"; + +import { routes } from "./routes"; + +import "./entry.browser.tsx"; + +const decodeCallServer: DecodeCallServerFunction = async (actionId, reply) => { + const args = await decodeReply(reply); + const action = await loadServerAction(actionId); + return action.bind(null, ...args); +}; + +const decodeFormAction: DecodeFormActionFunction = async (formData) => { + return await decodeAction(formData); +}; + +export function callServer(request: Request) { + return matchRSCServerRequest({ + decodeCallServer, + decodeFormAction, + request, + // @ts-expect-error + routes, + generateResponse(match) { + return new Response(renderToReadableStream(match.payload), { + status: match.statusCode, + headers: match.headers, + }); + }, + }); +} diff --git a/integration/helpers/rsc-parcel/src/entry.ssr.tsx b/integration/helpers/rsc-parcel/src/entry.ssr.tsx new file mode 100644 index 0000000000..7049555961 --- /dev/null +++ b/integration/helpers/rsc-parcel/src/entry.ssr.tsx @@ -0,0 +1,56 @@ +import { parseArgs } from "node:util"; +import { createRequestListener } from "@mjackson/node-fetch-server"; +import express from "express"; +// @ts-expect-error - no types +import { renderToReadableStream as renderHTMLToReadableStream } from "react-dom/server.edge" assert { env: "react-client" }; +import { + routeRSCServerRequest, + RSCStaticRouter, +} from "react-router" assert { env: "react-client" }; +// @ts-expect-error +import { createFromReadableStream } from "react-server-dom-parcel/client.edge" assert { env: "react-client" }; + +import { callServer } from "./entry.rsc" assert { env: "react-server" }; + +const app = express(); + +app.use("/client", express.static("dist/client")); + +app.get("/.well-known/appspecific/com.chrome.devtools.json", (req, res) => { + res.status(404); + res.end(); +}); + +app.use( + createRequestListener(async (request) => { + return routeRSCServerRequest({ + request, + callServer, + decode: createFromReadableStream, + async renderHTML(getPayload) { + return await renderHTMLToReadableStream( + , + { + bootstrapScriptContent: ( + callServer as unknown as { bootstrapScript: string } + ).bootstrapScript, + } + ); + }, + }); + }) +); + +const port = parseInt(process.env.RR_PORT || "3000", 10); +const server = app.listen(port, () => { + console.log(`Server started on http://localhost:${port}`); +}); + +// Restart the server when it changes. +if (module.hot) { + module.hot.dispose(() => { + server.close(); + }); + + module.hot.accept(); +} diff --git a/integration/helpers/rsc-parcel/src/routes.ts b/integration/helpers/rsc-parcel/src/routes.ts new file mode 100644 index 0000000000..6cc7b2a7bd --- /dev/null +++ b/integration/helpers/rsc-parcel/src/routes.ts @@ -0,0 +1,16 @@ +import type { ServerRouteObject } from "react-router/rsc"; + +export const routes = [ + { + id: "root", + path: "", + lazy: () => import("./routes/root"), + children: [ + { + id: "home", + index: true, + lazy: () => import("./routes/home"), + }, + ], + }, +] satisfies ServerRouteObject[]; diff --git a/integration/helpers/rsc-parcel/src/routes/home.tsx b/integration/helpers/rsc-parcel/src/routes/home.tsx new file mode 100644 index 0000000000..fa44740c12 --- /dev/null +++ b/integration/helpers/rsc-parcel/src/routes/home.tsx @@ -0,0 +1,3 @@ +export default function ServerComponent() { + return

Home

; +} diff --git a/integration/helpers/rsc-parcel/src/routes/root.tsx b/integration/helpers/rsc-parcel/src/routes/root.tsx new file mode 100644 index 0000000000..778a4858d6 --- /dev/null +++ b/integration/helpers/rsc-parcel/src/routes/root.tsx @@ -0,0 +1,22 @@ +import { Links, Outlet, ScrollRestoration } from "react-router"; + +export function Layout({ children }: { children: React.ReactNode }) { + return ( + + + + + Vite (RSC) + + + + {children} + + + + ); +} + +export default function ServerComponent() { + return ; +} diff --git a/integration/helpers/rsc-parcel/tsconfig.json b/integration/helpers/rsc-parcel/tsconfig.json new file mode 100644 index 0000000000..739ac74a41 --- /dev/null +++ b/integration/helpers/rsc-parcel/tsconfig.json @@ -0,0 +1,12 @@ +{ + "compilerOptions": { + "strict": true, + "jsx": "react-jsx", + "allowSyntheticDefaultImports": true, + "moduleResolution": "bundler", + "module": "esnext", + "isolatedModules": true, + "esModuleInterop": true, + "target": "es2022" + } +} diff --git a/integration/helpers/rsc-vite/.wrangler/deploy/config.json b/integration/helpers/rsc-vite/.wrangler/deploy/config.json new file mode 100644 index 0000000000..bde383d850 --- /dev/null +++ b/integration/helpers/rsc-vite/.wrangler/deploy/config.json @@ -0,0 +1 @@ +{"configPath":"../../dist/ssr/wrangler.json","auxiliaryWorkers":[{"configPath":"../../dist/server/wrangler.json"}]} \ No newline at end of file diff --git a/integration/helpers/rsc-vite/framework/references.browser.ts b/integration/helpers/rsc-vite/framework/references.browser.ts new file mode 100644 index 0000000000..cbf0af69e3 --- /dev/null +++ b/integration/helpers/rsc-vite/framework/references.browser.ts @@ -0,0 +1,12 @@ +import { + createServerReference as createServerReferenceImp, + // @ts-expect-error - no types yet +} from "@jacob-ebey/react-server-dom-vite/client"; + +export async function callServer(id: string, args: unknown) { + throw new Error("callServer not implemented"); +} + +export function createServerReference(imp: unknown, id: string, name: string) { + return createServerReferenceImp(`${id}#${name}`, callServer); +} diff --git a/integration/helpers/rsc-vite/framework/references.rsc.ts b/integration/helpers/rsc-vite/framework/references.rsc.ts new file mode 100644 index 0000000000..be086b8a0a --- /dev/null +++ b/integration/helpers/rsc-vite/framework/references.rsc.ts @@ -0,0 +1,5 @@ +// @ts-expect-error - no types yet +import RSD from "@jacob-ebey/react-server-dom-vite/server"; + +export const registerServerReference = RSD.registerServerReference; +export const registerClientReference = RSD.registerClientReference; diff --git a/integration/helpers/rsc-vite/framework/references.ssr.ts b/integration/helpers/rsc-vite/framework/references.ssr.ts new file mode 100644 index 0000000000..071d2d68e4 --- /dev/null +++ b/integration/helpers/rsc-vite/framework/references.ssr.ts @@ -0,0 +1,4 @@ +// @ts-expect-error - no types yet +import RSD from "@jacob-ebey/react-server-dom-vite/client"; + +export const createServerReference = RSD.createServerReference; diff --git a/integration/helpers/rsc-vite/framework/server.ts b/integration/helpers/rsc-vite/framework/server.ts new file mode 100644 index 0000000000..f1dad8db46 --- /dev/null +++ b/integration/helpers/rsc-vite/framework/server.ts @@ -0,0 +1,19 @@ +import * as stream from "node:stream"; +// @ts-expect-error - no types yet +import RSD from "@jacob-ebey/react-server-dom-vite/server"; +// @ts-expect-error - no types yet +import { manifest } from "virtual:react-manifest"; + +export function renderToReadableStream(payload: any) { + const { pipe } = RSD.renderToPipeableStream(payload, manifest); + return stream.Readable.toWeb( + pipe(new stream.PassThrough()) + ) as ReadableStream; +} + +export function decodeReply( + reply: FormData | string, + options?: any +): unknown[] { + return RSD.decodeReply(reply, manifest, options); +} diff --git a/integration/helpers/rsc-vite/package.json b/integration/helpers/rsc-vite/package.json new file mode 100644 index 0000000000..784ee1e525 --- /dev/null +++ b/integration/helpers/rsc-vite/package.json @@ -0,0 +1,32 @@ +{ + "name": "@playground/rsc-vite", + "private": true, + "type": "module", + "scripts": { + "dev": "vite", + "build": "vite build", + "start": "node server.js" + }, + "devDependencies": { + "@biomejs/biome": "^1.9.4", + "@cloudflare/vite-plugin": "0.1.7", + "@cloudflare/workers-types": "^4.20250224.0", + "@jacob-ebey/vite-react-server-dom": "0.0.12", + "@types/express": "^5.0.0", + "@types/node": "^22.13.1", + "@types/react": "^19.0.8", + "@types/react-dom": "^19.0.3", + "vite": "^6.2.0", + "vite-tsconfig-paths": "^5.1.4", + "wrangler": "^3.111.0" + }, + "dependencies": { + "@jacob-ebey/react-server-dom-vite": "19.0.0-experimental.14", + "@mjackson/node-fetch-server": "0.6.1", + "compression": "^1.8.0", + "express": "^4.21.2", + "react": "^19.0.0", + "react-dom": "^19.0.0", + "react-router": "workspace:*" + } +} diff --git a/integration/helpers/rsc-vite/public/favicon.ico b/integration/helpers/rsc-vite/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..5dbdfcddcb14182535f6d32d1c900681321b1aa3 GIT binary patch literal 15086 zcmeI33v3ic7{|AFEmuJ-;v>ep_G*NPi6KM`qNryCe1PIJ8siIN1WZ(7qVa)RVtmC% z)Ch?tN+afMKm;5@rvorJk zcXnoOc4q51HBQnQH_jn!cAg&XI1?PlX>Kl^k8qq0;zkha`kY$Fxt#=KNJAE9CMdpW zqr4#g8`nTw191(+H4xW8Tmyru2I^3=J1G3emPxkPXA=3{vvuvse_WWSshqaqls^-m zgB7q8&Vk*aYRe?sn$n53dGH#%3y%^vxv{pL*-h0Z4bmb_(k6{FL7HWIz(V*HT#IcS z-wE{)+0x1U!RUPt3gB97%p}@oHxF4|6S*+Yw=_tLtxZ~`S=z6J?O^AfU>7qOX`JNBbV&8+bO0%@fhQitKIJ^O^ zpgIa__qD_y07t@DFlBJ)8SP_#^j{6jpaXt{U%=dx!qu=4u7^21lWEYHPPY5U3TcoQ zX_7W+lvZi>TapNk_X>k-KO%MC9iZp>1E`N34gHKd9tK&){jq2~7OsJ>!G0FzxQFw6G zm&Vb(2#-T|rM|n3>uAsG_hnbvUKFf3#ay@u4uTzia~NY%XgCHfx4^To4BDU@)HlV? z@EN=g^ymETa1sQK{kRwyE4Ax8?wT&GvaG@ASO}{&a17&^v`y z!oPdiSiia^oov(Z)QhG2&|FgE{M9_4hJROGbnj>#$~ZF$-G^|zPj*QApltKe?;u;uKHJ~-V!=VLkg7Kgct)l7u39f@%VG8e3f$N-B zAu3a4%ZGf)r+jPAYCSLt73m_J3}p>}6Tx0j(wg4vvKhP!DzgiWANiE;Ppvp}P2W@m z-VbYn+NXFF?6ngef5CfY6ZwKnWvNV4z6s^~yMXw2i5mv}jC$6$46g?G|CPAu{W5qF zDobS=zb2ILX9D827g*NtGe5w;>frjanY{f)hrBP_2ehBt1?`~ypvg_Ot4x1V+43P@Ve8>qd)9NX_jWdLo`Zfy zoeam9)@Dpym{4m@+LNxXBPjPKA7{3a&H+~xQvr>C_A;7=JrfK~$M2pCh>|xLz>W6SCs4qC|#V`)# z)0C|?$o>jzh<|-cpf

K7osU{Xp5PG4-K+L2G=)c3f&}H&M3wo7TlO_UJjQ-Oq&_ zjAc9=nNIYz{c3zxOiS5UfcE1}8#iI4@uy;$Q7>}u`j+OU0N<*Ezx$k{x_27+{s2Eg z`^=rhtIzCm!_UcJ?Db~Lh-=_))PT3{Q0{Mwdq;0>ZL%l3+;B&4!&xm#%HYAK|;b456Iv&&f$VQHf` z>$*K9w8T+paVwc7fLfMlhQ4)*zL_SG{~v4QR;IuX-(oRtYAhWOlh`NLoX0k$RUYMi z2Y!bqpdN}wz8q`-%>&Le@q|jFw92ErW-hma-le?S z-@OZt2EEUm4wLsuEMkt4zlyy29_3S50JAcQHTtgTC{P~%-mvCTzrjXOc|{}N`Cz`W zSj7CrXfa7lcsU0J(0uSX6G`54t^7}+OLM0n(|g4waOQ}bd3%!XLh?NX9|8G_|06Ie zD5F1)w5I~!et7lA{G^;uf7aqT`KE&2qx9|~O;s6t!gb`+zVLJyT2T)l*8l(j literal 0 HcmV?d00001 diff --git a/integration/helpers/rsc-vite/server.js b/integration/helpers/rsc-vite/server.js new file mode 100644 index 0000000000..fff9015d39 --- /dev/null +++ b/integration/helpers/rsc-vite/server.js @@ -0,0 +1,39 @@ +import { parseArgs } from "node:util"; +import { createRequestListener } from "@mjackson/node-fetch-server"; +import compression from "compression"; +import express from "express"; + +import ssr from "./dist/ssr/entry.ssr.js"; +import server from "./dist/server/entry.rsc.js"; + +const app = express(); + +app.use(compression()); +app.use(express.static("dist/client")); + +app.get("/.well-known/appspecific/com.chrome.devtools.json", (req, res) => { + res.status(404); + res.end(); +}); + +app.use( + createRequestListener((request) => { + return ssr.fetch(request, { + SERVER: { + fetch(request) { + return server.fetch(request); + }, + }, + }); + }) +); + +const { values } = parseArgs({ + options: { p: { type: "string", default: "3000" } }, + allowPositionals: true, +}); + +const port = parseInt(values.p, 10); +app.listen(port, () => { + console.log(`Server started on http://localhost:${port}`); +}); diff --git a/integration/helpers/rsc-vite/src/entry.browser.tsx b/integration/helpers/rsc-vite/src/entry.browser.tsx new file mode 100644 index 0000000000..144736bf35 --- /dev/null +++ b/integration/helpers/rsc-vite/src/entry.browser.tsx @@ -0,0 +1,39 @@ +import { startTransition, StrictMode } from "react"; +import { hydrateRoot } from "react-dom/client"; +import { + createFromReadableStream, + encodeReply, + // @ts-expect-error - no types +} from "@jacob-ebey/react-server-dom-vite/client"; +// @ts-expect-error - no types yet +import { manifest } from "virtual:react-manifest"; + +import { + type DecodeServerResponseFunction, + type EncodeActionFunction, + createCallServer, + getServerStream, + RSCHydratedRouter, +} from "react-router"; +import { type ServerPayload } from "react-router/rsc"; + +const encodeAction: EncodeActionFunction = (args: unknown[]) => + encodeReply(args); + +const decode: DecodeServerResponseFunction = (body) => + createFromReadableStream(body, manifest, { callServer }); + +const callServer = createCallServer({ decode, encodeAction }); + +createFromReadableStream(getServerStream(), manifest, { callServer }).then( + (payload: ServerPayload) => { + startTransition(() => { + hydrateRoot( + document, + + + + ); + }); + } +); diff --git a/integration/helpers/rsc-vite/src/entry.rsc.tsx b/integration/helpers/rsc-vite/src/entry.rsc.tsx new file mode 100644 index 0000000000..1feb2cbd50 --- /dev/null +++ b/integration/helpers/rsc-vite/src/entry.rsc.tsx @@ -0,0 +1,38 @@ +/// +import { + type DecodeCallServerFunction, + matchRSCServerRequest, +} from "react-router/rsc"; +// @ts-expect-error - no types yet +import { manifest } from "virtual:react-manifest"; + +import { decodeReply, renderToReadableStream } from "../framework/server"; +import { routes } from "./routes"; + +const decodeCallServer: DecodeCallServerFunction = async (actionId, reply) => { + const args = await decodeReply(reply); + const reference = manifest.resolveServerReference(actionId); + await reference.preload(); + const action = reference.get() as (...args: unknown[]) => Promise; + return action.bind(null, ...args); +}; + +export default { + fetch(request, env) { + return matchRSCServerRequest({ + decodeCallServer, + request, + routes, + generateResponse(match) { + if (match instanceof Response) { + return match; + } + + return new Response(renderToReadableStream(match.payload), { + status: match.statusCode, + headers: match.headers, + }); + }, + }); + }, +} satisfies ExportedHandler; diff --git a/integration/helpers/rsc-vite/src/entry.ssr.tsx b/integration/helpers/rsc-vite/src/entry.ssr.tsx new file mode 100644 index 0000000000..45040b4e0d --- /dev/null +++ b/integration/helpers/rsc-vite/src/entry.ssr.tsx @@ -0,0 +1,40 @@ +/// + +// @ts-expect-error +import RSD from "@jacob-ebey/react-server-dom-vite/client"; +// @ts-expect-error +import RDS from "react-dom/server.edge"; +// @ts-expect-error +import { bootstrapModules, manifest } from "virtual:react-manifest"; + +import { routeRSCServerRequest, RSCStaticRouter } from "react-router"; + +type CloudflareEnv = { + ASSETS: Fetcher; + SERVER: Fetcher; +}; + +export default { + async fetch(request, { SERVER }) { + const callServer = async (request: Request) => await SERVER.fetch(request); + try { + return await routeRSCServerRequest({ + request, + callServer, + decode: (body) => RSD.createFromReadableStream(body, manifest), + async renderHTML(getPayload) { + return await RDS.renderToReadableStream( + , + { + bootstrapModules, + signal: request.signal, + } + ); + }, + }); + } catch (reason) { + console.error(reason); + return new Response("Internal Server Error", { status: 500 }); + } + }, +} satisfies ExportedHandler; diff --git a/integration/helpers/rsc-vite/src/routes.ts b/integration/helpers/rsc-vite/src/routes.ts new file mode 100644 index 0000000000..6cc7b2a7bd --- /dev/null +++ b/integration/helpers/rsc-vite/src/routes.ts @@ -0,0 +1,16 @@ +import type { ServerRouteObject } from "react-router/rsc"; + +export const routes = [ + { + id: "root", + path: "", + lazy: () => import("./routes/root"), + children: [ + { + id: "home", + index: true, + lazy: () => import("./routes/home"), + }, + ], + }, +] satisfies ServerRouteObject[]; diff --git a/integration/helpers/rsc-vite/src/routes/home.tsx b/integration/helpers/rsc-vite/src/routes/home.tsx new file mode 100644 index 0000000000..fa44740c12 --- /dev/null +++ b/integration/helpers/rsc-vite/src/routes/home.tsx @@ -0,0 +1,3 @@ +export default function ServerComponent() { + return

Home

; +} diff --git a/integration/helpers/rsc-vite/src/routes/root.tsx b/integration/helpers/rsc-vite/src/routes/root.tsx new file mode 100644 index 0000000000..778a4858d6 --- /dev/null +++ b/integration/helpers/rsc-vite/src/routes/root.tsx @@ -0,0 +1,22 @@ +import { Links, Outlet, ScrollRestoration } from "react-router"; + +export function Layout({ children }: { children: React.ReactNode }) { + return ( + + + + + Vite (RSC) + + + + {children} + + + + ); +} + +export default function ServerComponent() { + return ; +} diff --git a/integration/helpers/rsc-vite/src/wrangler.rsc.toml b/integration/helpers/rsc-vite/src/wrangler.rsc.toml new file mode 100644 index 0000000000..6d22f08fed --- /dev/null +++ b/integration/helpers/rsc-vite/src/wrangler.rsc.toml @@ -0,0 +1,4 @@ +name = "server" +main = "./entry.rsc.tsx" +compatibility_date = "2024-12-05" +compatibility_flags = ["nodejs_compat"] diff --git a/integration/helpers/rsc-vite/src/wrangler.ssr.toml b/integration/helpers/rsc-vite/src/wrangler.ssr.toml new file mode 100644 index 0000000000..f8c534067b --- /dev/null +++ b/integration/helpers/rsc-vite/src/wrangler.ssr.toml @@ -0,0 +1,6 @@ +name = "ssr" +main = "./entry.ssr.tsx" +compatibility_date = "2024-09-23" +compatibility_flags = ["nodejs_compat"] +assets = { binding = "ASSETS" } +services = [{ binding = "SERVER", service = "server" }] diff --git a/integration/helpers/rsc-vite/tsconfig.client.json b/integration/helpers/rsc-vite/tsconfig.client.json new file mode 100644 index 0000000000..8faea30be1 --- /dev/null +++ b/integration/helpers/rsc-vite/tsconfig.client.json @@ -0,0 +1,25 @@ +{ + "include": ["framework", "src"], + "compilerOptions": { + "lib": ["ES2022", "DOM", "DOM.Iterable"], + "types": ["@cloudflare/workers-types", "@types/node", "vite/client"], + "rootDir": ".", + "paths": { + "~/*": ["./src/app/*"], + }, + "allowImportingTsExtensions": true, + "jsx": "react-jsx", + "esModuleInterop": false, + "skipLibCheck": true, + "target": "ES2022", + "resolveJsonModule": true, + "moduleDetection": "force", + "isolatedModules": true, + "verbatimModuleSyntax": true, + "strict": true, + "noUncheckedIndexedAccess": true, + "noImplicitOverride": true, + "module": "Preserve", + "noEmit": true + } +} diff --git a/integration/helpers/rsc-vite/tsconfig.json b/integration/helpers/rsc-vite/tsconfig.json new file mode 100644 index 0000000000..e748ae2236 --- /dev/null +++ b/integration/helpers/rsc-vite/tsconfig.json @@ -0,0 +1,7 @@ +{ + "files": [], + "references": [ + { "path": "./tsconfig.node.json" }, + { "path": "./tsconfig.client.json" } + ] +} diff --git a/integration/helpers/rsc-vite/tsconfig.node.json b/integration/helpers/rsc-vite/tsconfig.node.json new file mode 100644 index 0000000000..70add5e01e --- /dev/null +++ b/integration/helpers/rsc-vite/tsconfig.node.json @@ -0,0 +1,18 @@ +{ + "include": ["vite.config.ts", "__tests__"], + "compilerOptions": { + "esModuleInterop": false, + "skipLibCheck": true, + "target": "ES2022", + "resolveJsonModule": true, + "moduleDetection": "force", + "isolatedModules": true, + "verbatimModuleSyntax": true, + "strict": true, + "noUncheckedIndexedAccess": true, + "noImplicitOverride": true, + "module": "Preserve", + "lib": ["ES2022"], + "noEmit": true + } +} diff --git a/integration/helpers/rsc-vite/vite.config.ts b/integration/helpers/rsc-vite/vite.config.ts new file mode 100644 index 0000000000..499dd6312d --- /dev/null +++ b/integration/helpers/rsc-vite/vite.config.ts @@ -0,0 +1,85 @@ +import * as path from "node:path"; + +import { cloudflare } from "@cloudflare/vite-plugin"; +import reactServerDOM from "@jacob-ebey/vite-react-server-dom"; +import { defineConfig, type ViteDevServer } from "vite"; +import tsconfigPaths from "vite-tsconfig-paths"; + +export default defineConfig({ + resolve: { + external: ["cloudflare:workers"], + }, + environments: { + client: { + build: { + rollupOptions: { + input: "src/entry.browser.tsx", + treeshake: { + moduleSideEffects: () => { + return false; + }, + }, + }, + }, + resolve: { + conditions: ["module-sync"], + }, + }, + ssr: { + resolve: { + noExternal: true, + conditions: ["module-sync"], + }, + }, + server: { + resolve: { + noExternal: true, + conditions: ["module-sync"], + }, + }, + }, + plugins: [ + stupidChromeDevtoolsRequest(), + tsconfigPaths({ configNames: ["tsconfig.client.json"] }), + reactServerDOM({ + browserEnvironment: "client", + serverEnvironments: ["server"], + ssrEnvironments: ["ssr"], + runtime: { + browser: { + importFrom: path.resolve("./framework/references.browser.ts"), + }, + server: { + importFrom: path.resolve("./framework/references.rsc.ts"), + }, + ssr: { + importFrom: path.resolve("./framework/references.ssr.ts"), + }, + }, + }), + cloudflare({ + persistState: true, + configPath: "src/wrangler.ssr.toml", + auxiliaryWorkers: [ + { + configPath: "src/wrangler.rsc.toml", + }, + ], + }), + ], +}); + +function stupidChromeDevtoolsRequest() { + return { + name: "stupid-chrome-devtools-request", + configureServer(server: ViteDevServer) { + server.middlewares.use( + "/.well-known/appspecific/com.chrome.devtools.json", + (_, res) => { + res.statusCode = 404; + res.end("Not Found"); + } + ); + }, + }; +} diff --git a/integration/helpers/vite.ts b/integration/helpers/vite.ts index 7c78a9211b..28a7010060 100644 --- a/integration/helpers/vite.ts +++ b/integration/helpers/vite.ts @@ -188,6 +188,8 @@ export const EXPRESS_SERVER = (args: { export type TemplateName = | "cloudflare-dev-proxy-template" + | "rsc-parcel" + | "rsc-vite" | "vite-5-template" | "vite-6-template" | "vite-plugin-cloudflare-template" @@ -200,6 +202,8 @@ export const viteMajorTemplates = [ templateName: "vite-rolldown-template", templateDisplayName: "Vite Rolldown", }, + { templateName: "rsc-vite", templateDisplayName: "RSC (Vite)" }, + { templateName: "rsc-parcel", templateDisplayName: "RSC (Parcel)" }, ] as const satisfies Array<{ templateName: TemplateName; templateDisplayName: string; @@ -319,7 +323,7 @@ type ServerArgs = { basename?: string; }; -const createDev = +export const createDev = (nodeArgs: string[]) => async ({ cwd, port, env, basename }: ServerArgs): Promise<() => unknown> => { let proc = node(nodeArgs, { cwd, env }); diff --git a/integration/rsc/rsc-test.ts b/integration/rsc/rsc-test.ts new file mode 100644 index 0000000000..20b697f583 --- /dev/null +++ b/integration/rsc/rsc-test.ts @@ -0,0 +1,110 @@ +import { spawnSync } from "node:child_process"; +import { test, expect } from "@playwright/test"; +import getPort from "get-port"; + +import { TemplateName, createDev, createProject } from "../helpers/vite.js"; + +const js = String.raw; + +type Implementation = { + name: string; + template: TemplateName; + build: ({ cwd }: { cwd: string }) => ReturnType; + run: ({ cwd, port }: { cwd: string; port: number }) => Promise<() => void>; +}; + +// Run tests against vite and parcel to ensure our code is bundler agnostic +const implementations: Implementation[] = [ + { + name: "vite", + template: "rsc-vite", + build: ({ cwd }: { cwd: string }) => + spawnSync("node_modules/.bin/vite", ["build"], { cwd }), + run: ({ cwd, port }: { cwd: string; port: number }) => + createDev(["server.js", "-p", String(port)])({ + cwd, + port, + }), + }, + { + name: "parcel", + template: "rsc-parcel", + build: ({ cwd }: { cwd: string }) => + spawnSync("node_modules/.bin/parcel", ["build"], { cwd }), + run: ({ cwd, port }: { cwd: string; port: number }) => + // FIXME: Parcel prod builds seems to have dup copies of react in them :/ + // Not reproducible in the playground though - only in integration/helpers... + createDev(["node_modules/parcel/lib/bin.js"])({ + // Since we run through parcels dev server we can't use `-p` because that + // only changes the dev server and doesn't pass through to the internal + // server. So we setup the internal server to choose from `RR_PORT` + env: { RR_PORT: String(port) }, + cwd, + port, + }), + }, +]; + +async function setupRscTest({ + implementation, + port, + files, +}: { + implementation: Implementation; + port: number; + files: Record; +}) { + let cwd = await createProject(files, implementation.template); + + let { status, stderr, stdout } = implementation.build({ cwd }); + if (status !== 0) { + console.error("Error building project", { + status, + stdout: stdout.toString(), + stderr: stderr.toString, + }); + throw new Error("Error building project"); + } + let stop = await implementation.run({ cwd, port }); + return stop; +} + +test.describe("RSC", () => { + implementations.forEach((implementation) => { + let stop: () => void; + + test.afterEach(() => { + stop?.(); + }); + + test.describe(implementation.name, () => { + test.only("Renders a page using server components", async ({ page }) => { + let port = await getPort(); + stop = await setupRscTest({ + implementation, + port, + files: { + "src/routes/home.tsx": js` + export function loader() { + return { message: "Loader Data" }; + } + export default function ServerComponent({ loaderData }) { + return

Home: {loaderData.message}

; + } + `, + }, + }); + + await page.goto(`http://localhost:${port}/`); + await page.waitForSelector("[data-home]", { timeout: 5000 }); + expect(await page.locator("[data-home]").textContent()).toBe( + "Home: Loader Data" + ); + // Ensure this is actually using RSC lol + expect(await page.content()).toMatch( + /\(self\.__FLIGHT_DATA\|\|=\[\]\)\.push\(/ + ); + }); + }); + }); +}); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 46661fc912..d6eb48d88a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -139,7 +139,7 @@ importers: version: 8.57.0 eslint-config-react-app: specifier: ^7.0.1 - version: 7.0.1(@babel/plugin-syntax-flow@7.18.6(@babel/core@7.24.3))(@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.24.3))(eslint@8.57.0)(jest@29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0))(typescript@5.4.5) + version: 7.0.1(@babel/plugin-syntax-flow@7.18.6(@babel/core@7.24.3))(@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.24.3))(eslint@8.57.0)(jest@29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0))(typescript@5.4.5) eslint-plugin-flowtype: specifier: ^8.0.3 version: 8.0.3(@babel/plugin-syntax-flow@7.18.6(@babel/core@7.24.3))(@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.24.3))(eslint@8.57.0) @@ -148,7 +148,7 @@ importers: version: 2.29.1(@typescript-eslint/parser@7.5.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0) eslint-plugin-jest: specifier: ^27.9.0 - version: 27.9.0(@typescript-eslint/eslint-plugin@7.5.0(@typescript-eslint/parser@7.5.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(jest@29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0))(typescript@5.4.5) + version: 27.9.0(@typescript-eslint/eslint-plugin@7.5.0(@typescript-eslint/parser@7.5.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(jest@29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0))(typescript@5.4.5) eslint-plugin-jsx-a11y: specifier: ^6.8.0 version: 6.8.0(eslint@8.57.0) @@ -169,7 +169,7 @@ importers: version: 5.1.11 jest: specifier: ^29.6.4 - version: 29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0) + version: 29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0) jest-environment-jsdom: specifier: ^29.6.2 version: 29.6.2 @@ -229,13 +229,13 @@ importers: version: 3.1.1 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-env-only: specifier: ^3.0.1 - version: 3.0.1(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)) + version: 3.0.1(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) vite-tsconfig-paths: specifier: ^4.2.2 - version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) integration: dependencies: @@ -265,7 +265,7 @@ importers: version: 1.14.2 '@vanilla-extract/vite-plugin': specifier: ^3.9.2 - version: 3.9.5(@types/node@22.14.0)(lightningcss@1.29.3)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)) + version: 3.9.5(@types/node@22.14.0)(lightningcss@1.30.1)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) cheerio: specifier: ^1.0.0-rc.12 version: 1.0.0 @@ -340,13 +340,13 @@ importers: version: 5.4.5 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-env-only: specifier: ^3.0.1 - version: 3.0.1(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)) + version: 3.0.1(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) vite-tsconfig-paths: specifier: ^4.2.2 - version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) wait-on: specifier: ^7.0.1 version: 7.2.0 @@ -395,11 +395,139 @@ importers: version: 5.4.5 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) wrangler: specifier: ^4.2.0 version: 4.2.0(@cloudflare/workers-types@4.20250317.0) + integration/helpers/rsc-parcel: + dependencies: + '@mjackson/node-fetch-server': + specifier: 0.6.1 + version: 0.6.1 + '@parcel/runtime-rsc': + specifier: 2.15.0 + version: 2.15.0(@parcel/core@2.15.0) + express: + specifier: ^4.21.2 + version: 4.21.2 + react: + specifier: ^19.1.0 + version: 19.1.0 + react-dom: + specifier: ^19.1.0 + version: 19.1.0(react@19.1.0) + react-router: + specifier: workspace:* + version: link:../../../packages/react-router + react-server-dom-parcel: + specifier: ^19.1.0 + version: 19.1.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + devDependencies: + '@parcel/packager-react-static': + specifier: 2.15.0 + version: 2.15.0(@parcel/core@2.15.0) + '@parcel/transformer-react-static': + specifier: 2.15.0 + version: 2.15.0(@parcel/core@2.15.0) + '@types/express': + specifier: ^5.0.0 + version: 5.0.1 + '@types/node': + specifier: ^22.13.1 + version: 22.14.0 + '@types/parcel-env': + specifier: 0.0.8 + version: 0.0.8 + '@types/react': + specifier: ^18.2.18 + version: 18.2.18 + '@types/react-dom': + specifier: ^18.2.7 + version: 18.2.7 + browserify-zlib: + specifier: ^0.2.0 + version: 0.2.0 + buffer: + specifier: ^5.5.0||^6.0.0 + version: 5.7.1 + events: + specifier: ^3.1.0 + version: 3.3.0 + parcel: + specifier: 2.15.0 + version: 2.15.0 + path-browserify: + specifier: ^1.0.0 + version: 1.0.1 + querystring-es3: + specifier: ^0.2.1 + version: 0.2.1 + stream-http: + specifier: ^3.1.0 + version: 3.2.0 + url: + specifier: ^0.11.0 + version: 0.11.4 + + integration/helpers/rsc-vite: + dependencies: + '@jacob-ebey/react-server-dom-vite': + specifier: 19.0.0-experimental.14 + version: 19.0.0-experimental.14(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + '@mjackson/node-fetch-server': + specifier: 0.6.1 + version: 0.6.1 + compression: + specifier: ^1.8.0 + version: 1.8.0 + express: + specifier: ^4.21.2 + version: 4.21.2 + react: + specifier: ^19.0.0 + version: 19.1.0 + react-dom: + specifier: ^19.0.0 + version: 19.1.0(react@19.1.0) + react-router: + specifier: workspace:* + version: link:../../../packages/react-router + devDependencies: + '@biomejs/biome': + specifier: ^1.9.4 + version: 1.9.4 + '@cloudflare/vite-plugin': + specifier: 0.1.7 + version: 0.1.7(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))(workerd@1.20250224.0)(wrangler@3.114.5(@cloudflare/workers-types@4.20250317.0)) + '@cloudflare/workers-types': + specifier: ^4.20250224.0 + version: 4.20250317.0 + '@jacob-ebey/vite-react-server-dom': + specifier: 0.0.12 + version: 0.0.12(@jacob-ebey/react-server-dom-vite@19.0.0-experimental.14(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(rollup@4.34.8)(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) + '@types/express': + specifier: ^5.0.0 + version: 5.0.1 + '@types/node': + specifier: ^22.13.1 + version: 22.14.0 + '@types/react': + specifier: ^18.2.18 + version: 18.2.18 + '@types/react-dom': + specifier: ^18.2.7 + version: 18.2.7 + vite: + specifier: ^6.2.0 + version: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) + vite-tsconfig-paths: + specifier: ^5.1.4 + version: 5.1.4(typescript@5.4.5)(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) + wrangler: + specifier: ^3.111.0 + version: 3.114.5(@cloudflare/workers-types@4.20250317.0) + integration/helpers/vite-5-template: dependencies: '@react-router/express': @@ -416,7 +544,7 @@ importers: version: 1.14.2 '@vanilla-extract/vite-plugin': specifier: ^3.9.2 - version: 3.9.5(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0)(vite@5.1.3(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0)) + version: 3.9.5(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0)(vite@5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0)) express: specifier: ^4.19.2 version: 4.19.2 @@ -459,13 +587,13 @@ importers: version: 5.4.5 vite: specifier: ^5.1.0 - version: 5.1.3(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0) + version: 5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0) vite-env-only: specifier: ^3.0.1 - version: 3.0.1(vite@5.1.3(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0)) + version: 3.0.1(vite@5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0)) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@5.1.3(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0)) + version: 4.3.2(typescript@5.4.5)(vite@5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0)) integration/helpers/vite-6-template: dependencies: @@ -483,7 +611,7 @@ importers: version: 1.14.2 '@vanilla-extract/vite-plugin': specifier: ^3.9.2 - version: 3.9.5(@types/node@22.14.0)(lightningcss@1.29.3)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)) + version: 3.9.5(@types/node@22.14.0)(lightningcss@1.30.1)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) express: specifier: ^4.19.2 version: 4.19.2 @@ -526,13 +654,13 @@ importers: version: 5.4.5 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-env-only: specifier: ^3.0.1 - version: 3.0.1(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)) + version: 3.0.1(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) integration/helpers/vite-plugin-cloudflare-template: dependencies: @@ -557,7 +685,7 @@ importers: devDependencies: '@cloudflare/vite-plugin': specifier: ^0.1.13 - version: 0.1.13(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0))(workerd@1.20250224.0)(wrangler@4.2.0(@cloudflare/workers-types@4.20250317.0)) + version: 0.1.13(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))(workerd@1.20250224.0)(wrangler@4.2.0(@cloudflare/workers-types@4.20250317.0)) '@react-router/dev': specifier: workspace:* version: link:../../../packages/react-router-dev @@ -581,10 +709,10 @@ importers: version: 5.4.5 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + version: 6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) wrangler: specifier: ^4.2.0 version: 4.2.0(@cloudflare/workers-types@4.20250317.0) @@ -605,7 +733,7 @@ importers: version: 1.14.2 '@vanilla-extract/vite-plugin': specifier: ^3.9.2 - version: 3.9.5(@types/node@22.14.0)(lightningcss@1.29.3)(rolldown-vite@6.3.0-beta.5(@types/node@22.14.0)(esbuild@0.25.0)(jiti@1.21.0)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0)) + version: 3.9.5(@types/node@22.14.0)(lightningcss@1.30.1)(rolldown-vite@6.3.0-beta.5(@types/node@22.14.0)(esbuild@0.25.0)(jiti@1.21.0)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0)) express: specifier: ^4.19.2 version: 4.19.2 @@ -727,7 +855,7 @@ importers: version: 1.3.3 tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.11.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.11.24)(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -758,7 +886,7 @@ importers: version: 6.0.1 tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.11.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.11.24)(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -798,7 +926,7 @@ importers: version: link:../react-router tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.11.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.11.24)(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -816,7 +944,7 @@ importers: version: link:../react-router tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.11.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.11.24)(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -906,7 +1034,7 @@ importers: version: 0.41.0(typescript@5.4.5) vite-node: specifier: 3.0.0-beta.2 - version: 3.0.0-beta.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + version: 3.0.0-beta.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) devDependencies: '@react-router/serve': specifier: workspace:* @@ -964,13 +1092,13 @@ importers: version: link:../react-router tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.11.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.11.24)(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + version: 6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) wireit: specifier: 0.14.9 version: 0.14.9 @@ -992,7 +1120,7 @@ importers: version: 19.1.0(react@19.1.0) tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.11.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.11.24)(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -1029,7 +1157,7 @@ importers: version: 6.3.4 tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.11.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.11.24)(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -1048,7 +1176,7 @@ importers: version: link:../react-router-dev tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.11.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.11.24)(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -1079,7 +1207,7 @@ importers: version: link:../react-router tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.11.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.11.24)(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -1094,7 +1222,7 @@ importers: version: link:../react-router-dev tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.11.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.11.24)(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -1143,7 +1271,7 @@ importers: version: 0.5.10 tsup: specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.11.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) + version: 8.3.0(@swc/core@1.11.24)(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) typescript: specifier: ^5.1.6 version: 5.4.5 @@ -1186,10 +1314,10 @@ importers: version: 5.4.5 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) playground/framework-express: dependencies: @@ -1247,10 +1375,10 @@ importers: version: 5.4.5 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) playground/framework-rolldown-vite: dependencies: @@ -1327,10 +1455,10 @@ importers: version: 5.4.5 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) playground/framework-vite-5: dependencies: @@ -1367,10 +1495,10 @@ importers: version: 5.4.5 vite: specifier: ^5.1.0 - version: 5.1.3(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0) + version: 5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@5.1.3(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0)) + version: 4.3.2(typescript@5.4.5)(vite@5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0)) playground/middleware: dependencies: @@ -1440,10 +1568,10 @@ importers: version: 5.4.5 vite: specifier: ^6.0.0 - version: 6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + version: 6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) playground/rsc-parcel: dependencies: @@ -1547,13 +1675,13 @@ importers: version: 1.9.4 '@cloudflare/vite-plugin': specifier: 0.1.7 - version: 0.1.7(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0))(workerd@1.20250224.0)(wrangler@3.114.5(@cloudflare/workers-types@4.20250317.0)) + version: 0.1.7(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))(workerd@1.20250224.0)(wrangler@3.114.5(@cloudflare/workers-types@4.20250317.0)) '@cloudflare/workers-types': specifier: ^4.20250224.0 version: 4.20250317.0 '@jacob-ebey/vite-react-server-dom': specifier: 0.0.12 - version: 0.0.12(@jacob-ebey/react-server-dom-vite@19.0.0-experimental.14(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(rollup@4.34.8)(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)) + version: 0.0.12(@jacob-ebey/react-server-dom-vite@19.0.0-experimental.14(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(rollup@4.34.8)(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) '@types/express': specifier: ^5.0.0 version: 5.0.1 @@ -1568,10 +1696,10 @@ importers: version: 18.2.7 vite: specifier: ^6.2.0 - version: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + version: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^5.1.4 - version: 5.1.4(typescript@5.4.5)(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)) + version: 5.1.4(typescript@5.4.5)(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) wrangler: specifier: ^3.111.0 version: 3.114.5(@cloudflare/workers-types@4.20250317.0) @@ -1611,10 +1739,10 @@ importers: version: 5.4.5 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) playground/split-route-modules-spa: dependencies: @@ -1648,10 +1776,10 @@ importers: version: 5.4.5 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) playground/vite-plugin-cloudflare: dependencies: @@ -1676,7 +1804,7 @@ importers: devDependencies: '@cloudflare/vite-plugin': specifier: ^0.1.13 - version: 0.1.13(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0))(workerd@1.20250224.0)(wrangler@4.2.0(@cloudflare/workers-types@4.20250317.0)) + version: 0.1.13(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))(workerd@1.20250224.0)(wrangler@4.2.0(@cloudflare/workers-types@4.20250317.0)) '@react-router/dev': specifier: workspace:* version: link:../../packages/react-router-dev @@ -1700,10 +1828,10 @@ importers: version: 5.4.5 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + version: 6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) wrangler: specifier: ^4.2.0 version: 4.2.0(@cloudflare/workers-types@4.20250317.0) @@ -4039,75 +4167,152 @@ packages: resolution: {integrity: sha512-xFS97cO9TdQgNf1M7N1c5M8Z/kWiIC91ufwabnRWFt5NTaT6NCXusOKcqw/kpJOBKgZcO1kjNvQ95HE3EG85rw==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/bundler-default@2.15.0': + resolution: {integrity: sha512-ILPLWsRdt8GceQSPUGWDg6FpELpHJbIEu5B2+72zx2zgsXHYmkT/d35HKIFHq4NoN2ZGwRFJI0bQ+DJcFAt+Tw==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/cache@2.14.1': resolution: {integrity: sha512-oFJfIK6QfxY35XYsDaOyFWH3eKEbzU4CXTsUVAkpH1PbX0DTko3eZ4D+xWapRRaAQIMfL+xfUWmsL4njYCQqZQ==} engines: {node: '>= 16.0.0'} peerDependencies: '@parcel/core': ^2.14.1 + '@parcel/cache@2.15.0': + resolution: {integrity: sha512-UKCf/mUJ1Kn+PXvDDTzXHu5eafUQPMQ+JIb1cHsFGGJETpCZskKhexnN21yJVrdRPM0JkIjxv1viTRTk2tt6Gw==} + engines: {node: '>= 16.0.0'} + peerDependencies: + '@parcel/core': ^2.15.0 + '@parcel/codeframe@2.14.1': resolution: {integrity: sha512-n5IdtgxuukSTJ5/fq/69S5Rm9KBSg/dhpE4oRkyUEtkgEwTLpG2c6rmYtWem1yGIc80Z4BRvP9vgmYAEHHXSwA==} engines: {node: '>= 16.0.0'} + '@parcel/codeframe@2.15.0': + resolution: {integrity: sha512-zpZCf5W+npiSkdCUC7izjdUUoWM2M++XWRwbqgwWBUCKrXC4vVJoOYMzLbyfaF/zkVo5iQenSGlsD0olBd7V1w==} + engines: {node: '>= 16.0.0'} + '@parcel/compressor-raw@2.14.1': resolution: {integrity: sha512-lo/MJIOaEhjhgC3H0eMvqWpd1J2CxTErIl7T4MIIwzgNBdXHJe39ErkiJYaelh/q15uQVnc5dXx3VSu/YgWDXg==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/compressor-raw@2.15.0': + resolution: {integrity: sha512-AoShbbqNCkzTkNMygmcCazV6iFj9nLVwBPZZCAyJ57ooRlxPszMtLO1RIw/cVU9PJg/NlYGg0uEGVt/N56SzWA==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/config-default@2.14.1': resolution: {integrity: sha512-rM+SqYmgzrg59XH8c41fC6lggFWRYm1tQ/NvrLB4QuKzLqh2RSLa8rNkuR7bDGo1Bq7ore0WjjFDv87MXsWJkg==} peerDependencies: '@parcel/core': ^2.14.1 + '@parcel/config-default@2.15.0': + resolution: {integrity: sha512-vWwDvM4t0Osm2u6PI8pG7Z/J6kDMpJ+zEdIdhj9Au9lJWYA4SS3BF7mj4jhWlr69ClK9rsLujwfh3AUJr6oYpA==} + peerDependencies: + '@parcel/core': ^2.15.0 + '@parcel/core@2.14.1': resolution: {integrity: sha512-vw7Uc2hZgXEDCHyPzeV+IPqC9mUtCbVSJ4lXP9Ri49mdLV7Hazb9iCN4mNld7sCMtG2f6fEqfwsD9r2zGyntgw==} engines: {node: '>= 16.0.0'} + '@parcel/core@2.15.0': + resolution: {integrity: sha512-HJvgxG18f6geGkp50y3Ta2ZcEBXtpraZxnERy/BMuXYxIB3DPGXN53Jsy6huELDNpSIXJJXOfXeDMSs+XonTCg==} + engines: {node: '>= 16.0.0'} + '@parcel/diagnostic@2.14.1': resolution: {integrity: sha512-1miPY3EFMlaRRXEEi9kqqVih8jxCIrmpeQTgnFcamX7TypAlGKaFjn0FTOYL1FXexVHETiVFzmNOWVe+EUJF6A==} engines: {node: '>= 16.0.0'} + '@parcel/diagnostic@2.15.0': + resolution: {integrity: sha512-Bzg7AJu10muQ793p2MPlZnYvbqZXOJw/YBIOCFjbwRKiYUb06+sZyfntU7e7YecV6im0IGqkIfMD0F4MT+v7Rg==} + engines: {node: '>= 16.0.0'} + '@parcel/error-overlay@2.14.1': resolution: {integrity: sha512-9HyBBOjR+xp8OWSwOV0DRmWduKEtR+PKjdwc3+PIP9LQ4p9WL/uUcGG57LCdU4UKih8befCRN0qs7iMQU1OSxg==} engines: {node: '>= 16.0.0'} + '@parcel/error-overlay@2.15.0': + resolution: {integrity: sha512-Tsq0q4Lv3aDn/nXWuzH1x/pgzYQYCt17qOejAANfNYIBIrLs7BRsGyT63vP39i7IXI+MvulMl5nDXQDAqDwujw==} + engines: {node: '>= 16.0.0'} + '@parcel/events@2.14.1': resolution: {integrity: sha512-DG4xxp1x/ky7aHbz2GpwPBAkbI4pTfEWGukXh6bTyp/8TJl6LHvQxZkNszBoOwPF+D9vKH+Cm1ZS+iLX1HCnaA==} engines: {node: '>= 16.0.0'} + '@parcel/events@2.15.0': + resolution: {integrity: sha512-iCoFGsZTAlh3ewp6KYseUC16OHbZi2n6vAl4Rr8Uw7yxvwCC3iHT9acLwhO7bP/YKkdGri3d78+UwPl8LmbIwA==} + engines: {node: '>= 16.0.0'} + '@parcel/feature-flags@2.14.1': resolution: {integrity: sha512-SiFWEONfIIM42+J4IFQnAgVOuqOPqZLc+6kHX8bmSBYAA6PVkwfjI8GVwcFm0qzo9HYylwuHwzrAdByv5FFodA==} engines: {node: '>= 16.0.0'} + '@parcel/feature-flags@2.15.0': + resolution: {integrity: sha512-gtAC30G2QlIwTlLM2tI7AB0JBKEiX4nNOL/qh+or9wD9fuk53O4QHJwPtiy49YGSPYrYnIR2EXWOOV+3Br9CCw==} + engines: {node: '>= 16.0.0'} + '@parcel/fs@2.14.1': resolution: {integrity: sha512-qLKjKdE+8d+HycrUSbWf2pLmfi2g4p23HkEMwxOPnbu+OQ9deyrODbfhMNVQNSGDztNDjw53YF4+c5Y+DCtXUw==} engines: {node: '>= 16.0.0'} peerDependencies: '@parcel/core': ^2.14.1 + '@parcel/fs@2.15.0': + resolution: {integrity: sha512-ecWIbIhwdnvJc/PY+l3TFOcRtr8W3X6M1yfhNQLmYs/3kETIxDK8s+vTva/qPBFEiW0amMBhbkhKZEXFrxL1GQ==} + engines: {node: '>= 16.0.0'} + peerDependencies: + '@parcel/core': ^2.15.0 + '@parcel/graph@3.4.1': resolution: {integrity: sha512-4kaHLJ0HfMo9OT3dEUlLLArMa3YYCYEDs7b1juXPUYS6VEPfxebdAw6gcF2KlC/TMUP7SbU9dsauPfOc1ttXcQ==} engines: {node: '>= 16.0.0'} + '@parcel/graph@3.5.0': + resolution: {integrity: sha512-CLQMSPq1TTwGqt741UIwuzXSXRX4G4skNrZ7OZnUcUNfKfHKjJq5T/tqhpCsfTXzW8KASOt7EJGPD64HYA8nRQ==} + engines: {node: '>= 16.0.0'} + '@parcel/logger@2.14.1': resolution: {integrity: sha512-jksQTCuVW7HWB75HShnliGs+lwbirv9ajCQtEwtOMFlZMCEplu0Pp6GxNG467r9EWzCf55yGwnZw7F6Fs1Oqgg==} engines: {node: '>= 16.0.0'} + '@parcel/logger@2.15.0': + resolution: {integrity: sha512-WCYtSweM7Iol/lE7HhU5cLsSNuGQ1T4xTIYvG16tGHCsjybWF1H9yqkL90WU2JHjhSsvNGjvwrVxWjfO304fqQ==} + engines: {node: '>= 16.0.0'} + '@parcel/markdown-ansi@2.14.1': resolution: {integrity: sha512-cxeM6w9861HTMuxEhhPDznCwPd/MxbIJpqp5z9E8+L3Syso0qa7ot5z5Lm3DSfDVh0Dnpi7srC8QpJkOqCl4yw==} engines: {node: '>= 16.0.0'} + '@parcel/markdown-ansi@2.15.0': + resolution: {integrity: sha512-TJOSg/y2P1Rp199+osSFd4jtt8M4iyBQwgC4gdAARcraIwLa/wYRt6RVnOIsN3nz1r1CPLvHHPfuIwwFjRNw9A==} + engines: {node: '>= 16.0.0'} + '@parcel/namer-default@2.14.1': resolution: {integrity: sha512-6Hq4TuQblYhqzpi7eVHLa2RJ0OGq5MiR6KofAwpz4gDF1H8UVR85KGzFLRRk73nAqMZi45Yqs8f4FHtTOJzksw==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/namer-default@2.15.0': + resolution: {integrity: sha512-JkfrvBcMmZ4DvI9VGUWSir3Nwlh224MsKUMqfXs9zc9Xq484v+p+bSaEoAwZIyfUwXXDz1sXk9NffNuLSa5ivA==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/node-resolver-core@3.5.1': resolution: {integrity: sha512-FiZUbTmEfoWIRKYmmx2baPlusIdW9gKPRowXp+YWb436aFxbk06rf8pS4uCkODN61RZEg6WPHOo0rLVcylbOSw==} engines: {node: '>= 16.0.0'} + '@parcel/node-resolver-core@3.6.0': + resolution: {integrity: sha512-5WxRlrFkHrUrCa3zq1Umo/k3Da7F1Bib31yEZp3pmAgjbX/wi+ESiMllAamW6IP2SLP80jAB2D/mbuHAqPH3kg==} + engines: {node: '>= 16.0.0'} + '@parcel/optimizer-css@2.14.1': resolution: {integrity: sha512-uerUTAFzer23wDD+CeGDxRSpGJrpYNU7RIkvUKrWBaYPG2ztKQ4NWWZ7/xVL8EdU6TilRec6xihrONFUE1Pa3Q==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/optimizer-css@2.15.0': + resolution: {integrity: sha512-MPazyyIZuQgdWdjkVNq8/JyaM3Z2IalChJV+7j2EjdAU6fGblkp7HsroRYCdoWP+88ULsOblHUUkpqDGtHr2WQ==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + + '@parcel/optimizer-html@2.15.0': + resolution: {integrity: sha512-sJBqAOFAFrT1fuF4bcGKy3bNsSvdWEP8TP27bOQZ7VoIEH4j+Uycxhy2OU+l8PC5FSnTQEGQlBZ5YNEsputzYw==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/optimizer-htmlnano@2.14.1': resolution: {integrity: sha512-m9qmJD1yC5/KfXz/6dk8QdVFug3iSXhkABIo51iPHezabRNKxBscQHvaYjRGptJdTgqe04vz8Wf1l4iLpKWM2w==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} @@ -4118,6 +4323,16 @@ packages: peerDependencies: '@parcel/core': ^2.14.1 + '@parcel/optimizer-image@2.15.0': + resolution: {integrity: sha512-LJjP2OeE+85zNL0jQfCPZ6mG2voG6FplgcQ2poQQi1HJ4WdVgMiF8K34j5X7jqrQZn9V2duQGEXt1dGlG/5wyQ==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + peerDependencies: + '@parcel/core': ^2.15.0 + + '@parcel/optimizer-svg@2.15.0': + resolution: {integrity: sha512-oIzgi2VfbsEs6R3e17Dps2lVN1mX6GpHMuCRYDXghJWhoMR0f8OodsG3mCpFqDldhQTDqHPkH+Rr8JqS1EMBHQ==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/optimizer-svgo@2.14.1': resolution: {integrity: sha512-pMQ2vHLRO4eOUYzc1aNa+U3EET2CoXNP9eHzMEXD9ikbcuU699LWhQ9f0g94q/tCEPiDDU7fYFVRk5z9rYJ4xg==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} @@ -4126,80 +4341,206 @@ packages: resolution: {integrity: sha512-oNtXoW/o9zWXhcoZ4taaIot3l5jSy9RzKXWzKLtrMHkljyifIcxJ7DfgMfr2v1ToCFYRitdtQ4s0Y9dDOvjlqw==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/optimizer-swc@2.15.0': + resolution: {integrity: sha512-CLcgEnmNQ98bFBcY/0n7yRKU/Vyq5FPGJh5tCosCGgZ1Ob6sHIb8zLbKl6aqKYqfbDHouHHtirjLwBf0nRfSUg==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/package-manager@2.14.1': resolution: {integrity: sha512-zLjPJpKhj+3Yqy9HN1Kp7fTot2BqTG3wxFoVRI5vdKqMeC9PT+UexdctU0sx90aeXcs3dF6yl944nVPlMZW8qA==} engines: {node: '>= 16.0.0'} peerDependencies: '@parcel/core': ^2.14.1 + '@parcel/package-manager@2.15.0': + resolution: {integrity: sha512-CYJss7ouWCAanv+E/6Ndo6TtFo3981k2lSi5pWRwaSEGe/adY6YaFTcfV4gwKmMWcpqAnymtUxDiCxrZBIR6AA==} + engines: {node: '>= 16.0.0'} + peerDependencies: + '@parcel/core': ^2.15.0 + '@parcel/packager-css@2.14.1': resolution: {integrity: sha512-SUVnX8cFHApmU0xA4rard3h1gR4tN7MeB7w1JtO+BgTLdxHBAG/rzqh22T7pJuwc+XJ8x+8CSh1vYkrIuL9Dow==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/packager-css@2.15.0': + resolution: {integrity: sha512-NIO3/wBbdBpajCwBon+wrdRHZl4ei+5JoZU3uW4Np8ECaoRdBmseyGoyYqiHCO7dxhu+iAa5WrRFOAjQGtNOOw==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/packager-html@2.14.1': resolution: {integrity: sha512-66vTBsQw9Tob/9uqOfXmGaJX83HG/Y7ymPcB2MqFSiZMKWz6jQSolwycHi386l2t1Lf71tMmFF9hrTzD4WHqgQ==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/packager-html@2.15.0': + resolution: {integrity: sha512-1oA+bgqTny7yTXPgRUbBwi4TLy0ywPtpFJZcxwI6GONORVHDC/178PpjCbkD4q9O61J2e1Ms793aZam7zeBkjg==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/packager-js@2.14.1': resolution: {integrity: sha512-NLK9eI876hedSvq95H3Wpk4eaGbPSmSr3fCuAOwfysMh0fO0mzpxzEj7aMK2SariSYLtBLkkeR42QJGe/qzqpA==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/packager-js@2.15.0': + resolution: {integrity: sha512-vAqBujbE/nJ47a7Gdo2p0dhipPuOQV8gy0cfJAuEz50BlCMwn1IRY2fGtE2zMW1KCcvLwGmEFyYVQh/C71wqAQ==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/packager-raw@2.14.1': resolution: {integrity: sha512-R36Awv/TuLIeQSK7l+GX7XEDYR3otutmMBGgZJg4w9Y8P0E26fViNELqzA9CIJq5qBHAC48eOd+V2IGh0RV9GQ==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/packager-raw@2.15.0': + resolution: {integrity: sha512-zbl4z2EyNPFfBGekQp8F9+LorKq5uV5zhkLcyGZY3kFqyar1HLwbr/Qm6Di1X3OE5IR0+kccqjtF7im9VY8v9A==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/packager-react-static@2.14.1': resolution: {integrity: sha512-dDPQ4xFSZ1XEirqhYimexmtOH6KBhw0bPRinNtpZak6iKOmNbg65LwDayBDMKQyU4wOvXjMh1Psr+5APQ0fDRw==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/packager-react-static@2.15.0': + resolution: {integrity: sha512-Gn/Dm6uTvyn+eA3VdMZLWzig6ZkOohPPV87DMy+enIcaN3Q0RetT5nh3SjwKGairai+WarAV0wRlMbmlR3bgxw==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/packager-svg@2.14.1': resolution: {integrity: sha512-5s/PSwVd8K92ksML50gGxUPs1WVOfGDoMHBqZbJP21FyTJSqV1e+qDvdjSSWGDImGL79ZAB5gVHguxuonsnAlw==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/packager-svg@2.15.0': + resolution: {integrity: sha512-rtdqnxNTlVi7HI/mHvmKBjv9d7AT2vveqw9QELAHosEKLl5+ZUBtUvwv5NcaQ8Z2Z4Vjyq3EHuPD+LsYCLalhQ==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/packager-wasm@2.14.1': resolution: {integrity: sha512-crMF0j3zgDgPuUQoXP19bZ2kr1JxwOkEb1uz3l52qzb+bU8mNn500MBh/oNv5Kz3LsmeNFF0QMpAjpCWYyWp8Q==} engines: {node: '>=16.0.0', parcel: ^2.14.1} + '@parcel/packager-wasm@2.15.0': + resolution: {integrity: sha512-fKG2sNC3OIx5XKJ9RQ8fzDXujNopGGjSK+uYbUVrGpG8AlyUJt5ETVjk1712KaDAJxE8u0oUcupXfrrRNbW/Fw==} + engines: {node: '>=16.0.0', parcel: ^2.15.0} + '@parcel/plugin@2.14.1': resolution: {integrity: sha512-zWqQF+YnCNjOd1lc2nWWdjhr6zNJGV1WFE05W3WSJgyfyes8s4HB0FzShTqJ+R9FQdmYWPmRuxO8hC3lwLSQDg==} engines: {node: '>= 16.0.0'} + '@parcel/plugin@2.15.0': + resolution: {integrity: sha512-OT+W5t70+VZbcg2P30QahF4YjRu+9ywG5NSMj0SYvS6PCZa+IAYB9589KuavcAp+Tq2FV7MgYtrBKPh9b0VAtg==} + engines: {node: '>= 16.0.0'} + '@parcel/profiler@2.14.1': resolution: {integrity: sha512-qrR+RqXfF1IXJdddMoJaAhFnl6pen1CBoobP8p78pZ2SAefo8gyXnTG4Kgr6ff0VJER03U7o0bL1dI9ooHHhDA==} engines: {node: '>= 16.0.0'} + '@parcel/profiler@2.15.0': + resolution: {integrity: sha512-/Bw10pCISHbSzpdmuxg1GjSh+GuvqmUYA9bAmb69dkzWLIEk3uU05ba4xoju2mwoSeNb50LRcYPcirLB0Z61wA==} + engines: {node: '>= 16.0.0'} + '@parcel/reporter-cli@2.14.1': resolution: {integrity: sha512-wNG2JbwpJ5qLRPhwoXgm0LxRNjePRflFzfgwX1NlSKwJp7FtNoczraTt8lZPtoM5e1ChzS2ggKz5XUnYhLQa9A==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/reporter-cli@2.15.0': + resolution: {integrity: sha512-p8nNpX53A7OLFpqZravxzanExPyk0/zNFTYJO/rdGToOqe/m3V/uK8XWb45fVf9OKNZmB13sr/DRdeYHMbXyYg==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/reporter-dev-server@2.14.1': resolution: {integrity: sha512-7bCBNcSNBlsoeDX5JHFTeqRDzGxggEkOqX/HMN0rkp9R1wUOKPu9ik1hHXKjknUOsLYJ/lvHbecLZFaTMBOYIQ==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/reporter-dev-server@2.15.0': + resolution: {integrity: sha512-WILv04oGD3yGAI17w1+MkJZKQumndpGHVzRVZIgLc5WWDffGWvCGYJseUWYQc34/CYY19v/hI/BaEQqJX6CABQ==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/reporter-tracer@2.14.1': resolution: {integrity: sha512-RBFoP3pVXhRMkatZcNNvl/NbJNS4LVPz2Oy+0pVL18pbMEan2O8HpVbELnUbeWi1995IGBEp2DMGZMAw4qV51A==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/reporter-tracer@2.15.0': + resolution: {integrity: sha512-ICVLXcwaXAbk9uLBczPgAaAG5esaIBUn8soaX+TXylQfUCIExbU9Q321hreLIRZK6j6UrWQ/m55EQGFKLWf0Lg==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/resolver-default@2.14.1': resolution: {integrity: sha512-wRdd/3ws3q82WxJ+ton41C1XiXvlJKW1xIklyvVAu9Bxqvru6N0L8zM6sWBdy305gwfyVq4pBBRUCJu7YxkkUQ==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/resolver-default@2.15.0': + resolution: {integrity: sha512-Olnm/eY70keKg0oyG0c5Qkhx0R/6fyj0S8w4E4OVgpAMIuRKt8nDNfHBLgbchYgCJlPb8YwzbHluJLfxZlHLeA==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/runtime-browser-hmr@2.14.1': resolution: {integrity: sha512-HaRMkQhco25klcTKfqL6UD6iRA+fkurbbsEo0p7gSfy9d6HoPS7Sml7duddQ13eBIcbTdYVclucwSIuoDFNoqQ==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/runtime-browser-hmr@2.15.0': + resolution: {integrity: sha512-HZQpEbunNino2SF5Ilt7EHFGeHhBCk05s1o69Y5bNrIGy3meu287maWcjK1zzpquw0IskgsnGaafKSOcaVbHXw==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/runtime-js@2.14.1': resolution: {integrity: sha512-YxSpJI5IQTo9ltKPXV9WueOD7z/uNaa9Fcl17OQ/cBgapDBRWqzBgewSSRJPySQt6gWcWdZWTqeeG2OTCRUQOw==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/runtime-js@2.15.0': + resolution: {integrity: sha512-fmHWzTr1WjHk/rrRyvt5e932rrDUyMZfzWMn1JLOXK7NFmndoc0PUrjH+8OFAlvGopFX+0gHWOe4/VeC8Vujuw==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/runtime-rsc@2.14.1': resolution: {integrity: sha512-rmvs02ilOkvFjblhQsJL8c8jJjFpQl88xm8owyH2eVpqNdqfyHtpCWHnDjsoKmvjfRTf6143W7w9kLqNb2UNnA==} engines: {node: '>= 12.0.0', parcel: ^2.14.1} + '@parcel/runtime-rsc@2.15.0': + resolution: {integrity: sha512-bs0miqQ/fqQU+6iAjXBG65/t5/r/JTYAg3YEo7WPPA9cbgSE8aL2rk+6d5HnRkUstzXKJEgzAQJLObOAb3s/HA==} + engines: {node: '>= 12.0.0', parcel: ^2.15.0} + '@parcel/runtime-service-worker@2.14.1': resolution: {integrity: sha512-Dz0tLHrECfzgNBfKm54QWBPsdvchFo4n2FBn4GWss0TYS4QMFrHWgc2YuRwVForXm2yS8/qoLignvM3gH8PLKg==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/runtime-service-worker@2.15.0': + resolution: {integrity: sha512-5JGqWuBriviDG6A1KSuBmQG408Ngx7iix3l/hG3IcUPv2jDUoN4tmLTqOMfmXsOZF+FUJNZ30EP6y3GTv2PIdg==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + + '@parcel/rust-darwin-arm64@2.15.0': + resolution: {integrity: sha512-bdlLA/l7h7TPGc6lnHNrLW6uwUMJ7bqyHa4StYFViwXffDnEeA+hdpixDfc9qTlMJlKgQyYj7BNP1NO6OxJiRg==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [darwin] + + '@parcel/rust-darwin-x64@2.15.0': + resolution: {integrity: sha512-l6tD0nNvmtpwuNSCP9Q5jPpPeY45NwmRNiuDoYMzfNT3iFKs/i48/3JM1vZvYO3HiW6V0xGfWa1b+HQsSKQRYg==} + engines: {node: '>= 10'} + cpu: [x64] + os: [darwin] + + '@parcel/rust-linux-arm-gnueabihf@2.15.0': + resolution: {integrity: sha512-MZNL/UV20kBaTYMos/IcJPZvzYzlYWjuBZh2EI3OHYBGMR9QdpeJuwgTAy2WUYbevXm7nemdGHGccGcdiNf/Xg==} + engines: {node: '>= 10'} + cpu: [arm] + os: [linux] + + '@parcel/rust-linux-arm64-gnu@2.15.0': + resolution: {integrity: sha512-u/rndCWjmQgFJi/2NFVWV1snlF/souO8UYZR+ZG6goo/sik5WgrACtCucgOrskogE50WU1+JGmP0TBNqOX27Uw==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + + '@parcel/rust-linux-arm64-musl@2.15.0': + resolution: {integrity: sha512-uTSOZJkZKh/x/IfaGkbmqqdUaK1S61Kw3ZW8yj+EtteHvfZgk1SQMgI51Gg5hwaZ5wuZx0nOJGLuOxPMGx7z6w==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + + '@parcel/rust-linux-x64-gnu@2.15.0': + resolution: {integrity: sha512-8SIwgM+bpiodJemNaEuUgZQk4hV/3pgJnPBRjGse1F7SHeTp9UoABLSF3V5Sc79Hi8fzECoRimk44krzSCaynw==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + + '@parcel/rust-linux-x64-musl@2.15.0': + resolution: {integrity: sha512-pMFQ7bdaBeFY+qfHE8Oor8yZLkXDl5PmnKICuFiGETnbClV9xfWmZdTnqjEw2XU9gGQ49DkWJcGW975d3IlksA==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + + '@parcel/rust-win32-x64-msvc@2.15.0': + resolution: {integrity: sha512-UXjPkWbavwGIHi/R1uPd4CZDhAUUfOGpvIMRdq0ImihoRUnUxyTCIsqRhwh8flOO2RCuU6rteeGOeT9undSX7Q==} + engines: {node: '>= 10'} + cpu: [x64] + os: [win32] + '@parcel/rust@2.14.1': resolution: {integrity: sha512-BGFV+bS72zlzaHQAEobm/9shcW+lvQb0rAdmJJg2C3lGlqeaGks+iEIkH0wHTFzJJ1MpKgew7I3k096La0CjTw==} engines: {node: '>= 16.0.0'} @@ -4209,6 +4550,15 @@ packages: napi-wasm: optional: true + '@parcel/rust@2.15.0': + resolution: {integrity: sha512-ERRO4q14g6nD5mr1S/kEDSsmis/mll9JLxzyub0vTgobywrUq/azJ6Un7XwhCXCaU7lO7ihD+HJvjmNLVULCXg==} + engines: {node: '>= 16.0.0'} + peerDependencies: + napi-wasm: ^1.1.2 + peerDependenciesMeta: + napi-wasm: + optional: true + '@parcel/source-map@2.1.1': resolution: {integrity: sha512-Ejx1P/mj+kMjQb8/y5XxDUn4reGdr+WyKYloBljpppUy8gs42T+BNoEOuRYqDVdgPc6NxduzIDoJS9pOFfV5Ew==} engines: {node: ^12.18.3 || >=14} @@ -4217,68 +4567,134 @@ packages: resolution: {integrity: sha512-WmCidhpNhbL4qWdnNFWS0F+GtYSY8k7X4wi9vYrGcFsh2jilsYoTm4BV91CUZtKfhxpYq7n1X+tknY4cOP8Isg==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/transformer-babel@2.15.0': + resolution: {integrity: sha512-mJNrV4254gJ9o2pjZvyK88RXCbDmlBdZqlAqg/HXEHTqzae/iOoSGpvxy+NisqXgpMwpIf8wlxmyFna8FL4Yfg==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/transformer-css@2.14.1': resolution: {integrity: sha512-v8kP/V1sOKEukie1veZxxcITJNJiuktNzZuCxR5G/yaJMOU57dTP8oVHGiTRr/eA6A3CRzYjeSWEWvaR3ruQRw==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/transformer-css@2.15.0': + resolution: {integrity: sha512-GOC/ZFi6lxVfseGCb2kJdYBiliHrQq9dxcFayHGb7zrIRWVf9F9ihzsLkDaZ7a4WBu+gIib7JLGnO0Jy3leWOg==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/transformer-html@2.14.1': resolution: {integrity: sha512-Q7WKi3zfgP+3QNLFqnuypRLcJBP3PMgL5mClXdIhoyY4D0xpTBoq3NCr4DfdATChrUO6NZm6BcgDVmF04KfYnQ==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/transformer-html@2.15.0': + resolution: {integrity: sha512-4qFvAZICCYbKgPaX48yzxMHrSXgm4fIISHYN+W9fu7S6ohr2cOYM6FE4sk3PYxDS5aWeU7j6zU0C4I/sLlO8KA==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/transformer-image@2.14.1': resolution: {integrity: sha512-ese7UQAb6KbC4qaPKqejNyx7Jsru8PlWMMcSgiw7o7BnHVqHP8d7MbwlokgxIo0uE/0zMFlEgKdNKtsoj+AEkQ==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} peerDependencies: '@parcel/core': ^2.14.1 + '@parcel/transformer-image@2.15.0': + resolution: {integrity: sha512-5arJrqpxHsGchqBZb2tVUIJUuzQLZIeleXq+kVnI0Tq+XFE5h3fvIrgg/viAN1lDi4eFf7fq5gWX2ImQNvkKyw==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + peerDependencies: + '@parcel/core': ^2.15.0 + '@parcel/transformer-js@2.14.1': resolution: {integrity: sha512-Zy60nRvZEabNCOTbChh/RbOpk03s5ozLMOXCAIv1VYRTSZmQFjSlIiwlaNgPjRIn2xpf+2c1y4eslk9z7RPy0w==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} peerDependencies: '@parcel/core': ^2.14.1 + '@parcel/transformer-js@2.15.0': + resolution: {integrity: sha512-tVa97+fHO0hROVpN+lmCR6H26NaQ2eq8uc2zrdsaW7XkTOyiCPSIb1oRkWP4jBBkAs73oHBhP+KvpumRhnzodw==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + peerDependencies: + '@parcel/core': ^2.15.0 + '@parcel/transformer-json@2.14.1': resolution: {integrity: sha512-oAjq78dt0Z8BbetH7edXSHVolL1DwMvEeqIPJfNybwyuKh3mwWvgbFgeurr3J5B268FXCMYmIgt63wactPnbcQ==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/transformer-json@2.15.0': + resolution: {integrity: sha512-TPv3xz8JmYpzEAeeDrJCxQ1cqO8dSjeI4MDjdrr5KAHNCZZhb1s2iFH7lXMFAkUZlR1BbUfMLUvCQsu4RFwAdw==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/transformer-node@2.14.1': resolution: {integrity: sha512-vl0m/k5eGxUe8kb9I56yhNrcrsfaWyn3+bUuLiX2jB4VA+F3qnN5N2V7wskmdGia4G4X174ICYCKQU+fLlDuFg==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/transformer-node@2.15.0': + resolution: {integrity: sha512-Nu8rBn4SkP2cMJ+iZYQQGW+OmgFPQs4eaAWf0x0ejosjsS32ZVL70WhsnqCDa2DLq3Oeo2Zyeugd0Hz7DvvsDw==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/transformer-postcss@2.14.1': resolution: {integrity: sha512-YkRLmglO9gGq4Ds/KFFPTU2VpsKcMPi5gcPp1ZGlvJQYXjjMXhHksDsOgDWiPXA+aQuTk9truO93QPdOol3U3w==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/transformer-postcss@2.15.0': + resolution: {integrity: sha512-N6DrPK34RfYoYQEah9Gp6SdzTxzBuOK2/ZjkjcAoyEBT2Ong1JtQUIW75Rw3Wdktd8Yez21Ez+fLseAHuXZMDw==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/transformer-posthtml@2.14.1': resolution: {integrity: sha512-i+CjFA1oGUYH2+gmwa58FsYAd/pHNdkdVRZgzFLeIcYmpZfl0opSwAwZ+5udhnYxed9Mlj77jmSzVK6GpVDYoQ==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/transformer-posthtml@2.15.0': + resolution: {integrity: sha512-7941lzoIa4XOzORCJ9vDjfkhgz92PaE6MS/eCgHYTaFYUMWZ2KQw0U3ow8lt0p2kqDqFWOXB4P8qA+QirNdAnw==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/transformer-raw@2.14.1': resolution: {integrity: sha512-OTO3n341HGHyrW4oKVC3InRiurjbPBTWbbX8mtyvfVcGMbs6PkU0jF1rVmO9gOsAOV5vn5AKowQ9eLMJ4xtLvQ==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/transformer-raw@2.15.0': + resolution: {integrity: sha512-06xJEXDF9YX5ffm+MKvQJIXpFqx2G6RND6L091L/BmLl+FH2SNYKO3RZ4rIx8TbkjyuBnE+awRh9xl7AiLIjaA==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/transformer-react-refresh-wrap@2.14.1': resolution: {integrity: sha512-Cke32thu4UE0Kbld1mqtw9a/Fxa67pu7BlDHvJTZvQrpAfbsev2RJM7GYYFn9KwmUqavV7GJjHHsjxGBc7JsZw==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/transformer-react-refresh-wrap@2.15.0': + resolution: {integrity: sha512-I108zq+ZwQrGXgkbdIXLW3VbUQhW0gjACiHVEXM380wWm/44bbrGLbD6VMupq5svP2Y5sKkopI9zzjuYUHplHw==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/transformer-react-static@2.14.1': resolution: {integrity: sha512-nYgvqvToAyuRYpLA1X0VwqnoHqFOIGMpRGsMl2xBIOu5v7UODHChMc1G2vvT0S+6KL0aPytXA1jpfNbRRcXdbg==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/transformer-react-static@2.15.0': + resolution: {integrity: sha512-OYqnAtjOZS2o0M/vKl9gfvEpjMnvcAnLwtPzVtK/OFyqtps6gvu99P/UIfxKi2sPngW+HbsmuCvY8rNbpbPsQA==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/transformer-svg@2.14.1': resolution: {integrity: sha512-AglOlBE8p7b5hzNM62LcslMbC73Yke8eMIsW9wm3By6/vIjW5GevAA99mrx5OhX+SKn4iJI1fAXoZ+2cP0TxJw==} engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@parcel/transformer-svg@2.15.0': + resolution: {integrity: sha512-pbhbkxM4mWjH4kpg8F+0xmHbXNCTavJ4DzrCoYgLZszZKYMhOYQZZ/uHkx4wOZ+b3n4iPe4QDlByYkh0QACxbw==} + engines: {node: '>= 16.0.0', parcel: ^2.15.0} + '@parcel/types-internal@2.14.1': resolution: {integrity: sha512-oBQfuUrNSx9ZB8HpHpMr3y0SRst5NKIsYlzx8uwHlt8A3c/4PS+apI6jamyt905grdCOpZYhNls+pY1HmhAtRA==} + '@parcel/types-internal@2.15.0': + resolution: {integrity: sha512-N0p622dZx84OPoxSoz5YfnVJMXAoQfcHI+qp535J/Uv6UAbcsimKl9NPKefrLOHgSKlTTJPiDbWSMOVrPvyr6w==} + '@parcel/types@2.14.1': resolution: {integrity: sha512-qlF96JPNYAwApUxcLEXDH5YJDQLQJsEVXNYTHXSaXR0qDybaCmo5104BcAU4R7Czic5NhGhFBScVvtwTyW2Vqg==} + '@parcel/types@2.15.0': + resolution: {integrity: sha512-BtAeK/mTQMjbgyo8r1jM1d+dcnEowErHH/Eb/95Agxi7YHpfnNP2oR8cC2yZbevU9FCXnSJ2f6vZc4NGT+nqlA==} + '@parcel/utils@2.14.1': resolution: {integrity: sha512-1178E3Dw6CjEeq6oyOfs/rNfceCQ2t4qKGpiPXGV//3k/ZDEwT4VR/f0FS0S6T1EMePrp0E0KAMQ9Zz0vrHhIA==} engines: {node: '>= 16.0.0'} + '@parcel/utils@2.15.0': + resolution: {integrity: sha512-Xir0/9UvUvMF8iRnARDdzzlEokDAcrsxj6aQUbYP3ZXV/l6/6eMRuSXZ32x6lUzOTHxukKMJA42imWUg6x38qg==} + engines: {node: '>= 16.0.0'} + '@parcel/watcher-android-arm64@2.5.1': resolution: {integrity: sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==} engines: {node: '>= 10.0.0'} @@ -4367,6 +4783,12 @@ packages: peerDependencies: '@parcel/core': ^2.14.1 + '@parcel/workers@2.15.0': + resolution: {integrity: sha512-OAtL9bvDzvIS+9uNMjnf0b6Ri2m2r8Wa3Bxr8SVnjX6J5SWdOPdVR1MqwCsFF+ZeOngaSEFFbe/czHLfgc0Vnw==} + engines: {node: '>= 16.0.0'} + peerDependencies: + '@parcel/core': ^2.15.0 + '@pkgjs/parseargs@0.11.0': resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} @@ -4741,38 +5163,80 @@ packages: cpu: [arm64] os: [darwin] + '@swc/core-darwin-arm64@1.11.24': + resolution: {integrity: sha512-dhtVj0PC1APOF4fl5qT2neGjRLgHAAYfiVP8poJelhzhB/318bO+QCFWAiimcDoyMgpCXOhTp757gnoJJrheWA==} + engines: {node: '>=10'} + cpu: [arm64] + os: [darwin] + '@swc/core-darwin-x64@1.11.18': resolution: {integrity: sha512-RCRvC6Q9M5BArTvj/IzUAAYGrgxYFbTTnAtf6UX7JFq2DAn+hEwYUjmC1m0gFso9HqFU0m5QZUGfZvVmACGWUw==} engines: {node: '>=10'} cpu: [x64] os: [darwin] + '@swc/core-darwin-x64@1.11.24': + resolution: {integrity: sha512-H/3cPs8uxcj2Fe3SoLlofN5JG6Ny5bl8DuZ6Yc2wr7gQFBmyBkbZEz+sPVgsID7IXuz7vTP95kMm1VL74SO5AQ==} + engines: {node: '>=10'} + cpu: [x64] + os: [darwin] + '@swc/core-linux-arm-gnueabihf@1.11.18': resolution: {integrity: sha512-wteAKf8YKb3jOnZFm3EzuIMzzCVXMuQOLHsz1IgEOc44/gdgNXKxaYTWAowZuej7t68tf/w0cRNMc7Le414v/g==} engines: {node: '>=10'} cpu: [arm] os: [linux] + '@swc/core-linux-arm-gnueabihf@1.11.24': + resolution: {integrity: sha512-PHJgWEpCsLo/NGj+A2lXZ2mgGjsr96ULNW3+T3Bj2KTc8XtMUkE8tmY2Da20ItZOvPNC/69KroU7edyo1Flfbw==} + engines: {node: '>=10'} + cpu: [arm] + os: [linux] + '@swc/core-linux-arm64-gnu@1.11.18': resolution: {integrity: sha512-hY6jJYZ6PKHSBo5OATswfyKsUgsWu9+4nDcN8liYIRRgz3E0G9wk0VUTP4cFPivBFeHWTTAGz687/Nf2aQEIpw==} engines: {node: '>=10'} cpu: [arm64] os: [linux] + '@swc/core-linux-arm64-gnu@1.11.24': + resolution: {integrity: sha512-C2FJb08+n5SD4CYWCTZx1uR88BN41ZieoHvI8A55hfVf2woT8+6ZiBzt74qW2g+ntZ535Jts5VwXAKdu41HpBg==} + engines: {node: '>=10'} + cpu: [arm64] + os: [linux] + '@swc/core-linux-arm64-musl@1.11.18': resolution: {integrity: sha512-slu0mlP2nucvQalttnapfpqpD/LlM9NHx9g3ofgsLzjObyMEBiX4ZysQ3y65U8Mjw71RNqtLd/ZmvxI6OmLdiQ==} engines: {node: '>=10'} cpu: [arm64] os: [linux] + '@swc/core-linux-arm64-musl@1.11.24': + resolution: {integrity: sha512-ypXLIdszRo0re7PNNaXN0+2lD454G8l9LPK/rbfRXnhLWDBPURxzKlLlU/YGd2zP98wPcVooMmegRSNOKfvErw==} + engines: {node: '>=10'} + cpu: [arm64] + os: [linux] + '@swc/core-linux-x64-gnu@1.11.18': resolution: {integrity: sha512-h9a/8PA25arMCQ9t8CE8rA1s0c77z4kCZZ7dUuUkD88yEXIrARMca1IKR7of+S3slfQrf1Zlq3Ac1Fb1HVJziQ==} engines: {node: '>=10'} cpu: [x64] os: [linux] - '@swc/core-linux-x64-musl@1.11.18': - resolution: {integrity: sha512-0sMDJj5qUGK9QEw4lrxLxkTP/4AoKciqNzXvqbk+J9XuXN2aIv4BsR1Y7z3GwAeMFGsba2lbHLOtJlDsaqIsiA==} + '@swc/core-linux-x64-gnu@1.11.24': + resolution: {integrity: sha512-IM7d+STVZD48zxcgo69L0yYptfhaaE9cMZ+9OoMxirNafhKKXwoZuufol1+alEFKc+Wbwp+aUPe/DeWC/Lh3dg==} + engines: {node: '>=10'} + cpu: [x64] + os: [linux] + + '@swc/core-linux-x64-musl@1.11.18': + resolution: {integrity: sha512-0sMDJj5qUGK9QEw4lrxLxkTP/4AoKciqNzXvqbk+J9XuXN2aIv4BsR1Y7z3GwAeMFGsba2lbHLOtJlDsaqIsiA==} + engines: {node: '>=10'} + cpu: [x64] + os: [linux] + + '@swc/core-linux-x64-musl@1.11.24': + resolution: {integrity: sha512-DZByJaMVzSfjQKKQn3cqSeqwy6lpMaQDQQ4HPlch9FWtDx/dLcpdIhxssqZXcR2rhaQVIaRQsCqwV6orSDGAGw==} engines: {node: '>=10'} cpu: [x64] os: [linux] @@ -4783,18 +5247,36 @@ packages: cpu: [arm64] os: [win32] + '@swc/core-win32-arm64-msvc@1.11.24': + resolution: {integrity: sha512-Q64Ytn23y9aVDKN5iryFi8mRgyHw3/kyjTjT4qFCa8AEb5sGUuSj//AUZ6c0J7hQKMHlg9do5Etvoe61V98/JQ==} + engines: {node: '>=10'} + cpu: [arm64] + os: [win32] + '@swc/core-win32-ia32-msvc@1.11.18': resolution: {integrity: sha512-uBKj0S1lYv/E2ZhxHZOxSiQwoegYmzbPRpjq6eHBZDv97mu7W3K27/lsnPbvAfQ6b6rnv8BI+EsmJ7VLQBAHBQ==} engines: {node: '>=10'} cpu: [ia32] os: [win32] + '@swc/core-win32-ia32-msvc@1.11.24': + resolution: {integrity: sha512-9pKLIisE/Hh2vJhGIPvSoTK4uBSPxNVyXHmOrtdDot4E1FUUI74Vi8tFdlwNbaj8/vusVnb8xPXsxF1uB0VgiQ==} + engines: {node: '>=10'} + cpu: [ia32] + os: [win32] + '@swc/core-win32-x64-msvc@1.11.18': resolution: {integrity: sha512-8USTRcdgeFMNBgvVXl8tz6n4+9s9m+zHsfDeBT4jPgwnq2bnLBlTUlwnPwzDxfg9nUJr6RFD4xeKfWyZZRosZg==} engines: {node: '>=10'} cpu: [x64] os: [win32] + '@swc/core-win32-x64-msvc@1.11.24': + resolution: {integrity: sha512-sybnXtOsdB+XvzVFlBVGgRHLqp3yRpHK7CrmpuDKszhj/QhmsaZzY/GHSeALlMtLup13M0gqbcQvsTNlAHTg3w==} + engines: {node: '>=10'} + cpu: [x64] + os: [win32] + '@swc/core@1.11.18': resolution: {integrity: sha512-ORZxyCKKiqYt2iHdh1C7pfVR1GBjkuFOdwqZggQzaq0vt22DpGca+2JsUtkUoWQmWcct04v5+ScwgvsHuMObxA==} engines: {node: '>=10'} @@ -4804,6 +5286,15 @@ packages: '@swc/helpers': optional: true + '@swc/core@1.11.24': + resolution: {integrity: sha512-MaQEIpfcEMzx3VWWopbofKJvaraqmL6HbLlw2bFZ7qYqYw3rkhM0cQVEgyzbHtTWwCwPMFZSC2DUbhlZgrMfLg==} + engines: {node: '>=10'} + peerDependencies: + '@swc/helpers': '>=0.5.17' + peerDependenciesMeta: + '@swc/helpers': + optional: true + '@swc/counter@0.1.3': resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==} @@ -5620,6 +6111,11 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true + browserslist@4.24.5: + resolution: {integrity: sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==} + engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} + hasBin: true + bser@2.1.1: resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==} @@ -6218,6 +6714,10 @@ packages: resolution: {integrity: sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==} engines: {node: '>=12'} + dotenv@16.5.0: + resolution: {integrity: sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==} + engines: {node: '>=12'} + dotenv@8.6.0: resolution: {integrity: sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==} engines: {node: '>=10'} @@ -6241,6 +6741,9 @@ packages: electron-to-chromium@1.5.120: resolution: {integrity: sha512-oTUp3gfX1gZI+xfD2djr2rzQdHCwHzPQrrK0CD7WpTdF0nPdQ/INcRVjWgLdCT4a9W3jFObR9DAfsuyFQnI8CQ==} + electron-to-chromium@1.5.155: + resolution: {integrity: sha512-ps5KcGGmwL8VaeJlvlDlu4fORQpv3+GIcF5I3f9tUKUlJ/wsysh6HU8P5L1XWRYeXfA0oJd4PyM8ds8zTFf6Ng==} + emittery@0.13.1: resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==} engines: {node: '>=12'} @@ -7643,64 +8146,128 @@ packages: cpu: [arm64] os: [darwin] + lightningcss-darwin-arm64@1.30.1: + resolution: {integrity: sha512-c8JK7hyE65X1MHMN+Viq9n11RRC7hgin3HhYKhrMyaXflk5GVplZ60IxyoVtzILeKr+xAJwg6zK6sjTBJ0FKYQ==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [darwin] + lightningcss-darwin-x64@1.29.3: resolution: {integrity: sha512-KF2XZ4ZdmDGGtEYmx5wpzn6u8vg7AdBHaEOvDKu8GOs7xDL/vcU2vMKtTeNe1d4dogkDdi3B9zC77jkatWBwEQ==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [darwin] + lightningcss-darwin-x64@1.30.1: + resolution: {integrity: sha512-k1EvjakfumAQoTfcXUcHQZhSpLlkAuEkdMBsI/ivWw9hL+7FtilQc0Cy3hrx0AAQrVtQAbMI7YjCgYgvn37PzA==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [darwin] + lightningcss-freebsd-x64@1.29.3: resolution: {integrity: sha512-VUWeVf+V1UM54jv9M4wen9vMlIAyT69Krl9XjI8SsRxz4tdNV/7QEPlW6JASev/pYdiynUCW0pwaFquDRYdxMw==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [freebsd] + lightningcss-freebsd-x64@1.30.1: + resolution: {integrity: sha512-kmW6UGCGg2PcyUE59K5r0kWfKPAVy4SltVeut+umLCFoJ53RdCUWxcRDzO1eTaxf/7Q2H7LTquFHPL5R+Gjyig==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [freebsd] + lightningcss-linux-arm-gnueabihf@1.29.3: resolution: {integrity: sha512-UhgZ/XVNfXQVEJrMIWeK1Laj8KbhjbIz7F4znUk7G4zeGw7TRoJxhb66uWrEsonn1+O45w//0i0Fu0wIovYdYg==} engines: {node: '>= 12.0.0'} cpu: [arm] os: [linux] + lightningcss-linux-arm-gnueabihf@1.30.1: + resolution: {integrity: sha512-MjxUShl1v8pit+6D/zSPq9S9dQ2NPFSQwGvxBCYaBYLPlCWuPh9/t1MRS8iUaR8i+a6w7aps+B4N0S1TYP/R+Q==} + engines: {node: '>= 12.0.0'} + cpu: [arm] + os: [linux] + lightningcss-linux-arm64-gnu@1.29.3: resolution: {integrity: sha512-Pqau7jtgJNmQ/esugfmAT1aCFy/Gxc92FOxI+3n+LbMHBheBnk41xHDhc0HeYlx9G0xP5tK4t0Koy3QGGNqypw==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [linux] + lightningcss-linux-arm64-gnu@1.30.1: + resolution: {integrity: sha512-gB72maP8rmrKsnKYy8XUuXi/4OctJiuQjcuqWNlJQ6jZiWqtPvqFziskH3hnajfvKB27ynbVCucKSm2rkQp4Bw==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [linux] + lightningcss-linux-arm64-musl@1.29.3: resolution: {integrity: sha512-dxakOk66pf7KLS7VRYFO7B8WOJLecE5OPL2YOk52eriFd/yeyxt2Km5H0BjLfElokIaR+qWi33gB8MQLrdAY3A==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [linux] + lightningcss-linux-arm64-musl@1.30.1: + resolution: {integrity: sha512-jmUQVx4331m6LIX+0wUhBbmMX7TCfjF5FoOH6SD1CttzuYlGNVpA7QnrmLxrsub43ClTINfGSYyHe2HWeLl5CQ==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [linux] + lightningcss-linux-x64-gnu@1.29.3: resolution: {integrity: sha512-ySZTNCpbfbK8rqpKJeJR2S0g/8UqqV3QnzcuWvpI60LWxnFN91nxpSSwCbzfOXkzKfar9j5eOuOplf+klKtINg==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [linux] + lightningcss-linux-x64-gnu@1.30.1: + resolution: {integrity: sha512-piWx3z4wN8J8z3+O5kO74+yr6ze/dKmPnI7vLqfSqI8bccaTGY5xiSGVIJBDd5K5BHlvVLpUB3S2YCfelyJ1bw==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [linux] + lightningcss-linux-x64-musl@1.29.3: resolution: {integrity: sha512-3pVZhIzW09nzi10usAXfIGTTSTYQ141dk88vGFNCgawIzayiIzZQxEcxVtIkdvlEq2YuFsL9Wcj/h61JHHzuFQ==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [linux] + lightningcss-linux-x64-musl@1.30.1: + resolution: {integrity: sha512-rRomAK7eIkL+tHY0YPxbc5Dra2gXlI63HL+v1Pdi1a3sC+tJTcFrHX+E86sulgAXeI7rSzDYhPSeHHjqFhqfeQ==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [linux] + lightningcss-win32-arm64-msvc@1.29.3: resolution: {integrity: sha512-VRnkAvtIkeWuoBJeGOTrZxsNp4HogXtcaaLm8agmbYtLDOhQdpgxW6NjZZjDXbvGF+eOehGulXZ3C1TiwHY4QQ==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [win32] + lightningcss-win32-arm64-msvc@1.30.1: + resolution: {integrity: sha512-mSL4rqPi4iXq5YVqzSsJgMVFENoa4nGTT/GjO2c0Yl9OuQfPsIfncvLrEW6RbbB24WtZ3xP/2CCmI3tNkNV4oA==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [win32] + lightningcss-win32-x64-msvc@1.29.3: resolution: {integrity: sha512-IszwRPu2cPnDQsZpd7/EAr0x2W7jkaWqQ1SwCVIZ/tSbZVXPLt6k8s6FkcyBjViCzvB5CW0We0QbbP7zp2aBjQ==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [win32] + lightningcss-win32-x64-msvc@1.30.1: + resolution: {integrity: sha512-PVqXh48wh4T53F/1CCu8PIPCxLzWyCnn/9T5W1Jpmdy5h9Cwd+0YQS6/LwhHXSafuc61/xg9Lv5OrCby6a++jg==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [win32] + lightningcss@1.29.3: resolution: {integrity: sha512-GlOJwTIP6TMIlrTFsxTerwC0W6OpQpCGuX1ECRLBUVRh6fpJH3xTqjCjRgQHTb4ZXexH9rtHou1Lf03GKzmhhQ==} engines: {node: '>= 12.0.0'} + lightningcss@1.30.1: + resolution: {integrity: sha512-xi6IyHML+c9+Q3W0S4fCQJOym42pyurFiJUHEcEyHS0CeKzia4yZDEsLlqOFykxOdHpNy0NmvVO31vcSqAxJCg==} + engines: {node: '>= 12.0.0'} + lilconfig@2.1.0: resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==} engines: {node: '>=10'} @@ -8497,6 +9064,11 @@ packages: engines: {node: '>= 16.0.0'} hasBin: true + parcel@2.15.0: + resolution: {integrity: sha512-CYAykhWLvCsYoTfB21azLmQjKzrPV3xUX4FgmOicbzXDz7cPxlsdQs9R8S5510fVsW7OLPG6ZN4cTzRbhjj8Tw==} + engines: {node: '>= 16.0.0'} + hasBin: true + parent-module@1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} engines: {node: '>=6'} @@ -8876,6 +9448,10 @@ packages: resolution: {integrity: sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==} engines: {node: '>=0.10.0'} + react-refresh@0.16.0: + resolution: {integrity: sha512-FPvF2XxTSikpJxcr+bHut2H4gJ17+18Uy20D5/F+SKzFap62R3cM5wH6b8WN3LyGSYeQilLEcJcR1fjBSI2S1A==} + engines: {node: '>=0.10.0'} + react-server-dom-parcel@19.1.0: resolution: {integrity: sha512-JkfPt/yV1ru8J1CTM0PD74HZZRQTjdoTU5eg2r6Xjn/TmFRS2J/4QsKdwu2X8NsA+ADnPHI8wKCgBh1HCmRr/A==} engines: {node: '>=0.10.0'} @@ -9177,6 +9753,9 @@ packages: rsc-html-stream@0.0.4: resolution: {integrity: sha512-1isiXIrlTI/vRLTvS3O4fMrO9qIHje1FSphufrIV5QfzHUgBDCZFwP9b8+rH63nbhxtcKTqfyziwM+2khfX0Uw==} + rsc-html-stream@0.0.6: + resolution: {integrity: sha512-oZUJ5AH0oDo9QywxD9yMY6N5Z3VwX2YfQg0FanNdCmvXmO0itTfv7BMkbMSwxg7JmBjYmefU8DTW0EcLsePPgQ==} + run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} @@ -10536,7 +11115,7 @@ snapshots: '@babel/helper-annotate-as-pure@7.22.5': dependencies: - '@babel/types': 7.24.0 + '@babel/types': 7.26.10 '@babel/helper-annotate-as-pure@7.25.9': dependencies: @@ -10544,7 +11123,7 @@ snapshots: '@babel/helper-builder-binary-assignment-operator-visitor@7.22.5': dependencies: - '@babel/types': 7.24.0 + '@babel/types': 7.26.10 '@babel/helper-compilation-targets@7.23.6': dependencies: @@ -10575,6 +11154,19 @@ snapshots: '@babel/helper-split-export-declaration': 7.22.6 semver: 6.3.1 + '@babel/helper-create-class-features-plugin@7.24.1(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-environment-visitor': 7.22.20 + '@babel/helper-function-name': 7.23.0 + '@babel/helper-member-expression-to-functions': 7.23.0 + '@babel/helper-optimise-call-expression': 7.22.5 + '@babel/helper-replace-supers': 7.24.1(@babel/core@7.26.10) + '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 + '@babel/helper-split-export-declaration': 7.22.6 + semver: 6.3.1 + '@babel/helper-create-class-features-plugin@7.26.9(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 @@ -10595,11 +11187,18 @@ snapshots: regexpu-core: 5.3.2 semver: 6.3.1 - '@babel/helper-define-polyfill-provider@0.3.3(@babel/core@7.24.3)': + '@babel/helper-create-regexp-features-plugin@7.22.9(@babel/core@7.26.10)': dependencies: - '@babel/core': 7.24.3 - '@babel/helper-compilation-targets': 7.23.6 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/core': 7.26.10 + '@babel/helper-annotate-as-pure': 7.22.5 + regexpu-core: 5.3.2 + semver: 6.3.1 + + '@babel/helper-define-polyfill-provider@0.3.3(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-compilation-targets': 7.26.5 + '@babel/helper-plugin-utils': 7.26.5 debug: 4.4.0 lodash.debounce: 4.0.8 resolve: 1.22.8 @@ -10610,8 +11209,19 @@ snapshots: '@babel/helper-define-polyfill-provider@0.4.2(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-compilation-targets': 7.23.6 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-compilation-targets': 7.26.5 + '@babel/helper-plugin-utils': 7.26.5 + debug: 4.4.0 + lodash.debounce: 4.0.8 + resolve: 1.22.8 + transitivePeerDependencies: + - supports-color + + '@babel/helper-define-polyfill-provider@0.4.2(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-compilation-targets': 7.26.5 + '@babel/helper-plugin-utils': 7.26.5 debug: 4.4.0 lodash.debounce: 4.0.8 resolve: 1.22.8 @@ -10631,7 +11241,7 @@ snapshots: '@babel/helper-member-expression-to-functions@7.23.0': dependencies: - '@babel/types': 7.24.0 + '@babel/types': 7.26.10 '@babel/helper-member-expression-to-functions@7.25.9': dependencies: @@ -10642,7 +11252,7 @@ snapshots: '@babel/helper-module-imports@7.24.3': dependencies: - '@babel/types': 7.24.0 + '@babel/types': 7.26.10 '@babel/helper-module-imports@7.25.9': dependencies: @@ -10655,10 +11265,23 @@ snapshots: dependencies: '@babel/core': 7.24.3 '@babel/helper-environment-visitor': 7.22.20 - '@babel/helper-module-imports': 7.24.3 + '@babel/helper-module-imports': 7.25.9 + '@babel/helper-simple-access': 7.22.5 + '@babel/helper-split-export-declaration': 7.22.6 + '@babel/helper-validator-identifier': 7.22.20 + transitivePeerDependencies: + - supports-color + + '@babel/helper-module-transforms@7.23.3(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-environment-visitor': 7.22.20 + '@babel/helper-module-imports': 7.25.9 '@babel/helper-simple-access': 7.22.5 '@babel/helper-split-export-declaration': 7.22.6 '@babel/helper-validator-identifier': 7.22.20 + transitivePeerDependencies: + - supports-color '@babel/helper-module-transforms@7.26.0(@babel/core@7.24.4)': dependencies: @@ -10680,7 +11303,7 @@ snapshots: '@babel/helper-optimise-call-expression@7.22.5': dependencies: - '@babel/types': 7.24.0 + '@babel/types': 7.26.10 '@babel/helper-optimise-call-expression@7.25.9': dependencies: @@ -10697,6 +11320,13 @@ snapshots: '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-wrap-function': 7.22.9 + '@babel/helper-remap-async-to-generator@7.22.9(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-environment-visitor': 7.22.20 + '@babel/helper-wrap-function': 7.22.9 + '@babel/helper-replace-supers@7.24.1(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 @@ -10704,6 +11334,13 @@ snapshots: '@babel/helper-member-expression-to-functions': 7.23.0 '@babel/helper-optimise-call-expression': 7.22.5 + '@babel/helper-replace-supers@7.24.1(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-environment-visitor': 7.22.20 + '@babel/helper-member-expression-to-functions': 7.23.0 + '@babel/helper-optimise-call-expression': 7.22.5 + '@babel/helper-replace-supers@7.26.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 @@ -10715,7 +11352,7 @@ snapshots: '@babel/helper-simple-access@7.22.5': dependencies: - '@babel/types': 7.24.0 + '@babel/types': 7.26.10 '@babel/helper-skip-transparent-expression-wrappers@7.22.5': dependencies: @@ -10747,13 +11384,13 @@ snapshots: '@babel/helper-wrap-function@7.22.9': dependencies: '@babel/helper-function-name': 7.23.0 - '@babel/template': 7.24.0 - '@babel/types': 7.24.0 + '@babel/template': 7.26.9 + '@babel/types': 7.26.10 '@babel/helpers@7.24.1': dependencies: '@babel/template': 7.24.0 - '@babel/traverse': 7.24.1 + '@babel/traverse': 7.26.10 '@babel/types': 7.24.0 transitivePeerDependencies: - supports-color @@ -10765,7 +11402,7 @@ snapshots: '@babel/highlight@7.24.2': dependencies: - '@babel/helper-validator-identifier': 7.22.20 + '@babel/helper-validator-identifier': 7.25.9 chalk: 2.4.2 js-tokens: 4.0.0 picocolors: 1.1.1 @@ -10781,27 +11418,39 @@ snapshots: '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 '@babel/plugin-transform-optional-chaining': 7.22.6(@babel/core@7.24.3) - '@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.24.3)': + '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.22.5(@babel/core@7.26.10)': dependencies: - '@babel/core': 7.24.3 - '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.24.0 + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 + '@babel/plugin-transform-optional-chaining': 7.22.6(@babel/core@7.26.10) - '@babel/plugin-proposal-decorators@7.24.1(@babel/core@7.24.3)': + '@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.26.10)': dependencies: - '@babel/core': 7.24.3 - '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.24.0 - '@babel/plugin-syntax-decorators': 7.24.1(@babel/core@7.24.3) + '@babel/core': 7.26.10 + '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.26.10) + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-proposal-decorators@7.24.1(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.26.10) + '@babel/helper-plugin-utils': 7.26.5 + '@babel/plugin-syntax-decorators': 7.24.1(@babel/core@7.26.10) '@babel/plugin-proposal-export-namespace-from@7.18.9(@babel/core@7.24.3)': dependencies: @@ -10809,17 +11458,17 @@ snapshots: '@babel/helper-plugin-utils': 7.24.0 '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.24.3)': + '@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.26.10)': dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.3) + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.26.10) - '@babel/plugin-proposal-numeric-separator@7.18.6(@babel/core@7.24.3)': + '@babel/plugin-proposal-numeric-separator@7.18.6(@babel/core@7.26.10)': dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 - '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.3) + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.26.10) '@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.24.3)': dependencies: @@ -10828,189 +11477,369 @@ snapshots: '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-proposal-private-methods@7.18.6(@babel/core@7.24.3)': + '@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.26.10)': dependencies: - '@babel/core': 7.24.3 - '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.3) + '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.26.10) + + '@babel/plugin-proposal-private-methods@7.18.6(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.26.10) + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/plugin-proposal-private-property-in-object@7.21.11(@babel/core@7.24.3)': + '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.26.10)': dependencies: - '@babel/core': 7.24.3 + '@babel/core': 7.26.10 + + '@babel/plugin-proposal-private-property-in-object@7.21.11(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.24.0 - '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.24.3) + '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.26.10) + '@babel/helper-plugin-utils': 7.26.5 + '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.26.10) '@babel/plugin-proposal-unicode-property-regex@7.18.6(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-proposal-unicode-property-regex@7.18.6(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.26.10) + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-decorators@7.24.1(@babel/core@7.24.3)': + '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.26.10)': dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.24.3)': + '@babel/plugin-syntax-decorators@7.24.1(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/helper-plugin-utils': 7.24.0 - '@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.24.3)': + '@babel/plugin-syntax-decorators@7.24.1(@babel/core@7.26.10)': dependencies: - '@babel/core': 7.24.3 + '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.24.0 - '@babel/plugin-syntax-flow@7.18.6(@babel/core@7.24.3)': + '@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-import-assertions@7.22.5(@babel/core@7.24.3)': + '@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-syntax-flow@7.18.6(@babel/core@7.24.3)': + dependencies: + '@babel/core': 7.24.3 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-syntax-flow@7.18.6(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-syntax-import-assertions@7.22.5(@babel/core@7.24.3)': + dependencies: + '@babel/core': 7.24.3 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-syntax-import-assertions@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-import-attributes@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-syntax-import-attributes@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/helper-plugin-utils': 7.24.0 + '@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.24.0 + '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-typescript@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-syntax-typescript@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.26.10) + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-arrow-functions@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-arrow-functions@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-async-generator-functions@7.22.7(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/helper-environment-visitor': 7.22.20 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 '@babel/helper-remap-async-to-generator': 7.22.9(@babel/core@7.24.3) '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.3) + '@babel/plugin-transform-async-generator-functions@7.22.7(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-environment-visitor': 7.22.20 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/helper-remap-async-to-generator': 7.22.9(@babel/core@7.26.10) + '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.26.10) + '@babel/plugin-transform-async-to-generator@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-module-imports': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-module-imports': 7.25.9 + '@babel/helper-plugin-utils': 7.26.5 '@babel/helper-remap-async-to-generator': 7.22.9(@babel/core@7.24.3) + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-async-to-generator@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-module-imports': 7.25.9 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/helper-remap-async-to-generator': 7.22.9(@babel/core@7.26.10) + transitivePeerDependencies: + - supports-color '@babel/plugin-transform-block-scoped-functions@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-block-scoped-functions@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-block-scoping@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-block-scoping@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-class-properties@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-class-properties@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.26.10) + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-class-static-block@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.24.3) + '@babel/plugin-transform-class-static-block@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.26.10) + '@babel/helper-plugin-utils': 7.26.5 + '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.26.10) + '@babel/plugin-transform-classes@7.22.6(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 @@ -11019,179 +11848,371 @@ snapshots: '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-function-name': 7.23.0 '@babel/helper-optimise-call-expression': 7.22.5 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 '@babel/helper-replace-supers': 7.24.1(@babel/core@7.24.3) '@babel/helper-split-export-declaration': 7.22.6 globals: 11.12.0 + '@babel/plugin-transform-classes@7.22.6(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-compilation-targets': 7.23.6 + '@babel/helper-environment-visitor': 7.22.20 + '@babel/helper-function-name': 7.23.0 + '@babel/helper-optimise-call-expression': 7.22.5 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/helper-replace-supers': 7.24.1(@babel/core@7.26.10) + '@babel/helper-split-export-declaration': 7.22.6 + globals: 11.12.0 + '@babel/plugin-transform-computed-properties@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/template': 7.24.0 + + '@babel/plugin-transform-computed-properties@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/template': 7.24.0 '@babel/plugin-transform-destructuring@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-destructuring@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-dotall-regex@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-dotall-regex@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.26.10) + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-duplicate-keys@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-duplicate-keys@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-dynamic-import@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.3) + '@babel/plugin-transform-dynamic-import@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.26.10) + '@babel/plugin-transform-exponentiation-operator@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/helper-builder-binary-assignment-operator-visitor': 7.22.5 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-exponentiation-operator@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-builder-binary-assignment-operator-visitor': 7.22.5 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-export-namespace-from@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-transform-flow-strip-types@7.19.0(@babel/core@7.24.3)': + '@babel/plugin-transform-export-namespace-from@7.22.5(@babel/core@7.26.10)': dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 - '@babel/plugin-syntax-flow': 7.18.6(@babel/core@7.24.3) + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.26.10) + + '@babel/plugin-transform-flow-strip-types@7.19.0(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/plugin-syntax-flow': 7.18.6(@babel/core@7.26.10) '@babel/plugin-transform-for-of@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-for-of@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-function-name@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/helper-compilation-targets': 7.23.6 '@babel/helper-function-name': 7.23.0 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-function-name@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-compilation-targets': 7.23.6 + '@babel/helper-function-name': 7.23.0 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-json-strings@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.3) + '@babel/plugin-transform-json-strings@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.26.10) + '@babel/plugin-transform-literals@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-literals@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-logical-assignment-operators@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.3) + '@babel/plugin-transform-logical-assignment-operators@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.26.10) + '@babel/plugin-transform-member-expression-literals@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-member-expression-literals@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-modules-amd@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-modules-amd@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-module-transforms': 7.23.3(@babel/core@7.26.10) + '@babel/helper-plugin-utils': 7.26.5 + transitivePeerDependencies: + - supports-color '@babel/plugin-transform-modules-commonjs@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 '@babel/helper-simple-access': 7.22.5 + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-modules-commonjs@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-module-transforms': 7.23.3(@babel/core@7.26.10) + '@babel/helper-plugin-utils': 7.26.5 + '@babel/helper-simple-access': 7.22.5 + transitivePeerDependencies: + - supports-color '@babel/plugin-transform-modules-systemjs@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/helper-hoist-variables': 7.22.5 '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/helper-validator-identifier': 7.22.20 + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-modules-systemjs@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-hoist-variables': 7.22.5 + '@babel/helper-module-transforms': 7.23.3(@babel/core@7.26.10) + '@babel/helper-plugin-utils': 7.26.5 '@babel/helper-validator-identifier': 7.22.20 + transitivePeerDependencies: + - supports-color '@babel/plugin-transform-modules-umd@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-modules-umd@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-module-transforms': 7.23.3(@babel/core@7.26.10) + '@babel/helper-plugin-utils': 7.26.5 + transitivePeerDependencies: + - supports-color '@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.26.10) + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-new-target@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-new-target@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-nullish-coalescing-operator@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.3) + '@babel/plugin-transform-nullish-coalescing-operator@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.26.10) + '@babel/plugin-transform-numeric-separator@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.3) + '@babel/plugin-transform-numeric-separator@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.26.10) + '@babel/plugin-transform-object-rest-spread@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/compat-data': 7.24.1 '@babel/core': 7.24.3 '@babel/helper-compilation-targets': 7.23.6 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.3) '@babel/plugin-transform-parameters': 7.22.5(@babel/core@7.24.3) + '@babel/plugin-transform-object-rest-spread@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/compat-data': 7.24.1 + '@babel/core': 7.26.10 + '@babel/helper-compilation-targets': 7.23.6 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.26.10) + '@babel/plugin-transform-parameters': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-object-super@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 '@babel/helper-replace-supers': 7.24.1(@babel/core@7.24.3) + '@babel/plugin-transform-object-super@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/helper-replace-supers': 7.24.1(@babel/core@7.26.10) + '@babel/plugin-transform-optional-catch-binding@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.3) + '@babel/plugin-transform-optional-catch-binding@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.26.10) + '@babel/plugin-transform-optional-chaining@7.22.6(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.3) + '@babel/plugin-transform-optional-chaining@7.22.6(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.26.10) + '@babel/plugin-transform-parameters@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-parameters@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-private-methods@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-private-methods@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.26.10) + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-private-methods@7.25.9(@babel/core@7.26.10)': dependencies: @@ -11203,26 +12224,53 @@ snapshots: '@babel/plugin-transform-private-property-in-object@7.22.5(@babel/core@7.24.3)': dependencies: - '@babel/core': 7.24.3 + '@babel/core': 7.24.3 + '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.3) + '@babel/helper-plugin-utils': 7.26.5 + '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.24.3) + + '@babel/plugin-transform-private-property-in-object@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.24.0 - '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.24.3) + '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.26.10) + '@babel/helper-plugin-utils': 7.26.5 + '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.26.10) '@babel/plugin-transform-property-literals@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-property-literals@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-react-display-name@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-react-display-name@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-react-jsx-development@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/plugin-transform-react-jsx': 7.22.5(@babel/core@7.24.3) + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-react-jsx-development@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/plugin-transform-react-jsx': 7.22.5(@babel/core@7.26.10) + transitivePeerDependencies: + - supports-color '@babel/plugin-transform-react-jsx-self@7.25.9(@babel/core@7.26.10)': dependencies: @@ -11238,36 +12286,66 @@ snapshots: dependencies: '@babel/core': 7.24.3 '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-module-imports': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-module-imports': 7.25.9 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.24.3) '@babel/types': 7.24.0 + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-module-imports': 7.25.9 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.26.10) + '@babel/types': 7.24.0 + transitivePeerDependencies: + - supports-color '@babel/plugin-transform-react-pure-annotations@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-react-pure-annotations@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-regenerator@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + regenerator-transform: 0.15.1 + + '@babel/plugin-transform-regenerator@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 regenerator-transform: 0.15.1 '@babel/plugin-transform-reserved-words@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-runtime@7.18.10(@babel/core@7.24.3)': + '@babel/plugin-transform-reserved-words@7.22.5(@babel/core@7.26.10)': dependencies: - '@babel/core': 7.24.3 - '@babel/helper-module-imports': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 - babel-plugin-polyfill-corejs2: 0.3.3(@babel/core@7.24.3) - babel-plugin-polyfill-corejs3: 0.5.3(@babel/core@7.24.3) - babel-plugin-polyfill-regenerator: 0.4.1(@babel/core@7.24.3) + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-runtime@7.18.10(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-module-imports': 7.25.9 + '@babel/helper-plugin-utils': 7.26.5 + babel-plugin-polyfill-corejs2: 0.3.3(@babel/core@7.26.10) + babel-plugin-polyfill-corejs3: 0.5.3(@babel/core@7.26.10) + babel-plugin-polyfill-regenerator: 0.4.1(@babel/core@7.26.10) semver: 6.3.1 transitivePeerDependencies: - supports-color @@ -11275,59 +12353,116 @@ snapshots: '@babel/plugin-transform-shorthand-properties@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-shorthand-properties@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-spread@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 + + '@babel/plugin-transform-spread@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 '@babel/plugin-transform-sticky-regex@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-sticky-regex@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-template-literals@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-template-literals@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-typeof-symbol@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-typeof-symbol@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-typescript@7.22.9(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/helper-annotate-as-pure': 7.22.5 '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.24.3) + '@babel/plugin-transform-typescript@7.22.9(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.26.10) + '@babel/helper-plugin-utils': 7.26.5 + '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-unicode-escapes@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-unicode-escapes@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-unicode-property-regex@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-unicode-property-regex@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.26.10) + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-unicode-regex@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-unicode-regex@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.26.10) + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-transform-unicode-sets-regex@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 + + '@babel/plugin-transform-unicode-sets-regex@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.26.10) + '@babel/helper-plugin-utils': 7.26.5 '@babel/preset-env@7.22.9(@babel/core@7.24.3)': dependencies: @@ -11415,6 +12550,92 @@ snapshots: transitivePeerDependencies: - supports-color + '@babel/preset-env@7.22.9(@babel/core@7.26.10)': + dependencies: + '@babel/compat-data': 7.24.1 + '@babel/core': 7.26.10 + '@babel/helper-compilation-targets': 7.23.6 + '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-validator-option': 7.23.5 + '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.26.10) + '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.26.10) + '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.26.10) + '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.26.10) + '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.26.10) + '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.26.10) + '@babel/plugin-syntax-import-assertions': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-syntax-import-attributes': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.26.10) + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.26.10) + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.26.10) + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.26.10) + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.26.10) + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.26.10) + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.26.10) + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.26.10) + '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.26.10) + '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.26.10) + '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.26.10) + '@babel/plugin-transform-arrow-functions': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-async-generator-functions': 7.22.7(@babel/core@7.26.10) + '@babel/plugin-transform-async-to-generator': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-block-scoped-functions': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-block-scoping': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-class-properties': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-class-static-block': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-classes': 7.22.6(@babel/core@7.26.10) + '@babel/plugin-transform-computed-properties': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-destructuring': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-dotall-regex': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-duplicate-keys': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-dynamic-import': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-exponentiation-operator': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-export-namespace-from': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-for-of': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-function-name': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-json-strings': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-literals': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-logical-assignment-operators': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-member-expression-literals': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-modules-amd': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-modules-commonjs': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-modules-systemjs': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-modules-umd': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-new-target': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-nullish-coalescing-operator': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-numeric-separator': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-object-rest-spread': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-object-super': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-optional-catch-binding': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-optional-chaining': 7.22.6(@babel/core@7.26.10) + '@babel/plugin-transform-parameters': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-private-methods': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-private-property-in-object': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-property-literals': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-regenerator': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-reserved-words': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-shorthand-properties': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-spread': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-sticky-regex': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-template-literals': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-typeof-symbol': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-unicode-escapes': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-unicode-property-regex': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-unicode-regex': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-unicode-sets-regex': 7.22.5(@babel/core@7.26.10) + '@babel/preset-modules': 0.1.6(@babel/core@7.26.10) + '@babel/types': 7.24.0 + babel-plugin-polyfill-corejs2: 0.4.5(@babel/core@7.26.10) + babel-plugin-polyfill-corejs3: 0.8.3(@babel/core@7.26.10) + babel-plugin-polyfill-regenerator: 0.5.2(@babel/core@7.26.10) + core-js-compat: 3.32.0 + semver: 6.3.1 + transitivePeerDependencies: + - supports-color + '@babel/preset-modules@0.1.6(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 @@ -11424,6 +12645,15 @@ snapshots: '@babel/types': 7.24.0 esutils: 2.0.3 + '@babel/preset-modules@0.1.6(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.24.0 + '@babel/plugin-proposal-unicode-property-regex': 7.18.6(@babel/core@7.26.10) + '@babel/plugin-transform-dotall-regex': 7.22.5(@babel/core@7.26.10) + '@babel/types': 7.24.0 + esutils: 2.0.3 + '@babel/preset-react@7.22.5(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 @@ -11433,6 +12663,20 @@ snapshots: '@babel/plugin-transform-react-jsx': 7.22.5(@babel/core@7.24.3) '@babel/plugin-transform-react-jsx-development': 7.22.5(@babel/core@7.24.3) '@babel/plugin-transform-react-pure-annotations': 7.22.5(@babel/core@7.24.3) + transitivePeerDependencies: + - supports-color + + '@babel/preset-react@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-validator-option': 7.23.5 + '@babel/plugin-transform-react-display-name': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-react-jsx': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-react-jsx-development': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-react-pure-annotations': 7.22.5(@babel/core@7.26.10) + transitivePeerDependencies: + - supports-color '@babel/preset-typescript@7.22.5(@babel/core@7.24.3)': dependencies: @@ -11442,6 +12686,19 @@ snapshots: '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.24.3) '@babel/plugin-transform-modules-commonjs': 7.22.5(@babel/core@7.24.3) '@babel/plugin-transform-typescript': 7.22.9(@babel/core@7.24.3) + transitivePeerDependencies: + - supports-color + + '@babel/preset-typescript@7.22.5(@babel/core@7.26.10)': + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-validator-option': 7.23.5 + '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-modules-commonjs': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-typescript': 7.22.9(@babel/core@7.26.10) + transitivePeerDependencies: + - supports-color '@babel/regjsgen@0.8.0': {} @@ -11483,7 +12740,7 @@ snapshots: '@babel/parser': 7.26.10 '@babel/template': 7.26.9 '@babel/types': 7.26.10 - debug: 4.4.0 + debug: 4.3.7 globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -11725,14 +12982,14 @@ snapshots: optionalDependencies: workerd: 1.20250224.0 - '@cloudflare/vite-plugin@0.1.13(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0))(workerd@1.20250224.0)(wrangler@4.2.0(@cloudflare/workers-types@4.20250317.0))': + '@cloudflare/vite-plugin@0.1.13(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))(workerd@1.20250224.0)(wrangler@4.2.0(@cloudflare/workers-types@4.20250317.0))': dependencies: '@cloudflare/unenv-preset': 1.1.1(unenv@2.0.0-rc.1)(workerd@1.20250224.0) '@hattip/adapter-node': 0.0.49 miniflare: 4.20250317.1 tinyglobby: 0.2.12 unenv: 2.0.0-rc.1 - vite: 6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + vite: 6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) wrangler: 4.2.0(@cloudflare/workers-types@4.20250317.0) ws: 8.18.0 transitivePeerDependencies: @@ -11740,13 +12997,13 @@ snapshots: - utf-8-validate - workerd - '@cloudflare/vite-plugin@0.1.7(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0))(workerd@1.20250224.0)(wrangler@3.114.5(@cloudflare/workers-types@4.20250317.0))': + '@cloudflare/vite-plugin@0.1.7(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))(workerd@1.20250224.0)(wrangler@3.114.5(@cloudflare/workers-types@4.20250317.0))': dependencies: '@cloudflare/unenv-preset': 1.1.1(unenv@2.0.0-rc.1)(workerd@1.20250224.0) '@hattip/adapter-node': 0.0.49 miniflare: 3.20250214.1 unenv: 2.0.0-rc.1 - vite: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + vite: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) wrangler: 3.114.5(@cloudflare/workers-types@4.20250317.0) ws: 8.18.0 transitivePeerDependencies: @@ -12354,13 +13611,13 @@ snapshots: react: 19.1.0 react-dom: 19.1.0(react@19.1.0) - '@jacob-ebey/vite-react-server-dom@0.0.12(@jacob-ebey/react-server-dom-vite@19.0.0-experimental.14(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(rollup@4.34.8)(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0))': + '@jacob-ebey/vite-react-server-dom@0.0.12(@jacob-ebey/react-server-dom-vite@19.0.0-experimental.14(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(rollup@4.34.8)(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))': dependencies: '@jacob-ebey/react-server-dom-vite': 19.0.0-experimental.14(react-dom@19.1.0(react@19.1.0))(react@19.1.0) '@mjackson/node-fetch-server': 0.5.0 - '@vitejs/plugin-react': 4.3.4(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)) + '@vitejs/plugin-react': 4.3.4(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) unplugin-rsc: 0.0.11(rollup@4.34.8) - vite: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + vite: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) transitivePeerDependencies: - rollup - supports-color @@ -12368,7 +13625,7 @@ snapshots: '@jest/console@29.7.0': dependencies: '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 22.14.0 chalk: 4.1.2 jest-message-util: 29.7.0 jest-util: 29.7.0 @@ -12381,14 +13638,14 @@ snapshots: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 22.14.0 ansi-escapes: 4.3.2 chalk: 4.1.2 ci-info: 3.8.0 exit: 0.1.2 graceful-fs: 4.2.11 jest-changed-files: 29.7.0 - jest-config: 29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0) + jest-config: 29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0) jest-haste-map: 29.7.0 jest-message-util: 29.7.0 jest-regex-util: 29.6.3 @@ -12413,7 +13670,7 @@ snapshots: dependencies: '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 22.14.0 jest-mock: 29.7.0 '@jest/expect-utils@29.7.0': @@ -12431,7 +13688,7 @@ snapshots: dependencies: '@jest/types': 29.6.3 '@sinonjs/fake-timers': 10.0.2 - '@types/node': 20.11.30 + '@types/node': 22.14.0 jest-message-util: 29.7.0 jest-mock: 29.7.0 jest-util: 29.7.0 @@ -12453,7 +13710,7 @@ snapshots: '@jest/transform': 29.7.0 '@jest/types': 29.6.3 '@jridgewell/trace-mapping': 0.3.25 - '@types/node': 20.11.30 + '@types/node': 22.14.0 chalk: 4.1.2 collect-v8-coverage: 1.0.1 exit: 0.1.2 @@ -12500,7 +13757,7 @@ snapshots: '@jest/transform@29.7.0': dependencies: - '@babel/core': 7.24.3 + '@babel/core': 7.26.10 '@jest/types': 29.6.3 '@jridgewell/trace-mapping': 0.3.25 babel-plugin-istanbul: 6.1.1 @@ -12523,7 +13780,7 @@ snapshots: '@jest/schemas': 29.6.3 '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/yargs': 17.0.24 chalk: 4.1.2 @@ -12892,6 +14149,18 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/bundler-default@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/diagnostic': 2.15.0 + '@parcel/graph': 3.5.0 + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/rust': 2.15.0 + '@parcel/utils': 2.15.0 + nullthrows: 1.1.1 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/cache@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/core': 2.14.1(@swc/helpers@0.5.15) @@ -12902,10 +14171,24 @@ snapshots: transitivePeerDependencies: - napi-wasm + '@parcel/cache@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/core': 2.15.0 + '@parcel/fs': 2.15.0(@parcel/core@2.15.0) + '@parcel/logger': 2.15.0 + '@parcel/utils': 2.15.0 + lmdb: 2.8.5 + transitivePeerDependencies: + - napi-wasm + '@parcel/codeframe@2.14.1': dependencies: chalk: 4.1.2 + '@parcel/codeframe@2.15.0': + dependencies: + chalk: 4.1.2 + '@parcel/compressor-raw@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) @@ -12913,6 +14196,13 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/compressor-raw@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/config-default@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5)': dependencies: '@parcel/bundler-default': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) @@ -12961,6 +14251,45 @@ snapshots: - typescript - uncss + '@parcel/config-default@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/bundler-default': 2.15.0(@parcel/core@2.15.0) + '@parcel/compressor-raw': 2.15.0(@parcel/core@2.15.0) + '@parcel/core': 2.15.0 + '@parcel/namer-default': 2.15.0(@parcel/core@2.15.0) + '@parcel/optimizer-css': 2.15.0(@parcel/core@2.15.0) + '@parcel/optimizer-html': 2.15.0(@parcel/core@2.15.0) + '@parcel/optimizer-image': 2.15.0(@parcel/core@2.15.0) + '@parcel/optimizer-svg': 2.15.0(@parcel/core@2.15.0) + '@parcel/optimizer-swc': 2.15.0(@parcel/core@2.15.0) + '@parcel/packager-css': 2.15.0(@parcel/core@2.15.0) + '@parcel/packager-html': 2.15.0(@parcel/core@2.15.0) + '@parcel/packager-js': 2.15.0(@parcel/core@2.15.0) + '@parcel/packager-raw': 2.15.0(@parcel/core@2.15.0) + '@parcel/packager-svg': 2.15.0(@parcel/core@2.15.0) + '@parcel/packager-wasm': 2.15.0(@parcel/core@2.15.0) + '@parcel/reporter-dev-server': 2.15.0(@parcel/core@2.15.0) + '@parcel/resolver-default': 2.15.0(@parcel/core@2.15.0) + '@parcel/runtime-browser-hmr': 2.15.0(@parcel/core@2.15.0) + '@parcel/runtime-js': 2.15.0(@parcel/core@2.15.0) + '@parcel/runtime-rsc': 2.15.0(@parcel/core@2.15.0) + '@parcel/runtime-service-worker': 2.15.0(@parcel/core@2.15.0) + '@parcel/transformer-babel': 2.15.0(@parcel/core@2.15.0) + '@parcel/transformer-css': 2.15.0(@parcel/core@2.15.0) + '@parcel/transformer-html': 2.15.0(@parcel/core@2.15.0) + '@parcel/transformer-image': 2.15.0(@parcel/core@2.15.0) + '@parcel/transformer-js': 2.15.0(@parcel/core@2.15.0) + '@parcel/transformer-json': 2.15.0(@parcel/core@2.15.0) + '@parcel/transformer-node': 2.15.0(@parcel/core@2.15.0) + '@parcel/transformer-postcss': 2.15.0(@parcel/core@2.15.0) + '@parcel/transformer-posthtml': 2.15.0(@parcel/core@2.15.0) + '@parcel/transformer-raw': 2.15.0(@parcel/core@2.15.0) + '@parcel/transformer-react-refresh-wrap': 2.15.0(@parcel/core@2.15.0) + '@parcel/transformer-svg': 2.15.0(@parcel/core@2.15.0) + transitivePeerDependencies: + - '@swc/helpers' + - napi-wasm + '@parcel/core@2.14.1(@swc/helpers@0.5.15)': dependencies: '@mischnic/json-sourcemap': 0.1.1 @@ -12992,17 +14321,59 @@ snapshots: - '@swc/helpers' - napi-wasm + '@parcel/core@2.15.0': + dependencies: + '@mischnic/json-sourcemap': 0.1.1 + '@parcel/cache': 2.15.0(@parcel/core@2.15.0) + '@parcel/diagnostic': 2.15.0 + '@parcel/events': 2.15.0 + '@parcel/feature-flags': 2.15.0 + '@parcel/fs': 2.15.0(@parcel/core@2.15.0) + '@parcel/graph': 3.5.0 + '@parcel/logger': 2.15.0 + '@parcel/package-manager': 2.15.0(@parcel/core@2.15.0) + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/profiler': 2.15.0 + '@parcel/rust': 2.15.0 + '@parcel/source-map': 2.1.1 + '@parcel/types': 2.15.0(@parcel/core@2.15.0) + '@parcel/utils': 2.15.0 + '@parcel/workers': 2.15.0(@parcel/core@2.15.0) + base-x: 3.0.11 + browserslist: 4.24.5 + clone: 2.1.2 + dotenv: 16.5.0 + dotenv-expand: 11.0.7 + json5: 2.2.3 + msgpackr: 1.11.2 + nullthrows: 1.1.1 + semver: 7.7.1 + transitivePeerDependencies: + - '@swc/helpers' + - napi-wasm + '@parcel/diagnostic@2.14.1': dependencies: '@mischnic/json-sourcemap': 0.1.1 nullthrows: 1.1.1 + '@parcel/diagnostic@2.15.0': + dependencies: + '@mischnic/json-sourcemap': 0.1.1 + nullthrows: 1.1.1 + '@parcel/error-overlay@2.14.1': {} + '@parcel/error-overlay@2.15.0': {} + '@parcel/events@2.14.1': {} + '@parcel/events@2.15.0': {} + '@parcel/feature-flags@2.14.1': {} + '@parcel/feature-flags@2.15.0': {} + '@parcel/fs@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/core': 2.14.1(@swc/helpers@0.5.15) @@ -13015,20 +14386,46 @@ snapshots: transitivePeerDependencies: - napi-wasm + '@parcel/fs@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/core': 2.15.0 + '@parcel/feature-flags': 2.15.0 + '@parcel/rust': 2.15.0 + '@parcel/types-internal': 2.15.0 + '@parcel/utils': 2.15.0 + '@parcel/watcher': 2.5.1 + '@parcel/workers': 2.15.0(@parcel/core@2.15.0) + transitivePeerDependencies: + - napi-wasm + '@parcel/graph@3.4.1': dependencies: '@parcel/feature-flags': 2.14.1 nullthrows: 1.1.1 + '@parcel/graph@3.5.0': + dependencies: + '@parcel/feature-flags': 2.15.0 + nullthrows: 1.1.1 + '@parcel/logger@2.14.1': dependencies: '@parcel/diagnostic': 2.14.1 '@parcel/events': 2.14.1 + '@parcel/logger@2.15.0': + dependencies: + '@parcel/diagnostic': 2.15.0 + '@parcel/events': 2.15.0 + '@parcel/markdown-ansi@2.14.1': dependencies: chalk: 4.1.2 + '@parcel/markdown-ansi@2.15.0': + dependencies: + chalk: 4.1.2 + '@parcel/namer-default@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/diagnostic': 2.14.1 @@ -13038,13 +14435,35 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/node-resolver-core@3.5.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/namer-default@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/diagnostic': 2.15.0 + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + nullthrows: 1.1.1 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + + '@parcel/node-resolver-core@3.5.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + dependencies: + '@mischnic/json-sourcemap': 0.1.1 + '@parcel/diagnostic': 2.14.1 + '@parcel/fs': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/rust': 2.14.1 + '@parcel/utils': 2.14.1 + nullthrows: 1.1.1 + semver: 7.7.1 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + + '@parcel/node-resolver-core@3.6.0(@parcel/core@2.15.0)': dependencies: '@mischnic/json-sourcemap': 0.1.1 - '@parcel/diagnostic': 2.14.1 - '@parcel/fs': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/rust': 2.14.1 - '@parcel/utils': 2.14.1 + '@parcel/diagnostic': 2.15.0 + '@parcel/fs': 2.15.0(@parcel/core@2.15.0) + '@parcel/rust': 2.15.0 + '@parcel/utils': 2.15.0 nullthrows: 1.1.1 semver: 7.7.1 transitivePeerDependencies: @@ -13064,6 +14483,28 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/optimizer-css@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/diagnostic': 2.15.0 + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/source-map': 2.1.1 + '@parcel/utils': 2.15.0 + browserslist: 4.24.5 + lightningcss: 1.30.1 + nullthrows: 1.1.1 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + + '@parcel/optimizer-html@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/rust': 2.15.0 + '@parcel/utils': 2.15.0 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/optimizer-htmlnano@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5)': dependencies: '@parcel/diagnostic': 2.14.1 @@ -13096,6 +14537,26 @@ snapshots: transitivePeerDependencies: - napi-wasm + '@parcel/optimizer-image@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/core': 2.15.0 + '@parcel/diagnostic': 2.15.0 + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/rust': 2.15.0 + '@parcel/utils': 2.15.0 + '@parcel/workers': 2.15.0(@parcel/core@2.15.0) + transitivePeerDependencies: + - napi-wasm + + '@parcel/optimizer-svg@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/rust': 2.15.0 + '@parcel/utils': 2.15.0 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/optimizer-svgo@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/diagnostic': 2.14.1 @@ -13118,6 +14579,19 @@ snapshots: - '@swc/helpers' - napi-wasm + '@parcel/optimizer-swc@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/diagnostic': 2.15.0 + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/source-map': 2.1.1 + '@parcel/utils': 2.15.0 + '@swc/core': 1.11.24 + nullthrows: 1.1.1 + transitivePeerDependencies: + - '@parcel/core' + - '@swc/helpers' + - napi-wasm + '@parcel/package-manager@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)': dependencies: '@parcel/core': 2.14.1(@swc/helpers@0.5.15) @@ -13134,6 +14608,22 @@ snapshots: - '@swc/helpers' - napi-wasm + '@parcel/package-manager@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/core': 2.15.0 + '@parcel/diagnostic': 2.15.0 + '@parcel/fs': 2.15.0(@parcel/core@2.15.0) + '@parcel/logger': 2.15.0 + '@parcel/node-resolver-core': 3.6.0(@parcel/core@2.15.0) + '@parcel/types': 2.15.0(@parcel/core@2.15.0) + '@parcel/utils': 2.15.0 + '@parcel/workers': 2.15.0(@parcel/core@2.15.0) + '@swc/core': 1.11.24 + semver: 7.7.1 + transitivePeerDependencies: + - '@swc/helpers' + - napi-wasm + '@parcel/packager-css@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/diagnostic': 2.14.1 @@ -13146,6 +14636,18 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/packager-css@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/diagnostic': 2.15.0 + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/source-map': 2.1.1 + '@parcel/utils': 2.15.0 + lightningcss: 1.30.1 + nullthrows: 1.1.1 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/packager-html@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) @@ -13157,6 +14659,16 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/packager-html@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/rust': 2.15.0 + '@parcel/types': 2.15.0(@parcel/core@2.15.0) + '@parcel/utils': 2.15.0 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/packager-js@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/diagnostic': 2.14.1 @@ -13171,6 +14683,20 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/packager-js@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/diagnostic': 2.15.0 + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/rust': 2.15.0 + '@parcel/source-map': 2.1.1 + '@parcel/types': 2.15.0(@parcel/core@2.15.0) + '@parcel/utils': 2.15.0 + globals: 13.24.0 + nullthrows: 1.1.1 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/packager-raw@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) @@ -13178,6 +14704,13 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/packager-raw@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/packager-react-static@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/node-resolver-core': 3.5.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) @@ -13191,6 +14724,19 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/packager-react-static@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/node-resolver-core': 3.6.0(@parcel/core@2.15.0) + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/rust': 2.15.0 + '@parcel/types': 2.15.0(@parcel/core@2.15.0) + '@parcel/utils': 2.15.0 + nullthrows: 1.1.1 + rsc-html-stream: 0.0.6 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/packager-svg@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) @@ -13201,6 +14747,16 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/packager-svg@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/rust': 2.15.0 + '@parcel/types': 2.15.0(@parcel/core@2.15.0) + '@parcel/utils': 2.15.0 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/packager-wasm@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) @@ -13208,6 +14764,13 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/packager-wasm@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/plugin@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/types': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) @@ -13215,6 +14778,13 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/plugin@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/types': 2.15.0(@parcel/core@2.15.0) + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/profiler@2.14.1': dependencies: '@parcel/diagnostic': 2.14.1 @@ -13222,6 +14792,13 @@ snapshots: '@parcel/types-internal': 2.14.1 chrome-trace-event: 1.0.4 + '@parcel/profiler@2.15.0': + dependencies: + '@parcel/diagnostic': 2.15.0 + '@parcel/events': 2.15.0 + '@parcel/types-internal': 2.15.0 + chrome-trace-event: 1.0.4 + '@parcel/reporter-cli@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) @@ -13233,6 +14810,17 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/reporter-cli@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/types': 2.15.0(@parcel/core@2.15.0) + '@parcel/utils': 2.15.0 + chalk: 4.1.2 + term-size: 2.2.1 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/reporter-dev-server@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/codeframe': 2.14.1 @@ -13243,6 +14831,16 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/reporter-dev-server@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/codeframe': 2.15.0 + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/source-map': 2.1.1 + '@parcel/utils': 2.15.0 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/reporter-tracer@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) @@ -13253,6 +14851,16 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/reporter-tracer@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/utils': 2.15.0 + chrome-trace-event: 1.0.4 + nullthrows: 1.1.1 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/resolver-default@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/node-resolver-core': 3.5.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) @@ -13261,6 +14869,14 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/resolver-default@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/node-resolver-core': 3.6.0(@parcel/core@2.15.0) + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/runtime-browser-hmr@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) @@ -13269,6 +14885,14 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/runtime-browser-hmr@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/utils': 2.15.0 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/runtime-js@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/diagnostic': 2.14.1 @@ -13279,6 +14903,16 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/runtime-js@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/diagnostic': 2.15.0 + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/utils': 2.15.0 + nullthrows: 1.1.1 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/runtime-rsc@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) @@ -13289,6 +14923,16 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/runtime-rsc@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/rust': 2.15.0 + '@parcel/utils': 2.15.0 + nullthrows: 1.1.1 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/runtime-service-worker@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) @@ -13298,8 +14942,52 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/runtime-service-worker@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/utils': 2.15.0 + nullthrows: 1.1.1 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + + '@parcel/rust-darwin-arm64@2.15.0': + optional: true + + '@parcel/rust-darwin-x64@2.15.0': + optional: true + + '@parcel/rust-linux-arm-gnueabihf@2.15.0': + optional: true + + '@parcel/rust-linux-arm64-gnu@2.15.0': + optional: true + + '@parcel/rust-linux-arm64-musl@2.15.0': + optional: true + + '@parcel/rust-linux-x64-gnu@2.15.0': + optional: true + + '@parcel/rust-linux-x64-musl@2.15.0': + optional: true + + '@parcel/rust-win32-x64-msvc@2.15.0': + optional: true + '@parcel/rust@2.14.1': {} + '@parcel/rust@2.15.0': + optionalDependencies: + '@parcel/rust-darwin-arm64': 2.15.0 + '@parcel/rust-darwin-x64': 2.15.0 + '@parcel/rust-linux-arm-gnueabihf': 2.15.0 + '@parcel/rust-linux-arm64-gnu': 2.15.0 + '@parcel/rust-linux-arm64-musl': 2.15.0 + '@parcel/rust-linux-x64-gnu': 2.15.0 + '@parcel/rust-linux-x64-musl': 2.15.0 + '@parcel/rust-win32-x64-msvc': 2.15.0 + '@parcel/source-map@2.1.1': dependencies: detect-libc: 1.0.3 @@ -13318,6 +15006,20 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/transformer-babel@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/diagnostic': 2.15.0 + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/source-map': 2.1.1 + '@parcel/utils': 2.15.0 + browserslist: 4.24.5 + json5: 2.2.3 + nullthrows: 1.1.1 + semver: 7.7.1 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/transformer-css@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/diagnostic': 2.14.1 @@ -13331,6 +15033,19 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/transformer-css@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/diagnostic': 2.15.0 + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/source-map': 2.1.1 + '@parcel/utils': 2.15.0 + browserslist: 4.24.5 + lightningcss: 1.30.1 + nullthrows: 1.1.1 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/transformer-html@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/diagnostic': 2.14.1 @@ -13346,6 +15061,15 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/transformer-html@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/diagnostic': 2.15.0 + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/rust': 2.15.0 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/transformer-image@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/core': 2.14.1(@swc/helpers@0.5.15) @@ -13356,6 +15080,16 @@ snapshots: transitivePeerDependencies: - napi-wasm + '@parcel/transformer-image@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/core': 2.15.0 + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/utils': 2.15.0 + '@parcel/workers': 2.15.0(@parcel/core@2.15.0) + nullthrows: 1.1.1 + transitivePeerDependencies: + - napi-wasm + '@parcel/transformer-js@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/core': 2.14.1(@swc/helpers@0.5.15) @@ -13373,6 +15107,23 @@ snapshots: transitivePeerDependencies: - napi-wasm + '@parcel/transformer-js@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/core': 2.15.0 + '@parcel/diagnostic': 2.15.0 + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/rust': 2.15.0 + '@parcel/source-map': 2.1.1 + '@parcel/utils': 2.15.0 + '@parcel/workers': 2.15.0(@parcel/core@2.15.0) + '@swc/helpers': 0.5.15 + browserslist: 4.24.5 + nullthrows: 1.1.1 + regenerator-runtime: 0.14.1 + semver: 7.7.1 + transitivePeerDependencies: + - napi-wasm + '@parcel/transformer-json@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) @@ -13381,6 +15132,14 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/transformer-json@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + json5: 2.2.3 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/transformer-node@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) @@ -13388,6 +15147,13 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/transformer-node@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/transformer-postcss@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/diagnostic': 2.14.1 @@ -13402,6 +15168,20 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/transformer-postcss@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/diagnostic': 2.15.0 + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/rust': 2.15.0 + '@parcel/utils': 2.15.0 + clone: 2.1.2 + nullthrows: 1.1.1 + postcss-value-parser: 4.2.0 + semver: 7.7.1 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/transformer-posthtml@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) @@ -13415,6 +15195,14 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/transformer-posthtml@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/utils': 2.15.0 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/transformer-raw@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) @@ -13422,12 +15210,29 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/transformer-raw@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/transformer-react-refresh-wrap@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/error-overlay': 2.14.1 '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) '@parcel/utils': 2.14.1 - react-refresh: 0.14.0 + react-refresh: 0.14.2 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + + '@parcel/transformer-react-refresh-wrap@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/error-overlay': 2.15.0 + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/utils': 2.15.0 + react-refresh: 0.16.0 transitivePeerDependencies: - '@parcel/core' - napi-wasm @@ -13439,6 +15244,13 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/transformer-react-static@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/transformer-svg@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/diagnostic': 2.14.1 @@ -13453,6 +15265,15 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/transformer-svg@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/diagnostic': 2.15.0 + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@parcel/rust': 2.15.0 + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/types-internal@2.14.1': dependencies: '@parcel/diagnostic': 2.14.1 @@ -13460,6 +15281,13 @@ snapshots: '@parcel/source-map': 2.1.1 utility-types: 3.11.0 + '@parcel/types-internal@2.15.0': + dependencies: + '@parcel/diagnostic': 2.15.0 + '@parcel/feature-flags': 2.15.0 + '@parcel/source-map': 2.1.1 + utility-types: 3.11.0 + '@parcel/types@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': dependencies: '@parcel/types-internal': 2.14.1 @@ -13468,13 +15296,34 @@ snapshots: - '@parcel/core' - napi-wasm + '@parcel/types@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/types-internal': 2.15.0 + '@parcel/workers': 2.15.0(@parcel/core@2.15.0) + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + '@parcel/utils@2.14.1': dependencies: - '@parcel/codeframe': 2.14.1 - '@parcel/diagnostic': 2.14.1 - '@parcel/logger': 2.14.1 - '@parcel/markdown-ansi': 2.14.1 - '@parcel/rust': 2.14.1 + '@parcel/codeframe': 2.14.1 + '@parcel/diagnostic': 2.14.1 + '@parcel/logger': 2.14.1 + '@parcel/markdown-ansi': 2.14.1 + '@parcel/rust': 2.14.1 + '@parcel/source-map': 2.1.1 + chalk: 4.1.2 + nullthrows: 1.1.1 + transitivePeerDependencies: + - napi-wasm + + '@parcel/utils@2.15.0': + dependencies: + '@parcel/codeframe': 2.15.0 + '@parcel/diagnostic': 2.15.0 + '@parcel/logger': 2.15.0 + '@parcel/markdown-ansi': 2.15.0 + '@parcel/rust': 2.15.0 '@parcel/source-map': 2.1.1 chalk: 4.1.2 nullthrows: 1.1.1 @@ -13553,6 +15402,18 @@ snapshots: transitivePeerDependencies: - napi-wasm + '@parcel/workers@2.15.0(@parcel/core@2.15.0)': + dependencies: + '@parcel/core': 2.15.0 + '@parcel/diagnostic': 2.15.0 + '@parcel/logger': 2.15.0 + '@parcel/profiler': 2.15.0 + '@parcel/types-internal': 2.15.0 + '@parcel/utils': 2.15.0 + nullthrows: 1.1.1 + transitivePeerDependencies: + - napi-wasm + '@pkgjs/parseargs@0.11.0': optional: true @@ -13836,33 +15697,63 @@ snapshots: '@swc/core-darwin-arm64@1.11.18': optional: true + '@swc/core-darwin-arm64@1.11.24': + optional: true + '@swc/core-darwin-x64@1.11.18': optional: true + '@swc/core-darwin-x64@1.11.24': + optional: true + '@swc/core-linux-arm-gnueabihf@1.11.18': optional: true + '@swc/core-linux-arm-gnueabihf@1.11.24': + optional: true + '@swc/core-linux-arm64-gnu@1.11.18': optional: true + '@swc/core-linux-arm64-gnu@1.11.24': + optional: true + '@swc/core-linux-arm64-musl@1.11.18': optional: true + '@swc/core-linux-arm64-musl@1.11.24': + optional: true + '@swc/core-linux-x64-gnu@1.11.18': optional: true + '@swc/core-linux-x64-gnu@1.11.24': + optional: true + '@swc/core-linux-x64-musl@1.11.18': optional: true + '@swc/core-linux-x64-musl@1.11.24': + optional: true + '@swc/core-win32-arm64-msvc@1.11.18': optional: true + '@swc/core-win32-arm64-msvc@1.11.24': + optional: true + '@swc/core-win32-ia32-msvc@1.11.18': optional: true + '@swc/core-win32-ia32-msvc@1.11.24': + optional: true + '@swc/core-win32-x64-msvc@1.11.18': optional: true + '@swc/core-win32-x64-msvc@1.11.24': + optional: true + '@swc/core@1.11.18(@swc/helpers@0.5.15)': dependencies: '@swc/counter': 0.1.3 @@ -13880,6 +15771,22 @@ snapshots: '@swc/core-win32-x64-msvc': 1.11.18 '@swc/helpers': 0.5.15 + '@swc/core@1.11.24': + dependencies: + '@swc/counter': 0.1.3 + '@swc/types': 0.1.21 + optionalDependencies: + '@swc/core-darwin-arm64': 1.11.24 + '@swc/core-darwin-x64': 1.11.24 + '@swc/core-linux-arm-gnueabihf': 1.11.24 + '@swc/core-linux-arm64-gnu': 1.11.24 + '@swc/core-linux-arm64-musl': 1.11.24 + '@swc/core-linux-x64-gnu': 1.11.24 + '@swc/core-linux-x64-musl': 1.11.24 + '@swc/core-win32-arm64-msvc': 1.11.24 + '@swc/core-win32-ia32-msvc': 1.11.24 + '@swc/core-win32-x64-msvc': 1.11.24 + '@swc/counter@0.1.3': {} '@swc/helpers@0.5.15': @@ -13966,7 +15873,7 @@ snapshots: '@types/body-parser@1.19.5': dependencies: '@types/connect': 3.4.38 - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/compression@1.7.5': dependencies: @@ -13974,7 +15881,7 @@ snapshots: '@types/connect@3.4.38': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/cookie@0.6.0': {} @@ -13982,7 +15889,7 @@ snapshots: '@types/cross-spawn@6.0.6': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/debug@4.1.12': dependencies: @@ -13998,14 +15905,14 @@ snapshots: '@types/express-serve-static-core@4.17.43': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/qs': 6.9.14 '@types/range-parser': 1.2.7 '@types/send': 0.17.4 '@types/express-serve-static-core@5.0.6': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/qs': 6.9.14 '@types/range-parser': 1.2.7 '@types/send': 0.17.4 @@ -14025,20 +15932,20 @@ snapshots: '@types/fs-extra@8.1.2': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/glob@7.2.0': dependencies: '@types/minimatch': 5.1.2 - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/graceful-fs@4.1.6': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/gunzip-maybe@1.4.2': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/hast@3.0.4': dependencies: @@ -14067,13 +15974,13 @@ snapshots: '@types/jsdom@20.0.1': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/tough-cookie': 4.0.2 parse5: 7.1.2 '@types/jsdom@21.1.1': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/tough-cookie': 4.0.2 parse5: 7.1.2 @@ -14085,7 +15992,7 @@ snapshots: '@types/jsonfile@6.1.1': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/lambda-tester@3.6.2': dependencies: @@ -14115,7 +16022,7 @@ snapshots: '@types/morgan@1.9.9': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/ms@0.7.34': {} @@ -14161,7 +16068,7 @@ snapshots: '@types/recursive-readdir@2.2.4': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/scheduler@0.16.2': {} @@ -14170,22 +16077,22 @@ snapshots: '@types/send@0.17.4': dependencies: '@types/mime': 1.3.5 - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/serve-static@1.15.5': dependencies: '@types/http-errors': 2.0.4 '@types/mime': 3.0.4 - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/set-cookie-parser@2.4.7': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/shelljs@0.8.15': dependencies: '@types/glob': 7.2.0 - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/source-map-support@0.5.10': dependencies: @@ -14199,7 +16106,7 @@ snapshots: dependencies: '@types/cookiejar': 2.1.5 '@types/methods': 1.1.4 - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/supertest@2.0.16': dependencies: @@ -14207,12 +16114,12 @@ snapshots: '@types/tar-fs@2.0.4': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/tar-stream': 3.1.3 '@types/tar-stream@3.1.3': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/tough-cookie@4.0.2': {} @@ -14418,7 +16325,7 @@ snapshots: '@vanilla-extract/babel-plugin-debug-ids@1.0.5': dependencies: - '@babel/core': 7.24.3 + '@babel/core': 7.26.10 transitivePeerDependencies: - supports-color @@ -14436,7 +16343,7 @@ snapshots: modern-ahocorasick: 1.0.1 outdent: 0.8.0 - '@vanilla-extract/integration@6.5.0(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0)': + '@vanilla-extract/integration@6.5.0(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0)': dependencies: '@babel/core': 7.24.3 '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.24.3) @@ -14449,8 +16356,8 @@ snapshots: lodash: 4.17.21 mlly: 1.6.1 outdent: 0.8.0 - vite: 5.1.3(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0) - vite-node: 1.6.0(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0) + vite: 5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0) + vite-node: 1.6.0(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0) transitivePeerDependencies: - '@types/node' - less @@ -14463,9 +16370,9 @@ snapshots: '@vanilla-extract/private@1.0.4': {} - '@vanilla-extract/vite-plugin@3.9.5(@types/node@22.14.0)(lightningcss@1.29.3)(rolldown-vite@6.3.0-beta.5(@types/node@22.14.0)(esbuild@0.25.0)(jiti@1.21.0)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0))': + '@vanilla-extract/vite-plugin@3.9.5(@types/node@22.14.0)(lightningcss@1.30.1)(rolldown-vite@6.3.0-beta.5(@types/node@22.14.0)(esbuild@0.25.0)(jiti@1.21.0)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0))': dependencies: - '@vanilla-extract/integration': 6.5.0(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0) + '@vanilla-extract/integration': 6.5.0(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0) outdent: 0.8.0 postcss: 8.4.49 postcss-load-config: 4.0.2(postcss@8.4.49) @@ -14481,13 +16388,13 @@ snapshots: - terser - ts-node - '@vanilla-extract/vite-plugin@3.9.5(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0)(vite@5.1.3(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0))': + '@vanilla-extract/vite-plugin@3.9.5(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0)(vite@5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0))': dependencies: - '@vanilla-extract/integration': 6.5.0(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0) + '@vanilla-extract/integration': 6.5.0(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0) outdent: 0.8.0 postcss: 8.4.49 postcss-load-config: 4.0.2(postcss@8.4.49) - vite: 5.1.3(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0) + vite: 5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0) transitivePeerDependencies: - '@types/node' - less @@ -14499,13 +16406,13 @@ snapshots: - terser - ts-node - '@vanilla-extract/vite-plugin@3.9.5(@types/node@22.14.0)(lightningcss@1.29.3)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0))': + '@vanilla-extract/vite-plugin@3.9.5(@types/node@22.14.0)(lightningcss@1.30.1)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))': dependencies: - '@vanilla-extract/integration': 6.5.0(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0) + '@vanilla-extract/integration': 6.5.0(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0) outdent: 0.8.0 postcss: 8.4.49 postcss-load-config: 4.0.2(postcss@8.4.49) - vite: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + vite: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) transitivePeerDependencies: - '@types/node' - less @@ -14517,14 +16424,14 @@ snapshots: - terser - ts-node - '@vitejs/plugin-react@4.3.4(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0))': + '@vitejs/plugin-react@4.3.4(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))': dependencies: '@babel/core': 7.26.10 '@babel/plugin-transform-react-jsx-self': 7.25.9(@babel/core@7.26.10) '@babel/plugin-transform-react-jsx-source': 7.25.9(@babel/core@7.26.10) '@types/babel__core': 7.20.5 react-refresh: 0.14.2 - vite: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + vite: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) transitivePeerDependencies: - supports-color @@ -14560,9 +16467,9 @@ snapshots: dependencies: acorn: 8.11.3 - acorn-jsx@5.3.2(acorn@8.14.0): + acorn-jsx@5.3.2(acorn@8.14.1): dependencies: - acorn: 8.14.0 + acorn: 8.14.1 acorn-walk@8.3.2: {} @@ -14570,8 +16477,7 @@ snapshots: acorn@8.14.0: {} - acorn@8.14.1: - optional: true + acorn@8.14.1: {} agent-base@6.0.2: dependencies: @@ -14773,13 +16679,26 @@ snapshots: transitivePeerDependencies: - supports-color + babel-jest@29.7.0(@babel/core@7.26.10): + dependencies: + '@babel/core': 7.26.10 + '@jest/transform': 29.7.0 + '@types/babel__core': 7.20.5 + babel-plugin-istanbul: 6.1.1 + babel-preset-jest: 29.6.3(@babel/core@7.26.10) + chalk: 4.1.2 + graceful-fs: 4.2.11 + slash: 3.0.0 + transitivePeerDependencies: + - supports-color + babel-plugin-dev-expression@0.2.3(@babel/core@7.24.3): dependencies: '@babel/core': 7.24.3 babel-plugin-istanbul@6.1.1: dependencies: - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 '@istanbuljs/load-nyc-config': 1.1.0 '@istanbuljs/schema': 0.1.3 istanbul-lib-instrument: 5.2.1 @@ -14789,8 +16708,8 @@ snapshots: babel-plugin-jest-hoist@29.6.3: dependencies: - '@babel/template': 7.24.0 - '@babel/types': 7.24.0 + '@babel/template': 7.26.9 + '@babel/types': 7.26.10 '@types/babel__core': 7.20.5 '@types/babel__traverse': 7.20.5 @@ -14800,11 +16719,11 @@ snapshots: cosmiconfig: 7.1.0 resolve: 1.22.8 - babel-plugin-polyfill-corejs2@0.3.3(@babel/core@7.24.3): + babel-plugin-polyfill-corejs2@0.3.3(@babel/core@7.26.10): dependencies: - '@babel/compat-data': 7.24.1 - '@babel/core': 7.24.3 - '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.24.3) + '@babel/compat-data': 7.26.8 + '@babel/core': 7.26.10 + '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.26.10) semver: 6.3.1 transitivePeerDependencies: - supports-color @@ -14818,10 +16737,19 @@ snapshots: transitivePeerDependencies: - supports-color - babel-plugin-polyfill-corejs3@0.5.3(@babel/core@7.24.3): + babel-plugin-polyfill-corejs2@0.4.5(@babel/core@7.26.10): dependencies: - '@babel/core': 7.24.3 - '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.24.3) + '@babel/compat-data': 7.24.1 + '@babel/core': 7.26.10 + '@babel/helper-define-polyfill-provider': 0.4.2(@babel/core@7.26.10) + semver: 6.3.1 + transitivePeerDependencies: + - supports-color + + babel-plugin-polyfill-corejs3@0.5.3(@babel/core@7.26.10): + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.26.10) core-js-compat: 3.32.0 transitivePeerDependencies: - supports-color @@ -14834,10 +16762,18 @@ snapshots: transitivePeerDependencies: - supports-color - babel-plugin-polyfill-regenerator@0.4.1(@babel/core@7.24.3): + babel-plugin-polyfill-corejs3@0.8.3(@babel/core@7.26.10): dependencies: - '@babel/core': 7.24.3 - '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.24.3) + '@babel/core': 7.26.10 + '@babel/helper-define-polyfill-provider': 0.4.2(@babel/core@7.26.10) + core-js-compat: 3.32.0 + transitivePeerDependencies: + - supports-color + + babel-plugin-polyfill-regenerator@0.4.1(@babel/core@7.26.10): + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.26.10) transitivePeerDependencies: - supports-color @@ -14848,6 +16784,13 @@ snapshots: transitivePeerDependencies: - supports-color + babel-plugin-polyfill-regenerator@0.5.2(@babel/core@7.26.10): + dependencies: + '@babel/core': 7.26.10 + '@babel/helper-define-polyfill-provider': 0.4.2(@babel/core@7.26.10) + transitivePeerDependencies: + - supports-color + babel-plugin-transform-react-remove-prop-types@0.4.24: {} babel-plugin-transform-remove-console@6.9.4: {} @@ -14868,28 +16811,50 @@ snapshots: '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.3) '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.24.3) + babel-preset-current-node-syntax@1.0.1(@babel/core@7.26.10): + dependencies: + '@babel/core': 7.26.10 + '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.26.10) + '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.26.10) + '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.26.10) + '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.26.10) + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.26.10) + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.26.10) + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.26.10) + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.26.10) + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.26.10) + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.26.10) + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.26.10) + '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.26.10) + babel-preset-jest@29.6.3(@babel/core@7.24.3): dependencies: '@babel/core': 7.24.3 babel-plugin-jest-hoist: 29.6.3 babel-preset-current-node-syntax: 1.0.1(@babel/core@7.24.3) + babel-preset-jest@29.6.3(@babel/core@7.26.10): + dependencies: + '@babel/core': 7.26.10 + babel-plugin-jest-hoist: 29.6.3 + babel-preset-current-node-syntax: 1.0.1(@babel/core@7.26.10) + babel-preset-react-app@10.0.1: dependencies: - '@babel/core': 7.24.3 - '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.24.3) - '@babel/plugin-proposal-decorators': 7.24.1(@babel/core@7.24.3) - '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.24.3) - '@babel/plugin-proposal-numeric-separator': 7.18.6(@babel/core@7.24.3) - '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.24.3) - '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.24.3) - '@babel/plugin-proposal-private-property-in-object': 7.21.11(@babel/core@7.24.3) - '@babel/plugin-transform-flow-strip-types': 7.19.0(@babel/core@7.24.3) - '@babel/plugin-transform-react-display-name': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-runtime': 7.18.10(@babel/core@7.24.3) - '@babel/preset-env': 7.22.9(@babel/core@7.24.3) - '@babel/preset-react': 7.22.5(@babel/core@7.24.3) - '@babel/preset-typescript': 7.22.5(@babel/core@7.24.3) + '@babel/core': 7.26.10 + '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.26.10) + '@babel/plugin-proposal-decorators': 7.24.1(@babel/core@7.26.10) + '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.26.10) + '@babel/plugin-proposal-numeric-separator': 7.18.6(@babel/core@7.26.10) + '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.26.10) + '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.26.10) + '@babel/plugin-proposal-private-property-in-object': 7.21.11(@babel/core@7.26.10) + '@babel/plugin-transform-flow-strip-types': 7.19.0(@babel/core@7.26.10) + '@babel/plugin-transform-react-display-name': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-runtime': 7.18.10(@babel/core@7.26.10) + '@babel/preset-env': 7.22.9(@babel/core@7.26.10) + '@babel/preset-react': 7.22.5(@babel/core@7.26.10) + '@babel/preset-typescript': 7.22.5(@babel/core@7.26.10) '@babel/runtime': 7.24.1 babel-plugin-macros: 3.1.0 babel-plugin-transform-react-remove-prop-types: 0.4.24 @@ -15009,6 +16974,13 @@ snapshots: node-releases: 2.0.19 update-browserslist-db: 1.1.3(browserslist@4.24.4) + browserslist@4.24.5: + dependencies: + caniuse-lite: 1.0.30001717 + electron-to-chromium: 1.5.155 + node-releases: 2.0.19 + update-browserslist-db: 1.1.3(browserslist@4.24.5) + bser@2.1.1: dependencies: node-int64: 0.4.0 @@ -15310,13 +17282,13 @@ snapshots: optionalDependencies: typescript: 5.4.5 - create-jest@29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0): + create-jest@29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0): dependencies: '@jest/types': 29.6.3 chalk: 4.1.2 exit: 0.1.2 graceful-fs: 4.2.11 - jest-config: 29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0) + jest-config: 29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0) jest-util: 29.7.0 prompts: 2.4.2 transitivePeerDependencies: @@ -15580,12 +17552,14 @@ snapshots: dotenv-expand@11.0.7: dependencies: - dotenv: 16.4.7 + dotenv: 16.5.0 dotenv-json@1.0.0: {} dotenv@16.4.7: {} + dotenv@16.5.0: {} + dotenv@8.6.0: {} dunder-proto@1.0.1: @@ -15609,6 +17583,8 @@ snapshots: electron-to-chromium@1.5.120: {} + electron-to-chromium@1.5.155: {} + emittery@0.13.1: {} emoji-regex@8.0.0: {} @@ -15907,7 +17883,7 @@ snapshots: optionalDependencies: source-map: 0.6.1 - eslint-config-react-app@7.0.1(@babel/plugin-syntax-flow@7.18.6(@babel/core@7.24.3))(@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.24.3))(eslint@8.57.0)(jest@29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0))(typescript@5.4.5): + eslint-config-react-app@7.0.1(@babel/plugin-syntax-flow@7.18.6(@babel/core@7.24.3))(@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.24.3))(eslint@8.57.0)(jest@29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0))(typescript@5.4.5): dependencies: '@babel/core': 7.24.3 '@babel/eslint-parser': 7.24.1(@babel/core@7.24.3)(eslint@8.57.0) @@ -15919,7 +17895,7 @@ snapshots: eslint: 8.57.0 eslint-plugin-flowtype: 8.0.3(@babel/plugin-syntax-flow@7.18.6(@babel/core@7.24.3))(@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.24.3))(eslint@8.57.0) eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0) - eslint-plugin-jest: 25.7.0(@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(jest@29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0))(typescript@5.4.5) + eslint-plugin-jest: 25.7.0(@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(jest@29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0))(typescript@5.4.5) eslint-plugin-jsx-a11y: 6.8.0(eslint@8.57.0) eslint-plugin-react: 7.34.1(eslint@8.57.0) eslint-plugin-react-hooks: 4.6.2(eslint@8.57.0) @@ -16024,24 +18000,24 @@ snapshots: - eslint-import-resolver-webpack - supports-color - eslint-plugin-jest@25.7.0(@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(jest@29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0))(typescript@5.4.5): + eslint-plugin-jest@25.7.0(@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(jest@29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0))(typescript@5.4.5): dependencies: '@typescript-eslint/experimental-utils': 5.62.0(eslint@8.57.0)(typescript@5.4.5) eslint: 8.57.0 optionalDependencies: '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5) - jest: 29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0) + jest: 29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0) transitivePeerDependencies: - supports-color - typescript - eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.5.0(@typescript-eslint/parser@7.5.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(jest@29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0))(typescript@5.4.5): + eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.5.0(@typescript-eslint/parser@7.5.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(jest@29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0))(typescript@5.4.5): dependencies: '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.4.5) eslint: 8.57.0 optionalDependencies: '@typescript-eslint/eslint-plugin': 7.5.0(@typescript-eslint/parser@7.5.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5) - jest: 29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0) + jest: 29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0) transitivePeerDependencies: - supports-color - typescript @@ -16227,7 +18203,7 @@ snapshots: eval@0.1.8: dependencies: - '@types/node': 20.11.30 + '@types/node': 22.14.0 require-like: 0.1.2 event-target-shim@5.0.1: {} @@ -17088,8 +19064,8 @@ snapshots: istanbul-lib-instrument@5.2.1: dependencies: - '@babel/core': 7.24.3 - '@babel/parser': 7.24.1 + '@babel/core': 7.26.10 + '@babel/parser': 7.26.10 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.0 semver: 6.3.1 @@ -17099,7 +19075,7 @@ snapshots: istanbul-lib-instrument@6.0.2: dependencies: '@babel/core': 7.26.10 - '@babel/parser': 7.24.1 + '@babel/parser': 7.26.10 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.0 semver: 7.7.1 @@ -17157,7 +19133,7 @@ snapshots: '@jest/expect': 29.7.0 '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 22.14.0 chalk: 4.1.2 co: 4.6.0 dedent: 1.5.3(babel-plugin-macros@3.1.0) @@ -17177,16 +19153,16 @@ snapshots: - babel-plugin-macros - supports-color - jest-cli@29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0): + jest-cli@29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0): dependencies: '@jest/core': 29.7.0(babel-plugin-macros@3.1.0) '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 chalk: 4.1.2 - create-jest: 29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0) + create-jest: 29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0) exit: 0.1.2 import-local: 3.1.0 - jest-config: 29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0) + jest-config: 29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0) jest-util: 29.7.0 jest-validate: 29.7.0 yargs: 17.7.2 @@ -17196,12 +19172,12 @@ snapshots: - supports-color - ts-node - jest-config@29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0): + jest-config@29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0): dependencies: - '@babel/core': 7.24.3 + '@babel/core': 7.26.10 '@jest/test-sequencer': 29.7.0 '@jest/types': 29.6.3 - babel-jest: 29.7.0(@babel/core@7.24.3) + babel-jest: 29.7.0(@babel/core@7.26.10) chalk: 4.1.2 ci-info: 3.8.0 deepmerge: 4.3.1 @@ -17221,7 +19197,7 @@ snapshots: slash: 3.0.0 strip-json-comments: 3.1.1 optionalDependencies: - '@types/node': 20.11.30 + '@types/node': 22.14.0 transitivePeerDependencies: - babel-plugin-macros - supports-color @@ -17251,7 +19227,7 @@ snapshots: '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 '@types/jsdom': 20.0.1 - '@types/node': 20.11.30 + '@types/node': 22.14.0 jest-mock: 29.7.0 jest-util: 29.7.0 jsdom: 22.1.0 @@ -17265,7 +19241,7 @@ snapshots: '@jest/environment': 29.7.0 '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 22.14.0 jest-mock: 29.7.0 jest-util: 29.7.0 @@ -17275,7 +19251,7 @@ snapshots: dependencies: '@jest/types': 29.6.3 '@types/graceful-fs': 4.1.6 - '@types/node': 20.11.30 + '@types/node': 22.14.0 anymatch: 3.1.3 fb-watchman: 2.0.2 graceful-fs: 4.2.11 @@ -17314,7 +19290,7 @@ snapshots: jest-mock@29.7.0: dependencies: '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 22.14.0 jest-util: 29.7.0 jest-pnp-resolver@1.2.3(jest-resolve@29.7.0): @@ -17349,7 +19325,7 @@ snapshots: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 22.14.0 chalk: 4.1.2 emittery: 0.13.1 graceful-fs: 4.2.11 @@ -17377,7 +19353,7 @@ snapshots: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 22.14.0 chalk: 4.1.2 cjs-module-lexer: 1.2.2 collect-v8-coverage: 1.0.1 @@ -17397,15 +19373,15 @@ snapshots: jest-snapshot@29.7.0: dependencies: - '@babel/core': 7.24.3 - '@babel/generator': 7.24.1 - '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.24.3) - '@babel/types': 7.24.0 + '@babel/core': 7.26.10 + '@babel/generator': 7.26.10 + '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.26.10) + '@babel/types': 7.26.10 '@jest/expect-utils': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - babel-preset-current-node-syntax: 1.0.1(@babel/core@7.24.3) + babel-preset-current-node-syntax: 1.0.1(@babel/core@7.26.10) chalk: 4.1.2 expect: 29.7.0 graceful-fs: 4.2.11 @@ -17423,7 +19399,7 @@ snapshots: jest-util@29.7.0: dependencies: '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 22.14.0 chalk: 4.1.2 ci-info: 3.8.0 graceful-fs: 4.2.11 @@ -17442,7 +19418,7 @@ snapshots: dependencies: '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 20.11.30 + '@types/node': 22.14.0 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.13.1 @@ -17451,17 +19427,17 @@ snapshots: jest-worker@29.7.0: dependencies: - '@types/node': 20.11.30 + '@types/node': 22.14.0 jest-util: 29.7.0 merge-stream: 2.0.0 supports-color: 8.1.1 - jest@29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0): + jest@29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0): dependencies: '@jest/core': 29.7.0(babel-plugin-macros@3.1.0) '@jest/types': 29.6.3 import-local: 3.1.0 - jest-cli: 29.7.0(@types/node@20.11.30)(babel-plugin-macros@3.1.0) + jest-cli: 29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0) transitivePeerDependencies: - '@types/node' - babel-plugin-macros @@ -17606,33 +19582,63 @@ snapshots: lightningcss-darwin-arm64@1.29.3: optional: true + lightningcss-darwin-arm64@1.30.1: + optional: true + lightningcss-darwin-x64@1.29.3: optional: true + lightningcss-darwin-x64@1.30.1: + optional: true + lightningcss-freebsd-x64@1.29.3: optional: true + lightningcss-freebsd-x64@1.30.1: + optional: true + lightningcss-linux-arm-gnueabihf@1.29.3: optional: true + lightningcss-linux-arm-gnueabihf@1.30.1: + optional: true + lightningcss-linux-arm64-gnu@1.29.3: optional: true + lightningcss-linux-arm64-gnu@1.30.1: + optional: true + lightningcss-linux-arm64-musl@1.29.3: optional: true + lightningcss-linux-arm64-musl@1.30.1: + optional: true + lightningcss-linux-x64-gnu@1.29.3: optional: true + lightningcss-linux-x64-gnu@1.30.1: + optional: true + lightningcss-linux-x64-musl@1.29.3: optional: true + lightningcss-linux-x64-musl@1.30.1: + optional: true + lightningcss-win32-arm64-msvc@1.29.3: optional: true + lightningcss-win32-arm64-msvc@1.30.1: + optional: true + lightningcss-win32-x64-msvc@1.29.3: optional: true + lightningcss-win32-x64-msvc@1.30.1: + optional: true + lightningcss@1.29.3: dependencies: detect-libc: 2.0.3 @@ -17648,6 +19654,21 @@ snapshots: lightningcss-win32-arm64-msvc: 1.29.3 lightningcss-win32-x64-msvc: 1.29.3 + lightningcss@1.30.1: + dependencies: + detect-libc: 2.0.3 + optionalDependencies: + lightningcss-darwin-arm64: 1.30.1 + lightningcss-darwin-x64: 1.30.1 + lightningcss-freebsd-x64: 1.30.1 + lightningcss-linux-arm-gnueabihf: 1.30.1 + lightningcss-linux-arm64-gnu: 1.30.1 + lightningcss-linux-arm64-musl: 1.30.1 + lightningcss-linux-x64-gnu: 1.30.1 + lightningcss-linux-x64-musl: 1.30.1 + lightningcss-win32-arm64-msvc: 1.30.1 + lightningcss-win32-x64-msvc: 1.30.1 + lilconfig@2.1.0: {} lilconfig@3.1.1: {} @@ -18134,8 +20155,8 @@ snapshots: micromark-extension-mdxjs@3.0.0: dependencies: - acorn: 8.14.0 - acorn-jsx: 5.3.2(acorn@8.14.0) + acorn: 8.14.1 + acorn-jsx: 5.3.2(acorn@8.14.1) micromark-extension-mdx-expression: 3.0.0 micromark-extension-mdx-jsx: 3.0.0 micromark-extension-mdx-md: 2.0.0 @@ -18518,14 +20539,14 @@ snapshots: mlly@1.6.1: dependencies: - acorn: 8.14.0 + acorn: 8.14.1 pathe: 1.1.2 pkg-types: 1.0.3 ufo: 1.5.4 mlly@1.7.4: dependencies: - acorn: 8.14.0 + acorn: 8.14.1 pathe: 2.0.3 pkg-types: 1.3.1 ufo: 1.5.4 @@ -18890,6 +20911,27 @@ snapshots: - typescript - uncss + parcel@2.15.0: + dependencies: + '@parcel/config-default': 2.15.0(@parcel/core@2.15.0) + '@parcel/core': 2.15.0 + '@parcel/diagnostic': 2.15.0 + '@parcel/events': 2.15.0 + '@parcel/feature-flags': 2.15.0 + '@parcel/fs': 2.15.0(@parcel/core@2.15.0) + '@parcel/logger': 2.15.0 + '@parcel/package-manager': 2.15.0(@parcel/core@2.15.0) + '@parcel/reporter-cli': 2.15.0(@parcel/core@2.15.0) + '@parcel/reporter-dev-server': 2.15.0(@parcel/core@2.15.0) + '@parcel/reporter-tracer': 2.15.0(@parcel/core@2.15.0) + '@parcel/utils': 2.15.0 + chalk: 4.1.2 + commander: 12.1.0 + get-port: 4.2.0 + transitivePeerDependencies: + - '@swc/helpers' + - napi-wasm + parent-module@1.0.1: dependencies: callsites: 3.1.0 @@ -19246,6 +21288,8 @@ snapshots: react-refresh@0.14.2: {} + react-refresh@0.16.0: {} + react-server-dom-parcel@19.1.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0): dependencies: react: 19.1.0 @@ -19612,6 +21656,8 @@ snapshots: rsc-html-stream@0.0.4: {} + rsc-html-stream@0.0.6: {} + run-parallel@1.2.0: dependencies: queue-microtask: 1.2.3 @@ -20273,7 +22319,7 @@ snapshots: tsscmp@1.0.6: {} - tsup@8.3.0(@swc/core@1.11.18(@swc/helpers@0.5.15))(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0): + tsup@8.3.0(@swc/core@1.11.24)(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0): dependencies: bundle-require: 5.0.0(esbuild@0.23.1) cac: 6.7.14 @@ -20292,7 +22338,7 @@ snapshots: tinyglobby: 0.2.9 tree-kill: 1.2.2 optionalDependencies: - '@swc/core': 1.11.18(@swc/helpers@0.5.15) + '@swc/core': 1.11.24 postcss: 8.5.3 typescript: 5.4.5 transitivePeerDependencies: @@ -20548,7 +22594,7 @@ snapshots: unplugin@1.10.1: dependencies: - acorn: 8.14.0 + acorn: 8.14.1 chokidar: 3.6.0 webpack-sources: 3.2.3 webpack-virtual-modules: 0.6.2 @@ -20565,6 +22611,12 @@ snapshots: escalade: 3.2.0 picocolors: 1.1.1 + update-browserslist-db@1.1.3(browserslist@4.24.5): + dependencies: + browserslist: 4.24.5 + escalade: 3.2.0 + picocolors: 1.1.1 + uri-js@4.4.1: dependencies: punycode: 2.3.0 @@ -20669,20 +22721,7 @@ snapshots: transitivePeerDependencies: - supports-color - vite-env-only@3.0.1(vite@5.1.3(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0)): - dependencies: - '@babel/core': 7.24.3 - '@babel/generator': 7.24.1 - '@babel/parser': 7.24.1 - '@babel/traverse': 7.24.1 - '@babel/types': 7.24.0 - babel-dead-code-elimination: 1.0.6 - micromatch: 4.0.5 - vite: 5.1.3(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0) - transitivePeerDependencies: - - supports-color - - vite-env-only@3.0.1(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)): + vite-env-only@3.0.1(vite@5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0)): dependencies: '@babel/core': 7.24.3 '@babel/generator': 7.24.1 @@ -20691,11 +22730,11 @@ snapshots: '@babel/types': 7.24.0 babel-dead-code-elimination: 1.0.6 micromatch: 4.0.5 - vite: 6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + vite: 5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0) transitivePeerDependencies: - supports-color - vite-env-only@3.0.1(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)): + vite-env-only@3.0.1(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)): dependencies: '@babel/core': 7.24.3 '@babel/generator': 7.24.1 @@ -20704,17 +22743,17 @@ snapshots: '@babel/types': 7.24.0 babel-dead-code-elimination: 1.0.6 micromatch: 4.0.5 - vite: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + vite: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) transitivePeerDependencies: - supports-color - vite-node@1.6.0(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0): + vite-node@1.6.0(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0): dependencies: cac: 6.7.14 debug: 4.4.0 pathe: 1.1.2 picocolors: 1.1.1 - vite: 5.1.3(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0) + vite: 5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0) transitivePeerDependencies: - '@types/node' - less @@ -20725,13 +22764,13 @@ snapshots: - supports-color - terser - vite-node@3.0.0-beta.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0): + vite-node@3.0.0-beta.2(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0): dependencies: cac: 6.7.14 debug: 4.4.0 es-module-lexer: 1.5.4 pathe: 1.1.2 - vite: 6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + vite: 6.2.5(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) transitivePeerDependencies: - '@types/node' - jiti @@ -20768,51 +22807,51 @@ snapshots: - supports-color - typescript - vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@5.1.3(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0)): + vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0)): dependencies: debug: 4.3.7 globrex: 0.1.2 tsconfck: 3.0.3(typescript@5.4.5) optionalDependencies: - vite: 5.1.3(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0) + vite: 5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0) transitivePeerDependencies: - supports-color - typescript - vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)): + vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)): dependencies: debug: 4.3.7 globrex: 0.1.2 tsconfck: 3.0.3(typescript@5.4.5) optionalDependencies: - vite: 6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + vite: 6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) transitivePeerDependencies: - supports-color - typescript - vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)): + vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)): dependencies: debug: 4.3.7 globrex: 0.1.2 tsconfck: 3.0.3(typescript@5.4.5) optionalDependencies: - vite: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + vite: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) transitivePeerDependencies: - supports-color - typescript - vite-tsconfig-paths@5.1.4(typescript@5.4.5)(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0)): + vite-tsconfig-paths@5.1.4(typescript@5.4.5)(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)): dependencies: debug: 4.4.0 globrex: 0.1.2 tsconfck: 3.0.3(typescript@5.4.5) optionalDependencies: - vite: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0) + vite: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) transitivePeerDependencies: - supports-color - typescript - vite@5.1.3(@types/node@22.14.0)(lightningcss@1.29.3)(terser@5.15.0): + vite@5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0): dependencies: esbuild: 0.19.12 postcss: 8.4.49 @@ -20820,10 +22859,10 @@ snapshots: optionalDependencies: '@types/node': 22.14.0 fsevents: 2.3.3 - lightningcss: 1.29.3 + lightningcss: 1.30.1 terser: 5.15.0 - vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0): + vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0): dependencies: esbuild: 0.24.2 postcss: 8.5.3 @@ -20832,11 +22871,11 @@ snapshots: '@types/node': 20.11.30 fsevents: 2.3.3 jiti: 1.21.0 - lightningcss: 1.29.3 + lightningcss: 1.30.1 tsx: 4.19.3 yaml: 2.6.0 - vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0): + vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0): dependencies: esbuild: 0.24.2 postcss: 8.5.3 @@ -20845,11 +22884,24 @@ snapshots: '@types/node': 22.14.0 fsevents: 2.3.3 jiti: 1.21.0 - lightningcss: 1.29.3 + lightningcss: 1.30.1 + tsx: 4.19.3 + yaml: 2.6.0 + + vite@6.2.5(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0): + dependencies: + esbuild: 0.25.0 + postcss: 8.5.3 + rollup: 4.34.8 + optionalDependencies: + '@types/node': 20.11.30 + fsevents: 2.3.3 + jiti: 1.21.0 + lightningcss: 1.30.1 tsx: 4.19.3 yaml: 2.6.0 - vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.29.3)(tsx@4.19.3)(yaml@2.6.0): + vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0): dependencies: esbuild: 0.25.0 postcss: 8.5.3 @@ -20858,7 +22910,7 @@ snapshots: '@types/node': 22.14.0 fsevents: 2.3.3 jiti: 1.21.0 - lightningcss: 1.29.3 + lightningcss: 1.30.1 tsx: 4.19.3 yaml: 2.6.0 From d9933d7949ac9fa6a9310cf60b565b3bc396a421 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Thu, 15 May 2025 17:26:33 -0400 Subject: [PATCH 107/143] Remove no-optimize flag --- integration/helpers/rsc-parcel/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration/helpers/rsc-parcel/package.json b/integration/helpers/rsc-parcel/package.json index 78b5ebcf98..b320e6271a 100644 --- a/integration/helpers/rsc-parcel/package.json +++ b/integration/helpers/rsc-parcel/package.json @@ -13,7 +13,7 @@ }, "scripts": { "dev": "parcel --no-cache", - "build": "parcel build --no-cache --no-optimize", + "build": "parcel build --no-cache", "start": "node dist/server.js" }, "devDependencies": { From 54b66328c383a1c6b146dbb11869a3e30ec30511 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Fri, 16 May 2025 10:01:50 -0400 Subject: [PATCH 108/143] Revert "PAss context provider to server components as a prop" This reverts commit d1966d4d09ac6e7e3d04da96730ac6a7926d540b. --- packages/react-router/lib/rsc/server.rsc.ts | 20 +++++--------------- playground/rsc-vite/src/routes/root/root.tsx | 14 ++------------ 2 files changed, 7 insertions(+), 27 deletions(-) diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index 67076d61c9..e36296c009 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -320,7 +320,7 @@ async function generateRenderResponse( ...(routeIdsToLoad ? { filterMatchesToLoad: (m) => routeIdsToLoad!.includes(m.route.id) } : null), - async unstable_stream(contextProvider, query) { + async unstable_stream(_, query) { // If this is an RSC server action, process that and then call query as a // revalidation. If this is a RR Form/Fetcher submission, // `processServerAction` will fall through as a no-op and we'll pass the @@ -355,8 +355,7 @@ async function generateRenderResponse( isDataRequest, isSubmission, actionResult, - staticContext, - contextProvider + staticContext ); }, }); @@ -399,8 +398,7 @@ async function generateStaticContextResponse( isDataRequest: boolean, isSubmission: boolean, actionResult: Promise | undefined, - staticContext: StaticHandlerContext, - contextProvider: unstable_RouterContextProvider + staticContext: StaticHandlerContext ): Promise { statusCode = staticContext.statusCode ?? statusCode; @@ -447,8 +445,7 @@ async function generateStaticContextResponse( routes, routeIdsToLoad, isDataRequest, - staticContext, - contextProvider + staticContext ); let payload: ServerRenderPayload | ServerActionPayload; @@ -485,8 +482,7 @@ async function getRenderPayload( routes: ServerRouteObject[], routeIdsToLoad: string[] | null, isDataRequest: boolean, - staticContext: StaticHandlerContext, - contextProvider: unstable_RouterContextProvider + staticContext: StaticHandlerContext ) { // Figure out how deep we want to render server components based on any // triggered error boundaries and/or `routeIdsToLoad` @@ -521,7 +517,6 @@ async function getRenderPayload( return getServerRouteMatch( staticContext, - contextProvider, match, shouldRenderComponent, parentIds[match.route.id] @@ -548,7 +543,6 @@ async function getRenderPayload( async function getServerRouteMatch( staticContext: StaticHandlerContext, - contextProvider: unstable_RouterContextProvider, match: AgnosticDataRouteMatch, shouldRenderComponent: boolean, parentId: string | undefined @@ -578,10 +572,6 @@ async function getServerRouteMatch( Layout, null, React.createElement(Component, { - // Pass context to server components so it can be used for data loading - ...(Component.$$typeof === Symbol.for("react.client.reference") - ? {} - : { context: contextProvider }), loaderData, actionData, params, diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx index 97f5bd1b61..c0f0844882 100644 --- a/playground/rsc-vite/src/routes/root/root.tsx +++ b/playground/rsc-vite/src/routes/root/root.tsx @@ -1,9 +1,5 @@ import { Link, Links, Outlet, ScrollRestoration } from "react-router"; -import { - type unstable_MiddlewareFunction, - type unstable_RouterContextProvider, - unstable_createContext, -} from "react-router/rsc"; +import { type unstable_MiddlewareFunction } from "react-router/rsc"; import { Counter } from "../../counter"; import { ErrorReporter, NavigationState } from "./root.client"; @@ -14,12 +10,9 @@ export function headers() { return new Headers({ "x-root": "yes" }); } -let stringContext = unstable_createContext(); - export const unstable_middleware: unstable_MiddlewareFunction[] = [ - async ({ request, context }, next) => { + async ({ request }, next) => { console.log(">>> RSC middleware", request.url); - context.set(stringContext, "Value from middleware"); let res = await next(); console.log("<<< RSC middleware", request.url); return res; @@ -35,16 +28,13 @@ export async function loader() { } export default function Root({ - context, loaderData, }: { - context: unstable_RouterContextProvider; loaderData: Awaited>; }) { return (

Root Route

-

Context value: {context.get(stringContext)}

Loader data: {loaderData.message}

{loaderData.counter} From c3736858d12c1d2fcdba4fd8215a332cd74f1626 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Mon, 19 May 2025 17:22:06 -0400 Subject: [PATCH 109/143] Remove unused imports --- packages/react-router/lib/components.tsx | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/react-router/lib/components.tsx b/packages/react-router/lib/components.tsx index 3f790d4bfd..bff2152268 100644 --- a/packages/react-router/lib/components.tsx +++ b/packages/react-router/lib/components.tsx @@ -53,16 +53,11 @@ import { } from "./context"; import { _renderMatches, - useActionData, useAsyncValue, useInRouterContext, - useLoaderData, useLocation, - useMatches, useNavigate, useOutlet, - useParams, - useRouteError, useRoutes, useRoutesImpl, } from "./hooks"; From 87677d2c7331867e91817a1f6d2702d3b2b5eb93 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Tue, 20 May 2025 11:39:24 -0400 Subject: [PATCH 110/143] Fix merge conflicts --- integration/rsc/rsc-test.ts | 2 +- packages/react-router/lib/rsc/server.rsc.ts | 5 ++--- packages/react-router/lib/server-runtime/headers.ts | 2 +- packages/react-router/lib/server-runtime/server.ts | 5 +---- .../react-router/lib/server-runtime/single-fetch.ts | 10 ++-------- 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/integration/rsc/rsc-test.ts b/integration/rsc/rsc-test.ts index 20b697f583..f5824773f3 100644 --- a/integration/rsc/rsc-test.ts +++ b/integration/rsc/rsc-test.ts @@ -61,7 +61,7 @@ async function setupRscTest({ console.error("Error building project", { status, stdout: stdout.toString(), - stderr: stderr.toString, + stderr: stderr.toString(), }); throw new Error("Error building project"); } diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index e36296c009..2956d89d65 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -21,12 +21,11 @@ import { type LoaderFunction, type Params, type ShouldRevalidateFunction, - type unstable_RouterContextProvider, isRouteErrorResponse, matchRoutes, convertRouteMatchToUiMatch, } from "../router/utils"; -import { getDocumentHeaders } from "../server-runtime/headers"; +import { getDocumentHeadersImpl } from "../server-runtime/headers"; import type { RouteMatch } from "../context"; import invariant from "../server-runtime/invariant"; @@ -426,7 +425,7 @@ async function generateStaticContextResponse( } }); - let headers = getDocumentHeaders( + let headers = getDocumentHeadersImpl( staticContext, (match) => (match as RouteMatch).route.headers ); diff --git a/packages/react-router/lib/server-runtime/headers.ts b/packages/react-router/lib/server-runtime/headers.ts index a87cb9d549..7c727f1f5a 100644 --- a/packages/react-router/lib/server-runtime/headers.ts +++ b/packages/react-router/lib/server-runtime/headers.ts @@ -18,7 +18,7 @@ export function getDocumentHeaders( }); } -function getDocumentHeadersImpl( +export function getDocumentHeadersImpl( context: StaticHandlerContext, getRouteHeadersFn: (match: DataRouteMatch) => ServerRouteModule["headers"] ): Headers { diff --git a/packages/react-router/lib/server-runtime/server.ts b/packages/react-router/lib/server-runtime/server.ts index cbfb0eb3ab..17c1cfb8ea 100644 --- a/packages/react-router/lib/server-runtime/server.ts +++ b/packages/react-router/lib/server-runtime/server.ts @@ -461,10 +461,7 @@ async function handleDocumentRequest( return context; } - let headers = getDocumentHeaders( - context, - (m) => build.routes[m.route.id]?.module.headers - ); + let headers = getDocumentHeaders(context, build); // Skip response body for unsupported status codes if (SERVER_NO_BODY_STATUS_CODES.has(context.statusCode)) { diff --git a/packages/react-router/lib/server-runtime/single-fetch.ts b/packages/react-router/lib/server-runtime/single-fetch.ts index 3d263fc224..ef3e6d5b22 100644 --- a/packages/react-router/lib/server-runtime/single-fetch.ts +++ b/packages/react-router/lib/server-runtime/single-fetch.ts @@ -55,10 +55,7 @@ export async function singleFetchAction( }); function respond(context: StaticHandlerContext) { - let headers = getDocumentHeaders( - context, - (m) => build.routes[m.route.id]?.module.headers - ); + let headers = getDocumentHeaders(context, build); if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) { return generateSingleFetchResponse(request, build, serverMode, { @@ -157,10 +154,7 @@ export async function singleFetchLoaders( let loadRouteIds = routesParam ? new Set(routesParam.split(",")) : null; function respond(context: StaticHandlerContext) { - let headers = getDocumentHeaders( - context, - (m) => build.routes[m.route.id]?.module.headers - ); + let headers = getDocumentHeaders(context, build); if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) { return generateSingleFetchResponse(request, build, serverMode, { From d9c565adba8f9866249d421b34928fb1ba9e4742 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Tue, 20 May 2025 12:46:56 -0400 Subject: [PATCH 111/143] Revert "Remove hashes on built filenames (#13567)" This reverts commit a1054455353fe6c0a27653c4e95abcaafc639d18. --- .changeset/small-rocks-grab.md | 5 -- integration/prefetch-test.ts | 10 +-- packages/react-router/index.ts | 2 +- packages/react-router/internal-export.ts | 16 ---- packages/react-router/lib/dom/lib.tsx | 2 +- .../react-router/lib/dom/ssr/routeModules.ts | 2 +- packages/react-router/lib/hooks.tsx | 2 +- .../lib/types/internal-export/params.ts | 7 -- packages/react-router/lib/types/internal.ts | 13 +++ packages/react-router/lib/types/params.ts | 6 ++ .../types/{internal-export => }/route-data.ts | 10 +-- .../route-module-annotations.ts | 15 ++-- .../{internal-export => }/route-module.ts | 2 +- packages/react-router/package.json | 6 +- packages/react-router/tsup.config.ts | 82 ++++++++++--------- 15 files changed, 87 insertions(+), 93 deletions(-) delete mode 100644 .changeset/small-rocks-grab.md delete mode 100644 packages/react-router/internal-export.ts delete mode 100644 packages/react-router/lib/types/internal-export/params.ts create mode 100644 packages/react-router/lib/types/internal.ts create mode 100644 packages/react-router/lib/types/params.ts rename packages/react-router/lib/types/{internal-export => }/route-data.ts (96%) rename packages/react-router/lib/types/{internal-export => }/route-module-annotations.ts (96%) rename packages/react-router/lib/types/{internal-export => }/route-module.ts (88%) diff --git a/.changeset/small-rocks-grab.md b/.changeset/small-rocks-grab.md deleted file mode 100644 index a205662970..0000000000 --- a/.changeset/small-rocks-grab.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"react-router": patch ---- - -Remove hashes from files in `dist/` for easier usage with `patch-package` diff --git a/integration/prefetch-test.ts b/integration/prefetch-test.ts index 6b768de1f3..3bc49e6d71 100644 --- a/integration/prefetch-test.ts +++ b/integration/prefetch-test.ts @@ -172,7 +172,7 @@ test.describe("prefetch", () => { await page.waitForSelector( // Look for either Rollup or Rolldown chunks [ - "link[rel='modulepreload'][href^='/assets/index-']", + "link[rel='modulepreload'][href^='/assets/chunk-']", "link[rel='modulepreload'][href^='/assets/jsx-runtime-']", ].join(","), { state: "attached" } @@ -232,7 +232,7 @@ test.describe("prefetch", () => { await page.waitForSelector( // Look for either Rollup or Rolldown chunks [ - "link[rel='modulepreload'][href^='/assets/index-']", + "link[rel='modulepreload'][href^='/assets/chunk-']", "link[rel='modulepreload'][href^='/assets/jsx-runtime-']", ].join(","), { state: "attached" } @@ -251,7 +251,7 @@ test.describe("prefetch", () => { await page.waitForSelector( // Look for either Rollup or Rolldown chunks [ - "link[rel='modulepreload'][href^='/assets/index-']", + "link[rel='modulepreload'][href^='/assets/chunk-']", "link[rel='modulepreload'][href^='/assets/jsx-runtime-']", ].join(","), { state: "attached" } @@ -341,7 +341,7 @@ test.describe("prefetch", () => { await page.waitForSelector( // Look for either Rollup or Rolldown chunks [ - "link[rel='modulepreload'][href^='/assets/index-']", + "link[rel='modulepreload'][href^='/assets/chunk-']", "link[rel='modulepreload'][href^='/assets/jsx-runtime-']", ].join(","), { state: "attached" } @@ -360,7 +360,7 @@ test.describe("prefetch", () => { await page.waitForSelector( // Look for either Rollup or Rolldown chunks [ - "link[rel='modulepreload'][href^='/assets/index-']", + "link[rel='modulepreload'][href^='/assets/chunk-']", "link[rel='modulepreload'][href^='/assets/jsx-runtime-']", ].join(","), { state: "attached" } diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts index a6a751c16b..17bc0ffd75 100644 --- a/packages/react-router/index.ts +++ b/packages/react-router/index.ts @@ -279,7 +279,7 @@ export type { MiddlewareEnabled as UNSAFE_MiddlewareEnabled, } from "./lib/types/future.ts"; export type { unstable_SerializesTo } from "./lib/types/serializes-to.ts"; -export type { Register, Pages, RouteFiles } from "./lib/types/register"; +export type { Register } from "./lib/types/register"; export { href } from "./lib/href"; // RSC diff --git a/packages/react-router/internal-export.ts b/packages/react-router/internal-export.ts deleted file mode 100644 index a28e5de3fa..0000000000 --- a/packages/react-router/internal-export.ts +++ /dev/null @@ -1,16 +0,0 @@ -import type { RouteFiles } from "react-router"; -import type { - GetLoaderData, - GetActionData, -} from "./lib/types/internal-export/route-data"; -import type { RouteModule } from "./lib/types/internal-export/route-module"; -import type { Params } from "./lib/types/internal-export/params"; - -export type { GetAnnotations } from "./lib/types/internal-export/route-module-annotations"; - -export type GetInfo = - { - params: Params; - loaderData: GetLoaderData; - actionData: GetActionData; - }; diff --git a/packages/react-router/lib/dom/lib.tsx b/packages/react-router/lib/dom/lib.tsx index 4dfe87c912..e280d79691 100644 --- a/packages/react-router/lib/dom/lib.tsx +++ b/packages/react-router/lib/dom/lib.tsx @@ -94,7 +94,7 @@ import { useResolvedPath, useRouteId, } from "../hooks"; -import type { SerializeFrom } from "../types/internal-export/route-data"; +import type { SerializeFrom } from "../types/route-data"; //////////////////////////////////////////////////////////////////////////////// //#region Global Stuff diff --git a/packages/react-router/lib/dom/ssr/routeModules.ts b/packages/react-router/lib/dom/ssr/routeModules.ts index 156e5cd56e..3239ca6c0c 100644 --- a/packages/react-router/lib/dom/ssr/routeModules.ts +++ b/packages/react-router/lib/dom/ssr/routeModules.ts @@ -13,7 +13,7 @@ import type { import type { EntryRoute } from "./routes"; import type { DataRouteMatch } from "../../context"; import type { LinkDescriptor } from "../../router/links"; -import type { SerializeFrom } from "../../types/internal-export/route-data"; +import type { SerializeFrom } from "../../types/route-data"; export interface RouteModules { [routeId: string]: RouteModule | undefined; diff --git a/packages/react-router/lib/hooks.tsx b/packages/react-router/lib/hooks.tsx index 11e73a6b93..2b0953d73b 100644 --- a/packages/react-router/lib/hooks.tsx +++ b/packages/react-router/lib/hooks.tsx @@ -49,7 +49,7 @@ import { resolveTo, stripBasename, } from "./router/utils"; -import type { SerializeFrom } from "./types/internal-export/route-data"; +import type { SerializeFrom } from "./types/route-data"; /** Resolves a URL against the current location. diff --git a/packages/react-router/lib/types/internal-export/params.ts b/packages/react-router/lib/types/internal-export/params.ts deleted file mode 100644 index 0dc593db55..0000000000 --- a/packages/react-router/lib/types/internal-export/params.ts +++ /dev/null @@ -1,7 +0,0 @@ -// Import this from the react-router public API to avoid duplicates in dist/ -import type { Pages, RouteFiles } from "react-router"; -import type { Normalize } from "../utils"; - -export type Params = Normalize< - Pages[RouteFiles[RouteFile]["page"]]["params"] ->; diff --git a/packages/react-router/lib/types/internal.ts b/packages/react-router/lib/types/internal.ts new file mode 100644 index 0000000000..87e1104b05 --- /dev/null +++ b/packages/react-router/lib/types/internal.ts @@ -0,0 +1,13 @@ +export type { GetAnnotations } from "./route-module-annotations"; + +import type { Params } from "./params"; +import type { RouteFiles } from "./register"; +import type { GetLoaderData, GetActionData } from "./route-data"; +import type { RouteModule } from "./route-module.ts"; + +export type GetInfo = + { + params: Params; + loaderData: GetLoaderData; + actionData: GetActionData; + }; diff --git a/packages/react-router/lib/types/params.ts b/packages/react-router/lib/types/params.ts new file mode 100644 index 0000000000..9cd1e98a51 --- /dev/null +++ b/packages/react-router/lib/types/params.ts @@ -0,0 +1,6 @@ +import type { Pages, RouteFiles } from "./register"; +import type { Normalize } from "./utils"; + +export type Params = Normalize< + Pages[RouteFiles[RouteFile]["page"]]["params"] +>; diff --git a/packages/react-router/lib/types/internal-export/route-data.ts b/packages/react-router/lib/types/route-data.ts similarity index 96% rename from packages/react-router/lib/types/internal-export/route-data.ts rename to packages/react-router/lib/types/route-data.ts index c0a2fb6857..c60e376939 100644 --- a/packages/react-router/lib/types/internal-export/route-data.ts +++ b/packages/react-router/lib/types/route-data.ts @@ -1,12 +1,12 @@ import type { ClientLoaderFunctionArgs, ClientActionFunctionArgs, -} from "../../dom/ssr/routeModules"; -import type { DataWithResponseInit } from "../../router/utils"; -import type { Serializable } from "../../server-runtime/single-fetch"; -import type { unstable_SerializesTo } from "../serializes-to"; -import type { Equal, Expect, Func, IsAny, Pretty } from "../utils"; +} from "../dom/ssr/routeModules"; +import type { DataWithResponseInit } from "../router/utils"; +import type { Serializable } from "../server-runtime/single-fetch"; import type { RouteModule } from "./route-module"; +import type { unstable_SerializesTo } from "./serializes-to"; +import type { Equal, Expect, Func, IsAny, Pretty } from "./utils"; // prettier-ignore type Serialize = diff --git a/packages/react-router/lib/types/internal-export/route-module-annotations.ts b/packages/react-router/lib/types/route-module-annotations.ts similarity index 96% rename from packages/react-router/lib/types/internal-export/route-module-annotations.ts rename to packages/react-router/lib/types/route-module-annotations.ts index 13a3344c4d..191ff35d16 100644 --- a/packages/react-router/lib/types/internal-export/route-module-annotations.ts +++ b/packages/react-router/lib/types/route-module-annotations.ts @@ -1,15 +1,16 @@ -import type { MetaDescriptor } from "../../dom/ssr/routeModules"; -import type { Location } from "../../router/history"; -import type { LinkDescriptor } from "../../router/links"; +import type { MetaDescriptor } from "../dom/ssr/routeModules"; +import type { Location } from "../router/history"; +import type { LinkDescriptor } from "../router/links"; import type { unstable_MiddlewareNextFunction, unstable_RouterContextProvider, -} from "../../router/utils"; -import type { AppLoadContext } from "../../server-runtime/data"; -import type { MiddlewareEnabled } from "../future"; -import type { Pretty } from "../utils"; +} from "../router/utils"; +import type { AppLoadContext } from "../server-runtime/data"; +import type { MiddlewareEnabled } from "./future"; + import type { GetLoaderData, ServerDataFrom } from "./route-data"; import type { RouteModule } from "./route-module"; +import type { Pretty } from "./utils"; type MaybePromise = T | Promise; diff --git a/packages/react-router/lib/types/internal-export/route-module.ts b/packages/react-router/lib/types/route-module.ts similarity index 88% rename from packages/react-router/lib/types/internal-export/route-module.ts rename to packages/react-router/lib/types/route-module.ts index 29c8224785..f2c4b1e35c 100644 --- a/packages/react-router/lib/types/internal-export/route-module.ts +++ b/packages/react-router/lib/types/route-module.ts @@ -1,4 +1,4 @@ -import type { Func } from "../utils"; +import type { Func } from "./utils"; export type RouteModule = { meta?: Func; diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 7fda80ef31..ef559006f7 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -44,13 +44,13 @@ }, "./internal": { "node": { - "types": "./dist/development/internal-export.d.ts" + "types": "./dist/development/lib/types/internal.d.ts" }, "import": { - "types": "./dist/development/internal-export.d.mts" + "types": "./dist/development/lib/types/internal.d.mts" }, "default": { - "types": "./dist/development/internal-export.d.ts" + "types": "./dist/development/lib/types/index.d.ts" } }, "./dom": { diff --git a/packages/react-router/tsup.config.ts b/packages/react-router/tsup.config.ts index a25155df95..3bad9ef564 100644 --- a/packages/react-router/tsup.config.ts +++ b/packages/react-router/tsup.config.ts @@ -1,51 +1,53 @@ -import { type Options, defineConfig } from "tsup"; +import { defineConfig } from "tsup"; // @ts-ignore - out of scope import { createBanner } from "../../build.utils.js"; import pkg from "./package.json"; -const config = (entry: string, enableDevWarnings: boolean): Options[] => [ - { - clean: false, - entry: [entry], - format: ["cjs"], - // Don't bundle `react-router` in sub-exports (i.e., `react-router/dom`) - external: ["react-router"], - outDir: enableDevWarnings ? "dist/development" : "dist/production", - dts: true, - banner: { - js: createBanner(pkg.name, pkg.version), - }, - define: { - "import.meta.hot": "undefined", - REACT_ROUTER_VERSION: JSON.stringify(pkg.version), - __DEV__: JSON.stringify(enableDevWarnings), - }, - }, - { - clean: false, - entry: [entry], - format: ["esm"], - // Don't bundle `react-router` in sub-exports (i.e., `react-router/dom`) - external: ["react-router"], - outDir: enableDevWarnings ? "dist/development" : "dist/production", - dts: true, - banner: { - js: createBanner(pkg.name, pkg.version), +const entry = ["index.ts", "dom-export.ts", "lib/types/internal.ts"]; + +const config = (enableDevWarnings: boolean) => + defineConfig([ + { + clean: false, + entry, + format: ["cjs"], + // Don't bundle `react-router` in sub-exports (i.e., `react-router/dom`) + external: ["react-router"], + outDir: enableDevWarnings ? "dist/development" : "dist/production", + dts: true, + banner: { + js: createBanner(pkg.name, pkg.version), + }, + define: { + "import.meta.hot": "undefined", + REACT_ROUTER_VERSION: JSON.stringify(pkg.version), + __DEV__: JSON.stringify(enableDevWarnings), + }, }, - define: { - REACT_ROUTER_VERSION: JSON.stringify(pkg.version), - __DEV__: JSON.stringify(enableDevWarnings), + { + clean: false, + entry, + format: ["esm"], + // We don't do the external thing for `react-router` here because it + // doesn't get bundled by default in the ESM build, and when we tried it + // in https://github.com/remix-run/react-router/pull/13497 it changed up + // some chunk creation that we didn't want to risk having any side effects + outDir: enableDevWarnings ? "dist/development" : "dist/production", + dts: true, + banner: { + js: createBanner(pkg.name, pkg.version), + }, + define: { + REACT_ROUTER_VERSION: JSON.stringify(pkg.version), + __DEV__: JSON.stringify(enableDevWarnings), + }, }, - }, -]; + ]); export default defineConfig([ - ...config("index.ts", false), - ...config("index.ts", true), - ...config("dom-export.ts", false), - ...config("dom-export.ts", true), - ...config("internal-export.ts", false), - ...config("internal-export.ts", true), + // @ts-expect-error + ...config(false), + ...config(true), ]); From d4ac45f172a6eb847844f43cb5b3d43c2f7a898e Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Fri, 16 May 2025 16:06:25 -0400 Subject: [PATCH 112/143] RSC E2E tests --- integration/rsc/rsc-test.ts | 511 +++++++++++++++++++- packages/react-router/lib/rsc/server.rsc.ts | 12 +- 2 files changed, 505 insertions(+), 18 deletions(-) diff --git a/integration/rsc/rsc-test.ts b/integration/rsc/rsc-test.ts index f5824773f3..6743ba70a3 100644 --- a/integration/rsc/rsc-test.ts +++ b/integration/rsc/rsc-test.ts @@ -2,15 +2,23 @@ import { spawnSync } from "node:child_process"; import { test, expect } from "@playwright/test"; import getPort from "get-port"; -import { TemplateName, createDev, createProject } from "../helpers/vite.js"; +import { + type TemplateName, + createDev, + createProject, +} from "../helpers/vite.js"; const js = String.raw; type Implementation = { name: string; template: TemplateName; + /** Build a production app */ build: ({ cwd }: { cwd: string }) => ReturnType; + /** Run a production app */ run: ({ cwd, port }: { cwd: string; port: number }) => Promise<() => void>; + /** Run the dev server */ + dev: ({ cwd, port }: { cwd: string; port: number }) => Promise<() => void>; }; // Run tests against vite and parcel to ensure our code is bundler agnostic @@ -20,20 +28,27 @@ const implementations: Implementation[] = [ template: "rsc-vite", build: ({ cwd }: { cwd: string }) => spawnSync("node_modules/.bin/vite", ["build"], { cwd }), - run: ({ cwd, port }: { cwd: string; port: number }) => + run: ({ cwd, port }) => createDev(["server.js", "-p", String(port)])({ cwd, port, }), + dev: ({ cwd, port }) => + createDev(["node_modules/vite/bin/vite.js", "--port", String(port)])({ + cwd, + port, + }), }, { name: "parcel", template: "rsc-parcel", build: ({ cwd }: { cwd: string }) => spawnSync("node_modules/.bin/parcel", ["build"], { cwd }), - run: ({ cwd, port }: { cwd: string; port: number }) => + run: ({ cwd, port }) => // FIXME: Parcel prod builds seems to have dup copies of react in them :/ // Not reproducible in the playground though - only in integration/helpers... + implementations.find((i) => i.name === "parcel")!.dev({ cwd, port }), + dev: ({ cwd, port }) => createDev(["node_modules/parcel/lib/bin.js"])({ // Since we run through parcels dev server we can't use `-p` because that // only changes the dev server and doesn't pass through to the internal @@ -48,10 +63,12 @@ const implementations: Implementation[] = [ async function setupRscTest({ implementation, port, + dev, files, }: { implementation: Implementation; port: number; + dev?: boolean; files: Record; }) { let cwd = await createProject(files, implementation.template); @@ -65,20 +82,24 @@ async function setupRscTest({ }); throw new Error("Error building project"); } - let stop = await implementation.run({ cwd, port }); - return stop; + return dev + ? implementation.dev({ cwd, port }) + : implementation.run({ cwd, port }); } -test.describe("RSC", () => { - implementations.forEach((implementation) => { - let stop: () => void; +const validateRSCHtml = (html: string) => + expect(html).toMatch(/\(self\.__FLIGHT_DATA\|\|=\[\]\)\.push\(/); - test.afterEach(() => { - stop?.(); - }); +implementations.forEach((implementation) => { + let stop: () => void; + + test.afterEach(() => { + stop?.(); + }); - test.describe(implementation.name, () => { - test.only("Renders a page using server components", async ({ page }) => { + test.describe(`RSC (${implementation.name})`, () => { + test.describe("Basic functionality", () => { + test("Renders a page using server components", async ({ page }) => { let port = await getPort(); stop = await setupRscTest({ implementation, @@ -96,14 +117,472 @@ test.describe("RSC", () => { }); await page.goto(`http://localhost:${port}/`); - await page.waitForSelector("[data-home]", { timeout: 5000 }); + await page.waitForSelector("[data-home]"); expect(await page.locator("[data-home]").textContent()).toBe( "Home: Loader Data" ); + // Ensure this is actually using RSC lol - expect(await page.content()).toMatch( - /\(self\.__FLIGHT_DATA\|\|=\[\]\)\.push\(/ + validateRSCHtml(await page.content()); + }); + + test("Works with client components using 'use client'", async ({ + page, + }) => { + let port = await getPort(); + stop = await setupRscTest({ + implementation, + port, + files: { + "src/routes/home.tsx": js` + import { ClientCounter } from "./home.client"; + + export function loader() { + return { message: "Loader Data" }; + } + + export default function ServerComponent({ loaderData }) { + return ( +
+

Home: {loaderData.message}

+ +
+ ); + } + `, + "src/routes/home.client.tsx": js` + "use client"; + + import { useState } from "react"; + + export function ClientCounter() { + const [count, setCount] = useState(0); + + return ( +
+

{count}

+ +
+ ); + } + `, + }, + }); + + await page.goto(`http://localhost:${port}/`); + + // Verify server component rendered + await page.waitForSelector("[data-home]"); + expect(await page.locator("[data-home]").textContent()).toBe( + "Home: Loader Data" + ); + + // Verify client component rendered + await page.waitForSelector("[data-testid=client-component]"); + expect(await page.locator("[data-count]").textContent()).toBe("0"); + + // Test interactivity of client component + await page.click("[data-increment]"); + expect(await page.locator("[data-count]").textContent()).toBe("1"); + + // Click again to ensure it's truly interactive + await page.click("[data-increment]"); + expect(await page.locator("[data-count]").textContent()).toBe("2"); + + // Ensure this is using RSC + validateRSCHtml(await page.content()); + }); + + test("Supports navigating between server-first/client-first routes starting on a server route", async ({ + page, + }) => { + let port = await getPort(); + stop = await setupRscTest({ + implementation, + port, + files: { + "src/routes.ts": js` + import type { ServerRouteObject } from "react-router/rsc"; + + export const routes = [ + { + id: "root", + path: "", + lazy: () => import("./routes/root"), + children: [ + { + id: "home", + index: true, + lazy: () => import("./routes/home"), + }, + { + id: "dashboard", + path: "dashboard", + lazy: () => import("./routes/dashboard"), + }, + ], + }, + ] satisfies ServerRouteObject[]; + `, + "src/routes/home.tsx": js` + import { Link } from "react-router"; + + export function loader() { + return { message: "Home Page Data" }; + } + + export default function Home({ loaderData }) { + return ( +
+

Home Page

+

{loaderData.message}

+ Dashboard +
+ ); + } + `, + "src/routes/dashboard.tsx": js` + export function loader() { + return { count: 1 }; + } + + export { Dashboard as default } from "./dashboard.client"; + `, + "src/routes/dashboard.client.tsx": js` + "use client"; + + import { useState } from "react"; + import { Link } from "react-router"; + + // Export the entire route as a client component + export function Dashboard({ loaderData }) { + const [count, setCount] = useState(loaderData.count); + + return ( +
+

Dashboard

+ + {/* Server data rendered in client component */} +

+ Server count: {loaderData.count} +

+ + {/* Client interactive elements */} +

+ Client count: {count} +

+ + + + Home +
+ ); + } + `, + }, + }); + + await page.goto(`http://localhost:${port}/`); + + // Load a server route + await page.waitForSelector("[data-page=home]"); + expect(await page.locator("[data-content]").textContent()).toBe( + "Home Page Data" + ); + + // Navigate to a client route + await page.click("a[href='/dashboard']"); + await page.waitForSelector("[data-page=dashboard]"); + + // Verify server data + expect(await page.locator("[data-server-count]").textContent()).toBe( + "Server count: 1" + ); + expect(await page.locator("[data-client-count]").textContent()).toBe( + "Client count: 1" + ); + + // Increment via the client component + await page.click("[data-increment]"); + expect(await page.locator("[data-server-count]").textContent()).toBe( + "Server count: 1" + ); + expect(await page.locator("[data-client-count]").textContent()).toBe( + "Client count: 2" + ); + + // Navigate back to a server route + await page.click("a[href='/']"); + await page.waitForSelector("[data-page=home]"); + expect(await page.locator("[data-content]").textContent()).toBe( + "Home Page Data" + ); + + // Ensure this is using RSC + validateRSCHtml(await page.content()); + }); + + test("Supports navigating between server-first/client-first routes starting on a client route", async ({ + page, + }) => { + let port = await getPort(); + stop = await setupRscTest({ + implementation, + port, + files: { + "src/routes.ts": js` + import type { ServerRouteObject } from "react-router/rsc"; + + export const routes = [ + { + id: "root", + path: "", + lazy: () => import("./routes/root"), + children: [ + { + id: "home", + index: true, + lazy: () => import("./routes/home"), + }, + { + id: "dashboard", + path: "dashboard", + lazy: () => import("./routes/dashboard"), + }, + ], + }, + ] satisfies ServerRouteObject[]; + `, + "src/routes/home.tsx": js` + import { Link } from "react-router"; + + export function loader() { + return { message: "Home Page Data" }; + } + + export default function Home({ loaderData }) { + return ( +
+

Home Page

+

{loaderData.message}

+ Dashboard +
+ ); + } + `, + "src/routes/dashboard.tsx": js` + export function loader() { + return { count: 1 }; + } + + export { Dashboard as default } from "./dashboard.client"; + `, + "src/routes/dashboard.client.tsx": js` + "use client"; + + import { useState } from "react"; + import { Link } from "react-router"; + + // Export the entire route as a client component + export function Dashboard({ loaderData }) { + const [count, setCount] = useState(loaderData.count); + + return ( +
+

Dashboard

+ + {/* Server data rendered in client component */} +

+ Server count: {loaderData.count} +

+ + {/* Client interactive elements */} +

+ Client count: {count} +

+ + + + Home +
+ ); + } + `, + }, + }); + + await page.goto(`http://localhost:${port}/dashboard`); + await page.waitForSelector("[data-page=dashboard]"); + + // Verify server data + expect(await page.locator("[data-server-count]").textContent()).toBe( + "Server count: 1" + ); + expect(await page.locator("[data-client-count]").textContent()).toBe( + "Client count: 1" + ); + + // Increment via the client component + await page.click("[data-increment]"); + expect(await page.locator("[data-server-count]").textContent()).toBe( + "Server count: 1" + ); + expect(await page.locator("[data-client-count]").textContent()).toBe( + "Client count: 2" + ); + + // Navigate to a server route + await page.click("a[href='/']"); + await page.waitForSelector("[data-page=home]"); + expect(await page.locator("[data-content]").textContent()).toBe( + "Home Page Data" + ); + + // Navigate back to a client route + await page.click("a[href='/dashboard']"); + await page.waitForSelector("[data-page=dashboard]"); + expect(await page.locator("[data-server-count]").textContent()).toBe( + "Server count: 1" ); + expect(await page.locator("[data-client-count]").textContent()).toBe( + "Client count: 1" + ); + + // Ensure this is using RSC + validateRSCHtml(await page.content()); + }); + }); + + test.describe("Server Actions", () => { + test("Supports React Server Functions", async ({ page }) => { + // FIXME: Waiting on parcel support: https://github.com/parcel-bundler/parcel/pull/10165 + test.skip( + implementation.name === "parcel", + "Not supported in parcel yet" + ); + + let port = await getPort(); + stop = await setupRscTest({ + implementation, + port, + files: { + "src/routes/home.tsx": js` + let count = 0; + let name = "Default"; + + export function loader() { + return { name, count }; + } + + export default function ServerComponent({ loaderData }) { + const updateCounter = async (formData: FormData) => { + "use server"; + name = formData.get("name"); + ++count + return { name, count }; + } + + return ( +
+

Home: {loaderData.name} ({loaderData.count})

+
+ + +
+
+ ); + } + `, + }, + }); + + await page.goto(`http://localhost:${port}/`); + + // Verify initial server render + await page.waitForSelector("[data-home]"); + expect(await page.locator("[data-home]").textContent()).toBe( + "Home: Default (0)" + ); + + // Submit the form to trigger server function + await page.click("[data-submit]"); + + // Verify server function updated the UI + await expect(page.locator("[data-home]")).toHaveText( + "Home: Updated (1)" + ); + + // Submit again to ensure server functions work repeatedly + await page.click("[data-submit]"); + await expect(page.locator("[data-home]")).toHaveText( + "Home: Updated (2)" + ); + + // Ensure this is using RSC + validateRSCHtml(await page.content()); + }); + }); + + test.describe("Errors", () => { + // FIXME: Unsure why these fail currently + test.skip("Handles errors in server components correctly", async ({ + page, + }) => { + let port = await getPort(); + stop = await setupRscTest({ + implementation, + port, + files: { + "src/routes/home.tsx": js` + export function loader() { + throw new Error("Intentional error from loader"); + } + + export default function Home() { + return

This shouldn't render

; + } + + export { ErrorBoundary } from "./home.client"; + `, + "src/routes/home.client.tsx": js` + "use client" + import { useRouteError } from "react-router"; + + export function ErrorBoundary() { + let error = useRouteError(); + return ( + <> +

Error Caught!

+

{error.message}

+ + ); + } + `, + }, + }); + + await page.goto(`http://localhost:${port}/`); + + // Verify error boundary is shown + await page.waitForSelector("[data-error-message]"); + expect(await page.locator("[data-error-title]").textContent()).toBe( + "Error Caught!" + ); + expect(await page.locator("[data-error-message]").textContent()).toBe( + "Intentional error from loader" + ); + + // Ensure this is using RSC + validateRSCHtml(await page.content()); }); }); }); diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index 2956d89d65..2a73d0da8e 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -26,7 +26,7 @@ import { convertRouteMatchToUiMatch, } from "../router/utils"; import { getDocumentHeadersImpl } from "../server-runtime/headers"; -import type { RouteMatch } from "../context"; +import type { RouteMatch, RouteObject } from "../context"; import invariant from "../server-runtime/invariant"; type ServerRouteObjectBase = { @@ -311,7 +311,11 @@ async function generateRenderResponse( } // Create the handler here with exploded routes - const handler = createStaticHandler(routes); + const handler = createStaticHandler(routes, { + mapRouteProperties: (r) => ({ + hasErrorBoundary: (r as RouteObject).ErrorBoundary != null, + }), + }); const result = await handler.query(request, { skipLoaderErrorBubbling: isDataRequest, @@ -581,6 +585,10 @@ async function getServerRouteMatch( ) : undefined; let error: unknown = undefined; + + // FIXME: Is this logic right? We don't want to take any error - only the + // error pegged to our route because the staticHandler should have done the + // bubbling for us (on document requests at least)? if (ErrorBoundary && staticContext.errors) { for (const match of [...staticContext.matches].reverse()) { if (match.route.id in staticContext.errors) { From c79b98331d62397bde1dff5c35a3cfcb8c8ec7f4 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Thu, 22 May 2025 11:07:22 -0400 Subject: [PATCH 113/143] Revert unintended param ordering change --- packages/react-router/lib/server-runtime/headers.ts | 4 ++-- packages/react-router/lib/server-runtime/server.ts | 2 +- packages/react-router/lib/server-runtime/single-fetch.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/react-router/lib/server-runtime/headers.ts b/packages/react-router/lib/server-runtime/headers.ts index 7c727f1f5a..5f4c818835 100644 --- a/packages/react-router/lib/server-runtime/headers.ts +++ b/packages/react-router/lib/server-runtime/headers.ts @@ -8,8 +8,8 @@ import invariant from "./invariant"; // Version used by v7 framework mode export function getDocumentHeaders( - context: StaticHandlerContext, - build: ServerBuild + build: ServerBuild, + context: StaticHandlerContext ): Headers { return getDocumentHeadersImpl(context, (m) => { let route = build.routes[m.route.id]; diff --git a/packages/react-router/lib/server-runtime/server.ts b/packages/react-router/lib/server-runtime/server.ts index 17c1cfb8ea..5bbe24e801 100644 --- a/packages/react-router/lib/server-runtime/server.ts +++ b/packages/react-router/lib/server-runtime/server.ts @@ -461,7 +461,7 @@ async function handleDocumentRequest( return context; } - let headers = getDocumentHeaders(context, build); + let headers = getDocumentHeaders(build, context); // Skip response body for unsupported status codes if (SERVER_NO_BODY_STATUS_CODES.has(context.statusCode)) { diff --git a/packages/react-router/lib/server-runtime/single-fetch.ts b/packages/react-router/lib/server-runtime/single-fetch.ts index ef3e6d5b22..a1613092ee 100644 --- a/packages/react-router/lib/server-runtime/single-fetch.ts +++ b/packages/react-router/lib/server-runtime/single-fetch.ts @@ -55,7 +55,7 @@ export async function singleFetchAction( }); function respond(context: StaticHandlerContext) { - let headers = getDocumentHeaders(context, build); + let headers = getDocumentHeaders(build, context); if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) { return generateSingleFetchResponse(request, build, serverMode, { @@ -154,7 +154,7 @@ export async function singleFetchLoaders( let loadRouteIds = routesParam ? new Set(routesParam.split(",")) : null; function respond(context: StaticHandlerContext) { - let headers = getDocumentHeaders(context, build); + let headers = getDocumentHeaders(build, context); if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) { return generateSingleFetchResponse(request, build, serverMode, { From 0964a54cd6d97fe8d70c18500520ffaff699bd1b Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Sun, 25 May 2025 10:26:53 -0400 Subject: [PATCH 114/143] Revert "Revert unintended param ordering change" This reverts commit c79b98331d62397bde1dff5c35a3cfcb8c8ec7f4. --- packages/react-router/lib/server-runtime/headers.ts | 4 ++-- packages/react-router/lib/server-runtime/server.ts | 2 +- packages/react-router/lib/server-runtime/single-fetch.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/react-router/lib/server-runtime/headers.ts b/packages/react-router/lib/server-runtime/headers.ts index 5f4c818835..7c727f1f5a 100644 --- a/packages/react-router/lib/server-runtime/headers.ts +++ b/packages/react-router/lib/server-runtime/headers.ts @@ -8,8 +8,8 @@ import invariant from "./invariant"; // Version used by v7 framework mode export function getDocumentHeaders( - build: ServerBuild, - context: StaticHandlerContext + context: StaticHandlerContext, + build: ServerBuild ): Headers { return getDocumentHeadersImpl(context, (m) => { let route = build.routes[m.route.id]; diff --git a/packages/react-router/lib/server-runtime/server.ts b/packages/react-router/lib/server-runtime/server.ts index 5bbe24e801..17c1cfb8ea 100644 --- a/packages/react-router/lib/server-runtime/server.ts +++ b/packages/react-router/lib/server-runtime/server.ts @@ -461,7 +461,7 @@ async function handleDocumentRequest( return context; } - let headers = getDocumentHeaders(build, context); + let headers = getDocumentHeaders(context, build); // Skip response body for unsupported status codes if (SERVER_NO_BODY_STATUS_CODES.has(context.statusCode)) { diff --git a/packages/react-router/lib/server-runtime/single-fetch.ts b/packages/react-router/lib/server-runtime/single-fetch.ts index a1613092ee..ef3e6d5b22 100644 --- a/packages/react-router/lib/server-runtime/single-fetch.ts +++ b/packages/react-router/lib/server-runtime/single-fetch.ts @@ -55,7 +55,7 @@ export async function singleFetchAction( }); function respond(context: StaticHandlerContext) { - let headers = getDocumentHeaders(build, context); + let headers = getDocumentHeaders(context, build); if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) { return generateSingleFetchResponse(request, build, serverMode, { @@ -154,7 +154,7 @@ export async function singleFetchLoaders( let loadRouteIds = routesParam ? new Set(routesParam.split(",")) : null; function respond(context: StaticHandlerContext) { - let headers = getDocumentHeaders(build, context); + let headers = getDocumentHeaders(context, build); if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) { return generateSingleFetchResponse(request, build, serverMode, { From 37f4e328074aca84076bb2058fc3626e90e515eb Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Mon, 26 May 2025 14:44:53 +1000 Subject: [PATCH 115/143] test: fix RSC type errors (#13678) --- integration/helpers/rsc-parcel/package.json | 4 +- .../helpers/rsc-parcel/src/entry.rsc.ts | 1 - integration/helpers/rsc-parcel/tsconfig.json | 3 +- integration/helpers/rsc-vite/package.json | 4 +- integration/tsconfig.json | 2 +- playground/rsc-parcel/package.json | 3 +- playground/rsc-parcel/tsconfig.json | 3 +- pnpm-lock.yaml | 2852 +++-------------- 8 files changed, 526 insertions(+), 2346 deletions(-) diff --git a/integration/helpers/rsc-parcel/package.json b/integration/helpers/rsc-parcel/package.json index b320e6271a..da7c3e5e76 100644 --- a/integration/helpers/rsc-parcel/package.json +++ b/integration/helpers/rsc-parcel/package.json @@ -14,7 +14,8 @@ "scripts": { "dev": "parcel --no-cache", "build": "parcel build --no-cache", - "start": "node dist/server.js" + "start": "node dist/server.js", + "typecheck": "tsc" }, "devDependencies": { "@parcel/packager-react-static": "2.15.0", @@ -31,6 +32,7 @@ "path-browserify": "^1.0.0", "querystring-es3": "^0.2.1", "stream-http": "^3.1.0", + "typescript": "^5.1.6", "url": "^0.11.0" }, "dependencies": { diff --git a/integration/helpers/rsc-parcel/src/entry.rsc.ts b/integration/helpers/rsc-parcel/src/entry.rsc.ts index 9080e93ebc..8085fe18e3 100644 --- a/integration/helpers/rsc-parcel/src/entry.rsc.ts +++ b/integration/helpers/rsc-parcel/src/entry.rsc.ts @@ -32,7 +32,6 @@ export function callServer(request: Request) { decodeCallServer, decodeFormAction, request, - // @ts-expect-error routes, generateResponse(match) { return new Response(renderToReadableStream(match.payload), { diff --git a/integration/helpers/rsc-parcel/tsconfig.json b/integration/helpers/rsc-parcel/tsconfig.json index 739ac74a41..009d4507cf 100644 --- a/integration/helpers/rsc-parcel/tsconfig.json +++ b/integration/helpers/rsc-parcel/tsconfig.json @@ -7,6 +7,7 @@ "module": "esnext", "isolatedModules": true, "esModuleInterop": true, - "target": "es2022" + "target": "es2022", + "noEmit": true } } diff --git a/integration/helpers/rsc-vite/package.json b/integration/helpers/rsc-vite/package.json index 784ee1e525..883cbcedc0 100644 --- a/integration/helpers/rsc-vite/package.json +++ b/integration/helpers/rsc-vite/package.json @@ -5,7 +5,8 @@ "scripts": { "dev": "vite", "build": "vite build", - "start": "node server.js" + "start": "node server.js", + "typecheck": "tsc" }, "devDependencies": { "@biomejs/biome": "^1.9.4", @@ -16,6 +17,7 @@ "@types/node": "^22.13.1", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", + "typescript": "^5.1.6", "vite": "^6.2.0", "vite-tsconfig-paths": "^5.1.4", "wrangler": "^3.111.0" diff --git a/integration/tsconfig.json b/integration/tsconfig.json index 50001a6f7f..baa2e3ae2a 100644 --- a/integration/tsconfig.json +++ b/integration/tsconfig.json @@ -1,6 +1,6 @@ { "include": ["**/*.ts"], - "exclude": ["helpers/*-template"], + "exclude": ["helpers/*"], "compilerOptions": { "lib": ["DOM", "DOM.Iterable", "ES2022"], "target": "ES2022", diff --git a/playground/rsc-parcel/package.json b/playground/rsc-parcel/package.json index 30edab1d8e..7974b152c5 100644 --- a/playground/rsc-parcel/package.json +++ b/playground/rsc-parcel/package.json @@ -14,7 +14,8 @@ "scripts": { "dev": "parcel --no-cache", "build": "parcel build --no-cache", - "start": "node dist/server.js" + "start": "node dist/server.js", + "typecheck": "tsc" }, "devDependencies": { "@biomejs/biome": "^1.9.4", diff --git a/playground/rsc-parcel/tsconfig.json b/playground/rsc-parcel/tsconfig.json index 739ac74a41..009d4507cf 100644 --- a/playground/rsc-parcel/tsconfig.json +++ b/playground/rsc-parcel/tsconfig.json @@ -7,6 +7,7 @@ "module": "esnext", "isolatedModules": true, "esModuleInterop": true, - "target": "es2022" + "target": "es2022", + "noEmit": true } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d6eb48d88a..f07a548aaf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -25,25 +25,25 @@ importers: dependencies: '@babel/core': specifier: ^7.22.9 - version: 7.24.3 + version: 7.26.10 '@babel/plugin-proposal-export-namespace-from': specifier: ^7.18.9 - version: 7.18.9(@babel/core@7.24.3) + version: 7.18.9(@babel/core@7.26.10) '@babel/plugin-proposal-optional-chaining': specifier: ^7.21.0 - version: 7.21.0(@babel/core@7.24.3) + version: 7.21.0(@babel/core@7.26.10) '@babel/preset-env': specifier: ^7.22.9 - version: 7.22.9(@babel/core@7.24.3) + version: 7.22.9(@babel/core@7.26.10) '@babel/preset-modules': specifier: ^0.1.6 - version: 0.1.6(@babel/core@7.24.3) + version: 0.1.6(@babel/core@7.26.10) '@babel/preset-react': specifier: ^7.22.5 - version: 7.22.5(@babel/core@7.24.3) + version: 7.22.5(@babel/core@7.26.10) '@babel/preset-typescript': specifier: ^7.22.5 - version: 7.22.5(@babel/core@7.24.3) + version: 7.22.5(@babel/core@7.26.10) '@changesets/cli': specifier: ^2.26.2 version: 2.26.2 @@ -124,10 +124,10 @@ importers: version: 7.5.0(eslint@8.57.0)(typescript@5.4.5) babel-jest: specifier: ^29.7.0 - version: 29.7.0(@babel/core@7.24.3) + version: 29.7.0(@babel/core@7.26.10) babel-plugin-dev-expression: specifier: ^0.2.3 - version: 0.2.3(@babel/core@7.24.3) + version: 0.2.3(@babel/core@7.26.10) babel-plugin-transform-remove-console: specifier: ^6.9.4 version: 6.9.4 @@ -139,10 +139,10 @@ importers: version: 8.57.0 eslint-config-react-app: specifier: ^7.0.1 - version: 7.0.1(@babel/plugin-syntax-flow@7.18.6(@babel/core@7.24.3))(@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.24.3))(eslint@8.57.0)(jest@29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0))(typescript@5.4.5) + version: 7.0.1(@babel/plugin-syntax-flow@7.18.6(@babel/core@7.26.10))(@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.26.10))(eslint@8.57.0)(jest@29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0))(typescript@5.4.5) eslint-plugin-flowtype: specifier: ^8.0.3 - version: 8.0.3(@babel/plugin-syntax-flow@7.18.6(@babel/core@7.24.3))(@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.24.3))(eslint@8.57.0) + version: 8.0.3(@babel/plugin-syntax-flow@7.18.6(@babel/core@7.26.10))(@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.26.10))(eslint@8.57.0) eslint-plugin-import: specifier: ^2.29.1 version: 2.29.1(@typescript-eslint/parser@7.5.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0) @@ -157,7 +157,7 @@ importers: version: 7.34.1(eslint@8.57.0) eslint-plugin-react-hooks: specifier: next - version: 6.1.0-canary-38ef6550-20250508(eslint@8.57.0) + version: 6.1.0-canary-99efc627-20250523(eslint@8.57.0) fs-extra: specifier: ^10.1.0 version: 10.1.0 @@ -205,10 +205,10 @@ importers: version: 10.0.3 semver: specifier: ^7.5.4 - version: 7.5.4 + version: 7.7.1 tslib: specifier: ^2.6.2 - version: 2.6.2 + version: 2.8.1 type-fest: specifier: ^2.19.0 version: 2.19.0 @@ -229,13 +229,13 @@ importers: version: 3.1.1 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) + version: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-env-only: specifier: ^3.0.1 - version: 3.0.1(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) + version: 3.0.1(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) vite-tsconfig-paths: specifier: ^4.2.2 - version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) integration: dependencies: @@ -265,7 +265,7 @@ importers: version: 1.14.2 '@vanilla-extract/vite-plugin': specifier: ^3.9.2 - version: 3.9.5(@types/node@22.14.0)(lightningcss@1.30.1)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) + version: 3.9.5(@types/node@22.14.0)(lightningcss@1.30.1)(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) cheerio: specifier: ^1.0.0-rc.12 version: 1.0.0 @@ -280,7 +280,7 @@ importers: version: 5.1.1 express: specifier: ^4.19.2 - version: 4.19.2 + version: 4.21.2 fs-extra: specifier: ^10.0.0 version: 10.1.0 @@ -301,10 +301,10 @@ importers: version: 1.1.2 postcss: specifier: ^8.4.19 - version: 8.4.49 + version: 8.5.3 postcss-import: specifier: ^15.1.0 - version: 15.1.0(postcss@8.4.49) + version: 15.1.0(postcss@8.5.3) prettier: specifier: ^2.7.1 version: 2.8.8 @@ -334,19 +334,19 @@ importers: version: 3.4.3 type-fest: specifier: ^4.0.0 - version: 4.15.0 + version: 4.40.1 typescript: specifier: ^5.1.0 version: 5.4.5 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) + version: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-env-only: specifier: ^3.0.1 - version: 3.0.1(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) + version: 3.0.1(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) vite-tsconfig-paths: specifier: ^4.2.2 - version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) wait-on: specifier: ^7.0.1 version: 7.2.0 @@ -361,7 +361,7 @@ importers: version: 4.4.0 miniflare: specifier: ^3.20250214.0 - version: 3.20250214.0 + version: 3.20250408.0 react: specifier: ^19.1.0 version: 19.1.0 @@ -395,7 +395,7 @@ importers: version: 5.4.5 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) + version: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) wrangler: specifier: ^4.2.0 version: 4.2.0(@cloudflare/workers-types@4.20250317.0) @@ -466,6 +466,9 @@ importers: stream-http: specifier: ^3.1.0 version: 3.2.0 + typescript: + specifier: ^5.1.6 + version: 5.4.5 url: specifier: ^0.11.0 version: 0.11.4 @@ -518,6 +521,9 @@ importers: '@types/react-dom': specifier: ^18.2.7 version: 18.2.7 + typescript: + specifier: ^5.1.6 + version: 5.4.5 vite: specifier: ^6.2.0 version: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) @@ -547,7 +553,7 @@ importers: version: 3.9.5(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0)(vite@5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0)) express: specifier: ^4.19.2 - version: 4.19.2 + version: 4.21.2 isbot: specifier: ^5.1.11 version: 5.1.11 @@ -611,10 +617,10 @@ importers: version: 1.14.2 '@vanilla-extract/vite-plugin': specifier: ^3.9.2 - version: 3.9.5(@types/node@22.14.0)(lightningcss@1.30.1)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) + version: 3.9.5(@types/node@22.14.0)(lightningcss@1.30.1)(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) express: specifier: ^4.19.2 - version: 4.19.2 + version: 4.21.2 isbot: specifier: ^5.1.11 version: 5.1.11 @@ -654,19 +660,19 @@ importers: version: 5.4.5 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) + version: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-env-only: specifier: ^3.0.1 - version: 3.0.1(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) + version: 3.0.1(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) integration/helpers/vite-plugin-cloudflare-template: dependencies: express: specifier: ^4.19.2 - version: 4.19.2 + version: 4.21.2 isbot: specifier: ^5.1.11 version: 5.1.11 @@ -685,7 +691,7 @@ importers: devDependencies: '@cloudflare/vite-plugin': specifier: ^0.1.13 - version: 0.1.13(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))(workerd@1.20250224.0)(wrangler@4.2.0(@cloudflare/workers-types@4.20250317.0)) + version: 0.1.13(vite@6.2.5(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))(workerd@1.20250224.0)(wrangler@4.2.0(@cloudflare/workers-types@4.20250317.0)) '@react-router/dev': specifier: workspace:* version: link:../../../packages/react-router-dev @@ -709,10 +715,10 @@ importers: version: 5.4.5 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) + version: 6.2.5(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.2.5(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) wrangler: specifier: ^4.2.0 version: 4.2.0(@cloudflare/workers-types@4.20250317.0) @@ -736,7 +742,7 @@ importers: version: 3.9.5(@types/node@22.14.0)(lightningcss@1.30.1)(rolldown-vite@6.3.0-beta.5(@types/node@22.14.0)(esbuild@0.25.0)(jiti@1.21.0)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0)) express: specifier: ^4.19.2 - version: 4.19.2 + version: 4.21.2 isbot: specifier: ^5.1.11 version: 5.1.11 @@ -818,7 +824,7 @@ importers: version: 2.2.3 semver: specifier: ^7.3.7 - version: 7.5.4 + version: 7.7.1 sisteransi: specifier: ^1.0.5 version: 1.0.5 @@ -956,28 +962,28 @@ importers: dependencies: '@babel/core': specifier: ^7.21.8 - version: 7.24.3 + version: 7.26.10 '@babel/generator': specifier: ^7.21.5 - version: 7.24.1 + version: 7.26.10 '@babel/parser': specifier: ^7.21.8 - version: 7.24.1 + version: 7.26.10 '@babel/plugin-syntax-decorators': specifier: ^7.22.10 - version: 7.24.1(@babel/core@7.24.3) + version: 7.24.1(@babel/core@7.26.10) '@babel/plugin-syntax-jsx': specifier: ^7.21.4 - version: 7.22.5(@babel/core@7.24.3) + version: 7.22.5(@babel/core@7.26.10) '@babel/preset-typescript': specifier: ^7.21.5 - version: 7.22.5(@babel/core@7.24.3) + version: 7.22.5(@babel/core@7.26.10) '@babel/traverse': specifier: ^7.23.2 - version: 7.24.1 + version: 7.26.10 '@babel/types': specifier: ^7.22.5 - version: 7.24.0 + version: 7.26.10 '@npmcli/package-json': specifier: ^4.0.1 version: 4.0.1 @@ -1022,10 +1028,10 @@ importers: version: 2.8.8 react-refresh: specifier: ^0.14.0 - version: 0.14.0 + version: 0.14.2 semver: specifier: ^7.3.7 - version: 7.5.4 + version: 7.7.1 set-cookie-parser: specifier: ^2.6.0 version: 2.6.0 @@ -1083,7 +1089,7 @@ importers: version: 5.1.1 express: specifier: ^4.19.2 - version: 4.19.2 + version: 4.21.2 fast-glob: specifier: 3.2.11 version: 3.2.11 @@ -1098,7 +1104,7 @@ importers: version: 5.4.5 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) + version: 6.2.5(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) wireit: specifier: 0.14.9 version: 0.14.9 @@ -1148,7 +1154,7 @@ importers: version: 2.0.16 express: specifier: ^4.19.2 - version: 4.19.2 + version: 4.21.2 node-mocks-http: specifier: ^1.10.1 version: 1.14.1 @@ -1240,10 +1246,10 @@ importers: version: link:../react-router-node compression: specifier: ^1.7.4 - version: 1.7.4 + version: 1.8.0 express: specifier: ^4.19.2 - version: 4.19.2 + version: 4.21.2 get-port: specifier: 5.1.1 version: 5.1.1 @@ -1314,10 +1320,10 @@ importers: version: 5.4.5 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) + version: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) playground/framework-express: dependencies: @@ -1329,10 +1335,10 @@ importers: version: link:../../packages/react-router-node compression: specifier: ^1.7.4 - version: 1.7.4 + version: 1.8.0 express: specifier: ^4.19.2 - version: 4.19.2 + version: 4.21.2 isbot: specifier: ^5.1.11 version: 5.1.11 @@ -1375,10 +1381,10 @@ importers: version: 5.4.5 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) + version: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) playground/framework-rolldown-vite: dependencies: @@ -1455,10 +1461,10 @@ importers: version: 5.4.5 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) + version: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) playground/framework-vite-5: dependencies: @@ -1510,13 +1516,13 @@ importers: version: link:../../packages/react-router-node compression: specifier: ^1.7.4 - version: 1.7.4 + version: 1.8.0 cross-env: specifier: ^7.0.3 version: 7.0.3 express: specifier: ^4.19.2 - version: 4.19.2 + version: 4.21.2 isbot: specifier: ^5.1.11 version: 5.1.11 @@ -1568,10 +1574,10 @@ importers: version: 5.4.5 vite: specifier: ^6.0.0 - version: 6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) + version: 6.2.5(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.2.5(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) playground/rsc-parcel: dependencies: @@ -1580,7 +1586,7 @@ importers: version: 0.6.1 '@parcel/runtime-rsc': specifier: 2.14.1 - version: 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + version: 2.14.1(@parcel/core@2.14.1) express: specifier: ^4.21.2 version: 4.21.2 @@ -1602,10 +1608,10 @@ importers: version: 1.9.4 '@parcel/packager-react-static': specifier: 2.14.1 - version: 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + version: 2.14.1(@parcel/core@2.14.1) '@parcel/transformer-react-static': specifier: 2.14.1 - version: 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + version: 2.14.1(@parcel/core@2.14.1) '@types/express': specifier: ^5.0.0 version: 5.0.1 @@ -1632,7 +1638,7 @@ importers: version: 3.3.0 parcel: specifier: 2.14.1 - version: 2.14.1(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) + version: 2.14.1(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) path-browserify: specifier: ^1.0.0 version: 1.0.1 @@ -1739,10 +1745,10 @@ importers: version: 5.4.5 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) + version: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) playground/split-route-modules-spa: dependencies: @@ -1776,16 +1782,16 @@ importers: version: 5.4.5 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) + version: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) playground/vite-plugin-cloudflare: dependencies: express: specifier: ^4.19.2 - version: 4.19.2 + version: 4.21.2 isbot: specifier: ^5.1.11 version: 5.1.11 @@ -1804,7 +1810,7 @@ importers: devDependencies: '@cloudflare/vite-plugin': specifier: ^0.1.13 - version: 0.1.13(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))(workerd@1.20250224.0)(wrangler@4.2.0(@cloudflare/workers-types@4.20250317.0)) + version: 0.1.13(vite@6.2.5(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))(workerd@1.20250224.0)(wrangler@4.2.0(@cloudflare/workers-types@4.20250317.0)) '@react-router/dev': specifier: workspace:* version: link:../../packages/react-router-dev @@ -1828,10 +1834,10 @@ importers: version: 5.4.5 vite: specifier: ^6.1.0 - version: 6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) + version: 6.2.5(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) + version: 4.3.2(typescript@5.4.5)(vite@6.2.5(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)) wrangler: specifier: ^4.2.0 version: 4.2.0(@cloudflare/workers-types@4.20250317.0) @@ -1857,26 +1863,14 @@ packages: resolution: {integrity: sha512-6HumTH9885uMAZ9yIEBUi8RmgzFTQoGefd6CD6sNkVzoZM2QCyk4BRfKvo8hdgm+AxDjkZdvA/4kaj5K7680Bg==} engines: {node: '>=14'} - '@babel/code-frame@7.24.2': - resolution: {integrity: sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==} - engines: {node: '>=6.9.0'} - '@babel/code-frame@7.26.2': resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==} engines: {node: '>=6.9.0'} - '@babel/compat-data@7.24.1': - resolution: {integrity: sha512-Pc65opHDliVpRHuKfzI+gSA4zcgr65O4cl64fFJIWEEh8JoHIHh0Oez1Eo8Arz8zq/JhgKodQaxEwUPRtZylVA==} - engines: {node: '>=6.9.0'} - '@babel/compat-data@7.26.8': resolution: {integrity: sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==} engines: {node: '>=6.9.0'} - '@babel/core@7.24.3': - resolution: {integrity: sha512-5FcvN1JHw2sHJChotgx8Ek0lyuh4kCKelgMTTqhYJJtloNvUfpAFMeNQUtdlIaktwrSV9LtCdqwk48wL2wBacQ==} - engines: {node: '>=6.9.0'} - '@babel/core@7.24.4': resolution: {integrity: sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==} engines: {node: '>=6.9.0'} @@ -1892,18 +1886,10 @@ packages: '@babel/core': ^7.11.0 eslint: ^7.5.0 || ^8.0.0 - '@babel/generator@7.24.1': - resolution: {integrity: sha512-DfCRfZsBcrPEHUfuBMgbJ1Ut01Y/itOs+hY2nFLgqsqXd52/iSiVq5TITtUasIUgm+IIKdY2/1I7auiQOEeC9A==} - engines: {node: '>=6.9.0'} - '@babel/generator@7.26.10': resolution: {integrity: sha512-rRHT8siFIXQrAYOYqZQVsAr8vJ+cBNqcVAY6m5V8/4QqzaPl+zDBe6cLEPRDuNOUf3ww8RfJVlOyQMoSI+5Ang==} engines: {node: '>=6.9.0'} - '@babel/helper-annotate-as-pure@7.22.5': - resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==} - engines: {node: '>=6.9.0'} - '@babel/helper-annotate-as-pure@7.25.9': resolution: {integrity: sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==} engines: {node: '>=6.9.0'} @@ -1912,20 +1898,10 @@ packages: resolution: {integrity: sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==} engines: {node: '>=6.9.0'} - '@babel/helper-compilation-targets@7.23.6': - resolution: {integrity: sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==} - engines: {node: '>=6.9.0'} - '@babel/helper-compilation-targets@7.26.5': resolution: {integrity: sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==} engines: {node: '>=6.9.0'} - '@babel/helper-create-class-features-plugin@7.24.1': - resolution: {integrity: sha512-1yJa9dX9g//V6fDebXoEfEsxkZHk3Hcbm+zLhyu6qVgYFLvmTALTeV+jNU9e5RnYtioBrGEOdoI2joMSNQ/+aA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - '@babel/helper-create-class-features-plugin@7.26.9': resolution: {integrity: sha512-ubbUqCofvxPRurw5L8WTsCLSkQiVpov4Qx0WMA+jUN+nXBK8ADPlJO1grkFw5CWKC5+sZSOfuGMdX1aI1iT9Sg==} engines: {node: '>=6.9.0'} @@ -1960,10 +1936,6 @@ packages: resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==} engines: {node: '>=6.9.0'} - '@babel/helper-member-expression-to-functions@7.23.0': - resolution: {integrity: sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==} - engines: {node: '>=6.9.0'} - '@babel/helper-member-expression-to-functions@7.25.9': resolution: {integrity: sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==} engines: {node: '>=6.9.0'} @@ -1976,22 +1948,12 @@ packages: resolution: {integrity: sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==} engines: {node: '>=6.9.0'} - '@babel/helper-module-transforms@7.23.3': - resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - '@babel/helper-module-transforms@7.26.0': resolution: {integrity: sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 - '@babel/helper-optimise-call-expression@7.22.5': - resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==} - engines: {node: '>=6.9.0'} - '@babel/helper-optimise-call-expression@7.25.9': resolution: {integrity: sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==} engines: {node: '>=6.9.0'} @@ -2010,12 +1972,6 @@ packages: peerDependencies: '@babel/core': ^7.0.0 - '@babel/helper-replace-supers@7.24.1': - resolution: {integrity: sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - '@babel/helper-replace-supers@7.26.5': resolution: {integrity: sha512-bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg==} engines: {node: '>=6.9.0'} @@ -2026,10 +1982,6 @@ packages: resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==} engines: {node: '>=6.9.0'} - '@babel/helper-skip-transparent-expression-wrappers@7.22.5': - resolution: {integrity: sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==} - engines: {node: '>=6.9.0'} - '@babel/helper-skip-transparent-expression-wrappers@7.25.9': resolution: {integrity: sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==} engines: {node: '>=6.9.0'} @@ -2038,26 +1990,14 @@ packages: resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==} engines: {node: '>=6.9.0'} - '@babel/helper-string-parser@7.24.1': - resolution: {integrity: sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==} - engines: {node: '>=6.9.0'} - '@babel/helper-string-parser@7.25.9': resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==} engines: {node: '>=6.9.0'} - '@babel/helper-validator-identifier@7.22.20': - resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==} - engines: {node: '>=6.9.0'} - '@babel/helper-validator-identifier@7.25.9': resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==} engines: {node: '>=6.9.0'} - '@babel/helper-validator-option@7.23.5': - resolution: {integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==} - engines: {node: '>=6.9.0'} - '@babel/helper-validator-option@7.25.9': resolution: {integrity: sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==} engines: {node: '>=6.9.0'} @@ -2066,23 +2006,10 @@ packages: resolution: {integrity: sha512-sZ+QzfauuUEfxSEjKFmi3qDSHgLsTPK/pEpoD/qonZKOtTPTLbf59oabPQ4rKekt9lFcj/hTZaOhWwFYrgjk+Q==} engines: {node: '>=6.9.0'} - '@babel/helpers@7.24.1': - resolution: {integrity: sha512-BpU09QqEe6ZCHuIHFphEFgvNSrubve1FtyMton26ekZ85gRGi6LrTF7zArARp2YvyFxloeiRmtSCq5sjh1WqIg==} - engines: {node: '>=6.9.0'} - '@babel/helpers@7.26.10': resolution: {integrity: sha512-UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==} engines: {node: '>=6.9.0'} - '@babel/highlight@7.24.2': - resolution: {integrity: sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==} - engines: {node: '>=6.9.0'} - - '@babel/parser@7.24.1': - resolution: {integrity: sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg==} - engines: {node: '>=6.0.0'} - hasBin: true - '@babel/parser@7.26.10': resolution: {integrity: sha512-6aQR2zGE/QFi8JpDLjUZEPYOs7+mhKXm86VaKFiLP35JQwQb6bwUE+XbvkH0EptsYhbNBSUGaUBLKqxH1xSgsA==} engines: {node: '>=6.0.0'} @@ -2503,12 +2430,6 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-private-methods@7.22.5': - resolution: {integrity: sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-private-methods@7.25.9': resolution: {integrity: sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==} engines: {node: '>=6.9.0'} @@ -2671,10 +2592,6 @@ packages: resolution: {integrity: sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==} engines: {node: '>=6.9.0'} - '@babel/template@7.24.0': - resolution: {integrity: sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==} - engines: {node: '>=6.9.0'} - '@babel/template@7.26.9': resolution: {integrity: sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==} engines: {node: '>=6.9.0'} @@ -2687,10 +2604,6 @@ packages: resolution: {integrity: sha512-k8NuDrxr0WrPH5Aupqb2LCVURP/S0vBEn5mK6iH+GIYob66U5EtoZvcdudR2jQ4cmTwhEwW1DLB+Yyas9zjF6A==} engines: {node: '>=6.9.0'} - '@babel/types@7.24.0': - resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==} - engines: {node: '>=6.9.0'} - '@babel/types@7.26.10': resolution: {integrity: sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==} engines: {node: '>=6.9.0'} @@ -3914,10 +3827,6 @@ packages: resolution: {integrity: sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - '@jridgewell/gen-mapping@0.3.5': - resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==} - engines: {node: '>=6.0.0'} - '@jridgewell/gen-mapping@0.3.8': resolution: {integrity: sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==} engines: {node: '>=6.0.0'} @@ -3933,9 +3842,6 @@ packages: '@jridgewell/source-map@0.3.6': resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==} - '@jridgewell/sourcemap-codec@1.4.15': - resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} - '@jridgewell/sourcemap-codec@1.5.0': resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} @@ -4946,41 +4852,21 @@ packages: rollup: optional: true - '@rollup/rollup-android-arm-eabi@4.24.0': - resolution: {integrity: sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==} - cpu: [arm] - os: [android] - '@rollup/rollup-android-arm-eabi@4.34.8': resolution: {integrity: sha512-q217OSE8DTp8AFHuNHXo0Y86e1wtlfVrXiAlwkIvGRQv9zbc6mE3sjIVfwI8sYUyNxwOg0j/Vm1RKM04JcWLJw==} cpu: [arm] os: [android] - '@rollup/rollup-android-arm64@4.24.0': - resolution: {integrity: sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==} - cpu: [arm64] - os: [android] - '@rollup/rollup-android-arm64@4.34.8': resolution: {integrity: sha512-Gigjz7mNWaOL9wCggvoK3jEIUUbGul656opstjaUSGC3eT0BM7PofdAJaBfPFWWkXNVAXbaQtC99OCg4sJv70Q==} cpu: [arm64] os: [android] - '@rollup/rollup-darwin-arm64@4.24.0': - resolution: {integrity: sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==} - cpu: [arm64] - os: [darwin] - '@rollup/rollup-darwin-arm64@4.34.8': resolution: {integrity: sha512-02rVdZ5tgdUNRxIUrFdcMBZQoaPMrxtwSb+/hOfBdqkatYHR3lZ2A2EGyHq2sGOd0Owk80oV3snlDASC24He3Q==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-x64@4.24.0': - resolution: {integrity: sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==} - cpu: [x64] - os: [darwin] - '@rollup/rollup-darwin-x64@4.34.8': resolution: {integrity: sha512-qIP/elwR/tq/dYRx3lgwK31jkZvMiD6qUtOycLhTzCvrjbZ3LjQnEM9rNhSGpbLXVJYQ3rq39A6Re0h9tU2ynw==} cpu: [x64] @@ -4996,41 +4882,21 @@ packages: cpu: [x64] os: [freebsd] - '@rollup/rollup-linux-arm-gnueabihf@4.24.0': - resolution: {integrity: sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==} - cpu: [arm] - os: [linux] - '@rollup/rollup-linux-arm-gnueabihf@4.34.8': resolution: {integrity: sha512-A4iphFGNkWRd+5m3VIGuqHnG3MVnqKe7Al57u9mwgbyZ2/xF9Jio72MaY7xxh+Y87VAHmGQr73qoKL9HPbXj1g==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.24.0': - resolution: {integrity: sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==} - cpu: [arm] - os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.34.8': resolution: {integrity: sha512-S0lqKLfTm5u+QTxlFiAnb2J/2dgQqRy/XvziPtDd1rKZFXHTyYLoVL58M/XFwDI01AQCDIevGLbQrMAtdyanpA==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.24.0': - resolution: {integrity: sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==} - cpu: [arm64] - os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.34.8': resolution: {integrity: sha512-jpz9YOuPiSkL4G4pqKrus0pn9aYwpImGkosRKwNi+sJSkz+WU3anZe6hi73StLOQdfXYXC7hUfsQlTnjMd3s1A==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.24.0': - resolution: {integrity: sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==} - cpu: [arm64] - os: [linux] - '@rollup/rollup-linux-arm64-musl@4.34.8': resolution: {integrity: sha512-KdSfaROOUJXgTVxJNAZ3KwkRc5nggDk+06P6lgi1HLv1hskgvxHUKZ4xtwHkVYJ1Rep4GNo+uEfycCRRxht7+Q==} cpu: [arm64] @@ -5041,81 +4907,41 @@ packages: cpu: [loong64] os: [linux] - '@rollup/rollup-linux-powerpc64le-gnu@4.24.0': - resolution: {integrity: sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==} - cpu: [ppc64] - os: [linux] - '@rollup/rollup-linux-powerpc64le-gnu@4.34.8': resolution: {integrity: sha512-LMJc999GkhGvktHU85zNTDImZVUCJ1z/MbAJTnviiWmmjyckP5aQsHtcujMjpNdMZPT2rQEDBlJfubhs3jsMfw==} cpu: [ppc64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.24.0': - resolution: {integrity: sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==} - cpu: [riscv64] - os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.34.8': resolution: {integrity: sha512-xAQCAHPj8nJq1PI3z8CIZzXuXCstquz7cIOL73HHdXiRcKk8Ywwqtx2wrIy23EcTn4aZ2fLJNBB8d0tQENPCmw==} cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.24.0': - resolution: {integrity: sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==} - cpu: [s390x] - os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.34.8': resolution: {integrity: sha512-DdePVk1NDEuc3fOe3dPPTb+rjMtuFw89gw6gVWxQFAuEqqSdDKnrwzZHrUYdac7A7dXl9Q2Vflxpme15gUWQFA==} cpu: [s390x] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.24.0': - resolution: {integrity: sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==} - cpu: [x64] - os: [linux] - '@rollup/rollup-linux-x64-gnu@4.34.8': resolution: {integrity: sha512-8y7ED8gjxITUltTUEJLQdgpbPh1sUQ0kMTmufRF/Ns5tI9TNMNlhWtmPKKHCU0SilX+3MJkZ0zERYYGIVBYHIA==} cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.24.0': - resolution: {integrity: sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==} - cpu: [x64] - os: [linux] - '@rollup/rollup-linux-x64-musl@4.34.8': resolution: {integrity: sha512-SCXcP0ZpGFIe7Ge+McxY5zKxiEI5ra+GT3QRxL0pMMtxPfpyLAKleZODi1zdRHkz5/BhueUrYtYVgubqe9JBNQ==} cpu: [x64] os: [linux] - '@rollup/rollup-win32-arm64-msvc@4.24.0': - resolution: {integrity: sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==} - cpu: [arm64] - os: [win32] - '@rollup/rollup-win32-arm64-msvc@4.34.8': resolution: {integrity: sha512-YHYsgzZgFJzTRbth4h7Or0m5O74Yda+hLin0irAIobkLQFRQd1qWmnoVfwmKm9TXIZVAD0nZ+GEb2ICicLyCnQ==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.24.0': - resolution: {integrity: sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==} - cpu: [ia32] - os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.34.8': resolution: {integrity: sha512-r3NRQrXkHr4uWy5TOjTpTYojR9XmF0j/RYgKCef+Ag46FWUTltm5ziticv8LdNsDMehjJ543x/+TJAek/xBA2w==} cpu: [ia32] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.24.0': - resolution: {integrity: sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==} - cpu: [x64] - os: [win32] - '@rollup/rollup-win32-x64-msvc@4.34.8': resolution: {integrity: sha512-U0FaE5O1BCpZSeE6gBl3c5ObhePQSfk9vDRToMmTkbhCOgW4jqvtS5LGyQ76L1fH8sM0keRp4uDTsbjiUyjk0g==} cpu: [x64] @@ -5157,135 +4983,66 @@ packages: '@sinonjs/fake-timers@10.0.2': resolution: {integrity: sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==} - '@swc/core-darwin-arm64@1.11.18': - resolution: {integrity: sha512-K6AntdUlNMQg8aChqjeXwnVhK6d4WRZ9TgtLSTmdU0Ugll4an7QK49s9NrT7XQU91cEsVvzdr++p1bNImx0hJg==} - engines: {node: '>=10'} - cpu: [arm64] - os: [darwin] - '@swc/core-darwin-arm64@1.11.24': resolution: {integrity: sha512-dhtVj0PC1APOF4fl5qT2neGjRLgHAAYfiVP8poJelhzhB/318bO+QCFWAiimcDoyMgpCXOhTp757gnoJJrheWA==} engines: {node: '>=10'} cpu: [arm64] os: [darwin] - '@swc/core-darwin-x64@1.11.18': - resolution: {integrity: sha512-RCRvC6Q9M5BArTvj/IzUAAYGrgxYFbTTnAtf6UX7JFq2DAn+hEwYUjmC1m0gFso9HqFU0m5QZUGfZvVmACGWUw==} - engines: {node: '>=10'} - cpu: [x64] - os: [darwin] - '@swc/core-darwin-x64@1.11.24': resolution: {integrity: sha512-H/3cPs8uxcj2Fe3SoLlofN5JG6Ny5bl8DuZ6Yc2wr7gQFBmyBkbZEz+sPVgsID7IXuz7vTP95kMm1VL74SO5AQ==} engines: {node: '>=10'} cpu: [x64] os: [darwin] - '@swc/core-linux-arm-gnueabihf@1.11.18': - resolution: {integrity: sha512-wteAKf8YKb3jOnZFm3EzuIMzzCVXMuQOLHsz1IgEOc44/gdgNXKxaYTWAowZuej7t68tf/w0cRNMc7Le414v/g==} - engines: {node: '>=10'} - cpu: [arm] - os: [linux] - '@swc/core-linux-arm-gnueabihf@1.11.24': resolution: {integrity: sha512-PHJgWEpCsLo/NGj+A2lXZ2mgGjsr96ULNW3+T3Bj2KTc8XtMUkE8tmY2Da20ItZOvPNC/69KroU7edyo1Flfbw==} engines: {node: '>=10'} cpu: [arm] os: [linux] - '@swc/core-linux-arm64-gnu@1.11.18': - resolution: {integrity: sha512-hY6jJYZ6PKHSBo5OATswfyKsUgsWu9+4nDcN8liYIRRgz3E0G9wk0VUTP4cFPivBFeHWTTAGz687/Nf2aQEIpw==} - engines: {node: '>=10'} - cpu: [arm64] - os: [linux] - '@swc/core-linux-arm64-gnu@1.11.24': resolution: {integrity: sha512-C2FJb08+n5SD4CYWCTZx1uR88BN41ZieoHvI8A55hfVf2woT8+6ZiBzt74qW2g+ntZ535Jts5VwXAKdu41HpBg==} engines: {node: '>=10'} cpu: [arm64] os: [linux] - '@swc/core-linux-arm64-musl@1.11.18': - resolution: {integrity: sha512-slu0mlP2nucvQalttnapfpqpD/LlM9NHx9g3ofgsLzjObyMEBiX4ZysQ3y65U8Mjw71RNqtLd/ZmvxI6OmLdiQ==} - engines: {node: '>=10'} - cpu: [arm64] - os: [linux] - '@swc/core-linux-arm64-musl@1.11.24': resolution: {integrity: sha512-ypXLIdszRo0re7PNNaXN0+2lD454G8l9LPK/rbfRXnhLWDBPURxzKlLlU/YGd2zP98wPcVooMmegRSNOKfvErw==} engines: {node: '>=10'} cpu: [arm64] os: [linux] - '@swc/core-linux-x64-gnu@1.11.18': - resolution: {integrity: sha512-h9a/8PA25arMCQ9t8CE8rA1s0c77z4kCZZ7dUuUkD88yEXIrARMca1IKR7of+S3slfQrf1Zlq3Ac1Fb1HVJziQ==} - engines: {node: '>=10'} - cpu: [x64] - os: [linux] - '@swc/core-linux-x64-gnu@1.11.24': resolution: {integrity: sha512-IM7d+STVZD48zxcgo69L0yYptfhaaE9cMZ+9OoMxirNafhKKXwoZuufol1+alEFKc+Wbwp+aUPe/DeWC/Lh3dg==} engines: {node: '>=10'} cpu: [x64] os: [linux] - '@swc/core-linux-x64-musl@1.11.18': - resolution: {integrity: sha512-0sMDJj5qUGK9QEw4lrxLxkTP/4AoKciqNzXvqbk+J9XuXN2aIv4BsR1Y7z3GwAeMFGsba2lbHLOtJlDsaqIsiA==} - engines: {node: '>=10'} - cpu: [x64] - os: [linux] - '@swc/core-linux-x64-musl@1.11.24': resolution: {integrity: sha512-DZByJaMVzSfjQKKQn3cqSeqwy6lpMaQDQQ4HPlch9FWtDx/dLcpdIhxssqZXcR2rhaQVIaRQsCqwV6orSDGAGw==} engines: {node: '>=10'} cpu: [x64] os: [linux] - '@swc/core-win32-arm64-msvc@1.11.18': - resolution: {integrity: sha512-zGv9HnfgBcKyt54MJRWdwRNu9BuYkAFM7bx+tWtKhd37Ef7ZX20QLs9xXl5wWDXCbsOdRxXIZgXs6PEL+Pzmrw==} - engines: {node: '>=10'} - cpu: [arm64] - os: [win32] - '@swc/core-win32-arm64-msvc@1.11.24': resolution: {integrity: sha512-Q64Ytn23y9aVDKN5iryFi8mRgyHw3/kyjTjT4qFCa8AEb5sGUuSj//AUZ6c0J7hQKMHlg9do5Etvoe61V98/JQ==} engines: {node: '>=10'} cpu: [arm64] os: [win32] - '@swc/core-win32-ia32-msvc@1.11.18': - resolution: {integrity: sha512-uBKj0S1lYv/E2ZhxHZOxSiQwoegYmzbPRpjq6eHBZDv97mu7W3K27/lsnPbvAfQ6b6rnv8BI+EsmJ7VLQBAHBQ==} - engines: {node: '>=10'} - cpu: [ia32] - os: [win32] - '@swc/core-win32-ia32-msvc@1.11.24': resolution: {integrity: sha512-9pKLIisE/Hh2vJhGIPvSoTK4uBSPxNVyXHmOrtdDot4E1FUUI74Vi8tFdlwNbaj8/vusVnb8xPXsxF1uB0VgiQ==} engines: {node: '>=10'} cpu: [ia32] os: [win32] - '@swc/core-win32-x64-msvc@1.11.18': - resolution: {integrity: sha512-8USTRcdgeFMNBgvVXl8tz6n4+9s9m+zHsfDeBT4jPgwnq2bnLBlTUlwnPwzDxfg9nUJr6RFD4xeKfWyZZRosZg==} - engines: {node: '>=10'} - cpu: [x64] - os: [win32] - '@swc/core-win32-x64-msvc@1.11.24': resolution: {integrity: sha512-sybnXtOsdB+XvzVFlBVGgRHLqp3yRpHK7CrmpuDKszhj/QhmsaZzY/GHSeALlMtLup13M0gqbcQvsTNlAHTg3w==} engines: {node: '>=10'} cpu: [x64] os: [win32] - '@swc/core@1.11.18': - resolution: {integrity: sha512-ORZxyCKKiqYt2iHdh1C7pfVR1GBjkuFOdwqZggQzaq0vt22DpGca+2JsUtkUoWQmWcct04v5+ScwgvsHuMObxA==} - engines: {node: '>=10'} - peerDependencies: - '@swc/helpers': '*' - peerDependenciesMeta: - '@swc/helpers': - optional: true - '@swc/core@1.11.24': resolution: {integrity: sha512-MaQEIpfcEMzx3VWWopbofKJvaraqmL6HbLlw2bFZ7qYqYw3rkhM0cQVEgyzbHtTWwCwPMFZSC2DUbhlZgrMfLg==} engines: {node: '>=10'} @@ -5577,9 +5334,6 @@ packages: '@types/tar-stream@3.1.3': resolution: {integrity: sha512-Zbnx4wpkWBMBSu5CytMbrT5ZpMiF55qgM+EpHzR4yIDu7mv52cej8hTkOc6K+LzpkOAbxwn/m7j3iO+/l42YkQ==} - '@types/tough-cookie@4.0.2': - resolution: {integrity: sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==} - '@types/tough-cookie@4.0.5': resolution: {integrity: sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==} @@ -5786,11 +5540,6 @@ packages: resolution: {integrity: sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==} engines: {node: '>=0.4.0'} - acorn@8.11.3: - resolution: {integrity: sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==} - engines: {node: '>=0.4.0'} - hasBin: true - acorn@8.14.0: resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==} engines: {node: '>=0.4.0'} @@ -6067,10 +5816,6 @@ packages: blake3-wasm@2.1.5: resolution: {integrity: sha512-F1+K8EbfOZE49dtoPtmxUQrpXaBIl3ICvasLh+nJta0xkz+9kF/7uet9fLnwKqhDrmj6g+6K3Tw9yQPUg2ka5g==} - body-parser@1.20.2: - resolution: {integrity: sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==} - engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} - body-parser@1.20.3: resolution: {integrity: sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==} engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} @@ -6101,16 +5846,6 @@ packages: browserify-zlib@0.2.0: resolution: {integrity: sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==} - browserslist@4.23.0: - resolution: {integrity: sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==} - engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} - hasBin: true - - browserslist@4.24.4: - resolution: {integrity: sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==} - engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} - hasBin: true - browserslist@4.24.5: resolution: {integrity: sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} @@ -6141,10 +5876,6 @@ packages: resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==} engines: {node: '>=10.16.0'} - bytes@3.0.0: - resolution: {integrity: sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==} - engines: {node: '>= 0.8'} - bytes@3.1.2: resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==} engines: {node: '>= 0.8'} @@ -6333,10 +6064,6 @@ packages: resolution: {integrity: sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==} engines: {node: '>= 0.6'} - compression@1.7.4: - resolution: {integrity: sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==} - engines: {node: '>= 0.8.0'} - compression@1.8.0: resolution: {integrity: sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==} engines: {node: '>= 0.8.0'} @@ -6379,10 +6106,6 @@ packages: resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==} engines: {node: '>= 0.6'} - cookie@0.6.0: - resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==} - engines: {node: '>= 0.6'} - cookie@0.7.1: resolution: {integrity: sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==} engines: {node: '>= 0.6'} @@ -6526,15 +6249,6 @@ packages: supports-color: optional: true - debug@4.3.7: - resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - debug@4.4.0: resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==} engines: {node: '>=6.0'} @@ -6710,10 +6424,6 @@ packages: dotenv-json@1.0.0: resolution: {integrity: sha512-jAssr+6r4nKhKRudQ0HOzMskOFFi9+ubXWwmrSGJFgTvpjyPXCXsCsYbjif6mXp7uxA7xY3/LGaiTQukZzSbOQ==} - dotenv@16.4.7: - resolution: {integrity: sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==} - engines: {node: '>=12'} - dotenv@16.5.0: resolution: {integrity: sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==} engines: {node: '>=12'} @@ -6735,12 +6445,6 @@ packages: ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} - electron-to-chromium@1.4.714: - resolution: {integrity: sha512-OfnVHt+nMRH9Ua5koH/2gKlCAXbG+u1yXwLKyBVqNboBV34ZTwb846RUe8K5mtE1uhz0BXoMarZ13JCQr+sBtQ==} - - electron-to-chromium@1.5.120: - resolution: {integrity: sha512-oTUp3gfX1gZI+xfD2djr2rzQdHCwHzPQrrK0CD7WpTdF0nPdQ/INcRVjWgLdCT4a9W3jFObR9DAfsuyFQnI8CQ==} - electron-to-chromium@1.5.155: resolution: {integrity: sha512-ps5KcGGmwL8VaeJlvlDlu4fORQpv3+GIcF5I3f9tUKUlJ/wsysh6HU8P5L1XWRYeXfA0oJd4PyM8ds8zTFf6Ng==} @@ -6797,10 +6501,6 @@ packages: resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==} engines: {node: '>= 0.4'} - es-define-property@1.0.0: - resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==} - engines: {node: '>= 0.4'} - es-define-property@1.0.1: resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==} engines: {node: '>= 0.4'} @@ -6816,10 +6516,6 @@ packages: es-module-lexer@1.5.4: resolution: {integrity: sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==} - es-object-atoms@1.0.0: - resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==} - engines: {node: '>= 0.4'} - es-object-atoms@1.1.1: resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==} engines: {node: '>= 0.4'} @@ -6983,8 +6679,8 @@ packages: peerDependencies: eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 - eslint-plugin-react-hooks@6.1.0-canary-38ef6550-20250508: - resolution: {integrity: sha512-p/Ms1HS9KQr+LaaK3N342yVXntnb02amx+Owob6iemQKdu4xEY/8Gpqsv+nKH6vP33JfjPIB+TPxz4XmymDMuA==} + eslint-plugin-react-hooks@6.1.0-canary-99efc627-20250523: + resolution: {integrity: sha512-lZOr6Swebpk1YwnnhO9OO2RgiuU/gGpQTerlorHqRzucbnKR7IaJQ5TKfbsIln8CyXA+hkVamOrcmeBjgjNAmw==} engines: {node: '>=18'} peerDependencies: eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0 @@ -7108,10 +6804,6 @@ packages: resolution: {integrity: sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - express@4.19.2: - resolution: {integrity: sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==} - engines: {node: '>= 0.10.0'} - express@4.21.2: resolution: {integrity: sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==} engines: {node: '>= 0.10.0'} @@ -7161,14 +6853,6 @@ packages: fb-watchman@2.0.2: resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==} - fdir@6.4.0: - resolution: {integrity: sha512-3oB133prH1o4j/L5lLW7uOCF1PlD+/It2L0eL/iAqWMB91RBbqTewABqxhj0ibBd90EEmWZq7ntIWzVaWcXTGQ==} - peerDependencies: - picomatch: ^3 || ^4 - peerDependenciesMeta: - picomatch: - optional: true - fdir@6.4.3: resolution: {integrity: sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==} peerDependencies: @@ -7185,10 +6869,6 @@ packages: resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} engines: {node: '>=8'} - finalhandler@1.2.0: - resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==} - engines: {node: '>= 0.8'} - finalhandler@1.3.1: resolution: {integrity: sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==} engines: {node: '>= 0.8'} @@ -7293,10 +6973,6 @@ packages: resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} engines: {node: 6.* || 8.* || >= 10.*} - get-intrinsic@1.2.4: - resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==} - engines: {node: '>= 0.4'} - get-intrinsic@1.3.0: resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==} engines: {node: '>= 0.4'} @@ -7391,9 +7067,6 @@ packages: globrex@0.1.2: resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==} - gopd@1.0.1: - resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} - gopd@1.2.0: resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==} engines: {node: '>= 0.4'} @@ -7437,10 +7110,6 @@ packages: resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==} engines: {node: '>= 0.4'} - has-symbols@1.0.3: - resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} - engines: {node: '>= 0.4'} - has-symbols@1.1.0: resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==} engines: {node: '>= 0.4'} @@ -8053,11 +7722,6 @@ packages: resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==} hasBin: true - jsesc@2.5.2: - resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==} - engines: {node: '>=4'} - hasBin: true - jsesc@3.0.2: resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==} engines: {node: '>=6'} @@ -8140,130 +7804,66 @@ packages: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} engines: {node: '>= 0.8.0'} - lightningcss-darwin-arm64@1.29.3: - resolution: {integrity: sha512-fb7raKO3pXtlNbQbiMeEu8RbBVHnpyqAoxTyTRMEWFQWmscGC2wZxoHzZ+YKAepUuKT9uIW5vL2QbFivTgprZg==} - engines: {node: '>= 12.0.0'} - cpu: [arm64] - os: [darwin] - lightningcss-darwin-arm64@1.30.1: resolution: {integrity: sha512-c8JK7hyE65X1MHMN+Viq9n11RRC7hgin3HhYKhrMyaXflk5GVplZ60IxyoVtzILeKr+xAJwg6zK6sjTBJ0FKYQ==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [darwin] - lightningcss-darwin-x64@1.29.3: - resolution: {integrity: sha512-KF2XZ4ZdmDGGtEYmx5wpzn6u8vg7AdBHaEOvDKu8GOs7xDL/vcU2vMKtTeNe1d4dogkDdi3B9zC77jkatWBwEQ==} - engines: {node: '>= 12.0.0'} - cpu: [x64] - os: [darwin] - lightningcss-darwin-x64@1.30.1: resolution: {integrity: sha512-k1EvjakfumAQoTfcXUcHQZhSpLlkAuEkdMBsI/ivWw9hL+7FtilQc0Cy3hrx0AAQrVtQAbMI7YjCgYgvn37PzA==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [darwin] - lightningcss-freebsd-x64@1.29.3: - resolution: {integrity: sha512-VUWeVf+V1UM54jv9M4wen9vMlIAyT69Krl9XjI8SsRxz4tdNV/7QEPlW6JASev/pYdiynUCW0pwaFquDRYdxMw==} - engines: {node: '>= 12.0.0'} - cpu: [x64] - os: [freebsd] - lightningcss-freebsd-x64@1.30.1: resolution: {integrity: sha512-kmW6UGCGg2PcyUE59K5r0kWfKPAVy4SltVeut+umLCFoJ53RdCUWxcRDzO1eTaxf/7Q2H7LTquFHPL5R+Gjyig==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [freebsd] - lightningcss-linux-arm-gnueabihf@1.29.3: - resolution: {integrity: sha512-UhgZ/XVNfXQVEJrMIWeK1Laj8KbhjbIz7F4znUk7G4zeGw7TRoJxhb66uWrEsonn1+O45w//0i0Fu0wIovYdYg==} - engines: {node: '>= 12.0.0'} - cpu: [arm] - os: [linux] - lightningcss-linux-arm-gnueabihf@1.30.1: resolution: {integrity: sha512-MjxUShl1v8pit+6D/zSPq9S9dQ2NPFSQwGvxBCYaBYLPlCWuPh9/t1MRS8iUaR8i+a6w7aps+B4N0S1TYP/R+Q==} engines: {node: '>= 12.0.0'} cpu: [arm] os: [linux] - lightningcss-linux-arm64-gnu@1.29.3: - resolution: {integrity: sha512-Pqau7jtgJNmQ/esugfmAT1aCFy/Gxc92FOxI+3n+LbMHBheBnk41xHDhc0HeYlx9G0xP5tK4t0Koy3QGGNqypw==} - engines: {node: '>= 12.0.0'} - cpu: [arm64] - os: [linux] - lightningcss-linux-arm64-gnu@1.30.1: resolution: {integrity: sha512-gB72maP8rmrKsnKYy8XUuXi/4OctJiuQjcuqWNlJQ6jZiWqtPvqFziskH3hnajfvKB27ynbVCucKSm2rkQp4Bw==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [linux] - lightningcss-linux-arm64-musl@1.29.3: - resolution: {integrity: sha512-dxakOk66pf7KLS7VRYFO7B8WOJLecE5OPL2YOk52eriFd/yeyxt2Km5H0BjLfElokIaR+qWi33gB8MQLrdAY3A==} - engines: {node: '>= 12.0.0'} - cpu: [arm64] - os: [linux] - lightningcss-linux-arm64-musl@1.30.1: resolution: {integrity: sha512-jmUQVx4331m6LIX+0wUhBbmMX7TCfjF5FoOH6SD1CttzuYlGNVpA7QnrmLxrsub43ClTINfGSYyHe2HWeLl5CQ==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [linux] - lightningcss-linux-x64-gnu@1.29.3: - resolution: {integrity: sha512-ySZTNCpbfbK8rqpKJeJR2S0g/8UqqV3QnzcuWvpI60LWxnFN91nxpSSwCbzfOXkzKfar9j5eOuOplf+klKtINg==} - engines: {node: '>= 12.0.0'} - cpu: [x64] - os: [linux] - lightningcss-linux-x64-gnu@1.30.1: resolution: {integrity: sha512-piWx3z4wN8J8z3+O5kO74+yr6ze/dKmPnI7vLqfSqI8bccaTGY5xiSGVIJBDd5K5BHlvVLpUB3S2YCfelyJ1bw==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [linux] - lightningcss-linux-x64-musl@1.29.3: - resolution: {integrity: sha512-3pVZhIzW09nzi10usAXfIGTTSTYQ141dk88vGFNCgawIzayiIzZQxEcxVtIkdvlEq2YuFsL9Wcj/h61JHHzuFQ==} - engines: {node: '>= 12.0.0'} - cpu: [x64] - os: [linux] - lightningcss-linux-x64-musl@1.30.1: resolution: {integrity: sha512-rRomAK7eIkL+tHY0YPxbc5Dra2gXlI63HL+v1Pdi1a3sC+tJTcFrHX+E86sulgAXeI7rSzDYhPSeHHjqFhqfeQ==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [linux] - lightningcss-win32-arm64-msvc@1.29.3: - resolution: {integrity: sha512-VRnkAvtIkeWuoBJeGOTrZxsNp4HogXtcaaLm8agmbYtLDOhQdpgxW6NjZZjDXbvGF+eOehGulXZ3C1TiwHY4QQ==} - engines: {node: '>= 12.0.0'} - cpu: [arm64] - os: [win32] - lightningcss-win32-arm64-msvc@1.30.1: resolution: {integrity: sha512-mSL4rqPi4iXq5YVqzSsJgMVFENoa4nGTT/GjO2c0Yl9OuQfPsIfncvLrEW6RbbB24WtZ3xP/2CCmI3tNkNV4oA==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [win32] - lightningcss-win32-x64-msvc@1.29.3: - resolution: {integrity: sha512-IszwRPu2cPnDQsZpd7/EAr0x2W7jkaWqQ1SwCVIZ/tSbZVXPLt6k8s6FkcyBjViCzvB5CW0We0QbbP7zp2aBjQ==} - engines: {node: '>= 12.0.0'} - cpu: [x64] - os: [win32] - lightningcss-win32-x64-msvc@1.30.1: resolution: {integrity: sha512-PVqXh48wh4T53F/1CCu8PIPCxLzWyCnn/9T5W1Jpmdy5h9Cwd+0YQS6/LwhHXSafuc61/xg9Lv5OrCby6a++jg==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [win32] - lightningcss@1.29.3: - resolution: {integrity: sha512-GlOJwTIP6TMIlrTFsxTerwC0W6OpQpCGuX1ECRLBUVRh6fpJH3xTqjCjRgQHTb4ZXexH9rtHou1Lf03GKzmhhQ==} - engines: {node: '>= 12.0.0'} - lightningcss@1.30.1: resolution: {integrity: sha512-xi6IyHML+c9+Q3W0S4fCQJOym42pyurFiJUHEcEyHS0CeKzia4yZDEsLlqOFykxOdHpNy0NmvVO31vcSqAxJCg==} engines: {node: '>= 12.0.0'} @@ -8346,10 +7946,6 @@ packages: lru-cache@5.1.1: resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} - lru-cache@6.0.0: - resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} - engines: {node: '>=10'} - lru-cache@7.18.3: resolution: {integrity: sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==} engines: {node: '>=12'} @@ -8472,9 +8068,6 @@ packages: resolution: {integrity: sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==} engines: {node: '>=8'} - merge-descriptors@1.0.1: - resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==} - merge-descriptors@1.0.3: resolution: {integrity: sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==} @@ -8692,11 +8285,6 @@ packages: resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==} engines: {node: '>=4'} - miniflare@3.20250214.0: - resolution: {integrity: sha512-XKwn+X/V2CEpbRhoeaIcJHpV/Duz5Md5rxVT8I6S1oqd3aLZkn8cUX1tuxHpUvfQSPuXwWH+2ESLNnTf9PKEWg==} - engines: {node: '>=16.13'} - hasBin: true - miniflare@3.20250214.1: resolution: {integrity: sha512-NE66QV+2n9ZndaP5jgPlcVref3Arvizb+l2QqhgeXtKM5Orhi8UU2mijoiN3mHEUexKaBES2S1VubT4LDPqkxQ==} engines: {node: '>=16.13'} @@ -8749,9 +8337,6 @@ packages: mkdirp-classic@0.5.3: resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==} - mlly@1.6.1: - resolution: {integrity: sha512-vLgaHvaeunuOXHSmEbZ9izxPx3USsk8KCQ8iC+aTlp5sKRSoZvwhHh5L9VbKSaVC6sJDqbyohIS76E2VmHIPAA==} - mlly@1.7.4: resolution: {integrity: sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==} @@ -8804,11 +8389,6 @@ packages: mz@2.7.0: resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} - nanoid@3.3.7: - resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} - engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} - hasBin: true - nanoid@3.3.8: resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} @@ -8868,9 +8448,6 @@ packages: resolution: {integrity: sha512-mfXuCGonz0A7uG1FEjnypjm34xegeN5+HI6xeGhYKecfgaZhjsmYoLE9LEFmT+53G1n8IuagPZmVnEL/xNsFaA==} engines: {node: '>=14'} - node-releases@2.0.14: - resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==} - node-releases@2.0.19: resolution: {integrity: sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==} @@ -8931,9 +8508,6 @@ packages: resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==} engines: {node: '>= 6'} - object-inspect@1.13.1: - resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==} - object-inspect@1.13.4: resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==} engines: {node: '>= 0.4'} @@ -9130,9 +8704,6 @@ packages: path-to-regexp@0.1.12: resolution: {integrity: sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==} - path-to-regexp@0.1.7: - resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==} - path-to-regexp@6.3.0: resolution: {integrity: sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==} @@ -9192,9 +8763,6 @@ packages: resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==} engines: {node: '>=8'} - pkg-types@1.0.3: - resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==} - pkg-types@1.3.1: resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==} @@ -9267,10 +8835,6 @@ packages: postcss-value-parser@4.2.0: resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} - postcss@8.4.49: - resolution: {integrity: sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==} - engines: {node: ^10 || ^12 || >=14} - postcss@8.5.3: resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==} engines: {node: ^10 || ^12 || >=14} @@ -9387,14 +8951,6 @@ packages: pure-rand@6.0.2: resolution: {integrity: sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==} - qs@6.11.0: - resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==} - engines: {node: '>=0.6'} - - qs@6.12.0: - resolution: {integrity: sha512-trVZiI6RMOkO476zLGaBIzszOdFPnCCXHPG9kn0yuS1uz6xdVxPfZdB3vUig9pxPFDM9BRAgz/YUIVQ1/vuiUg==} - engines: {node: '>=0.6'} - qs@6.13.0: resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==} engines: {node: '>=0.6'} @@ -9440,10 +8996,6 @@ packages: react-is@19.1.0: resolution: {integrity: sha512-Oe56aUPnkHyyDxxkvqtd7KkdQP5uIUfHxd5XTb3wE9d/kRnZLmKbDB0GWk919tdQ+mxxPtG6EAs6RMT6i1qtHg==} - react-refresh@0.14.0: - resolution: {integrity: sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==} - engines: {node: '>=0.10.0'} - react-refresh@0.14.2: resolution: {integrity: sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==} engines: {node: '>=0.10.0'} @@ -9737,11 +9289,6 @@ packages: rollup-pluginutils@2.8.2: resolution: {integrity: sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==} - rollup@4.24.0: - resolution: {integrity: sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==} - engines: {node: '>=18.0.0', npm: '>=8.0.0'} - hasBin: true - rollup@4.34.8: resolution: {integrity: sha512-489gTVMzAYdiZHFVA/ig/iYFllCcWFHMvUHI1rpFmkoUtRlQxqh6/yiNqnYibjMZ2b/+FUQwldG+aLsEt6bglQ==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} @@ -9801,20 +9348,11 @@ packages: resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} hasBin: true - semver@7.5.4: - resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==} - engines: {node: '>=10'} - hasBin: true - semver@7.7.1: resolution: {integrity: sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==} engines: {node: '>=10'} hasBin: true - send@0.18.0: - resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==} - engines: {node: '>= 0.8.0'} - send@0.19.0: resolution: {integrity: sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==} engines: {node: '>= 0.8.0'} @@ -9822,10 +9360,6 @@ packages: serialize-javascript@6.0.2: resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==} - serve-static@1.15.0: - resolution: {integrity: sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==} - engines: {node: '>= 0.8.0'} - serve-static@1.16.2: resolution: {integrity: sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==} engines: {node: '>= 0.8.0'} @@ -9894,10 +9428,6 @@ packages: resolution: {integrity: sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==} engines: {node: '>= 0.4'} - side-channel@1.0.6: - resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==} - engines: {node: '>= 0.4'} - side-channel@1.1.0: resolution: {integrity: sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==} engines: {node: '>= 0.4'} @@ -10190,10 +9720,6 @@ packages: resolution: {integrity: sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==} engines: {node: '>=12.0.0'} - tinyglobby@0.2.9: - resolution: {integrity: sha512-8or1+BGEdk1Zkkw2ii16qSS7uVrQJPre5A9o/XkWPATkk23FZh/15BKFxPnlTy6vkljZxLqYCzzBMj30ZrSvjw==} - engines: {node: '>=12.0.0'} - tmp@0.0.33: resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==} engines: {node: '>=0.6.0'} @@ -10201,10 +9727,6 @@ packages: tmpl@1.0.5: resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==} - to-fast-properties@2.0.0: - resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} - engines: {node: '>=4'} - to-regex-range@5.0.1: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} @@ -10213,10 +9735,6 @@ packages: resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==} engines: {node: '>=0.6'} - tough-cookie@4.1.2: - resolution: {integrity: sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==} - engines: {node: '>=6'} - tough-cookie@4.1.4: resolution: {integrity: sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==} engines: {node: '>=6'} @@ -10270,9 +9788,6 @@ packages: tslib@1.14.1: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} - tslib@2.6.2: - resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} - tslib@2.8.1: resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} @@ -10351,10 +9866,6 @@ packages: resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==} engines: {node: '>=12.20'} - type-fest@4.15.0: - resolution: {integrity: sha512-tB9lu0pQpX5KJq54g+oHOLumOx+pMep4RaM6liXh2PKmVRFF+/vAtUP0ZaJ0kOySfVNjF6doBWPHhBhISKdlIA==} - engines: {node: '>=16'} - type-fest@4.40.1: resolution: {integrity: sha512-9YvLNnORDpI+vghLU/Nf+zSv0kL47KbVJ1o3sKgoTefl6i+zebxbiDQWoe/oWWqPhIgQdRZRT1KA9sCPL810SA==} engines: {node: '>=16'} @@ -10508,12 +10019,6 @@ packages: resolution: {integrity: sha512-d6Mhq8RJeGA8UfKCu54Um4lFA0eSaRa3XxdAJg8tIdxbu1ubW0hBCZUL7yI2uGyYCRndvbK8FLHzqy2XKfeMsg==} engines: {node: '>=14.0.0'} - update-browserslist-db@1.0.13: - resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==} - hasBin: true - peerDependencies: - browserslist: '>= 4.21.0' - update-browserslist-db@1.1.3: resolution: {integrity: sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==} hasBin: true @@ -10666,46 +10171,6 @@ packages: terser: optional: true - vite@6.1.1: - resolution: {integrity: sha512-4GgM54XrwRfrOp297aIYspIti66k56v16ZnqHvrIM7mG+HjDlAwS7p+Srr7J6fGvEdOJ5JcQ/D9T7HhtdXDTzA==} - engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} - hasBin: true - peerDependencies: - '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 - jiti: '>=1.21.0' - less: '*' - lightningcss: ^1.21.0 - sass: '*' - sass-embedded: '*' - stylus: '*' - sugarss: '*' - terser: ^5.16.0 - tsx: ^4.8.1 - yaml: ^2.4.2 - peerDependenciesMeta: - '@types/node': - optional: true - jiti: - optional: true - less: - optional: true - lightningcss: - optional: true - sass: - optional: true - sass-embedded: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - tsx: - optional: true - yaml: - optional: true - vite@6.2.5: resolution: {integrity: sha512-j023J/hCAa4pRIUH6J9HemwYfjB5llR2Ps0CWeikOtdR8+pAURAk0DoJC5/mm9kd+UgdnIy7d6HE4EAvlYhPhA==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} @@ -10935,9 +10400,6 @@ packages: yallist@3.1.1: resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==} - yallist@4.0.0: - resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - yaml@1.10.2: resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} engines: {node: '>= 6'} @@ -11002,7 +10464,7 @@ snapshots: '@ampproject/remapping@2.2.1': dependencies: - '@jridgewell/gen-mapping': 0.3.5 + '@jridgewell/gen-mapping': 0.3.8 '@jridgewell/trace-mapping': 0.3.25 '@architect/functions@7.0.0': @@ -11015,41 +10477,14 @@ snapshots: run-waterfall: 1.1.7 uid-safe: 2.1.5 - '@babel/code-frame@7.24.2': - dependencies: - '@babel/highlight': 7.24.2 - picocolors: 1.1.1 - '@babel/code-frame@7.26.2': dependencies: '@babel/helper-validator-identifier': 7.25.9 js-tokens: 4.0.0 picocolors: 1.1.1 - '@babel/compat-data@7.24.1': {} - '@babel/compat-data@7.26.8': {} - '@babel/core@7.24.3': - dependencies: - '@ampproject/remapping': 2.2.1 - '@babel/code-frame': 7.24.2 - '@babel/generator': 7.24.1 - '@babel/helper-compilation-targets': 7.23.6 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.3) - '@babel/helpers': 7.24.1 - '@babel/parser': 7.24.1 - '@babel/template': 7.24.0 - '@babel/traverse': 7.24.1 - '@babel/types': 7.24.0 - convert-source-map: 2.0.0 - debug: 4.3.7 - gensync: 1.0.0-beta.2 - json5: 2.2.3 - semver: 6.3.1 - transitivePeerDependencies: - - supports-color - '@babel/core@7.24.4': dependencies: '@ampproject/remapping': 2.2.1 @@ -11090,21 +10525,14 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/eslint-parser@7.24.1(@babel/core@7.24.3)(eslint@8.57.0)': + '@babel/eslint-parser@7.24.1(@babel/core@7.26.10)(eslint@8.57.0)': dependencies: - '@babel/core': 7.24.3 + '@babel/core': 7.26.10 '@nicolo-ribaudo/eslint-scope-5-internals': 5.1.1-v1 eslint: 8.57.0 eslint-visitor-keys: 2.1.0 semver: 6.3.1 - '@babel/generator@7.24.1': - dependencies: - '@babel/types': 7.24.0 - '@jridgewell/gen-mapping': 0.3.5 - '@jridgewell/trace-mapping': 0.3.25 - jsesc: 2.5.2 - '@babel/generator@7.26.10': dependencies: '@babel/parser': 7.26.10 @@ -11113,10 +10541,6 @@ snapshots: '@jridgewell/trace-mapping': 0.3.25 jsesc: 3.0.2 - '@babel/helper-annotate-as-pure@7.22.5': - dependencies: - '@babel/types': 7.26.10 - '@babel/helper-annotate-as-pure@7.25.9': dependencies: '@babel/types': 7.26.10 @@ -11125,48 +10549,14 @@ snapshots: dependencies: '@babel/types': 7.26.10 - '@babel/helper-compilation-targets@7.23.6': - dependencies: - '@babel/compat-data': 7.24.1 - '@babel/helper-validator-option': 7.23.5 - browserslist: 4.23.0 - lru-cache: 5.1.1 - semver: 6.3.1 - '@babel/helper-compilation-targets@7.26.5': dependencies: '@babel/compat-data': 7.26.8 '@babel/helper-validator-option': 7.25.9 - browserslist: 4.24.4 + browserslist: 4.24.5 lru-cache: 5.1.1 semver: 6.3.1 - '@babel/helper-create-class-features-plugin@7.24.1(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-environment-visitor': 7.22.20 - '@babel/helper-function-name': 7.23.0 - '@babel/helper-member-expression-to-functions': 7.23.0 - '@babel/helper-optimise-call-expression': 7.22.5 - '@babel/helper-replace-supers': 7.24.1(@babel/core@7.24.3) - '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 - '@babel/helper-split-export-declaration': 7.22.6 - semver: 6.3.1 - - '@babel/helper-create-class-features-plugin@7.24.1(@babel/core@7.26.10)': - dependencies: - '@babel/core': 7.26.10 - '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-environment-visitor': 7.22.20 - '@babel/helper-function-name': 7.23.0 - '@babel/helper-member-expression-to-functions': 7.23.0 - '@babel/helper-optimise-call-expression': 7.22.5 - '@babel/helper-replace-supers': 7.24.1(@babel/core@7.26.10) - '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 - '@babel/helper-split-export-declaration': 7.22.6 - semver: 6.3.1 - '@babel/helper-create-class-features-plugin@7.26.9(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 @@ -11180,17 +10570,10 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helper-create-regexp-features-plugin@7.22.9(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-annotate-as-pure': 7.22.5 - regexpu-core: 5.3.2 - semver: 6.3.1 - '@babel/helper-create-regexp-features-plugin@7.22.9(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-annotate-as-pure': 7.25.9 regexpu-core: 5.3.2 semver: 6.3.1 @@ -11206,17 +10589,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helper-define-polyfill-provider@0.4.2(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-compilation-targets': 7.26.5 - '@babel/helper-plugin-utils': 7.26.5 - debug: 4.4.0 - lodash.debounce: 4.0.8 - resolve: 1.22.8 - transitivePeerDependencies: - - supports-color - '@babel/helper-define-polyfill-provider@0.4.2(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 @@ -11232,14 +10604,10 @@ snapshots: '@babel/helper-function-name@7.23.0': dependencies: - '@babel/template': 7.24.0 - '@babel/types': 7.24.0 + '@babel/template': 7.26.9 + '@babel/types': 7.26.10 '@babel/helper-hoist-variables@7.22.5': - dependencies: - '@babel/types': 7.24.0 - - '@babel/helper-member-expression-to-functions@7.23.0': dependencies: '@babel/types': 7.26.10 @@ -11261,28 +10629,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helper-module-transforms@7.23.3(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-environment-visitor': 7.22.20 - '@babel/helper-module-imports': 7.25.9 - '@babel/helper-simple-access': 7.22.5 - '@babel/helper-split-export-declaration': 7.22.6 - '@babel/helper-validator-identifier': 7.22.20 - transitivePeerDependencies: - - supports-color - - '@babel/helper-module-transforms@7.23.3(@babel/core@7.26.10)': - dependencies: - '@babel/core': 7.26.10 - '@babel/helper-environment-visitor': 7.22.20 - '@babel/helper-module-imports': 7.25.9 - '@babel/helper-simple-access': 7.22.5 - '@babel/helper-split-export-declaration': 7.22.6 - '@babel/helper-validator-identifier': 7.22.20 - transitivePeerDependencies: - - supports-color - '@babel/helper-module-transforms@7.26.0(@babel/core@7.24.4)': dependencies: '@babel/core': 7.24.4 @@ -11301,10 +10647,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helper-optimise-call-expression@7.22.5': - dependencies: - '@babel/types': 7.26.10 - '@babel/helper-optimise-call-expression@7.25.9': dependencies: '@babel/types': 7.26.10 @@ -11313,34 +10655,13 @@ snapshots: '@babel/helper-plugin-utils@7.26.5': {} - '@babel/helper-remap-async-to-generator@7.22.9(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-environment-visitor': 7.22.20 - '@babel/helper-wrap-function': 7.22.9 - '@babel/helper-remap-async-to-generator@7.22.9(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-annotate-as-pure': 7.25.9 '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-wrap-function': 7.22.9 - '@babel/helper-replace-supers@7.24.1(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-environment-visitor': 7.22.20 - '@babel/helper-member-expression-to-functions': 7.23.0 - '@babel/helper-optimise-call-expression': 7.22.5 - - '@babel/helper-replace-supers@7.24.1(@babel/core@7.26.10)': - dependencies: - '@babel/core': 7.26.10 - '@babel/helper-environment-visitor': 7.22.20 - '@babel/helper-member-expression-to-functions': 7.23.0 - '@babel/helper-optimise-call-expression': 7.22.5 - '@babel/helper-replace-supers@7.26.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 @@ -11354,10 +10675,6 @@ snapshots: dependencies: '@babel/types': 7.26.10 - '@babel/helper-skip-transparent-expression-wrappers@7.22.5': - dependencies: - '@babel/types': 7.24.0 - '@babel/helper-skip-transparent-expression-wrappers@7.25.9': dependencies: '@babel/traverse': 7.26.10 @@ -11367,18 +10684,12 @@ snapshots: '@babel/helper-split-export-declaration@7.22.6': dependencies: - '@babel/types': 7.24.0 - - '@babel/helper-string-parser@7.24.1': {} + '@babel/types': 7.26.10 '@babel/helper-string-parser@7.25.9': {} - '@babel/helper-validator-identifier@7.22.20': {} - '@babel/helper-validator-identifier@7.25.9': {} - '@babel/helper-validator-option@7.23.5': {} - '@babel/helper-validator-option@7.25.9': {} '@babel/helper-wrap-function@7.22.9': @@ -11387,76 +10698,51 @@ snapshots: '@babel/template': 7.26.9 '@babel/types': 7.26.10 - '@babel/helpers@7.24.1': - dependencies: - '@babel/template': 7.24.0 - '@babel/traverse': 7.26.10 - '@babel/types': 7.24.0 - transitivePeerDependencies: - - supports-color - '@babel/helpers@7.26.10': dependencies: '@babel/template': 7.26.9 '@babel/types': 7.26.10 - '@babel/highlight@7.24.2': - dependencies: - '@babel/helper-validator-identifier': 7.25.9 - chalk: 2.4.2 - js-tokens: 4.0.0 - picocolors: 1.1.1 - - '@babel/parser@7.24.1': - dependencies: - '@babel/types': 7.24.0 - '@babel/parser@7.26.10': dependencies: '@babel/types': 7.26.10 - '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 - '@babel/plugin-transform-optional-chaining': 7.22.6(@babel/core@7.24.3) - '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 + '@babel/helper-skip-transparent-expression-wrappers': 7.25.9 '@babel/plugin-transform-optional-chaining': 7.22.6(@babel/core@7.26.10) + transitivePeerDependencies: + - supports-color '@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.26.10) + '@babel/helper-create-class-features-plugin': 7.26.9(@babel/core@7.26.10) '@babel/helper-plugin-utils': 7.26.5 + transitivePeerDependencies: + - supports-color '@babel/plugin-proposal-decorators@7.24.1(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.26.10) + '@babel/helper-create-class-features-plugin': 7.26.9(@babel/core@7.26.10) '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-decorators': 7.24.1(@babel/core@7.26.10) + transitivePeerDependencies: + - supports-color - '@babel/plugin-proposal-export-namespace-from@7.18.9(@babel/core@7.24.3)': + '@babel/plugin-proposal-export-namespace-from@7.18.9(@babel/core@7.26.10)': dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 - '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.3) + '@babel/core': 7.26.10 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.26.10) '@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.26.10)': dependencies: @@ -11470,29 +10756,22 @@ snapshots: '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.26.10) - '@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 - '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-plugin-utils': 7.24.0 - '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/helper-skip-transparent-expression-wrappers': 7.25.9 '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.26.10) + transitivePeerDependencies: + - supports-color '@babel/plugin-proposal-private-methods@7.18.6(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.26.10) + '@babel/helper-create-class-features-plugin': 7.26.9(@babel/core@7.26.10) '@babel/helper-plugin-utils': 7.26.5 - - '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 + transitivePeerDependencies: + - supports-color '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.26.10)': dependencies: @@ -11501,16 +10780,12 @@ snapshots: '@babel/plugin-proposal-private-property-in-object@7.21.11(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.26.10) + '@babel/helper-annotate-as-pure': 7.25.9 + '@babel/helper-create-class-features-plugin': 7.26.9(@babel/core@7.26.10) '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.26.10) - - '@babel/plugin-proposal-unicode-property-regex@7.18.6(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.26.5 + transitivePeerDependencies: + - supports-color '@babel/plugin-proposal-unicode-property-regex@7.18.6(@babel/core@7.26.10)': dependencies: @@ -11518,59 +10793,29 @@ snapshots: '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.26.10) '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.24.3)': + '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.26.10)': dependencies: - '@babel/core': 7.24.3 + '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.26.10)': + '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.24.3)': + '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.26.10)': dependencies: - '@babel/core': 7.24.3 + '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.26.10)': + '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - - '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.26.10)': - dependencies: - '@babel/core': 7.26.10 - '@babel/helper-plugin-utils': 7.26.5 - - '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - - '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.26.10)': - dependencies: - '@babel/core': 7.26.10 - '@babel/helper-plugin-utils': 7.26.5 - - '@babel/plugin-syntax-decorators@7.24.1(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 - '@babel/plugin-syntax-decorators@7.24.1(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-plugin-utils': 7.24.0 - - '@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.26.10)': @@ -11578,79 +10823,39 @@ snapshots: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-flow@7.18.6(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-flow@7.18.6(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-import-assertions@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-import-assertions@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-import-attributes@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-import-attributes@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 - '@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-plugin-utils': 7.24.0 - - '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.26.10)': @@ -11658,116 +10863,57 @@ snapshots: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-typescript@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-typescript@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.26.10) '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-arrow-functions@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-arrow-functions@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-async-generator-functions@7.22.7(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-environment-visitor': 7.22.20 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/helper-remap-async-to-generator': 7.22.9(@babel/core@7.24.3) - '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.3) - '@babel/plugin-transform-async-generator-functions@7.22.7(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 @@ -11776,15 +10922,6 @@ snapshots: '@babel/helper-remap-async-to-generator': 7.22.9(@babel/core@7.26.10) '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.26.10) - '@babel/plugin-transform-async-to-generator@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-module-imports': 7.25.9 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/helper-remap-async-to-generator': 7.22.9(@babel/core@7.24.3) - transitivePeerDependencies: - - supports-color - '@babel/plugin-transform-async-to-generator@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 @@ -11794,152 +10931,82 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/plugin-transform-block-scoped-functions@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-block-scoped-functions@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-block-scoping@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-block-scoping@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-class-properties@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-class-properties@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.26.10) - '@babel/helper-plugin-utils': 7.26.5 - - '@babel/plugin-transform-class-static-block@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.3) + '@babel/helper-create-class-features-plugin': 7.26.9(@babel/core@7.26.10) '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.24.3) + transitivePeerDependencies: + - supports-color '@babel/plugin-transform-class-static-block@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.26.10) + '@babel/helper-create-class-features-plugin': 7.26.9(@babel/core@7.26.10) '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.26.10) - - '@babel/plugin-transform-classes@7.22.6(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-compilation-targets': 7.23.6 - '@babel/helper-environment-visitor': 7.22.20 - '@babel/helper-function-name': 7.23.0 - '@babel/helper-optimise-call-expression': 7.22.5 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/helper-replace-supers': 7.24.1(@babel/core@7.24.3) - '@babel/helper-split-export-declaration': 7.22.6 - globals: 11.12.0 + transitivePeerDependencies: + - supports-color '@babel/plugin-transform-classes@7.22.6(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-compilation-targets': 7.23.6 + '@babel/helper-annotate-as-pure': 7.25.9 + '@babel/helper-compilation-targets': 7.26.5 '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-function-name': 7.23.0 - '@babel/helper-optimise-call-expression': 7.22.5 + '@babel/helper-optimise-call-expression': 7.25.9 '@babel/helper-plugin-utils': 7.26.5 - '@babel/helper-replace-supers': 7.24.1(@babel/core@7.26.10) + '@babel/helper-replace-supers': 7.26.5(@babel/core@7.26.10) '@babel/helper-split-export-declaration': 7.22.6 globals: 11.12.0 - - '@babel/plugin-transform-computed-properties@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/template': 7.24.0 + transitivePeerDependencies: + - supports-color '@babel/plugin-transform-computed-properties@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/template': 7.24.0 - - '@babel/plugin-transform-destructuring@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 + '@babel/template': 7.26.9 '@babel/plugin-transform-destructuring@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-dotall-regex@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-dotall-regex@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.26.10) '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-duplicate-keys@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-duplicate-keys@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-dynamic-import@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-transform-dynamic-import@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.26.10) - '@babel/plugin-transform-exponentiation-operator@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-builder-binary-assignment-operator-visitor': 7.22.5 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-exponentiation-operator@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-builder-binary-assignment-operator-visitor': 7.22.5 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-export-namespace-from@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-transform-export-namespace-from@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 @@ -11952,225 +11019,114 @@ snapshots: '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-flow': 7.18.6(@babel/core@7.26.10) - '@babel/plugin-transform-for-of@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-for-of@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-function-name@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-compilation-targets': 7.23.6 - '@babel/helper-function-name': 7.23.0 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-function-name@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-compilation-targets': 7.23.6 + '@babel/helper-compilation-targets': 7.26.5 '@babel/helper-function-name': 7.23.0 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-json-strings@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-transform-json-strings@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.26.10) - '@babel/plugin-transform-literals@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-literals@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-logical-assignment-operators@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.3) - '@babel/plugin-transform-logical-assignment-operators@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.26.10) - '@babel/plugin-transform-member-expression-literals@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-member-expression-literals@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-modules-amd@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.26.5 - transitivePeerDependencies: - - supports-color - '@babel/plugin-transform-modules-amd@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.26.10) - '@babel/helper-plugin-utils': 7.26.5 - transitivePeerDependencies: - - supports-color - - '@babel/plugin-transform-modules-commonjs@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.3) + '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.10) '@babel/helper-plugin-utils': 7.26.5 - '@babel/helper-simple-access': 7.22.5 transitivePeerDependencies: - supports-color '@babel/plugin-transform-modules-commonjs@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.26.10) + '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.10) '@babel/helper-plugin-utils': 7.26.5 '@babel/helper-simple-access': 7.22.5 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-modules-systemjs@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-hoist-variables': 7.22.5 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.26.5 - '@babel/helper-validator-identifier': 7.22.20 - transitivePeerDependencies: - - supports-color - '@babel/plugin-transform-modules-systemjs@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-hoist-variables': 7.22.5 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.26.10) - '@babel/helper-plugin-utils': 7.26.5 - '@babel/helper-validator-identifier': 7.22.20 - transitivePeerDependencies: - - supports-color - - '@babel/plugin-transform-modules-umd@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.3) + '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.10) '@babel/helper-plugin-utils': 7.26.5 + '@babel/helper-validator-identifier': 7.25.9 transitivePeerDependencies: - supports-color '@babel/plugin-transform-modules-umd@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.26.10) + '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.10) '@babel/helper-plugin-utils': 7.26.5 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.26.10) '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-new-target@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-new-target@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-nullish-coalescing-operator@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-transform-nullish-coalescing-operator@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.26.10) - '@babel/plugin-transform-numeric-separator@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.3) - '@babel/plugin-transform-numeric-separator@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.26.10) - '@babel/plugin-transform-object-rest-spread@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/compat-data': 7.24.1 - '@babel/core': 7.24.3 - '@babel/helper-compilation-targets': 7.23.6 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-transform-parameters': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-object-rest-spread@7.22.5(@babel/core@7.26.10)': dependencies: - '@babel/compat-data': 7.24.1 + '@babel/compat-data': 7.26.8 '@babel/core': 7.26.10 - '@babel/helper-compilation-targets': 7.23.6 + '@babel/helper-compilation-targets': 7.26.5 '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.26.10) '@babel/plugin-transform-parameters': 7.22.5(@babel/core@7.26.10) - '@babel/plugin-transform-object-super@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/helper-replace-supers': 7.24.1(@babel/core@7.24.3) - '@babel/plugin-transform-object-super@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/helper-replace-supers': 7.24.1(@babel/core@7.26.10) - - '@babel/plugin-transform-optional-catch-binding@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.3) + '@babel/helper-replace-supers': 7.26.5(@babel/core@7.26.10) + transitivePeerDependencies: + - supports-color '@babel/plugin-transform-optional-catch-binding@7.22.5(@babel/core@7.26.10)': dependencies: @@ -12178,42 +11134,20 @@ snapshots: '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.26.10) - '@babel/plugin-transform-optional-chaining@7.22.6(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-transform-optional-chaining@7.22.6(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 + '@babel/helper-skip-transparent-expression-wrappers': 7.25.9 '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.26.10) - - '@babel/plugin-transform-parameters@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 + transitivePeerDependencies: + - supports-color '@babel/plugin-transform-parameters@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-private-methods@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.26.5 - - '@babel/plugin-transform-private-methods@7.22.5(@babel/core@7.26.10)': - dependencies: - '@babel/core': 7.26.10 - '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.26.10) - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-private-methods@7.25.9(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 @@ -12222,49 +11156,26 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/plugin-transform-private-property-in-object@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.24.3) - '@babel/plugin-transform-private-property-in-object@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.26.10) + '@babel/helper-annotate-as-pure': 7.25.9 + '@babel/helper-create-class-features-plugin': 7.26.9(@babel/core@7.26.10) '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.26.10) - - '@babel/plugin-transform-property-literals@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 + transitivePeerDependencies: + - supports-color '@babel/plugin-transform-property-literals@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-react-display-name@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-react-display-name@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-react-jsx-development@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/plugin-transform-react-jsx': 7.22.5(@babel/core@7.24.3) - transitivePeerDependencies: - - supports-color - '@babel/plugin-transform-react-jsx-development@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 @@ -12282,57 +11193,29 @@ snapshots: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-module-imports': 7.25.9 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.24.3) - '@babel/types': 7.24.0 - transitivePeerDependencies: - - supports-color - '@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-annotate-as-pure': 7.25.9 '@babel/helper-module-imports': 7.25.9 '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.26.10) - '@babel/types': 7.24.0 + '@babel/types': 7.26.10 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-react-pure-annotations@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-react-pure-annotations@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-annotate-as-pure': 7.25.9 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-regenerator@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - regenerator-transform: 0.15.1 - '@babel/plugin-transform-regenerator@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 regenerator-transform: 0.15.1 - '@babel/plugin-transform-reserved-words@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-reserved-words@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 @@ -12350,213 +11233,74 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/plugin-transform-shorthand-properties@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-shorthand-properties@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-spread@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 - '@babel/plugin-transform-spread@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 - - '@babel/plugin-transform-sticky-regex@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 + '@babel/helper-skip-transparent-expression-wrappers': 7.25.9 + transitivePeerDependencies: + - supports-color '@babel/plugin-transform-sticky-regex@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-template-literals@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-template-literals@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-typeof-symbol@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-typeof-symbol@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-typescript@7.22.9(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-typescript@7.22.9(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.26.10) + '@babel/helper-annotate-as-pure': 7.25.9 + '@babel/helper-create-class-features-plugin': 7.26.9(@babel/core@7.26.10) '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.26.10) - - '@babel/plugin-transform-unicode-escapes@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.26.5 + transitivePeerDependencies: + - supports-color '@babel/plugin-transform-unicode-escapes@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-unicode-property-regex@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-unicode-property-regex@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.26.10) '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-unicode-regex@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-unicode-regex@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.26.10) '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-unicode-sets-regex@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.24.3) - '@babel/helper-plugin-utils': 7.26.5 - '@babel/plugin-transform-unicode-sets-regex@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.26.10) '@babel/helper-plugin-utils': 7.26.5 - '@babel/preset-env@7.22.9(@babel/core@7.24.3)': - dependencies: - '@babel/compat-data': 7.24.1 - '@babel/core': 7.24.3 - '@babel/helper-compilation-targets': 7.23.6 - '@babel/helper-plugin-utils': 7.24.0 - '@babel/helper-validator-option': 7.23.5 - '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.24.3) - '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.3) - '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.24.3) - '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.24.3) - '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-syntax-import-assertions': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-syntax-import-attributes': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.24.3) - '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.3) - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.3) - '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.24.3) - '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.24.3) - '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.24.3) - '@babel/plugin-transform-arrow-functions': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-async-generator-functions': 7.22.7(@babel/core@7.24.3) - '@babel/plugin-transform-async-to-generator': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-block-scoped-functions': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-block-scoping': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-class-properties': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-class-static-block': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-classes': 7.22.6(@babel/core@7.24.3) - '@babel/plugin-transform-computed-properties': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-destructuring': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-dotall-regex': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-duplicate-keys': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-dynamic-import': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-exponentiation-operator': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-export-namespace-from': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-for-of': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-function-name': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-json-strings': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-literals': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-logical-assignment-operators': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-member-expression-literals': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-modules-amd': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-modules-commonjs': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-modules-systemjs': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-modules-umd': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-new-target': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-nullish-coalescing-operator': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-numeric-separator': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-object-rest-spread': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-object-super': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-optional-catch-binding': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-optional-chaining': 7.22.6(@babel/core@7.24.3) - '@babel/plugin-transform-parameters': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-private-methods': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-private-property-in-object': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-property-literals': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-regenerator': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-reserved-words': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-shorthand-properties': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-spread': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-sticky-regex': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-template-literals': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-typeof-symbol': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-unicode-escapes': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-unicode-property-regex': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-unicode-regex': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-unicode-sets-regex': 7.22.5(@babel/core@7.24.3) - '@babel/preset-modules': 0.1.6(@babel/core@7.24.3) - '@babel/types': 7.24.0 - babel-plugin-polyfill-corejs2: 0.4.5(@babel/core@7.24.3) - babel-plugin-polyfill-corejs3: 0.8.3(@babel/core@7.24.3) - babel-plugin-polyfill-regenerator: 0.5.2(@babel/core@7.24.3) - core-js-compat: 3.32.0 - semver: 6.3.1 - transitivePeerDependencies: - - supports-color - '@babel/preset-env@7.22.9(@babel/core@7.26.10)': dependencies: - '@babel/compat-data': 7.24.1 + '@babel/compat-data': 7.26.8 '@babel/core': 7.26.10 - '@babel/helper-compilation-targets': 7.23.6 - '@babel/helper-plugin-utils': 7.24.0 - '@babel/helper-validator-option': 7.23.5 + '@babel/helper-compilation-targets': 7.26.5 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/helper-validator-option': 7.25.9 '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.22.5(@babel/core@7.26.10) '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.22.5(@babel/core@7.26.10) '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.26.10) @@ -12612,7 +11356,7 @@ snapshots: '@babel/plugin-transform-optional-catch-binding': 7.22.5(@babel/core@7.26.10) '@babel/plugin-transform-optional-chaining': 7.22.6(@babel/core@7.26.10) '@babel/plugin-transform-parameters': 7.22.5(@babel/core@7.26.10) - '@babel/plugin-transform-private-methods': 7.22.5(@babel/core@7.26.10) + '@babel/plugin-transform-private-methods': 7.25.9(@babel/core@7.26.10) '@babel/plugin-transform-private-property-in-object': 7.22.5(@babel/core@7.26.10) '@babel/plugin-transform-property-literals': 7.22.5(@babel/core@7.26.10) '@babel/plugin-transform-regenerator': 7.22.5(@babel/core@7.26.10) @@ -12627,7 +11371,7 @@ snapshots: '@babel/plugin-transform-unicode-regex': 7.22.5(@babel/core@7.26.10) '@babel/plugin-transform-unicode-sets-regex': 7.22.5(@babel/core@7.26.10) '@babel/preset-modules': 0.1.6(@babel/core@7.26.10) - '@babel/types': 7.24.0 + '@babel/types': 7.26.10 babel-plugin-polyfill-corejs2: 0.4.5(@babel/core@7.26.10) babel-plugin-polyfill-corejs3: 0.8.3(@babel/core@7.26.10) babel-plugin-polyfill-regenerator: 0.5.2(@babel/core@7.26.10) @@ -12636,41 +11380,20 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/preset-modules@0.1.6(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 - '@babel/plugin-proposal-unicode-property-regex': 7.18.6(@babel/core@7.24.3) - '@babel/plugin-transform-dotall-regex': 7.22.5(@babel/core@7.24.3) - '@babel/types': 7.24.0 - esutils: 2.0.3 - '@babel/preset-modules@0.1.6(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-plugin-utils': 7.24.0 + '@babel/helper-plugin-utils': 7.26.5 '@babel/plugin-proposal-unicode-property-regex': 7.18.6(@babel/core@7.26.10) '@babel/plugin-transform-dotall-regex': 7.22.5(@babel/core@7.26.10) - '@babel/types': 7.24.0 + '@babel/types': 7.26.10 esutils: 2.0.3 - '@babel/preset-react@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 - '@babel/helper-validator-option': 7.23.5 - '@babel/plugin-transform-react-display-name': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-react-jsx': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-react-jsx-development': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-react-pure-annotations': 7.22.5(@babel/core@7.24.3) - transitivePeerDependencies: - - supports-color - '@babel/preset-react@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-plugin-utils': 7.24.0 - '@babel/helper-validator-option': 7.23.5 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/helper-validator-option': 7.25.9 '@babel/plugin-transform-react-display-name': 7.22.5(@babel/core@7.26.10) '@babel/plugin-transform-react-jsx': 7.22.5(@babel/core@7.26.10) '@babel/plugin-transform-react-jsx-development': 7.22.5(@babel/core@7.26.10) @@ -12678,22 +11401,11 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/preset-typescript@7.22.5(@babel/core@7.24.3)': - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-plugin-utils': 7.24.0 - '@babel/helper-validator-option': 7.23.5 - '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-modules-commonjs': 7.22.5(@babel/core@7.24.3) - '@babel/plugin-transform-typescript': 7.22.9(@babel/core@7.24.3) - transitivePeerDependencies: - - supports-color - '@babel/preset-typescript@7.22.5(@babel/core@7.26.10)': dependencies: '@babel/core': 7.26.10 - '@babel/helper-plugin-utils': 7.24.0 - '@babel/helper-validator-option': 7.23.5 + '@babel/helper-plugin-utils': 7.26.5 + '@babel/helper-validator-option': 7.25.9 '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.26.10) '@babel/plugin-transform-modules-commonjs': 7.22.5(@babel/core@7.26.10) '@babel/plugin-transform-typescript': 7.22.9(@babel/core@7.26.10) @@ -12706,12 +11418,6 @@ snapshots: dependencies: regenerator-runtime: 0.14.1 - '@babel/template@7.24.0': - dependencies: - '@babel/code-frame': 7.24.2 - '@babel/parser': 7.24.1 - '@babel/types': 7.24.0 - '@babel/template@7.26.9': dependencies: '@babel/code-frame': 7.26.2 @@ -12720,15 +11426,15 @@ snapshots: '@babel/traverse@7.24.1': dependencies: - '@babel/code-frame': 7.24.2 - '@babel/generator': 7.24.1 + '@babel/code-frame': 7.26.2 + '@babel/generator': 7.26.10 '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-function-name': 7.23.0 '@babel/helper-hoist-variables': 7.22.5 '@babel/helper-split-export-declaration': 7.22.6 - '@babel/parser': 7.24.1 - '@babel/types': 7.24.0 - debug: 4.3.7 + '@babel/parser': 7.26.10 + '@babel/types': 7.26.10 + debug: 4.4.0 globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -12740,17 +11446,11 @@ snapshots: '@babel/parser': 7.26.10 '@babel/template': 7.26.9 '@babel/types': 7.26.10 - debug: 4.3.7 + debug: 4.4.0 globals: 11.12.0 transitivePeerDependencies: - supports-color - '@babel/types@7.24.0': - dependencies: - '@babel/helper-string-parser': 7.24.1 - '@babel/helper-validator-identifier': 7.22.20 - to-fast-properties: 2.0.0 - '@babel/types@7.26.10': dependencies: '@babel/helper-string-parser': 7.25.9 @@ -12866,7 +11566,7 @@ snapshots: p-limit: 2.3.0 preferred-pm: 3.0.3 resolve-from: 5.0.0 - semver: 7.5.4 + semver: 7.7.1 spawndamnit: 2.0.0 term-size: 2.2.1 tty-table: 4.1.6 @@ -12982,14 +11682,14 @@ snapshots: optionalDependencies: workerd: 1.20250224.0 - '@cloudflare/vite-plugin@0.1.13(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))(workerd@1.20250224.0)(wrangler@4.2.0(@cloudflare/workers-types@4.20250317.0))': + '@cloudflare/vite-plugin@0.1.13(vite@6.2.5(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))(workerd@1.20250224.0)(wrangler@4.2.0(@cloudflare/workers-types@4.20250317.0))': dependencies: '@cloudflare/unenv-preset': 1.1.1(unenv@2.0.0-rc.1)(workerd@1.20250224.0) '@hattip/adapter-node': 0.0.49 miniflare: 4.20250317.1 tinyglobby: 0.2.12 unenv: 2.0.0-rc.1 - vite: 6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) + vite: 6.2.5(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) wrangler: 4.2.0(@cloudflare/workers-types@4.20250317.0) ws: 8.18.0 transitivePeerDependencies: @@ -13784,12 +12484,6 @@ snapshots: '@types/yargs': 17.0.24 chalk: 4.1.2 - '@jridgewell/gen-mapping@0.3.5': - dependencies: - '@jridgewell/set-array': 1.2.1 - '@jridgewell/sourcemap-codec': 1.4.15 - '@jridgewell/trace-mapping': 0.3.25 - '@jridgewell/gen-mapping@0.3.8': dependencies: '@jridgewell/set-array': 1.2.1 @@ -13806,19 +12500,17 @@ snapshots: '@jridgewell/trace-mapping': 0.3.25 optional: true - '@jridgewell/sourcemap-codec@1.4.15': {} - '@jridgewell/sourcemap-codec@1.5.0': {} '@jridgewell/trace-mapping@0.3.25': dependencies: '@jridgewell/resolve-uri': 3.1.0 - '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/sourcemap-codec': 1.5.0 '@jridgewell/trace-mapping@0.3.9': dependencies: '@jridgewell/resolve-uri': 3.1.0 - '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/sourcemap-codec': 1.5.0 '@kamilkisiela/fast-url-parser@1.1.4': {} @@ -13970,7 +12662,7 @@ snapshots: proc-log: 3.0.0 promise-inflight: 1.0.1 promise-retry: 2.0.1 - semver: 7.5.4 + semver: 7.7.1 which: 3.0.1 transitivePeerDependencies: - bluebird @@ -13983,7 +12675,7 @@ snapshots: json-parse-even-better-errors: 3.0.1 normalize-package-data: 5.0.0 proc-log: 3.0.0 - semver: 7.5.4 + semver: 7.7.1 transitivePeerDependencies: - bluebird @@ -14137,11 +12829,11 @@ snapshots: '@oxc-project/types@0.61.2': {} - '@parcel/bundler-default@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/bundler-default@2.14.1(@parcel/core@2.14.1)': dependencies: '@parcel/diagnostic': 2.14.1 '@parcel/graph': 3.4.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/rust': 2.14.1 '@parcel/utils': 2.14.1 nullthrows: 1.1.1 @@ -14161,10 +12853,10 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/cache@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/cache@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/core': 2.14.1(@swc/helpers@0.5.15) - '@parcel/fs': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/core': 2.14.1 + '@parcel/fs': 2.14.1(@parcel/core@2.14.1) '@parcel/logger': 2.14.1 '@parcel/utils': 2.14.1 lmdb: 2.8.5 @@ -14189,9 +12881,9 @@ snapshots: dependencies: chalk: 4.1.2 - '@parcel/compressor-raw@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/compressor-raw@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) transitivePeerDependencies: - '@parcel/core' - napi-wasm @@ -14203,41 +12895,41 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/config-default@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5)': - dependencies: - '@parcel/bundler-default': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/compressor-raw': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/core': 2.14.1(@swc/helpers@0.5.15) - '@parcel/namer-default': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/optimizer-css': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/optimizer-htmlnano': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) - '@parcel/optimizer-image': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/optimizer-svgo': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/optimizer-swc': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) - '@parcel/packager-css': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/packager-html': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/packager-js': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/packager-raw': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/packager-svg': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/packager-wasm': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/reporter-dev-server': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/resolver-default': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/runtime-browser-hmr': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/runtime-js': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/runtime-rsc': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/runtime-service-worker': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/transformer-babel': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/transformer-css': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/transformer-html': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/transformer-image': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/transformer-js': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/transformer-json': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/transformer-node': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/transformer-postcss': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/transformer-posthtml': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/transformer-raw': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/transformer-react-refresh-wrap': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/transformer-svg': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/config-default@2.14.1(@parcel/core@2.14.1)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5)': + dependencies: + '@parcel/bundler-default': 2.14.1(@parcel/core@2.14.1) + '@parcel/compressor-raw': 2.14.1(@parcel/core@2.14.1) + '@parcel/core': 2.14.1 + '@parcel/namer-default': 2.14.1(@parcel/core@2.14.1) + '@parcel/optimizer-css': 2.14.1(@parcel/core@2.14.1) + '@parcel/optimizer-htmlnano': 2.14.1(@parcel/core@2.14.1)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) + '@parcel/optimizer-image': 2.14.1(@parcel/core@2.14.1) + '@parcel/optimizer-svgo': 2.14.1(@parcel/core@2.14.1) + '@parcel/optimizer-swc': 2.14.1(@parcel/core@2.14.1) + '@parcel/packager-css': 2.14.1(@parcel/core@2.14.1) + '@parcel/packager-html': 2.14.1(@parcel/core@2.14.1) + '@parcel/packager-js': 2.14.1(@parcel/core@2.14.1) + '@parcel/packager-raw': 2.14.1(@parcel/core@2.14.1) + '@parcel/packager-svg': 2.14.1(@parcel/core@2.14.1) + '@parcel/packager-wasm': 2.14.1(@parcel/core@2.14.1) + '@parcel/reporter-dev-server': 2.14.1(@parcel/core@2.14.1) + '@parcel/resolver-default': 2.14.1(@parcel/core@2.14.1) + '@parcel/runtime-browser-hmr': 2.14.1(@parcel/core@2.14.1) + '@parcel/runtime-js': 2.14.1(@parcel/core@2.14.1) + '@parcel/runtime-rsc': 2.14.1(@parcel/core@2.14.1) + '@parcel/runtime-service-worker': 2.14.1(@parcel/core@2.14.1) + '@parcel/transformer-babel': 2.14.1(@parcel/core@2.14.1) + '@parcel/transformer-css': 2.14.1(@parcel/core@2.14.1) + '@parcel/transformer-html': 2.14.1(@parcel/core@2.14.1) + '@parcel/transformer-image': 2.14.1(@parcel/core@2.14.1) + '@parcel/transformer-js': 2.14.1(@parcel/core@2.14.1) + '@parcel/transformer-json': 2.14.1(@parcel/core@2.14.1) + '@parcel/transformer-node': 2.14.1(@parcel/core@2.14.1) + '@parcel/transformer-postcss': 2.14.1(@parcel/core@2.14.1) + '@parcel/transformer-posthtml': 2.14.1(@parcel/core@2.14.1) + '@parcel/transformer-raw': 2.14.1(@parcel/core@2.14.1) + '@parcel/transformer-react-refresh-wrap': 2.14.1(@parcel/core@2.14.1) + '@parcel/transformer-svg': 2.14.1(@parcel/core@2.14.1) transitivePeerDependencies: - '@swc/helpers' - cssnano @@ -14290,28 +12982,28 @@ snapshots: - '@swc/helpers' - napi-wasm - '@parcel/core@2.14.1(@swc/helpers@0.5.15)': + '@parcel/core@2.14.1': dependencies: '@mischnic/json-sourcemap': 0.1.1 - '@parcel/cache': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/cache': 2.14.1(@parcel/core@2.14.1) '@parcel/diagnostic': 2.14.1 '@parcel/events': 2.14.1 '@parcel/feature-flags': 2.14.1 - '@parcel/fs': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/fs': 2.14.1(@parcel/core@2.14.1) '@parcel/graph': 3.4.1 '@parcel/logger': 2.14.1 - '@parcel/package-manager': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/package-manager': 2.14.1(@parcel/core@2.14.1) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/profiler': 2.14.1 '@parcel/rust': 2.14.1 '@parcel/source-map': 2.1.1 - '@parcel/types': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/types': 2.14.1(@parcel/core@2.14.1) '@parcel/utils': 2.14.1 - '@parcel/workers': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/workers': 2.14.1(@parcel/core@2.14.1) base-x: 3.0.11 - browserslist: 4.24.4 + browserslist: 4.24.5 clone: 2.1.2 - dotenv: 16.4.7 + dotenv: 16.5.0 dotenv-expand: 11.0.7 json5: 2.2.3 msgpackr: 1.11.2 @@ -14374,15 +13066,15 @@ snapshots: '@parcel/feature-flags@2.15.0': {} - '@parcel/fs@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/fs@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/core': 2.14.1(@swc/helpers@0.5.15) + '@parcel/core': 2.14.1 '@parcel/feature-flags': 2.14.1 '@parcel/rust': 2.14.1 '@parcel/types-internal': 2.14.1 '@parcel/utils': 2.14.1 '@parcel/watcher': 2.5.1 - '@parcel/workers': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/workers': 2.14.1(@parcel/core@2.14.1) transitivePeerDependencies: - napi-wasm @@ -14426,10 +13118,10 @@ snapshots: dependencies: chalk: 4.1.2 - '@parcel/namer-default@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/namer-default@2.14.1(@parcel/core@2.14.1)': dependencies: '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' @@ -14444,11 +13136,11 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/node-resolver-core@3.5.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/node-resolver-core@3.5.1(@parcel/core@2.14.1)': dependencies: '@mischnic/json-sourcemap': 0.1.1 '@parcel/diagnostic': 2.14.1 - '@parcel/fs': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/fs': 2.14.1(@parcel/core@2.14.1) '@parcel/rust': 2.14.1 '@parcel/utils': 2.14.1 nullthrows: 1.1.1 @@ -14470,14 +13162,14 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/optimizer-css@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/optimizer-css@2.14.1(@parcel/core@2.14.1)': dependencies: '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/source-map': 2.1.1 '@parcel/utils': 2.14.1 - browserslist: 4.24.4 - lightningcss: 1.29.3 + browserslist: 4.24.5 + lightningcss: 1.30.1 nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' @@ -14505,10 +13197,10 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/optimizer-htmlnano@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5)': + '@parcel/optimizer-htmlnano@2.14.1(@parcel/core@2.14.1)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5)': dependencies: '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/utils': 2.14.1 htmlnano: 2.1.1(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) nullthrows: 1.1.1 @@ -14526,14 +13218,14 @@ snapshots: - typescript - uncss - '@parcel/optimizer-image@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/optimizer-image@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/core': 2.14.1(@swc/helpers@0.5.15) + '@parcel/core': 2.14.1 '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/rust': 2.14.1 '@parcel/utils': 2.14.1 - '@parcel/workers': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/workers': 2.14.1(@parcel/core@2.14.1) transitivePeerDependencies: - napi-wasm @@ -14557,22 +13249,22 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/optimizer-svgo@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/optimizer-svgo@2.14.1(@parcel/core@2.14.1)': dependencies: '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/utils': 2.14.1 transitivePeerDependencies: - '@parcel/core' - napi-wasm - '@parcel/optimizer-swc@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)': + '@parcel/optimizer-swc@2.14.1(@parcel/core@2.14.1)': dependencies: '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/source-map': 2.1.1 '@parcel/utils': 2.14.1 - '@swc/core': 1.11.18(@swc/helpers@0.5.15) + '@swc/core': 1.11.24 nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' @@ -14592,17 +13284,17 @@ snapshots: - '@swc/helpers' - napi-wasm - '@parcel/package-manager@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)': + '@parcel/package-manager@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/core': 2.14.1(@swc/helpers@0.5.15) + '@parcel/core': 2.14.1 '@parcel/diagnostic': 2.14.1 - '@parcel/fs': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/fs': 2.14.1(@parcel/core@2.14.1) '@parcel/logger': 2.14.1 - '@parcel/node-resolver-core': 3.5.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/types': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/node-resolver-core': 3.5.1(@parcel/core@2.14.1) + '@parcel/types': 2.14.1(@parcel/core@2.14.1) '@parcel/utils': 2.14.1 - '@parcel/workers': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@swc/core': 1.11.18(@swc/helpers@0.5.15) + '@parcel/workers': 2.14.1(@parcel/core@2.14.1) + '@swc/core': 1.11.24 semver: 7.7.1 transitivePeerDependencies: - '@swc/helpers' @@ -14624,13 +13316,13 @@ snapshots: - '@swc/helpers' - napi-wasm - '@parcel/packager-css@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/packager-css@2.14.1(@parcel/core@2.14.1)': dependencies: '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/source-map': 2.1.1 '@parcel/utils': 2.14.1 - lightningcss: 1.29.3 + lightningcss: 1.30.1 nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' @@ -14648,10 +13340,10 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/packager-html@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/packager-html@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/types': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) + '@parcel/types': 2.14.1(@parcel/core@2.14.1) '@parcel/utils': 2.14.1 nullthrows: 1.1.1 posthtml: 0.16.6 @@ -14669,13 +13361,13 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/packager-js@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/packager-js@2.14.1(@parcel/core@2.14.1)': dependencies: '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/rust': 2.14.1 '@parcel/source-map': 2.1.1 - '@parcel/types': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/types': 2.14.1(@parcel/core@2.14.1) '@parcel/utils': 2.14.1 globals: 13.24.0 nullthrows: 1.1.1 @@ -14697,9 +13389,9 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/packager-raw@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/packager-raw@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) transitivePeerDependencies: - '@parcel/core' - napi-wasm @@ -14711,12 +13403,12 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/packager-react-static@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/packager-react-static@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/node-resolver-core': 3.5.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/node-resolver-core': 3.5.1(@parcel/core@2.14.1) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/rust': 2.14.1 - '@parcel/types': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/types': 2.14.1(@parcel/core@2.14.1) '@parcel/utils': 2.14.1 nullthrows: 1.1.1 rsc-html-stream: 0.0.4 @@ -14737,10 +13429,10 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/packager-svg@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/packager-svg@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/types': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) + '@parcel/types': 2.14.1(@parcel/core@2.14.1) '@parcel/utils': 2.14.1 posthtml: 0.16.6 transitivePeerDependencies: @@ -14757,9 +13449,9 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/packager-wasm@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/packager-wasm@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) transitivePeerDependencies: - '@parcel/core' - napi-wasm @@ -14771,9 +13463,9 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/plugin@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/plugin@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/types': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/types': 2.14.1(@parcel/core@2.14.1) transitivePeerDependencies: - '@parcel/core' - napi-wasm @@ -14799,10 +13491,10 @@ snapshots: '@parcel/types-internal': 2.15.0 chrome-trace-event: 1.0.4 - '@parcel/reporter-cli@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/reporter-cli@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/types': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) + '@parcel/types': 2.14.1(@parcel/core@2.14.1) '@parcel/utils': 2.14.1 chalk: 4.1.2 term-size: 2.2.1 @@ -14821,10 +13513,10 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/reporter-dev-server@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/reporter-dev-server@2.14.1(@parcel/core@2.14.1)': dependencies: '@parcel/codeframe': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/source-map': 2.1.1 '@parcel/utils': 2.14.1 transitivePeerDependencies: @@ -14841,9 +13533,9 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/reporter-tracer@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/reporter-tracer@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/utils': 2.14.1 chrome-trace-event: 1.0.4 nullthrows: 1.1.1 @@ -14861,10 +13553,10 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/resolver-default@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/resolver-default@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/node-resolver-core': 3.5.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/node-resolver-core': 3.5.1(@parcel/core@2.14.1) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) transitivePeerDependencies: - '@parcel/core' - napi-wasm @@ -14877,9 +13569,9 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/runtime-browser-hmr@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/runtime-browser-hmr@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/utils': 2.14.1 transitivePeerDependencies: - '@parcel/core' @@ -14893,10 +13585,10 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/runtime-js@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/runtime-js@2.14.1(@parcel/core@2.14.1)': dependencies: '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/utils': 2.14.1 nullthrows: 1.1.1 transitivePeerDependencies: @@ -14913,9 +13605,9 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/runtime-rsc@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/runtime-rsc@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/rust': 2.14.1 '@parcel/utils': 2.14.1 nullthrows: 1.1.1 @@ -14933,9 +13625,9 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/runtime-service-worker@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/runtime-service-worker@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/utils': 2.14.1 nullthrows: 1.1.1 transitivePeerDependencies: @@ -14992,13 +13684,13 @@ snapshots: dependencies: detect-libc: 1.0.3 - '@parcel/transformer-babel@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/transformer-babel@2.14.1(@parcel/core@2.14.1)': dependencies: '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/source-map': 2.1.1 '@parcel/utils': 2.14.1 - browserslist: 4.24.4 + browserslist: 4.24.5 json5: 2.2.3 nullthrows: 1.1.1 semver: 7.7.1 @@ -15020,14 +13712,14 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-css@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/transformer-css@2.14.1(@parcel/core@2.14.1)': dependencies: '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/source-map': 2.1.1 '@parcel/utils': 2.14.1 - browserslist: 4.24.4 - lightningcss: 1.29.3 + browserslist: 4.24.5 + lightningcss: 1.30.1 nullthrows: 1.1.1 transitivePeerDependencies: - '@parcel/core' @@ -15046,10 +13738,10 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-html@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/transformer-html@2.14.1(@parcel/core@2.14.1)': dependencies: '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/rust': 2.14.1 nullthrows: 1.1.1 posthtml: 0.16.6 @@ -15070,12 +13762,12 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-image@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/transformer-image@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/core': 2.14.1(@swc/helpers@0.5.15) - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/core': 2.14.1 + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/utils': 2.14.1 - '@parcel/workers': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/workers': 2.14.1(@parcel/core@2.14.1) nullthrows: 1.1.1 transitivePeerDependencies: - napi-wasm @@ -15090,17 +13782,17 @@ snapshots: transitivePeerDependencies: - napi-wasm - '@parcel/transformer-js@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/transformer-js@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/core': 2.14.1(@swc/helpers@0.5.15) + '@parcel/core': 2.14.1 '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/rust': 2.14.1 '@parcel/source-map': 2.1.1 '@parcel/utils': 2.14.1 - '@parcel/workers': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/workers': 2.14.1(@parcel/core@2.14.1) '@swc/helpers': 0.5.15 - browserslist: 4.24.4 + browserslist: 4.24.5 nullthrows: 1.1.1 regenerator-runtime: 0.14.1 semver: 7.7.1 @@ -15124,9 +13816,9 @@ snapshots: transitivePeerDependencies: - napi-wasm - '@parcel/transformer-json@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/transformer-json@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) json5: 2.2.3 transitivePeerDependencies: - '@parcel/core' @@ -15140,9 +13832,9 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-node@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/transformer-node@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) transitivePeerDependencies: - '@parcel/core' - napi-wasm @@ -15154,10 +13846,10 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-postcss@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/transformer-postcss@2.14.1(@parcel/core@2.14.1)': dependencies: '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/rust': 2.14.1 '@parcel/utils': 2.14.1 clone: 2.1.2 @@ -15182,9 +13874,9 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-posthtml@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/transformer-posthtml@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/utils': 2.14.1 nullthrows: 1.1.1 posthtml: 0.16.6 @@ -15203,9 +13895,9 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-raw@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/transformer-raw@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) transitivePeerDependencies: - '@parcel/core' - napi-wasm @@ -15217,10 +13909,10 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-react-refresh-wrap@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/transformer-react-refresh-wrap@2.14.1(@parcel/core@2.14.1)': dependencies: '@parcel/error-overlay': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/utils': 2.14.1 react-refresh: 0.14.2 transitivePeerDependencies: @@ -15237,9 +13929,9 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-react-static@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/transformer-react-static@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) transitivePeerDependencies: - '@parcel/core' - napi-wasm @@ -15251,10 +13943,10 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-svg@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/transformer-svg@2.14.1(@parcel/core@2.14.1)': dependencies: '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) '@parcel/rust': 2.14.1 nullthrows: 1.1.1 posthtml: 0.16.6 @@ -15288,10 +13980,10 @@ snapshots: '@parcel/source-map': 2.1.1 utility-types: 3.11.0 - '@parcel/types@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/types@2.14.1(@parcel/core@2.14.1)': dependencies: '@parcel/types-internal': 2.14.1 - '@parcel/workers': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/workers': 2.14.1(@parcel/core@2.14.1) transitivePeerDependencies: - '@parcel/core' - napi-wasm @@ -15390,9 +14082,9 @@ snapshots: '@parcel/watcher-win32-ia32': 2.5.1 '@parcel/watcher-win32-x64': 2.5.1 - '@parcel/workers@2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))': + '@parcel/workers@2.14.1(@parcel/core@2.14.1)': dependencies: - '@parcel/core': 2.14.1(@swc/helpers@0.5.15) + '@parcel/core': 2.14.1 '@parcel/diagnostic': 2.14.1 '@parcel/logger': 2.14.1 '@parcel/profiler': 2.14.1 @@ -15542,27 +14234,15 @@ snapshots: optionalDependencies: rollup: 4.34.8 - '@rollup/rollup-android-arm-eabi@4.24.0': - optional: true - '@rollup/rollup-android-arm-eabi@4.34.8': optional: true - '@rollup/rollup-android-arm64@4.24.0': - optional: true - '@rollup/rollup-android-arm64@4.34.8': optional: true - '@rollup/rollup-darwin-arm64@4.24.0': - optional: true - '@rollup/rollup-darwin-arm64@4.34.8': optional: true - '@rollup/rollup-darwin-x64@4.24.0': - optional: true - '@rollup/rollup-darwin-x64@4.34.8': optional: true @@ -15572,78 +14252,42 @@ snapshots: '@rollup/rollup-freebsd-x64@4.34.8': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.24.0': - optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.34.8': optional: true - '@rollup/rollup-linux-arm-musleabihf@4.24.0': - optional: true - '@rollup/rollup-linux-arm-musleabihf@4.34.8': optional: true - '@rollup/rollup-linux-arm64-gnu@4.24.0': - optional: true - '@rollup/rollup-linux-arm64-gnu@4.34.8': optional: true - '@rollup/rollup-linux-arm64-musl@4.24.0': - optional: true - '@rollup/rollup-linux-arm64-musl@4.34.8': optional: true '@rollup/rollup-linux-loongarch64-gnu@4.34.8': optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.24.0': - optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.34.8': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.24.0': - optional: true - '@rollup/rollup-linux-riscv64-gnu@4.34.8': optional: true - '@rollup/rollup-linux-s390x-gnu@4.24.0': - optional: true - '@rollup/rollup-linux-s390x-gnu@4.34.8': optional: true - '@rollup/rollup-linux-x64-gnu@4.24.0': - optional: true - '@rollup/rollup-linux-x64-gnu@4.34.8': optional: true - '@rollup/rollup-linux-x64-musl@4.24.0': - optional: true - '@rollup/rollup-linux-x64-musl@4.34.8': optional: true - '@rollup/rollup-win32-arm64-msvc@4.24.0': - optional: true - '@rollup/rollup-win32-arm64-msvc@4.34.8': optional: true - '@rollup/rollup-win32-ia32-msvc@4.24.0': - optional: true - '@rollup/rollup-win32-ia32-msvc@4.34.8': optional: true - '@rollup/rollup-win32-x64-msvc@4.24.0': - optional: true - '@rollup/rollup-win32-x64-msvc@4.34.8': optional: true @@ -15694,83 +14338,36 @@ snapshots: dependencies: '@sinonjs/commons': 2.0.0 - '@swc/core-darwin-arm64@1.11.18': - optional: true - '@swc/core-darwin-arm64@1.11.24': optional: true - '@swc/core-darwin-x64@1.11.18': - optional: true - '@swc/core-darwin-x64@1.11.24': optional: true - '@swc/core-linux-arm-gnueabihf@1.11.18': - optional: true - '@swc/core-linux-arm-gnueabihf@1.11.24': optional: true - '@swc/core-linux-arm64-gnu@1.11.18': - optional: true - '@swc/core-linux-arm64-gnu@1.11.24': optional: true - '@swc/core-linux-arm64-musl@1.11.18': - optional: true - '@swc/core-linux-arm64-musl@1.11.24': optional: true - '@swc/core-linux-x64-gnu@1.11.18': - optional: true - '@swc/core-linux-x64-gnu@1.11.24': optional: true - '@swc/core-linux-x64-musl@1.11.18': - optional: true - '@swc/core-linux-x64-musl@1.11.24': optional: true - '@swc/core-win32-arm64-msvc@1.11.18': - optional: true - '@swc/core-win32-arm64-msvc@1.11.24': optional: true - '@swc/core-win32-ia32-msvc@1.11.18': - optional: true - '@swc/core-win32-ia32-msvc@1.11.24': optional: true - '@swc/core-win32-x64-msvc@1.11.18': - optional: true - '@swc/core-win32-x64-msvc@1.11.24': optional: true - '@swc/core@1.11.18(@swc/helpers@0.5.15)': - dependencies: - '@swc/counter': 0.1.3 - '@swc/types': 0.1.21 - optionalDependencies: - '@swc/core-darwin-arm64': 1.11.18 - '@swc/core-darwin-x64': 1.11.18 - '@swc/core-linux-arm-gnueabihf': 1.11.18 - '@swc/core-linux-arm64-gnu': 1.11.18 - '@swc/core-linux-arm64-musl': 1.11.18 - '@swc/core-linux-x64-gnu': 1.11.18 - '@swc/core-linux-x64-musl': 1.11.18 - '@swc/core-win32-arm64-msvc': 1.11.18 - '@swc/core-win32-ia32-msvc': 1.11.18 - '@swc/core-win32-x64-msvc': 1.11.18 - '@swc/helpers': 0.5.15 - '@swc/core@1.11.24': dependencies: '@swc/counter': 0.1.3 @@ -15851,24 +14448,24 @@ snapshots: '@types/babel__core@7.20.5': dependencies: - '@babel/parser': 7.24.1 - '@babel/types': 7.24.0 + '@babel/parser': 7.26.10 + '@babel/types': 7.26.10 '@types/babel__generator': 7.6.8 '@types/babel__template': 7.4.1 '@types/babel__traverse': 7.20.5 '@types/babel__generator@7.6.8': dependencies: - '@babel/types': 7.24.0 + '@babel/types': 7.26.10 '@types/babel__template@7.4.1': dependencies: - '@babel/parser': 7.24.1 - '@babel/types': 7.24.0 + '@babel/parser': 7.26.10 + '@babel/types': 7.26.10 '@types/babel__traverse@7.20.5': dependencies: - '@babel/types': 7.24.0 + '@babel/types': 7.26.10 '@types/body-parser@1.19.5': dependencies: @@ -15975,13 +14572,13 @@ snapshots: '@types/jsdom@20.0.1': dependencies: '@types/node': 22.14.0 - '@types/tough-cookie': 4.0.2 + '@types/tough-cookie': 4.0.5 parse5: 7.1.2 '@types/jsdom@21.1.1': dependencies: '@types/node': 22.14.0 - '@types/tough-cookie': 4.0.2 + '@types/tough-cookie': 4.0.5 parse5: 7.1.2 '@types/jsesc@3.0.3': {} @@ -16121,8 +14718,6 @@ snapshots: dependencies: '@types/node': 22.14.0 - '@types/tough-cookie@4.0.2': {} - '@types/tough-cookie@4.0.5': {} '@types/unist@2.0.10': {} @@ -16131,7 +14726,7 @@ snapshots: '@types/wait-on@5.3.4': dependencies: - '@types/node': 20.11.30 + '@types/node': 22.14.0 '@types/yargs-parser@21.0.0': {} @@ -16166,12 +14761,12 @@ snapshots: '@typescript-eslint/type-utils': 7.5.0(eslint@8.57.0)(typescript@5.4.5) '@typescript-eslint/utils': 7.5.0(eslint@8.57.0)(typescript@5.4.5) '@typescript-eslint/visitor-keys': 7.5.0 - debug: 4.3.7 + debug: 4.4.0 eslint: 8.57.0 graphemer: 1.4.0 ignore: 5.3.1 natural-compare: 1.4.0 - semver: 7.5.4 + semver: 7.7.1 ts-api-utils: 1.3.0(typescript@5.4.5) optionalDependencies: typescript: 5.4.5 @@ -16204,7 +14799,7 @@ snapshots: '@typescript-eslint/types': 7.5.0 '@typescript-eslint/typescript-estree': 7.5.0(typescript@5.4.5) '@typescript-eslint/visitor-keys': 7.5.0 - debug: 4.3.7 + debug: 4.4.0 eslint: 8.57.0 optionalDependencies: typescript: 5.4.5 @@ -16345,8 +14940,8 @@ snapshots: '@vanilla-extract/integration@6.5.0(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0)': dependencies: - '@babel/core': 7.24.3 - '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.24.3) + '@babel/core': 7.26.10 + '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.26.10) '@vanilla-extract/babel-plugin-debug-ids': 1.0.5 '@vanilla-extract/css': 1.14.2 esbuild: 0.19.12 @@ -16354,7 +14949,7 @@ snapshots: find-up: 5.0.0 javascript-stringify: 2.1.0 lodash: 4.17.21 - mlly: 1.6.1 + mlly: 1.7.4 outdent: 0.8.0 vite: 5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0) vite-node: 1.6.0(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0) @@ -16374,8 +14969,8 @@ snapshots: dependencies: '@vanilla-extract/integration': 6.5.0(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0) outdent: 0.8.0 - postcss: 8.4.49 - postcss-load-config: 4.0.2(postcss@8.4.49) + postcss: 8.5.3 + postcss-load-config: 4.0.2(postcss@8.5.3) vite: rolldown-vite@6.3.0-beta.5(@types/node@22.14.0)(esbuild@0.25.0)(jiti@1.21.0)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) transitivePeerDependencies: - '@types/node' @@ -16392,8 +14987,8 @@ snapshots: dependencies: '@vanilla-extract/integration': 6.5.0(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0) outdent: 0.8.0 - postcss: 8.4.49 - postcss-load-config: 4.0.2(postcss@8.4.49) + postcss: 8.5.3 + postcss-load-config: 4.0.2(postcss@8.5.3) vite: 5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0) transitivePeerDependencies: - '@types/node' @@ -16406,13 +15001,13 @@ snapshots: - terser - ts-node - '@vanilla-extract/vite-plugin@3.9.5(@types/node@22.14.0)(lightningcss@1.30.1)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))': + '@vanilla-extract/vite-plugin@3.9.5(@types/node@22.14.0)(lightningcss@1.30.1)(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))': dependencies: '@vanilla-extract/integration': 6.5.0(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0) outdent: 0.8.0 - postcss: 8.4.49 - postcss-load-config: 4.0.2(postcss@8.4.49) - vite: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) + postcss: 8.5.3 + postcss-load-config: 4.0.2(postcss@8.5.3) + vite: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) transitivePeerDependencies: - '@types/node' - less @@ -16463,18 +15058,12 @@ snapshots: mime-types: 2.1.35 negotiator: 0.6.3 - acorn-jsx@5.3.2(acorn@8.11.3): - dependencies: - acorn: 8.11.3 - acorn-jsx@5.3.2(acorn@8.14.1): dependencies: acorn: 8.14.1 acorn-walk@8.3.2: {} - acorn@8.11.3: {} - acorn@8.14.0: {} acorn@8.14.1: {} @@ -16557,8 +15146,8 @@ snapshots: call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.23.3 - es-object-atoms: 1.0.0 - get-intrinsic: 1.2.4 + es-object-atoms: 1.1.1 + get-intrinsic: 1.3.0 is-string: 1.0.7 array-union@2.1.0: {} @@ -16569,7 +15158,7 @@ snapshots: define-properties: 1.2.1 es-abstract: 1.23.3 es-errors: 1.3.0 - es-object-atoms: 1.0.0 + es-object-atoms: 1.1.1 es-shim-unscopables: 1.0.2 array.prototype.findlastindex@1.2.5: @@ -16578,7 +15167,7 @@ snapshots: define-properties: 1.2.1 es-abstract: 1.23.3 es-errors: 1.3.0 - es-object-atoms: 1.0.0 + es-object-atoms: 1.1.1 es-shim-unscopables: 1.0.2 array.prototype.flat@1.3.2: @@ -16617,7 +15206,7 @@ snapshots: define-properties: 1.2.1 es-abstract: 1.23.3 es-errors: 1.3.0 - get-intrinsic: 1.2.4 + get-intrinsic: 1.3.0 is-array-buffer: 3.0.4 is-shared-array-buffer: 1.0.3 @@ -16659,23 +15248,10 @@ snapshots: babel-dead-code-elimination@1.0.6: dependencies: - '@babel/core': 7.24.3 - '@babel/parser': 7.24.1 - '@babel/traverse': 7.24.1 - '@babel/types': 7.24.0 - transitivePeerDependencies: - - supports-color - - babel-jest@29.7.0(@babel/core@7.24.3): - dependencies: - '@babel/core': 7.24.3 - '@jest/transform': 29.7.0 - '@types/babel__core': 7.20.5 - babel-plugin-istanbul: 6.1.1 - babel-preset-jest: 29.6.3(@babel/core@7.24.3) - chalk: 4.1.2 - graceful-fs: 4.2.11 - slash: 3.0.0 + '@babel/core': 7.26.10 + '@babel/parser': 7.26.10 + '@babel/traverse': 7.26.10 + '@babel/types': 7.26.10 transitivePeerDependencies: - supports-color @@ -16692,9 +15268,9 @@ snapshots: transitivePeerDependencies: - supports-color - babel-plugin-dev-expression@0.2.3(@babel/core@7.24.3): + babel-plugin-dev-expression@0.2.3(@babel/core@7.26.10): dependencies: - '@babel/core': 7.24.3 + '@babel/core': 7.26.10 babel-plugin-istanbul@6.1.1: dependencies: @@ -16728,18 +15304,9 @@ snapshots: transitivePeerDependencies: - supports-color - babel-plugin-polyfill-corejs2@0.4.5(@babel/core@7.24.3): - dependencies: - '@babel/compat-data': 7.24.1 - '@babel/core': 7.24.3 - '@babel/helper-define-polyfill-provider': 0.4.2(@babel/core@7.24.3) - semver: 6.3.1 - transitivePeerDependencies: - - supports-color - babel-plugin-polyfill-corejs2@0.4.5(@babel/core@7.26.10): dependencies: - '@babel/compat-data': 7.24.1 + '@babel/compat-data': 7.26.8 '@babel/core': 7.26.10 '@babel/helper-define-polyfill-provider': 0.4.2(@babel/core@7.26.10) semver: 6.3.1 @@ -16754,14 +15321,6 @@ snapshots: transitivePeerDependencies: - supports-color - babel-plugin-polyfill-corejs3@0.8.3(@babel/core@7.24.3): - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-define-polyfill-provider': 0.4.2(@babel/core@7.24.3) - core-js-compat: 3.32.0 - transitivePeerDependencies: - - supports-color - babel-plugin-polyfill-corejs3@0.8.3(@babel/core@7.26.10): dependencies: '@babel/core': 7.26.10 @@ -16777,13 +15336,6 @@ snapshots: transitivePeerDependencies: - supports-color - babel-plugin-polyfill-regenerator@0.5.2(@babel/core@7.24.3): - dependencies: - '@babel/core': 7.24.3 - '@babel/helper-define-polyfill-provider': 0.4.2(@babel/core@7.24.3) - transitivePeerDependencies: - - supports-color - babel-plugin-polyfill-regenerator@0.5.2(@babel/core@7.26.10): dependencies: '@babel/core': 7.26.10 @@ -16795,22 +15347,6 @@ snapshots: babel-plugin-transform-remove-console@6.9.4: {} - babel-preset-current-node-syntax@1.0.1(@babel/core@7.24.3): - dependencies: - '@babel/core': 7.24.3 - '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.3) - '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.24.3) - '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.24.3) - '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.3) - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.3) - '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.3) - '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.24.3) - babel-preset-current-node-syntax@1.0.1(@babel/core@7.26.10): dependencies: '@babel/core': 7.26.10 @@ -16827,12 +15363,6 @@ snapshots: '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.26.10) '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.26.10) - babel-preset-jest@29.6.3(@babel/core@7.24.3): - dependencies: - '@babel/core': 7.24.3 - babel-plugin-jest-hoist: 29.6.3 - babel-preset-current-node-syntax: 1.0.1(@babel/core@7.24.3) - babel-preset-jest@29.6.3(@babel/core@7.26.10): dependencies: '@babel/core': 7.26.10 @@ -16895,23 +15425,6 @@ snapshots: blake3-wasm@2.1.5: {} - body-parser@1.20.2: - dependencies: - bytes: 3.1.2 - content-type: 1.0.5 - debug: 2.6.9 - depd: 2.0.0 - destroy: 1.2.0 - http-errors: 2.0.0 - iconv-lite: 0.4.24 - on-finished: 2.4.1 - qs: 6.11.0 - raw-body: 2.5.2 - type-is: 1.6.18 - unpipe: 1.0.0 - transitivePeerDependencies: - - supports-color - body-parser@1.20.3: dependencies: bytes: 3.1.2 @@ -16960,20 +15473,6 @@ snapshots: dependencies: pako: 1.0.11 - browserslist@4.23.0: - dependencies: - caniuse-lite: 1.0.30001717 - electron-to-chromium: 1.4.714 - node-releases: 2.0.14 - update-browserslist-db: 1.0.13(browserslist@4.23.0) - - browserslist@4.24.4: - dependencies: - caniuse-lite: 1.0.30001717 - electron-to-chromium: 1.5.120 - node-releases: 2.0.19 - update-browserslist-db: 1.1.3(browserslist@4.24.4) - browserslist@4.24.5: dependencies: caniuse-lite: 1.0.30001717 @@ -17007,8 +15506,6 @@ snapshots: dependencies: streamsearch: 1.1.0 - bytes@3.0.0: {} - bytes@3.1.2: {} cac@6.7.14: {} @@ -17020,10 +15517,10 @@ snapshots: call-bind@1.0.7: dependencies: - es-define-property: 1.0.0 + es-define-property: 1.0.1 es-errors: 1.3.0 function-bind: 1.1.2 - get-intrinsic: 1.2.4 + get-intrinsic: 1.3.0 set-function-length: 1.2.2 call-bound@1.0.4: @@ -17201,18 +15698,6 @@ snapshots: dependencies: mime-db: 1.52.0 - compression@1.7.4: - dependencies: - accepts: 1.3.8 - bytes: 3.0.0 - compressible: 2.0.18 - debug: 2.6.9 - on-headers: 1.0.2 - safe-buffer: 5.1.2 - vary: 1.1.2 - transitivePeerDependencies: - - supports-color - compression@1.8.0: dependencies: bytes: 3.1.2 @@ -17249,8 +15734,6 @@ snapshots: cookie@0.5.0: {} - cookie@0.6.0: {} - cookie@0.7.1: {} cookie@0.7.2: {} @@ -17261,7 +15744,7 @@ snapshots: core-js-compat@3.32.0: dependencies: - browserslist: 4.23.0 + browserslist: 4.24.5 core-util-is@1.0.3: {} @@ -17402,10 +15885,6 @@ snapshots: dependencies: ms: 2.1.3 - debug@4.3.7: - dependencies: - ms: 2.1.3 - debug@4.4.0: dependencies: ms: 2.1.3 @@ -17441,9 +15920,9 @@ snapshots: define-data-property@1.1.4: dependencies: - es-define-property: 1.0.0 + es-define-property: 1.0.1 es-errors: 1.3.0 - gopd: 1.0.1 + gopd: 1.2.0 define-properties@1.2.1: dependencies: @@ -17556,8 +16035,6 @@ snapshots: dotenv-json@1.0.0: {} - dotenv@16.4.7: {} - dotenv@16.5.0: {} dotenv@8.6.0: {} @@ -17579,10 +16056,6 @@ snapshots: ee-first@1.1.1: {} - electron-to-chromium@1.4.714: {} - - electron-to-chromium@1.5.120: {} - electron-to-chromium@1.5.155: {} emittery@0.13.1: {} @@ -17631,19 +16104,19 @@ snapshots: data-view-buffer: 1.0.1 data-view-byte-length: 1.0.1 data-view-byte-offset: 1.0.0 - es-define-property: 1.0.0 + es-define-property: 1.0.1 es-errors: 1.3.0 - es-object-atoms: 1.0.0 + es-object-atoms: 1.1.1 es-set-tostringtag: 2.0.3 es-to-primitive: 1.2.1 function.prototype.name: 1.1.6 - get-intrinsic: 1.2.4 + get-intrinsic: 1.3.0 get-symbol-description: 1.0.2 globalthis: 1.0.3 - gopd: 1.0.1 + gopd: 1.2.0 has-property-descriptors: 1.0.2 has-proto: 1.0.3 - has-symbols: 1.0.3 + has-symbols: 1.1.0 hasown: 2.0.2 internal-slot: 1.0.7 is-array-buffer: 3.0.4 @@ -17655,7 +16128,7 @@ snapshots: is-string: 1.0.7 is-typed-array: 1.1.13 is-weakref: 1.0.2 - object-inspect: 1.13.1 + object-inspect: 1.13.4 object-keys: 1.1.1 object.assign: 4.1.5 regexp.prototype.flags: 1.5.2 @@ -17671,10 +16144,6 @@ snapshots: unbox-primitive: 1.0.2 which-typed-array: 1.1.15 - es-define-property@1.0.0: - dependencies: - get-intrinsic: 1.2.4 - es-define-property@1.0.1: {} es-errors@1.3.0: {} @@ -17687,28 +16156,24 @@ snapshots: es-errors: 1.3.0 es-set-tostringtag: 2.0.3 function-bind: 1.1.2 - get-intrinsic: 1.2.4 + get-intrinsic: 1.3.0 globalthis: 1.0.3 has-property-descriptors: 1.0.2 has-proto: 1.0.3 - has-symbols: 1.0.3 + has-symbols: 1.1.0 internal-slot: 1.0.7 iterator.prototype: 1.1.2 safe-array-concat: 1.1.2 es-module-lexer@1.5.4: {} - es-object-atoms@1.0.0: - dependencies: - es-errors: 1.3.0 - es-object-atoms@1.1.1: dependencies: es-errors: 1.3.0 es-set-tostringtag@2.0.3: dependencies: - get-intrinsic: 1.2.4 + get-intrinsic: 1.3.0 has-tostringtag: 1.0.2 hasown: 2.0.2 @@ -17883,17 +16348,17 @@ snapshots: optionalDependencies: source-map: 0.6.1 - eslint-config-react-app@7.0.1(@babel/plugin-syntax-flow@7.18.6(@babel/core@7.24.3))(@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.24.3))(eslint@8.57.0)(jest@29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0))(typescript@5.4.5): + eslint-config-react-app@7.0.1(@babel/plugin-syntax-flow@7.18.6(@babel/core@7.26.10))(@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.26.10))(eslint@8.57.0)(jest@29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0))(typescript@5.4.5): dependencies: - '@babel/core': 7.24.3 - '@babel/eslint-parser': 7.24.1(@babel/core@7.24.3)(eslint@8.57.0) + '@babel/core': 7.26.10 + '@babel/eslint-parser': 7.24.1(@babel/core@7.26.10)(eslint@8.57.0) '@rushstack/eslint-patch': 1.10.1 '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5) '@typescript-eslint/parser': 5.62.0(eslint@8.57.0)(typescript@5.4.5) babel-preset-react-app: 10.0.1 confusing-browser-globals: 1.0.11 eslint: 8.57.0 - eslint-plugin-flowtype: 8.0.3(@babel/plugin-syntax-flow@7.18.6(@babel/core@7.24.3))(@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.24.3))(eslint@8.57.0) + eslint-plugin-flowtype: 8.0.3(@babel/plugin-syntax-flow@7.18.6(@babel/core@7.26.10))(@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.26.10))(eslint@8.57.0) eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0) eslint-plugin-jest: 25.7.0(@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(jest@29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0))(typescript@5.4.5) eslint-plugin-jsx-a11y: 6.8.0(eslint@8.57.0) @@ -17938,10 +16403,10 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-flowtype@8.0.3(@babel/plugin-syntax-flow@7.18.6(@babel/core@7.24.3))(@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.24.3))(eslint@8.57.0): + eslint-plugin-flowtype@8.0.3(@babel/plugin-syntax-flow@7.18.6(@babel/core@7.26.10))(@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.26.10))(eslint@8.57.0): dependencies: - '@babel/plugin-syntax-flow': 7.18.6(@babel/core@7.24.3) - '@babel/plugin-transform-react-jsx': 7.22.5(@babel/core@7.24.3) + '@babel/plugin-syntax-flow': 7.18.6(@babel/core@7.26.10) + '@babel/plugin-transform-react-jsx': 7.22.5(@babel/core@7.26.10) eslint: 8.57.0 lodash: 4.17.21 string-natural-compare: 3.0.1 @@ -18046,7 +16511,7 @@ snapshots: dependencies: eslint: 8.57.0 - eslint-plugin-react-hooks@6.1.0-canary-38ef6550-20250508(eslint@8.57.0): + eslint-plugin-react-hooks@6.1.0-canary-99efc627-20250523(eslint@8.57.0): dependencies: '@babel/core': 7.26.10 '@babel/parser': 7.26.10 @@ -18115,7 +16580,7 @@ snapshots: ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.3 - debug: 4.3.7 + debug: 4.4.0 doctrine: 3.0.0 escape-string-regexp: 4.0.0 eslint-scope: 7.2.2 @@ -18147,8 +16612,8 @@ snapshots: espree@9.6.1: dependencies: - acorn: 8.11.3 - acorn-jsx: 5.3.2(acorn@8.11.3) + acorn: 8.14.1 + acorn-jsx: 5.3.2(acorn@8.14.1) eslint-visitor-keys: 3.4.3 esprima@4.0.1: {} @@ -18224,51 +16689,15 @@ snapshots: exit-hook@2.2.1: {} - exit@0.1.2: {} - - expect@29.7.0: - dependencies: - '@jest/expect-utils': 29.7.0 - jest-get-type: 29.6.3 - jest-matcher-utils: 29.7.0 - jest-message-util: 29.7.0 - jest-util: 29.7.0 - - express@4.19.2: - dependencies: - accepts: 1.3.8 - array-flatten: 1.1.1 - body-parser: 1.20.2 - content-disposition: 0.5.4 - content-type: 1.0.5 - cookie: 0.6.0 - cookie-signature: 1.0.6 - debug: 2.6.9 - depd: 2.0.0 - encodeurl: 1.0.2 - escape-html: 1.0.3 - etag: 1.8.1 - finalhandler: 1.2.0 - fresh: 0.5.2 - http-errors: 2.0.0 - merge-descriptors: 1.0.1 - methods: 1.1.2 - on-finished: 2.4.1 - parseurl: 1.3.3 - path-to-regexp: 0.1.7 - proxy-addr: 2.0.7 - qs: 6.11.0 - range-parser: 1.2.1 - safe-buffer: 5.2.1 - send: 0.18.0 - serve-static: 1.15.0 - setprototypeof: 1.2.0 - statuses: 2.0.1 - type-is: 1.6.18 - utils-merge: 1.0.1 - vary: 1.1.2 - transitivePeerDependencies: - - supports-color + exit@0.1.2: {} + + expect@29.7.0: + dependencies: + '@jest/expect-utils': 29.7.0 + jest-get-type: 29.6.3 + jest-matcher-utils: 29.7.0 + jest-message-util: 29.7.0 + jest-util: 29.7.0 express@4.21.2: dependencies: @@ -18356,10 +16785,6 @@ snapshots: dependencies: bser: 2.1.1 - fdir@6.4.0(picomatch@4.0.2): - optionalDependencies: - picomatch: 4.0.2 - fdir@6.4.3(picomatch@4.0.2): optionalDependencies: picomatch: 4.0.2 @@ -18372,18 +16797,6 @@ snapshots: dependencies: to-regex-range: 5.0.1 - finalhandler@1.2.0: - dependencies: - debug: 2.6.9 - encodeurl: 1.0.2 - escape-html: 1.0.3 - on-finished: 2.4.1 - parseurl: 1.3.3 - statuses: 2.0.1 - unpipe: 1.0.0 - transitivePeerDependencies: - - supports-color - finalhandler@1.3.1: dependencies: debug: 2.6.9 @@ -18440,7 +16853,7 @@ snapshots: dezalgo: 1.0.4 hexoid: 1.0.0 once: 1.4.0 - qs: 6.12.0 + qs: 6.14.0 forwarded@0.2.0: {} @@ -18495,14 +16908,6 @@ snapshots: get-caller-file@2.0.5: {} - get-intrinsic@1.2.4: - dependencies: - es-errors: 1.3.0 - function-bind: 1.1.2 - has-proto: 1.0.3 - has-symbols: 1.0.3 - hasown: 2.0.2 - get-intrinsic@1.3.0: dependencies: call-bind-apply-helpers: 1.0.2 @@ -18538,7 +16943,7 @@ snapshots: dependencies: call-bind: 1.0.7 es-errors: 1.3.0 - get-intrinsic: 1.2.4 + get-intrinsic: 1.3.0 get-tsconfig@4.10.0: dependencies: @@ -18631,10 +17036,6 @@ snapshots: globrex@0.1.2: {} - gopd@1.0.1: - dependencies: - get-intrinsic: 1.2.4 - gopd@1.2.0: {} graceful-fs@4.2.11: {} @@ -18664,17 +17065,15 @@ snapshots: has-property-descriptors@1.0.2: dependencies: - es-define-property: 1.0.0 + es-define-property: 1.0.1 has-proto@1.0.3: {} - has-symbols@1.0.3: {} - has-symbols@1.1.0: {} has-tostringtag@1.0.2: dependencies: - has-symbols: 1.0.3 + has-symbols: 1.1.0 hasown@2.0.2: dependencies: @@ -18874,7 +17273,7 @@ snapshots: dependencies: es-errors: 1.3.0 hasown: 2.0.2 - side-channel: 1.0.6 + side-channel: 1.1.0 interpret@1.4.0: {} @@ -18900,7 +17299,7 @@ snapshots: is-array-buffer@3.0.4: dependencies: call-bind: 1.0.7 - get-intrinsic: 1.2.4 + get-intrinsic: 1.3.0 is-arrayish@0.2.1: {} @@ -19029,7 +17428,7 @@ snapshots: is-symbol@1.0.4: dependencies: - has-symbols: 1.0.3 + has-symbols: 1.1.0 is-typed-array@1.1.13: dependencies: @@ -19044,7 +17443,7 @@ snapshots: is-weakset@2.0.3: dependencies: call-bind: 1.0.7 - get-intrinsic: 1.2.4 + get-intrinsic: 1.3.0 is-windows@1.0.2: {} @@ -19104,8 +17503,8 @@ snapshots: iterator.prototype@1.1.2: dependencies: define-properties: 1.2.1 - get-intrinsic: 1.2.4 - has-symbols: 1.0.3 + get-intrinsic: 1.3.0 + has-symbols: 1.1.0 reflect.getprototypeof: 1.0.6 set-function-name: 2.0.2 @@ -19486,7 +17885,7 @@ snapshots: rrweb-cssom: 0.6.0 saxes: 6.0.0 symbol-tree: 3.2.4 - tough-cookie: 4.1.2 + tough-cookie: 4.1.4 w3c-xmlserializer: 4.0.0 webidl-conversions: 7.0.0 whatwg-encoding: 2.0.0 @@ -19501,8 +17900,6 @@ snapshots: jsesc@0.5.0: {} - jsesc@2.5.2: {} - jsesc@3.0.2: {} json-parse-better-errors@1.0.2: {} @@ -19579,81 +17976,36 @@ snapshots: prelude-ls: 1.2.1 type-check: 0.4.0 - lightningcss-darwin-arm64@1.29.3: - optional: true - lightningcss-darwin-arm64@1.30.1: optional: true - lightningcss-darwin-x64@1.29.3: - optional: true - lightningcss-darwin-x64@1.30.1: optional: true - lightningcss-freebsd-x64@1.29.3: - optional: true - lightningcss-freebsd-x64@1.30.1: optional: true - lightningcss-linux-arm-gnueabihf@1.29.3: - optional: true - lightningcss-linux-arm-gnueabihf@1.30.1: optional: true - lightningcss-linux-arm64-gnu@1.29.3: - optional: true - lightningcss-linux-arm64-gnu@1.30.1: optional: true - lightningcss-linux-arm64-musl@1.29.3: - optional: true - lightningcss-linux-arm64-musl@1.30.1: optional: true - lightningcss-linux-x64-gnu@1.29.3: - optional: true - lightningcss-linux-x64-gnu@1.30.1: optional: true - lightningcss-linux-x64-musl@1.29.3: - optional: true - lightningcss-linux-x64-musl@1.30.1: optional: true - lightningcss-win32-arm64-msvc@1.29.3: - optional: true - lightningcss-win32-arm64-msvc@1.30.1: optional: true - lightningcss-win32-x64-msvc@1.29.3: - optional: true - lightningcss-win32-x64-msvc@1.30.1: optional: true - lightningcss@1.29.3: - dependencies: - detect-libc: 2.0.3 - optionalDependencies: - lightningcss-darwin-arm64: 1.29.3 - lightningcss-darwin-x64: 1.29.3 - lightningcss-freebsd-x64: 1.29.3 - lightningcss-linux-arm-gnueabihf: 1.29.3 - lightningcss-linux-arm64-gnu: 1.29.3 - lightningcss-linux-arm64-musl: 1.29.3 - lightningcss-linux-x64-gnu: 1.29.3 - lightningcss-linux-x64-musl: 1.29.3 - lightningcss-win32-arm64-msvc: 1.29.3 - lightningcss-win32-x64-msvc: 1.29.3 - lightningcss@1.30.1: dependencies: detect-libc: 2.0.3 @@ -19755,10 +18107,6 @@ snapshots: dependencies: yallist: 3.1.1 - lru-cache@6.0.0: - dependencies: - yallist: 4.0.0 - lru-cache@7.18.3: {} lunr@2.3.9: {} @@ -20007,8 +18355,6 @@ snapshots: type-fest: 0.13.1 yargs-parser: 18.1.3 - merge-descriptors@1.0.1: {} - merge-descriptors@1.0.3: {} merge-stream@2.0.0: {} @@ -20435,23 +18781,6 @@ snapshots: min-indent@1.0.1: {} - miniflare@3.20250214.0: - dependencies: - '@cspotcode/source-map-support': 0.8.1 - acorn: 8.14.0 - acorn-walk: 8.3.2 - exit-hook: 2.2.1 - glob-to-regexp: 0.4.1 - stoppable: 1.1.0 - undici: 5.28.5 - workerd: 1.20250224.0 - ws: 8.18.0 - youch: 3.2.3 - zod: 3.22.3 - transitivePeerDependencies: - - bufferutil - - utf-8-validate - miniflare@3.20250214.1: dependencies: '@cspotcode/source-map-support': 0.8.1 @@ -20537,13 +18866,6 @@ snapshots: mkdirp-classic@0.5.3: {} - mlly@1.6.1: - dependencies: - acorn: 8.14.1 - pathe: 1.1.2 - pkg-types: 1.0.3 - ufo: 1.5.4 - mlly@1.7.4: dependencies: acorn: 8.14.1 @@ -20622,8 +18944,6 @@ snapshots: object-assign: 4.1.1 thenify-all: 1.6.0 - nanoid@3.3.7: {} - nanoid@3.3.8: {} natural-compare-lite@1.4.0: {} @@ -20674,8 +18994,6 @@ snapshots: range-parser: 1.2.1 type-is: 1.6.18 - node-releases@2.0.14: {} - node-releases@2.0.19: {} node-webtokens@1.0.4: {} @@ -20691,7 +19009,7 @@ snapshots: dependencies: hosted-git-info: 6.1.1 is-core-module: 2.13.1 - semver: 7.5.4 + semver: 7.7.1 validate-npm-package-license: 3.0.4 normalize-path@3.0.0: {} @@ -20744,8 +19062,6 @@ snapshots: object-hash@3.0.0: {} - object-inspect@1.13.1: {} - object-inspect@1.13.4: {} object-keys@1.1.1: {} @@ -20754,21 +19070,21 @@ snapshots: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - has-symbols: 1.0.3 + has-symbols: 1.1.0 object-keys: 1.1.1 object.entries@1.1.8: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-object-atoms: 1.0.0 + es-object-atoms: 1.1.1 object.fromentries@2.0.8: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.23.3 - es-object-atoms: 1.0.0 + es-object-atoms: 1.1.1 object.groupby@1.0.3: dependencies: @@ -20780,13 +19096,13 @@ snapshots: dependencies: define-properties: 1.2.1 es-abstract: 1.23.3 - es-object-atoms: 1.0.0 + es-object-atoms: 1.1.1 object.values@1.2.0: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-object-atoms: 1.0.0 + es-object-atoms: 1.1.1 ohash@1.1.4: {} @@ -20881,19 +19197,19 @@ snapshots: pako@1.0.11: {} - parcel@2.14.1(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5): + parcel@2.14.1(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5): dependencies: - '@parcel/config-default': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) - '@parcel/core': 2.14.1(@swc/helpers@0.5.15) + '@parcel/config-default': 2.14.1(@parcel/core@2.14.1)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) + '@parcel/core': 2.14.1 '@parcel/diagnostic': 2.14.1 '@parcel/events': 2.14.1 '@parcel/feature-flags': 2.14.1 - '@parcel/fs': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/fs': 2.14.1(@parcel/core@2.14.1) '@parcel/logger': 2.14.1 - '@parcel/package-manager': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) - '@parcel/reporter-cli': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/reporter-dev-server': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) - '@parcel/reporter-tracer': 2.14.1(@parcel/core@2.14.1(@swc/helpers@0.5.15)) + '@parcel/package-manager': 2.14.1(@parcel/core@2.14.1) + '@parcel/reporter-cli': 2.14.1(@parcel/core@2.14.1) + '@parcel/reporter-dev-server': 2.14.1(@parcel/core@2.14.1) + '@parcel/reporter-tracer': 2.14.1(@parcel/core@2.14.1) '@parcel/utils': 2.14.1 chalk: 4.1.2 commander: 12.1.0 @@ -20998,8 +19314,6 @@ snapshots: path-to-regexp@0.1.12: {} - path-to-regexp@0.1.7: {} - path-to-regexp@6.3.0: {} path-type@3.0.0: @@ -21044,12 +19358,6 @@ snapshots: dependencies: find-up: 4.1.0 - pkg-types@1.0.3: - dependencies: - jsonc-parser: 3.2.1 - mlly: 1.6.1 - pathe: 1.1.2 - pkg-types@1.3.1: dependencies: confbox: 0.1.8 @@ -21066,24 +19374,24 @@ snapshots: possible-typed-array-names@1.0.0: {} - postcss-import@15.1.0(postcss@8.4.49): + postcss-import@15.1.0(postcss@8.5.3): dependencies: - postcss: 8.4.49 + postcss: 8.5.3 postcss-value-parser: 4.2.0 read-cache: 1.0.0 resolve: 1.22.8 - postcss-js@4.0.1(postcss@8.4.49): + postcss-js@4.0.1(postcss@8.5.3): dependencies: camelcase-css: 2.0.1 - postcss: 8.4.49 + postcss: 8.5.3 - postcss-load-config@4.0.2(postcss@8.4.49): + postcss-load-config@4.0.2(postcss@8.5.3): dependencies: lilconfig: 3.1.1 yaml: 2.6.0 optionalDependencies: - postcss: 8.4.49 + postcss: 8.5.3 postcss-load-config@6.0.1(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(yaml@2.6.0): dependencies: @@ -21094,9 +19402,9 @@ snapshots: tsx: 4.19.3 yaml: 2.6.0 - postcss-nested@6.0.1(postcss@8.4.49): + postcss-nested@6.0.1(postcss@8.5.3): dependencies: - postcss: 8.4.49 + postcss: 8.5.3 postcss-selector-parser: 6.0.16 postcss-selector-parser@6.0.16: @@ -21106,12 +19414,6 @@ snapshots: postcss-value-parser@4.2.0: {} - postcss@8.4.49: - dependencies: - nanoid: 3.3.7 - picocolors: 1.1.1 - source-map-js: 1.2.1 - postcss@8.5.3: dependencies: nanoid: 3.3.8 @@ -21198,7 +19500,7 @@ snapshots: proxy-agent@6.4.0: dependencies: agent-base: 7.1.1 - debug: 4.3.7 + debug: 4.4.0 http-proxy-agent: 7.0.2 https-proxy-agent: 7.0.5 lru-cache: 7.18.3 @@ -21238,17 +19540,9 @@ snapshots: pure-rand@6.0.2: {} - qs@6.11.0: - dependencies: - side-channel: 1.0.6 - - qs@6.12.0: - dependencies: - side-channel: 1.0.6 - qs@6.13.0: dependencies: - side-channel: 1.0.6 + side-channel: 1.1.0 qs@6.14.0: dependencies: @@ -21284,8 +19578,6 @@ snapshots: react-is@19.1.0: {} - react-refresh@0.14.0: {} - react-refresh@0.14.2: {} react-refresh@0.16.0: {} @@ -21374,7 +19666,7 @@ snapshots: define-properties: 1.2.1 es-abstract: 1.23.3 es-errors: 1.3.0 - get-intrinsic: 1.2.4 + get-intrinsic: 1.3.0 globalthis: 1.0.3 which-builtin-type: 1.1.3 @@ -21514,7 +19806,7 @@ snapshots: rolldown-vite@6.3.0-beta.3(@types/node@22.14.0)(esbuild@0.25.0)(jiti@1.21.0)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0): dependencies: '@oxc-project/runtime': 0.61.2 - lightningcss: 1.29.3 + lightningcss: 1.30.1 picomatch: 4.0.2 postcss: 8.5.3 rolldown: 1.0.0-beta.7-commit.7452fa0(@oxc-project/runtime@0.61.2)(typescript@5.4.5) @@ -21532,7 +19824,7 @@ snapshots: rolldown-vite@6.3.0-beta.5(@types/node@22.14.0)(esbuild@0.25.0)(jiti@1.21.0)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0): dependencies: '@oxc-project/runtime': 0.61.2 - lightningcss: 1.29.3 + lightningcss: 1.30.1 picomatch: 4.0.2 postcss: 8.5.3 rolldown: 1.0.0-beta.7-commit.e117288(@oxc-project/runtime@0.61.2)(typescript@5.4.5) @@ -21605,28 +19897,6 @@ snapshots: dependencies: estree-walker: 0.6.1 - rollup@4.24.0: - dependencies: - '@types/estree': 1.0.6 - optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.24.0 - '@rollup/rollup-android-arm64': 4.24.0 - '@rollup/rollup-darwin-arm64': 4.24.0 - '@rollup/rollup-darwin-x64': 4.24.0 - '@rollup/rollup-linux-arm-gnueabihf': 4.24.0 - '@rollup/rollup-linux-arm-musleabihf': 4.24.0 - '@rollup/rollup-linux-arm64-gnu': 4.24.0 - '@rollup/rollup-linux-arm64-musl': 4.24.0 - '@rollup/rollup-linux-powerpc64le-gnu': 4.24.0 - '@rollup/rollup-linux-riscv64-gnu': 4.24.0 - '@rollup/rollup-linux-s390x-gnu': 4.24.0 - '@rollup/rollup-linux-x64-gnu': 4.24.0 - '@rollup/rollup-linux-x64-musl': 4.24.0 - '@rollup/rollup-win32-arm64-msvc': 4.24.0 - '@rollup/rollup-win32-ia32-msvc': 4.24.0 - '@rollup/rollup-win32-x64-msvc': 4.24.0 - fsevents: 2.3.3 - rollup@4.34.8: dependencies: '@types/estree': 1.0.6 @@ -21666,7 +19936,7 @@ snapshots: rxjs@7.8.1: dependencies: - tslib: 2.6.2 + tslib: 2.8.1 sade@1.8.1: dependencies: @@ -21675,8 +19945,8 @@ snapshots: safe-array-concat@1.1.2: dependencies: call-bind: 1.0.7 - get-intrinsic: 1.2.4 - has-symbols: 1.0.3 + get-intrinsic: 1.3.0 + has-symbols: 1.1.0 isarray: 2.0.5 safe-buffer@5.1.2: {} @@ -21701,30 +19971,8 @@ snapshots: semver@6.3.1: {} - semver@7.5.4: - dependencies: - lru-cache: 6.0.0 - semver@7.7.1: {} - send@0.18.0: - dependencies: - debug: 2.6.9 - depd: 2.0.0 - destroy: 1.2.0 - encodeurl: 1.0.2 - escape-html: 1.0.3 - etag: 1.8.1 - fresh: 0.5.2 - http-errors: 2.0.0 - mime: 1.6.0 - ms: 2.1.3 - on-finished: 2.4.1 - range-parser: 1.2.1 - statuses: 2.0.1 - transitivePeerDependencies: - - supports-color - send@0.19.0: dependencies: debug: 2.6.9 @@ -21747,15 +19995,6 @@ snapshots: dependencies: randombytes: 2.1.0 - serve-static@1.15.0: - dependencies: - encodeurl: 1.0.2 - escape-html: 1.0.3 - parseurl: 1.3.3 - send: 0.18.0 - transitivePeerDependencies: - - supports-color - serve-static@1.16.2: dependencies: encodeurl: 2.0.0 @@ -21774,8 +20013,8 @@ snapshots: define-data-property: 1.1.4 es-errors: 1.3.0 function-bind: 1.1.2 - get-intrinsic: 1.2.4 - gopd: 1.0.1 + get-intrinsic: 1.3.0 + gopd: 1.2.0 has-property-descriptors: 1.0.2 set-function-name@2.0.2: @@ -21867,13 +20106,6 @@ snapshots: object-inspect: 1.13.4 side-channel-map: 1.0.1 - side-channel@1.0.6: - dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - get-intrinsic: 1.2.4 - object-inspect: 1.13.1 - side-channel@1.1.0: dependencies: es-errors: 1.3.0 @@ -22041,40 +20273,40 @@ snapshots: define-properties: 1.2.1 es-abstract: 1.23.3 es-errors: 1.3.0 - es-object-atoms: 1.0.0 - get-intrinsic: 1.2.4 - gopd: 1.0.1 - has-symbols: 1.0.3 + es-object-atoms: 1.1.1 + get-intrinsic: 1.3.0 + gopd: 1.2.0 + has-symbols: 1.1.0 internal-slot: 1.0.7 regexp.prototype.flags: 1.5.2 set-function-name: 2.0.2 - side-channel: 1.0.6 + side-channel: 1.1.0 string.prototype.padend@3.1.6: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.23.3 - es-object-atoms: 1.0.0 + es-object-atoms: 1.1.1 string.prototype.trim@1.2.9: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.23.3 - es-object-atoms: 1.0.0 + es-object-atoms: 1.1.1 string.prototype.trimend@1.0.8: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-object-atoms: 1.0.0 + es-object-atoms: 1.1.1 string.prototype.trimstart@1.0.8: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-object-atoms: 1.0.0 + es-object-atoms: 1.1.1 string_decoder@1.1.1: dependencies: @@ -22115,7 +20347,7 @@ snapshots: sucrase@3.35.0: dependencies: - '@jridgewell/gen-mapping': 0.3.5 + '@jridgewell/gen-mapping': 0.3.8 commander: 4.1.1 glob: 10.3.10 lines-and-columns: 1.2.4 @@ -22133,8 +20365,8 @@ snapshots: formidable: 2.1.2 methods: 1.1.2 mime: 2.6.0 - qs: 6.12.0 - semver: 7.5.4 + qs: 6.14.0 + semver: 7.7.1 transitivePeerDependencies: - supports-color @@ -22177,11 +20409,11 @@ snapshots: normalize-path: 3.0.0 object-hash: 3.0.0 picocolors: 1.1.1 - postcss: 8.4.49 - postcss-import: 15.1.0(postcss@8.4.49) - postcss-js: 4.0.1(postcss@8.4.49) - postcss-load-config: 4.0.2(postcss@8.4.49) - postcss-nested: 6.0.1(postcss@8.4.49) + postcss: 8.5.3 + postcss-import: 15.1.0(postcss@8.5.3) + postcss-js: 4.0.1(postcss@8.5.3) + postcss-load-config: 4.0.2(postcss@8.5.3) + postcss-nested: 6.0.1(postcss@8.5.3) postcss-selector-parser: 6.0.16 resolve: 1.22.8 sucrase: 3.35.0 @@ -22243,32 +20475,18 @@ snapshots: fdir: 6.4.3(picomatch@4.0.2) picomatch: 4.0.2 - tinyglobby@0.2.9: - dependencies: - fdir: 6.4.0(picomatch@4.0.2) - picomatch: 4.0.2 - tmp@0.0.33: dependencies: os-tmpdir: 1.0.2 tmpl@1.0.5: {} - to-fast-properties@2.0.0: {} - to-regex-range@5.0.1: dependencies: is-number: 7.0.0 toidentifier@1.0.1: {} - tough-cookie@4.1.2: - dependencies: - psl: 1.9.0 - punycode: 2.3.0 - universalify: 0.2.0 - url-parse: 1.5.10 - tough-cookie@4.1.4: dependencies: psl: 1.9.0 @@ -22313,8 +20531,6 @@ snapshots: tslib@1.14.1: {} - tslib@2.6.2: {} - tslib@2.8.1: {} tsscmp@1.0.6: {} @@ -22325,17 +20541,17 @@ snapshots: cac: 6.7.14 chokidar: 3.6.0 consola: 3.2.3 - debug: 4.3.7 + debug: 4.4.0 esbuild: 0.23.1 execa: 5.1.1 joycon: 3.1.1 picocolors: 1.1.1 postcss-load-config: 6.0.1(jiti@1.21.0)(postcss@8.5.3)(tsx@4.19.3)(yaml@2.6.0) resolve-from: 5.0.0 - rollup: 4.24.0 + rollup: 4.34.8 source-map: 0.8.0-beta.0 sucrase: 3.35.0 - tinyglobby: 0.2.9 + tinyglobby: 0.2.12 tree-kill: 1.2.2 optionalDependencies: '@swc/core': 1.11.24 @@ -22389,8 +20605,6 @@ snapshots: type-fest@2.19.0: {} - type-fest@4.15.0: {} - type-fest@4.40.1: {} type-is@1.6.18: @@ -22408,7 +20622,7 @@ snapshots: dependencies: call-bind: 1.0.7 for-each: 0.3.3 - gopd: 1.0.1 + gopd: 1.2.0 has-proto: 1.0.3 is-typed-array: 1.1.13 @@ -22417,7 +20631,7 @@ snapshots: available-typed-arrays: 1.0.7 call-bind: 1.0.7 for-each: 0.3.3 - gopd: 1.0.1 + gopd: 1.2.0 has-proto: 1.0.3 is-typed-array: 1.1.13 @@ -22425,7 +20639,7 @@ snapshots: dependencies: call-bind: 1.0.7 for-each: 0.3.3 - gopd: 1.0.1 + gopd: 1.2.0 has-proto: 1.0.3 is-typed-array: 1.1.13 possible-typed-array-names: 1.0.0 @@ -22453,7 +20667,7 @@ snapshots: dependencies: call-bind: 1.0.7 has-bigints: 1.0.2 - has-symbols: 1.0.3 + has-symbols: 1.1.0 which-boxed-primitive: 1.0.2 undici-types@5.26.5: {} @@ -22599,18 +20813,6 @@ snapshots: webpack-sources: 3.2.3 webpack-virtual-modules: 0.6.2 - update-browserslist-db@1.0.13(browserslist@4.23.0): - dependencies: - browserslist: 4.23.0 - escalade: 3.2.0 - picocolors: 1.1.1 - - update-browserslist-db@1.1.3(browserslist@4.24.4): - dependencies: - browserslist: 4.24.4 - escalade: 3.2.0 - picocolors: 1.1.1 - update-browserslist-db@1.1.3(browserslist@4.24.5): dependencies: browserslist: 4.24.5 @@ -22710,11 +20912,11 @@ snapshots: vite-env-only@3.0.1(rolldown-vite@6.3.0-beta.5(@types/node@22.14.0)(esbuild@0.25.0)(jiti@1.21.0)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0)): dependencies: - '@babel/core': 7.24.3 - '@babel/generator': 7.24.1 - '@babel/parser': 7.24.1 - '@babel/traverse': 7.24.1 - '@babel/types': 7.24.0 + '@babel/core': 7.26.10 + '@babel/generator': 7.26.10 + '@babel/parser': 7.26.10 + '@babel/traverse': 7.26.10 + '@babel/types': 7.26.10 babel-dead-code-elimination: 1.0.6 micromatch: 4.0.5 vite: rolldown-vite@6.3.0-beta.5(@types/node@22.14.0)(esbuild@0.25.0)(jiti@1.21.0)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0) @@ -22723,27 +20925,27 @@ snapshots: vite-env-only@3.0.1(vite@5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0)): dependencies: - '@babel/core': 7.24.3 - '@babel/generator': 7.24.1 - '@babel/parser': 7.24.1 - '@babel/traverse': 7.24.1 - '@babel/types': 7.24.0 + '@babel/core': 7.26.10 + '@babel/generator': 7.26.10 + '@babel/parser': 7.26.10 + '@babel/traverse': 7.26.10 + '@babel/types': 7.26.10 babel-dead-code-elimination: 1.0.6 micromatch: 4.0.5 vite: 5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0) transitivePeerDependencies: - supports-color - vite-env-only@3.0.1(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)): + vite-env-only@3.0.1(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)): dependencies: - '@babel/core': 7.24.3 - '@babel/generator': 7.24.1 - '@babel/parser': 7.24.1 - '@babel/traverse': 7.24.1 - '@babel/types': 7.24.0 + '@babel/core': 7.26.10 + '@babel/generator': 7.26.10 + '@babel/parser': 7.26.10 + '@babel/traverse': 7.26.10 + '@babel/types': 7.26.10 babel-dead-code-elimination: 1.0.6 micromatch: 4.0.5 - vite: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) + vite: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) transitivePeerDependencies: - supports-color @@ -22787,7 +20989,7 @@ snapshots: vite-tsconfig-paths@4.3.2(rolldown-vite@6.3.0-beta.3(@types/node@22.14.0)(esbuild@0.25.0)(jiti@1.21.0)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0))(typescript@5.4.5): dependencies: - debug: 4.3.7 + debug: 4.4.0 globrex: 0.1.2 tsconfck: 3.0.3(typescript@5.4.5) optionalDependencies: @@ -22798,7 +21000,7 @@ snapshots: vite-tsconfig-paths@4.3.2(rolldown-vite@6.3.0-beta.5(@types/node@22.14.0)(esbuild@0.25.0)(jiti@1.21.0)(tsx@4.19.3)(typescript@5.4.5)(yaml@2.6.0))(typescript@5.4.5): dependencies: - debug: 4.3.7 + debug: 4.4.0 globrex: 0.1.2 tsconfck: 3.0.3(typescript@5.4.5) optionalDependencies: @@ -22809,7 +21011,7 @@ snapshots: vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0)): dependencies: - debug: 4.3.7 + debug: 4.4.0 globrex: 0.1.2 tsconfck: 3.0.3(typescript@5.4.5) optionalDependencies: @@ -22818,24 +21020,24 @@ snapshots: - supports-color - typescript - vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)): + vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@6.2.5(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)): dependencies: - debug: 4.3.7 + debug: 4.4.0 globrex: 0.1.2 tsconfck: 3.0.3(typescript@5.4.5) optionalDependencies: - vite: 6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) + vite: 6.2.5(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) transitivePeerDependencies: - supports-color - typescript - vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)): + vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)): dependencies: - debug: 4.3.7 + debug: 4.4.0 globrex: 0.1.2 tsconfck: 3.0.3(typescript@5.4.5) optionalDependencies: - vite: 6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) + vite: 6.2.5(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0) transitivePeerDependencies: - supports-color - typescript @@ -22854,39 +21056,13 @@ snapshots: vite@5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0): dependencies: esbuild: 0.19.12 - postcss: 8.4.49 - rollup: 4.24.0 - optionalDependencies: - '@types/node': 22.14.0 - fsevents: 2.3.3 - lightningcss: 1.30.1 - terser: 5.15.0 - - vite@6.1.1(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0): - dependencies: - esbuild: 0.24.2 - postcss: 8.5.3 - rollup: 4.34.8 - optionalDependencies: - '@types/node': 20.11.30 - fsevents: 2.3.3 - jiti: 1.21.0 - lightningcss: 1.30.1 - tsx: 4.19.3 - yaml: 2.6.0 - - vite@6.1.1(@types/node@22.14.0)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0): - dependencies: - esbuild: 0.24.2 postcss: 8.5.3 rollup: 4.34.8 optionalDependencies: '@types/node': 22.14.0 fsevents: 2.3.3 - jiti: 1.21.0 lightningcss: 1.30.1 - tsx: 4.19.3 - yaml: 2.6.0 + terser: 5.15.0 vite@6.2.5(@types/node@20.11.30)(jiti@1.21.0)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0): dependencies: @@ -23026,7 +21202,7 @@ snapshots: available-typed-arrays: 1.0.7 call-bind: 1.0.7 for-each: 0.3.3 - gopd: 1.0.1 + gopd: 1.2.0 has-tostringtag: 1.0.2 which@1.3.1: @@ -23136,8 +21312,6 @@ snapshots: yallist@3.1.1: {} - yallist@4.0.0: {} - yaml@1.10.2: {} yaml@2.6.0: {} From 8c95759527785d97f5409c1139fa275a3789e30b Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Tue, 27 May 2025 13:36:19 -0700 Subject: [PATCH 116/143] chore: mark new APIs as unstable (#13685) --- .../helpers/rsc-parcel/src/entry.browser.tsx | 8 ++++---- .../helpers/rsc-parcel/src/entry.rsc.ts | 6 +++--- .../helpers/rsc-parcel/src/entry.ssr.tsx | 4 ++-- integration/helpers/rsc-parcel/src/routes.ts | 2 +- .../helpers/rsc-vite/src/entry.browser.tsx | 12 ++++++------ integration/helpers/rsc-vite/src/entry.rsc.tsx | 4 ++-- integration/helpers/rsc-vite/src/entry.ssr.tsx | 5 ++++- integration/helpers/rsc-vite/src/routes.ts | 2 +- integration/rsc/rsc-test.ts | 4 ++-- packages/react-router/dom-export.ts | 2 ++ packages/react-router/index.ts | 16 +++++++++++----- packages/react-router/rsc-export.ts | 18 +++++++++--------- playground/rsc-parcel/src/entry.browser.tsx | 8 ++++---- playground/rsc-parcel/src/entry.rsc.ts | 6 +++--- playground/rsc-parcel/src/entry.ssr.tsx | 4 ++-- playground/rsc-parcel/src/routes.ts | 2 +- .../rsc-vite/src/browser/entry.browser.tsx | 12 ++++++------ playground/rsc-vite/src/routes.ts | 2 +- playground/rsc-vite/src/rsc/entry.rsc.tsx | 4 ++-- playground/rsc-vite/src/ssr/entry.ssr.tsx | 5 ++++- 20 files changed, 70 insertions(+), 56 deletions(-) diff --git a/integration/helpers/rsc-parcel/src/entry.browser.tsx b/integration/helpers/rsc-parcel/src/entry.browser.tsx index 2f412c8596..af2621c657 100644 --- a/integration/helpers/rsc-parcel/src/entry.browser.tsx +++ b/integration/helpers/rsc-parcel/src/entry.browser.tsx @@ -3,11 +3,11 @@ import * as React from "react"; import { hydrateRoot } from "react-dom/client"; import { - createCallServer, - getServerStream, - RSCHydratedRouter, + unstable_createCallServer as createCallServer, + unstable_getServerStream as getServerStream, + unstable_RSCHydratedRouter as RSCHydratedRouter, } from "react-router"; -import type { ServerPayload } from "react-router/rsc"; +import type { unstable_ServerPayload as ServerPayload } from "react-router/rsc"; import { createFromReadableStream, encodeReply, diff --git a/integration/helpers/rsc-parcel/src/entry.rsc.ts b/integration/helpers/rsc-parcel/src/entry.rsc.ts index 8085fe18e3..6e52b6a682 100644 --- a/integration/helpers/rsc-parcel/src/entry.rsc.ts +++ b/integration/helpers/rsc-parcel/src/entry.rsc.ts @@ -8,9 +8,9 @@ import { // @ts-expect-error } from "react-server-dom-parcel/server.edge"; import { - type DecodeCallServerFunction, - type DecodeFormActionFunction, - matchRSCServerRequest, + type unstable_DecodeCallServerFunction as DecodeCallServerFunction, + type unstable_DecodeFormActionFunction as DecodeFormActionFunction, + unstable_matchRSCServerRequest as matchRSCServerRequest, } from "react-router/rsc"; import { routes } from "./routes"; diff --git a/integration/helpers/rsc-parcel/src/entry.ssr.tsx b/integration/helpers/rsc-parcel/src/entry.ssr.tsx index 7049555961..28a8ebf0eb 100644 --- a/integration/helpers/rsc-parcel/src/entry.ssr.tsx +++ b/integration/helpers/rsc-parcel/src/entry.ssr.tsx @@ -4,8 +4,8 @@ import express from "express"; // @ts-expect-error - no types import { renderToReadableStream as renderHTMLToReadableStream } from "react-dom/server.edge" assert { env: "react-client" }; import { - routeRSCServerRequest, - RSCStaticRouter, + unstable_routeRSCServerRequest as routeRSCServerRequest, + unstable_RSCStaticRouter as RSCStaticRouter, } from "react-router" assert { env: "react-client" }; // @ts-expect-error import { createFromReadableStream } from "react-server-dom-parcel/client.edge" assert { env: "react-client" }; diff --git a/integration/helpers/rsc-parcel/src/routes.ts b/integration/helpers/rsc-parcel/src/routes.ts index 6cc7b2a7bd..d29bd3aca2 100644 --- a/integration/helpers/rsc-parcel/src/routes.ts +++ b/integration/helpers/rsc-parcel/src/routes.ts @@ -1,4 +1,4 @@ -import type { ServerRouteObject } from "react-router/rsc"; +import type { unstable_ServerRouteObject as ServerRouteObject } from "react-router/rsc"; export const routes = [ { diff --git a/integration/helpers/rsc-vite/src/entry.browser.tsx b/integration/helpers/rsc-vite/src/entry.browser.tsx index 144736bf35..b48deb805c 100644 --- a/integration/helpers/rsc-vite/src/entry.browser.tsx +++ b/integration/helpers/rsc-vite/src/entry.browser.tsx @@ -9,13 +9,13 @@ import { import { manifest } from "virtual:react-manifest"; import { - type DecodeServerResponseFunction, - type EncodeActionFunction, - createCallServer, - getServerStream, - RSCHydratedRouter, + type unstable_DecodeServerResponseFunction as DecodeServerResponseFunction, + type unstable_EncodeActionFunction as EncodeActionFunction, + unstable_createCallServer as createCallServer, + unstable_getServerStream as getServerStream, + unstable_RSCHydratedRouter as RSCHydratedRouter, } from "react-router"; -import { type ServerPayload } from "react-router/rsc"; +import { type unstable_ServerPayload as ServerPayload } from "react-router/rsc"; const encodeAction: EncodeActionFunction = (args: unknown[]) => encodeReply(args); diff --git a/integration/helpers/rsc-vite/src/entry.rsc.tsx b/integration/helpers/rsc-vite/src/entry.rsc.tsx index 1feb2cbd50..41945dd987 100644 --- a/integration/helpers/rsc-vite/src/entry.rsc.tsx +++ b/integration/helpers/rsc-vite/src/entry.rsc.tsx @@ -1,7 +1,7 @@ /// import { - type DecodeCallServerFunction, - matchRSCServerRequest, + type unstable_DecodeCallServerFunction as DecodeCallServerFunction, + unstable_matchRSCServerRequest as matchRSCServerRequest, } from "react-router/rsc"; // @ts-expect-error - no types yet import { manifest } from "virtual:react-manifest"; diff --git a/integration/helpers/rsc-vite/src/entry.ssr.tsx b/integration/helpers/rsc-vite/src/entry.ssr.tsx index 45040b4e0d..9d65d7a6ad 100644 --- a/integration/helpers/rsc-vite/src/entry.ssr.tsx +++ b/integration/helpers/rsc-vite/src/entry.ssr.tsx @@ -7,7 +7,10 @@ import RDS from "react-dom/server.edge"; // @ts-expect-error import { bootstrapModules, manifest } from "virtual:react-manifest"; -import { routeRSCServerRequest, RSCStaticRouter } from "react-router"; +import { + unstable_routeRSCServerRequest as routeRSCServerRequest, + unstable_RSCStaticRouter as RSCStaticRouter, +} from "react-router"; type CloudflareEnv = { ASSETS: Fetcher; diff --git a/integration/helpers/rsc-vite/src/routes.ts b/integration/helpers/rsc-vite/src/routes.ts index 6cc7b2a7bd..d29bd3aca2 100644 --- a/integration/helpers/rsc-vite/src/routes.ts +++ b/integration/helpers/rsc-vite/src/routes.ts @@ -1,4 +1,4 @@ -import type { ServerRouteObject } from "react-router/rsc"; +import type { unstable_ServerRouteObject as ServerRouteObject } from "react-router/rsc"; export const routes = [ { diff --git a/integration/rsc/rsc-test.ts b/integration/rsc/rsc-test.ts index 6743ba70a3..b791c9a083 100644 --- a/integration/rsc/rsc-test.ts +++ b/integration/rsc/rsc-test.ts @@ -207,7 +207,7 @@ implementations.forEach((implementation) => { port, files: { "src/routes.ts": js` - import type { ServerRouteObject } from "react-router/rsc"; + import type { unstable_ServerRouteObject as ServerRouteObject } from "react-router/rsc"; export const routes = [ { @@ -338,7 +338,7 @@ implementations.forEach((implementation) => { port, files: { "src/routes.ts": js` - import type { ServerRouteObject } from "react-router/rsc"; + import type { unstable_ServerRouteObject as ServerRouteObject } from "react-router/rsc"; export const routes = [ { diff --git a/packages/react-router/dom-export.ts b/packages/react-router/dom-export.ts index 4c0d218ed4..127fc64213 100644 --- a/packages/react-router/dom-export.ts +++ b/packages/react-router/dom-export.ts @@ -1,3 +1,5 @@ +"use client"; + export type { RouterProviderProps } from "./lib/dom-export/dom-router-provider"; export { RouterProvider } from "./lib/dom-export/dom-router-provider"; export { HydratedRouter } from "./lib/dom-export/hydrated-router"; diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts index 82ffea8efb..e4fe91afa7 100644 --- a/packages/react-router/index.ts +++ b/packages/react-router/index.ts @@ -284,12 +284,18 @@ export { href } from "./lib/href"; // RSC export type { - DecodeServerResponseFunction, - EncodeActionFunction, + DecodeServerResponseFunction as unstable_DecodeServerResponseFunction, + EncodeActionFunction as unstable_EncodeActionFunction, } from "./lib/rsc/browser"; -export { createCallServer, RSCHydratedRouter } from "./lib/rsc/browser"; -export { routeRSCServerRequest, RSCStaticRouter } from "./lib/rsc/server.ssr"; -export { getServerStream } from "./lib/rsc/html-stream/browser"; +export { + createCallServer as unstable_createCallServer, + RSCHydratedRouter as unstable_RSCHydratedRouter, +} from "./lib/rsc/browser"; +export { + routeRSCServerRequest as unstable_routeRSCServerRequest, + RSCStaticRouter as unstable_RSCStaticRouter, +} from "./lib/rsc/server.ssr"; +export { getServerStream as unstable_getServerStream } from "./lib/rsc/html-stream/browser"; /////////////////////////////////////////////////////////////////////////////// // DANGER! PLEASE READ ME! diff --git a/packages/react-router/rsc-export.ts b/packages/react-router/rsc-export.ts index 794ac3c72d..b1b3c5b4d0 100644 --- a/packages/react-router/rsc-export.ts +++ b/packages/react-router/rsc-export.ts @@ -40,14 +40,14 @@ export { createCookieSessionStorage } from "./lib/server-runtime/sessions/cookie export { createMemorySessionStorage } from "./lib/server-runtime/sessions/memoryStorage"; export type { - DecodeCallServerFunction, - DecodeFormActionFunction, - ServerManifestPayload, - ServerMatch, - ServerPayload, - ServerRenderPayload, + DecodeCallServerFunction as unstable_DecodeCallServerFunction, + DecodeFormActionFunction as unstable_DecodeFormActionFunction, + ServerManifestPayload as unstable_ServerManifestPayload, + ServerMatch as unstable_ServerMatch, + ServerPayload as unstable_ServerPayload, + ServerRenderPayload as unstable_ServerRenderPayload, RenderedRoute as ServerRouteManifest, - ServerRouteMatch, - ServerRouteObject, + ServerRouteMatch as unstable_ServerRouteMatch, + ServerRouteObject as unstable_ServerRouteObject, } from "./lib/rsc/server.rsc"; -export { matchRSCServerRequest } from "./lib/rsc/server.rsc"; +export { matchRSCServerRequest as unstable_matchRSCServerRequest } from "./lib/rsc/server.rsc"; diff --git a/playground/rsc-parcel/src/entry.browser.tsx b/playground/rsc-parcel/src/entry.browser.tsx index 2f412c8596..af2621c657 100644 --- a/playground/rsc-parcel/src/entry.browser.tsx +++ b/playground/rsc-parcel/src/entry.browser.tsx @@ -3,11 +3,11 @@ import * as React from "react"; import { hydrateRoot } from "react-dom/client"; import { - createCallServer, - getServerStream, - RSCHydratedRouter, + unstable_createCallServer as createCallServer, + unstable_getServerStream as getServerStream, + unstable_RSCHydratedRouter as RSCHydratedRouter, } from "react-router"; -import type { ServerPayload } from "react-router/rsc"; +import type { unstable_ServerPayload as ServerPayload } from "react-router/rsc"; import { createFromReadableStream, encodeReply, diff --git a/playground/rsc-parcel/src/entry.rsc.ts b/playground/rsc-parcel/src/entry.rsc.ts index 9080e93ebc..eb78176690 100644 --- a/playground/rsc-parcel/src/entry.rsc.ts +++ b/playground/rsc-parcel/src/entry.rsc.ts @@ -8,9 +8,9 @@ import { // @ts-expect-error } from "react-server-dom-parcel/server.edge"; import { - type DecodeCallServerFunction, - type DecodeFormActionFunction, - matchRSCServerRequest, + type unstable_DecodeCallServerFunction as DecodeCallServerFunction, + type unstable_DecodeFormActionFunction as DecodeFormActionFunction, + unstable_matchRSCServerRequest as matchRSCServerRequest, } from "react-router/rsc"; import { routes } from "./routes"; diff --git a/playground/rsc-parcel/src/entry.ssr.tsx b/playground/rsc-parcel/src/entry.ssr.tsx index 55df1059aa..a62548e714 100644 --- a/playground/rsc-parcel/src/entry.ssr.tsx +++ b/playground/rsc-parcel/src/entry.ssr.tsx @@ -3,8 +3,8 @@ import express from "express"; // @ts-expect-error - no types import { renderToReadableStream as renderHTMLToReadableStream } from "react-dom/server.edge" assert { env: "react-client" }; import { - routeRSCServerRequest, - RSCStaticRouter, + unstable_routeRSCServerRequest as routeRSCServerRequest, + unstable_RSCStaticRouter as RSCStaticRouter, } from "react-router" assert { env: "react-client" }; // @ts-expect-error import { createFromReadableStream } from "react-server-dom-parcel/client.edge" assert { env: "react-client" }; diff --git a/playground/rsc-parcel/src/routes.ts b/playground/rsc-parcel/src/routes.ts index 3afe40bbe3..4c033dda4d 100644 --- a/playground/rsc-parcel/src/routes.ts +++ b/playground/rsc-parcel/src/routes.ts @@ -1,4 +1,4 @@ -import type { ServerRouteObject } from "react-router/rsc"; +import type { unstable_ServerRouteObject as ServerRouteObject } from "react-router/rsc"; export const routes = [ { diff --git a/playground/rsc-vite/src/browser/entry.browser.tsx b/playground/rsc-vite/src/browser/entry.browser.tsx index 144736bf35..9d2d0f6055 100644 --- a/playground/rsc-vite/src/browser/entry.browser.tsx +++ b/playground/rsc-vite/src/browser/entry.browser.tsx @@ -9,13 +9,13 @@ import { import { manifest } from "virtual:react-manifest"; import { - type DecodeServerResponseFunction, - type EncodeActionFunction, - createCallServer, - getServerStream, - RSCHydratedRouter, + type unstable_DecodeServerResponseFunction as DecodeServerResponseFunction, + type unstable_EncodeActionFunction as EncodeActionFunction, + unstable_createCallServer as createCallServer, + unstable_getServerStream as getServerStream, + unstable_RSCHydratedRouter as RSCHydratedRouter, } from "react-router"; -import { type ServerPayload } from "react-router/rsc"; +import type { unstable_ServerPayload as ServerPayload } from "react-router/rsc"; const encodeAction: EncodeActionFunction = (args: unknown[]) => encodeReply(args); diff --git a/playground/rsc-vite/src/routes.ts b/playground/rsc-vite/src/routes.ts index c54a332be4..d491f8749b 100644 --- a/playground/rsc-vite/src/routes.ts +++ b/playground/rsc-vite/src/routes.ts @@ -1,4 +1,4 @@ -import type { ServerRouteObject } from "react-router/rsc"; +import type { unstable_ServerRouteObject as ServerRouteObject } from "react-router/rsc"; export const routes = [ { diff --git a/playground/rsc-vite/src/rsc/entry.rsc.tsx b/playground/rsc-vite/src/rsc/entry.rsc.tsx index 542f65ac02..6946382d1b 100644 --- a/playground/rsc-vite/src/rsc/entry.rsc.tsx +++ b/playground/rsc-vite/src/rsc/entry.rsc.tsx @@ -5,8 +5,8 @@ import { decodeReply, renderToReadableStream } from "../../framework/server"; import { manifest } from "virtual:react-manifest"; import { - type DecodeCallServerFunction, - matchRSCServerRequest, + type unstable_DecodeCallServerFunction as DecodeCallServerFunction, + unstable_matchRSCServerRequest as matchRSCServerRequest, } from "react-router/rsc"; import { routes } from "../routes"; diff --git a/playground/rsc-vite/src/ssr/entry.ssr.tsx b/playground/rsc-vite/src/ssr/entry.ssr.tsx index 45040b4e0d..9d65d7a6ad 100644 --- a/playground/rsc-vite/src/ssr/entry.ssr.tsx +++ b/playground/rsc-vite/src/ssr/entry.ssr.tsx @@ -7,7 +7,10 @@ import RDS from "react-dom/server.edge"; // @ts-expect-error import { bootstrapModules, manifest } from "virtual:react-manifest"; -import { routeRSCServerRequest, RSCStaticRouter } from "react-router"; +import { + unstable_routeRSCServerRequest as routeRSCServerRequest, + unstable_RSCStaticRouter as RSCStaticRouter, +} from "react-router"; type CloudflareEnv = { ASSETS: Fetcher; From 25aeaad5110f15579eb10da0f5fd1d9380ef1b78 Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Wed, 28 May 2025 09:16:17 +1000 Subject: [PATCH 117/143] Skip RSC templates in Framework Mode tests (#13689) --- integration/helpers/vite.ts | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/integration/helpers/vite.ts b/integration/helpers/vite.ts index 28a7010060..c519c514ba 100644 --- a/integration/helpers/vite.ts +++ b/integration/helpers/vite.ts @@ -186,15 +186,22 @@ export const EXPRESS_SERVER = (args: { app.listen(port, () => console.log('http://localhost:' + port)); `; -export type TemplateName = - | "cloudflare-dev-proxy-template" - | "rsc-parcel" - | "rsc-vite" +type FrameworkModeViteMajorTemplateName = | "vite-5-template" | "vite-6-template" - | "vite-plugin-cloudflare-template" | "vite-rolldown-template"; +type FrameworkModeCloudflareTemplateName = + | "cloudflare-dev-proxy-template" + | "vite-plugin-cloudflare-template"; + +export type RscBundlerTemplateName = "rsc-vite" | "rsc-parcel"; + +export type TemplateName = + | FrameworkModeViteMajorTemplateName + | FrameworkModeCloudflareTemplateName + | RscBundlerTemplateName; + export const viteMajorTemplates = [ { templateName: "vite-5-template", templateDisplayName: "Vite 5" }, { templateName: "vite-6-template", templateDisplayName: "Vite 6" }, @@ -202,10 +209,16 @@ export const viteMajorTemplates = [ templateName: "vite-rolldown-template", templateDisplayName: "Vite Rolldown", }, +] as const satisfies Array<{ + templateName: FrameworkModeViteMajorTemplateName; + templateDisplayName: string; +}>; + +export const rscBundlerTemplates = [ { templateName: "rsc-vite", templateDisplayName: "RSC (Vite)" }, { templateName: "rsc-parcel", templateDisplayName: "RSC (Parcel)" }, ] as const satisfies Array<{ - templateName: TemplateName; + templateName: RscBundlerTemplateName; templateDisplayName: string; }>; From a2d5768ea7679011cb5df0ba262bc1cedfcb5907 Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Wed, 28 May 2025 15:42:56 +1000 Subject: [PATCH 118/143] Fix RSC client loader support (#13663) --- .../react-router/lib/dom/ssr/single-fetch.tsx | 16 +++++-- packages/react-router/lib/rsc/browser.tsx | 47 ++++++++++++++----- 2 files changed, 46 insertions(+), 17 deletions(-) diff --git a/packages/react-router/lib/dom/ssr/single-fetch.tsx b/packages/react-router/lib/dom/ssr/single-fetch.tsx index 445f606e92..357f8a9597 100644 --- a/packages/react-router/lib/dom/ssr/single-fetch.tsx +++ b/packages/react-router/lib/dom/ssr/single-fetch.tsx @@ -166,10 +166,13 @@ type GetRouteInfoFunction = (match: DataRouteMatch) => { hasShouldRevalidate: boolean; }; +type ShouldAllowOptOutFunction = (match: DataRouteMatch) => boolean; + export type FetchAndDecodeFunction = ( args: DataStrategyFunctionArgs, basename: string | undefined, - targetRoutes?: string[] + targetRoutes?: string[], + shouldAllowOptOut?: ShouldAllowOptOutFunction ) => Promise<{ status: number; data: DecodedSingleFetchResults }>; export function getTurboStreamSingleFetchDataStrategy( @@ -203,7 +206,8 @@ export function getSingleFetchDataStrategyImpl( getRouteInfo: GetRouteInfoFunction, fetchAndDecode: FetchAndDecodeFunction, ssr: boolean, - basename: string | undefined + basename: string | undefined, + shouldAllowOptOut: ShouldAllowOptOutFunction = () => true ): DataStrategyFunction { return async (args) => { let { request, matches, fetcherKey } = args; @@ -266,7 +270,8 @@ export function getSingleFetchDataStrategyImpl( getRouteInfo, fetchAndDecode, ssr, - basename + basename, + shouldAllowOptOut ); }; } @@ -354,7 +359,8 @@ async function singleFetchLoaderNavigationStrategy( getRouteInfo: GetRouteInfoFunction, fetchAndDecode: FetchAndDecodeFunction, ssr: boolean, - basename: string | undefined + basename: string | undefined, + shouldAllowOptOut: (match: DataRouteMatch) => boolean = () => true ) { // Track which routes need a server load for use in a `_routes` param let routesParams = new Set(); @@ -396,7 +402,7 @@ async function singleFetchLoaderNavigationStrategy( // When a route has a client loader, it opts out of the singular call and // calls it's server loader via `serverLoader()` using a `?_routes` param - if (hasClientLoader) { + if (shouldAllowOptOut(m) && hasClientLoader) { if (hasLoader) { foundOptOutRoute = true; } diff --git a/packages/react-router/lib/rsc/browser.tsx b/packages/react-router/lib/rsc/browser.tsx index da899e368a..9a1e185547 100644 --- a/packages/react-router/lib/rsc/browser.tsx +++ b/packages/react-router/lib/rsc/browser.tsx @@ -271,7 +271,13 @@ export function getRSCSingleFetchDataStrategy( // pass map into fetchAndDecode so it can add payloads getFetchAndDecodeViaRSC(decode), ssr, - basename + basename, + // If we don't have an element, we need to hit the server loader flow + // regardless of whether the client loader calls `serverLoader` or not, + // otherwise we'll have nothing to render. + // TODO: Do we need to account for API routes? Do we need a + // `match.hasComponent` flag? + (match) => match.route.element != null ); return async (args) => args.unstable_runClientMiddleware(async () => { @@ -288,17 +294,27 @@ export function getRSCSingleFetchDataStrategy( context.set(renderedRoutesContext, []); let results = await dataStrategy(args); // patch into router from all payloads in map - const renderedRouteById = new Map( - context.get(renderedRoutesContext).map((r) => [r.id, r]) - ); + // TODO: Confirm that it's correct for us to have multiple rendered routes + // with the same ID. This is currently happening in `clientLoader` cases + // where we're calling `fetchAndDecode` multiple times. This may be a + // sign of a logical error in how we're handling client loader routes. + const renderedRoutesById = new Map(); + for (const route of context.get(renderedRoutesContext)) { + if (!renderedRoutesById.has(route.id)) { + renderedRoutesById.set(route.id, []); + } + renderedRoutesById.get(route.id)!.push(route); + } for (const match of args.matches) { - const rendered = renderedRouteById.get(match.route.id); - if (rendered) { - window.__router.patchRoutes( - rendered.parentId ?? null, - [createRouteFromServerManifest(rendered)], - true - ); + const renderedRoutes = renderedRoutesById.get(match.route.id); + if (renderedRoutes) { + for (const rendered of renderedRoutes) { + window.__router.patchRoutes( + rendered.parentId ?? null, + [createRouteFromServerManifest(rendered)], + true + ); + } } } return results; @@ -457,7 +473,14 @@ function createRouteFromServerManifest( let hasInitialError = payload?.errors && match.id in payload.errors; let initialError = payload?.errors?.[match.id]; let isHydrationRequest = - match.clientLoader?.hydrate === true || !match.hasLoader; + match.clientLoader?.hydrate === true || + !match.hasLoader || + // If we don't have an element, we need to hit the server loader flow + // regardless of whether the client loader calls `serverLoader` or not, + // otherwise we'll have nothing to render. + // TODO: Do we need to account for API routes? Do we need a + // `match.hasComponent` flag? + !match.element; let dataRoute: DataRouteObjectWithManifestInfo = { id: match.id, From a32bc0b610259ffa6b77642fd3e1e2d796df5ba1 Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Wed, 28 May 2025 15:46:38 +1000 Subject: [PATCH 119/143] Add RSC eager route discovery (#13698) --- packages/react-router/lib/rsc/browser.tsx | 164 +++++++++++++++++--- packages/react-router/lib/rsc/server.rsc.ts | 103 +++++++----- playground/rsc-parcel/src/entry.browser.tsx | 1 + 3 files changed, 208 insertions(+), 60 deletions(-) diff --git a/packages/react-router/lib/rsc/browser.tsx b/packages/react-router/lib/rsc/browser.tsx index 9a1e185547..6d8f5a3fe3 100644 --- a/packages/react-router/lib/rsc/browser.tsx +++ b/packages/react-router/lib/rsc/browser.tsx @@ -188,27 +188,11 @@ function createRouterFromPayload({ undefined, false ), - async patchRoutesOnNavigation({ patch, path, signal }) { - let response = await fetch(`${path}.manifest`, { signal }); - if (!response.body || response.status < 200 || response.status >= 300) { - throw new Error("Unable to fetch new route matches from the server"); + async patchRoutesOnNavigation({ path, signal }) { + if (discoveredPaths.has(path)) { + return; } - - let payload = await decode(response.body); - if (payload.type !== "manifest") { - throw new Error("Failed to patch routes on navigation"); - } - - // Without the `allowElementMutations` flag, this will no-op if the route - // already exists so we can just call it for all returned matches - payload.matches.forEach((match, i) => - patch(payload.matches[i - 1]?.id ?? null, [ - createRouteFromServerManifest(match), - ]) - ); - payload.patches.forEach((p) => { - patch(p.parentId ?? null, [createRouteFromServerManifest(p)]); - }); + await fetchAndApplyManifestPatches([path], decode, signal); }, // FIXME: Pass `build.ssr` and `build.basename` into this function dataStrategy: getRSCSingleFetchDataStrategy( @@ -405,9 +389,11 @@ function getFetchAndDecodeViaRSC( export function RSCHydratedRouter({ decode, payload, + routeDiscovery = "eager", }: { decode: DecodeServerResponseFunction; payload: ServerPayload; + routeDiscovery?: "eager" | "lazy"; }) { if (payload.type !== "render") throw new Error("Invalid payload type"); @@ -426,6 +412,75 @@ export function RSCHydratedRouter({ } }, []); + React.useEffect(() => { + if ( + routeDiscovery === "lazy" || + // @ts-expect-error - TS doesn't know about this yet + window.navigator?.connection?.saveData === true + ) { + return; + } + + // Register a link href for patching + function registerElement(el: Element) { + let path = + el.tagName === "FORM" + ? el.getAttribute("action") + : el.getAttribute("href"); + if (!path) { + return; + } + // optimization: use the already-parsed pathname from links + let pathname = + el.tagName === "A" + ? (el as HTMLAnchorElement).pathname + : new URL(path, window.location.origin).pathname; + if (!discoveredPaths.has(pathname)) { + nextPaths.add(pathname); + } + } + + // Register and fetch patches for all initially-rendered links/forms + async function fetchPatches() { + // re-check/update registered links + document + .querySelectorAll("a[data-discover], form[data-discover]") + .forEach(registerElement); + + let paths = Array.from(nextPaths.keys()).filter((path) => { + if (discoveredPaths.has(path)) { + nextPaths.delete(path); + return false; + } + return true; + }); + + if (paths.length === 0) { + return; + } + + try { + await fetchAndApplyManifestPatches(paths, decode); + } catch (e) { + console.error("Failed to fetch manifest patches", e); + } + } + + let debouncedFetchPatches = debounce(fetchPatches, 100); + + // scan and fetch initial links + fetchPatches(); + + let observer = new MutationObserver(() => debouncedFetchPatches()); + + observer.observe(document.documentElement, { + subtree: true, + childList: true, + attributes: true, + attributeFilter: ["data-discover", "href", "action"], + }); + }, [routeDiscovery, decode]); + const frameworkContext: FrameworkContextObject = { future: { // These flags have no runtime impact so can always be false. If we add @@ -579,3 +634,72 @@ function preventInvalidServerHandlerCall( throw new ErrorResponseImpl(400, "Bad Request", new Error(msg), true); } } + +// Currently rendered links that may need prefetching +const nextPaths = new Set(); + +// FIFO queue of previously discovered routes to prevent re-calling on +// subsequent navigations to the same path +const discoveredPathsMaxSize = 1000; +const discoveredPaths = new Set(); + +// 7.5k to come in under the ~8k limit for most browsers +// https://stackoverflow.com/a/417184 +const URL_LIMIT = 7680; + +async function fetchAndApplyManifestPatches( + paths: string[], + decode: DecodeServerResponseFunction, + signal?: AbortSignal +) { + let basename = (window.__router.basename ?? "").replace(/^\/|\/$/g, ""); + let url = new URL(`${basename}/.manifest`, window.location.origin); + paths.sort().forEach((path) => url.searchParams.append("p", path)); + + // If the URL is nearing the ~8k limit on GET requests, skip this optimization + // step and just let discovery happen on link click. We also wipe out the + // nextPaths Set here so we can start filling it with fresh links + if (url.toString().length > URL_LIMIT) { + nextPaths.clear(); + return; + } + + let response = await fetch(url, { signal }); + if (!response.body || response.status < 200 || response.status >= 300) { + throw new Error("Unable to fetch new route matches from the server"); + } + + let payload = await decode(response.body); + if (payload.type !== "manifest") { + throw new Error("Failed to patch routes"); + } + + // Track discovered paths so we don't have to fetch them again + paths.forEach((p) => addToFifoQueue(p, discoveredPaths)); + + // Without the `allowElementMutations` flag, this will no-op if the route + // already exists so we can just call it for all returned patches + payload.patches.forEach((p) => { + window.__router.patchRoutes(p.parentId ?? null, [ + createRouteFromServerManifest(p), + ]); + }); +} + +function addToFifoQueue(path: string, queue: Set) { + if (queue.size >= discoveredPathsMaxSize) { + let first = queue.values().next().value; + queue.delete(first); + } + queue.add(path); +} + +// Thanks Josh! +// https://www.joshwcomeau.com/snippets/javascript/debounce/ +function debounce(callback: (...args: unknown[]) => unknown, wait: number) { + let timeoutId: number | undefined; + return (...args: unknown[]) => { + window.clearTimeout(timeoutId); + timeoutId = window.setTimeout(() => callback(...args), wait); + }; +} diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index 2a73d0da8e..eaba8448f6 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -101,11 +101,7 @@ export type ServerRenderPayload = { export type ServerManifestPayload = { type: "manifest"; - // Current rendered matches - matches: RenderedRoute[]; - // Additional routes we should patch into the router for subsequent navigations. - // Mostly a collection of pathless/index routes that may be needed for complete - // matching on upward navigations. + // Routes we should patch into the router for subsequent navigations. patches: RenderedRoute[]; }; @@ -190,19 +186,36 @@ async function generateManifestResponse( generateResponse: (match: ServerMatch) => Response ) { let url = new URL(request.url); - let matches = matchRoutes(routes, url.pathname.replace(/\.manifest$/, "")); + let pathnameParams = url.searchParams.getAll("p"); + let pathnames = pathnameParams.length + ? pathnameParams + : [url.pathname.replace(/\.manifest$/, "")]; + let routeIds = new Set(); + let matchedRoutes = pathnames + .flatMap((pathname) => { + let pathnameMatches = matchRoutes(routes, pathname); + return ( + pathnameMatches?.map((m, i) => ({ + ...m.route, + parentId: pathnameMatches[i - 1]?.route.id, + })) ?? [] + ); + }) + .filter((route) => { + if (!routeIds.has(route.id)) { + routeIds.add(route.id); + return true; + } + return false; + }); let payload: ServerManifestPayload = { type: "manifest", - matches: await Promise.all( - matches?.map((m, i) => - getManifestRoute(m.route, matches[i - 1]?.route.id) - ) ?? [] - ), - patches: await getAdditionalRoutePatches( - url.pathname, - routes, - matches?.map((m) => m.route.id) ?? [] - ), + patches: ( + await Promise.all([ + ...matchedRoutes.map((route) => getManifestRoute(route)), + getAdditionalRoutePatches(pathnames, routes, Array.from(routeIds)), + ]) + ).flat(1), }; return generateResponse({ @@ -529,7 +542,7 @@ async function getRenderPayload( let patchesPromise = !isDataRequest ? getAdditionalRoutePatches( - staticContext.location.pathname, + [staticContext.location.pathname], routes, staticContext.matches.map((m) => m.route.id) ) @@ -650,8 +663,7 @@ async function getServerRouteMatch( } async function getManifestRoute( - route: ServerRouteObject, - parentId: string | undefined + route: ServerRouteObject & { parentId: string | undefined } ): Promise { await explodeLazyRoute(route); @@ -675,7 +687,7 @@ async function getManifestRoute( errorElement, hasLoader: !!route.loader, id: route.id, - parentId, + parentId: route.parentId, path: route.path, index: "index" in route ? route.index : undefined, links: route.links, @@ -694,7 +706,7 @@ async function explodeLazyRoute(route: ServerRouteObject) { } async function getAdditionalRoutePatches( - pathname: string, + pathnames: string[], routes: ServerRouteObject[], matchedRouteIds: string[] ): Promise { @@ -702,33 +714,44 @@ async function getAdditionalRoutePatches( string, ServerRouteObject & { parentId: string | undefined } >(); - let segments = pathname.split("/").filter(Boolean); - let paths: string[] = ["/"]; + let matchedPaths = new Set(); - // We've already matched to the last segment - segments.pop(); + for (const pathname of pathnames) { + let segments = pathname.split("/").filter(Boolean); + let paths: string[] = ["/"]; - // Traverse each path for our parents and match in case they have pathless/index - // children we need to include in the initial manifest - while (segments.length > 0) { - paths.push(`/${segments.join("/")}`); + // We've already matched to the last segment segments.pop(); - } - paths.forEach((path) => { - let matches = matchRoutes(routes, path) || []; - matches.forEach((m, i) => - patchRouteMatches.set(m.route.id, { - ...m.route, - parentId: matches[i - 1]?.route.id, - }) - ); - }); + // Traverse each path for our parents and match in case they have pathless/index + // children we need to include in the initial manifest + while (segments.length > 0) { + paths.push(`/${segments.join("/")}`); + segments.pop(); + } + + paths.forEach((path) => { + if (matchedPaths.has(path)) { + return; + } + matchedPaths.add(path); + let matches = matchRoutes(routes, path) || []; + matches.forEach((m, i) => { + if (patchRouteMatches.get(m.route.id)) { + return; + } + patchRouteMatches.set(m.route.id, { + ...m.route, + parentId: matches[i - 1]?.route.id, + }); + }); + }); + } let patches = await Promise.all( [...patchRouteMatches.values()] .filter((route) => !matchedRouteIds.some((id) => id === route.id)) - .map((route) => getManifestRoute(route, route.parentId)) + .map((route) => getManifestRoute(route)) ); return patches; } diff --git a/playground/rsc-parcel/src/entry.browser.tsx b/playground/rsc-parcel/src/entry.browser.tsx index af2621c657..f8a39fb5a7 100644 --- a/playground/rsc-parcel/src/entry.browser.tsx +++ b/playground/rsc-parcel/src/entry.browser.tsx @@ -32,6 +32,7 @@ createFromReadableStream(getServerStream(), { assets: "manifest" }).then( decode={createFromReadableStream} // @ts-expect-error payload={payload} + routeDiscovery="eager" /> ); From e7eb25a7b71100bbc8623b9d1de7d4b16cc239fa Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Wed, 28 May 2025 07:28:13 -0700 Subject: [PATCH 120/143] Enable rsc error test (#13696) --- integration/helpers/rsc-parcel/src/entry.ssr.tsx | 3 ++- integration/helpers/vite.ts | 2 +- integration/rsc/rsc-test.ts | 16 +++++++++++----- integration/vite-css-test.ts | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/integration/helpers/rsc-parcel/src/entry.ssr.tsx b/integration/helpers/rsc-parcel/src/entry.ssr.tsx index 28a8ebf0eb..8e3a58c135 100644 --- a/integration/helpers/rsc-parcel/src/entry.ssr.tsx +++ b/integration/helpers/rsc-parcel/src/entry.ssr.tsx @@ -1,4 +1,3 @@ -import { parseArgs } from "node:util"; import { createRequestListener } from "@mjackson/node-fetch-server"; import express from "express"; // @ts-expect-error - no types @@ -14,6 +13,8 @@ import { callServer } from "./entry.rsc" assert { env: "react-server" }; const app = express(); +app.use(express.static("public")); + app.use("/client", express.static("dist/client")); app.get("/.well-known/appspecific/com.chrome.devtools.json", (req, res) => { diff --git a/integration/helpers/vite.ts b/integration/helpers/vite.ts index c519c514ba..6dfbc4d503 100644 --- a/integration/helpers/vite.ts +++ b/integration/helpers/vite.ts @@ -476,7 +476,7 @@ async function waitForServer( await waitOn({ resources: [ - `http://${args.host ?? "localhost"}:${args.port}${args.basename ?? "/"}`, + `http://${args.host ?? "localhost"}:${args.port}${args.basename ?? "/favicon.ico"}`, ], timeout: platform() === "win32" ? 20000 : 10000, }).catch((err) => { diff --git a/integration/rsc/rsc-test.ts b/integration/rsc/rsc-test.ts index b791c9a083..44108ce477 100644 --- a/integration/rsc/rsc-test.ts +++ b/integration/rsc/rsc-test.ts @@ -533,12 +533,20 @@ implementations.forEach((implementation) => { }); test.describe("Errors", () => { - // FIXME: Unsure why these fail currently - test.skip("Handles errors in server components correctly", async ({ + test("Handles errors in server components correctly", async ({ page, }) => { + // TODO: There is a mis-match in React versions between the Vite and + // Parcel builds here causing one to strip errors, and the other allow + // through the development error message. + test.skip( + implementation.name === "vite", + "Bug in vite somewhere, needs investigation" + ); + let port = await getPort(); stop = await setupRscTest({ + dev: true, implementation, port, files: { @@ -573,10 +581,8 @@ implementations.forEach((implementation) => { await page.goto(`http://localhost:${port}/`); // Verify error boundary is shown + await page.waitForSelector("[data-error-title]"); await page.waitForSelector("[data-error-message]"); - expect(await page.locator("[data-error-title]").textContent()).toBe( - "Error Caught!" - ); expect(await page.locator("[data-error-message]").textContent()).toBe( "Intentional error from loader" ); diff --git a/integration/vite-css-test.ts b/integration/vite-css-test.ts index 866ec4bdfd..fb391868d4 100644 --- a/integration/vite-css-test.ts +++ b/integration/vite-css-test.ts @@ -234,7 +234,7 @@ test.describe("Vite CSS", () => { }, templateName ); - stop = await dev({ cwd, port }); + stop = await dev({ cwd, port, basename: base }); }); test.afterAll(() => stop()); From 8652a009982762c28e38555a9604ad8e0bd8815d Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Thu, 29 May 2025 10:10:46 -0700 Subject: [PATCH 121/143] chore: add basic server function test that runs on both bundlers (#13704) --- .../rsc-vite/framework/references.browser.ts | 10 ++- integration/rsc/rsc-test.ts | 61 +++++++++++++++++++ 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/integration/helpers/rsc-vite/framework/references.browser.ts b/integration/helpers/rsc-vite/framework/references.browser.ts index cbf0af69e3..06bf756022 100644 --- a/integration/helpers/rsc-vite/framework/references.browser.ts +++ b/integration/helpers/rsc-vite/framework/references.browser.ts @@ -1,11 +1,15 @@ import { createServerReference as createServerReferenceImp, + createFromReadableStream, + encodeReply, // @ts-expect-error - no types yet } from "@jacob-ebey/react-server-dom-vite/client"; +import { unstable_createCallServer as createCallServer } from "react-router"; -export async function callServer(id: string, args: unknown) { - throw new Error("callServer not implemented"); -} +export const callServer = createCallServer({ + decode: (body) => createFromReadableStream(body, { callServer }), + encodeAction: (args) => encodeReply(args), +}); export function createServerReference(imp: unknown, id: string, name: string) { return createServerReferenceImp(`${id}#${name}`, callServer); diff --git a/integration/rsc/rsc-test.ts b/integration/rsc/rsc-test.ts index 44108ce477..e13e185763 100644 --- a/integration/rsc/rsc-test.ts +++ b/integration/rsc/rsc-test.ts @@ -464,6 +464,67 @@ implementations.forEach((implementation) => { test.describe("Server Actions", () => { test("Supports React Server Functions", async ({ page }) => { + let port = await getPort(); + stop = await setupRscTest({ + implementation, + port, + files: { + "src/routes/home.actions.ts": js` + "use server"; + + export function incrementCounter(count: number, formData: FormData) { + return count + parseInt(formData.get("by") as string || "1", 10); + } + `, + "src/routes/home.tsx": js` + "use client"; + + import { useActionState } from "react"; + + import { incrementCounter } from "./home.actions"; + + export default function ClientComponent() { + const [count, incrementCounterAction, incrementing] = useActionState(incrementCounter, 0); + + return ( +
+

Home: ({count})

+
+ + +
+
+ ); + } + `, + }, + }); + + await page.goto(`http://localhost:${port}/`); + + // Verify initial server render + await page.waitForSelector("[data-home]"); + expect(await page.locator("[data-home]").textContent()).toBe( + "Home: (0)" + ); + + // Submit the form to trigger server function + await page.click("[data-submit]"); + + // Verify server function updated the UI + await expect(page.locator("[data-home]")).toHaveText("Home: (1)"); + + // Submit again to ensure server functions work repeatedly + await page.click("[data-submit]"); + await expect(page.locator("[data-home]")).toHaveText("Home: (2)"); + + // Ensure this is using RSC + validateRSCHtml(await page.content()); + }); + + test("Supports Inline React Server Functions", async ({ page }) => { // FIXME: Waiting on parcel support: https://github.com/parcel-bundler/parcel/pull/10165 test.skip( implementation.name === "parcel", From c1f0daefff86cb4feb922646d6cea26e7ddabe4c Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Thu, 29 May 2025 10:13:16 -0700 Subject: [PATCH 122/143] expand action check (#13705) --- packages/react-router/lib/rsc/server.rsc.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index eaba8448f6..e6b951f24a 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -272,7 +272,7 @@ async function processServerAction( if (request.method === "POST") { const formData = await request.formData(); - if (Array.from(formData.keys()).some((k) => k.startsWith("$ACTION_ID_"))) { + if (Array.from(formData.keys()).some((k) => k.startsWith("$ACTION_"))) { if (!decodeFormAction) { throw new Error( "Cannot handle form actions without a decodeFormAction function" From 1fcc8eb1d90e18f4fdafa1bca85dfbd2dd306548 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Thu, 29 May 2025 11:13:19 -0700 Subject: [PATCH 123/143] support thrown redirects from server actions (#13707) --- integration/rsc/rsc-test.ts | 79 +++++++++++++++++++++ packages/react-router/lib/rsc/browser.tsx | 12 ++++ packages/react-router/lib/rsc/server.rsc.ts | 13 +++- 3 files changed, 103 insertions(+), 1 deletion(-) diff --git a/integration/rsc/rsc-test.ts b/integration/rsc/rsc-test.ts index e13e185763..10f53593fa 100644 --- a/integration/rsc/rsc-test.ts +++ b/integration/rsc/rsc-test.ts @@ -591,6 +591,85 @@ implementations.forEach((implementation) => { // Ensure this is using RSC validateRSCHtml(await page.content()); }); + + test("Supports React Server Functions thrown redirects", async ({ + page, + }) => { + let port = await getPort(); + stop = await setupRscTest({ + implementation, + port, + files: { + "src/routes/home.actions.ts": js` + "use server"; + import { redirect } from "react-router/rsc"; + + export function redirectAction(formData: FormData) { + throw redirect("/?redirected=true"); + } + `, + "src/routes/home.client.tsx": js` + "use client"; + import { useState } from "react"; + + export function Counter() { + const [count, setCount] = useState(0); + return ; + } + `, + "src/routes/home.tsx": js` + import { redirectAction } from "./home.actions"; + import { Counter } from "./home.client"; + + export default function ServerComponent(props) { + console.log({props}); + return ( +
+
+ +
+ +
+ ); + } + `, + }, + }); + + await page.goto(`http://localhost:${port}/`); + + // Verify initial server render + await page.waitForSelector("[data-count]"); + expect(await page.locator("[data-count]").textContent()).toBe( + "Count: 0" + ); + await page.click("[data-count]"); + expect(await page.locator("[data-count]").textContent()).toBe( + "Count: 1" + ); + + // Submit the form to trigger server function redirect + await page.click("[data-submit]"); + + await expect(page).toHaveURL( + `http://localhost:${port}/?redirected=true` + ); + + // Validate things are still interactive after redirect + await page.click("[data-count]"); + expect(await page.locator("[data-count]").textContent()).toBe( + "Count: 2" + ); + await page.click("[data-count]"); + expect(await page.locator("[data-count]").textContent()).toBe( + "Count: 3" + ); + + // Ensure this is using RSC + validateRSCHtml(await page.content()); + }); }); test.describe("Errors", () => { diff --git a/packages/react-router/lib/rsc/browser.tsx b/packages/react-router/lib/rsc/browser.tsx index 6d8f5a3fe3..a6fdf58e8a 100644 --- a/packages/react-router/lib/rsc/browser.tsx +++ b/packages/react-router/lib/rsc/browser.tsx @@ -45,6 +45,7 @@ declare global { } } +const neverResolvedPromise = new Promise(() => {}); export function createCallServer({ decode, encodeAction, @@ -70,6 +71,17 @@ export function createCallServer({ } const payload = await decode(response.body); + if (payload.type === "redirect") { + if (payload.reload) { + window.location.href = payload.location; + return; + } + window.__router.navigate(payload.location, { + replace: payload.replace, + }); + return neverResolvedPromise; + } + if (payload.type !== "action") { throw new Error("Unexpected payload type"); } diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index e6b951f24a..169124cdcd 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -234,7 +234,9 @@ async function processServerAction( decodeFormAction: DecodeFormActionFunction | undefined, onError: ((error: unknown) => void) | undefined ): Promise< - { revalidationRequest: Request; actionResult?: Promise } | undefined + | { revalidationRequest: Request; actionResult?: Promise } + | Response + | undefined > { const getRevalidationRequest = () => new Request(request.url, { @@ -261,6 +263,9 @@ async function processServerAction( // Wait for actions to finish regardless of state await actionResult; } catch (error) { + if (isResponse(error)) { + return error; + } // The error is propagated to the client through the result promise in the stream onError?.(error); } @@ -282,6 +287,9 @@ async function processServerAction( try { await action(); } catch (error) { + if (isResponse(error)) { + return error; + } onError?.(error); } return { @@ -349,6 +357,9 @@ async function generateRenderResponse( decodeFormAction, onError ); + if (isResponse(result)) { + return generateRedirectResponse(statusCode, result, generateResponse); + } actionResult = result?.actionResult; request = result?.revalidationRequest ?? request; } From 17b9b60afde233426c1c7b4ddb1e984c6cc24dfc Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Thu, 29 May 2025 17:58:29 -0700 Subject: [PATCH 124/143] wire thrown redirects from actions into the transition lifecycle (#13708) --- integration/rsc/rsc-test.ts | 7 +++-- packages/react-router/lib/hooks.tsx | 18 +++++++++++++ packages/react-router/lib/rsc/browser.tsx | 16 ++++++++++-- .../rsc-vite/src/routes/home/home.client.tsx | 13 ++++++++++ playground/rsc-vite/src/routes/home/home.tsx | 26 +++++++++++++++---- 5 files changed, 69 insertions(+), 11 deletions(-) diff --git a/integration/rsc/rsc-test.ts b/integration/rsc/rsc-test.ts index 10f53593fa..cbc9c304cf 100644 --- a/integration/rsc/rsc-test.ts +++ b/integration/rsc/rsc-test.ts @@ -657,14 +657,13 @@ implementations.forEach((implementation) => { `http://localhost:${port}/?redirected=true` ); - // Validate things are still interactive after redirect - await page.click("[data-count]"); expect(await page.locator("[data-count]").textContent()).toBe( - "Count: 2" + "Count: 0" ); + // Validate things are still interactive after redirect await page.click("[data-count]"); expect(await page.locator("[data-count]").textContent()).toBe( - "Count: 3" + "Count: 1" ); // Ensure this is using RSC diff --git a/packages/react-router/lib/hooks.tsx b/packages/react-router/lib/hooks.tsx index 2b0953d73b..78871f463d 100644 --- a/packages/react-router/lib/hooks.tsx +++ b/packages/react-router/lib/hooks.tsx @@ -894,6 +894,9 @@ export function _renderMatches( } else { children = outlet; } + + children = {children}; + return ( { + // If the error is Symbol.for("react-router.redirect"), keep rendering children. + // If it's anything else, re-throw to bubble it up. + static getDerivedStateFromError(error: any) { + if (error === Symbol.for("react-router.redirect")) { + return null; // Keep rendering children + } + throw error; // Re-throw to bubble up + } + + render() { + return this.props.children; + } +} + enum DataRouterHook { UseBlocker = "useBlocker", UseRevalidator = "useRevalidator", diff --git a/packages/react-router/lib/rsc/browser.tsx b/packages/react-router/lib/rsc/browser.tsx index a6fdf58e8a..67a203d8a0 100644 --- a/packages/react-router/lib/rsc/browser.tsx +++ b/packages/react-router/lib/rsc/browser.tsx @@ -45,7 +45,6 @@ declare global { } } -const neverResolvedPromise = new Promise(() => {}); export function createCallServer({ decode, encodeAction, @@ -76,10 +75,23 @@ export function createCallServer({ window.location.href = payload.location; return; } + + let reject!: (e: unknown) => void; + const promise = new Promise((resolve, rejectFn) => { + reject = rejectFn; + }); + + const unsubscribe = window.__router.subscribe(({ navigation }) => { + if (navigation.state === "idle") { + unsubscribe(); + reject(Symbol.for("react-router.redirect")); + } + }); window.__router.navigate(payload.location, { replace: payload.replace, }); - return neverResolvedPromise; + + return promise; } if (payload.type !== "action") { diff --git a/playground/rsc-vite/src/routes/home/home.client.tsx b/playground/rsc-vite/src/routes/home/home.client.tsx index 02c1ee4780..d11ff00f78 100644 --- a/playground/rsc-vite/src/routes/home/home.client.tsx +++ b/playground/rsc-vite/src/routes/home/home.client.tsx @@ -41,3 +41,16 @@ export function HomeForm({ fn }: { fn: () => unknown }) { ); } + +export function RedirectForm({ fn }: { fn: () => unknown }) { + const [state, formAction, isPending] = React.useActionState(fn, null); + + return ( +
+ + {state ?

Action state: {state}

: null} +
+ ); +} diff --git a/playground/rsc-vite/src/routes/home/home.tsx b/playground/rsc-vite/src/routes/home/home.tsx index 77e6e273ca..393a5814e9 100644 --- a/playground/rsc-vite/src/routes/home/home.tsx +++ b/playground/rsc-vite/src/routes/home/home.tsx @@ -1,17 +1,21 @@ -import { HomeForm } from "./home.client"; +import { HomeForm, RedirectForm } from "./home.client"; export { clientLoader } from "./home.client"; import { Counter } from "../../counter"; +import { redirect } from "react-router/rsc"; +import type { LoaderFunctionArgs } from "react-router"; -export async function loader() { +export async function loader({ request }: LoaderFunctionArgs) { await new Promise((r) => setTimeout(r, 500)); return { message: `Home route loader ran at ${new Date().toISOString()}`, + wasRedirected: + new URL(request.url).searchParams.get("redirected") === "true", }; } export default function Home({ - loaderData, + loaderData: { message, wasRedirected }, }: { loaderData: Awaited>; }) { @@ -19,16 +23,28 @@ export default function Home({ "use server"; await new Promise((r) => setTimeout(r, 500)); console.log("Running action on server!"); - console.log(` data to prove that scoped vars work: ${loaderData.message}`); + console.log( + ` data to prove that scoped vars work: ${message} and it is now ${new Date().toISOString()}` + ); return new Date().toISOString(); }; + const redirectOnServer = async () => { + "use server"; + await new Promise((r) => setTimeout(r, 500)); + if (wasRedirected) { + throw redirect("/"); + } + throw redirect("/?redirected=true"); + }; + return (

Home Route

-

Loader data: {loaderData.message}

+

Loader data: {message}

+
); } From 2352aaa1f650231d79b22e050562b8d11601556b Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Fri, 30 May 2025 16:13:13 +1000 Subject: [PATCH 125/143] Fix RSC `fetcher.load` (#13709) --- packages/react-router/lib/router/router.ts | 42 +++++++------------ playground/rsc-parcel/src/routes.ts | 10 +++++ .../src/routes/fetcher/fetcher.client.tsx | 17 ++++++++ .../rsc-parcel/src/routes/fetcher/fetcher.ts | 1 + .../src/routes/resource/resource.ts | 6 +++ .../src/routes/root/root.client.tsx | 3 ++ 6 files changed, 51 insertions(+), 28 deletions(-) create mode 100644 playground/rsc-parcel/src/routes/fetcher/fetcher.client.tsx create mode 100644 playground/rsc-parcel/src/routes/fetcher/fetcher.ts create mode 100644 playground/rsc-parcel/src/routes/resource/resource.ts diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts index 9b06511b2c..93904af28a 100644 --- a/packages/react-router/lib/router/router.ts +++ b/packages/react-router/lib/router/router.ts @@ -2258,7 +2258,6 @@ export function createRouter(init: RouterInit): Router { return; } - let match = getTargetMatch(matches, path); // Create a new context per fetch let scopedContext = new unstable_RouterContextProvider( init.unstable_getContext ? await init.unstable_getContext() : undefined @@ -2270,7 +2269,6 @@ export function createRouter(init: RouterInit): Router { key, routeId, path, - match, matches, scopedContext, fogOfWar.active, @@ -2288,7 +2286,6 @@ export function createRouter(init: RouterInit): Router { key, routeId, path, - match, matches, scopedContext, fogOfWar.active, @@ -2304,7 +2301,6 @@ export function createRouter(init: RouterInit): Router { key: string, routeId: string, path: string, - match: AgnosticDataRouteMatch, requestMatches: AgnosticDataRouteMatch[], scopedContext: unstable_RouterContextProvider, isFogOfWar: boolean, @@ -2315,23 +2311,6 @@ export function createRouter(init: RouterInit): Router { interruptActiveLoads(); fetchLoadMatches.delete(key); - function detectAndHandle405Error(m: AgnosticDataRouteMatch) { - if (!m.route.action && !m.route.lazy) { - let error = getInternalRouterError(405, { - method: submission.formMethod, - pathname: path, - routeId: routeId, - }); - setFetcherError(key, routeId, error, { flushSync }); - return true; - } - return false; - } - - if (!isFogOfWar && detectAndHandle405Error(match)) { - return; - } - // Put this fetcher into it's submitting state let existingFetcher = state.fetchers.get(key); updateFetcherState(key, getSubmittingFetcher(submission, existingFetcher), { @@ -2369,14 +2348,21 @@ export function createRouter(init: RouterInit): Router { return; } else { requestMatches = discoverResult.matches; - match = getTargetMatch(requestMatches, path); - - if (detectAndHandle405Error(match)) { - return; - } } } + let match = getTargetMatch(requestMatches, path); + + if (!match.route.action && !match.route.lazy) { + let error = getInternalRouterError(405, { + method: submission.formMethod, + pathname: path, + routeId: routeId, + }); + setFetcherError(key, routeId, error, { flushSync }); + return; + } + // Call the action for the fetcher fetchControllers.set(key, abortController); @@ -2619,7 +2605,6 @@ export function createRouter(init: RouterInit): Router { key: string, routeId: string, path: string, - match: AgnosticDataRouteMatch, matches: AgnosticDataRouteMatch[], scopedContext: unstable_RouterContextProvider, isFogOfWar: boolean, @@ -2667,10 +2652,11 @@ export function createRouter(init: RouterInit): Router { return; } else { matches = discoverResult.matches; - match = getTargetMatch(matches, path); } } + let match = getTargetMatch(matches, path); + // Call the loader for this fetcher route match fetchControllers.set(key, abortController); diff --git a/playground/rsc-parcel/src/routes.ts b/playground/rsc-parcel/src/routes.ts index 4c033dda4d..37206d8466 100644 --- a/playground/rsc-parcel/src/routes.ts +++ b/playground/rsc-parcel/src/routes.ts @@ -17,6 +17,16 @@ export const routes = [ // @ts-expect-error lazy: () => import("./routes/about/about"), }, + { + id: "fetcher", + path: "fetcher", + lazy: () => import("./routes/fetcher/fetcher"), + }, ], }, + { + id: "resource", + path: "resource", + lazy: () => import("./routes/resource/resource"), + }, ] satisfies ServerRouteObject[]; diff --git a/playground/rsc-parcel/src/routes/fetcher/fetcher.client.tsx b/playground/rsc-parcel/src/routes/fetcher/fetcher.client.tsx new file mode 100644 index 0000000000..db250e1347 --- /dev/null +++ b/playground/rsc-parcel/src/routes/fetcher/fetcher.client.tsx @@ -0,0 +1,17 @@ +"use client"; + +import { useFetcher } from "react-router"; +import type { loader } from "../resource/resource"; + +export default function Fetcher() { + const fetcher = useFetcher(); + + return ( +
+ + 
{JSON.stringify(fetcher.data, null, 2)}
+
+ ); +} diff --git a/playground/rsc-parcel/src/routes/fetcher/fetcher.ts b/playground/rsc-parcel/src/routes/fetcher/fetcher.ts new file mode 100644 index 0000000000..e7dadeb8d8 --- /dev/null +++ b/playground/rsc-parcel/src/routes/fetcher/fetcher.ts @@ -0,0 +1 @@ +export { default } from "./fetcher.client"; diff --git a/playground/rsc-parcel/src/routes/resource/resource.ts b/playground/rsc-parcel/src/routes/resource/resource.ts new file mode 100644 index 0000000000..188f306ca6 --- /dev/null +++ b/playground/rsc-parcel/src/routes/resource/resource.ts @@ -0,0 +1,6 @@ +export function loader() { + return { + timestamp: Date.now(), + message: "Hello from resource route!", + }; +} diff --git a/playground/rsc-parcel/src/routes/root/root.client.tsx b/playground/rsc-parcel/src/routes/root/root.client.tsx index d5e190d168..5c472d7a91 100644 --- a/playground/rsc-parcel/src/routes/root/root.client.tsx +++ b/playground/rsc-parcel/src/routes/root/root.client.tsx @@ -39,6 +39,9 @@ export default function Root() {
  • About
    • +
  • + Fetcher +
    • {counter} From 4b96510d56b0a232a9ad2acf64b10ce81aa7c33b Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Thu, 5 Jun 2025 09:51:36 +1000 Subject: [PATCH 126/143] Add pathless fog of war test to fetchers unit tests (#13727) --- .../__tests__/router/fetchers-test.ts | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/packages/react-router/__tests__/router/fetchers-test.ts b/packages/react-router/__tests__/router/fetchers-test.ts index 739ea8bd46..63fecc377c 100644 --- a/packages/react-router/__tests__/router/fetchers-test.ts +++ b/packages/react-router/__tests__/router/fetchers-test.ts @@ -116,6 +116,50 @@ describe("fetchers", () => { expect(router._internalFetchControllers.size).toBe(0); }); + it("unabstracted loader fetch with fog of war", async () => { + let dfd = createDeferred(); + let router = createRouter({ + history: createMemoryHistory({ initialEntries: ["/"] }), + routes: [ + { + id: "root", + // Note: No path is provided on the root route in this test to + // ensure nothing matches before routes are patched + }, + ], + hydrationData: { + loaderData: { root: "ROOT DATA" }, + }, + async patchRoutesOnNavigation({ path, patch }) { + if (path === "/lazy") { + patch("root", [ + { + id: "lazy", + path: "/lazy", + loader: () => dfd.promise, + }, + ]); + } + }, + }); + let fetcherData = getFetcherData(router); + + let key = "key"; + router.fetch(key, "lazy", "/lazy"); + expect(router.getFetcher(key)).toEqual({ + state: "loading", + formMethod: undefined, + formEncType: undefined, + formData: undefined, + }); + + await dfd.resolve("DATA"); + expect(router.getFetcher(key)).toBe(IDLE_FETCHER); + expect(fetcherData.get(key)).toBe("DATA"); + + expect(router._internalFetchControllers.size).toBe(0); + }); + it("loader fetch", async () => { let t = initializeTest({ url: "/foo", From f2b42587c05c20fc7290835d81c16dff1132a62a Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Thu, 5 Jun 2025 10:08:18 +1000 Subject: [PATCH 127/143] feat(react-router): rename RSC `default` route property to `Component` (#13726) --- .../helpers/rsc-parcel/src/routes/home.tsx | 2 +- integration/rsc/rsc-test.ts | 25 +++++++++++-------- packages/react-router/lib/rsc/server.rsc.ts | 4 +-- .../src/routes/about/about.client.tsx | 2 +- .../rsc-parcel/src/routes/about/about.tsx | 2 +- .../src/routes/fetcher/fetcher.client.tsx | 2 +- .../rsc-parcel/src/routes/fetcher/fetcher.ts | 2 +- .../src/routes/home/home.client.tsx | 2 +- .../rsc-parcel/src/routes/home/home.tsx | 2 +- .../src/routes/root/root.client.tsx | 2 +- .../rsc-parcel/src/routes/root/root.tsx | 2 +- .../src/routes/about/about.client.tsx | 2 +- .../rsc-vite/src/routes/about/about.tsx | 2 +- .../rsc-vite/src/routes/child/child.tsx | 2 +- playground/rsc-vite/src/routes/home/home.tsx | 2 +- .../src/routes/parent-index/parent-index.tsx | 2 +- .../rsc-vite/src/routes/parent/parent.tsx | 2 +- playground/rsc-vite/src/routes/root/root.tsx | 2 +- 18 files changed, 32 insertions(+), 29 deletions(-) diff --git a/integration/helpers/rsc-parcel/src/routes/home.tsx b/integration/helpers/rsc-parcel/src/routes/home.tsx index fa44740c12..9dc86aec4a 100644 --- a/integration/helpers/rsc-parcel/src/routes/home.tsx +++ b/integration/helpers/rsc-parcel/src/routes/home.tsx @@ -1,3 +1,3 @@ -export default function ServerComponent() { +export function Component() { return

    Home

    ; } diff --git a/integration/rsc/rsc-test.ts b/integration/rsc/rsc-test.ts index cbc9c304cf..d8ee2d8790 100644 --- a/integration/rsc/rsc-test.ts +++ b/integration/rsc/rsc-test.ts @@ -109,7 +109,7 @@ implementations.forEach((implementation) => { export function loader() { return { message: "Loader Data" }; } - export default function ServerComponent({ loaderData }) { + export function Component({ loaderData }) { return

    Home: {loaderData.message}

    ; } `, @@ -141,7 +141,7 @@ implementations.forEach((implementation) => { return { message: "Loader Data" }; } - export default function ServerComponent({ loaderData }) { + export function Component({ loaderData }) { return (

    Home: {loaderData.message}

    @@ -236,7 +236,7 @@ implementations.forEach((implementation) => { return { message: "Home Page Data" }; } - export default function Home({ loaderData }) { + export function Component({ loaderData }) { return (

    Home Page

    @@ -251,7 +251,7 @@ implementations.forEach((implementation) => { return { count: 1 }; } - export { Dashboard as default } from "./dashboard.client"; + export { Component } from "./dashboard.client"; `, "src/routes/dashboard.client.tsx": js` "use client"; @@ -260,7 +260,7 @@ implementations.forEach((implementation) => { import { Link } from "react-router"; // Export the entire route as a client component - export function Dashboard({ loaderData }) { + export function Component({ loaderData }) { const [count, setCount] = useState(loaderData.count); return ( @@ -367,7 +367,7 @@ implementations.forEach((implementation) => { return { message: "Home Page Data" }; } - export default function Home({ loaderData }) { + export function Component({ loaderData }) { return (

    Home Page

    @@ -382,7 +382,7 @@ implementations.forEach((implementation) => { return { count: 1 }; } - export { Dashboard as default } from "./dashboard.client"; + export { Dashboard as Component } from "./dashboard.client"; `, "src/routes/dashboard.client.tsx": js` "use client"; @@ -477,13 +477,16 @@ implementations.forEach((implementation) => { } `, "src/routes/home.tsx": js` + export { Component } from "./home.client"; + `, + "src/routes/home.client.tsx": js` "use client"; import { useActionState } from "react"; import { incrementCounter } from "./home.actions"; - export default function ClientComponent() { + export function Component() { const [count, incrementCounterAction, incrementing] = useActionState(incrementCounter, 0); return ( @@ -544,7 +547,7 @@ implementations.forEach((implementation) => { return { name, count }; } - export default function ServerComponent({ loaderData }) { + export function Component({ loaderData }) { const updateCounter = async (formData: FormData) => { "use server"; name = formData.get("name"); @@ -621,7 +624,7 @@ implementations.forEach((implementation) => { import { redirectAction } from "./home.actions"; import { Counter } from "./home.client"; - export default function ServerComponent(props) { + export function Component(props) { console.log({props}); return (
    @@ -694,7 +697,7 @@ implementations.forEach((implementation) => { throw new Error("Intentional error from loader"); } - export default function Home() { + export function Component() { return

    This shouldn't render

    ; } diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index 169124cdcd..f046f86c24 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -33,7 +33,7 @@ type ServerRouteObjectBase = { action?: ActionFunction; clientAction?: ClientActionFunction; clientLoader?: ClientLoaderFunction; - default?: React.ComponentType; + Component?: React.ComponentType; ErrorBoundary?: React.ComponentType; handle?: any; headers?: HeadersFunction; @@ -586,7 +586,7 @@ async function getServerRouteMatch( } const Layout = (match.route as any).Layout || React.Fragment; - const Component = (match.route as any).default; + const Component = (match.route as any).Component; const ErrorBoundary = (match.route as any).ErrorBoundary; const HydrateFallback = (match.route as any).HydrateFallback; const loaderData = staticContext.loaderData[match.route.id]; diff --git a/playground/rsc-parcel/src/routes/about/about.client.tsx b/playground/rsc-parcel/src/routes/about/about.client.tsx index b3be63676c..a60e964447 100644 --- a/playground/rsc-parcel/src/routes/about/about.client.tsx +++ b/playground/rsc-parcel/src/routes/about/about.client.tsx @@ -15,7 +15,7 @@ export async function clientLoader({ serverLoader }: ClientLoaderFunctionArgs) { }; } -export default function About() { +export function Component() { const { client, message } = useLoaderData(); return ( diff --git a/playground/rsc-parcel/src/routes/about/about.tsx b/playground/rsc-parcel/src/routes/about/about.tsx index 815c50903d..b1222a2056 100644 --- a/playground/rsc-parcel/src/routes/about/about.tsx +++ b/playground/rsc-parcel/src/routes/about/about.tsx @@ -1,4 +1,4 @@ -export { clientLoader, default } from "./about.client"; +export { clientLoader, Component } from "./about.client"; export function loader() { return { diff --git a/playground/rsc-parcel/src/routes/fetcher/fetcher.client.tsx b/playground/rsc-parcel/src/routes/fetcher/fetcher.client.tsx index db250e1347..d1b72782f0 100644 --- a/playground/rsc-parcel/src/routes/fetcher/fetcher.client.tsx +++ b/playground/rsc-parcel/src/routes/fetcher/fetcher.client.tsx @@ -3,7 +3,7 @@ import { useFetcher } from "react-router"; import type { loader } from "../resource/resource"; -export default function Fetcher() { +export function Component() { const fetcher = useFetcher(); return ( diff --git a/playground/rsc-parcel/src/routes/fetcher/fetcher.ts b/playground/rsc-parcel/src/routes/fetcher/fetcher.ts index e7dadeb8d8..8887fa87ad 100644 --- a/playground/rsc-parcel/src/routes/fetcher/fetcher.ts +++ b/playground/rsc-parcel/src/routes/fetcher/fetcher.ts @@ -1 +1 @@ -export { default } from "./fetcher.client"; +export { Component } from "./fetcher.client"; diff --git a/playground/rsc-parcel/src/routes/home/home.client.tsx b/playground/rsc-parcel/src/routes/home/home.client.tsx index d9e598b71a..70b50d001b 100644 --- a/playground/rsc-parcel/src/routes/home/home.client.tsx +++ b/playground/rsc-parcel/src/routes/home/home.client.tsx @@ -15,7 +15,7 @@ export async function clientLoader({ serverLoader }: ClientLoaderFunctionArgs) { }; } -export default function Home() { +export function Component() { const { client, message } = useLoaderData(); return ( diff --git a/playground/rsc-parcel/src/routes/home/home.tsx b/playground/rsc-parcel/src/routes/home/home.tsx index 22fffe84be..a8678017c4 100644 --- a/playground/rsc-parcel/src/routes/home/home.tsx +++ b/playground/rsc-parcel/src/routes/home/home.tsx @@ -1,4 +1,4 @@ -export { clientLoader, default } from "./home.client"; +export { clientLoader, Component } from "./home.client"; export function loader() { return { diff --git a/playground/rsc-parcel/src/routes/root/root.client.tsx b/playground/rsc-parcel/src/routes/root/root.client.tsx index 5c472d7a91..bdf8e2fbd3 100644 --- a/playground/rsc-parcel/src/routes/root/root.client.tsx +++ b/playground/rsc-parcel/src/routes/root/root.client.tsx @@ -27,7 +27,7 @@ export function Layout({ children }: { children: React.ReactNode }) { ); } -export default function Root() { +export function Component() { const { counter, message } = useLoaderData(); return ( <> diff --git a/playground/rsc-parcel/src/routes/root/root.tsx b/playground/rsc-parcel/src/routes/root/root.tsx index 347dbd2248..f4ffa957d9 100644 --- a/playground/rsc-parcel/src/routes/root/root.tsx +++ b/playground/rsc-parcel/src/routes/root/root.tsx @@ -1,4 +1,4 @@ -export { default, ErrorBoundary, Layout } from "./root.client"; +export { Component, ErrorBoundary, Layout } from "./root.client"; import { Counter } from "../../counter"; diff --git a/playground/rsc-vite/src/routes/about/about.client.tsx b/playground/rsc-vite/src/routes/about/about.client.tsx index cba0f37cde..47a3738b01 100644 --- a/playground/rsc-vite/src/routes/about/about.client.tsx +++ b/playground/rsc-vite/src/routes/about/about.client.tsx @@ -31,7 +31,7 @@ export async function clientLoader({ serverLoader }: ClientLoaderFunctionArgs) { clientLoader.hydrate = true; -export default function About() { +export function Component() { const loaderData = useLoaderData(); const actionData = useActionData(); diff --git a/playground/rsc-vite/src/routes/about/about.tsx b/playground/rsc-vite/src/routes/about/about.tsx index 6f5efddeef..01baa19a68 100644 --- a/playground/rsc-vite/src/routes/about/about.tsx +++ b/playground/rsc-vite/src/routes/about/about.tsx @@ -5,7 +5,7 @@ export { // clientLazy, clientLoader, clientAction, - default, + Component, } from "./about.client"; export function headers({ diff --git a/playground/rsc-vite/src/routes/child/child.tsx b/playground/rsc-vite/src/routes/child/child.tsx index 25fc9b01f0..d96ba3459c 100644 --- a/playground/rsc-vite/src/routes/child/child.tsx +++ b/playground/rsc-vite/src/routes/child/child.tsx @@ -5,7 +5,7 @@ async function loader() { }; } -export default async function Component() { +export async function Component() { let loaderData = await loader(); return (
    diff --git a/playground/rsc-vite/src/routes/home/home.tsx b/playground/rsc-vite/src/routes/home/home.tsx index 393a5814e9..b08e936428 100644 --- a/playground/rsc-vite/src/routes/home/home.tsx +++ b/playground/rsc-vite/src/routes/home/home.tsx @@ -14,7 +14,7 @@ export async function loader({ request }: LoaderFunctionArgs) { }; } -export default function Home({ +export function Component({ loaderData: { message, wasRedirected }, }: { loaderData: Awaited>; diff --git a/playground/rsc-vite/src/routes/parent-index/parent-index.tsx b/playground/rsc-vite/src/routes/parent-index/parent-index.tsx index f9498fd7ae..971b5dc7b3 100644 --- a/playground/rsc-vite/src/routes/parent-index/parent-index.tsx +++ b/playground/rsc-vite/src/routes/parent-index/parent-index.tsx @@ -5,7 +5,7 @@ export async function loader() { }; } -export default function Component({ +export function Component({ loaderData, }: { loaderData: Awaited>; diff --git a/playground/rsc-vite/src/routes/parent/parent.tsx b/playground/rsc-vite/src/routes/parent/parent.tsx index 780d4cdc9f..9a306e3ef8 100644 --- a/playground/rsc-vite/src/routes/parent/parent.tsx +++ b/playground/rsc-vite/src/routes/parent/parent.tsx @@ -6,7 +6,7 @@ export function loader() { }; } -export default function Component({ +export function Component({ loaderData, }: { loaderData: Awaited>; diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx index c0f0844882..008c6f8ab0 100644 --- a/playground/rsc-vite/src/routes/root/root.tsx +++ b/playground/rsc-vite/src/routes/root/root.tsx @@ -27,7 +27,7 @@ export async function loader() { }; } -export default function Root({ +export function Component({ loaderData, }: { loaderData: Awaited>; From a4179968002357d1284ee5f15500a4b47d6803b1 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Thu, 5 Jun 2025 16:51:57 -0700 Subject: [PATCH 128/143] fix: flushSync support (#13755) fix: clone request if we have to read the body --- packages/react-router/lib/rsc/browser.tsx | 5 +++-- packages/react-router/lib/rsc/server.rsc.ts | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/react-router/lib/rsc/browser.tsx b/packages/react-router/lib/rsc/browser.tsx index 67a203d8a0..16d7925478 100644 --- a/packages/react-router/lib/rsc/browser.tsx +++ b/packages/react-router/lib/rsc/browser.tsx @@ -1,4 +1,5 @@ import * as React from "react"; +import * as ReactDOM from "react-dom"; import { RouterProvider } from "../components"; import type { DataRouteMatch, DataRouteObject } from "../context"; @@ -80,7 +81,7 @@ export function createCallServer({ const promise = new Promise((resolve, rejectFn) => { reject = rejectFn; }); - + const unsubscribe = window.__router.subscribe(({ navigation }) => { if (navigation.state === "idle") { unsubscribe(); @@ -530,7 +531,7 @@ export function RSCHydratedRouter({ return ( - + ); } diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index f046f86c24..211fbb94e1 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -276,6 +276,7 @@ async function processServerAction( } if (request.method === "POST") { + const clone = request.clone(); const formData = await request.formData(); if (Array.from(formData.keys()).some((k) => k.startsWith("$ACTION_"))) { if (!decodeFormAction) { @@ -296,6 +297,9 @@ async function processServerAction( revalidationRequest: getRevalidationRequest(), }; } + return { + revalidationRequest: clone, + }; } } From 7db49e8d4da3c3160cc6bf51c723a0724b4364c2 Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Fri, 6 Jun 2025 15:07:26 +1000 Subject: [PATCH 129/143] Support RSC lazy `default` export as `Component` fallback (#13763) --- .../helpers/rsc-parcel/src/routes/home.tsx | 2 +- integration/rsc/rsc-test.ts | 22 ++++---- packages/react-router/lib/rsc/server.rsc.ts | 51 +++++++++++++------ .../src/routes/about/about.client.tsx | 2 +- .../rsc-parcel/src/routes/about/about.tsx | 2 +- .../src/routes/fetcher/fetcher.client.tsx | 2 +- .../rsc-parcel/src/routes/fetcher/fetcher.ts | 2 +- .../src/routes/home/home.client.tsx | 2 +- .../rsc-parcel/src/routes/home/home.tsx | 2 +- .../src/routes/root/root.client.tsx | 2 +- .../rsc-parcel/src/routes/root/root.tsx | 2 +- .../src/routes/about/about.client.tsx | 2 +- playground/rsc-vite/src/routes/home/home.tsx | 2 +- .../src/routes/parent-index/parent-index.tsx | 2 +- .../rsc-vite/src/routes/parent/parent.tsx | 2 +- playground/rsc-vite/src/routes/root/root.tsx | 2 +- 16 files changed, 60 insertions(+), 41 deletions(-) diff --git a/integration/helpers/rsc-parcel/src/routes/home.tsx b/integration/helpers/rsc-parcel/src/routes/home.tsx index 9dc86aec4a..b5e522802e 100644 --- a/integration/helpers/rsc-parcel/src/routes/home.tsx +++ b/integration/helpers/rsc-parcel/src/routes/home.tsx @@ -1,3 +1,3 @@ -export function Component() { +export default function HomeRoute() { return

    Home

    ; } diff --git a/integration/rsc/rsc-test.ts b/integration/rsc/rsc-test.ts index d8ee2d8790..7c535a1349 100644 --- a/integration/rsc/rsc-test.ts +++ b/integration/rsc/rsc-test.ts @@ -109,7 +109,7 @@ implementations.forEach((implementation) => { export function loader() { return { message: "Loader Data" }; } - export function Component({ loaderData }) { + export default function HomeRoute({ loaderData }) { return

    Home: {loaderData.message}

    ; } `, @@ -141,7 +141,7 @@ implementations.forEach((implementation) => { return { message: "Loader Data" }; } - export function Component({ loaderData }) { + export default function HomeRoute({ loaderData }) { return (

    Home: {loaderData.message}

    @@ -236,7 +236,7 @@ implementations.forEach((implementation) => { return { message: "Home Page Data" }; } - export function Component({ loaderData }) { + export default function HomeRoute({ loaderData }) { return (

    Home Page

    @@ -251,7 +251,7 @@ implementations.forEach((implementation) => { return { count: 1 }; } - export { Component } from "./dashboard.client"; + export { default } from "./dashboard.client"; `, "src/routes/dashboard.client.tsx": js` "use client"; @@ -260,7 +260,7 @@ implementations.forEach((implementation) => { import { Link } from "react-router"; // Export the entire route as a client component - export function Component({ loaderData }) { + export default function DashboardRoute({ loaderData }) { const [count, setCount] = useState(loaderData.count); return ( @@ -367,7 +367,7 @@ implementations.forEach((implementation) => { return { message: "Home Page Data" }; } - export function Component({ loaderData }) { + export default function HomeRoute({ loaderData }) { return (

    Home Page

    @@ -477,7 +477,7 @@ implementations.forEach((implementation) => { } `, "src/routes/home.tsx": js` - export { Component } from "./home.client"; + export { default } from "./home.client"; `, "src/routes/home.client.tsx": js` "use client"; @@ -486,7 +486,7 @@ implementations.forEach((implementation) => { import { incrementCounter } from "./home.actions"; - export function Component() { + export default function HomeRoute() { const [count, incrementCounterAction, incrementing] = useActionState(incrementCounter, 0); return ( @@ -547,7 +547,7 @@ implementations.forEach((implementation) => { return { name, count }; } - export function Component({ loaderData }) { + export default function HomeRoute({ loaderData }) { const updateCounter = async (formData: FormData) => { "use server"; name = formData.get("name"); @@ -624,7 +624,7 @@ implementations.forEach((implementation) => { import { redirectAction } from "./home.actions"; import { Counter } from "./home.client"; - export function Component(props) { + export default function HomeRoute(props) { console.log({props}); return (
    @@ -697,7 +697,7 @@ implementations.forEach((implementation) => { throw new Error("Intentional error from loader"); } - export function Component() { + export default function HomeRoute() { return

    This shouldn't render

    ; } diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index 211fbb94e1..a3756293f7 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -33,7 +33,6 @@ type ServerRouteObjectBase = { action?: ActionFunction; clientAction?: ClientActionFunction; clientLoader?: ClientLoaderFunction; - Component?: React.ComponentType; ErrorBoundary?: React.ComponentType; handle?: any; headers?: HeadersFunction; @@ -48,7 +47,20 @@ type ServerRouteObjectBase = { export type ServerRouteObject = ServerRouteObjectBase & { id: string; path?: string; - lazy?: () => Promise; + Component?: React.ComponentType; + lazy?: () => Promise< + ServerRouteObjectBase & + ( + | { + default?: React.ComponentType; + Component?: never; + } + | { + default?: never; + Component?: React.ComponentType; + } + ) + >; } & ( | { index: true; @@ -578,17 +590,8 @@ async function getServerRouteMatch( shouldRenderComponent: boolean, parentId: string | undefined ) { - if ("lazy" in match.route && match.route.lazy) { - Object.assign(match.route, { - // @ts-expect-error - FIXME: Fix the types here - ...((await match.route.lazy()) as any), - path: match.route.path, - index: (match.route as any).index, - id: match.route.id, - }); - match.route.lazy = undefined; - } - + // @ts-expect-error - FIXME: Fix the types here + await explodeLazyRoute(match.route); const Layout = (match.route as any).Layout || React.Fragment; const Component = (match.route as any).Component; const ErrorBoundary = (match.route as any).ErrorBoundary; @@ -712,9 +715,25 @@ async function getManifestRoute( async function explodeLazyRoute(route: ServerRouteObject) { if ("lazy" in route && route.lazy) { - let impl = (await route.lazy()) as any; - for (let [k, v] of Object.entries(impl)) { - route[k as keyof ServerRouteObject] = v; + let { + default: lazyDefaultExport, + Component: lazyComponentExport, + ...lazyProperties + } = (await route.lazy()) as any; + let Component = lazyComponentExport || lazyDefaultExport; + if (Component && !route.Component) { + route.Component = Component; + } + for (let [k, v] of Object.entries(lazyProperties)) { + if ( + k !== "id" && + k !== "path" && + k !== "index" && + k !== "children" && + route[k as keyof ServerRouteObject] == null + ) { + route[k as keyof ServerRouteObject] = v; + } } route.lazy = undefined; } diff --git a/playground/rsc-parcel/src/routes/about/about.client.tsx b/playground/rsc-parcel/src/routes/about/about.client.tsx index a60e964447..e6d57616b3 100644 --- a/playground/rsc-parcel/src/routes/about/about.client.tsx +++ b/playground/rsc-parcel/src/routes/about/about.client.tsx @@ -15,7 +15,7 @@ export async function clientLoader({ serverLoader }: ClientLoaderFunctionArgs) { }; } -export function Component() { +export default function AboutRoute() { const { client, message } = useLoaderData(); return ( diff --git a/playground/rsc-parcel/src/routes/about/about.tsx b/playground/rsc-parcel/src/routes/about/about.tsx index b1222a2056..815c50903d 100644 --- a/playground/rsc-parcel/src/routes/about/about.tsx +++ b/playground/rsc-parcel/src/routes/about/about.tsx @@ -1,4 +1,4 @@ -export { clientLoader, Component } from "./about.client"; +export { clientLoader, default } from "./about.client"; export function loader() { return { diff --git a/playground/rsc-parcel/src/routes/fetcher/fetcher.client.tsx b/playground/rsc-parcel/src/routes/fetcher/fetcher.client.tsx index d1b72782f0..2c48ea8963 100644 --- a/playground/rsc-parcel/src/routes/fetcher/fetcher.client.tsx +++ b/playground/rsc-parcel/src/routes/fetcher/fetcher.client.tsx @@ -3,7 +3,7 @@ import { useFetcher } from "react-router"; import type { loader } from "../resource/resource"; -export function Component() { +export default function FetcherRoute() { const fetcher = useFetcher(); return ( diff --git a/playground/rsc-parcel/src/routes/fetcher/fetcher.ts b/playground/rsc-parcel/src/routes/fetcher/fetcher.ts index 8887fa87ad..e7dadeb8d8 100644 --- a/playground/rsc-parcel/src/routes/fetcher/fetcher.ts +++ b/playground/rsc-parcel/src/routes/fetcher/fetcher.ts @@ -1 +1 @@ -export { Component } from "./fetcher.client"; +export { default } from "./fetcher.client"; diff --git a/playground/rsc-parcel/src/routes/home/home.client.tsx b/playground/rsc-parcel/src/routes/home/home.client.tsx index 70b50d001b..11277d9199 100644 --- a/playground/rsc-parcel/src/routes/home/home.client.tsx +++ b/playground/rsc-parcel/src/routes/home/home.client.tsx @@ -15,7 +15,7 @@ export async function clientLoader({ serverLoader }: ClientLoaderFunctionArgs) { }; } -export function Component() { +export default function HomeRoute() { const { client, message } = useLoaderData(); return ( diff --git a/playground/rsc-parcel/src/routes/home/home.tsx b/playground/rsc-parcel/src/routes/home/home.tsx index a8678017c4..22fffe84be 100644 --- a/playground/rsc-parcel/src/routes/home/home.tsx +++ b/playground/rsc-parcel/src/routes/home/home.tsx @@ -1,4 +1,4 @@ -export { clientLoader, Component } from "./home.client"; +export { clientLoader, default } from "./home.client"; export function loader() { return { diff --git a/playground/rsc-parcel/src/routes/root/root.client.tsx b/playground/rsc-parcel/src/routes/root/root.client.tsx index bdf8e2fbd3..03ccf799f8 100644 --- a/playground/rsc-parcel/src/routes/root/root.client.tsx +++ b/playground/rsc-parcel/src/routes/root/root.client.tsx @@ -27,7 +27,7 @@ export function Layout({ children }: { children: React.ReactNode }) { ); } -export function Component() { +export default function RootRoute() { const { counter, message } = useLoaderData(); return ( <> diff --git a/playground/rsc-parcel/src/routes/root/root.tsx b/playground/rsc-parcel/src/routes/root/root.tsx index f4ffa957d9..347dbd2248 100644 --- a/playground/rsc-parcel/src/routes/root/root.tsx +++ b/playground/rsc-parcel/src/routes/root/root.tsx @@ -1,4 +1,4 @@ -export { Component, ErrorBoundary, Layout } from "./root.client"; +export { default, ErrorBoundary, Layout } from "./root.client"; import { Counter } from "../../counter"; diff --git a/playground/rsc-vite/src/routes/about/about.client.tsx b/playground/rsc-vite/src/routes/about/about.client.tsx index 47a3738b01..e0c7a4079d 100644 --- a/playground/rsc-vite/src/routes/about/about.client.tsx +++ b/playground/rsc-vite/src/routes/about/about.client.tsx @@ -31,7 +31,7 @@ export async function clientLoader({ serverLoader }: ClientLoaderFunctionArgs) { clientLoader.hydrate = true; -export function Component() { +export default function AboutRoute() { const loaderData = useLoaderData(); const actionData = useActionData(); diff --git a/playground/rsc-vite/src/routes/home/home.tsx b/playground/rsc-vite/src/routes/home/home.tsx index b08e936428..89e1234b8a 100644 --- a/playground/rsc-vite/src/routes/home/home.tsx +++ b/playground/rsc-vite/src/routes/home/home.tsx @@ -14,7 +14,7 @@ export async function loader({ request }: LoaderFunctionArgs) { }; } -export function Component({ +export default function HomeRoute({ loaderData: { message, wasRedirected }, }: { loaderData: Awaited>; diff --git a/playground/rsc-vite/src/routes/parent-index/parent-index.tsx b/playground/rsc-vite/src/routes/parent-index/parent-index.tsx index 971b5dc7b3..ed3e26fad7 100644 --- a/playground/rsc-vite/src/routes/parent-index/parent-index.tsx +++ b/playground/rsc-vite/src/routes/parent-index/parent-index.tsx @@ -5,7 +5,7 @@ export async function loader() { }; } -export function Component({ +export default function ParentIndexRoute({ loaderData, }: { loaderData: Awaited>; diff --git a/playground/rsc-vite/src/routes/parent/parent.tsx b/playground/rsc-vite/src/routes/parent/parent.tsx index 9a306e3ef8..7c932b3507 100644 --- a/playground/rsc-vite/src/routes/parent/parent.tsx +++ b/playground/rsc-vite/src/routes/parent/parent.tsx @@ -6,7 +6,7 @@ export function loader() { }; } -export function Component({ +export default function ParentRoute({ loaderData, }: { loaderData: Awaited>; diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx index 008c6f8ab0..cfe865d0fe 100644 --- a/playground/rsc-vite/src/routes/root/root.tsx +++ b/playground/rsc-vite/src/routes/root/root.tsx @@ -27,7 +27,7 @@ export async function loader() { }; } -export function Component({ +export default function RootRoute({ loaderData, }: { loaderData: Awaited>; From 98367e49900701c460cb08eb16c2441da5007efc Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Fri, 6 Jun 2025 15:10:53 -0700 Subject: [PATCH 130/143] fix: allow resource routes to be called as fetchers or as public API (#13770) remove reliance on request header by shifting router url sanitization up to rsc server --- integration/rsc/rsc-test.ts | 86 +++++++++++ packages/react-router/lib/rsc/server.rsc.ts | 149 ++++++++++++++----- packages/react-router/lib/rsc/server.ssr.tsx | 22 +-- 3 files changed, 206 insertions(+), 51 deletions(-) diff --git a/integration/rsc/rsc-test.ts b/integration/rsc/rsc-test.ts index 7c535a1349..df0de52e06 100644 --- a/integration/rsc/rsc-test.ts +++ b/integration/rsc/rsc-test.ts @@ -460,6 +460,92 @@ implementations.forEach((implementation) => { // Ensure this is using RSC validateRSCHtml(await page.content()); }); + + test("Supports resource routes as URL and fetchers", async ({ page }) => { + let port = await getPort(); + stop = await setupRscTest({ + implementation, + port, + files: { + "src/routes.ts": js` + import type { unstable_ServerRouteObject as ServerRouteObject } from "react-router/rsc"; + + export const routes = [ + { + id: "root", + path: "", + lazy: () => import("./routes/root"), + children: [ + { + id: "home", + index: true, + lazy: () => import("./routes/home"), + }, + { + id: "resource", + path: "resource", + lazy: () => import("./routes/resource"), + }, + ], + }, + ] satisfies ServerRouteObject[]; + `, + "src/routes/resource.tsx": js` + export function loader() { + return { + message: "Hello from resource route!", + }; + } + `, + "src/routes/home.client.tsx": js` + "use client"; + + import { useFetcher } from "react-router"; + + export function ResourceFetcher() { + const fetcher = useFetcher(); + + const loadResource = () => { + fetcher.load("/resource"); + }; + + return ( +
    + + {!!fetcher.data && ( + 
    +                        {JSON.stringify(fetcher.data)}
+
    + )} +
    + ); + } + `, + "src/routes/home.tsx": js` + import { ResourceFetcher } from "./home.client"; + + export default function HomeRoute() { + return ; + } + `, + }, + }); + const response = await page.goto(`http://localhost:${port}/resource`); + expect(response?.status()).toBe(200); + expect(await response?.json()).toEqual({ + message: "Hello from resource route!", + }); + + await page.goto(`http://localhost:${port}/`); + await page.click("button"); + + await page.waitForSelector("[data-testid=resource-data]"); + expect( + await page.locator("[data-testid=resource-data]").textContent() + ).toBe(JSON.stringify({ message: "Hello from resource route!" })); + }); }); test.describe("Server Actions", () => { diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index a3756293f7..8f01fec1bf 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -167,9 +167,9 @@ export async function matchRSCServerRequest({ routes: ServerRouteObject[]; generateResponse: (match: ServerMatch) => Response; }): Promise { - const url = new URL(request.url); + let requestUrl = new URL(request.url); - if (isManifestRequest(url)) { + if (isManifestRequest(requestUrl)) { let response = await generateManifestResponse( routes, request, @@ -178,9 +178,49 @@ export async function matchRSCServerRequest({ return response; } + let isDataRequest = isReactServerRequest(requestUrl); + + const url = new URL(request.url); + let routerRequest = request; + if (isDataRequest) { + url.pathname = url.pathname.replace(/(_root)?\.rsc$/, ""); + routerRequest = new Request(url.toString(), { + method: request.method, + headers: request.headers, + body: request.body, + signal: request.signal, + duplex: request.body ? "half" : undefined, + } as RequestInit); + } + + // Explode lazy functions out the routes so we can use middleware + // TODO: This isn't ideal but we can't do it through `lazy()` in the router, + // and if we move to `lazy: {}` then we lose all the other things from the + // `ServerRouteObject` like `Layout` etc. + let matches = matchRoutes(routes, url.pathname); + if (matches) { + await Promise.all(matches.map((m) => explodeLazyRoute(m.route))); + } + + const leafMatch = matches?.[matches.length - 1]; + if ( + !isDataRequest && + leafMatch && + !leafMatch.route.Component && + !leafMatch.route.ErrorBoundary + ) { + return generateResourceResponse( + routerRequest, + routes, + leafMatch.route.id, + onError + ); + } + let response = await generateRenderResponse( - request, + routerRequest, routes, + isDataRequest, decodeCallServer, decodeFormAction, onError, @@ -287,37 +327,87 @@ async function processServerAction( }; } - if (request.method === "POST") { - const clone = request.clone(); - const formData = await request.formData(); - if (Array.from(formData.keys()).some((k) => k.startsWith("$ACTION_"))) { - if (!decodeFormAction) { - throw new Error( - "Cannot handle form actions without a decodeFormAction function" - ); - } - const action = await decodeFormAction(formData); - try { - await action(); - } catch (error) { - if (isResponse(error)) { - return error; - } - onError?.(error); + const clone = request.clone(); + const formData = await request.formData(); + if (Array.from(formData.keys()).some((k) => k.startsWith("$ACTION_"))) { + if (!decodeFormAction) { + throw new Error( + "Cannot handle form actions without a decodeFormAction function" + ); + } + const action = await decodeFormAction(formData); + try { + await action(); + } catch (error) { + if (isResponse(error)) { + return error; } - return { - revalidationRequest: getRevalidationRequest(), - }; + onError?.(error); } return { - revalidationRequest: clone, + revalidationRequest: getRevalidationRequest(), }; } + return { + revalidationRequest: clone, + }; +} + +async function generateResourceResponse( + request: Request, + routes: ServerRouteObject[], + routeId: string, + onError: ((error: unknown) => void) | undefined +) { + let result: Response; + try { + const staticHandler = createStaticHandler(routes, { + // TODO: Support basename + // basename + }); + + let response = await staticHandler.queryRoute(request, { + routeId, + // TODO: Support loadContext + // requestContext: loadContext, + unstable_respond: (ctx) => ctx, + }); + + if (isResponse(response)) { + result = response; + } else { + if (typeof response === "string") { + result = new Response(response); + } else { + result = Response.json(response); + } + } + } catch (error) { + if (isResponse(error)) { + result = error; + } else { + // TODO: Do we need to handle ErrorResponse? + onError?.(error); + + result = new Response("Internal Server Error", { + status: 500, + }); + } + } + + const headers = new Headers(result.headers); + headers.set("React-Router-Resource", "true"); + return new Response(result.body, { + status: result.status, + statusText: result.statusText, + headers, + }); } async function generateRenderResponse( request: Request, routes: ServerRouteObject[], + isDataRequest: boolean, decodeCallServer: DecodeCallServerFunction | undefined, decodeFormAction: DecodeFormActionFunction | undefined, onError: ((error: unknown) => void) | undefined, @@ -331,22 +421,13 @@ async function generateRenderResponse( // TODO: Can this be done with a pathname extension instead of a header? // If not, make sure we strip this at the SSR server and it can only be set // by us to avoid cache-poisoning attempts - let isDataRequest = request.headers.has("X-React-Router-Data-Request"); + let isSubmission = isMutationMethod(request.method); let routeIdsToLoad = !isSubmission && url.searchParams.has("_routes") ? url.searchParams.get("_routes")!.split(",") : null; - // Explode lazy functions out the routes so we can use middleware - // TODO: This isn't ideal but we can't do it through `lazy()` in the router, - // and if we move to `lazy: {}` then we lose all the other things from the - // `ServerRouteObject` like `Layout` etc. - let matches = matchRoutes(routes, url.pathname); - if (matches) { - await Promise.all(matches.map((m) => explodeLazyRoute(m.route))); - } - // Create the handler here with exploded routes const handler = createStaticHandler(routes, { mapRouteProperties: (r) => ({ diff --git a/packages/react-router/lib/rsc/server.ssr.tsx b/packages/react-router/lib/rsc/server.ssr.tsx index ddff7de457..b7fbbd4e36 100644 --- a/packages/react-router/lib/rsc/server.ssr.tsx +++ b/packages/react-router/lib/rsc/server.ssr.tsx @@ -22,30 +22,18 @@ export async function routeRSCServerRequest({ hydrate?: boolean; }) { const url = new URL(request.url); - let serverRequest = request; const isDataRequest = isReactServerRequest(url); const respondWithRSCPayload = isDataRequest || isManifestRequest(url) || request.headers.has("rsc-action-id"); - if (isDataRequest) { - const serverURL = new URL(request.url); - serverURL.pathname = serverURL.pathname.replace(/(_root)?\.rsc$/, ""); - let headers = new Headers(request.headers); - headers.set("X-React-Router-Data-Request", "true"); - serverRequest = new Request(serverURL, { - body: request.body, - duplex: request.body ? "half" : undefined, - headers, - method: request.method, - signal: request.signal, - } as RequestInit & { duplex?: "half" }); - } - - const serverResponse = await callServer(serverRequest); + const serverResponse = await callServer(request); - if (respondWithRSCPayload) { + if ( + respondWithRSCPayload || + serverResponse.headers.get("React-Router-Resource") === "true" + ) { return serverResponse; } From 8175a14f7fe521ec8f5df3c030a5fbec50c66431 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Thu, 12 Jun 2025 19:36:38 -0700 Subject: [PATCH 131/143] chore: issolate changes to _renderRoutes chore: minor cleanup --- .../helpers/rsc-parcel/src/entry.browser.tsx | 10 ++++++++++ packages/react-router/lib/components.tsx | 1 + packages/react-router/lib/context.ts | 6 ++++++ .../react-router/lib/dom/ssr/single-fetch.tsx | 1 - packages/react-router/lib/hooks.tsx | 13 +++++++++--- packages/react-router/lib/router/router.ts | 19 +++++++++--------- packages/react-router/lib/rsc/browser.tsx | 10 ++++++---- packages/react-router/lib/rsc/server.rsc.ts | 7 ++++++- packages/react-router/lib/rsc/server.ssr.tsx | 20 ++++++++++--------- 9 files changed, 59 insertions(+), 28 deletions(-) diff --git a/integration/helpers/rsc-parcel/src/entry.browser.tsx b/integration/helpers/rsc-parcel/src/entry.browser.tsx index af2621c657..d604446534 100644 --- a/integration/helpers/rsc-parcel/src/entry.browser.tsx +++ b/integration/helpers/rsc-parcel/src/entry.browser.tsx @@ -38,3 +38,13 @@ createFromReadableStream(getServerStream(), { assets: "manifest" }).then( }); } ); + +if (process.env.NODE_ENV !== "production") { + const ogError = console.error.bind(console); + console.error = (...args) => { + if (args[1] === Symbol.for("react-router.redirect")) { + return; + } + ogError(...args); + }; +} diff --git a/packages/react-router/lib/components.tsx b/packages/react-router/lib/components.tsx index 769dc28bf1..c88bc77962 100644 --- a/packages/react-router/lib/components.tsx +++ b/packages/react-router/lib/components.tsx @@ -1232,6 +1232,7 @@ export let createRoutesFromElements = createRoutesFromChildren; export function renderMatches( matches: RouteMatch[] | null ): React.ReactElement | null { + // Is this legacy? No params relevant to how it's used???? Seems lacking. return _renderMatches(matches); } diff --git a/packages/react-router/lib/context.ts b/packages/react-router/lib/context.ts index 03587bcf54..9ff5c96891 100644 --- a/packages/react-router/lib/context.ts +++ b/packages/react-router/lib/context.ts @@ -101,6 +101,12 @@ export const DataRouterStateContext = React.createContext< >(null); DataRouterStateContext.displayName = "DataRouterState"; +export const RSCRouterContext = React.createContext(false); + +export function useIsRSCRouterContext(): boolean { + return React.useContext(RSCRouterContext); +} + export type ViewTransitionContextObject = | { isTransitioning: false; diff --git a/packages/react-router/lib/dom/ssr/single-fetch.tsx b/packages/react-router/lib/dom/ssr/single-fetch.tsx index 357f8a9597..c1742be90b 100644 --- a/packages/react-router/lib/dom/ssr/single-fetch.tsx +++ b/packages/react-router/lib/dom/ssr/single-fetch.tsx @@ -7,7 +7,6 @@ import type { DataStrategyFunction, DataStrategyFunctionArgs, DataStrategyResult, - unstable_RouterContextProvider, } from "../../router/utils"; import { ErrorResponseImpl, diff --git a/packages/react-router/lib/hooks.tsx b/packages/react-router/lib/hooks.tsx index 78871f463d..c9f7f343cf 100644 --- a/packages/react-router/lib/hooks.tsx +++ b/packages/react-router/lib/hooks.tsx @@ -15,6 +15,7 @@ import { NavigationContext, RouteContext, RouteErrorContext, + useIsRSCRouterContext, } from "./context"; import type { Location, Path, To } from "./router/history"; import { @@ -444,6 +445,8 @@ export function useRoutesImpl( `useRoutes() may be used only in the context of a component.` ); + let isRSCRouterContext = useIsRSCRouterContext(); + let { navigator } = React.useContext(NavigationContext); let { matches: parentMatches } = React.useContext(RouteContext); let routeMatch = parentMatches[parentMatches.length - 1]; @@ -576,7 +579,8 @@ export function useRoutesImpl( ), parentMatches, dataRouterState, - future + future, + isRSCRouterContext ); // When a user passes in a `locationArg`, the associated routes need to @@ -766,7 +770,8 @@ export function _renderMatches( matches: RouteMatch[] | null, parentMatches: RouteMatch[] = [], dataRouterState: DataRouter["state"] | null = null, - future: DataRouter["future"] | null = null + future: DataRouter["future"] | null = null, + isRSCRouterContext: boolean = false ): React.ReactElement | null { if (matches == null) { if (!dataRouterState) { @@ -895,7 +900,9 @@ export function _renderMatches( children = outlet; } - children = {children}; + if (isRSCRouterContext) { + children = {children}; + } return ( | undefined => { + ): MaybePromise | StaticHandlerContext => { return stream ? stream(requestContext as unstable_RouterContextProvider, () => Promise.resolve(ctx) ) : respond ? respond(ctx) - : undefined; + : ctx; }; // SSR supports HEAD requests while SPA doesn't @@ -3564,7 +3564,7 @@ export function createStaticHandler( loaderHeaders: {}, actionHeaders: {}, }; - return respondOrStreamStaticContext(staticContext) || staticContext; + return respondOrStreamStaticContext(staticContext); } else if (!matches) { let error = getInternalRouterError(404, { pathname: location.pathname }); let { matches: notFoundMatches, route } = @@ -3582,7 +3582,7 @@ export function createStaticHandler( loaderHeaders: {}, actionHeaders: {}, }; - return respondOrStreamStaticContext(staticContext) || staticContext; + return respondOrStreamStaticContext(staticContext); } if ( @@ -3739,9 +3739,7 @@ export function createStaticHandler( ? routeId : findNearestBoundary(matches, routeId).route.id ); - return ( - respondOrStreamStaticContext(staticContext) || staticContext - ); + return respondOrStreamStaticContext(staticContext); } else { // We never even got to the handlers, so we've got no data - // just create an empty context reflecting the error. @@ -3771,9 +3769,7 @@ export function createStaticHandler( actionHeaders: {}, loaderHeaders: {}, }; - return ( - respondOrStreamStaticContext(staticContext) || staticContext - ); + return respondOrStreamStaticContext(staticContext); } } ); @@ -6570,6 +6566,9 @@ function isValidMethod(method: string): method is FormMethod { } export function isMutationMethod(method: string): method is MutationFormMethod { + // TODO: This should probably check against GET and HEAD, and consider any other + // method, including non-standard methods as mutations. We should also consider + // allowing "non-standard" method through, right now we 405 on anything non-standard. return validMutationMethods.has(method.toUpperCase() as MutationFormMethod); } diff --git a/packages/react-router/lib/rsc/browser.tsx b/packages/react-router/lib/rsc/browser.tsx index 16d7925478..4d6330d54a 100644 --- a/packages/react-router/lib/rsc/browser.tsx +++ b/packages/react-router/lib/rsc/browser.tsx @@ -2,7 +2,7 @@ import * as React from "react"; import * as ReactDOM from "react-dom"; import { RouterProvider } from "../components"; -import type { DataRouteMatch, DataRouteObject } from "../context"; +import { RSCRouterContext, type DataRouteMatch, type DataRouteObject } from "../context"; import { FrameworkContext } from "../dom/ssr/components"; import type { FrameworkContextObject } from "../dom/ssr/entry"; import { createBrowserHistory, invariant } from "../router/history"; @@ -530,9 +530,11 @@ export function RSCHydratedRouter({ }; return ( - - - + + + + + ); } diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index 8f01fec1bf..651f758e9c 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -87,6 +87,10 @@ export type RenderedRoute = { parentId?: string; path?: string; shouldRevalidate?: ShouldRevalidateFunction; + // TODO: Add "hasComponent" or similar to help with the `shouldAllowOptOut` + // logic in the browser RSC single fetch implementation. The issue is that + // if there is no element, we have to go to the server. This helps with "route + // has no component therefore can opt out". }; export type ServerRouteMatch = RenderedRoute & { @@ -695,7 +699,8 @@ async function getServerRouteMatch( ), }) ) - : undefined; + : // TODO: Render outet instead? + undefined; let error: unknown = undefined; // FIXME: Is this logic right? We don't want to take any error - only the diff --git a/packages/react-router/lib/rsc/server.ssr.tsx b/packages/react-router/lib/rsc/server.ssr.tsx index b7fbbd4e36..524bdc5c95 100644 --- a/packages/react-router/lib/rsc/server.ssr.tsx +++ b/packages/react-router/lib/rsc/server.ssr.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import { type DataRouteObject } from "../context"; +import { RSCRouterContext, type DataRouteObject } from "../context"; import { FrameworkContext } from "../dom/ssr/components"; import type { FrameworkContextObject } from "../dom/ssr/entry"; import { createStaticRouter, StaticRouterProvider } from "../dom/server"; @@ -180,14 +180,16 @@ export function RSCStaticRouter({ }; return ( - - - + + + + + ); } From e68b0c75fabcdf43d86744cd29bbbe357f13c1a4 Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Fri, 13 Jun 2025 15:51:51 +1000 Subject: [PATCH 132/143] fix: add `hasComponent` to RSC route manifest (#13798) --- packages/react-router/lib/rsc/browser.tsx | 55 ++++++++++++--------- packages/react-router/lib/rsc/server.rsc.ts | 9 ++-- 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/packages/react-router/lib/rsc/browser.tsx b/packages/react-router/lib/rsc/browser.tsx index 4d6330d54a..0776110510 100644 --- a/packages/react-router/lib/rsc/browser.tsx +++ b/packages/react-router/lib/rsc/browser.tsx @@ -2,7 +2,11 @@ import * as React from "react"; import * as ReactDOM from "react-dom"; import { RouterProvider } from "../components"; -import { RSCRouterContext, type DataRouteMatch, type DataRouteObject } from "../context"; +import { + RSCRouterContext, + type DataRouteMatch, + type DataRouteObject, +} from "../context"; import { FrameworkContext } from "../dom/ssr/components"; import type { FrameworkContextObject } from "../dom/ssr/entry"; import { createBrowserHistory, invariant } from "../router/history"; @@ -255,23 +259,27 @@ export function getRSCSingleFetchDataStrategy( basename: string | undefined, decode: DecodeServerResponseFunction ): DataStrategyFunction { + // TODO: Clean this up with a shared type + type RSCDataRouteMatch = DataRouteMatch & { + route: DataRouteObject & { + hasLoader: boolean; + hasClientLoader: boolean; + hasComponent: boolean; + hasAction: boolean; + hasClientAction: boolean; + hasShouldRevalidate: boolean; + }; + }; + // create map let dataStrategy = getSingleFetchDataStrategyImpl( getRouter, - (match: DataRouteMatch) => { - // TODO: Clean this up with a shared type - let M = match as DataRouteMatch & { - route: DataRouteObject & { - hasLoader: boolean; - hasClientLoader: boolean; - hasAction: boolean; - hasClientAction: boolean; - hasShouldRevalidate: boolean; - }; - }; + (match) => { + let M = match as RSCDataRouteMatch; return { hasLoader: M.route.hasLoader, hasClientLoader: M.route.hasClientLoader, + hasComponent: M.route.hasComponent, hasAction: M.route.hasAction, hasClientAction: M.route.hasClientAction, hasShouldRevalidate: M.route.hasShouldRevalidate, @@ -281,12 +289,13 @@ export function getRSCSingleFetchDataStrategy( getFetchAndDecodeViaRSC(decode), ssr, basename, - // If we don't have an element, we need to hit the server loader flow - // regardless of whether the client loader calls `serverLoader` or not, - // otherwise we'll have nothing to render. - // TODO: Do we need to account for API routes? Do we need a - // `match.hasComponent` flag? - (match) => match.route.element != null + // If the route has a component but we don't have an element, we need to hit + // the server loader flow regardless of whether the client loader calls + // `serverLoader` or not, otherwise we'll have nothing to render. + (match) => { + let M = match as RSCDataRouteMatch; + return M.route.hasComponent && !M.route.element; + } ); return async (args) => args.unstable_runClientMiddleware(async () => { @@ -557,12 +566,10 @@ function createRouteFromServerManifest( let isHydrationRequest = match.clientLoader?.hydrate === true || !match.hasLoader || - // If we don't have an element, we need to hit the server loader flow - // regardless of whether the client loader calls `serverLoader` or not, - // otherwise we'll have nothing to render. - // TODO: Do we need to account for API routes? Do we need a - // `match.hasComponent` flag? - !match.element; + // If the route has a component but we don't have an element, we need to hit + // the server loader flow regardless of whether the client loader calls + // `serverLoader` or not, otherwise we'll have nothing to render. + (match.hasComponent && !match.element); let dataRoute: DataRouteObjectWithManifestInfo = { id: match.id, diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index 651f758e9c..cfd15351a6 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -77,6 +77,7 @@ export type RenderedRoute = { errorElement?: React.ReactElement; handle?: any; hasAction: boolean; + hasComponent: boolean; hasErrorBoundary: boolean; hasLoader: boolean; hydrateFallbackElement?: React.ReactElement; @@ -87,10 +88,6 @@ export type RenderedRoute = { parentId?: string; path?: string; shouldRevalidate?: ShouldRevalidateFunction; - // TODO: Add "hasComponent" or similar to help with the `shouldAllowOptOut` - // logic in the browser RSC single fetch implementation. The issue is that - // if there is no element, we have to go to the server. This helps with "route - // has no component therefore can opt out". }; export type ServerRouteMatch = RenderedRoute & { @@ -750,7 +747,8 @@ async function getServerRouteMatch( errorElement, handle: (match.route as any).handle, hasAction: !!match.route.action, - hasErrorBoundary: !!(match.route as any).ErrorBoundary, + hasComponent: !!Component, + hasErrorBoundary: !!ErrorBoundary, hasLoader: !!match.route.loader, hydrateFallbackElement, id: match.route.id, @@ -787,6 +785,7 @@ async function getManifestRoute( clientLoader: route.clientLoader, handle: route.handle, hasAction: !!route.action, + hasComponent: !!route.Component, hasErrorBoundary: !!route.ErrorBoundary, errorElement, hasLoader: !!route.loader, From 3495891d58622a353b09a3d471854274b7144cb6 Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Fri, 13 Jun 2025 18:27:09 +1000 Subject: [PATCH 133/143] test: add initial RSC framework integration test support (#13788) --- .eslintignore | 9 + integration/action-test.ts | 426 ++-- integration/helpers/create-fixture.ts | 102 +- .../helpers/rsc-parcel-framework/.gitignore | 5 + .../helpers/rsc-parcel-framework/.parcelrc | 3 + .../helpers/rsc-parcel-framework/app/index.ts | 3 + .../helpers/rsc-parcel-framework/app/root.tsx | 18 + .../rsc-parcel-framework/app/routes.ts | 4 + .../app/routes/_index.tsx | 16 + .../helpers/rsc-parcel-framework/package.json | 44 + .../helpers/rsc-parcel-framework/start.js | 18 + .../rsc-parcel-framework/tsconfig.json | 20 + .../helpers/rsc-vite/tsconfig.client.json | 2 +- integration/helpers/vite.ts | 3 + integration/package.json | 1 + package.json | 1 + packages/react-router/tsup.config.rsc.ts | 5 +- playground/rsc-parcel-framework/.gitignore | 5 + playground/rsc-parcel-framework/.parcelrc | 3 + playground/rsc-parcel-framework/app/root.css | 3 + playground/rsc-parcel-framework/app/root.tsx | 55 + playground/rsc-parcel-framework/app/routes.ts | 4 + .../app/routes/_index/actions.ts | 5 + .../app/routes/_index/route.tsx | 21 + .../app/routes/_index/styles.css | 3 + .../routes/client-loader-hydrate/route.tsx | 24 + .../client-loader-hydrate/styles.module.css | 3 + .../route.tsx | 16 + .../styles.module.css | 3 + .../app/routes/client-loader/route.tsx | 22 + .../routes/client-loader/styles.module.css | 3 + .../routes/fixture.client-component/route.tsx | 16 + .../routes/fixture.server-component/route.tsx | 18 + .../app/routes/optimistic/form.tsx | 33 + .../app/routes/optimistic/route.tsx | 17 + .../app/routes/server-loader/route.tsx | 18 + .../routes/server-loader/styles.module.css | 3 + playground/rsc-parcel-framework/app/server.ts | 16 + playground/rsc-parcel-framework/package.json | 42 + playground/rsc-parcel-framework/tsconfig.json | 20 + playground/rsc-parcel/package.json | 8 +- pnpm-lock.yaml | 1725 +++++++---------- 42 files changed, 1496 insertions(+), 1270 deletions(-) create mode 100644 integration/helpers/rsc-parcel-framework/.gitignore create mode 100644 integration/helpers/rsc-parcel-framework/.parcelrc create mode 100644 integration/helpers/rsc-parcel-framework/app/index.ts create mode 100644 integration/helpers/rsc-parcel-framework/app/root.tsx create mode 100644 integration/helpers/rsc-parcel-framework/app/routes.ts create mode 100644 integration/helpers/rsc-parcel-framework/app/routes/_index.tsx create mode 100644 integration/helpers/rsc-parcel-framework/package.json create mode 100644 integration/helpers/rsc-parcel-framework/start.js create mode 100644 integration/helpers/rsc-parcel-framework/tsconfig.json create mode 100644 playground/rsc-parcel-framework/.gitignore create mode 100644 playground/rsc-parcel-framework/.parcelrc create mode 100644 playground/rsc-parcel-framework/app/root.css create mode 100644 playground/rsc-parcel-framework/app/root.tsx create mode 100644 playground/rsc-parcel-framework/app/routes.ts create mode 100644 playground/rsc-parcel-framework/app/routes/_index/actions.ts create mode 100644 playground/rsc-parcel-framework/app/routes/_index/route.tsx create mode 100644 playground/rsc-parcel-framework/app/routes/_index/styles.css create mode 100644 playground/rsc-parcel-framework/app/routes/client-loader-hydrate/route.tsx create mode 100644 playground/rsc-parcel-framework/app/routes/client-loader-hydrate/styles.module.css create mode 100644 playground/rsc-parcel-framework/app/routes/client-loader-without-server-loader/route.tsx create mode 100644 playground/rsc-parcel-framework/app/routes/client-loader-without-server-loader/styles.module.css create mode 100644 playground/rsc-parcel-framework/app/routes/client-loader/route.tsx create mode 100644 playground/rsc-parcel-framework/app/routes/client-loader/styles.module.css create mode 100644 playground/rsc-parcel-framework/app/routes/fixture.client-component/route.tsx create mode 100644 playground/rsc-parcel-framework/app/routes/fixture.server-component/route.tsx create mode 100644 playground/rsc-parcel-framework/app/routes/optimistic/form.tsx create mode 100644 playground/rsc-parcel-framework/app/routes/optimistic/route.tsx create mode 100644 playground/rsc-parcel-framework/app/routes/server-loader/route.tsx create mode 100644 playground/rsc-parcel-framework/app/routes/server-loader/styles.module.css create mode 100644 playground/rsc-parcel-framework/app/server.ts create mode 100644 playground/rsc-parcel-framework/package.json create mode 100644 playground/rsc-parcel-framework/tsconfig.json diff --git a/.eslintignore b/.eslintignore index dbd9643de0..49a812d5b4 100644 --- a/.eslintignore +++ b/.eslintignore @@ -6,6 +6,15 @@ examples/**/dist/ worker-configuration.d.ts /playground/ /playground-local/ +integration/helpers/**/dist/ +integration/helpers/**/build/ +playwright-report/ +test-results/ +build.utils.d.ts +.wrangler/ +.tmp/ +.react-router/ +.react-router-parcel/ packages/**/dist/ packages/react-router-dom/server.d.ts packages/react-router-dom/server.js diff --git a/integration/action-test.ts b/integration/action-test.ts index c08e6d4bdb..b11dc6a574 100644 --- a/integration/action-test.ts +++ b/integration/action-test.ts @@ -7,206 +7,234 @@ import { } from "./helpers/create-fixture.js"; import type { Fixture, AppFixture } from "./helpers/create-fixture.js"; import { PlaywrightFixture, selectHtml } from "./helpers/playwright-fixture.js"; +import type { TemplateName } from "./helpers/vite.js"; -test.describe("actions", () => { - let fixture: Fixture; - let appFixture: AppFixture; - - let FIELD_NAME = "message"; - let WAITING_VALUE = "Waiting..."; - let SUBMITTED_VALUE = "Submission"; - let THROWS_REDIRECT = "redirect-throw"; - let REDIRECT_TARGET = "page"; - let PAGE_TEXT = "PAGE_TEXT"; - - test.beforeAll(async () => { - fixture = await createFixture({ - files: { - "app/routes/urlencoded.tsx": js` - import { Form, useActionData } from "react-router"; - - export let action = async ({ request }) => { - let formData = await request.formData(); - return formData.get("${FIELD_NAME}"); - }; - - export default function Actions() { - let data = useActionData() - - return ( -
    -

    - {data ? {data} : "${WAITING_VALUE}"} -

    -

    - - -

    -
    - ); - } - `, - - "app/routes/request-text.tsx": js` - import { Form, useActionData } from "react-router"; - - export let action = async ({ request }) => { - let text = await request.text(); - return text; - }; - - export default function Actions() { - let data = useActionData() - - return ( -
    -

    - {data ? {data} : "${WAITING_VALUE}"} -

    -

    - - - -

    -
    - ); - } - `, - - [`app/routes/${THROWS_REDIRECT}.jsx`]: js` - import { redirect, Form } from "react-router"; - - export function action() { - throw redirect("/${REDIRECT_TARGET}") - } - - export default function () { - return ( -
    - -
    - ) - } - `, - - [`app/routes/${REDIRECT_TARGET}.jsx`]: js` - export default function () { - return
    ${PAGE_TEXT}
    - } - `, - - "app/routes/no-action.tsx": js` - import { Form } from "react-router"; - - export default function Component() { - return ( -
    - -
    - ); - } - `, - }, - }); - - appFixture = await createAppFixture(fixture); - }); +const templateNames = [ + "vite-5-template", + "rsc-parcel-framework", +] as const satisfies TemplateName[]; - test.afterAll(() => { - appFixture.close(); - }); - - let logs: string[] = []; - - test.beforeEach(({ page }) => { - page.on("console", (msg) => { - logs.push(msg.text()); +test.describe("actions", () => { + for (const templateName of templateNames) { + test.describe(`template: ${templateName}`, () => { + let fixture: Fixture; + let appFixture: AppFixture; + + let FIELD_NAME = "message"; + let WAITING_VALUE = "Waiting..."; + let SUBMITTED_VALUE = "Submission"; + let THROWS_REDIRECT = "redirect-throw"; + let REDIRECT_TARGET = "page"; + let PAGE_TEXT = "PAGE_TEXT"; + + test.beforeAll(async () => { + fixture = await createFixture({ + templateName, + files: { + "app/routes/urlencoded.tsx": js` + import { Form, useActionData } from "react-router"; + + export let action = async ({ request }) => { + let formData = await request.formData(); + return formData.get("${FIELD_NAME}"); + }; + + export default function Actions() { + let data = useActionData() + + return ( +
    +

    + {data ? {data} : "${WAITING_VALUE}"} +

    +

    + + +

    +
    + ); + } + `, + + "app/routes/request-text.tsx": js` + import { Form, useActionData } from "react-router"; + + export let action = async ({ request }) => { + let text = await request.text(); + return text; + }; + + export default function Actions() { + let data = useActionData() + + return ( +
    +

    + {data ? {data} : "${WAITING_VALUE}"} +

    +

    + + + +

    +
    + ); + } + `, + + [`app/routes/${THROWS_REDIRECT}.jsx`]: js` + import { redirect, Form } from "react-router"; + + export function action() { + throw redirect("/${REDIRECT_TARGET}") + } + + export default function () { + return ( +
    + +
    + ) + } + `, + + [`app/routes/${REDIRECT_TARGET}.jsx`]: js` + export default function () { + return
    ${PAGE_TEXT}
    + } + `, + + "app/routes/no-action.tsx": js` + import { Form } from "react-router"; + + export default function Component() { + return ( +
    + +
    + ); + } + `, + }, + }); + + appFixture = await createAppFixture(fixture); + }); + + test.afterAll(() => { + appFixture.close(); + }); + + let logs: string[] = []; + + test.beforeEach(({ page }) => { + page.on("console", (msg) => { + logs.push(msg.text()); + }); + }); + + test.afterEach(() => { + expect(logs).toHaveLength(0); + }); + + test("is not called on document GET requests", async () => { + let res = await fixture.requestDocument("/urlencoded"); + let html = selectHtml(await res.text(), "#text"); + expect(html).toMatch(WAITING_VALUE); + }); + + test("is called on document POST requests", async () => { + let FIELD_VALUE = "cheeseburger"; + + let params = new URLSearchParams(); + params.append(FIELD_NAME, FIELD_VALUE); + + let res = await fixture.postDocument("/urlencoded", params); + + let html = selectHtml(await res.text(), "#text"); + expect(html).toMatch(FIELD_VALUE); + }); + + test("is called on script transition POST requests", async ({ page }) => { + let app = new PlaywrightFixture(appFixture, page); + await app.goto(`/urlencoded`); + await page.waitForSelector(`#text:has-text("${WAITING_VALUE}")`); + + await page.click("button[type=submit]"); + await page.waitForSelector("#action-text"); + await page.waitForSelector(`#text:has-text("${SUBMITTED_VALUE}")`); + }); + + test("throws a 405 when no action exists", async ({ page }) => { + // FIXME: Support in RSC + if (templateName === "rsc-parcel-framework") { + test.skip(); + } + + let app = new PlaywrightFixture(appFixture, page); + await app.goto(`/no-action`); + await page.click("button[type=submit]"); + await page.waitForSelector(`h1:has-text("405 Method Not Allowed")`); + expect(logs.length).toBe(2); + expect(logs[0]).toMatch( + 'Route "routes/no-action" does not have an action' + ); + // logs[1] is the raw ErrorResponse instance from the boundary but playwright + // seems to just log the name of the constructor, which in the minified code + // is meaningless so we don't bother asserting + + // The rest of the tests in this suite assert no logs, so clear this out to + // avoid failures in afterEach + logs = []; + }); + + test("properly encodes form data for request.text() usage", async ({ + page, + }) => { + let app = new PlaywrightFixture(appFixture, page); + await app.goto(`/request-text`); + await page.waitForSelector(`#text:has-text("${WAITING_VALUE}")`); + + await page.click("button[type=submit]"); + await page.waitForSelector("#action-text"); + expect(await app.getHtml("#action-text")).toBe( + 'a=1&b=2' + ); + }); + + test("redirects a thrown response on document requests", async () => { + // FIXME: Support in RSC + if (templateName === "rsc-parcel-framework") { + test.skip(); + } + + let params = new URLSearchParams(); + let res = await fixture.postDocument(`/${THROWS_REDIRECT}`, params); + expect(res.status).toBe(302); + expect(res.headers.get("Location")).toBe(`/${REDIRECT_TARGET}`); + }); + + test("redirects a thrown response on script transitions", async ({ + page, + }) => { + // FIXME: Support in RSC + if (templateName === "rsc-parcel-framework") { + test.skip(); + } + + let app = new PlaywrightFixture(appFixture, page); + await app.goto(`/${THROWS_REDIRECT}`); + let responses = app.collectSingleFetchResponses(); + await app.clickSubmitButton(`/${THROWS_REDIRECT}`); + + await page.waitForSelector(`#${REDIRECT_TARGET}`); + + expect(responses.length).toBe(1); + expect(responses[0].status()).toBe(202); + + expect(new URL(page.url()).pathname).toBe(`/${REDIRECT_TARGET}`); + expect(await app.getHtml()).toMatch(PAGE_TEXT); + }); }); - }); - - test.afterEach(() => { - expect(logs).toHaveLength(0); - }); - - test("is not called on document GET requests", async () => { - let res = await fixture.requestDocument("/urlencoded"); - let html = selectHtml(await res.text(), "#text"); - expect(html).toMatch(WAITING_VALUE); - }); - - test("is called on document POST requests", async () => { - let FIELD_VALUE = "cheeseburger"; - - let params = new URLSearchParams(); - params.append(FIELD_NAME, FIELD_VALUE); - - let res = await fixture.postDocument("/urlencoded", params); - - let html = selectHtml(await res.text(), "#text"); - expect(html).toMatch(FIELD_VALUE); - }); - - test("is called on script transition POST requests", async ({ page }) => { - let app = new PlaywrightFixture(appFixture, page); - await app.goto(`/urlencoded`); - await page.waitForSelector(`#text:has-text("${WAITING_VALUE}")`); - - await page.click("button[type=submit]"); - await page.waitForSelector("#action-text"); - await page.waitForSelector(`#text:has-text("${SUBMITTED_VALUE}")`); - }); - - test("throws a 405 when no action exists", async ({ page }) => { - let app = new PlaywrightFixture(appFixture, page); - await app.goto(`/no-action`); - await page.click("button[type=submit]"); - await page.waitForSelector(`h1:has-text("405 Method Not Allowed")`); - expect(logs.length).toBe(2); - expect(logs[0]).toMatch('Route "routes/no-action" does not have an action'); - // logs[1] is the raw ErrorResponse instance from the boundary but playwright - // seems to just log the name of the constructor, which in the minified code - // is meaningless so we don't bother asserting - - // The rest of the tests in this suite assert no logs, so clear this out to - // avoid failures in afterEach - logs = []; - }); - - test("properly encodes form data for request.text() usage", async ({ - page, - }) => { - let app = new PlaywrightFixture(appFixture, page); - await app.goto(`/request-text`); - await page.waitForSelector(`#text:has-text("${WAITING_VALUE}")`); - - await page.click("button[type=submit]"); - await page.waitForSelector("#action-text"); - expect(await app.getHtml("#action-text")).toBe( - 'a=1&b=2' - ); - }); - - test("redirects a thrown response on document requests", async () => { - let params = new URLSearchParams(); - let res = await fixture.postDocument(`/${THROWS_REDIRECT}`, params); - expect(res.status).toBe(302); - expect(res.headers.get("Location")).toBe(`/${REDIRECT_TARGET}`); - }); - - test("redirects a thrown response on script transitions", async ({ - page, - }) => { - let app = new PlaywrightFixture(appFixture, page); - await app.goto(`/${THROWS_REDIRECT}`); - let responses = app.collectSingleFetchResponses(); - await app.clickSubmitButton(`/${THROWS_REDIRECT}`); - - await page.waitForSelector(`#${REDIRECT_TARGET}`); - - expect(responses.length).toBe(1); - expect(responses[0].status()).toBe(202); - - expect(new URL(page.url()).pathname).toBe(`/${REDIRECT_TARGET}`); - expect(await app.getHtml()).toMatch(PAGE_TEXT); - }); + } }); diff --git a/integration/helpers/create-fixture.ts b/integration/helpers/create-fixture.ts index 038a339a3d..85fbe6fc26 100644 --- a/integration/helpers/create-fixture.ts +++ b/integration/helpers/create-fixture.ts @@ -9,6 +9,7 @@ import getPort from "get-port"; import stripIndent from "strip-indent"; import { sync as spawnSync, spawn } from "cross-spawn"; import type { JsonObject } from "type-fest"; +import { createRequestListener } from "@mjackson/node-fetch-server"; import { type ServerBuild, @@ -45,7 +46,10 @@ export function json(value: JsonObject) { return JSON.stringify(value, null, 2); } +const defaultTemplateName = "vite-5-template" satisfies TemplateName; + export async function createFixture(init: FixtureInit, mode?: ServerMode) { + let templateName = init.templateName ?? defaultTemplateName; let projectDir = await createFixtureProject(init, mode); let buildPath = url.pathToFileURL( path.join(projectDir, "build/server/index.js") @@ -134,8 +138,22 @@ export async function createFixture(init: FixtureInit, mode?: ServerMode) { }; } - let app: ServerBuild = await import(buildPath); - let handler = createRequestHandler(app, mode || ServerMode.Production); + let build: ServerBuild | null = null; + type RequestHandler = (request: Request) => Promise; + let handler: RequestHandler; + if (templateName.includes("parcel")) { + let serverBuild = await import(buildPath); + handler = (serverBuild?.requestHandler ?? + serverBuild?.default?.requestHandler) as RequestHandler; + if (!handler) { + throw new Error( + "Expected a 'requestHandler' export in Parcel server build" + ); + } + } else { + build = (await import(buildPath)) as ServerBuild; + handler = createRequestHandler(build, mode || ServerMode.Production); + } let requestDocument = async (href: string, init?: RequestInit) => { let url = new URL(href, "test://test"); @@ -184,8 +202,10 @@ export async function createFixture(init: FixtureInit, mode?: ServerMode) { }; return { + templateName, projectDir, - build: app, + build, + handler, isSpaMode: init.spaMode, prerender: init.prerender, requestDocument, @@ -313,7 +333,25 @@ export async function createAppFixture(fixture: Fixture, mode?: ServerMode) { }); } - if (!fixture.build) { + if (fixture.templateName.includes("parcel")) { + return new Promise(async (accept) => { + let port = await getPort(); + let app = express(); + app.use( + "/client", + express.static(path.join(fixture.projectDir, "build/client")) + ); + + app.all("*", createRequestListener(fixture.handler)); + + let server = app.listen(port); + + accept({ stop: server.close.bind(server), port }); + }); + } + + const build = fixture.build; + if (!build) { return Promise.reject( new Error("Cannot start app server without a build") ); @@ -327,7 +365,7 @@ export async function createAppFixture(fixture: Fixture, mode?: ServerMode) { app.all( "*", createExpressHandler({ - build: fixture.build, + build, mode: mode || ServerMode.Production, }) ); @@ -366,9 +404,9 @@ export async function createFixtureProject( init: FixtureInit = {}, mode?: ServerMode ): Promise { - let template = init.templateName ?? "vite-5-template"; - let integrationTemplateDir = path.resolve(__dirname, template); - let projectName = `rr-${template}-${Math.random().toString(32).slice(2)}`; + let templateName = init.templateName ?? defaultTemplateName; + let integrationTemplateDir = path.resolve(__dirname, templateName); + let projectName = `rr-${templateName}-${Math.random().toString(32).slice(2)}`; let projectDir = path.join(TMP_DIR, projectName); let port = init.port ?? (await getPort()); @@ -406,12 +444,56 @@ export async function createFixtureProject( projectDir ); - build(projectDir, init.buildStdio, mode); + if (templateName.includes("parcel")) { + parcelBuild(projectDir, init.buildStdio, mode); + } else { + reactRouterBuild(projectDir, init.buildStdio, mode); + } return projectDir; } -function build(projectDir: string, buildStdio?: Writable, mode?: ServerMode) { +function parcelBuild( + projectDir: string, + buildStdio?: Writable, + mode?: ServerMode +) { + let parcelBin = "node_modules/parcel/lib/bin.js"; + + let buildArgs: string[] = [parcelBin, "build"]; + + let buildSpawn = spawnSync("node", buildArgs, { + cwd: projectDir, + env: { + ...process.env, + NODE_ENV: mode || ServerMode.Production, + }, + }); + + // These logs are helpful for debugging. Remove comments if needed. + // console.log("spawning node " + buildArgs.join(" ") + ":\n"); + // console.log(" STDOUT:"); + // console.log(" " + buildSpawn.stdout.toString("utf-8")); + // console.log(" STDERR:"); + // console.log(" " + buildSpawn.stderr.toString("utf-8")); + + if (buildStdio) { + buildStdio.write(buildSpawn.stdout.toString("utf-8")); + buildStdio.write(buildSpawn.stderr.toString("utf-8")); + buildStdio.end(); + } + + if (buildSpawn.error || buildSpawn.status) { + console.error(buildSpawn.stderr.toString("utf-8")); + throw buildSpawn.error || new Error(`Build failed, check the output above`); + } +} + +function reactRouterBuild( + projectDir: string, + buildStdio?: Writable, + mode?: ServerMode +) { // We have a "require" instead of a dynamic import in readConfig gated // behind mode === ServerMode.Test to make jest happy, but that doesn't // work for ESM configs, those MUST be dynamic imports. So we need to diff --git a/integration/helpers/rsc-parcel-framework/.gitignore b/integration/helpers/rsc-parcel-framework/.gitignore new file mode 100644 index 0000000000..0ad794a35c --- /dev/null +++ b/integration/helpers/rsc-parcel-framework/.gitignore @@ -0,0 +1,5 @@ +.parcel-cache +.react-router +.react-router-parcel +build +node_modules diff --git a/integration/helpers/rsc-parcel-framework/.parcelrc b/integration/helpers/rsc-parcel-framework/.parcelrc new file mode 100644 index 0000000000..49bb729196 --- /dev/null +++ b/integration/helpers/rsc-parcel-framework/.parcelrc @@ -0,0 +1,3 @@ +{ + "extends": "parcel-config-react-router-experimental" +} diff --git a/integration/helpers/rsc-parcel-framework/app/index.ts b/integration/helpers/rsc-parcel-framework/app/index.ts new file mode 100644 index 0000000000..3c5c0797d5 --- /dev/null +++ b/integration/helpers/rsc-parcel-framework/app/index.ts @@ -0,0 +1,3 @@ +import requestHandler from "virtual:react-router/request-handler"; + +export { requestHandler }; diff --git a/integration/helpers/rsc-parcel-framework/app/root.tsx b/integration/helpers/rsc-parcel-framework/app/root.tsx new file mode 100644 index 0000000000..9f824e6c53 --- /dev/null +++ b/integration/helpers/rsc-parcel-framework/app/root.tsx @@ -0,0 +1,18 @@ +import { Links, Meta, Outlet, ScrollRestoration } from "react-router"; + +export default function App() { + return ( + + + + + + + + + + + + + ); +} diff --git a/integration/helpers/rsc-parcel-framework/app/routes.ts b/integration/helpers/rsc-parcel-framework/app/routes.ts new file mode 100644 index 0000000000..4c05936cb6 --- /dev/null +++ b/integration/helpers/rsc-parcel-framework/app/routes.ts @@ -0,0 +1,4 @@ +import { type RouteConfig } from "@react-router/dev/routes"; +import { flatRoutes } from "@react-router/fs-routes"; + +export default flatRoutes() satisfies RouteConfig; diff --git a/integration/helpers/rsc-parcel-framework/app/routes/_index.tsx b/integration/helpers/rsc-parcel-framework/app/routes/_index.tsx new file mode 100644 index 0000000000..ecfc25c614 --- /dev/null +++ b/integration/helpers/rsc-parcel-framework/app/routes/_index.tsx @@ -0,0 +1,16 @@ +import type { MetaFunction } from "react-router"; + +export const meta: MetaFunction = () => { + return [ + { title: "New React Router App" }, + { name: "description", content: "Welcome to React Router!" }, + ]; +}; + +export default function Index() { + return ( +
    +

    Welcome to React Router

    +
    + ); +} diff --git a/integration/helpers/rsc-parcel-framework/package.json b/integration/helpers/rsc-parcel-framework/package.json new file mode 100644 index 0000000000..deb4e10b8e --- /dev/null +++ b/integration/helpers/rsc-parcel-framework/package.json @@ -0,0 +1,44 @@ +{ + "name": "@playground/rsc-parcel-framework", + "private": true, + "targets": { + "server": { + "source": "app/index.ts", + "distDir": "build", + "context": "react-server", + "scopeHoist": false, + "includeNodeModules": { + "express": false + } + } + }, + "scripts": { + "clean": "rm -rf dist .parcel-cache .react-router .react-router-parcel", + "dev": "parcel --no-cache --no-autoinstall", + "build": "parcel build --no-cache --no-autoinstall", + "start": "node start.js", + "typecheck": "react-router typegen && pnpm build && tsc" + }, + "devDependencies": { + "@react-router/dev": "workspace:*", + "@react-router/fs-routes": "workspace:*", + "@types/express": "^5.0.0", + "@types/node": "^22.13.1", + "@types/parcel-env": "0.0.8", + "@types/react-dom": "^19.0.3", + "@types/react": "^19.0.8", + "parcel": "2.15.0", + "parcel-config-react-router-experimental": "1.0.20", + "typescript": "^5.1.6" + }, + "dependencies": { + "@mjackson/node-fetch-server": "0.6.1", + "@parcel/runtime-rsc": "2.15.0", + "express": "^4.21.2", + "react": "^19.0.0", + "react-dom": "^19.0.0", + "react-router": "workspace:*", + "react-server-dom-parcel": "^19.0.0", + "remix-utils": "^8.7.0" + } +} diff --git a/integration/helpers/rsc-parcel-framework/start.js b/integration/helpers/rsc-parcel-framework/start.js new file mode 100644 index 0000000000..10a6a8f386 --- /dev/null +++ b/integration/helpers/rsc-parcel-framework/start.js @@ -0,0 +1,18 @@ +const { createRequestListener } = require("@mjackson/node-fetch-server"); +const express = require("express"); +const reactRouterRequestHandler = require("./build/server/index.js").default; + +const app = express(); + +app.use(express.static("public")); +app.use("/client", express.static("dist/client")); + +app.get("/.well-known/appspecific/com.chrome.devtools.json", (_, res) => { + res.status(404); + res.send("Not Found"); +}); + +app.use(createRequestListener(reactRouterRequestHandler)); + +app.listen(3000); +console.log("Server listening on port 3000 (http://localhost:3000)"); diff --git a/integration/helpers/rsc-parcel-framework/tsconfig.json b/integration/helpers/rsc-parcel-framework/tsconfig.json new file mode 100644 index 0000000000..edcc15fde0 --- /dev/null +++ b/integration/helpers/rsc-parcel-framework/tsconfig.json @@ -0,0 +1,20 @@ +{ + "include": [ + "**/*.ts", + "**/*.tsx", + "./.react-router/types/**/*", + "./.react-router-parcel/types/**/*" + ], + "compilerOptions": { + "strict": true, + "jsx": "react-jsx", + "allowSyntheticDefaultImports": true, + "moduleResolution": "bundler", + "module": "esnext", + "isolatedModules": true, + "esModuleInterop": true, + "target": "es2022", + "noEmit": true, + "rootDirs": [".", "./.react-router/types", "./.react-router-parcel/types"] + } +} diff --git a/integration/helpers/rsc-vite/tsconfig.client.json b/integration/helpers/rsc-vite/tsconfig.client.json index 8faea30be1..b44285bcb1 100644 --- a/integration/helpers/rsc-vite/tsconfig.client.json +++ b/integration/helpers/rsc-vite/tsconfig.client.json @@ -5,7 +5,7 @@ "types": ["@cloudflare/workers-types", "@types/node", "vite/client"], "rootDir": ".", "paths": { - "~/*": ["./src/app/*"], + "~/*": ["./src/app/*"] }, "allowImportingTsExtensions": true, "jsx": "react-jsx", diff --git a/integration/helpers/vite.ts b/integration/helpers/vite.ts index dce24f2633..707b323d1b 100644 --- a/integration/helpers/vite.ts +++ b/integration/helpers/vite.ts @@ -192,6 +192,8 @@ type FrameworkModeViteMajorTemplateName = | "vite-plugin-cloudflare-template" | "vite-rolldown-template"; +type FrameworkModeRscTemplateName = "rsc-parcel-framework"; + type FrameworkModeCloudflareTemplateName = | "cloudflare-dev-proxy-template" | "vite-plugin-cloudflare-template"; @@ -200,6 +202,7 @@ export type RscBundlerTemplateName = "rsc-vite" | "rsc-parcel"; export type TemplateName = | FrameworkModeViteMajorTemplateName + | FrameworkModeRscTemplateName | FrameworkModeCloudflareTemplateName | RscBundlerTemplateName; diff --git a/integration/package.json b/integration/package.json index 36ec79ee46..fae185affc 100644 --- a/integration/package.json +++ b/integration/package.json @@ -8,6 +8,7 @@ "typecheck": "tsc" }, "dependencies": { + "@mjackson/node-fetch-server": "0.6.1", "@playwright/test": "^1.49.1", "@react-router/dev": "workspace:*", "@react-router/express": "workspace:*", diff --git a/package.json b/package.json index 46ac8559e0..c1a971e23b 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,7 @@ "@octokit/graphql": "^4.8.0", "@octokit/plugin-paginate-rest": "^2.21.3", "@octokit/rest": "^18.12.0", + "@parcel/runtime-rsc": "2.15.0", "@playwright/test": "^1.49.1", "@remix-run/changelog-github": "^0.0.5", "@testing-library/jest-dom": "6.6.3", diff --git a/packages/react-router/tsup.config.rsc.ts b/packages/react-router/tsup.config.rsc.ts index de39df1cd1..c5551d4fde 100644 --- a/packages/react-router/tsup.config.rsc.ts +++ b/packages/react-router/tsup.config.rsc.ts @@ -45,7 +45,4 @@ const config = (enableDevWarnings: boolean) => }, ]) as Options[]; -export default defineConfig([ - ...config(false), - ...config(true), -]); +export default defineConfig([...config(false), ...config(true)]); diff --git a/playground/rsc-parcel-framework/.gitignore b/playground/rsc-parcel-framework/.gitignore new file mode 100644 index 0000000000..cdf4c6c296 --- /dev/null +++ b/playground/rsc-parcel-framework/.gitignore @@ -0,0 +1,5 @@ +.parcel-cache +.react-router +.react-router-parcel +dist +node_modules diff --git a/playground/rsc-parcel-framework/.parcelrc b/playground/rsc-parcel-framework/.parcelrc new file mode 100644 index 0000000000..49bb729196 --- /dev/null +++ b/playground/rsc-parcel-framework/.parcelrc @@ -0,0 +1,3 @@ +{ + "extends": "parcel-config-react-router-experimental" +} diff --git a/playground/rsc-parcel-framework/app/root.css b/playground/rsc-parcel-framework/app/root.css new file mode 100644 index 0000000000..64b3065213 --- /dev/null +++ b/playground/rsc-parcel-framework/app/root.css @@ -0,0 +1,3 @@ +.root__header { + color: rebeccapurple; +} diff --git a/playground/rsc-parcel-framework/app/root.tsx b/playground/rsc-parcel-framework/app/root.tsx new file mode 100644 index 0000000000..674fd6cbe5 --- /dev/null +++ b/playground/rsc-parcel-framework/app/root.tsx @@ -0,0 +1,55 @@ +import { Link, Outlet } from "react-router"; +import "./root.css"; + +export function Layout({ children }: { children: React.ReactNode }) { + console.log("Layout"); + return ( + + + + + React Router Parcel + + +
    +

    React Router Parcel

    + +
    + {children} + + + ); +} + +export function ServerComponent() { + console.log("Root"); + return ( + <> + + + ); +} + +export function ErrorBoundary() { + return

    Oooops

    ; +} diff --git a/playground/rsc-parcel-framework/app/routes.ts b/playground/rsc-parcel-framework/app/routes.ts new file mode 100644 index 0000000000..4c05936cb6 --- /dev/null +++ b/playground/rsc-parcel-framework/app/routes.ts @@ -0,0 +1,4 @@ +import { type RouteConfig } from "@react-router/dev/routes"; +import { flatRoutes } from "@react-router/fs-routes"; + +export default flatRoutes() satisfies RouteConfig; diff --git a/playground/rsc-parcel-framework/app/routes/_index/actions.ts b/playground/rsc-parcel-framework/app/routes/_index/actions.ts new file mode 100644 index 0000000000..3b0858f7d3 --- /dev/null +++ b/playground/rsc-parcel-framework/app/routes/_index/actions.ts @@ -0,0 +1,5 @@ +"use server"; + +export function log() { + console.log("hello from server"); +} diff --git a/playground/rsc-parcel-framework/app/routes/_index/route.tsx b/playground/rsc-parcel-framework/app/routes/_index/route.tsx new file mode 100644 index 0000000000..1cb58e8142 --- /dev/null +++ b/playground/rsc-parcel-framework/app/routes/_index/route.tsx @@ -0,0 +1,21 @@ +import type { Route } from "./+types/route.js"; +import { log } from "./actions.js"; +import "./styles.css"; + +export function loader({}: Route.LoaderArgs) { + return "hello, world"; +} + +export function ServerComponent({ loaderData }: Route.ComponentProps) { + return ( +
    +

    Home

    +

    This is the home page.

    +

    loaderData: {loaderData}

    + {/* @ts-expect-error React types for the repo are set to v18 */} +
    + +
    +
    + ); +} diff --git a/playground/rsc-parcel-framework/app/routes/_index/styles.css b/playground/rsc-parcel-framework/app/routes/_index/styles.css new file mode 100644 index 0000000000..9c165fd787 --- /dev/null +++ b/playground/rsc-parcel-framework/app/routes/_index/styles.css @@ -0,0 +1,3 @@ +.home__heading { + color: green; +} diff --git a/playground/rsc-parcel-framework/app/routes/client-loader-hydrate/route.tsx b/playground/rsc-parcel-framework/app/routes/client-loader-hydrate/route.tsx new file mode 100644 index 0000000000..70ab01864b --- /dev/null +++ b/playground/rsc-parcel-framework/app/routes/client-loader-hydrate/route.tsx @@ -0,0 +1,24 @@ +import { Route } from "./+types/route.js"; +// @ts-expect-error +import styles from "./styles.module.css"; + +export function loader() { + return "hello, world from server loader"; +} + +export function clientLoader() { + return "hello, world from client loader"; +} + +clientLoader.hydrate = true; + +export default function ClientLoaderHydrateRoute({ + loaderData, +}: Route.ComponentProps) { + return ( +
    +

    Client loader

    +

    Loader data: {loaderData}

    +
    + ); +} diff --git a/playground/rsc-parcel-framework/app/routes/client-loader-hydrate/styles.module.css b/playground/rsc-parcel-framework/app/routes/client-loader-hydrate/styles.module.css new file mode 100644 index 0000000000..4474b5f8a7 --- /dev/null +++ b/playground/rsc-parcel-framework/app/routes/client-loader-hydrate/styles.module.css @@ -0,0 +1,3 @@ +.heading { + color: seagreen; +} diff --git a/playground/rsc-parcel-framework/app/routes/client-loader-without-server-loader/route.tsx b/playground/rsc-parcel-framework/app/routes/client-loader-without-server-loader/route.tsx new file mode 100644 index 0000000000..78787fdb0b --- /dev/null +++ b/playground/rsc-parcel-framework/app/routes/client-loader-without-server-loader/route.tsx @@ -0,0 +1,16 @@ +import { Route } from "./+types/route.js"; + +export function clientLoader() { + return "hello, world from client loader"; +} + +export default function ClientLoaderWithoutServerLoaderRoute({ + loaderData, +}: Route.ComponentProps) { + return ( +
    +

    Client loader without server loader

    +

    Loader data: {loaderData}

    +
    + ); +} diff --git a/playground/rsc-parcel-framework/app/routes/client-loader-without-server-loader/styles.module.css b/playground/rsc-parcel-framework/app/routes/client-loader-without-server-loader/styles.module.css new file mode 100644 index 0000000000..068f052dad --- /dev/null +++ b/playground/rsc-parcel-framework/app/routes/client-loader-without-server-loader/styles.module.css @@ -0,0 +1,3 @@ +.heading { + color: salmon; +} diff --git a/playground/rsc-parcel-framework/app/routes/client-loader/route.tsx b/playground/rsc-parcel-framework/app/routes/client-loader/route.tsx new file mode 100644 index 0000000000..2554be9ff3 --- /dev/null +++ b/playground/rsc-parcel-framework/app/routes/client-loader/route.tsx @@ -0,0 +1,22 @@ +import { Route } from "./+types/route.js"; +// @ts-expect-error +import styles from "./styles.module.css"; + +export function loader() { + return "hello, world from server loader"; +} + +export function clientLoader() { + return "hello, world from client loader"; +} + +export default function ClientLoaderRoute({ + loaderData, +}: Route.ComponentProps) { + return ( +
    +

    Client loader

    +

    Loader data: {loaderData}

    +
    + ); +} diff --git a/playground/rsc-parcel-framework/app/routes/client-loader/styles.module.css b/playground/rsc-parcel-framework/app/routes/client-loader/styles.module.css new file mode 100644 index 0000000000..91936520e5 --- /dev/null +++ b/playground/rsc-parcel-framework/app/routes/client-loader/styles.module.css @@ -0,0 +1,3 @@ +.heading { + color: cornflowerblue; +} diff --git a/playground/rsc-parcel-framework/app/routes/fixture.client-component/route.tsx b/playground/rsc-parcel-framework/app/routes/fixture.client-component/route.tsx new file mode 100644 index 0000000000..25fe4b1dc4 --- /dev/null +++ b/playground/rsc-parcel-framework/app/routes/fixture.client-component/route.tsx @@ -0,0 +1,16 @@ +import { Route } from "./+types/route"; + +export function loader() { + return { + message:

    From the loader.

    , + }; +} + +export default function ClientComponent({ loaderData }: Route.ComponentProps) { + return ( +
    +

    Client Component

    + {loaderData.message} +
    + ); +} diff --git a/playground/rsc-parcel-framework/app/routes/fixture.server-component/route.tsx b/playground/rsc-parcel-framework/app/routes/fixture.server-component/route.tsx new file mode 100644 index 0000000000..2d988060bb --- /dev/null +++ b/playground/rsc-parcel-framework/app/routes/fixture.server-component/route.tsx @@ -0,0 +1,18 @@ +import { Route } from "./+types/route"; + +export function loader() { + return { + message:

    From the loader.

    , + }; +} + +export async function ServerComponent({ loaderData }: Route.ComponentProps) { + const message = await Promise.resolve("From the component."); + return ( +
    +

    Client Component

    + {loaderData.message} + {message} +
    + ); +} diff --git a/playground/rsc-parcel-framework/app/routes/optimistic/form.tsx b/playground/rsc-parcel-framework/app/routes/optimistic/form.tsx new file mode 100644 index 0000000000..b2816110e5 --- /dev/null +++ b/playground/rsc-parcel-framework/app/routes/optimistic/form.tsx @@ -0,0 +1,33 @@ +"use client"; + +import { + // @ts-expect-error React types for the repo are set to v18 + useOptimistic, +} from "react"; +import { useHydrated } from "remix-utils/use-hydrated"; + +export function ToggleLikedForm({ + liked, + toggleLikedAction, +}: { + liked: boolean; + toggleLikedAction: () => Promise; +}) { + const hydrated = useHydrated(); + + const [optimisticLiked, setOptimisticLiked] = useOptimistic(liked); + const toggleLikedActionOptimistic = async () => { + // @ts-expect-error React types for the repo are set to v18 + setOptimisticLiked((liked) => !liked); + await toggleLikedAction(); + }; + + return ( + // @ts-expect-error React types for the repo are set to v18 +
    + +
    + ); +} diff --git a/playground/rsc-parcel-framework/app/routes/optimistic/route.tsx b/playground/rsc-parcel-framework/app/routes/optimistic/route.tsx new file mode 100644 index 0000000000..1213675377 --- /dev/null +++ b/playground/rsc-parcel-framework/app/routes/optimistic/route.tsx @@ -0,0 +1,17 @@ +"use server"; +import { ToggleLikedForm } from "./form"; + +let liked = false; +export async function toggleLikedAction() { + await new Promise((resolve) => setTimeout(resolve, 1000)); + liked = !liked; +} + +export function ServerComponent() { + return ( +
    +

    Server Component

    + +
    + ); +} diff --git a/playground/rsc-parcel-framework/app/routes/server-loader/route.tsx b/playground/rsc-parcel-framework/app/routes/server-loader/route.tsx new file mode 100644 index 0000000000..8a513568a6 --- /dev/null +++ b/playground/rsc-parcel-framework/app/routes/server-loader/route.tsx @@ -0,0 +1,18 @@ +import type { Route } from "./+types/route.js"; +// @ts-expect-error +import styles from "./styles.module.css"; + +export function loader() { + return "hello, world from server loader"; +} + +export default function ServerLoaderRoute({ + loaderData, +}: Route.ComponentProps) { + return ( +
    +

    Server loader

    +

    Loader data: {loaderData}

    +
    + ); +} diff --git a/playground/rsc-parcel-framework/app/routes/server-loader/styles.module.css b/playground/rsc-parcel-framework/app/routes/server-loader/styles.module.css new file mode 100644 index 0000000000..f51cb7c568 --- /dev/null +++ b/playground/rsc-parcel-framework/app/routes/server-loader/styles.module.css @@ -0,0 +1,3 @@ +.heading { + color: burlywood; +} diff --git a/playground/rsc-parcel-framework/app/server.ts b/playground/rsc-parcel-framework/app/server.ts new file mode 100644 index 0000000000..d8fb107f1c --- /dev/null +++ b/playground/rsc-parcel-framework/app/server.ts @@ -0,0 +1,16 @@ +import express from "express"; + +import reactRouter from "virtual:react-router/express"; + +const app = express(); +app.use(express.static("public")); + +app.get("/.well-known/appspecific/com.chrome.devtools.json", (_, res) => { + res.status(404); + res.send("Not Found"); +}); + +app.use(reactRouter()); + +app.listen(3000); +console.log("Server listening on port 3000 (http://localhost:3000)"); diff --git a/playground/rsc-parcel-framework/package.json b/playground/rsc-parcel-framework/package.json new file mode 100644 index 0000000000..b50ceda525 --- /dev/null +++ b/playground/rsc-parcel-framework/package.json @@ -0,0 +1,42 @@ +{ + "name": "@playground/rsc-parcel", + "private": true, + "targets": { + "server": { + "source": "app/server.ts", + "context": "react-server", + "scopeHoist": false, + "includeNodeModules": { + "express": false + } + } + }, + "scripts": { + "clean": "rm -rf dist .parcel-cache .react-router .react-router-parcel", + "dev": "parcel --no-cache --no-autoinstall", + "build": "parcel build --no-cache --no-autoinstall", + "start": "node dist/server/server.js", + "typecheck": "react-router typegen && pnpm build && tsc" + }, + "devDependencies": { + "@react-router/dev": "workspace:*", + "@react-router/fs-routes": "workspace:*", + "@types/express": "^5.0.0", + "@types/node": "^22.13.1", + "@types/parcel-env": "0.0.8", + "@types/react-dom": "^19.0.3", + "@types/react": "^19.0.8", + "parcel": "2.15.0", + "parcel-config-react-router-experimental": "1.0.20" + }, + "dependencies": { + "@mjackson/node-fetch-server": "0.6.1", + "@parcel/runtime-rsc": "2.15.0", + "express": "^4.21.2", + "react": "^19.0.0", + "react-dom": "^19.0.0", + "react-router": "workspace:*", + "react-server-dom-parcel": "^19.0.0", + "remix-utils": "^8.7.0" + } +} diff --git a/playground/rsc-parcel-framework/tsconfig.json b/playground/rsc-parcel-framework/tsconfig.json new file mode 100644 index 0000000000..edcc15fde0 --- /dev/null +++ b/playground/rsc-parcel-framework/tsconfig.json @@ -0,0 +1,20 @@ +{ + "include": [ + "**/*.ts", + "**/*.tsx", + "./.react-router/types/**/*", + "./.react-router-parcel/types/**/*" + ], + "compilerOptions": { + "strict": true, + "jsx": "react-jsx", + "allowSyntheticDefaultImports": true, + "moduleResolution": "bundler", + "module": "esnext", + "isolatedModules": true, + "esModuleInterop": true, + "target": "es2022", + "noEmit": true, + "rootDirs": [".", "./.react-router/types", "./.react-router-parcel/types"] + } +} diff --git a/playground/rsc-parcel/package.json b/playground/rsc-parcel/package.json index 7974b152c5..e86675aafc 100644 --- a/playground/rsc-parcel/package.json +++ b/playground/rsc-parcel/package.json @@ -19,8 +19,8 @@ }, "devDependencies": { "@biomejs/biome": "^1.9.4", - "@parcel/packager-react-static": "2.14.1", - "@parcel/transformer-react-static": "2.14.1", + "@parcel/packager-react-static": "2.15.0", + "@parcel/transformer-react-static": "2.15.0", "@types/express": "^5.0.0", "@types/node": "^22.13.1", "@types/parcel-env": "0.0.8", @@ -29,7 +29,7 @@ "browserify-zlib": "^0.2.0", "buffer": "^5.5.0||^6.0.0", "events": "^3.1.0", - "parcel": "2.14.1", + "parcel": "2.15.0", "path-browserify": "^1.0.0", "querystring-es3": "^0.2.1", "stream-http": "^3.1.0", @@ -37,7 +37,7 @@ }, "dependencies": { "@mjackson/node-fetch-server": "0.6.1", - "@parcel/runtime-rsc": "2.14.1", + "@parcel/runtime-rsc": "2.15.0", "express": "^4.21.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8a748176fb..bd941d8d05 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -65,6 +65,9 @@ importers: '@octokit/rest': specifier: ^18.12.0 version: 18.12.0 + '@parcel/runtime-rsc': + specifier: 2.15.0 + version: 2.15.0(@parcel/core@2.15.0) '@playwright/test': specifier: ^1.49.1 version: 1.49.1 @@ -233,6 +236,9 @@ importers: integration: dependencies: + '@mjackson/node-fetch-server': + specifier: 0.6.1 + version: 0.6.1 '@playwright/test': specifier: ^1.49.1 version: 1.49.1 @@ -461,6 +467,64 @@ importers: specifier: ^0.11.0 version: 0.11.4 + integration/helpers/rsc-parcel-framework: + dependencies: + '@mjackson/node-fetch-server': + specifier: 0.6.1 + version: 0.6.1 + '@parcel/runtime-rsc': + specifier: 2.15.0 + version: 2.15.0(@parcel/core@2.15.0) + express: + specifier: ^4.21.2 + version: 4.21.2 + react: + specifier: ^19.0.0 + version: 19.1.0 + react-dom: + specifier: ^19.0.0 + version: 19.1.0(react@19.1.0) + react-router: + specifier: workspace:* + version: link:../../../packages/react-router + react-server-dom-parcel: + specifier: ^19.0.0 + version: 19.1.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + remix-utils: + specifier: ^8.7.0 + version: 8.7.0(react-router@packages+react-router)(react@19.1.0)(zod@3.24.2) + devDependencies: + '@react-router/dev': + specifier: workspace:* + version: link:../../../packages/react-router-dev + '@react-router/fs-routes': + specifier: workspace:* + version: link:../../../packages/react-router-fs-routes + '@types/express': + specifier: ^5.0.0 + version: 5.0.1 + '@types/node': + specifier: ^22.13.1 + version: 22.14.0 + '@types/parcel-env': + specifier: 0.0.8 + version: 0.0.8 + '@types/react': + specifier: ^18.2.18 + version: 18.2.18 + '@types/react-dom': + specifier: ^18.2.7 + version: 18.2.7 + parcel: + specifier: 2.15.0 + version: 2.15.0 + parcel-config-react-router-experimental: + specifier: 1.0.20 + version: 1.0.20(@parcel/core@2.15.0)(@react-router/dev@packages+react-router-dev)(react-dom@19.1.0(react@19.1.0))(react-router@packages+react-router)(react-server-dom-parcel@19.1.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react@19.1.0) + typescript: + specifier: ^5.1.6 + version: 5.4.5 + integration/helpers/rsc-vite: dependencies: '@jacob-ebey/react-server-dom-vite': @@ -1659,8 +1723,8 @@ importers: specifier: 0.6.1 version: 0.6.1 '@parcel/runtime-rsc': - specifier: 2.14.1 - version: 2.14.1(@parcel/core@2.14.1) + specifier: 2.15.0 + version: 2.15.0(@parcel/core@2.15.0) express: specifier: ^4.21.2 version: 4.21.2 @@ -1681,11 +1745,11 @@ importers: specifier: ^1.9.4 version: 1.9.4 '@parcel/packager-react-static': - specifier: 2.14.1 - version: 2.14.1(@parcel/core@2.14.1) + specifier: 2.15.0 + version: 2.15.0(@parcel/core@2.15.0) '@parcel/transformer-react-static': - specifier: 2.14.1 - version: 2.14.1(@parcel/core@2.14.1) + specifier: 2.15.0 + version: 2.15.0(@parcel/core@2.15.0) '@types/express': specifier: ^5.0.0 version: 5.0.1 @@ -1711,8 +1775,8 @@ importers: specifier: ^3.1.0 version: 3.3.0 parcel: - specifier: 2.14.1 - version: 2.14.1(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) + specifier: 2.15.0 + version: 2.15.0 path-browserify: specifier: ^1.0.0 version: 1.0.1 @@ -1726,6 +1790,61 @@ importers: specifier: ^0.11.0 version: 0.11.4 + playground/rsc-parcel-framework: + dependencies: + '@mjackson/node-fetch-server': + specifier: 0.6.1 + version: 0.6.1 + '@parcel/runtime-rsc': + specifier: 2.15.0 + version: 2.15.0(@parcel/core@2.15.0) + express: + specifier: ^4.21.2 + version: 4.21.2 + react: + specifier: ^19.0.0 + version: 19.1.0 + react-dom: + specifier: ^19.0.0 + version: 19.1.0(react@19.1.0) + react-router: + specifier: workspace:* + version: link:../../packages/react-router + react-server-dom-parcel: + specifier: ^19.0.0 + version: 19.1.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + remix-utils: + specifier: ^8.7.0 + version: 8.7.0(react-router@packages+react-router)(react@19.1.0)(zod@3.24.2) + devDependencies: + '@react-router/dev': + specifier: workspace:* + version: link:../../packages/react-router-dev + '@react-router/fs-routes': + specifier: workspace:* + version: link:../../packages/react-router-fs-routes + '@types/express': + specifier: ^5.0.0 + version: 5.0.1 + '@types/node': + specifier: ^22.13.1 + version: 22.14.0 + '@types/parcel-env': + specifier: 0.0.8 + version: 0.0.8 + '@types/react': + specifier: ^18.2.18 + version: 18.2.18 + '@types/react-dom': + specifier: ^18.2.7 + version: 18.2.7 + parcel: + specifier: 2.15.0 + version: 2.15.0 + parcel-config-react-router-experimental: + specifier: 1.0.20 + version: 1.0.20(@parcel/core@2.15.0)(@react-router/dev@packages+react-router-dev)(react-dom@19.1.0(react@19.1.0))(react-router@packages+react-router)(react-server-dom-parcel@19.1.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react@19.1.0) + playground/rsc-vite: dependencies: '@jacob-ebey/react-server-dom-vite': @@ -3992,6 +4111,65 @@ packages: '@open-draft/until@2.1.0': resolution: {integrity: sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==} + '@oxc-parser/binding-darwin-arm64@0.64.0': + resolution: {integrity: sha512-FfmLZWrt5rsG+wzruv0xfYci1fE/GQ/HnUCmB+j3keU4SfDxkxSIGUTphxdcE8S4ISoLelgeVZiE8QDGRhmSoQ==} + engines: {node: '>=14.0.0'} + cpu: [arm64] + os: [darwin] + + '@oxc-parser/binding-darwin-x64@0.64.0': + resolution: {integrity: sha512-FFbtYNdlRw6d/KcfSxqOAJAI4evijC+i+PHQkpB8JJGr+mPzQEPKwVa8vh2Qe/lcspaQs6IrR2GRpJ+5UvciRw==} + engines: {node: '>=14.0.0'} + cpu: [x64] + os: [darwin] + + '@oxc-parser/binding-linux-arm-gnueabihf@0.64.0': + resolution: {integrity: sha512-u113yYpeTW0rQBp6Lld2PvdEMzVQmTq8n2T4WDb7UNGQFCMzoURCKgahkIZCStph4+zHAFU5uKwG5waQaswCyw==} + engines: {node: '>=14.0.0'} + cpu: [arm] + os: [linux] + + '@oxc-parser/binding-linux-arm64-gnu@0.64.0': + resolution: {integrity: sha512-cqWgdJcXJ2u2Rcjd/+4mY10DPISZtKosgyL7eMZwZdCNJD8q2ohS57pk6IbCmopF55QAh9/Py8rajblKbFCJBg==} + engines: {node: '>=14.0.0'} + cpu: [arm64] + os: [linux] + + '@oxc-parser/binding-linux-arm64-musl@0.64.0': + resolution: {integrity: sha512-b7Ma+CDlkK+UIU/Zr8Ydo+q3A9ouWUhV8PzWcnfOxiOwK+JEaoz5N02ixAPK8qvO+IKqzP00HzxPD8tUto8GcA==} + engines: {node: '>=14.0.0'} + cpu: [arm64] + os: [linux] + + '@oxc-parser/binding-linux-x64-gnu@0.64.0': + resolution: {integrity: sha512-7o/qfZNZ0kt1o5vtqUz6nQkV6tuCGor4+gOmqtrb2TtnAo3qxYwPXZVjd9LKv39Z+Nfpqz/2cnR+GIqUNqv34A==} + engines: {node: '>=14.0.0'} + cpu: [x64] + os: [linux] + + '@oxc-parser/binding-linux-x64-musl@0.64.0': + resolution: {integrity: sha512-nuL0rqoWgvO11pP7g5FYdTDsjX93mt8ZFtUaOL4HMVkvRAx3XiKltJBYXXWiI2kySbHRC/XHJftAKWEgGhcXgg==} + engines: {node: '>=14.0.0'} + cpu: [x64] + os: [linux] + + '@oxc-parser/binding-wasm32-wasi@0.64.0': + resolution: {integrity: sha512-iZ5LeOPDo0gCISzcq1JKo3HGqXwuQDTgHVPBUs+UFdCL9WJ9DmNkXXQPLVYEyyI/YFXg15y7Rv2L+FEvpvYa+w==} + engines: {node: '>=14.0.0'} + cpu: [wasm32] + + '@oxc-parser/binding-win32-arm64-msvc@0.64.0': + resolution: {integrity: sha512-9kWLwYOT9sCVrFL3Egpt4+viAYtYOwmstGoy/CPikC0fxEpB760qln8u+MfZpbrH0Df2XgEdAUTqiwnRwcp+uA==} + engines: {node: '>=14.0.0'} + cpu: [arm64] + os: [win32] + + '@oxc-parser/binding-win32-x64-msvc@0.64.0': + resolution: {integrity: sha512-EHQglaBx4LpNw9BMA65aM36isTpuAdWxGbAUH7w55GYIGjVG7hIsMx/MuOrJXsmOBVmRokoYNYLN7X5aTd5TmQ==} + engines: {node: '>=14.0.0'} + cpu: [x64] + os: [win32] + '@oxc-project/runtime@0.61.2': resolution: {integrity: sha512-UNv56Aa4pTtsnqapa2LC+gRxXbUZxA6j1WlSYV8+zan5sD+CvwOMSzUsMNdUUTebob6PafJfT+/TN83yWXWmSA==} engines: {node: '>=6.9.0'} @@ -3999,148 +4177,137 @@ packages: '@oxc-project/types@0.61.2': resolution: {integrity: sha512-rfuwJwvwn9MRthHNXlSo9Eka/u7gC0MhnWAoX3BhE1+rwPOl22nq0K0Y997Hof0tHCOuD7H3/Z8HTfCVhB4c5Q==} - '@parcel/bundler-default@2.14.1': - resolution: {integrity: sha512-xFS97cO9TdQgNf1M7N1c5M8Z/kWiIC91ufwabnRWFt5NTaT6NCXusOKcqw/kpJOBKgZcO1kjNvQ95HE3EG85rw==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} + '@oxc-project/types@0.64.0': + resolution: {integrity: sha512-B0dxuEZFV6M4tXjPFwDSaED5/J55YUhODBaF09xNFNRrEyzQLKZuhKXAw1xYK8bO4K8Jn1d21TZfei3kAIE8dA==} + + '@oxc-transform/binding-darwin-arm64@0.64.0': + resolution: {integrity: sha512-SphSpVk2TcJ1bGfv/kStrSGrKyA5wLuIjuyK0/Im8ZJZ2zAolJdm4WFZUDI5NZZskwcqoB2qrUQFr9pV75N+BA==} + engines: {node: '>=14.0.0'} + cpu: [arm64] + os: [darwin] + + '@oxc-transform/binding-darwin-x64@0.64.0': + resolution: {integrity: sha512-MDTCesIxze+lVc33cZGHZE5alWUL5dbhQGM4i1uobHbll7nuLBO8ymZZ7dQxCKJztkzQOU+Ib+TPtdxIWkcnqQ==} + engines: {node: '>=14.0.0'} + cpu: [x64] + os: [darwin] + + '@oxc-transform/binding-linux-arm-gnueabihf@0.64.0': + resolution: {integrity: sha512-1emYdqi1lJscGi4F75Zgr24+l5v6o/TawUDVyrZ2JPW0g4F8V22udbsN6f0cFRwspTiBtxCfFMCnK/bdgcQOeQ==} + engines: {node: '>=14.0.0'} + cpu: [arm] + os: [linux] + + '@oxc-transform/binding-linux-arm64-gnu@0.64.0': + resolution: {integrity: sha512-OxIEd1bk9fEmSgisxD525+2/7XZ6ex9vSU/FZhalv/tEsbrMA7sxsu/cl0zfKVVZFkI2uZ2r93RLeh/kv0VznQ==} + engines: {node: '>=14.0.0'} + cpu: [arm64] + os: [linux] + + '@oxc-transform/binding-linux-arm64-musl@0.64.0': + resolution: {integrity: sha512-kTtZBREwmXMMgsMdFWU6/zZPavbeFwXHf32MY07tIBEn6kRz9Gg6Xsl7V1s0PVMTcYVY+6IZ5idZ1ODAdt1VkQ==} + engines: {node: '>=14.0.0'} + cpu: [arm64] + os: [linux] + + '@oxc-transform/binding-linux-x64-gnu@0.64.0': + resolution: {integrity: sha512-zHe0oT6xpCECWFdN2Uovut/36RJ6fA0IZwZEHaHeGHYbp8UoCrvZAXoh5MYa/hadYpsoVV13b5ZHBEJk7DuMjg==} + engines: {node: '>=14.0.0'} + cpu: [x64] + os: [linux] + + '@oxc-transform/binding-linux-x64-musl@0.64.0': + resolution: {integrity: sha512-kxiziQsB+ic5j2SCMV0pzcesA+QFaufTmNQbQznu7XFy+sFjHHkYfS3109D40gLnNtmlaIyTHj+1Ooka7awKhA==} + engines: {node: '>=14.0.0'} + cpu: [x64] + os: [linux] + + '@oxc-transform/binding-wasm32-wasi@0.64.0': + resolution: {integrity: sha512-YJtTvi3DYxEZ7mIZaIEaLGL0ECCiJWHxiA9Qz2EpswbRCfXX/l7YSODs3uvG/thlCFhnzPLIM8O6tIHjpHIWYA==} + engines: {node: '>=14.0.0'} + cpu: [wasm32] + + '@oxc-transform/binding-win32-arm64-msvc@0.64.0': + resolution: {integrity: sha512-X2gDEzZFrfM65+mc4VYBfxdVPcqcxS5RZgc+dPcz8Xc14t/pmdqMeEJDTt0zKnL6T+42kPZHdybLwpgsuBdRDA==} + engines: {node: '>=14.0.0'} + cpu: [arm64] + os: [win32] + + '@oxc-transform/binding-win32-x64-msvc@0.64.0': + resolution: {integrity: sha512-QC2Nx0GFuUNGU5vmWgCym0TLIHFdoVvdpTWwcbZtWp8pFbQhvYms5CWmZm+wlCqAGPp5aYm2aLmp9hE8dM1c9Q==} + engines: {node: '>=14.0.0'} + cpu: [x64] + os: [win32] '@parcel/bundler-default@2.15.0': resolution: {integrity: sha512-ILPLWsRdt8GceQSPUGWDg6FpELpHJbIEu5B2+72zx2zgsXHYmkT/d35HKIFHq4NoN2ZGwRFJI0bQ+DJcFAt+Tw==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/cache@2.14.1': - resolution: {integrity: sha512-oFJfIK6QfxY35XYsDaOyFWH3eKEbzU4CXTsUVAkpH1PbX0DTko3eZ4D+xWapRRaAQIMfL+xfUWmsL4njYCQqZQ==} - engines: {node: '>= 16.0.0'} - peerDependencies: - '@parcel/core': ^2.14.1 - '@parcel/cache@2.15.0': resolution: {integrity: sha512-UKCf/mUJ1Kn+PXvDDTzXHu5eafUQPMQ+JIb1cHsFGGJETpCZskKhexnN21yJVrdRPM0JkIjxv1viTRTk2tt6Gw==} engines: {node: '>= 16.0.0'} peerDependencies: '@parcel/core': ^2.15.0 - '@parcel/codeframe@2.14.1': - resolution: {integrity: sha512-n5IdtgxuukSTJ5/fq/69S5Rm9KBSg/dhpE4oRkyUEtkgEwTLpG2c6rmYtWem1yGIc80Z4BRvP9vgmYAEHHXSwA==} - engines: {node: '>= 16.0.0'} - '@parcel/codeframe@2.15.0': resolution: {integrity: sha512-zpZCf5W+npiSkdCUC7izjdUUoWM2M++XWRwbqgwWBUCKrXC4vVJoOYMzLbyfaF/zkVo5iQenSGlsD0olBd7V1w==} engines: {node: '>= 16.0.0'} - '@parcel/compressor-raw@2.14.1': - resolution: {integrity: sha512-lo/MJIOaEhjhgC3H0eMvqWpd1J2CxTErIl7T4MIIwzgNBdXHJe39ErkiJYaelh/q15uQVnc5dXx3VSu/YgWDXg==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/compressor-raw@2.15.0': resolution: {integrity: sha512-AoShbbqNCkzTkNMygmcCazV6iFj9nLVwBPZZCAyJ57ooRlxPszMtLO1RIw/cVU9PJg/NlYGg0uEGVt/N56SzWA==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/config-default@2.14.1': - resolution: {integrity: sha512-rM+SqYmgzrg59XH8c41fC6lggFWRYm1tQ/NvrLB4QuKzLqh2RSLa8rNkuR7bDGo1Bq7ore0WjjFDv87MXsWJkg==} - peerDependencies: - '@parcel/core': ^2.14.1 - '@parcel/config-default@2.15.0': resolution: {integrity: sha512-vWwDvM4t0Osm2u6PI8pG7Z/J6kDMpJ+zEdIdhj9Au9lJWYA4SS3BF7mj4jhWlr69ClK9rsLujwfh3AUJr6oYpA==} peerDependencies: '@parcel/core': ^2.15.0 - '@parcel/core@2.14.1': - resolution: {integrity: sha512-vw7Uc2hZgXEDCHyPzeV+IPqC9mUtCbVSJ4lXP9Ri49mdLV7Hazb9iCN4mNld7sCMtG2f6fEqfwsD9r2zGyntgw==} - engines: {node: '>= 16.0.0'} - '@parcel/core@2.15.0': resolution: {integrity: sha512-HJvgxG18f6geGkp50y3Ta2ZcEBXtpraZxnERy/BMuXYxIB3DPGXN53Jsy6huELDNpSIXJJXOfXeDMSs+XonTCg==} engines: {node: '>= 16.0.0'} - '@parcel/diagnostic@2.14.1': - resolution: {integrity: sha512-1miPY3EFMlaRRXEEi9kqqVih8jxCIrmpeQTgnFcamX7TypAlGKaFjn0FTOYL1FXexVHETiVFzmNOWVe+EUJF6A==} - engines: {node: '>= 16.0.0'} - '@parcel/diagnostic@2.15.0': resolution: {integrity: sha512-Bzg7AJu10muQ793p2MPlZnYvbqZXOJw/YBIOCFjbwRKiYUb06+sZyfntU7e7YecV6im0IGqkIfMD0F4MT+v7Rg==} engines: {node: '>= 16.0.0'} - '@parcel/error-overlay@2.14.1': - resolution: {integrity: sha512-9HyBBOjR+xp8OWSwOV0DRmWduKEtR+PKjdwc3+PIP9LQ4p9WL/uUcGG57LCdU4UKih8befCRN0qs7iMQU1OSxg==} - engines: {node: '>= 16.0.0'} - '@parcel/error-overlay@2.15.0': resolution: {integrity: sha512-Tsq0q4Lv3aDn/nXWuzH1x/pgzYQYCt17qOejAANfNYIBIrLs7BRsGyT63vP39i7IXI+MvulMl5nDXQDAqDwujw==} engines: {node: '>= 16.0.0'} - '@parcel/events@2.14.1': - resolution: {integrity: sha512-DG4xxp1x/ky7aHbz2GpwPBAkbI4pTfEWGukXh6bTyp/8TJl6LHvQxZkNszBoOwPF+D9vKH+Cm1ZS+iLX1HCnaA==} - engines: {node: '>= 16.0.0'} - '@parcel/events@2.15.0': resolution: {integrity: sha512-iCoFGsZTAlh3ewp6KYseUC16OHbZi2n6vAl4Rr8Uw7yxvwCC3iHT9acLwhO7bP/YKkdGri3d78+UwPl8LmbIwA==} engines: {node: '>= 16.0.0'} - '@parcel/feature-flags@2.14.1': - resolution: {integrity: sha512-SiFWEONfIIM42+J4IFQnAgVOuqOPqZLc+6kHX8bmSBYAA6PVkwfjI8GVwcFm0qzo9HYylwuHwzrAdByv5FFodA==} - engines: {node: '>= 16.0.0'} - '@parcel/feature-flags@2.15.0': resolution: {integrity: sha512-gtAC30G2QlIwTlLM2tI7AB0JBKEiX4nNOL/qh+or9wD9fuk53O4QHJwPtiy49YGSPYrYnIR2EXWOOV+3Br9CCw==} engines: {node: '>= 16.0.0'} - '@parcel/fs@2.14.1': - resolution: {integrity: sha512-qLKjKdE+8d+HycrUSbWf2pLmfi2g4p23HkEMwxOPnbu+OQ9deyrODbfhMNVQNSGDztNDjw53YF4+c5Y+DCtXUw==} - engines: {node: '>= 16.0.0'} - peerDependencies: - '@parcel/core': ^2.14.1 - '@parcel/fs@2.15.0': resolution: {integrity: sha512-ecWIbIhwdnvJc/PY+l3TFOcRtr8W3X6M1yfhNQLmYs/3kETIxDK8s+vTva/qPBFEiW0amMBhbkhKZEXFrxL1GQ==} engines: {node: '>= 16.0.0'} peerDependencies: '@parcel/core': ^2.15.0 - '@parcel/graph@3.4.1': - resolution: {integrity: sha512-4kaHLJ0HfMo9OT3dEUlLLArMa3YYCYEDs7b1juXPUYS6VEPfxebdAw6gcF2KlC/TMUP7SbU9dsauPfOc1ttXcQ==} - engines: {node: '>= 16.0.0'} - '@parcel/graph@3.5.0': resolution: {integrity: sha512-CLQMSPq1TTwGqt741UIwuzXSXRX4G4skNrZ7OZnUcUNfKfHKjJq5T/tqhpCsfTXzW8KASOt7EJGPD64HYA8nRQ==} engines: {node: '>= 16.0.0'} - '@parcel/logger@2.14.1': - resolution: {integrity: sha512-jksQTCuVW7HWB75HShnliGs+lwbirv9ajCQtEwtOMFlZMCEplu0Pp6GxNG467r9EWzCf55yGwnZw7F6Fs1Oqgg==} - engines: {node: '>= 16.0.0'} - '@parcel/logger@2.15.0': resolution: {integrity: sha512-WCYtSweM7Iol/lE7HhU5cLsSNuGQ1T4xTIYvG16tGHCsjybWF1H9yqkL90WU2JHjhSsvNGjvwrVxWjfO304fqQ==} engines: {node: '>= 16.0.0'} - '@parcel/markdown-ansi@2.14.1': - resolution: {integrity: sha512-cxeM6w9861HTMuxEhhPDznCwPd/MxbIJpqp5z9E8+L3Syso0qa7ot5z5Lm3DSfDVh0Dnpi7srC8QpJkOqCl4yw==} - engines: {node: '>= 16.0.0'} - '@parcel/markdown-ansi@2.15.0': resolution: {integrity: sha512-TJOSg/y2P1Rp199+osSFd4jtt8M4iyBQwgC4gdAARcraIwLa/wYRt6RVnOIsN3nz1r1CPLvHHPfuIwwFjRNw9A==} engines: {node: '>= 16.0.0'} - '@parcel/namer-default@2.14.1': - resolution: {integrity: sha512-6Hq4TuQblYhqzpi7eVHLa2RJ0OGq5MiR6KofAwpz4gDF1H8UVR85KGzFLRRk73nAqMZi45Yqs8f4FHtTOJzksw==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/namer-default@2.15.0': resolution: {integrity: sha512-JkfrvBcMmZ4DvI9VGUWSir3Nwlh224MsKUMqfXs9zc9Xq484v+p+bSaEoAwZIyfUwXXDz1sXk9NffNuLSa5ivA==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/node-resolver-core@3.5.1': - resolution: {integrity: sha512-FiZUbTmEfoWIRKYmmx2baPlusIdW9gKPRowXp+YWb436aFxbk06rf8pS4uCkODN61RZEg6WPHOo0rLVcylbOSw==} - engines: {node: '>= 16.0.0'} - '@parcel/node-resolver-core@3.6.0': resolution: {integrity: sha512-5WxRlrFkHrUrCa3zq1Umo/k3Da7F1Bib31yEZp3pmAgjbX/wi+ESiMllAamW6IP2SLP80jAB2D/mbuHAqPH3kg==} engines: {node: '>= 16.0.0'} - '@parcel/optimizer-css@2.14.1': - resolution: {integrity: sha512-uerUTAFzer23wDD+CeGDxRSpGJrpYNU7RIkvUKrWBaYPG2ztKQ4NWWZ7/xVL8EdU6TilRec6xihrONFUE1Pa3Q==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/optimizer-css@2.15.0': resolution: {integrity: sha512-MPazyyIZuQgdWdjkVNq8/JyaM3Z2IalChJV+7j2EjdAU6fGblkp7HsroRYCdoWP+88ULsOblHUUkpqDGtHr2WQ==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} @@ -4149,16 +4316,6 @@ packages: resolution: {integrity: sha512-sJBqAOFAFrT1fuF4bcGKy3bNsSvdWEP8TP27bOQZ7VoIEH4j+Uycxhy2OU+l8PC5FSnTQEGQlBZ5YNEsputzYw==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/optimizer-htmlnano@2.14.1': - resolution: {integrity: sha512-m9qmJD1yC5/KfXz/6dk8QdVFug3iSXhkABIo51iPHezabRNKxBscQHvaYjRGptJdTgqe04vz8Wf1l4iLpKWM2w==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - - '@parcel/optimizer-image@2.14.1': - resolution: {integrity: sha512-Ut3LyQjh4bZw2sfS0gB2LaVo7cRYqXMb2UX3l8c57jZUfHjqG3eweiZtl7cM3sbOLjj7Z79BSj9JJ67OJS6ATQ==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - peerDependencies: - '@parcel/core': ^2.14.1 - '@parcel/optimizer-image@2.15.0': resolution: {integrity: sha512-LJjP2OeE+85zNL0jQfCPZ6mG2voG6FplgcQ2poQQi1HJ4WdVgMiF8K34j5X7jqrQZn9V2duQGEXt1dGlG/5wyQ==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} @@ -4169,162 +4326,80 @@ packages: resolution: {integrity: sha512-oIzgi2VfbsEs6R3e17Dps2lVN1mX6GpHMuCRYDXghJWhoMR0f8OodsG3mCpFqDldhQTDqHPkH+Rr8JqS1EMBHQ==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/optimizer-svgo@2.14.1': - resolution: {integrity: sha512-pMQ2vHLRO4eOUYzc1aNa+U3EET2CoXNP9eHzMEXD9ikbcuU699LWhQ9f0g94q/tCEPiDDU7fYFVRk5z9rYJ4xg==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - - '@parcel/optimizer-swc@2.14.1': - resolution: {integrity: sha512-oNtXoW/o9zWXhcoZ4taaIot3l5jSy9RzKXWzKLtrMHkljyifIcxJ7DfgMfr2v1ToCFYRitdtQ4s0Y9dDOvjlqw==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/optimizer-swc@2.15.0': resolution: {integrity: sha512-CLcgEnmNQ98bFBcY/0n7yRKU/Vyq5FPGJh5tCosCGgZ1Ob6sHIb8zLbKl6aqKYqfbDHouHHtirjLwBf0nRfSUg==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/package-manager@2.14.1': - resolution: {integrity: sha512-zLjPJpKhj+3Yqy9HN1Kp7fTot2BqTG3wxFoVRI5vdKqMeC9PT+UexdctU0sx90aeXcs3dF6yl944nVPlMZW8qA==} - engines: {node: '>= 16.0.0'} - peerDependencies: - '@parcel/core': ^2.14.1 - '@parcel/package-manager@2.15.0': resolution: {integrity: sha512-CYJss7ouWCAanv+E/6Ndo6TtFo3981k2lSi5pWRwaSEGe/adY6YaFTcfV4gwKmMWcpqAnymtUxDiCxrZBIR6AA==} engines: {node: '>= 16.0.0'} peerDependencies: '@parcel/core': ^2.15.0 - '@parcel/packager-css@2.14.1': - resolution: {integrity: sha512-SUVnX8cFHApmU0xA4rard3h1gR4tN7MeB7w1JtO+BgTLdxHBAG/rzqh22T7pJuwc+XJ8x+8CSh1vYkrIuL9Dow==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/packager-css@2.15.0': resolution: {integrity: sha512-NIO3/wBbdBpajCwBon+wrdRHZl4ei+5JoZU3uW4Np8ECaoRdBmseyGoyYqiHCO7dxhu+iAa5WrRFOAjQGtNOOw==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/packager-html@2.14.1': - resolution: {integrity: sha512-66vTBsQw9Tob/9uqOfXmGaJX83HG/Y7ymPcB2MqFSiZMKWz6jQSolwycHi386l2t1Lf71tMmFF9hrTzD4WHqgQ==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/packager-html@2.15.0': resolution: {integrity: sha512-1oA+bgqTny7yTXPgRUbBwi4TLy0ywPtpFJZcxwI6GONORVHDC/178PpjCbkD4q9O61J2e1Ms793aZam7zeBkjg==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/packager-js@2.14.1': - resolution: {integrity: sha512-NLK9eI876hedSvq95H3Wpk4eaGbPSmSr3fCuAOwfysMh0fO0mzpxzEj7aMK2SariSYLtBLkkeR42QJGe/qzqpA==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/packager-js@2.15.0': resolution: {integrity: sha512-vAqBujbE/nJ47a7Gdo2p0dhipPuOQV8gy0cfJAuEz50BlCMwn1IRY2fGtE2zMW1KCcvLwGmEFyYVQh/C71wqAQ==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/packager-raw@2.14.1': - resolution: {integrity: sha512-R36Awv/TuLIeQSK7l+GX7XEDYR3otutmMBGgZJg4w9Y8P0E26fViNELqzA9CIJq5qBHAC48eOd+V2IGh0RV9GQ==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/packager-raw@2.15.0': resolution: {integrity: sha512-zbl4z2EyNPFfBGekQp8F9+LorKq5uV5zhkLcyGZY3kFqyar1HLwbr/Qm6Di1X3OE5IR0+kccqjtF7im9VY8v9A==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/packager-react-static@2.14.1': - resolution: {integrity: sha512-dDPQ4xFSZ1XEirqhYimexmtOH6KBhw0bPRinNtpZak6iKOmNbg65LwDayBDMKQyU4wOvXjMh1Psr+5APQ0fDRw==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/packager-react-static@2.15.0': resolution: {integrity: sha512-Gn/Dm6uTvyn+eA3VdMZLWzig6ZkOohPPV87DMy+enIcaN3Q0RetT5nh3SjwKGairai+WarAV0wRlMbmlR3bgxw==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/packager-svg@2.14.1': - resolution: {integrity: sha512-5s/PSwVd8K92ksML50gGxUPs1WVOfGDoMHBqZbJP21FyTJSqV1e+qDvdjSSWGDImGL79ZAB5gVHguxuonsnAlw==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/packager-svg@2.15.0': resolution: {integrity: sha512-rtdqnxNTlVi7HI/mHvmKBjv9d7AT2vveqw9QELAHosEKLl5+ZUBtUvwv5NcaQ8Z2Z4Vjyq3EHuPD+LsYCLalhQ==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/packager-wasm@2.14.1': - resolution: {integrity: sha512-crMF0j3zgDgPuUQoXP19bZ2kr1JxwOkEb1uz3l52qzb+bU8mNn500MBh/oNv5Kz3LsmeNFF0QMpAjpCWYyWp8Q==} - engines: {node: '>=16.0.0', parcel: ^2.14.1} - '@parcel/packager-wasm@2.15.0': resolution: {integrity: sha512-fKG2sNC3OIx5XKJ9RQ8fzDXujNopGGjSK+uYbUVrGpG8AlyUJt5ETVjk1712KaDAJxE8u0oUcupXfrrRNbW/Fw==} engines: {node: '>=16.0.0', parcel: ^2.15.0} - '@parcel/plugin@2.14.1': - resolution: {integrity: sha512-zWqQF+YnCNjOd1lc2nWWdjhr6zNJGV1WFE05W3WSJgyfyes8s4HB0FzShTqJ+R9FQdmYWPmRuxO8hC3lwLSQDg==} - engines: {node: '>= 16.0.0'} - '@parcel/plugin@2.15.0': resolution: {integrity: sha512-OT+W5t70+VZbcg2P30QahF4YjRu+9ywG5NSMj0SYvS6PCZa+IAYB9589KuavcAp+Tq2FV7MgYtrBKPh9b0VAtg==} engines: {node: '>= 16.0.0'} - '@parcel/profiler@2.14.1': - resolution: {integrity: sha512-qrR+RqXfF1IXJdddMoJaAhFnl6pen1CBoobP8p78pZ2SAefo8gyXnTG4Kgr6ff0VJER03U7o0bL1dI9ooHHhDA==} - engines: {node: '>= 16.0.0'} - '@parcel/profiler@2.15.0': resolution: {integrity: sha512-/Bw10pCISHbSzpdmuxg1GjSh+GuvqmUYA9bAmb69dkzWLIEk3uU05ba4xoju2mwoSeNb50LRcYPcirLB0Z61wA==} engines: {node: '>= 16.0.0'} - '@parcel/reporter-cli@2.14.1': - resolution: {integrity: sha512-wNG2JbwpJ5qLRPhwoXgm0LxRNjePRflFzfgwX1NlSKwJp7FtNoczraTt8lZPtoM5e1ChzS2ggKz5XUnYhLQa9A==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/reporter-cli@2.15.0': resolution: {integrity: sha512-p8nNpX53A7OLFpqZravxzanExPyk0/zNFTYJO/rdGToOqe/m3V/uK8XWb45fVf9OKNZmB13sr/DRdeYHMbXyYg==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/reporter-dev-server@2.14.1': - resolution: {integrity: sha512-7bCBNcSNBlsoeDX5JHFTeqRDzGxggEkOqX/HMN0rkp9R1wUOKPu9ik1hHXKjknUOsLYJ/lvHbecLZFaTMBOYIQ==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/reporter-dev-server@2.15.0': resolution: {integrity: sha512-WILv04oGD3yGAI17w1+MkJZKQumndpGHVzRVZIgLc5WWDffGWvCGYJseUWYQc34/CYY19v/hI/BaEQqJX6CABQ==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/reporter-tracer@2.14.1': - resolution: {integrity: sha512-RBFoP3pVXhRMkatZcNNvl/NbJNS4LVPz2Oy+0pVL18pbMEan2O8HpVbELnUbeWi1995IGBEp2DMGZMAw4qV51A==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/reporter-tracer@2.15.0': resolution: {integrity: sha512-ICVLXcwaXAbk9uLBczPgAaAG5esaIBUn8soaX+TXylQfUCIExbU9Q321hreLIRZK6j6UrWQ/m55EQGFKLWf0Lg==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/resolver-default@2.14.1': - resolution: {integrity: sha512-wRdd/3ws3q82WxJ+ton41C1XiXvlJKW1xIklyvVAu9Bxqvru6N0L8zM6sWBdy305gwfyVq4pBBRUCJu7YxkkUQ==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/resolver-default@2.15.0': resolution: {integrity: sha512-Olnm/eY70keKg0oyG0c5Qkhx0R/6fyj0S8w4E4OVgpAMIuRKt8nDNfHBLgbchYgCJlPb8YwzbHluJLfxZlHLeA==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/runtime-browser-hmr@2.14.1': - resolution: {integrity: sha512-HaRMkQhco25klcTKfqL6UD6iRA+fkurbbsEo0p7gSfy9d6HoPS7Sml7duddQ13eBIcbTdYVclucwSIuoDFNoqQ==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/runtime-browser-hmr@2.15.0': resolution: {integrity: sha512-HZQpEbunNino2SF5Ilt7EHFGeHhBCk05s1o69Y5bNrIGy3meu287maWcjK1zzpquw0IskgsnGaafKSOcaVbHXw==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/runtime-js@2.14.1': - resolution: {integrity: sha512-YxSpJI5IQTo9ltKPXV9WueOD7z/uNaa9Fcl17OQ/cBgapDBRWqzBgewSSRJPySQt6gWcWdZWTqeeG2OTCRUQOw==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/runtime-js@2.15.0': resolution: {integrity: sha512-fmHWzTr1WjHk/rrRyvt5e932rrDUyMZfzWMn1JLOXK7NFmndoc0PUrjH+8OFAlvGopFX+0gHWOe4/VeC8Vujuw==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/runtime-rsc@2.14.1': - resolution: {integrity: sha512-rmvs02ilOkvFjblhQsJL8c8jJjFpQl88xm8owyH2eVpqNdqfyHtpCWHnDjsoKmvjfRTf6143W7w9kLqNb2UNnA==} - engines: {node: '>= 12.0.0', parcel: ^2.14.1} - '@parcel/runtime-rsc@2.15.0': resolution: {integrity: sha512-bs0miqQ/fqQU+6iAjXBG65/t5/r/JTYAg3YEo7WPPA9cbgSE8aL2rk+6d5HnRkUstzXKJEgzAQJLObOAb3s/HA==} engines: {node: '>= 12.0.0', parcel: ^2.15.0} - '@parcel/runtime-service-worker@2.14.1': - resolution: {integrity: sha512-Dz0tLHrECfzgNBfKm54QWBPsdvchFo4n2FBn4GWss0TYS4QMFrHWgc2YuRwVForXm2yS8/qoLignvM3gH8PLKg==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/runtime-service-worker@2.15.0': resolution: {integrity: sha512-5JGqWuBriviDG6A1KSuBmQG408Ngx7iix3l/hG3IcUPv2jDUoN4tmLTqOMfmXsOZF+FUJNZ30EP6y3GTv2PIdg==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} @@ -4377,15 +4452,6 @@ packages: cpu: [x64] os: [win32] - '@parcel/rust@2.14.1': - resolution: {integrity: sha512-BGFV+bS72zlzaHQAEobm/9shcW+lvQb0rAdmJJg2C3lGlqeaGks+iEIkH0wHTFzJJ1MpKgew7I3k096La0CjTw==} - engines: {node: '>= 16.0.0'} - peerDependencies: - napi-wasm: ^1.1.2 - peerDependenciesMeta: - napi-wasm: - optional: true - '@parcel/rust@2.15.0': resolution: {integrity: sha512-ERRO4q14g6nD5mr1S/kEDSsmis/mll9JLxzyub0vTgobywrUq/azJ6Un7XwhCXCaU7lO7ihD+HJvjmNLVULCXg==} engines: {node: '>= 16.0.0'} @@ -4399,134 +4465,68 @@ packages: resolution: {integrity: sha512-Ejx1P/mj+kMjQb8/y5XxDUn4reGdr+WyKYloBljpppUy8gs42T+BNoEOuRYqDVdgPc6NxduzIDoJS9pOFfV5Ew==} engines: {node: ^12.18.3 || >=14} - '@parcel/transformer-babel@2.14.1': - resolution: {integrity: sha512-WmCidhpNhbL4qWdnNFWS0F+GtYSY8k7X4wi9vYrGcFsh2jilsYoTm4BV91CUZtKfhxpYq7n1X+tknY4cOP8Isg==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/transformer-babel@2.15.0': resolution: {integrity: sha512-mJNrV4254gJ9o2pjZvyK88RXCbDmlBdZqlAqg/HXEHTqzae/iOoSGpvxy+NisqXgpMwpIf8wlxmyFna8FL4Yfg==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/transformer-css@2.14.1': - resolution: {integrity: sha512-v8kP/V1sOKEukie1veZxxcITJNJiuktNzZuCxR5G/yaJMOU57dTP8oVHGiTRr/eA6A3CRzYjeSWEWvaR3ruQRw==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/transformer-css@2.15.0': resolution: {integrity: sha512-GOC/ZFi6lxVfseGCb2kJdYBiliHrQq9dxcFayHGb7zrIRWVf9F9ihzsLkDaZ7a4WBu+gIib7JLGnO0Jy3leWOg==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/transformer-html@2.14.1': - resolution: {integrity: sha512-Q7WKi3zfgP+3QNLFqnuypRLcJBP3PMgL5mClXdIhoyY4D0xpTBoq3NCr4DfdATChrUO6NZm6BcgDVmF04KfYnQ==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/transformer-html@2.15.0': resolution: {integrity: sha512-4qFvAZICCYbKgPaX48yzxMHrSXgm4fIISHYN+W9fu7S6ohr2cOYM6FE4sk3PYxDS5aWeU7j6zU0C4I/sLlO8KA==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/transformer-image@2.14.1': - resolution: {integrity: sha512-ese7UQAb6KbC4qaPKqejNyx7Jsru8PlWMMcSgiw7o7BnHVqHP8d7MbwlokgxIo0uE/0zMFlEgKdNKtsoj+AEkQ==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - peerDependencies: - '@parcel/core': ^2.14.1 - '@parcel/transformer-image@2.15.0': resolution: {integrity: sha512-5arJrqpxHsGchqBZb2tVUIJUuzQLZIeleXq+kVnI0Tq+XFE5h3fvIrgg/viAN1lDi4eFf7fq5gWX2ImQNvkKyw==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} peerDependencies: '@parcel/core': ^2.15.0 - '@parcel/transformer-js@2.14.1': - resolution: {integrity: sha512-Zy60nRvZEabNCOTbChh/RbOpk03s5ozLMOXCAIv1VYRTSZmQFjSlIiwlaNgPjRIn2xpf+2c1y4eslk9z7RPy0w==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - peerDependencies: - '@parcel/core': ^2.14.1 - '@parcel/transformer-js@2.15.0': resolution: {integrity: sha512-tVa97+fHO0hROVpN+lmCR6H26NaQ2eq8uc2zrdsaW7XkTOyiCPSIb1oRkWP4jBBkAs73oHBhP+KvpumRhnzodw==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} peerDependencies: '@parcel/core': ^2.15.0 - '@parcel/transformer-json@2.14.1': - resolution: {integrity: sha512-oAjq78dt0Z8BbetH7edXSHVolL1DwMvEeqIPJfNybwyuKh3mwWvgbFgeurr3J5B268FXCMYmIgt63wactPnbcQ==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/transformer-json@2.15.0': resolution: {integrity: sha512-TPv3xz8JmYpzEAeeDrJCxQ1cqO8dSjeI4MDjdrr5KAHNCZZhb1s2iFH7lXMFAkUZlR1BbUfMLUvCQsu4RFwAdw==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/transformer-node@2.14.1': - resolution: {integrity: sha512-vl0m/k5eGxUe8kb9I56yhNrcrsfaWyn3+bUuLiX2jB4VA+F3qnN5N2V7wskmdGia4G4X174ICYCKQU+fLlDuFg==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/transformer-node@2.15.0': resolution: {integrity: sha512-Nu8rBn4SkP2cMJ+iZYQQGW+OmgFPQs4eaAWf0x0ejosjsS32ZVL70WhsnqCDa2DLq3Oeo2Zyeugd0Hz7DvvsDw==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/transformer-postcss@2.14.1': - resolution: {integrity: sha512-YkRLmglO9gGq4Ds/KFFPTU2VpsKcMPi5gcPp1ZGlvJQYXjjMXhHksDsOgDWiPXA+aQuTk9truO93QPdOol3U3w==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/transformer-postcss@2.15.0': resolution: {integrity: sha512-N6DrPK34RfYoYQEah9Gp6SdzTxzBuOK2/ZjkjcAoyEBT2Ong1JtQUIW75Rw3Wdktd8Yez21Ez+fLseAHuXZMDw==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/transformer-posthtml@2.14.1': - resolution: {integrity: sha512-i+CjFA1oGUYH2+gmwa58FsYAd/pHNdkdVRZgzFLeIcYmpZfl0opSwAwZ+5udhnYxed9Mlj77jmSzVK6GpVDYoQ==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/transformer-posthtml@2.15.0': resolution: {integrity: sha512-7941lzoIa4XOzORCJ9vDjfkhgz92PaE6MS/eCgHYTaFYUMWZ2KQw0U3ow8lt0p2kqDqFWOXB4P8qA+QirNdAnw==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/transformer-raw@2.14.1': - resolution: {integrity: sha512-OTO3n341HGHyrW4oKVC3InRiurjbPBTWbbX8mtyvfVcGMbs6PkU0jF1rVmO9gOsAOV5vn5AKowQ9eLMJ4xtLvQ==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/transformer-raw@2.15.0': resolution: {integrity: sha512-06xJEXDF9YX5ffm+MKvQJIXpFqx2G6RND6L091L/BmLl+FH2SNYKO3RZ4rIx8TbkjyuBnE+awRh9xl7AiLIjaA==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/transformer-react-refresh-wrap@2.14.1': - resolution: {integrity: sha512-Cke32thu4UE0Kbld1mqtw9a/Fxa67pu7BlDHvJTZvQrpAfbsev2RJM7GYYFn9KwmUqavV7GJjHHsjxGBc7JsZw==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/transformer-react-refresh-wrap@2.15.0': resolution: {integrity: sha512-I108zq+ZwQrGXgkbdIXLW3VbUQhW0gjACiHVEXM380wWm/44bbrGLbD6VMupq5svP2Y5sKkopI9zzjuYUHplHw==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/transformer-react-static@2.14.1': - resolution: {integrity: sha512-nYgvqvToAyuRYpLA1X0VwqnoHqFOIGMpRGsMl2xBIOu5v7UODHChMc1G2vvT0S+6KL0aPytXA1jpfNbRRcXdbg==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/transformer-react-static@2.15.0': resolution: {integrity: sha512-OYqnAtjOZS2o0M/vKl9gfvEpjMnvcAnLwtPzVtK/OFyqtps6gvu99P/UIfxKi2sPngW+HbsmuCvY8rNbpbPsQA==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/transformer-svg@2.14.1': - resolution: {integrity: sha512-AglOlBE8p7b5hzNM62LcslMbC73Yke8eMIsW9wm3By6/vIjW5GevAA99mrx5OhX+SKn4iJI1fAXoZ+2cP0TxJw==} - engines: {node: '>= 16.0.0', parcel: ^2.14.1} - '@parcel/transformer-svg@2.15.0': resolution: {integrity: sha512-pbhbkxM4mWjH4kpg8F+0xmHbXNCTavJ4DzrCoYgLZszZKYMhOYQZZ/uHkx4wOZ+b3n4iPe4QDlByYkh0QACxbw==} engines: {node: '>= 16.0.0', parcel: ^2.15.0} - '@parcel/types-internal@2.14.1': - resolution: {integrity: sha512-oBQfuUrNSx9ZB8HpHpMr3y0SRst5NKIsYlzx8uwHlt8A3c/4PS+apI6jamyt905grdCOpZYhNls+pY1HmhAtRA==} - '@parcel/types-internal@2.15.0': resolution: {integrity: sha512-N0p622dZx84OPoxSoz5YfnVJMXAoQfcHI+qp535J/Uv6UAbcsimKl9NPKefrLOHgSKlTTJPiDbWSMOVrPvyr6w==} - '@parcel/types@2.14.1': - resolution: {integrity: sha512-qlF96JPNYAwApUxcLEXDH5YJDQLQJsEVXNYTHXSaXR0qDybaCmo5104BcAU4R7Czic5NhGhFBScVvtwTyW2Vqg==} - '@parcel/types@2.15.0': resolution: {integrity: sha512-BtAeK/mTQMjbgyo8r1jM1d+dcnEowErHH/Eb/95Agxi7YHpfnNP2oR8cC2yZbevU9FCXnSJ2f6vZc4NGT+nqlA==} - '@parcel/utils@2.14.1': - resolution: {integrity: sha512-1178E3Dw6CjEeq6oyOfs/rNfceCQ2t4qKGpiPXGV//3k/ZDEwT4VR/f0FS0S6T1EMePrp0E0KAMQ9Zz0vrHhIA==} - engines: {node: '>= 16.0.0'} - '@parcel/utils@2.15.0': resolution: {integrity: sha512-Xir0/9UvUvMF8iRnARDdzzlEokDAcrsxj6aQUbYP3ZXV/l6/6eMRuSXZ32x6lUzOTHxukKMJA42imWUg6x38qg==} engines: {node: '>= 16.0.0'} @@ -4613,12 +4613,6 @@ packages: resolution: {integrity: sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==} engines: {node: '>= 10.0.0'} - '@parcel/workers@2.14.1': - resolution: {integrity: sha512-i0mui7kSLAPT0B0/5+YUjbP38F8e8C5QDVritAW1lbRe5XCqkvO+nU4PRsjyP5mvXVhoFVCe7UycbD2D/lrogA==} - engines: {node: '>= 16.0.0'} - peerDependencies: - '@parcel/core': ^2.14.1 - '@parcel/workers@2.15.0': resolution: {integrity: sha512-OAtL9bvDzvIS+9uNMjnf0b6Ri2m2r8Wa3Bxr8SVnjX6J5SWdOPdVR1MqwCsFF+ZeOngaSEFFbe/czHLfgc0Vnw==} engines: {node: '>= 16.0.0'} @@ -5561,6 +5555,10 @@ packages: resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==} engines: {node: '>= 0.6'} + accepts@2.0.0: + resolution: {integrity: sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==} + engines: {node: '>= 0.6'} + acorn-jsx@5.3.2: resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: @@ -5850,6 +5848,10 @@ packages: resolution: {integrity: sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==} engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} + body-parser@2.2.0: + resolution: {integrity: sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==} + engines: {node: '>=18'} + boolbase@1.0.0: resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==} @@ -6115,6 +6117,10 @@ packages: resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==} engines: {node: '>= 0.6'} + content-disposition@1.0.0: + resolution: {integrity: sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==} + engines: {node: '>= 0.6'} + content-type@1.0.5: resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==} engines: {node: '>= 0.6'} @@ -6161,15 +6167,6 @@ packages: resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==} engines: {node: '>=10'} - cosmiconfig@9.0.0: - resolution: {integrity: sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==} - engines: {node: '>=14'} - peerDependencies: - typescript: '>=4.9.5' - peerDependenciesMeta: - typescript: - optional: true - create-jest@29.7.0: resolution: {integrity: sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} @@ -6415,9 +6412,6 @@ packages: dom-accessibility-api@0.6.3: resolution: {integrity: sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==} - dom-serializer@1.4.1: - resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==} - dom-serializer@2.0.0: resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==} @@ -6429,17 +6423,10 @@ packages: engines: {node: '>=12'} deprecated: Use your platform's native DOMException instead - domhandler@4.3.1: - resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==} - engines: {node: '>= 4'} - domhandler@5.0.3: resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==} engines: {node: '>= 4'} - domutils@2.8.0: - resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==} - domutils@3.1.0: resolution: {integrity: sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==} @@ -6502,21 +6489,10 @@ packages: resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==} engines: {node: '>=8.6'} - entities@2.2.0: - resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==} - - entities@3.0.1: - resolution: {integrity: sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==} - engines: {node: '>=0.12'} - entities@4.5.0: resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} engines: {node: '>=0.12'} - env-paths@2.2.1: - resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==} - engines: {node: '>=6'} - err-code@2.0.3: resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==} @@ -6829,6 +6805,10 @@ packages: resolution: {integrity: sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==} engines: {node: '>= 0.10.0'} + express@5.1.0: + resolution: {integrity: sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==} + engines: {node: '>= 18'} + exsolve@1.0.4: resolution: {integrity: sha512-xsZH6PXaER4XoV+NiT7JHp1bJodJVT+cxeSH1G0f0tlT0lJqYuHUP3bUx2HtfTDvOagMINYp8rsqusxud3RXhw==} @@ -6902,6 +6882,10 @@ packages: resolution: {integrity: sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==} engines: {node: '>= 0.8'} + finalhandler@2.1.0: + resolution: {integrity: sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==} + engines: {node: '>= 0.8'} + find-up@4.1.0: resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==} engines: {node: '>=8'} @@ -6955,6 +6939,10 @@ packages: resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==} engines: {node: '>= 0.6'} + fresh@2.0.0: + resolution: {integrity: sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==} + engines: {node: '>= 0.8'} + fs-constants@1.0.0: resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==} @@ -7195,38 +7183,6 @@ packages: html-void-elements@3.0.0: resolution: {integrity: sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==} - htmlnano@2.1.2: - resolution: {integrity: sha512-8Fst+0bhAfU362S6oHVb4wtJj/UYEFr0qiCLAEi8zioqmp1JYBQx5crZAADlFVX0Ly/6s/IQz6G7PL9/hgoJaQ==} - peerDependencies: - cssnano: ^7.0.0 - postcss: ^8.3.11 - purgecss: ^7.0.2 - relateurl: ^0.2.7 - srcset: 5.0.1 - svgo: ^3.0.2 - terser: ^5.10.0 - uncss: ^0.17.3 - peerDependenciesMeta: - cssnano: - optional: true - postcss: - optional: true - purgecss: - optional: true - relateurl: - optional: true - srcset: - optional: true - svgo: - optional: true - terser: - optional: true - uncss: - optional: true - - htmlparser2@7.2.0: - resolution: {integrity: sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==} - htmlparser2@9.1.0: resolution: {integrity: sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==} @@ -7416,9 +7372,6 @@ packages: is-hexadecimal@2.0.1: resolution: {integrity: sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==} - is-json@2.0.1: - resolution: {integrity: sha512-6BEnpVn1rcf3ngfmViLM6vjUjGErbdrL4rwlv+u1NO1XO8kqT4YGL8+19Q+Z/bas8tY90BTWMk2+fW1g6hQjbA==} - is-map@2.0.3: resolution: {integrity: sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==} engines: {node: '>= 0.4'} @@ -7465,6 +7418,9 @@ packages: is-potential-custom-element-name@1.0.1: resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==} + is-promise@4.0.0: + resolution: {integrity: sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==} + is-reference@3.0.2: resolution: {integrity: sha512-v3rht/LgVcsdZa3O2Nqs+NMowLOxeOm7Ay9+/ARQ2F+qEoANRcqrjAZKGN0v8ymUetZGgkp26LTnGT7H0Qo9Pg==} @@ -8088,6 +8044,10 @@ packages: resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==} engines: {node: '>= 0.6'} + media-typer@1.1.0: + resolution: {integrity: sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==} + engines: {node: '>= 0.8'} + meow@6.1.1: resolution: {integrity: sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==} engines: {node: '>=8'} @@ -8095,6 +8055,10 @@ packages: merge-descriptors@1.0.3: resolution: {integrity: sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==} + merge-descriptors@2.0.0: + resolution: {integrity: sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==} + engines: {node: '>=18'} + merge-stream@2.0.0: resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} @@ -8290,6 +8254,10 @@ packages: resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==} engines: {node: '>= 0.6'} + mime-types@3.0.1: + resolution: {integrity: sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==} + engines: {node: '>= 0.6'} + mime@1.6.0: resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==} engines: {node: '>=4'} @@ -8436,6 +8404,10 @@ packages: resolution: {integrity: sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==} engines: {node: '>= 0.6'} + negotiator@1.0.0: + resolution: {integrity: sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==} + engines: {node: '>= 0.6'} + netmask@2.0.2: resolution: {integrity: sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==} engines: {node: '>= 0.4.0'} @@ -8608,6 +8580,14 @@ packages: outvariant@1.4.3: resolution: {integrity: sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==} + oxc-parser@0.64.0: + resolution: {integrity: sha512-T5/h7Iv3kwUwTaOwOLz2yTwz2LsUfdu5IXTmZuMEDYL2Bp/dxGdxQZHaz8lc4bUBU9Swnb+caioKk4FLBT7prg==} + engines: {node: '>=14.0.0'} + + oxc-transform@0.64.0: + resolution: {integrity: sha512-b4fN/7l+/frPZ7/Z3XYcjvgFXfctYiOKNP0cYFDUOZR4P1NbrpfYlLVAXiCAE66kLo7um1TS/JFCSl1JbUsb9g==} + engines: {node: '>=14.0.0'} + p-filter@2.1.0: resolution: {integrity: sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==} engines: {node: '>=8'} @@ -8653,10 +8633,33 @@ packages: pako@1.0.11: resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==} - parcel@2.14.1: - resolution: {integrity: sha512-fkqepRAxXBDPrI0omfbG2AInCGJVyxlBqVPxc/+qsW+JbyIED0ZgPgSCpvLuzTW00A2LO1/4k6oDWvTU2D84Dw==} - engines: {node: '>= 16.0.0'} - hasBin: true + parcel-config-react-router-experimental@1.0.20: + resolution: {integrity: sha512-/iQsfPrR9TXX9lWkIv5768jfnPXSW5MCyGWiIimiP+vNf8C1PRtKohI3MFcJeN8lMzpRpNyulmimMD8kIRUPEQ==} + engines: {parcel: '>=2.15.0'} + + parcel-resolver-react-router-experimental@1.1.4: + resolution: {integrity: sha512-vkYOjNgLXMPYmcPhu3+0qYbaxwLIJR7EWKmx88M9FmvBWNuRGmaqBF3KH5ATW0hXoaREv6daGFgVUcrq4OT7+Q==} + engines: {parcel: '>=2.15.0'} + peerDependencies: + '@react-router/dev': '*' + react: '*' + react-dom: '*' + react-router: '*' + react-server-dom-parcel: '*' + + parcel-resolver-react-router-typegen-experimental@1.1.2: + resolution: {integrity: sha512-vUX84xWNpw4USm6WgCqkAgKl1puxDqvLM0JU6rlh9WmNbdfPHJX5uP7PmJ3/7Dl9b1mVMB8bgnc9W/ZB8Ng+6g==} + engines: {parcel: '>=2.15.0'} + peerDependencies: + '@react-router/dev': '*' + + parcel-transformer-react-router-experimental@1.1.2: + resolution: {integrity: sha512-6F4Ic2ATIX0IwPjiUvw+iJuHgTFdqCg6HgOrJUAs4v5zirQClhp08eowtfATl/GbAAxVZeAV6BoB3K5hpvpbpw==} + engines: {parcel: '>=2.15.0'} + peerDependencies: + react: '*' + react-dom: '*' + react-router: '*' parcel@2.15.0: resolution: {integrity: sha512-CYAykhWLvCsYoTfB21azLmQjKzrPV3xUX4FgmOicbzXDz7cPxlsdQs9R8S5510fVsW7OLPG6ZN4cTzRbhjj8Tw==} @@ -8719,6 +8722,10 @@ packages: path-to-regexp@6.3.0: resolution: {integrity: sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==} + path-to-regexp@8.2.0: + resolution: {integrity: sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==} + engines: {node: '>=16'} + path-type@4.0.0: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} engines: {node: '>=8'} @@ -8838,22 +8845,6 @@ packages: resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==} engines: {node: ^10 || ^12 || >=14} - posthtml-parser@0.11.0: - resolution: {integrity: sha512-QecJtfLekJbWVo/dMAA+OSwY79wpRmbqS5TeXvXSX+f0c6pW4/SE6inzZ2qkU7oAMCPqIDkZDvd/bQsSFUnKyw==} - engines: {node: '>=12'} - - posthtml-parser@0.12.1: - resolution: {integrity: sha512-rYFmsDLfYm+4Ts2Oh4DCDSZPtdC1BLnRXAobypVzX9alj28KGl65dIFtgDY9zB57D0TC4Qxqrawuq/2et1P0GA==} - engines: {node: '>=16'} - - posthtml-render@3.0.0: - resolution: {integrity: sha512-z+16RoxK3fUPgwaIgH9NGnK1HKY9XIDpydky5eQGgAFVXTCSezalv9U2jQuNV+Z9qV1fDWNzldcw4eK0SSbqKA==} - engines: {node: '>=12'} - - posthtml@0.16.6: - resolution: {integrity: sha512-JcEmHlyLK/o0uGAlj65vgg+7LIms0xKXe60lcDOTU7oVX/3LuEuLwrQpW3VJ7de5TaFKiW4kWkaIpJL42FEgxQ==} - engines: {node: '>=12.0.0'} - preferred-pm@3.0.3: resolution: {integrity: sha512-+wZgbxNES/KlJs9q40F/1sfOd/j7f1O9JaHcW5Dsn3aUUOZg3L2bjpVUcKV2jvtElYfoTuQiNeMfQJ4kwUAhCQ==} engines: {node: '>=10'} @@ -8987,6 +8978,10 @@ packages: resolution: {integrity: sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==} engines: {node: '>= 0.8'} + raw-body@3.0.0: + resolution: {integrity: sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==} + engines: {node: '>= 0.8'} + react-dom@19.1.0: resolution: {integrity: sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g==} peerDependencies: @@ -9107,6 +9102,42 @@ packages: remark-stringify@10.0.3: resolution: {integrity: sha512-koyOzCMYoUHudypbj4XpnAKFbkddRMYZHwghnxd7ue5210WzGw6kOBwauJTRUMq16jsovXx8dYNvSSWP89kZ3A==} + remix-utils@8.7.0: + resolution: {integrity: sha512-oRumofsYFaxHyPtqLuYe3g2nQi4SMYjCoebaeed0gYHIOKBiPPYdNP6cgmQbFjQQ5pwXV+uQiKLqO6pM9ep3VA==} + engines: {node: '>=20.0.0'} + peerDependencies: + '@edgefirst-dev/batcher': ^1.0.0 + '@edgefirst-dev/jwt': ^1.2.0 + '@edgefirst-dev/server-timing': ^0.0.1 + '@oslojs/crypto': ^1.0.1 + '@oslojs/encoding': ^1.1.0 + intl-parse-accept-language: ^1.0.0 + is-ip: ^5.0.1 + react: ^18.0.0 || ^19.0.0 + react-router: ^7.0.0 + zod: ^3.22.4 + peerDependenciesMeta: + '@edgefirst-dev/batcher': + optional: true + '@edgefirst-dev/jwt': + optional: true + '@edgefirst-dev/server-timing': + optional: true + '@oslojs/crypto': + optional: true + '@oslojs/encoding': + optional: true + intl-parse-accept-language: + optional: true + is-ip: + optional: true + react: + optional: true + react-router: + optional: true + zod: + optional: true + require-directory@2.1.1: resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} engines: {node: '>=0.10.0'} @@ -9290,12 +9321,13 @@ packages: engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true + router@2.2.0: + resolution: {integrity: sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==} + engines: {node: '>= 18'} + rrweb-cssom@0.6.0: resolution: {integrity: sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==} - rsc-html-stream@0.0.4: - resolution: {integrity: sha512-1isiXIrlTI/vRLTvS3O4fMrO9qIHje1FSphufrIV5QfzHUgBDCZFwP9b8+rH63nbhxtcKTqfyziwM+2khfX0Uw==} - rsc-html-stream@0.0.6: resolution: {integrity: sha512-oZUJ5AH0oDo9QywxD9yMY6N5Z3VwX2YfQg0FanNdCmvXmO0itTfv7BMkbMSwxg7JmBjYmefU8DTW0EcLsePPgQ==} @@ -9353,6 +9385,10 @@ packages: resolution: {integrity: sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==} engines: {node: '>= 0.8.0'} + send@1.2.0: + resolution: {integrity: sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==} + engines: {node: '>= 18'} + serialize-javascript@6.0.2: resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==} @@ -9360,6 +9396,10 @@ packages: resolution: {integrity: sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==} engines: {node: '>= 0.8.0'} + serve-static@2.2.0: + resolution: {integrity: sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==} + engines: {node: '>= 18'} + set-blocking@2.0.0: resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==} @@ -9520,10 +9560,6 @@ packages: sprintf-js@1.1.3: resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==} - srcset@4.0.0: - resolution: {integrity: sha512-wvLeHgcVHKO8Sc/H/5lkGreJQVeYMm9rlmt8PuR1xE31rIuXhuzznUUqAt8MqLhB3MqJdFzlNAfpcWnxiFUcPw==} - engines: {node: '>=12'} - stack-utils@2.0.6: resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==} engines: {node: '>=10'} @@ -9864,6 +9900,10 @@ packages: resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==} engines: {node: '>= 0.6'} + type-is@2.0.1: + resolution: {integrity: sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==} + engines: {node: '>= 0.6'} + typed-array-buffer@1.0.2: resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==} engines: {node: '>= 0.4'} @@ -12783,21 +12823,75 @@ snapshots: '@open-draft/until@2.1.0': {} + '@oxc-parser/binding-darwin-arm64@0.64.0': + optional: true + + '@oxc-parser/binding-darwin-x64@0.64.0': + optional: true + + '@oxc-parser/binding-linux-arm-gnueabihf@0.64.0': + optional: true + + '@oxc-parser/binding-linux-arm64-gnu@0.64.0': + optional: true + + '@oxc-parser/binding-linux-arm64-musl@0.64.0': + optional: true + + '@oxc-parser/binding-linux-x64-gnu@0.64.0': + optional: true + + '@oxc-parser/binding-linux-x64-musl@0.64.0': + optional: true + + '@oxc-parser/binding-wasm32-wasi@0.64.0': + dependencies: + '@napi-rs/wasm-runtime': 0.2.11 + optional: true + + '@oxc-parser/binding-win32-arm64-msvc@0.64.0': + optional: true + + '@oxc-parser/binding-win32-x64-msvc@0.64.0': + optional: true + '@oxc-project/runtime@0.61.2': {} '@oxc-project/types@0.61.2': {} - '@parcel/bundler-default@2.14.1(@parcel/core@2.14.1)': + '@oxc-project/types@0.64.0': {} + + '@oxc-transform/binding-darwin-arm64@0.64.0': + optional: true + + '@oxc-transform/binding-darwin-x64@0.64.0': + optional: true + + '@oxc-transform/binding-linux-arm-gnueabihf@0.64.0': + optional: true + + '@oxc-transform/binding-linux-arm64-gnu@0.64.0': + optional: true + + '@oxc-transform/binding-linux-arm64-musl@0.64.0': + optional: true + + '@oxc-transform/binding-linux-x64-gnu@0.64.0': + optional: true + + '@oxc-transform/binding-linux-x64-musl@0.64.0': + optional: true + + '@oxc-transform/binding-wasm32-wasi@0.64.0': dependencies: - '@parcel/diagnostic': 2.14.1 - '@parcel/graph': 3.4.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/rust': 2.14.1 - '@parcel/utils': 2.14.1 - nullthrows: 1.1.1 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm + '@napi-rs/wasm-runtime': 0.2.11 + optional: true + + '@oxc-transform/binding-win32-arm64-msvc@0.64.0': + optional: true + + '@oxc-transform/binding-win32-x64-msvc@0.64.0': + optional: true '@parcel/bundler-default@2.15.0(@parcel/core@2.15.0)': dependencies: @@ -12811,16 +12905,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/cache@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/core': 2.14.1 - '@parcel/fs': 2.14.1(@parcel/core@2.14.1) - '@parcel/logger': 2.14.1 - '@parcel/utils': 2.14.1 - lmdb: 2.8.5 - transitivePeerDependencies: - - napi-wasm - '@parcel/cache@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/core': 2.15.0 @@ -12831,21 +12915,10 @@ snapshots: transitivePeerDependencies: - napi-wasm - '@parcel/codeframe@2.14.1': - dependencies: - chalk: 4.1.2 - '@parcel/codeframe@2.15.0': dependencies: chalk: 4.1.2 - '@parcel/compressor-raw@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/compressor-raw@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) @@ -12853,54 +12926,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/config-default@2.14.1(@parcel/core@2.14.1)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5)': - dependencies: - '@parcel/bundler-default': 2.14.1(@parcel/core@2.14.1) - '@parcel/compressor-raw': 2.14.1(@parcel/core@2.14.1) - '@parcel/core': 2.14.1 - '@parcel/namer-default': 2.14.1(@parcel/core@2.14.1) - '@parcel/optimizer-css': 2.14.1(@parcel/core@2.14.1) - '@parcel/optimizer-htmlnano': 2.14.1(@parcel/core@2.14.1)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) - '@parcel/optimizer-image': 2.14.1(@parcel/core@2.14.1) - '@parcel/optimizer-svgo': 2.14.1(@parcel/core@2.14.1) - '@parcel/optimizer-swc': 2.14.1(@parcel/core@2.14.1) - '@parcel/packager-css': 2.14.1(@parcel/core@2.14.1) - '@parcel/packager-html': 2.14.1(@parcel/core@2.14.1) - '@parcel/packager-js': 2.14.1(@parcel/core@2.14.1) - '@parcel/packager-raw': 2.14.1(@parcel/core@2.14.1) - '@parcel/packager-svg': 2.14.1(@parcel/core@2.14.1) - '@parcel/packager-wasm': 2.14.1(@parcel/core@2.14.1) - '@parcel/reporter-dev-server': 2.14.1(@parcel/core@2.14.1) - '@parcel/resolver-default': 2.14.1(@parcel/core@2.14.1) - '@parcel/runtime-browser-hmr': 2.14.1(@parcel/core@2.14.1) - '@parcel/runtime-js': 2.14.1(@parcel/core@2.14.1) - '@parcel/runtime-rsc': 2.14.1(@parcel/core@2.14.1) - '@parcel/runtime-service-worker': 2.14.1(@parcel/core@2.14.1) - '@parcel/transformer-babel': 2.14.1(@parcel/core@2.14.1) - '@parcel/transformer-css': 2.14.1(@parcel/core@2.14.1) - '@parcel/transformer-html': 2.14.1(@parcel/core@2.14.1) - '@parcel/transformer-image': 2.14.1(@parcel/core@2.14.1) - '@parcel/transformer-js': 2.14.1(@parcel/core@2.14.1) - '@parcel/transformer-json': 2.14.1(@parcel/core@2.14.1) - '@parcel/transformer-node': 2.14.1(@parcel/core@2.14.1) - '@parcel/transformer-postcss': 2.14.1(@parcel/core@2.14.1) - '@parcel/transformer-posthtml': 2.14.1(@parcel/core@2.14.1) - '@parcel/transformer-raw': 2.14.1(@parcel/core@2.14.1) - '@parcel/transformer-react-refresh-wrap': 2.14.1(@parcel/core@2.14.1) - '@parcel/transformer-svg': 2.14.1(@parcel/core@2.14.1) - transitivePeerDependencies: - - '@swc/helpers' - - cssnano - - napi-wasm - - postcss - - purgecss - - relateurl - - srcset - - svgo - - terser - - typescript - - uncss - '@parcel/config-default@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/bundler-default': 2.15.0(@parcel/core@2.15.0) @@ -12940,37 +12965,6 @@ snapshots: - '@swc/helpers' - napi-wasm - '@parcel/core@2.14.1': - dependencies: - '@mischnic/json-sourcemap': 0.1.1 - '@parcel/cache': 2.14.1(@parcel/core@2.14.1) - '@parcel/diagnostic': 2.14.1 - '@parcel/events': 2.14.1 - '@parcel/feature-flags': 2.14.1 - '@parcel/fs': 2.14.1(@parcel/core@2.14.1) - '@parcel/graph': 3.4.1 - '@parcel/logger': 2.14.1 - '@parcel/package-manager': 2.14.1(@parcel/core@2.14.1) - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/profiler': 2.14.1 - '@parcel/rust': 2.14.1 - '@parcel/source-map': 2.1.1 - '@parcel/types': 2.14.1(@parcel/core@2.14.1) - '@parcel/utils': 2.14.1 - '@parcel/workers': 2.14.1(@parcel/core@2.14.1) - base-x: 3.0.11 - browserslist: 4.24.5 - clone: 2.1.2 - dotenv: 16.5.0 - dotenv-expand: 11.0.7 - json5: 2.2.3 - msgpackr: 1.11.2 - nullthrows: 1.1.1 - semver: 7.7.1 - transitivePeerDependencies: - - '@swc/helpers' - - napi-wasm - '@parcel/core@2.15.0': dependencies: '@mischnic/json-sourcemap': 0.1.1 @@ -13002,40 +12996,17 @@ snapshots: - '@swc/helpers' - napi-wasm - '@parcel/diagnostic@2.14.1': - dependencies: - '@mischnic/json-sourcemap': 0.1.1 - nullthrows: 1.1.1 - '@parcel/diagnostic@2.15.0': dependencies: '@mischnic/json-sourcemap': 0.1.1 nullthrows: 1.1.1 - '@parcel/error-overlay@2.14.1': {} - '@parcel/error-overlay@2.15.0': {} - '@parcel/events@2.14.1': {} - '@parcel/events@2.15.0': {} - '@parcel/feature-flags@2.14.1': {} - '@parcel/feature-flags@2.15.0': {} - '@parcel/fs@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/core': 2.14.1 - '@parcel/feature-flags': 2.14.1 - '@parcel/rust': 2.14.1 - '@parcel/types-internal': 2.14.1 - '@parcel/utils': 2.14.1 - '@parcel/watcher': 2.5.1 - '@parcel/workers': 2.14.1(@parcel/core@2.14.1) - transitivePeerDependencies: - - napi-wasm - '@parcel/fs@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/core': 2.15.0 @@ -13048,43 +13019,20 @@ snapshots: transitivePeerDependencies: - napi-wasm - '@parcel/graph@3.4.1': - dependencies: - '@parcel/feature-flags': 2.14.1 - nullthrows: 1.1.1 - '@parcel/graph@3.5.0': dependencies: '@parcel/feature-flags': 2.15.0 nullthrows: 1.1.1 - '@parcel/logger@2.14.1': - dependencies: - '@parcel/diagnostic': 2.14.1 - '@parcel/events': 2.14.1 - '@parcel/logger@2.15.0': dependencies: '@parcel/diagnostic': 2.15.0 '@parcel/events': 2.15.0 - '@parcel/markdown-ansi@2.14.1': - dependencies: - chalk: 4.1.2 - '@parcel/markdown-ansi@2.15.0': dependencies: chalk: 4.1.2 - '@parcel/namer-default@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - nullthrows: 1.1.1 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/namer-default@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/diagnostic': 2.15.0 @@ -13094,19 +13042,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/node-resolver-core@3.5.1(@parcel/core@2.14.1)': - dependencies: - '@mischnic/json-sourcemap': 0.1.1 - '@parcel/diagnostic': 2.14.1 - '@parcel/fs': 2.14.1(@parcel/core@2.14.1) - '@parcel/rust': 2.14.1 - '@parcel/utils': 2.14.1 - nullthrows: 1.1.1 - semver: 7.7.1 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/node-resolver-core@3.6.0(@parcel/core@2.15.0)': dependencies: '@mischnic/json-sourcemap': 0.1.1 @@ -13120,19 +13055,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/optimizer-css@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/source-map': 2.1.1 - '@parcel/utils': 2.14.1 - browserslist: 4.24.5 - lightningcss: 1.30.1 - nullthrows: 1.1.1 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/optimizer-css@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/diagnostic': 2.15.0 @@ -13155,38 +13077,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/optimizer-htmlnano@2.14.1(@parcel/core@2.14.1)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5)': - dependencies: - '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/utils': 2.14.1 - htmlnano: 2.1.2(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) - nullthrows: 1.1.1 - posthtml: 0.16.6 - transitivePeerDependencies: - - '@parcel/core' - - cssnano - - napi-wasm - - postcss - - purgecss - - relateurl - - srcset - - svgo - - terser - - typescript - - uncss - - '@parcel/optimizer-image@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/core': 2.14.1 - '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/rust': 2.14.1 - '@parcel/utils': 2.14.1 - '@parcel/workers': 2.14.1(@parcel/core@2.14.1) - transitivePeerDependencies: - - napi-wasm - '@parcel/optimizer-image@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/core': 2.15.0 @@ -13207,28 +13097,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/optimizer-svgo@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/utils': 2.14.1 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - - '@parcel/optimizer-swc@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/source-map': 2.1.1 - '@parcel/utils': 2.14.1 - '@swc/core': 1.11.24 - nullthrows: 1.1.1 - transitivePeerDependencies: - - '@parcel/core' - - '@swc/helpers' - - napi-wasm - '@parcel/optimizer-swc@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/diagnostic': 2.15.0 @@ -13242,22 +13110,6 @@ snapshots: - '@swc/helpers' - napi-wasm - '@parcel/package-manager@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/core': 2.14.1 - '@parcel/diagnostic': 2.14.1 - '@parcel/fs': 2.14.1(@parcel/core@2.14.1) - '@parcel/logger': 2.14.1 - '@parcel/node-resolver-core': 3.5.1(@parcel/core@2.14.1) - '@parcel/types': 2.14.1(@parcel/core@2.14.1) - '@parcel/utils': 2.14.1 - '@parcel/workers': 2.14.1(@parcel/core@2.14.1) - '@swc/core': 1.11.24 - semver: 7.7.1 - transitivePeerDependencies: - - '@swc/helpers' - - napi-wasm - '@parcel/package-manager@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/core': 2.15.0 @@ -13274,18 +13126,6 @@ snapshots: - '@swc/helpers' - napi-wasm - '@parcel/packager-css@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/source-map': 2.1.1 - '@parcel/utils': 2.14.1 - lightningcss: 1.30.1 - nullthrows: 1.1.1 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/packager-css@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/diagnostic': 2.15.0 @@ -13298,17 +13138,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/packager-html@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/types': 2.14.1(@parcel/core@2.14.1) - '@parcel/utils': 2.14.1 - nullthrows: 1.1.1 - posthtml: 0.16.6 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/packager-html@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) @@ -13319,20 +13148,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/packager-js@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/rust': 2.14.1 - '@parcel/source-map': 2.1.1 - '@parcel/types': 2.14.1(@parcel/core@2.14.1) - '@parcel/utils': 2.14.1 - globals: 13.24.0 - nullthrows: 1.1.1 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/packager-js@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/diagnostic': 2.15.0 @@ -13347,13 +13162,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/packager-raw@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/packager-raw@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) @@ -13361,19 +13169,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/packager-react-static@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/node-resolver-core': 3.5.1(@parcel/core@2.14.1) - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/rust': 2.14.1 - '@parcel/types': 2.14.1(@parcel/core@2.14.1) - '@parcel/utils': 2.14.1 - nullthrows: 1.1.1 - rsc-html-stream: 0.0.4 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/packager-react-static@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/node-resolver-core': 3.6.0(@parcel/core@2.15.0) @@ -13387,16 +13182,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/packager-svg@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/types': 2.14.1(@parcel/core@2.14.1) - '@parcel/utils': 2.14.1 - posthtml: 0.16.6 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/packager-svg@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) @@ -13407,13 +13192,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/packager-wasm@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/packager-wasm@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) @@ -13421,13 +13199,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/plugin@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/types': 2.14.1(@parcel/core@2.14.1) - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/plugin@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/types': 2.15.0(@parcel/core@2.15.0) @@ -13435,13 +13206,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/profiler@2.14.1': - dependencies: - '@parcel/diagnostic': 2.14.1 - '@parcel/events': 2.14.1 - '@parcel/types-internal': 2.14.1 - chrome-trace-event: 1.0.4 - '@parcel/profiler@2.15.0': dependencies: '@parcel/diagnostic': 2.15.0 @@ -13449,17 +13213,6 @@ snapshots: '@parcel/types-internal': 2.15.0 chrome-trace-event: 1.0.4 - '@parcel/reporter-cli@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/types': 2.14.1(@parcel/core@2.14.1) - '@parcel/utils': 2.14.1 - chalk: 4.1.2 - term-size: 2.2.1 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/reporter-cli@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) @@ -13471,16 +13224,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/reporter-dev-server@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/codeframe': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/source-map': 2.1.1 - '@parcel/utils': 2.14.1 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/reporter-dev-server@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/codeframe': 2.15.0 @@ -13491,16 +13234,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/reporter-tracer@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/utils': 2.14.1 - chrome-trace-event: 1.0.4 - nullthrows: 1.1.1 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/reporter-tracer@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) @@ -13511,14 +13244,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/resolver-default@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/node-resolver-core': 3.5.1(@parcel/core@2.14.1) - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/resolver-default@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/node-resolver-core': 3.6.0(@parcel/core@2.15.0) @@ -13527,14 +13252,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/runtime-browser-hmr@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/utils': 2.14.1 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/runtime-browser-hmr@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) @@ -13543,16 +13260,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/runtime-js@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/utils': 2.14.1 - nullthrows: 1.1.1 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/runtime-js@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/diagnostic': 2.15.0 @@ -13563,16 +13270,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/runtime-rsc@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/rust': 2.14.1 - '@parcel/utils': 2.14.1 - nullthrows: 1.1.1 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/runtime-rsc@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) @@ -13583,15 +13280,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/runtime-service-worker@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/utils': 2.14.1 - nullthrows: 1.1.1 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/runtime-service-worker@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) @@ -13625,8 +13313,6 @@ snapshots: '@parcel/rust-win32-x64-msvc@2.15.0': optional: true - '@parcel/rust@2.14.1': {} - '@parcel/rust@2.15.0': optionalDependencies: '@parcel/rust-darwin-arm64': 2.15.0 @@ -13642,20 +13328,6 @@ snapshots: dependencies: detect-libc: 1.0.3 - '@parcel/transformer-babel@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/source-map': 2.1.1 - '@parcel/utils': 2.14.1 - browserslist: 4.24.5 - json5: 2.2.3 - nullthrows: 1.1.1 - semver: 7.7.1 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/transformer-babel@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/diagnostic': 2.15.0 @@ -13670,19 +13342,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-css@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/source-map': 2.1.1 - '@parcel/utils': 2.14.1 - browserslist: 4.24.5 - lightningcss: 1.30.1 - nullthrows: 1.1.1 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/transformer-css@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/diagnostic': 2.15.0 @@ -13696,21 +13355,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-html@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/rust': 2.14.1 - nullthrows: 1.1.1 - posthtml: 0.16.6 - posthtml-parser: 0.12.1 - posthtml-render: 3.0.0 - semver: 7.7.1 - srcset: 4.0.0 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/transformer-html@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/diagnostic': 2.15.0 @@ -13720,40 +13364,13 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-image@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/core': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/utils': 2.14.1 - '@parcel/workers': 2.14.1(@parcel/core@2.14.1) - nullthrows: 1.1.1 - transitivePeerDependencies: - - napi-wasm - '@parcel/transformer-image@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/core': 2.15.0 '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) '@parcel/utils': 2.15.0 '@parcel/workers': 2.15.0(@parcel/core@2.15.0) - nullthrows: 1.1.1 - transitivePeerDependencies: - - napi-wasm - - '@parcel/transformer-js@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/core': 2.14.1 - '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/rust': 2.14.1 - '@parcel/source-map': 2.1.1 - '@parcel/utils': 2.14.1 - '@parcel/workers': 2.14.1(@parcel/core@2.14.1) - '@swc/helpers': 0.5.15 - browserslist: 4.24.5 - nullthrows: 1.1.1 - regenerator-runtime: 0.14.1 - semver: 7.7.1 + nullthrows: 1.1.1 transitivePeerDependencies: - napi-wasm @@ -13774,14 +13391,6 @@ snapshots: transitivePeerDependencies: - napi-wasm - '@parcel/transformer-json@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - json5: 2.2.3 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/transformer-json@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) @@ -13790,13 +13399,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-node@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/transformer-node@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) @@ -13804,20 +13406,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-postcss@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/rust': 2.14.1 - '@parcel/utils': 2.14.1 - clone: 2.1.2 - nullthrows: 1.1.1 - postcss-value-parser: 4.2.0 - semver: 7.7.1 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/transformer-postcss@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/diagnostic': 2.15.0 @@ -13832,19 +13420,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-posthtml@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/utils': 2.14.1 - nullthrows: 1.1.1 - posthtml: 0.16.6 - posthtml-parser: 0.12.1 - posthtml-render: 3.0.0 - semver: 7.7.1 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/transformer-posthtml@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) @@ -13853,13 +13428,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-raw@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/transformer-raw@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) @@ -13867,16 +13435,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-react-refresh-wrap@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/error-overlay': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/utils': 2.14.1 - react-refresh: 0.14.2 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/transformer-react-refresh-wrap@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/error-overlay': 2.15.0 @@ -13887,13 +13445,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-react-static@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/transformer-react-static@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) @@ -13901,20 +13452,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/transformer-svg@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/diagnostic': 2.14.1 - '@parcel/plugin': 2.14.1(@parcel/core@2.14.1) - '@parcel/rust': 2.14.1 - nullthrows: 1.1.1 - posthtml: 0.16.6 - posthtml-parser: 0.12.1 - posthtml-render: 3.0.0 - semver: 7.7.1 - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/transformer-svg@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/diagnostic': 2.15.0 @@ -13924,13 +13461,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/types-internal@2.14.1': - dependencies: - '@parcel/diagnostic': 2.14.1 - '@parcel/feature-flags': 2.14.1 - '@parcel/source-map': 2.1.1 - utility-types: 3.11.0 - '@parcel/types-internal@2.15.0': dependencies: '@parcel/diagnostic': 2.15.0 @@ -13938,14 +13468,6 @@ snapshots: '@parcel/source-map': 2.1.1 utility-types: 3.11.0 - '@parcel/types@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/types-internal': 2.14.1 - '@parcel/workers': 2.14.1(@parcel/core@2.14.1) - transitivePeerDependencies: - - '@parcel/core' - - napi-wasm - '@parcel/types@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/types-internal': 2.15.0 @@ -13954,19 +13476,6 @@ snapshots: - '@parcel/core' - napi-wasm - '@parcel/utils@2.14.1': - dependencies: - '@parcel/codeframe': 2.14.1 - '@parcel/diagnostic': 2.14.1 - '@parcel/logger': 2.14.1 - '@parcel/markdown-ansi': 2.14.1 - '@parcel/rust': 2.14.1 - '@parcel/source-map': 2.1.1 - chalk: 4.1.2 - nullthrows: 1.1.1 - transitivePeerDependencies: - - napi-wasm - '@parcel/utils@2.15.0': dependencies: '@parcel/codeframe': 2.15.0 @@ -14040,18 +13549,6 @@ snapshots: '@parcel/watcher-win32-ia32': 2.5.1 '@parcel/watcher-win32-x64': 2.5.1 - '@parcel/workers@2.14.1(@parcel/core@2.14.1)': - dependencies: - '@parcel/core': 2.14.1 - '@parcel/diagnostic': 2.14.1 - '@parcel/logger': 2.14.1 - '@parcel/profiler': 2.14.1 - '@parcel/types-internal': 2.14.1 - '@parcel/utils': 2.14.1 - nullthrows: 1.1.1 - transitivePeerDependencies: - - napi-wasm - '@parcel/workers@2.15.0(@parcel/core@2.15.0)': dependencies: '@parcel/core': 2.15.0 @@ -15092,6 +14589,11 @@ snapshots: mime-types: 2.1.35 negotiator: 0.6.3 + accepts@2.0.0: + dependencies: + mime-types: 3.0.1 + negotiator: 1.0.0 + acorn-jsx@5.3.2(acorn@8.14.1): dependencies: acorn: 8.14.1 @@ -15476,6 +14978,20 @@ snapshots: transitivePeerDependencies: - supports-color + body-parser@2.2.0: + dependencies: + bytes: 3.1.2 + content-type: 1.0.5 + debug: 4.4.0 + http-errors: 2.0.0 + iconv-lite: 0.6.3 + on-finished: 2.4.1 + qs: 6.14.0 + raw-body: 3.0.0 + type-is: 2.0.1 + transitivePeerDependencies: + - supports-color + boolbase@1.0.0: {} brace-expansion@1.1.11: @@ -15756,6 +15272,10 @@ snapshots: dependencies: safe-buffer: 5.2.1 + content-disposition@1.0.0: + dependencies: + safe-buffer: 5.2.1 + content-type@1.0.5: {} convert-source-map@1.9.0: {} @@ -15790,15 +15310,6 @@ snapshots: path-type: 4.0.0 yaml: 1.10.2 - cosmiconfig@9.0.0(typescript@5.4.5): - dependencies: - env-paths: 2.2.1 - import-fresh: 3.3.0 - js-yaml: 4.1.0 - parse-json: 5.2.0 - optionalDependencies: - typescript: 5.4.5 - create-jest@29.7.0(@types/node@22.14.0)(babel-plugin-macros@3.1.0): dependencies: '@jest/types': 29.6.3 @@ -16017,12 +15528,6 @@ snapshots: dom-accessibility-api@0.6.3: {} - dom-serializer@1.4.1: - dependencies: - domelementtype: 2.3.0 - domhandler: 4.3.1 - entities: 2.2.0 - dom-serializer@2.0.0: dependencies: domelementtype: 2.3.0 @@ -16035,20 +15540,10 @@ snapshots: dependencies: webidl-conversions: 7.0.0 - domhandler@4.3.1: - dependencies: - domelementtype: 2.3.0 - domhandler@5.0.3: dependencies: domelementtype: 2.3.0 - domutils@2.8.0: - dependencies: - dom-serializer: 1.4.1 - domelementtype: 2.3.0 - domhandler: 4.3.1 - domutils@3.1.0: dependencies: dom-serializer: 2.0.0 @@ -16107,14 +15602,8 @@ snapshots: dependencies: ansi-colors: 4.1.3 - entities@2.2.0: {} - - entities@3.0.1: {} - entities@4.5.0: {} - env-paths@2.2.1: {} - err-code@2.0.3: {} error-ex@1.3.2: @@ -16734,6 +16223,38 @@ snapshots: transitivePeerDependencies: - supports-color + express@5.1.0: + dependencies: + accepts: 2.0.0 + body-parser: 2.2.0 + content-disposition: 1.0.0 + content-type: 1.0.5 + cookie: 0.7.2 + cookie-signature: 1.2.1 + debug: 4.4.0 + encodeurl: 2.0.0 + escape-html: 1.0.3 + etag: 1.8.1 + finalhandler: 2.1.0 + fresh: 2.0.0 + http-errors: 2.0.0 + merge-descriptors: 2.0.0 + mime-types: 3.0.1 + on-finished: 2.4.1 + once: 1.4.0 + parseurl: 1.3.3 + proxy-addr: 2.0.7 + qs: 6.14.0 + range-parser: 1.2.1 + router: 2.2.0 + send: 1.2.0 + serve-static: 2.2.0 + statuses: 2.0.1 + type-is: 2.0.1 + vary: 1.1.2 + transitivePeerDependencies: + - supports-color + exsolve@1.0.4: {} extend@3.0.2: {} @@ -16812,6 +16333,17 @@ snapshots: transitivePeerDependencies: - supports-color + finalhandler@2.1.0: + dependencies: + debug: 4.4.0 + encodeurl: 2.0.0 + escape-html: 1.0.3 + on-finished: 2.4.1 + parseurl: 1.3.3 + statuses: 2.0.1 + transitivePeerDependencies: + - supports-color + find-up@4.1.0: dependencies: locate-path: 5.0.0 @@ -16868,6 +16400,8 @@ snapshots: fresh@0.5.2: {} + fresh@2.0.0: {} + fs-constants@1.0.0: {} fs-extra@11.2.0: @@ -17169,23 +16703,6 @@ snapshots: html-void-elements@3.0.0: {} - htmlnano@2.1.2(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5): - dependencies: - cosmiconfig: 9.0.0(typescript@5.4.5) - posthtml: 0.16.6 - optionalDependencies: - postcss: 8.5.3 - terser: 5.15.0 - transitivePeerDependencies: - - typescript - - htmlparser2@7.2.0: - dependencies: - domelementtype: 2.3.0 - domhandler: 4.3.1 - domutils: 2.8.0 - entities: 3.0.1 - htmlparser2@9.1.0: dependencies: domelementtype: 2.3.0 @@ -17373,8 +16890,6 @@ snapshots: is-hexadecimal@2.0.1: {} - is-json@2.0.1: {} - is-map@2.0.3: {} is-negative-zero@2.0.3: {} @@ -17403,6 +16918,8 @@ snapshots: is-potential-custom-element-name@1.0.1: {} + is-promise@4.0.0: {} + is-reference@3.0.2: dependencies: '@types/estree': 1.0.6 @@ -17847,8 +17364,7 @@ snapshots: jiti@1.21.0: {} - jiti@2.4.2: - optional: true + jiti@2.4.2: {} joi@17.12.3: dependencies: @@ -18339,6 +17855,8 @@ snapshots: media-typer@0.3.0: {} + media-typer@1.1.0: {} + meow@6.1.1: dependencies: '@types/minimist': 1.2.2 @@ -18355,6 +17873,8 @@ snapshots: merge-descriptors@1.0.3: {} + merge-descriptors@2.0.0: {} + merge-stream@2.0.0: {} merge2@1.4.1: {} @@ -18771,6 +18291,10 @@ snapshots: dependencies: mime-db: 1.52.0 + mime-types@3.0.1: + dependencies: + mime-db: 1.54.0 + mime@1.6.0: {} mime@2.6.0: {} @@ -18954,6 +18478,8 @@ snapshots: negotiator@0.6.4: {} + negotiator@1.0.0: {} + netmask@2.0.2: {} node-addon-api@6.1.0: {} @@ -19135,6 +18661,34 @@ snapshots: outvariant@1.4.3: {} + oxc-parser@0.64.0: + dependencies: + '@oxc-project/types': 0.64.0 + optionalDependencies: + '@oxc-parser/binding-darwin-arm64': 0.64.0 + '@oxc-parser/binding-darwin-x64': 0.64.0 + '@oxc-parser/binding-linux-arm-gnueabihf': 0.64.0 + '@oxc-parser/binding-linux-arm64-gnu': 0.64.0 + '@oxc-parser/binding-linux-arm64-musl': 0.64.0 + '@oxc-parser/binding-linux-x64-gnu': 0.64.0 + '@oxc-parser/binding-linux-x64-musl': 0.64.0 + '@oxc-parser/binding-wasm32-wasi': 0.64.0 + '@oxc-parser/binding-win32-arm64-msvc': 0.64.0 + '@oxc-parser/binding-win32-x64-msvc': 0.64.0 + + oxc-transform@0.64.0: + optionalDependencies: + '@oxc-transform/binding-darwin-arm64': 0.64.0 + '@oxc-transform/binding-darwin-x64': 0.64.0 + '@oxc-transform/binding-linux-arm-gnueabihf': 0.64.0 + '@oxc-transform/binding-linux-arm64-gnu': 0.64.0 + '@oxc-transform/binding-linux-arm64-musl': 0.64.0 + '@oxc-transform/binding-linux-x64-gnu': 0.64.0 + '@oxc-transform/binding-linux-x64-musl': 0.64.0 + '@oxc-transform/binding-wasm32-wasi': 0.64.0 + '@oxc-transform/binding-win32-arm64-msvc': 0.64.0 + '@oxc-transform/binding-win32-x64-msvc': 0.64.0 + p-filter@2.1.0: dependencies: p-map: 2.1.0 @@ -19183,35 +18737,65 @@ snapshots: pako@1.0.11: {} - parcel@2.14.1(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5): - dependencies: - '@parcel/config-default': 2.14.1(@parcel/core@2.14.1)(postcss@8.5.3)(terser@5.15.0)(typescript@5.4.5) - '@parcel/core': 2.14.1 - '@parcel/diagnostic': 2.14.1 - '@parcel/events': 2.14.1 - '@parcel/feature-flags': 2.14.1 - '@parcel/fs': 2.14.1(@parcel/core@2.14.1) - '@parcel/logger': 2.14.1 - '@parcel/package-manager': 2.14.1(@parcel/core@2.14.1) - '@parcel/reporter-cli': 2.14.1(@parcel/core@2.14.1) - '@parcel/reporter-dev-server': 2.14.1(@parcel/core@2.14.1) - '@parcel/reporter-tracer': 2.14.1(@parcel/core@2.14.1) - '@parcel/utils': 2.14.1 - chalk: 4.1.2 - commander: 12.1.0 - get-port: 4.2.0 + parcel-config-react-router-experimental@1.0.20(@parcel/core@2.15.0)(@react-router/dev@packages+react-router-dev)(react-dom@19.1.0(react@19.1.0))(react-router@packages+react-router)(react-server-dom-parcel@19.1.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react@19.1.0): + dependencies: + '@parcel/config-default': 2.15.0(@parcel/core@2.15.0) + parcel-resolver-react-router-experimental: 1.1.4(@parcel/core@2.15.0)(@react-router/dev@packages+react-router-dev)(react-dom@19.1.0(react@19.1.0))(react-router@packages+react-router)(react-server-dom-parcel@19.1.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react@19.1.0) + parcel-resolver-react-router-typegen-experimental: 1.1.2(@parcel/core@2.15.0)(@react-router/dev@packages+react-router-dev) + parcel-transformer-react-router-experimental: 1.1.2(@parcel/core@2.15.0)(react-dom@19.1.0(react@19.1.0))(react-router@packages+react-router)(react@19.1.0) transitivePeerDependencies: + - '@parcel/core' + - '@react-router/dev' - '@swc/helpers' - - cssnano - napi-wasm - - postcss - - purgecss - - relateurl - - srcset - - svgo - - terser - - typescript - - uncss + - react + - react-dom + - react-router + - react-server-dom-parcel + - supports-color + + parcel-resolver-react-router-experimental@1.1.4(@parcel/core@2.15.0)(@react-router/dev@packages+react-router-dev)(react-dom@19.1.0(react@19.1.0))(react-router@packages+react-router)(react-server-dom-parcel@19.1.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react@19.1.0): + dependencies: + '@mjackson/node-fetch-server': 0.6.1 + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@react-router/dev': link:packages/react-router-dev + express: 5.1.0 + jiti: 2.4.2 + react: 19.1.0 + react-dom: 19.1.0(react@19.1.0) + react-router: link:packages/react-router + react-server-dom-parcel: 19.1.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + - supports-color + + parcel-resolver-react-router-typegen-experimental@1.1.2(@parcel/core@2.15.0)(@react-router/dev@packages+react-router-dev): + dependencies: + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + '@react-router/dev': link:packages/react-router-dev + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + + parcel-transformer-react-router-experimental@1.1.2(@parcel/core@2.15.0)(react-dom@19.1.0(react@19.1.0))(react-router@packages+react-router)(react@19.1.0): + dependencies: + '@babel/core': 7.27.4 + '@babel/generator': 7.27.5 + '@babel/parser': 7.27.5 + '@babel/traverse': 7.27.4 + '@babel/types': 7.27.6 + '@parcel/plugin': 2.15.0(@parcel/core@2.15.0) + babel-dead-code-elimination: 1.0.10 + oxc-parser: 0.64.0 + oxc-transform: 0.64.0 + react: 19.1.0 + react-dom: 19.1.0(react@19.1.0) + react-router: link:packages/react-router + transitivePeerDependencies: + - '@parcel/core' + - napi-wasm + - supports-color parcel@2.15.0: dependencies: @@ -19295,6 +18879,8 @@ snapshots: path-to-regexp@6.3.0: {} + path-to-regexp@8.2.0: {} + path-type@4.0.0: {} pathe@1.1.2: {} @@ -19391,23 +18977,6 @@ snapshots: picocolors: 1.1.1 source-map-js: 1.2.1 - posthtml-parser@0.11.0: - dependencies: - htmlparser2: 7.2.0 - - posthtml-parser@0.12.1: - dependencies: - htmlparser2: 9.1.0 - - posthtml-render@3.0.0: - dependencies: - is-json: 2.0.1 - - posthtml@0.16.6: - dependencies: - posthtml-parser: 0.11.0 - posthtml-render: 3.0.0 - preferred-pm@3.0.3: dependencies: find-up: 5.0.0 @@ -19542,6 +19111,13 @@ snapshots: iconv-lite: 0.4.24 unpipe: 1.0.0 + raw-body@3.0.0: + dependencies: + bytes: 3.1.2 + http-errors: 2.0.0 + iconv-lite: 0.6.3 + unpipe: 1.0.0 + react-dom@19.1.0(react@19.1.0): dependencies: react: 19.1.0 @@ -19712,6 +19288,14 @@ snapshots: mdast-util-to-markdown: 1.5.0 unified: 10.1.2 + remix-utils@8.7.0(react-router@packages+react-router)(react@19.1.0)(zod@3.24.2): + dependencies: + type-fest: 4.40.1 + optionalDependencies: + react: 19.1.0 + react-router: link:packages/react-router + zod: 3.24.2 + require-directory@2.1.1: {} require-like@0.1.2: {} @@ -19909,9 +19493,17 @@ snapshots: '@rollup/rollup-win32-x64-msvc': 4.43.0 fsevents: 2.3.3 - rrweb-cssom@0.6.0: {} + router@2.2.0: + dependencies: + debug: 4.4.0 + depd: 2.0.0 + is-promise: 4.0.0 + parseurl: 1.3.3 + path-to-regexp: 8.2.0 + transitivePeerDependencies: + - supports-color - rsc-html-stream@0.0.4: {} + rrweb-cssom@0.6.0: {} rsc-html-stream@0.0.6: {} @@ -19978,6 +19570,22 @@ snapshots: transitivePeerDependencies: - supports-color + send@1.2.0: + dependencies: + debug: 4.4.0 + encodeurl: 2.0.0 + escape-html: 1.0.3 + etag: 1.8.1 + fresh: 2.0.0 + http-errors: 2.0.0 + mime-types: 3.0.1 + ms: 2.1.3 + on-finished: 2.4.1 + range-parser: 1.2.1 + statuses: 2.0.1 + transitivePeerDependencies: + - supports-color + serialize-javascript@6.0.2: dependencies: randombytes: 2.1.0 @@ -19991,6 +19599,15 @@ snapshots: transitivePeerDependencies: - supports-color + serve-static@2.2.0: + dependencies: + encodeurl: 2.0.0 + escape-html: 1.0.3 + parseurl: 1.3.3 + send: 1.2.0 + transitivePeerDependencies: + - supports-color + set-blocking@2.0.0: {} set-cookie-parser@2.6.0: {} @@ -20199,8 +19816,6 @@ snapshots: sprintf-js@1.1.3: {} - srcset@4.0.0: {} - stack-utils@2.0.6: dependencies: escape-string-regexp: 2.0.0 @@ -20594,6 +20209,12 @@ snapshots: media-typer: 0.3.0 mime-types: 2.1.35 + type-is@2.0.1: + dependencies: + content-type: 1.0.5 + media-typer: 1.1.0 + mime-types: 3.0.1 + typed-array-buffer@1.0.2: dependencies: call-bind: 1.0.7 From b98f9b16e4ac3a6f40f7c85f45ef17bef99569d3 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Sat, 14 Jun 2025 09:49:57 -0700 Subject: [PATCH 134/143] fix: route action body is no-longer used (#13773) fix: only do expensive buffering if formData --- integration/rsc/rsc-test.ts | 49 ++++++++++++++----- packages/react-router/lib/rsc/server.rsc.ts | 47 +++++++++--------- playground/rsc-parcel/src/entry.browser.tsx | 10 ++++ .../src/routes/fetcher/fetcher.client.tsx | 13 +++-- .../src/routes/home/home.actions.ts | 7 +++ .../src/routes/home/home.client.tsx | 6 +++ .../src/routes/resource/resource.ts | 5 +- 7 files changed, 98 insertions(+), 39 deletions(-) create mode 100644 playground/rsc-parcel/src/routes/home/home.actions.ts diff --git a/integration/rsc/rsc-test.ts b/integration/rsc/rsc-test.ts index df0de52e06..5233aa1d3b 100644 --- a/integration/rsc/rsc-test.ts +++ b/integration/rsc/rsc-test.ts @@ -461,7 +461,10 @@ implementations.forEach((implementation) => { validateRSCHtml(await page.content()); }); - test("Supports resource routes as URL and fetchers", async ({ page }) => { + test("Supports resource routes as URL and fetchers", async ({ + page, + request, + }) => { let port = await getPort(); stop = await setupRscTest({ implementation, @@ -481,19 +484,24 @@ implementations.forEach((implementation) => { index: true, lazy: () => import("./routes/home"), }, - { - id: "resource", - path: "resource", - lazy: () => import("./routes/resource"), - }, ], }, + { + id: "resource", + path: "resource", + lazy: () => import("./routes/resource"), + }, ] satisfies ServerRouteObject[]; `, "src/routes/resource.tsx": js` export function loader() { + return Response.json({ message: "Hello from resource route!" }); + } + + export async function action({ request }) { return { message: "Hello from resource route!", + echo: await request.text(), }; } `, @@ -506,7 +514,7 @@ implementations.forEach((implementation) => { const fetcher = useFetcher(); const loadResource = () => { - fetcher.load("/resource"); + fetcher.submit({ hello: "world" }, { method: "post", action: "/resource" }); }; return ( @@ -532,19 +540,38 @@ implementations.forEach((implementation) => { `, }, }); - const response = await page.goto(`http://localhost:${port}/resource`); - expect(response?.status()).toBe(200); - expect(await response?.json()).toEqual({ + const getResponse = await request.get( + `http://localhost:${port}/resource` + ); + expect(getResponse?.status()).toBe(200); + expect(await getResponse?.json()).toEqual({ message: "Hello from resource route!", }); + const postResponse = await request.post( + `http://localhost:${port}/resource`, + { + data: { hello: "world" }, + } + ); + expect(postResponse?.status()).toBe(200); + expect(await postResponse?.json()).toEqual({ + message: "Hello from resource route!", + echo: JSON.stringify({ hello: "world" }), + }); + await page.goto(`http://localhost:${port}/`); await page.click("button"); await page.waitForSelector("[data-testid=resource-data]"); expect( await page.locator("[data-testid=resource-data]").textContent() - ).toBe(JSON.stringify({ message: "Hello from resource route!" })); + ).toBe( + JSON.stringify({ + message: "Hello from resource route!", + echo: "hello=world", + }) + ); }); }); diff --git a/packages/react-router/lib/rsc/server.rsc.ts b/packages/react-router/lib/rsc/server.rsc.ts index cfd15351a6..049afaa50a 100644 --- a/packages/react-router/lib/rsc/server.rsc.ts +++ b/packages/react-router/lib/rsc/server.rsc.ts @@ -298,6 +298,9 @@ async function processServerAction( signal: request.signal, }); + const isFormRequest = canDecodeWithFormData( + request.headers.get("Content-Type") + ); const actionId = request.headers.get("rsc-action-id"); if (actionId) { if (!decodeCallServer) { @@ -306,7 +309,7 @@ async function processServerAction( ); } - const reply = canDecodeWithFormData(request.headers.get("Content-Type")) + const reply = isFormRequest ? await request.formData() : await request.text(); const serverAction = await decodeCallServer(actionId, reply); @@ -326,32 +329,28 @@ async function processServerAction( actionResult, revalidationRequest: getRevalidationRequest(), }; - } - - const clone = request.clone(); - const formData = await request.formData(); - if (Array.from(formData.keys()).some((k) => k.startsWith("$ACTION_"))) { - if (!decodeFormAction) { - throw new Error( - "Cannot handle form actions without a decodeFormAction function" - ); - } - const action = await decodeFormAction(formData); - try { - await action(); - } catch (error) { - if (isResponse(error)) { - return error; + } else if (isFormRequest) { + const formData = await request.clone().formData(); + if (Array.from(formData.keys()).some((k) => k.startsWith("$ACTION_"))) { + if (!decodeFormAction) { + throw new Error( + "Cannot handle form actions without a decodeFormAction function" + ); } - onError?.(error); + const action = await decodeFormAction(formData); + try { + await action(); + } catch (error) { + if (isResponse(error)) { + return error; + } + onError?.(error); + } + return { + revalidationRequest: getRevalidationRequest(), + }; } - return { - revalidationRequest: getRevalidationRequest(), - }; } - return { - revalidationRequest: clone, - }; } async function generateResourceResponse( diff --git a/playground/rsc-parcel/src/entry.browser.tsx b/playground/rsc-parcel/src/entry.browser.tsx index f8a39fb5a7..d772ba1aa9 100644 --- a/playground/rsc-parcel/src/entry.browser.tsx +++ b/playground/rsc-parcel/src/entry.browser.tsx @@ -39,3 +39,13 @@ createFromReadableStream(getServerStream(), { assets: "manifest" }).then( }); } ); + +if (process.env.NODE_ENV !== "production") { + const ogError = console.error.bind(console); + console.error = (...args) => { + if (args[1] === Symbol.for("react-router.redirect")) { + return; + } + ogError(...args); + }; +} diff --git a/playground/rsc-parcel/src/routes/fetcher/fetcher.client.tsx b/playground/rsc-parcel/src/routes/fetcher/fetcher.client.tsx index 2c48ea8963..dcfdcbc33d 100644 --- a/playground/rsc-parcel/src/routes/fetcher/fetcher.client.tsx +++ b/playground/rsc-parcel/src/routes/fetcher/fetcher.client.tsx @@ -1,14 +1,21 @@ "use client"; import { useFetcher } from "react-router"; -import type { loader } from "../resource/resource"; +import type { action } from "../resource/resource"; export default function FetcherRoute() { - const fetcher = useFetcher(); + const fetcher = useFetcher(); return (
    - 
    {JSON.stringify(fetcher.data, null, 2)}
    diff --git a/playground/rsc-parcel/src/routes/home/home.actions.ts b/playground/rsc-parcel/src/routes/home/home.actions.ts new file mode 100644 index 0000000000..1f3d45d715 --- /dev/null +++ b/playground/rsc-parcel/src/routes/home/home.actions.ts @@ -0,0 +1,7 @@ +"use server"; + +import { redirect } from "react-router/rsc"; + +export function redirectAction(formData: FormData) { + throw redirect("/?redirected=true"); +} diff --git a/playground/rsc-parcel/src/routes/home/home.client.tsx b/playground/rsc-parcel/src/routes/home/home.client.tsx index 11277d9199..0b83ab1fef 100644 --- a/playground/rsc-parcel/src/routes/home/home.client.tsx +++ b/playground/rsc-parcel/src/routes/home/home.client.tsx @@ -5,6 +5,7 @@ import { type ClientLoaderFunctionArgs, useLoaderData } from "react-router"; import { Counter } from "../../counter"; import type { loader } from "./home"; +import { redirectAction } from "./home.actions"; export async function clientLoader({ serverLoader }: ClientLoaderFunctionArgs) { const res = await serverLoader(); @@ -23,6 +24,11 @@ export default function HomeRoute() {

    {message}

    Did client loader run? {client ? "Yes" : "No"}

    +
    + +
    ); } diff --git a/playground/rsc-parcel/src/routes/resource/resource.ts b/playground/rsc-parcel/src/routes/resource/resource.ts index 188f306ca6..6d52c79aa6 100644 --- a/playground/rsc-parcel/src/routes/resource/resource.ts +++ b/playground/rsc-parcel/src/routes/resource/resource.ts @@ -1,6 +1,9 @@ -export function loader() { +import type { ActionFunctionArgs } from "react-router"; + +export async function action({ request }: ActionFunctionArgs) { return { timestamp: Date.now(), message: "Hello from resource route!", + echo: await request.text(), }; } From b7958c76028c76a13a02951504e1e915362ece3a Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Mon, 16 Jun 2025 10:11:07 +1000 Subject: [PATCH 135/143] test: fix rsc-parcel-framework test fixture start script --- integration/helpers/rsc-parcel-framework/start.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/integration/helpers/rsc-parcel-framework/start.js b/integration/helpers/rsc-parcel-framework/start.js index 10a6a8f386..0abc11d55a 100644 --- a/integration/helpers/rsc-parcel-framework/start.js +++ b/integration/helpers/rsc-parcel-framework/start.js @@ -1,11 +1,12 @@ const { createRequestListener } = require("@mjackson/node-fetch-server"); const express = require("express"); -const reactRouterRequestHandler = require("./build/server/index.js").default; +const reactRouterRequestHandler = + require("./build/server/index.js").requestHandler; const app = express(); app.use(express.static("public")); -app.use("/client", express.static("dist/client")); +app.use("/client", express.static("build/client")); app.get("/.well-known/appspecific/com.chrome.devtools.json", (_, res) => { res.status(404); From 95d003492b71f5b107af27a117ace40d1e2f2cec Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Mon, 16 Jun 2025 11:35:59 +1000 Subject: [PATCH 136/143] add public dir to rsc-parcel-framework test --- integration/helpers/create-fixture.ts | 1 + .../rsc-parcel-framework/public/favicon.ico | Bin 0 -> 15086 bytes 2 files changed, 1 insertion(+) create mode 100644 integration/helpers/rsc-parcel-framework/public/favicon.ico diff --git a/integration/helpers/create-fixture.ts b/integration/helpers/create-fixture.ts index 85fbe6fc26..89d0d50d5c 100644 --- a/integration/helpers/create-fixture.ts +++ b/integration/helpers/create-fixture.ts @@ -337,6 +337,7 @@ export async function createAppFixture(fixture: Fixture, mode?: ServerMode) { return new Promise(async (accept) => { let port = await getPort(); let app = express(); + app.use(express.static(path.join(fixture.projectDir, "public"))); app.use( "/client", express.static(path.join(fixture.projectDir, "build/client")) diff --git a/integration/helpers/rsc-parcel-framework/public/favicon.ico b/integration/helpers/rsc-parcel-framework/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..5dbdfcddcb14182535f6d32d1c900681321b1aa3 GIT binary patch literal 15086 zcmeI33v3ic7{|AFEmuJ-;v>ep_G*NPi6KM`qNryCe1PIJ8siIN1WZ(7qVa)RVtmC% z)Ch?tN+afMKm;5@rvorJk zcXnoOc4q51HBQnQH_jn!cAg&XI1?PlX>Kl^k8qq0;zkha`kY$Fxt#=KNJAE9CMdpW zqr4#g8`nTw191(+H4xW8Tmyru2I^3=J1G3emPxkPXA=3{vvuvse_WWSshqaqls^-m zgB7q8&Vk*aYRe?sn$n53dGH#%3y%^vxv{pL*-h0Z4bmb_(k6{FL7HWIz(V*HT#IcS z-wE{)+0x1U!RUPt3gB97%p}@oHxF4|6S*+Yw=_tLtxZ~`S=z6J?O^AfU>7qOX`JNBbV&8+bO0%@fhQitKIJ^O^ zpgIa__qD_y07t@DFlBJ)8SP_#^j{6jpaXt{U%=dx!qu=4u7^21lWEYHPPY5U3TcoQ zX_7W+lvZi>TapNk_X>k-KO%MC9iZp>1E`N34gHKd9tK&){jq2~7OsJ>!G0FzxQFw6G zm&Vb(2#-T|rM|n3>uAsG_hnbvUKFf3#ay@u4uTzia~NY%XgCHfx4^To4BDU@)HlV? z@EN=g^ymETa1sQK{kRwyE4Ax8?wT&GvaG@ASO}{&a17&^v`y z!oPdiSiia^oov(Z)QhG2&|FgE{M9_4hJROGbnj>#$~ZF$-G^|zPj*QApltKe?;u;uKHJ~-V!=VLkg7Kgct)l7u39f@%VG8e3f$N-B zAu3a4%ZGf)r+jPAYCSLt73m_J3}p>}6Tx0j(wg4vvKhP!DzgiWANiE;Ppvp}P2W@m z-VbYn+NXFF?6ngef5CfY6ZwKnWvNV4z6s^~yMXw2i5mv}jC$6$46g?G|CPAu{W5qF zDobS=zb2ILX9D827g*NtGe5w;>frjanY{f)hrBP_2ehBt1?`~ypvg_Ot4x1V+43P@Ve8>qd)9NX_jWdLo`Zfy zoeam9)@Dpym{4m@+LNxXBPjPKA7{3a&H+~xQvr>C_A;7=JrfK~$M2pCh>|xLz>W6SCs4qC|#V`)# z)0C|?$o>jzh<|-cpf

    K7osU{Xp5PG4-K+L2G=)c3f&}H&M3wo7TlO_UJjQ-Oq&_ zjAc9=nNIYz{c3zxOiS5UfcE1}8#iI4@uy;$Q7>}u`j+OU0N<*Ezx$k{x_27+{s2Eg z`^=rhtIzCm!_UcJ?Db~Lh-=_))PT3{Q0{Mwdq;0>ZL%l3+;B&4!&xm#%HYAK|;b456Iv&&f$VQHf` z>$*K9w8T+paVwc7fLfMlhQ4)*zL_SG{~v4QR;IuX-(oRtYAhWOlh`NLoX0k$RUYMi z2Y!bqpdN}wz8q`-%>&Le@q|jFw92ErW-hma-le?S z-@OZt2EEUm4wLsuEMkt4zlyy29_3S50JAcQHTtgTC{P~%-mvCTzrjXOc|{}N`Cz`W zSj7CrXfa7lcsU0J(0uSX6G`54t^7}+OLM0n(|g4waOQ}bd3%!XLh?NX9|8G_|06Ie zD5F1)w5I~!et7lA{G^;uf7aqT`KE&2qx9|~O;s6t!gb`+zVLJyT2T)l*8l(j literal 0 HcmV?d00001 From cf289a88ec63124868afb77d95ebd98e5b6179a2 Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Mon, 16 Jun 2025 10:24:52 +1000 Subject: [PATCH 137/143] add --no-cache to integration parcel build --- integration/helpers/create-fixture.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration/helpers/create-fixture.ts b/integration/helpers/create-fixture.ts index 89d0d50d5c..f935390bd8 100644 --- a/integration/helpers/create-fixture.ts +++ b/integration/helpers/create-fixture.ts @@ -461,7 +461,7 @@ function parcelBuild( ) { let parcelBin = "node_modules/parcel/lib/bin.js"; - let buildArgs: string[] = [parcelBin, "build"]; + let buildArgs: string[] = [parcelBin, "build", "--no-cache"]; let buildSpawn = spawnSync("node", buildArgs, { cwd: projectDir, From 91dc3da6e2f973aa6bade6f44d2fd29f48b9ddd8 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Mon, 16 Jun 2025 11:47:44 -0700 Subject: [PATCH 138/143] make tests pass on windows for now (#13802) chore: update CI node versions chore: update windows OS chore: update nvmrc chore: add --no-cache to integration parcel build chore: add public dir to rsc-parcel-framework test chore: update flaky tests --------- Co-authored-by: Mark Dalgleish --- .github/workflows/integration-full.yml | 6 +- .github/workflows/integration-pr-ubuntu.yml | 2 +- .../integration-pr-windows-macos.yml | 10 +- .github/workflows/shared-integration.yml | 2 +- .github/workflows/test.yml | 2 +- .nvmrc | 2 +- integration/fetcher-test.ts | 32 ++-- integration/helpers/vite.ts | 3 +- integration/playwright.config.ts | 3 +- integration/revalidate-test.ts | 152 +++++++++++++----- integration/rsc/rsc-test.ts | 91 ++++++----- 11 files changed, 191 insertions(+), 114 deletions(-) diff --git a/.github/workflows/integration-full.yml b/.github/workflows/integration-full.yml index fd2f79bfa9..205cc2b7f9 100644 --- a/.github/workflows/integration-full.yml +++ b/.github/workflows/integration-full.yml @@ -31,7 +31,7 @@ jobs: uses: ./.github/workflows/shared-integration.yml with: os: "ubuntu-latest" - node_version: "[20, 22]" + node_version: "[22, 24]" browser: '["chromium", "firefox"]' integration-windows: @@ -40,7 +40,7 @@ jobs: uses: ./.github/workflows/shared-integration.yml with: os: "windows-latest" - node_version: "[20, 22]" + node_version: "[22, 24]" browser: '["msedge"]' integration-macos: @@ -49,5 +49,5 @@ jobs: uses: ./.github/workflows/shared-integration.yml with: os: "macos-latest" - node_version: "[20, 22]" + node_version: "[22, 24]" browser: '["webkit"]' diff --git a/.github/workflows/integration-pr-ubuntu.yml b/.github/workflows/integration-pr-ubuntu.yml index ac25713e08..056f0d1e46 100644 --- a/.github/workflows/integration-pr-ubuntu.yml +++ b/.github/workflows/integration-pr-ubuntu.yml @@ -31,5 +31,5 @@ jobs: uses: ./.github/workflows/shared-integration.yml with: os: "ubuntu-latest" - node_version: "[22]" + node_version: "[24]" browser: '["chromium"]' diff --git a/.github/workflows/integration-pr-windows-macos.yml b/.github/workflows/integration-pr-windows-macos.yml index a36aef144d..4423d376b4 100644 --- a/.github/workflows/integration-pr-windows-macos.yml +++ b/.github/workflows/integration-pr-windows-macos.yml @@ -21,7 +21,7 @@ jobs: uses: ./.github/workflows/shared-integration.yml with: os: "ubuntu-latest" - node_version: "[22]" + node_version: "[24]" browser: '["firefox"]' integration-msedge: @@ -29,10 +29,10 @@ jobs: if: github.repository == 'remix-run/react-router' uses: ./.github/workflows/shared-integration.yml with: - os: "windows-latest" - node_version: "[22]" + os: "windows-2025" + node_version: "[24]" browser: '["msedge"]' - timeout: 60 + timeout: 120 integration-webkit: name: "👀 Integration Test" @@ -40,5 +40,5 @@ jobs: uses: ./.github/workflows/shared-integration.yml with: os: "macos-latest" - node_version: "[22]" + node_version: "[24]" browser: '["webkit"]' diff --git a/.github/workflows/shared-integration.yml b/.github/workflows/shared-integration.yml index e7adb0dd47..4dd3df2cfd 100644 --- a/.github/workflows/shared-integration.yml +++ b/.github/workflows/shared-integration.yml @@ -9,7 +9,7 @@ on: node_version: required: true # this is limited to string | boolean | number (https://github.community/t/can-action-inputs-be-arrays/16457) - # but we want to pass an array (node_version: "[20, 22]"), + # but we want to pass an array (node_version: "[22, 24]"), # so we'll need to manually stringify it for now type: string browser: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index af709fdaaa..5eda492b5f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,8 +26,8 @@ jobs: fail-fast: false matrix: node: - - 20 - 22 + - 24 runs-on: ubuntu-latest diff --git a/.nvmrc b/.nvmrc index 2edeafb09d..8fdd954df9 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20 \ No newline at end of file +22 \ No newline at end of file diff --git a/integration/fetcher-test.ts b/integration/fetcher-test.ts index f021ea36f3..f0d36a9110 100644 --- a/integration/fetcher-test.ts +++ b/integration/fetcher-test.ts @@ -247,7 +247,7 @@ test.describe("useFetcher", () => { // a 

     but Edge puts it in some weird code editor markup:
       // 
       //   
-      expect(await app.getHtml()).toContain(LUNCH);
+      await page.getByText(LUNCH);
     });
 
     test("Form can hit an action", async ({ page }) => {
@@ -264,7 +264,7 @@ test.describe("useFetcher", () => {
       // a 
     but Edge puts it in some weird code editor markup:
       // 
       //   
-      expect(await app.getHtml()).toContain(CHEESESTEAK);
+      await page.getByText(CHEESESTEAK);
     });
   });
 
@@ -288,9 +288,7 @@ test.describe("useFetcher", () => {
     await page.fill("#fetcher-input", "input value");
     await app.clickElement("#fetcher-submit-json");
     await page.waitForSelector(`#fetcher-idle`);
-    expect(await app.getHtml()).toMatch(
-      'ACTION (application/json) input value"'
-    );
+    await page.getByText('ACTION (application/json) input value"');
   });
 
   test("submit can hit an action with null json", async ({ page }) => {
@@ -299,7 +297,7 @@ test.describe("useFetcher", () => {
     await app.clickElement("#fetcher-submit-json-null");
     await new Promise((r) => setTimeout(r, 1000));
     await page.waitForSelector(`#fetcher-idle`);
-    expect(await app.getHtml()).toMatch('ACTION (application/json) null"');
+    await page.getByText('ACTION (application/json) null"');
   });
 
   test("submit can hit an action with text", async ({ page }) => {
@@ -308,9 +306,7 @@ test.describe("useFetcher", () => {
     await page.fill("#fetcher-input", "input value");
     await app.clickElement("#fetcher-submit-text");
     await page.waitForSelector(`#fetcher-idle`);
-    expect(await app.getHtml()).toMatch(
-      'ACTION (text/plain;charset=UTF-8) input value"'
-    );
+    await page.getByText('ACTION (text/plain;charset=UTF-8) input value"');
   });
 
   test("submit can hit an action with empty text", async ({ page }) => {
@@ -319,7 +315,7 @@ test.describe("useFetcher", () => {
     await app.clickElement("#fetcher-submit-text-empty");
     await new Promise((r) => setTimeout(r, 1000));
     await page.waitForSelector(`#fetcher-idle`);
-    expect(await app.getHtml()).toMatch('ACTION (text/plain;charset=UTF-8) "');
+    await page.getByText('ACTION (text/plain;charset=UTF-8) "');
   });
 
   test("submit can hit an action only route", async ({ page }) => {
@@ -360,21 +356,19 @@ test.describe("useFetcher", () => {
     let app = new PlaywrightFixture(appFixture, page);
 
     await app.goto("/fetcher-echo", true);
-    expect(await app.getHtml("pre")).toMatch(
-      JSON.stringify(["idle/undefined"])
-    );
+    await page.getByText(JSON.stringify(["idle/undefined"]));
 
     await page.fill("#fetcher-input", "1");
     await app.clickElement("#fetcher-load");
     await page.waitForSelector("#fetcher-idle");
-    expect(await app.getHtml("pre")).toMatch(
+    await page.getByText(
       JSON.stringify(["idle/undefined", "loading/undefined", "idle/LOADER 1"])
     );
 
     await page.fill("#fetcher-input", "2");
     await app.clickElement("#fetcher-load");
     await page.waitForSelector("#fetcher-idle");
-    expect(await app.getHtml("pre")).toMatch(
+    await page.getByText(
       JSON.stringify([
         "idle/undefined",
         "loading/undefined",
@@ -391,14 +385,12 @@ test.describe("useFetcher", () => {
     let app = new PlaywrightFixture(appFixture, page);
 
     await app.goto("/fetcher-echo", true);
-    expect(await app.getHtml("pre")).toMatch(
-      JSON.stringify(["idle/undefined"])
-    );
+    await page.getByText(JSON.stringify(["idle/undefined"]));
 
     await page.fill("#fetcher-input", "1");
     await app.clickElement("#fetcher-submit");
     await page.waitForSelector("#fetcher-idle");
-    expect(await app.getHtml("pre")).toMatch(
+    await page.getByText(
       JSON.stringify([
         "idle/undefined",
         "submitting/undefined",
@@ -410,7 +402,7 @@ test.describe("useFetcher", () => {
     await page.fill("#fetcher-input", "2");
     await app.clickElement("#fetcher-submit");
     await page.waitForSelector("#fetcher-idle");
-    expect(await app.getHtml("pre")).toMatch(
+    await page.getByText(
       JSON.stringify([
         "idle/undefined",
         "submitting/undefined",
diff --git a/integration/helpers/vite.ts b/integration/helpers/vite.ts
index 707b323d1b..f30f6b699c 100644
--- a/integration/helpers/vite.ts
+++ b/integration/helpers/vite.ts
@@ -1,4 +1,5 @@
-import { spawn, spawnSync, type ChildProcess } from "node:child_process";
+import type { ChildProcess } from "node:child_process";
+import { sync as spawnSync, spawn } from "cross-spawn";
 import { cp, mkdir, readFile, writeFile } from "node:fs/promises";
 import { createRequire } from "node:module";
 import { platform } from "node:os";
diff --git a/integration/playwright.config.ts b/integration/playwright.config.ts
index da6159be6b..965aacd57d 100644
--- a/integration/playwright.config.ts
+++ b/integration/playwright.config.ts
@@ -18,7 +18,8 @@ const config: PlaywrightTestConfig = {
   },
   /* Maximum time one test can run for. */
   timeout: isWindows ? 60_000 : 30_000,
-  fullyParallel: true,
+  fullyParallel: !(isWindows && process.env.CI),
+  workers: isWindows && process.env.CI ? 1 : undefined,
   expect: {
     /* Maximum time expect() should wait for the condition to be met. */
     timeout: isWindows ? 10_000 : 5_000,
diff --git a/integration/revalidate-test.ts b/integration/revalidate-test.ts
index b14c73ff5d..5ccdfa79b8 100644
--- a/integration/revalidate-test.ts
+++ b/integration/revalidate-test.ts
@@ -77,7 +77,7 @@ test.describe("Revalidation", () => {
                 let data = useLoaderData();
                 return (
                   <>
-                    
    {'Value:' + data.value}
    
+                    
    {'Value:' + data.value}
    
                     
                   
                 );
@@ -122,7 +122,7 @@ test.describe("Revalidation", () => {
                 let revalidator = useRevalidator();
                 return (
                   <>
-                    
    {'Value:' + data.value}
    
+                    
    {'Value:' + data.value}
    
                     
    
                       
                       
@@ -168,37 +168,59 @@ test.describe("Revalidation", () => {
     // Should call parent (first load)
     await app.clickLink("/parent");
     await page.waitForSelector("#idle");
-    expect(await app.getHtml("#parent-data")).toMatch("Value:1");
+    await expect(
+      page.getByTestId("parent-data").filter({ hasText: "Value:1" })
+    ).toBeAttached();
 
     // Should call child (first load) but not parent (no param)
     await app.clickLink("/parent/child");
     await page.waitForSelector("#idle");
-    expect(await app.getHtml("#parent-data")).toMatch("Value:1");
-    expect(await app.getHtml("#child-data")).toMatch("Value:1");
+    await expect(
+      page.getByTestId("parent-data").filter({ hasText: "Value:1" })
+    ).toBeAttached();
+    await expect(
+      page.getByTestId("child-data").filter({ hasText: "Value:1" })
+    ).toBeAttached();
 
     // Should call neither
     await app.clickLink("/parent/child");
     await page.waitForSelector("#idle");
-    expect(await app.getHtml("#parent-data")).toMatch("Value:1");
-    expect(await app.getHtml("#child-data")).toMatch("Value:1");
+    await expect(
+      page.getByTestId("parent-data").filter({ hasText: "Value:1" })
+    ).toBeAttached();
+    await expect(
+      page.getByTestId("child-data").filter({ hasText: "Value:1" })
+    ).toBeAttached();
 
     // Should call both
     await app.clickLink("/parent/child?revalidate=parent,child");
     await page.waitForSelector("#idle");
-    expect(await app.getHtml("#parent-data")).toMatch("Value:2");
-    expect(await app.getHtml("#child-data")).toMatch("Value:2");
+    await expect(
+      page.getByTestId("parent-data").filter({ hasText: "Value:2" })
+    ).toBeAttached();
+    await expect(
+      page.getByTestId("child-data").filter({ hasText: "Value:2" })
+    ).toBeAttached();
 
     // Should call parent only
     await app.clickLink("/parent/child?revalidate=parent");
     await page.waitForSelector("#idle");
-    expect(await app.getHtml("#parent-data")).toMatch("Value:3");
-    expect(await app.getHtml("#child-data")).toMatch("Value:2");
+    await expect(
+      page.getByTestId("parent-data").filter({ hasText: "Value:3" })
+    ).toBeAttached();
+    await expect(
+      page.getByTestId("child-data").filter({ hasText: "Value:2" })
+    ).toBeAttached();
 
     // Should call child only
     await app.clickLink("/parent/child?revalidate=child");
     await page.waitForSelector("#idle");
-    expect(await app.getHtml("#parent-data")).toMatch("Value:3");
-    expect(await app.getHtml("#child-data")).toMatch("Value:3");
+    await expect(
+      page.getByTestId("parent-data").filter({ hasText: "Value:3" })
+    ).toBeAttached();
+    await expect(
+      page.getByTestId("child-data").filter({ hasText: "Value:3" })
+    ).toBeAttached();
   });
 
   test("Revalidates according to shouldRevalidate (submission navigations)", async ({
@@ -210,32 +232,52 @@ test.describe("Revalidation", () => {
     // Should call both (first load)
     await app.clickLink("/parent/child");
     await page.waitForSelector("#idle");
-    expect(await app.getHtml("#parent-data")).toMatch("Value:1");
-    expect(await app.getHtml("#child-data")).toMatch("Value:1");
+    await expect(
+      page.getByTestId("parent-data").filter({ hasText: "Value:1" })
+    ).toBeAttached();
+    await expect(
+      page.getByTestId("child-data").filter({ hasText: "Value:1" })
+    ).toBeAttached();
 
     // Should call neither
     await app.clickElement("#submit-neither");
     await page.waitForSelector("#idle");
-    expect(await app.getHtml("#parent-data")).toMatch("Value:1");
-    expect(await app.getHtml("#child-data")).toMatch("Value:1");
+    await expect(
+      page.getByTestId("parent-data").filter({ hasText: "Value:1" })
+    ).toBeAttached();
+    await expect(
+      page.getByTestId("child-data").filter({ hasText: "Value:1" })
+    ).toBeAttached();
 
     // Should call both
     await app.clickElement("#submit-both");
     await page.waitForSelector("#idle");
-    expect(await app.getHtml("#parent-data")).toMatch("Value:2");
-    expect(await app.getHtml("#child-data")).toMatch("Value:2");
+    await expect(
+      page.getByTestId("parent-data").filter({ hasText: "Value:2" })
+    ).toBeAttached();
+    await expect(
+      page.getByTestId("child-data").filter({ hasText: "Value:2" })
+    ).toBeAttached();
 
     // Should call parent only
     await app.clickElement("#submit-parent");
     await page.waitForSelector("#idle");
-    expect(await app.getHtml("#parent-data")).toMatch("Value:3");
-    expect(await app.getHtml("#child-data")).toMatch("Value:2");
+    await expect(
+      page.getByTestId("parent-data").filter({ hasText: "Value:3" })
+    ).toBeAttached();
+    await expect(
+      page.getByTestId("child-data").filter({ hasText: "Value:2" })
+    ).toBeAttached();
 
     // Should call child only
     await app.clickElement("#submit-child");
     await page.waitForSelector("#idle");
-    expect(await app.getHtml("#parent-data")).toMatch("Value:3");
-    expect(await app.getHtml("#child-data")).toMatch("Value:3");
+    await expect(
+      page.getByTestId("parent-data").filter({ hasText: "Value:3" })
+    ).toBeAttached();
+    await expect(
+      page.getByTestId("child-data").filter({ hasText: "Value:3" })
+    ).toBeAttached();
   });
 
   test("Revalidates on demand with useRevalidator", async ({ page }) => {
@@ -245,49 +287,81 @@ test.describe("Revalidation", () => {
     // Should call both (first load)
     await app.clickLink("/parent/child");
     await page.waitForSelector("#idle");
-    expect(await app.getHtml("#parent-data")).toMatch("Value:1");
-    expect(await app.getHtml("#child-data")).toMatch("Value:1");
+    await expect(
+      page.getByTestId("parent-data").filter({ hasText: "Value:1" })
+    ).toBeAttached();
+    await expect(
+      page.getByTestId("child-data").filter({ hasText: "Value:1" })
+    ).toBeAttached();
 
     // Should call neither on manual revalidate (no params)
     await app.clickElement("#revalidate");
     await page.waitForSelector("#revalidation-idle", { state: "visible" });
-    expect(await app.getHtml("#parent-data")).toMatch("Value:1");
-    expect(await app.getHtml("#child-data")).toMatch("Value:1");
+    await expect(
+      page.getByTestId("parent-data").filter({ hasText: "Value:1" })
+    ).toBeAttached();
+    await expect(
+      page.getByTestId("child-data").filter({ hasText: "Value:1" })
+    ).toBeAttached();
 
     // Should call both
     await app.clickLink("/parent/child?revalidate=parent,child");
     await page.waitForSelector("#idle");
-    expect(await app.getHtml("#parent-data")).toMatch("Value:2");
-    expect(await app.getHtml("#child-data")).toMatch("Value:2");
+    await expect(
+      page.getByTestId("parent-data").filter({ hasText: "Value:2" })
+    ).toBeAttached();
+    await expect(
+      page.getByTestId("child-data").filter({ hasText: "Value:2" })
+    ).toBeAttached();
 
     // Should call both on manual revalidate
     await app.clickElement("#revalidate");
     await page.waitForSelector("#revalidation-idle", { state: "visible" });
-    expect(await app.getHtml("#parent-data")).toMatch("Value:3");
-    expect(await app.getHtml("#child-data")).toMatch("Value:3");
+    await expect(
+      page.getByTestId("parent-data").filter({ hasText: "Value:3" })
+    ).toBeAttached();
+    await expect(
+      page.getByTestId("child-data").filter({ hasText: "Value:3" })
+    ).toBeAttached();
 
     // Should call parent only
     await app.clickLink("/parent/child?revalidate=parent");
     await page.waitForSelector("#idle");
-    expect(await app.getHtml("#parent-data")).toMatch("Value:4");
-    expect(await app.getHtml("#child-data")).toMatch("Value:3");
+    await expect(
+      page.getByTestId("parent-data").filter({ hasText: "Value:4" })
+    ).toBeAttached();
+    await expect(
+      page.getByTestId("child-data").filter({ hasText: "Value:3" })
+    ).toBeAttached();
 
     // Should call parent only on manual revalidate
     await app.clickElement("#revalidate");
     await page.waitForSelector("#revalidation-idle", { state: "visible" });
-    expect(await app.getHtml("#parent-data")).toMatch("Value:5");
-    expect(await app.getHtml("#child-data")).toMatch("Value:3");
+    await expect(
+      page.getByTestId("parent-data").filter({ hasText: "Value:5" })
+    ).toBeAttached();
+    await expect(
+      page.getByTestId("child-data").filter({ hasText: "Value:3" })
+    ).toBeAttached();
 
     // Should call child only
     await app.clickLink("/parent/child?revalidate=child");
     await page.waitForSelector("#idle");
-    expect(await app.getHtml("#parent-data")).toMatch("Value:5");
-    expect(await app.getHtml("#child-data")).toMatch("Value:4");
+    await expect(
+      page.getByTestId("parent-data").filter({ hasText: "Value:5" })
+    ).toBeAttached();
+    await expect(
+      page.getByTestId("child-data").filter({ hasText: "Value:4" })
+    ).toBeAttached();
 
     // Should call child only on manual revalidate
     await app.clickElement("#revalidate");
     await page.waitForSelector("#revalidation-idle", { state: "visible" });
-    expect(await app.getHtml("#parent-data")).toMatch("Value:5");
-    expect(await app.getHtml("#child-data")).toMatch("Value:5");
+    await expect(
+      page.getByTestId("parent-data").filter({ hasText: "Value:5" })
+    ).toBeAttached();
+    await expect(
+      page.getByTestId("child-data").filter({ hasText: "Value:5" })
+    ).toBeAttached();
   });
 });
diff --git a/integration/rsc/rsc-test.ts b/integration/rsc/rsc-test.ts
index 5233aa1d3b..bede94ff57 100644
--- a/integration/rsc/rsc-test.ts
+++ b/integration/rsc/rsc-test.ts
@@ -1,5 +1,6 @@
-import { spawnSync } from "node:child_process";
+import * as os from "node:os";
 import { test, expect } from "@playwright/test";
+import { sync as spawnSync } from "cross-spawn";
 import getPort from "get-port";
 
 import {
@@ -22,43 +23,50 @@ type Implementation = {
 };
 
 // Run tests against vite and parcel to ensure our code is bundler agnostic
-const implementations: Implementation[] = [
-  {
-    name: "vite",
-    template: "rsc-vite",
-    build: ({ cwd }: { cwd: string }) =>
-      spawnSync("node_modules/.bin/vite", ["build"], { cwd }),
-    run: ({ cwd, port }) =>
-      createDev(["server.js", "-p", String(port)])({
-        cwd,
-        port,
-      }),
-    dev: ({ cwd, port }) =>
-      createDev(["node_modules/vite/bin/vite.js", "--port", String(port)])({
-        cwd,
-        port,
-      }),
-  },
-  {
-    name: "parcel",
-    template: "rsc-parcel",
-    build: ({ cwd }: { cwd: string }) =>
-      spawnSync("node_modules/.bin/parcel", ["build"], { cwd }),
-    run: ({ cwd, port }) =>
-      // FIXME: Parcel prod builds seems to have dup copies of react in them :/
-      // Not reproducible in the playground though - only in integration/helpers...
-      implementations.find((i) => i.name === "parcel")!.dev({ cwd, port }),
-    dev: ({ cwd, port }) =>
-      createDev(["node_modules/parcel/lib/bin.js"])({
-        // Since we run through parcels dev server we can't use `-p` because that
-        // only changes the dev server and doesn't pass through to the internal
-        // server.  So we setup the internal server to choose from `RR_PORT`
-        env: { RR_PORT: String(port) },
-        cwd,
-        port,
-      }),
-  },
-];
+const implementations: Implementation[] = (
+  [
+    {
+      name: "vite",
+      template: "rsc-vite",
+      build: ({ cwd }: { cwd: string }) =>
+        spawnSync("pnpm", ["build"], { cwd }),
+      run: ({ cwd, port }) =>
+        createDev(["server.js", "-p", String(port)])({
+          cwd,
+          port,
+        }),
+      dev: ({ cwd, port }) =>
+        createDev(["node_modules/vite/bin/vite.js", "--port", String(port)])({
+          cwd,
+          port,
+        }),
+    },
+    {
+      name: "parcel",
+      template: "rsc-parcel",
+      build: ({ cwd }: { cwd: string }) =>
+        spawnSync("pnpm", ["build"], { cwd }),
+      run: ({ cwd, port }) =>
+        // FIXME: Parcel prod builds seems to have dup copies of react in them :/
+        // Not reproducible in the playground though - only in integration/helpers...
+        implementations.find((i) => i.name === "parcel")!.dev({ cwd, port }),
+      dev: ({ cwd, port }) =>
+        createDev(["node_modules/parcel/lib/bin.js"])({
+          // Since we run through parcels dev server we can't use `-p` because that
+          // only changes the dev server and doesn't pass through to the internal
+          // server.  So we setup the internal server to choose from `RR_PORT`
+          env: { RR_PORT: String(port) },
+          cwd,
+          port,
+        }),
+    },
+  ] as Implementation[]
+).filter((imp) => {
+  if (imp.name === "vite" && os.platform() === "win32") {
+    return false;
+  }
+  return true;
+});
 
 async function setupRscTest({
   implementation,
@@ -73,12 +81,13 @@ async function setupRscTest({
 }) {
   let cwd = await createProject(files, implementation.template);
 
-  let { status, stderr, stdout } = implementation.build({ cwd });
+  let { error, status, stderr, stdout } = implementation.build({ cwd });
   if (status !== 0) {
     console.error("Error building project", {
       status,
-      stdout: stdout.toString(),
-      stderr: stderr.toString(),
+      error,
+      stdout: stdout?.toString(),
+      stderr: stderr?.toString(),
     });
     throw new Error("Error building project");
   }

From 93d64ad16d4662bb08c69ecc1ed7db6d667cf179 Mon Sep 17 00:00:00 2001
From: Mark Dalgleish 
Date: Wed, 18 Jun 2025 06:01:56 +1000
Subject: [PATCH 139/143] test(rsc): migrate Vite fixtures to
 `@hiogawa/vite-rsc` (#13819)

chore: enable vite tests on windows

---------

Co-authored-by: Jacob Ebey 
---
 integration/helpers/rsc-vite/.gitignore       |   2 +
 .../rsc-vite/.wrangler/deploy/config.json     |   1 -
 .../rsc-vite/framework/references.browser.ts  |  16 -
 .../rsc-vite/framework/references.rsc.ts      |   5 -
 .../rsc-vite/framework/references.ssr.ts      |   4 -
 .../helpers/rsc-vite/framework/server.ts      |  19 -
 integration/helpers/rsc-vite/package.json     |  21 +-
 integration/helpers/rsc-vite/server.js        |  15 +-
 .../helpers/rsc-vite/src/entry.browser.tsx    |  49 +-
 .../helpers/rsc-vite/src/entry.rsc.tsx        |  58 +-
 .../helpers/rsc-vite/src/entry.ssr.tsx        |  61 +-
 .../helpers/rsc-vite/src/routes/home.tsx      |   2 +-
 .../helpers/rsc-vite/src/routes/root.tsx      |   2 +-
 .../helpers/rsc-vite/src/wrangler.rsc.toml    |   4 -
 .../helpers/rsc-vite/src/wrangler.ssr.toml    |   6 -
 .../helpers/rsc-vite/tsconfig.client.json     |  25 -
 integration/helpers/rsc-vite/tsconfig.json    |  20 +-
 .../helpers/rsc-vite/tsconfig.node.json       |  18 -
 integration/helpers/rsc-vite/vite.config.ts   |  87 +--
 integration/rsc/rsc-test.ts                   |  23 +-
 playground/rsc-vite/.gitignore                |   1 -
 .../rsc-vite/.wrangler/deploy/config.json     |   1 -
 .../rsc-vite/framework/references.browser.ts  |  12 -
 .../rsc-vite/framework/references.rsc.ts      |   5 -
 .../rsc-vite/framework/references.ssr.ts      |   4 -
 playground/rsc-vite/framework/server.ts       |  19 -
 playground/rsc-vite/package.json              |  22 +-
 playground/rsc-vite/server.js                 |  26 +-
 .../rsc-vite/src/browser/entry.browser.tsx    |  39 -
 playground/rsc-vite/src/counter.tsx           |  11 +-
 playground/rsc-vite/src/entry.browser.tsx     |  36 +
 playground/rsc-vite/src/entry.rsc.tsx         |  46 ++
 playground/rsc-vite/src/entry.ssr.tsx         |  28 +
 playground/rsc-vite/src/routes.ts             |   3 +
 .../rsc-vite/src/routes/about/about.tsx       |   2 +-
 .../rsc-vite/src/routes/home/home.client.tsx  |   6 +-
 playground/rsc-vite/src/routes/redirect.ts    |   2 +-
 playground/rsc-vite/src/routes/root/root.tsx  |   2 +-
 playground/rsc-vite/src/rsc/entry.rsc.tsx     |  40 -
 playground/rsc-vite/src/rsc/wrangler.toml     |   4 -
 playground/rsc-vite/src/ssr/entry.ssr.tsx     |  43 --
 playground/rsc-vite/src/ssr/wrangler.toml     |   6 -
 playground/rsc-vite/tsconfig.client.json      |  25 -
 playground/rsc-vite/tsconfig.json             |  20 +-
 playground/rsc-vite/tsconfig.node.json        |  18 -
 playground/rsc-vite/vite.config.ts            |  87 +--
 pnpm-lock.yaml                                | 690 +++---------------
 47 files changed, 397 insertions(+), 1239 deletions(-)
 create mode 100644 integration/helpers/rsc-vite/.gitignore
 delete mode 100644 integration/helpers/rsc-vite/.wrangler/deploy/config.json
 delete mode 100644 integration/helpers/rsc-vite/framework/references.browser.ts
 delete mode 100644 integration/helpers/rsc-vite/framework/references.rsc.ts
 delete mode 100644 integration/helpers/rsc-vite/framework/references.ssr.ts
 delete mode 100644 integration/helpers/rsc-vite/framework/server.ts
 delete mode 100644 integration/helpers/rsc-vite/src/wrangler.rsc.toml
 delete mode 100644 integration/helpers/rsc-vite/src/wrangler.ssr.toml
 delete mode 100644 integration/helpers/rsc-vite/tsconfig.client.json
 delete mode 100644 integration/helpers/rsc-vite/tsconfig.node.json
 delete mode 100644 playground/rsc-vite/.wrangler/deploy/config.json
 delete mode 100644 playground/rsc-vite/framework/references.browser.ts
 delete mode 100644 playground/rsc-vite/framework/references.rsc.ts
 delete mode 100644 playground/rsc-vite/framework/references.ssr.ts
 delete mode 100644 playground/rsc-vite/framework/server.ts
 delete mode 100644 playground/rsc-vite/src/browser/entry.browser.tsx
 create mode 100644 playground/rsc-vite/src/entry.browser.tsx
 create mode 100644 playground/rsc-vite/src/entry.rsc.tsx
 create mode 100644 playground/rsc-vite/src/entry.ssr.tsx
 delete mode 100644 playground/rsc-vite/src/rsc/entry.rsc.tsx
 delete mode 100644 playground/rsc-vite/src/rsc/wrangler.toml
 delete mode 100644 playground/rsc-vite/src/ssr/entry.ssr.tsx
 delete mode 100644 playground/rsc-vite/src/ssr/wrangler.toml
 delete mode 100644 playground/rsc-vite/tsconfig.client.json
 delete mode 100644 playground/rsc-vite/tsconfig.node.json

diff --git a/integration/helpers/rsc-vite/.gitignore b/integration/helpers/rsc-vite/.gitignore
new file mode 100644
index 0000000000..de4d1f007d
--- /dev/null
+++ b/integration/helpers/rsc-vite/.gitignore
@@ -0,0 +1,2 @@
+dist
+node_modules
diff --git a/integration/helpers/rsc-vite/.wrangler/deploy/config.json b/integration/helpers/rsc-vite/.wrangler/deploy/config.json
deleted file mode 100644
index bde383d850..0000000000
--- a/integration/helpers/rsc-vite/.wrangler/deploy/config.json
+++ /dev/null
@@ -1 +0,0 @@
-{"configPath":"../../dist/ssr/wrangler.json","auxiliaryWorkers":[{"configPath":"../../dist/server/wrangler.json"}]}
\ No newline at end of file
diff --git a/integration/helpers/rsc-vite/framework/references.browser.ts b/integration/helpers/rsc-vite/framework/references.browser.ts
deleted file mode 100644
index 06bf756022..0000000000
--- a/integration/helpers/rsc-vite/framework/references.browser.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import {
-  createServerReference as createServerReferenceImp,
-  createFromReadableStream,
-  encodeReply,
-  // @ts-expect-error - no types yet
-} from "@jacob-ebey/react-server-dom-vite/client";
-import { unstable_createCallServer as createCallServer } from "react-router";
-
-export const callServer = createCallServer({
-  decode: (body) => createFromReadableStream(body, { callServer }),
-  encodeAction: (args) => encodeReply(args),
-});
-
-export function createServerReference(imp: unknown, id: string, name: string) {
-  return createServerReferenceImp(`${id}#${name}`, callServer);
-}
diff --git a/integration/helpers/rsc-vite/framework/references.rsc.ts b/integration/helpers/rsc-vite/framework/references.rsc.ts
deleted file mode 100644
index be086b8a0a..0000000000
--- a/integration/helpers/rsc-vite/framework/references.rsc.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// @ts-expect-error - no types yet
-import RSD from "@jacob-ebey/react-server-dom-vite/server";
-
-export const registerServerReference = RSD.registerServerReference;
-export const registerClientReference = RSD.registerClientReference;
diff --git a/integration/helpers/rsc-vite/framework/references.ssr.ts b/integration/helpers/rsc-vite/framework/references.ssr.ts
deleted file mode 100644
index 071d2d68e4..0000000000
--- a/integration/helpers/rsc-vite/framework/references.ssr.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// @ts-expect-error - no types yet
-import RSD from "@jacob-ebey/react-server-dom-vite/client";
-
-export const createServerReference = RSD.createServerReference;
diff --git a/integration/helpers/rsc-vite/framework/server.ts b/integration/helpers/rsc-vite/framework/server.ts
deleted file mode 100644
index f1dad8db46..0000000000
--- a/integration/helpers/rsc-vite/framework/server.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import * as stream from "node:stream";
-// @ts-expect-error - no types yet
-import RSD from "@jacob-ebey/react-server-dom-vite/server";
-// @ts-expect-error - no types yet
-import { manifest } from "virtual:react-manifest";
-
-export function renderToReadableStream(payload: any) {
-  const { pipe } = RSD.renderToPipeableStream(payload, manifest);
-  return stream.Readable.toWeb(
-    pipe(new stream.PassThrough())
-  ) as ReadableStream;
-}
-
-export function decodeReply(
-  reply: FormData | string,
-  options?: any
-): unknown[] {
-  return RSD.decodeReply(reply, manifest, options);
-}
diff --git a/integration/helpers/rsc-vite/package.json b/integration/helpers/rsc-vite/package.json
index 883cbcedc0..43b3e09d18 100644
--- a/integration/helpers/rsc-vite/package.json
+++ b/integration/helpers/rsc-vite/package.json
@@ -1,29 +1,24 @@
 {
-  "name": "@playground/rsc-vite",
+  "name": "integration-rsc-vite",
   "private": true,
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "vite build",
-    "start": "node server.js",
+    "build": "vite build --app",
+    "start": "cross-env NODE_ENV=production node server.js",
     "typecheck": "tsc"
   },
   "devDependencies": {
-    "@biomejs/biome": "^1.9.4",
-    "@cloudflare/vite-plugin": "0.1.7",
-    "@cloudflare/workers-types": "^4.20250224.0",
-    "@jacob-ebey/vite-react-server-dom": "0.0.12",
+    "@hiogawa/vite-rsc": "0.4.1",
     "@types/express": "^5.0.0",
     "@types/node": "^22.13.1",
-    "@types/react": "^19.0.8",
-    "@types/react-dom": "^19.0.3",
+    "@types/react": "^19.1.8",
+    "@types/react-dom": "^19.1.6",
+    "@vitejs/plugin-react": "^4.5.2",
     "typescript": "^5.1.6",
-    "vite": "^6.2.0",
-    "vite-tsconfig-paths": "^5.1.4",
-    "wrangler": "^3.111.0"
+    "vite": "^6.2.0"
   },
   "dependencies": {
-    "@jacob-ebey/react-server-dom-vite": "19.0.0-experimental.14",
     "@mjackson/node-fetch-server": "0.6.1",
     "compression": "^1.8.0",
     "express": "^4.21.2",
diff --git a/integration/helpers/rsc-vite/server.js b/integration/helpers/rsc-vite/server.js
index fff9015d39..c897acd7ad 100644
--- a/integration/helpers/rsc-vite/server.js
+++ b/integration/helpers/rsc-vite/server.js
@@ -3,8 +3,7 @@ import { createRequestListener } from "@mjackson/node-fetch-server";
 import compression from "compression";
 import express from "express";
 
-import ssr from "./dist/ssr/entry.ssr.js";
-import server from "./dist/server/entry.rsc.js";
+import rscRequestHandler from "./dist/rsc/index.js";
 
 const app = express();
 
@@ -16,17 +15,7 @@ app.get("/.well-known/appspecific/com.chrome.devtools.json", (req, res) => {
   res.end();
 });
 
-app.use(
-  createRequestListener((request) => {
-    return ssr.fetch(request, {
-      SERVER: {
-        fetch(request) {
-          return server.fetch(request);
-        },
-      },
-    });
-  })
-);
+app.use(createRequestListener(rscRequestHandler));
 
 const { values } = parseArgs({
   options: { p: { type: "string", default: "3000" } },
diff --git a/integration/helpers/rsc-vite/src/entry.browser.tsx b/integration/helpers/rsc-vite/src/entry.browser.tsx
index b48deb805c..d952ef68ae 100644
--- a/integration/helpers/rsc-vite/src/entry.browser.tsx
+++ b/integration/helpers/rsc-vite/src/entry.browser.tsx
@@ -3,37 +3,34 @@ import { hydrateRoot } from "react-dom/client";
 import {
   createFromReadableStream,
   encodeReply,
-  // @ts-expect-error - no types
-} from "@jacob-ebey/react-server-dom-vite/client";
-// @ts-expect-error - no types yet
-import { manifest } from "virtual:react-manifest";
-
+  setServerCallback,
+} from "@hiogawa/vite-rsc/browser";
+import type { unstable_DecodeServerResponseFunction as DecodeServerResponseFunction } from "react-router";
 import {
-  type unstable_DecodeServerResponseFunction as DecodeServerResponseFunction,
-  type unstable_EncodeActionFunction as EncodeActionFunction,
   unstable_createCallServer as createCallServer,
   unstable_getServerStream as getServerStream,
   unstable_RSCHydratedRouter as RSCHydratedRouter,
 } from "react-router";
-import { type unstable_ServerPayload as ServerPayload } from "react-router/rsc";
-
-const encodeAction: EncodeActionFunction = (args: unknown[]) =>
-  encodeReply(args);
+import type { unstable_ServerPayload as ServerPayload } from "react-router/rsc";
 
-const decode: DecodeServerResponseFunction = (body) =>
-  createFromReadableStream(body, manifest, { callServer });
+const decode: DecodeServerResponseFunction = (
+  body: ReadableStream
+) => createFromReadableStream(body);
 
-const callServer = createCallServer({ decode, encodeAction });
-
-createFromReadableStream(getServerStream(), manifest, { callServer }).then(
-  (payload: ServerPayload) => {
-    startTransition(() => {
-      hydrateRoot(
-        document,
-        
-          
-        
-      );
-    });
-  }
+setServerCallback(
+  createCallServer({
+    decode,
+    encodeAction: (args) => encodeReply(args),
+  })
 );
+
+createFromReadableStream(getServerStream()).then((payload) => {
+  startTransition(() => {
+    hydrateRoot(
+      document,
+      
+        
+      
+    );
+  });
+});
diff --git a/integration/helpers/rsc-vite/src/entry.rsc.tsx b/integration/helpers/rsc-vite/src/entry.rsc.tsx
index 41945dd987..ebd05d15de 100644
--- a/integration/helpers/rsc-vite/src/entry.rsc.tsx
+++ b/integration/helpers/rsc-vite/src/entry.rsc.tsx
@@ -1,38 +1,46 @@
-/// 
+import {
+  decodeAction,
+  decodeReply,
+  loadServerAction,
+  renderToReadableStream,
+} from "@hiogawa/vite-rsc/rsc";
 import {
   type unstable_DecodeCallServerFunction as DecodeCallServerFunction,
+  type unstable_DecodeFormActionFunction as DecodeFormActionFunction,
   unstable_matchRSCServerRequest as matchRSCServerRequest,
 } from "react-router/rsc";
-// @ts-expect-error - no types yet
-import { manifest } from "virtual:react-manifest";
 
-import { decodeReply, renderToReadableStream } from "../framework/server";
 import { routes } from "./routes";
 
 const decodeCallServer: DecodeCallServerFunction = async (actionId, reply) => {
   const args = await decodeReply(reply);
-  const reference = manifest.resolveServerReference(actionId);
-  await reference.preload();
-  const action = reference.get() as (...args: unknown[]) => Promise;
+  const action = await loadServerAction(actionId);
   return action.bind(null, ...args);
 };
 
-export default {
-  fetch(request, env) {
-    return matchRSCServerRequest({
-      decodeCallServer,
-      request,
-      routes,
-      generateResponse(match) {
-        if (match instanceof Response) {
-          return match;
-        }
+const decodeFormAction: DecodeFormActionFunction = async (formData) => {
+  return await decodeAction(formData);
+};
+
+export async function callServer(request: Request) {
+  return await matchRSCServerRequest({
+    decodeCallServer,
+    decodeFormAction,
+    request,
+    routes,
+    generateResponse(match) {
+      return new Response(renderToReadableStream(match.payload), {
+        status: match.statusCode,
+        headers: match.headers,
+      });
+    },
+  });
+}
 
-        return new Response(renderToReadableStream(match.payload), {
-          status: match.statusCode,
-          headers: match.headers,
-        });
-      },
-    });
-  },
-} satisfies ExportedHandler;
+export default async function handler(request: Request) {
+  const ssr = await import.meta.viteRsc.loadSsrModule<
+    // eslint-disable-next-line @typescript-eslint/consistent-type-imports
+    typeof import("./entry.ssr")
+  >("index");
+  return ssr.default(request, callServer);
+}
diff --git a/integration/helpers/rsc-vite/src/entry.ssr.tsx b/integration/helpers/rsc-vite/src/entry.ssr.tsx
index 9d65d7a6ad..e7d58cad43 100644
--- a/integration/helpers/rsc-vite/src/entry.ssr.tsx
+++ b/integration/helpers/rsc-vite/src/entry.ssr.tsx
@@ -1,43 +1,28 @@
-/// 
-
-// @ts-expect-error
-import RSD from "@jacob-ebey/react-server-dom-vite/client";
+import bootstrapScriptContent from "virtual:vite-rsc/bootstrap-script-content";
+import { createFromReadableStream } from "@hiogawa/vite-rsc/ssr";
 // @ts-expect-error
-import RDS from "react-dom/server.edge";
-// @ts-expect-error
-import { bootstrapModules, manifest } from "virtual:react-manifest";
-
+import * as ReactDomServer from "react-dom/server.edge";
 import {
-  unstable_routeRSCServerRequest as routeRSCServerRequest,
   unstable_RSCStaticRouter as RSCStaticRouter,
+  unstable_routeRSCServerRequest as routeRSCServerRequest,
 } from "react-router";
 
-type CloudflareEnv = {
-  ASSETS: Fetcher;
-  SERVER: Fetcher;
-};
-
-export default {
-  async fetch(request, { SERVER }) {
-    const callServer = async (request: Request) => await SERVER.fetch(request);
-    try {
-      return await routeRSCServerRequest({
-        request,
-        callServer,
-        decode: (body) => RSD.createFromReadableStream(body, manifest),
-        async renderHTML(getPayload) {
-          return await RDS.renderToReadableStream(
-            ,
-            {
-              bootstrapModules,
-              signal: request.signal,
-            }
-          );
-        },
-      });
-    } catch (reason) {
-      console.error(reason);
-      return new Response("Internal Server Error", { status: 500 });
-    }
-  },
-} satisfies ExportedHandler;
+export default async function handler(
+  request: Request,
+  callServer: (request: Request) => Promise
+) {
+  return routeRSCServerRequest({
+    request,
+    callServer,
+    decode: (body) => createFromReadableStream(body),
+    renderHTML(getPayload) {
+      return ReactDomServer.renderToReadableStream(
+        ,
+        {
+          bootstrapScriptContent,
+          signal: request.signal,
+        }
+      );
+    },
+  });
+}
diff --git a/integration/helpers/rsc-vite/src/routes/home.tsx b/integration/helpers/rsc-vite/src/routes/home.tsx
index fa44740c12..b5e522802e 100644
--- a/integration/helpers/rsc-vite/src/routes/home.tsx
+++ b/integration/helpers/rsc-vite/src/routes/home.tsx
@@ -1,3 +1,3 @@
-export default function ServerComponent() {
+export default function HomeRoute() {
   return 
    Home
    ;
 }
diff --git a/integration/helpers/rsc-vite/src/routes/root.tsx b/integration/helpers/rsc-vite/src/routes/root.tsx
index 778a4858d6..d498b32ffa 100644
--- a/integration/helpers/rsc-vite/src/routes/root.tsx
+++ b/integration/helpers/rsc-vite/src/routes/root.tsx
@@ -17,6 +17,6 @@ export function Layout({ children }: { children: React.ReactNode }) {
   );
 }
 
-export default function ServerComponent() {
+export default function RootRoute() {
   return ;
 }
diff --git a/integration/helpers/rsc-vite/src/wrangler.rsc.toml b/integration/helpers/rsc-vite/src/wrangler.rsc.toml
deleted file mode 100644
index 6d22f08fed..0000000000
--- a/integration/helpers/rsc-vite/src/wrangler.rsc.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-name = "server"
-main = "./entry.rsc.tsx"
-compatibility_date = "2024-12-05"
-compatibility_flags = ["nodejs_compat"]
diff --git a/integration/helpers/rsc-vite/src/wrangler.ssr.toml b/integration/helpers/rsc-vite/src/wrangler.ssr.toml
deleted file mode 100644
index f8c534067b..0000000000
--- a/integration/helpers/rsc-vite/src/wrangler.ssr.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-name = "ssr"
-main = "./entry.ssr.tsx"
-compatibility_date = "2024-09-23"
-compatibility_flags = ["nodejs_compat"]
-assets = { binding = "ASSETS" }
-services = [{ binding = "SERVER", service = "server" }]
diff --git a/integration/helpers/rsc-vite/tsconfig.client.json b/integration/helpers/rsc-vite/tsconfig.client.json
deleted file mode 100644
index b44285bcb1..0000000000
--- a/integration/helpers/rsc-vite/tsconfig.client.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "include": ["framework", "src"],
-  "compilerOptions": {
-    "lib": ["ES2022", "DOM", "DOM.Iterable"],
-    "types": ["@cloudflare/workers-types", "@types/node", "vite/client"],
-    "rootDir": ".",
-    "paths": {
-      "~/*": ["./src/app/*"]
-    },
-    "allowImportingTsExtensions": true,
-    "jsx": "react-jsx",
-    "esModuleInterop": false,
-    "skipLibCheck": true,
-    "target": "ES2022",
-    "resolveJsonModule": true,
-    "moduleDetection": "force",
-    "isolatedModules": true,
-    "verbatimModuleSyntax": true,
-    "strict": true,
-    "noUncheckedIndexedAccess": true,
-    "noImplicitOverride": true,
-    "module": "Preserve",
-    "noEmit": true
-  }
-}
diff --git a/integration/helpers/rsc-vite/tsconfig.json b/integration/helpers/rsc-vite/tsconfig.json
index e748ae2236..b795eea593 100644
--- a/integration/helpers/rsc-vite/tsconfig.json
+++ b/integration/helpers/rsc-vite/tsconfig.json
@@ -1,7 +1,17 @@
 {
-  "files": [],
-  "references": [
-    { "path": "./tsconfig.node.json" },
-    { "path": "./tsconfig.client.json" }
-  ]
+  "compilerOptions": {
+    "allowImportingTsExtensions": true,
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "skipLibCheck": true,
+    "verbatimModuleSyntax": true,
+    "noEmit": true,
+    "moduleResolution": "Bundler",
+    "module": "ESNext",
+    "target": "ESNext",
+    "lib": ["ESNext", "DOM", "DOM.Iterable"],
+    "types": ["vite/client", "@hiogawa/vite-rsc/types"],
+    "jsx": "react-jsx"
+  }
 }
diff --git a/integration/helpers/rsc-vite/tsconfig.node.json b/integration/helpers/rsc-vite/tsconfig.node.json
deleted file mode 100644
index 70add5e01e..0000000000
--- a/integration/helpers/rsc-vite/tsconfig.node.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "include": ["vite.config.ts", "__tests__"],
-  "compilerOptions": {
-    "esModuleInterop": false,
-    "skipLibCheck": true,
-    "target": "ES2022",
-    "resolveJsonModule": true,
-    "moduleDetection": "force",
-    "isolatedModules": true,
-    "verbatimModuleSyntax": true,
-    "strict": true,
-    "noUncheckedIndexedAccess": true,
-    "noImplicitOverride": true,
-    "module": "Preserve",
-    "lib": ["ES2022"],
-    "noEmit": true
-  }
-}
diff --git a/integration/helpers/rsc-vite/vite.config.ts b/integration/helpers/rsc-vite/vite.config.ts
index 499dd6312d..274649c19c 100644
--- a/integration/helpers/rsc-vite/vite.config.ts
+++ b/integration/helpers/rsc-vite/vite.config.ts
@@ -1,85 +1,16 @@
-import * as path from "node:path";
-
-import { cloudflare } from "@cloudflare/vite-plugin";
-import reactServerDOM from "@jacob-ebey/vite-react-server-dom";
-import { defineConfig, type ViteDevServer } from "vite";
-import tsconfigPaths from "vite-tsconfig-paths";
+import rsc from "@hiogawa/vite-rsc/plugin";
+import react from "@vitejs/plugin-react";
+import { defineConfig } from "vite";
 
 export default defineConfig({
-  resolve: {
-    external: ["cloudflare:workers"],
-  },
-  environments: {
-    client: {
-      build: {
-        rollupOptions: {
-          input: "src/entry.browser.tsx",
-          treeshake: {
-            moduleSideEffects: () => {
-              return false;
-            },
-          },
-        },
-      },
-      resolve: {
-        conditions: ["module-sync"],
-      },
-    },
-    ssr: {
-      resolve: {
-        noExternal: true,
-        conditions: ["module-sync"],
-      },
-    },
-    server: {
-      resolve: {
-        noExternal: true,
-        conditions: ["module-sync"],
-      },
-    },
-  },
   plugins: [
-    stupidChromeDevtoolsRequest(),
-    tsconfigPaths({ configNames: ["tsconfig.client.json"] }),
-    reactServerDOM({
-      browserEnvironment: "client",
-      serverEnvironments: ["server"],
-      ssrEnvironments: ["ssr"],
-      runtime: {
-        browser: {
-          importFrom: path.resolve("./framework/references.browser.ts"),
-        },
-        server: {
-          importFrom: path.resolve("./framework/references.rsc.ts"),
-        },
-        ssr: {
-          importFrom: path.resolve("./framework/references.ssr.ts"),
-        },
+    react(),
+    rsc({
+      entries: {
+        client: "src/entry.browser.tsx",
+        rsc: "src/entry.rsc.tsx",
+        ssr: "src/entry.ssr.tsx",
       },
     }),
-    cloudflare({
-      persistState: true,
-      configPath: "src/wrangler.ssr.toml",
-      auxiliaryWorkers: [
-        {
-          configPath: "src/wrangler.rsc.toml",
-        },
-      ],
-    }),
   ],
 });
-
-function stupidChromeDevtoolsRequest() {
-  return {
-    name: "stupid-chrome-devtools-request",
-    configureServer(server: ViteDevServer) {
-      server.middlewares.use(
-        "/.well-known/appspecific/com.chrome.devtools.json",
-        (_, res) => {
-          res.statusCode = 404;
-          res.end("Not Found");
-        }
-      );
-    },
-  };
-}
diff --git a/integration/rsc/rsc-test.ts b/integration/rsc/rsc-test.ts
index bede94ff57..00bf680d79 100644
--- a/integration/rsc/rsc-test.ts
+++ b/integration/rsc/rsc-test.ts
@@ -1,4 +1,3 @@
-import * as os from "node:os";
 import { test, expect } from "@playwright/test";
 import { sync as spawnSync } from "cross-spawn";
 import getPort from "get-port";
@@ -34,6 +33,9 @@ const implementations: Implementation[] = (
         createDev(["server.js", "-p", String(port)])({
           cwd,
           port,
+          env: {
+            NODE_ENV: "production",
+          },
         }),
       dev: ({ cwd, port }) =>
         createDev(["node_modules/vite/bin/vite.js", "--port", String(port)])({
@@ -61,12 +63,7 @@ const implementations: Implementation[] = (
         }),
     },
   ] as Implementation[]
-).filter((imp) => {
-  if (imp.name === "vite" && os.platform() === "win32") {
-    return false;
-  }
-  return true;
-});
+);
 
 async function setupRscTest({
   implementation,
@@ -594,7 +591,7 @@ implementations.forEach((implementation) => {
             "src/routes/home.actions.ts": js`
               "use server";
 
-              export function incrementCounter(count: number, formData: FormData) {
+              export async function incrementCounter(count: number, formData: FormData) {
                 return count + parseInt(formData.get("by") as string || "1", 10);
               }
             `,
@@ -729,7 +726,7 @@ implementations.forEach((implementation) => {
               "use server";
               import { redirect } from "react-router/rsc";
 
-              export function redirectAction(formData: FormData) {
+              export async function redirectAction(formData: FormData) {
                 throw redirect("/?redirected=true");
               }
             `,
@@ -800,14 +797,6 @@ implementations.forEach((implementation) => {
       test("Handles errors in server components correctly", async ({
         page,
       }) => {
-        // TODO: There is a mis-match in React versions between the Vite and
-        // Parcel builds here causing one to strip errors, and the other allow
-        // through the development error message.
-        test.skip(
-          implementation.name === "vite",
-          "Bug in vite somewhere, needs investigation"
-        );
-
         let port = await getPort();
         stop = await setupRscTest({
           dev: true,
diff --git a/playground/rsc-vite/.gitignore b/playground/rsc-vite/.gitignore
index ef718b97ff..de4d1f007d 100644
--- a/playground/rsc-vite/.gitignore
+++ b/playground/rsc-vite/.gitignore
@@ -1,3 +1,2 @@
-.parcel-cache
 dist
 node_modules
diff --git a/playground/rsc-vite/.wrangler/deploy/config.json b/playground/rsc-vite/.wrangler/deploy/config.json
deleted file mode 100644
index bde383d850..0000000000
--- a/playground/rsc-vite/.wrangler/deploy/config.json
+++ /dev/null
@@ -1 +0,0 @@
-{"configPath":"../../dist/ssr/wrangler.json","auxiliaryWorkers":[{"configPath":"../../dist/server/wrangler.json"}]}
\ No newline at end of file
diff --git a/playground/rsc-vite/framework/references.browser.ts b/playground/rsc-vite/framework/references.browser.ts
deleted file mode 100644
index cbf0af69e3..0000000000
--- a/playground/rsc-vite/framework/references.browser.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import {
-  createServerReference as createServerReferenceImp,
-  // @ts-expect-error - no types yet
-} from "@jacob-ebey/react-server-dom-vite/client";
-
-export async function callServer(id: string, args: unknown) {
-  throw new Error("callServer not implemented");
-}
-
-export function createServerReference(imp: unknown, id: string, name: string) {
-  return createServerReferenceImp(`${id}#${name}`, callServer);
-}
diff --git a/playground/rsc-vite/framework/references.rsc.ts b/playground/rsc-vite/framework/references.rsc.ts
deleted file mode 100644
index be086b8a0a..0000000000
--- a/playground/rsc-vite/framework/references.rsc.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// @ts-expect-error - no types yet
-import RSD from "@jacob-ebey/react-server-dom-vite/server";
-
-export const registerServerReference = RSD.registerServerReference;
-export const registerClientReference = RSD.registerClientReference;
diff --git a/playground/rsc-vite/framework/references.ssr.ts b/playground/rsc-vite/framework/references.ssr.ts
deleted file mode 100644
index 071d2d68e4..0000000000
--- a/playground/rsc-vite/framework/references.ssr.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// @ts-expect-error - no types yet
-import RSD from "@jacob-ebey/react-server-dom-vite/client";
-
-export const createServerReference = RSD.createServerReference;
diff --git a/playground/rsc-vite/framework/server.ts b/playground/rsc-vite/framework/server.ts
deleted file mode 100644
index f1dad8db46..0000000000
--- a/playground/rsc-vite/framework/server.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import * as stream from "node:stream";
-// @ts-expect-error - no types yet
-import RSD from "@jacob-ebey/react-server-dom-vite/server";
-// @ts-expect-error - no types yet
-import { manifest } from "virtual:react-manifest";
-
-export function renderToReadableStream(payload: any) {
-  const { pipe } = RSD.renderToPipeableStream(payload, manifest);
-  return stream.Readable.toWeb(
-    pipe(new stream.PassThrough())
-  ) as ReadableStream;
-}
-
-export function decodeReply(
-  reply: FormData | string,
-  options?: any
-): unknown[] {
-  return RSD.decodeReply(reply, manifest, options);
-}
diff --git a/playground/rsc-vite/package.json b/playground/rsc-vite/package.json
index 784ee1e525..f8aeca055c 100644
--- a/playground/rsc-vite/package.json
+++ b/playground/rsc-vite/package.json
@@ -4,24 +4,22 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "vite build",
-    "start": "node server.js"
+    "build": "vite build --app",
+    "start": "cross-env NODE_ENV=production node server.js",
+    "typecheck": "tsc"
   },
   "devDependencies": {
-    "@biomejs/biome": "^1.9.4",
-    "@cloudflare/vite-plugin": "0.1.7",
-    "@cloudflare/workers-types": "^4.20250224.0",
-    "@jacob-ebey/vite-react-server-dom": "0.0.12",
+    "@hiogawa/vite-rsc": "0.4.1",
     "@types/express": "^5.0.0",
     "@types/node": "^22.13.1",
-    "@types/react": "^19.0.8",
-    "@types/react-dom": "^19.0.3",
-    "vite": "^6.2.0",
-    "vite-tsconfig-paths": "^5.1.4",
-    "wrangler": "^3.111.0"
+    "@types/react": "^19.1.8",
+    "@types/react-dom": "^19.1.6",
+    "@vitejs/plugin-react": "^4.5.2",
+    "cross-env": "^7.0.3",
+    "typescript": "^5.1.6",
+    "vite": "^6.2.0"
   },
   "dependencies": {
-    "@jacob-ebey/react-server-dom-vite": "19.0.0-experimental.14",
     "@mjackson/node-fetch-server": "0.6.1",
     "compression": "^1.8.0",
     "express": "^4.21.2",
diff --git a/playground/rsc-vite/server.js b/playground/rsc-vite/server.js
index 3fdbde058a..c897acd7ad 100644
--- a/playground/rsc-vite/server.js
+++ b/playground/rsc-vite/server.js
@@ -1,9 +1,9 @@
+import { parseArgs } from "node:util";
 import { createRequestListener } from "@mjackson/node-fetch-server";
 import compression from "compression";
 import express from "express";
 
-import ssr from "./dist/ssr/entry.ssr.js";
-import server from "./dist/server/entry.rsc.js";
+import rscRequestHandler from "./dist/rsc/index.js";
 
 const app = express();
 
@@ -15,18 +15,14 @@ app.get("/.well-known/appspecific/com.chrome.devtools.json", (req, res) => {
   res.end();
 });
 
-app.use(
-  createRequestListener((request) => {
-    return ssr.fetch(request, {
-      SERVER: {
-        fetch(request) {
-          return server.fetch(request);
-        },
-      },
-    });
-  })
-);
+app.use(createRequestListener(rscRequestHandler));
 
-app.listen(3000, () => {
-  console.log("Server started on http://localhost:3000");
+const { values } = parseArgs({
+  options: { p: { type: "string", default: "3000" } },
+  allowPositionals: true,
+});
+
+const port = parseInt(values.p, 10);
+app.listen(port, () => {
+  console.log(`Server started on http://localhost:${port}`);
 });
diff --git a/playground/rsc-vite/src/browser/entry.browser.tsx b/playground/rsc-vite/src/browser/entry.browser.tsx
deleted file mode 100644
index 9d2d0f6055..0000000000
--- a/playground/rsc-vite/src/browser/entry.browser.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { startTransition, StrictMode } from "react";
-import { hydrateRoot } from "react-dom/client";
-import {
-  createFromReadableStream,
-  encodeReply,
-  // @ts-expect-error - no types
-} from "@jacob-ebey/react-server-dom-vite/client";
-// @ts-expect-error - no types yet
-import { manifest } from "virtual:react-manifest";
-
-import {
-  type unstable_DecodeServerResponseFunction as DecodeServerResponseFunction,
-  type unstable_EncodeActionFunction as EncodeActionFunction,
-  unstable_createCallServer as createCallServer,
-  unstable_getServerStream as getServerStream,
-  unstable_RSCHydratedRouter as RSCHydratedRouter,
-} from "react-router";
-import type { unstable_ServerPayload as ServerPayload } from "react-router/rsc";
-
-const encodeAction: EncodeActionFunction = (args: unknown[]) =>
-  encodeReply(args);
-
-const decode: DecodeServerResponseFunction = (body) =>
-  createFromReadableStream(body, manifest, { callServer });
-
-const callServer = createCallServer({ decode, encodeAction });
-
-createFromReadableStream(getServerStream(), manifest, { callServer }).then(
-  (payload: ServerPayload) => {
-    startTransition(() => {
-      hydrateRoot(
-        document,
-        
-          
-        
-      );
-    });
-  }
-);
diff --git a/playground/rsc-vite/src/counter.tsx b/playground/rsc-vite/src/counter.tsx
index a7ecda6819..7a5b69a098 100644
--- a/playground/rsc-vite/src/counter.tsx
+++ b/playground/rsc-vite/src/counter.tsx
@@ -7,12 +7,11 @@ export function Counter() {
 
   return (
     
    
-      
    
-        Counter: {count}{" "}
-        
-      
    
+      
    Counter
    
+      
    Current count: {count}
    
+      
     
    
   );
 }
diff --git a/playground/rsc-vite/src/entry.browser.tsx b/playground/rsc-vite/src/entry.browser.tsx
new file mode 100644
index 0000000000..d952ef68ae
--- /dev/null
+++ b/playground/rsc-vite/src/entry.browser.tsx
@@ -0,0 +1,36 @@
+import { startTransition, StrictMode } from "react";
+import { hydrateRoot } from "react-dom/client";
+import {
+  createFromReadableStream,
+  encodeReply,
+  setServerCallback,
+} from "@hiogawa/vite-rsc/browser";
+import type { unstable_DecodeServerResponseFunction as DecodeServerResponseFunction } from "react-router";
+import {
+  unstable_createCallServer as createCallServer,
+  unstable_getServerStream as getServerStream,
+  unstable_RSCHydratedRouter as RSCHydratedRouter,
+} from "react-router";
+import type { unstable_ServerPayload as ServerPayload } from "react-router/rsc";
+
+const decode: DecodeServerResponseFunction = (
+  body: ReadableStream
+) => createFromReadableStream(body);
+
+setServerCallback(
+  createCallServer({
+    decode,
+    encodeAction: (args) => encodeReply(args),
+  })
+);
+
+createFromReadableStream(getServerStream()).then((payload) => {
+  startTransition(() => {
+    hydrateRoot(
+      document,
+      
+        
+      
+    );
+  });
+});
diff --git a/playground/rsc-vite/src/entry.rsc.tsx b/playground/rsc-vite/src/entry.rsc.tsx
new file mode 100644
index 0000000000..81ccd57670
--- /dev/null
+++ b/playground/rsc-vite/src/entry.rsc.tsx
@@ -0,0 +1,46 @@
+import {
+  decodeAction,
+  decodeReply,
+  loadServerAction,
+  renderToReadableStream,
+} from "@hiogawa/vite-rsc/rsc";
+import {
+  type unstable_DecodeCallServerFunction as DecodeCallServerFunction,
+  type unstable_DecodeFormActionFunction as DecodeFormActionFunction,
+  unstable_matchRSCServerRequest as matchRSCServerRequest,
+} from "react-router/rsc";
+
+import { routes } from "./routes";
+
+const decodeCallServer: DecodeCallServerFunction = async (actionId, reply) => {
+  const args = await decodeReply(reply);
+  const action = await loadServerAction(actionId);
+  return action.bind(null, ...args);
+};
+
+const decodeFormAction: DecodeFormActionFunction = async (formData) => {
+  return await decodeAction(formData);
+};
+
+export async function callServer(request: Request) {
+  return await matchRSCServerRequest({
+    decodeCallServer,
+    decodeFormAction,
+    request,
+    // @ts-expect-error
+    routes,
+    generateResponse(match) {
+      return new Response(renderToReadableStream(match.payload), {
+        status: match.statusCode,
+        headers: match.headers,
+      });
+    },
+  });
+}
+
+export default async function handler(request: Request) {
+  const ssr = await import.meta.viteRsc.loadSsrModule<
+    typeof import("./entry.ssr")
+  >("index");
+  return ssr.default(request, callServer);
+}
diff --git a/playground/rsc-vite/src/entry.ssr.tsx b/playground/rsc-vite/src/entry.ssr.tsx
new file mode 100644
index 0000000000..e7d58cad43
--- /dev/null
+++ b/playground/rsc-vite/src/entry.ssr.tsx
@@ -0,0 +1,28 @@
+import bootstrapScriptContent from "virtual:vite-rsc/bootstrap-script-content";
+import { createFromReadableStream } from "@hiogawa/vite-rsc/ssr";
+// @ts-expect-error
+import * as ReactDomServer from "react-dom/server.edge";
+import {
+  unstable_RSCStaticRouter as RSCStaticRouter,
+  unstable_routeRSCServerRequest as routeRSCServerRequest,
+} from "react-router";
+
+export default async function handler(
+  request: Request,
+  callServer: (request: Request) => Promise
+) {
+  return routeRSCServerRequest({
+    request,
+    callServer,
+    decode: (body) => createFromReadableStream(body),
+    renderHTML(getPayload) {
+      return ReactDomServer.renderToReadableStream(
+        ,
+        {
+          bootstrapScriptContent,
+          signal: request.signal,
+        }
+      );
+    },
+  });
+}
diff --git a/playground/rsc-vite/src/routes.ts b/playground/rsc-vite/src/routes.ts
index d491f8749b..822b676180 100644
--- a/playground/rsc-vite/src/routes.ts
+++ b/playground/rsc-vite/src/routes.ts
@@ -10,11 +10,13 @@ export const routes = [
       {
         id: "home",
         index: true,
+        // @ts-expect-error
         lazy: () => import("./routes/home/home"),
       },
       {
         id: "about",
         path: "about",
+        // @ts-expect-error
         lazy: () => import("./routes/about/about"),
       },
       {
@@ -30,6 +32,7 @@ export const routes = [
           {
             id: "child",
             path: "child",
+            // @ts-expect-error
             lazy: () => import("./routes/child/child"),
           },
         ],
diff --git a/playground/rsc-vite/src/routes/about/about.tsx b/playground/rsc-vite/src/routes/about/about.tsx
index 01baa19a68..6f5efddeef 100644
--- a/playground/rsc-vite/src/routes/about/about.tsx
+++ b/playground/rsc-vite/src/routes/about/about.tsx
@@ -5,7 +5,7 @@ export {
   // clientLazy,
   clientLoader,
   clientAction,
-  Component,
+  default,
 } from "./about.client";
 
 export function headers({
diff --git a/playground/rsc-vite/src/routes/home/home.client.tsx b/playground/rsc-vite/src/routes/home/home.client.tsx
index d11ff00f78..308982b883 100644
--- a/playground/rsc-vite/src/routes/home/home.client.tsx
+++ b/playground/rsc-vite/src/routes/home/home.client.tsx
@@ -30,6 +30,7 @@ export default function Home() {
 }
 
 export function HomeForm({ fn }: { fn: () => unknown }) {
+  // @ts-expect-error React types for the repo are set to v18
   const [state, formAction, isPending] = React.useActionState(fn, null);
 
   return (
@@ -43,13 +44,12 @@ export function HomeForm({ fn }: { fn: () => unknown }) {
 }
 
 export function RedirectForm({ fn }: { fn: () => unknown }) {
+  // @ts-expect-error React types for the repo are set to v18
   const [state, formAction, isPending] = React.useActionState(fn, null);
 
   return (
     
-      
+      
       {state ? 
    Action state: {state}
     : null}
     
   );
diff --git a/playground/rsc-vite/src/routes/redirect.ts b/playground/rsc-vite/src/routes/redirect.ts
index 8967cec561..bd8913f812 100644
--- a/playground/rsc-vite/src/routes/redirect.ts
+++ b/playground/rsc-vite/src/routes/redirect.ts
@@ -1,4 +1,4 @@
-import { redirect, redirectDocument, replace } from "react-router/rsc";
+import { redirectDocument } from "react-router/rsc";
 
 export function loader() {
   throw redirectDocument("/about?redirected");
diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx
index cfe865d0fe..2387832d3e 100644
--- a/playground/rsc-vite/src/routes/root/root.tsx
+++ b/playground/rsc-vite/src/routes/root/root.tsx
@@ -22,7 +22,7 @@ export const unstable_middleware: unstable_MiddlewareFunction[] = [
 export async function loader() {
   await new Promise((r) => setTimeout(r, 500));
   return {
-    counter: ,
+    counter: ,
     message: `Root route loader ran at ${new Date().toISOString()}`,
   };
 }
diff --git a/playground/rsc-vite/src/rsc/entry.rsc.tsx b/playground/rsc-vite/src/rsc/entry.rsc.tsx
deleted file mode 100644
index 6946382d1b..0000000000
--- a/playground/rsc-vite/src/rsc/entry.rsc.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-/// 
-
-import { decodeReply, renderToReadableStream } from "../../framework/server";
-// @ts-expect-error - no types yet
-import { manifest } from "virtual:react-manifest";
-
-import {
-  type unstable_DecodeCallServerFunction as DecodeCallServerFunction,
-  unstable_matchRSCServerRequest as matchRSCServerRequest,
-} from "react-router/rsc";
-
-import { routes } from "../routes";
-
-const decodeCallServer: DecodeCallServerFunction = async (actionId, reply) => {
-  const args = await decodeReply(reply);
-  const reference = manifest.resolveServerReference(actionId);
-  await reference.preload();
-  const action = reference.get() as (...args: unknown[]) => Promise;
-  return action.bind(null, ...args);
-};
-
-export default {
-  fetch(request, env) {
-    return matchRSCServerRequest({
-      decodeCallServer,
-      request,
-      routes,
-      generateResponse(match) {
-        if (match instanceof Response) {
-          return match;
-        }
-
-        return new Response(renderToReadableStream(match.payload), {
-          status: match.statusCode,
-          headers: match.headers,
-        });
-      },
-    });
-  },
-} satisfies ExportedHandler;
diff --git a/playground/rsc-vite/src/rsc/wrangler.toml b/playground/rsc-vite/src/rsc/wrangler.toml
deleted file mode 100644
index 6d22f08fed..0000000000
--- a/playground/rsc-vite/src/rsc/wrangler.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-name = "server"
-main = "./entry.rsc.tsx"
-compatibility_date = "2024-12-05"
-compatibility_flags = ["nodejs_compat"]
diff --git a/playground/rsc-vite/src/ssr/entry.ssr.tsx b/playground/rsc-vite/src/ssr/entry.ssr.tsx
deleted file mode 100644
index 9d65d7a6ad..0000000000
--- a/playground/rsc-vite/src/ssr/entry.ssr.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-/// 
-
-// @ts-expect-error
-import RSD from "@jacob-ebey/react-server-dom-vite/client";
-// @ts-expect-error
-import RDS from "react-dom/server.edge";
-// @ts-expect-error
-import { bootstrapModules, manifest } from "virtual:react-manifest";
-
-import {
-  unstable_routeRSCServerRequest as routeRSCServerRequest,
-  unstable_RSCStaticRouter as RSCStaticRouter,
-} from "react-router";
-
-type CloudflareEnv = {
-  ASSETS: Fetcher;
-  SERVER: Fetcher;
-};
-
-export default {
-  async fetch(request, { SERVER }) {
-    const callServer = async (request: Request) => await SERVER.fetch(request);
-    try {
-      return await routeRSCServerRequest({
-        request,
-        callServer,
-        decode: (body) => RSD.createFromReadableStream(body, manifest),
-        async renderHTML(getPayload) {
-          return await RDS.renderToReadableStream(
-            ,
-            {
-              bootstrapModules,
-              signal: request.signal,
-            }
-          );
-        },
-      });
-    } catch (reason) {
-      console.error(reason);
-      return new Response("Internal Server Error", { status: 500 });
-    }
-  },
-} satisfies ExportedHandler;
diff --git a/playground/rsc-vite/src/ssr/wrangler.toml b/playground/rsc-vite/src/ssr/wrangler.toml
deleted file mode 100644
index f8c534067b..0000000000
--- a/playground/rsc-vite/src/ssr/wrangler.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-name = "ssr"
-main = "./entry.ssr.tsx"
-compatibility_date = "2024-09-23"
-compatibility_flags = ["nodejs_compat"]
-assets = { binding = "ASSETS" }
-services = [{ binding = "SERVER", service = "server" }]
diff --git a/playground/rsc-vite/tsconfig.client.json b/playground/rsc-vite/tsconfig.client.json
deleted file mode 100644
index 8faea30be1..0000000000
--- a/playground/rsc-vite/tsconfig.client.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "include": ["framework", "src"],
-  "compilerOptions": {
-    "lib": ["ES2022", "DOM", "DOM.Iterable"],
-    "types": ["@cloudflare/workers-types", "@types/node", "vite/client"],
-    "rootDir": ".",
-    "paths": {
-      "~/*": ["./src/app/*"],
-    },
-    "allowImportingTsExtensions": true,
-    "jsx": "react-jsx",
-    "esModuleInterop": false,
-    "skipLibCheck": true,
-    "target": "ES2022",
-    "resolveJsonModule": true,
-    "moduleDetection": "force",
-    "isolatedModules": true,
-    "verbatimModuleSyntax": true,
-    "strict": true,
-    "noUncheckedIndexedAccess": true,
-    "noImplicitOverride": true,
-    "module": "Preserve",
-    "noEmit": true
-  }
-}
diff --git a/playground/rsc-vite/tsconfig.json b/playground/rsc-vite/tsconfig.json
index e748ae2236..b795eea593 100644
--- a/playground/rsc-vite/tsconfig.json
+++ b/playground/rsc-vite/tsconfig.json
@@ -1,7 +1,17 @@
 {
-  "files": [],
-  "references": [
-    { "path": "./tsconfig.node.json" },
-    { "path": "./tsconfig.client.json" }
-  ]
+  "compilerOptions": {
+    "allowImportingTsExtensions": true,
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "skipLibCheck": true,
+    "verbatimModuleSyntax": true,
+    "noEmit": true,
+    "moduleResolution": "Bundler",
+    "module": "ESNext",
+    "target": "ESNext",
+    "lib": ["ESNext", "DOM", "DOM.Iterable"],
+    "types": ["vite/client", "@hiogawa/vite-rsc/types"],
+    "jsx": "react-jsx"
+  }
 }
diff --git a/playground/rsc-vite/tsconfig.node.json b/playground/rsc-vite/tsconfig.node.json
deleted file mode 100644
index 70add5e01e..0000000000
--- a/playground/rsc-vite/tsconfig.node.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "include": ["vite.config.ts", "__tests__"],
-  "compilerOptions": {
-    "esModuleInterop": false,
-    "skipLibCheck": true,
-    "target": "ES2022",
-    "resolveJsonModule": true,
-    "moduleDetection": "force",
-    "isolatedModules": true,
-    "verbatimModuleSyntax": true,
-    "strict": true,
-    "noUncheckedIndexedAccess": true,
-    "noImplicitOverride": true,
-    "module": "Preserve",
-    "lib": ["ES2022"],
-    "noEmit": true
-  }
-}
diff --git a/playground/rsc-vite/vite.config.ts b/playground/rsc-vite/vite.config.ts
index 9781133fa0..274649c19c 100644
--- a/playground/rsc-vite/vite.config.ts
+++ b/playground/rsc-vite/vite.config.ts
@@ -1,85 +1,16 @@
-import * as path from "node:path";
-
-import { cloudflare } from "@cloudflare/vite-plugin";
-import reactServerDOM from "@jacob-ebey/vite-react-server-dom";
-import { defineConfig, type ViteDevServer } from "vite";
-import tsconfigPaths from "vite-tsconfig-paths";
+import rsc from "@hiogawa/vite-rsc/plugin";
+import react from "@vitejs/plugin-react";
+import { defineConfig } from "vite";
 
 export default defineConfig({
-  resolve: {
-    external: ["cloudflare:workers"],
-  },
-  environments: {
-    client: {
-      build: {
-        rollupOptions: {
-          input: "src/browser/entry.browser.tsx",
-          treeshake: {
-            moduleSideEffects: () => {
-              return false;
-            },
-          },
-        },
-      },
-      resolve: {
-        conditions: ["module-sync"],
-      },
-    },
-    ssr: {
-      resolve: {
-        noExternal: true,
-        conditions: ["module-sync"],
-      },
-    },
-    server: {
-      resolve: {
-        noExternal: true,
-        conditions: ["module-sync"],
-      },
-    },
-  },
   plugins: [
-    stupidChromeDevtoolsRequest(),
-    tsconfigPaths({ configNames: ["tsconfig.client.json"] }),
-    reactServerDOM({
-      browserEnvironment: "client",
-      serverEnvironments: ["server"],
-      ssrEnvironments: ["ssr"],
-      runtime: {
-        browser: {
-          importFrom: path.resolve("./framework/references.browser.ts"),
-        },
-        server: {
-          importFrom: path.resolve("./framework/references.rsc.ts"),
-        },
-        ssr: {
-          importFrom: path.resolve("./framework/references.ssr.ts"),
-        },
+    react(),
+    rsc({
+      entries: {
+        client: "src/entry.browser.tsx",
+        rsc: "src/entry.rsc.tsx",
+        ssr: "src/entry.ssr.tsx",
       },
     }),
-    cloudflare({
-      persistState: true,
-      configPath: "src/ssr/wrangler.toml",
-      auxiliaryWorkers: [
-        {
-          configPath: "src/rsc/wrangler.toml",
-        },
-      ],
-    }),
   ],
 });
-
-function stupidChromeDevtoolsRequest() {
-  return {
-    name: "stupid-chrome-devtools-request",
-    configureServer(server: ViteDevServer) {
-      server.middlewares.use(
-        "/.well-known/appspecific/com.chrome.devtools.json",
-        (_, res) => {
-          res.statusCode = 404;
-          res.end("Not Found");
-        }
-      );
-    },
-  };
-}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bd941d8d05..d636988dfa 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -527,9 +527,6 @@ importers:
 
   integration/helpers/rsc-vite:
     dependencies:
-      '@jacob-ebey/react-server-dom-vite':
-        specifier: 19.0.0-experimental.14
-        version: 19.0.0-experimental.14(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
       '@mjackson/node-fetch-server':
         specifier: 0.6.1
         version: 0.6.1
@@ -549,18 +546,9 @@ importers:
         specifier: workspace:*
         version: link:../../../packages/react-router
     devDependencies:
-      '@biomejs/biome':
-        specifier: ^1.9.4
-        version: 1.9.4
-      '@cloudflare/vite-plugin':
-        specifier: 0.1.7
-        version: 0.1.7(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))(workerd@1.20250224.0)(wrangler@3.114.5(@cloudflare/workers-types@4.20250317.0))
-      '@cloudflare/workers-types':
-        specifier: ^4.20250224.0
-        version: 4.20250317.0
-      '@jacob-ebey/vite-react-server-dom':
-        specifier: 0.0.12
-        version: 0.0.12(@jacob-ebey/react-server-dom-vite@19.0.0-experimental.14(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(rollup@4.43.0)(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))
+      '@hiogawa/vite-rsc':
+        specifier: 0.4.1
+        version: 0.4.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))
       '@types/express':
         specifier: ^5.0.0
         version: 5.0.1
@@ -573,18 +561,15 @@ importers:
       '@types/react-dom':
         specifier: ^18.2.7
         version: 18.2.7
+      '@vitejs/plugin-react':
+        specifier: ^4.5.2
+        version: 4.5.2(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))
       typescript:
         specifier: ^5.1.6
         version: 5.4.5
       vite:
         specifier: ^6.2.0
         version: 6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)
-      vite-tsconfig-paths:
-        specifier: ^5.1.4
-        version: 5.1.4(typescript@5.4.5)(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))
-      wrangler:
-        specifier: ^3.111.0
-        version: 3.114.5(@cloudflare/workers-types@4.20250317.0)
 
   integration/helpers/vite-5-template:
     dependencies:
@@ -1847,9 +1832,6 @@ importers:
 
   playground/rsc-vite:
     dependencies:
-      '@jacob-ebey/react-server-dom-vite':
-        specifier: 19.0.0-experimental.14
-        version: 19.0.0-experimental.14(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
       '@mjackson/node-fetch-server':
         specifier: 0.6.1
         version: 0.6.1
@@ -1869,18 +1851,9 @@ importers:
         specifier: workspace:*
         version: link:../../packages/react-router
     devDependencies:
-      '@biomejs/biome':
-        specifier: ^1.9.4
-        version: 1.9.4
-      '@cloudflare/vite-plugin':
-        specifier: 0.1.7
-        version: 0.1.7(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))(workerd@1.20250224.0)(wrangler@3.114.5(@cloudflare/workers-types@4.20250317.0))
-      '@cloudflare/workers-types':
-        specifier: ^4.20250224.0
-        version: 4.20250317.0
-      '@jacob-ebey/vite-react-server-dom':
-        specifier: 0.0.12
-        version: 0.0.12(@jacob-ebey/react-server-dom-vite@19.0.0-experimental.14(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(rollup@4.43.0)(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))
+      '@hiogawa/vite-rsc':
+        specifier: 0.4.1
+        version: 0.4.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))
       '@types/express':
         specifier: ^5.0.0
         version: 5.0.1
@@ -1893,15 +1866,18 @@ importers:
       '@types/react-dom':
         specifier: ^18.2.7
         version: 18.2.7
+      '@vitejs/plugin-react':
+        specifier: ^4.5.2
+        version: 4.5.2(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))
+      cross-env:
+        specifier: ^7.0.3
+        version: 7.0.3
+      typescript:
+        specifier: ^5.1.6
+        version: 5.4.5
       vite:
         specifier: ^6.2.0
         version: 6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)
-      vite-tsconfig-paths:
-        specifier: ^5.1.4
-        version: 5.1.4(typescript@5.4.5)(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))
-      wrangler:
-        specifier: ^3.111.0
-        version: 3.114.5(@cloudflare/workers-types@4.20250317.0)
 
   playground/split-route-modules:
     dependencies:
@@ -2064,10 +2040,6 @@ packages:
     resolution: {integrity: sha512-KiRAp/VoJaWkkte84TvUd9qjdbZAdiqyvMxrGl1N6vzFogKmaLgoM3L1kgtLicp2HP5fBJS8JrZKLVIZGVJAVg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/core@7.24.4':
-    resolution: {integrity: sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/core@7.27.4':
     resolution: {integrity: sha512-bXYxrXFubeYdvB0NhD/NBB3Qi6aZeV20GOWVI47t2dkecCEoneR4NPVcb7abpXDEvejgrUfFtG6vG/zxAKmg+g==}
     engines: {node: '>=6.9.0'}
@@ -2133,10 +2105,6 @@ packages:
     resolution: {integrity: sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-module-imports@7.24.3':
-    resolution: {integrity: sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/helper-module-imports@7.27.1':
     resolution: {integrity: sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==}
     engines: {node: '>=6.9.0'}
@@ -2151,14 +2119,14 @@ packages:
     resolution: {integrity: sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-plugin-utils@7.24.0':
-    resolution: {integrity: sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/helper-plugin-utils@7.26.5':
     resolution: {integrity: sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-plugin-utils@7.27.1':
+    resolution: {integrity: sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-remap-async-to-generator@7.22.9':
     resolution: {integrity: sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==}
     engines: {node: '>=6.9.0'}
@@ -2653,14 +2621,14 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-react-jsx-self@7.25.9':
-    resolution: {integrity: sha512-y8quW6p0WHkEhmErnfe58r7x0A70uKphQm8Sp8cV7tjNQwK56sNVK0M73LK3WuYmsuyrftut4xAkjjgU0twaMg==}
+  '@babel/plugin-transform-react-jsx-self@7.27.1':
+    resolution: {integrity: sha512-6UzkCs+ejGdZ5mFFC/OCUrv028ab2fp1znZmCZjAOBKiBK2jXD1O+BPSfX8X2qjJ75fZBMSnQn3Rq2mrBJK2mw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-react-jsx-source@7.25.9':
-    resolution: {integrity: sha512-+iqjT8xmXhhYv4/uiYd8FNQsraMFZIfxVSqxxVSZP0WbbSAWvBXAul0m/zu+7Vv4O/3WtApy9pmaTMiumEZgfg==}
+  '@babel/plugin-transform-react-jsx-source@7.27.1':
+    resolution: {integrity: sha512-zbwoTsBruTeKB9hSq73ha66iFeJHuaFkUbwvqElnygoNbj/jHRsSeokowZFN3CZ64IvEqcmmkVe89OPXc7ldAw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -2789,10 +2757,6 @@ packages:
     resolution: {integrity: sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/traverse@7.24.1':
-    resolution: {integrity: sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/traverse@7.27.4':
     resolution: {integrity: sha512-oNcu2QbHqts9BtOWJosOVJapWjBDSxGCpFvikNR5TGDYDQf3JwpIoMzIKrvfoti93cLfPJEG4tH9SPVeyCGgdA==}
     engines: {node: '>=6.9.0'}
@@ -2921,10 +2885,6 @@ packages:
   '@changesets/write@0.2.3':
     resolution: {integrity: sha512-Dbamr7AIMvslKnNYsLFafaVORx4H0pvCA2MHqgtNCySMe1blImEyAEOzDmcgKAkgz4+uwoLz7demIrX+JBr/Xw==}
 
-  '@cloudflare/kv-asset-handler@0.3.4':
-    resolution: {integrity: sha512-YLPHc8yASwjNkmcDMQMY35yiWjoKAKnhUbPRszBRS0YgH+IXtsMp61j+yTcnCE3oO2DgP0U3iejLC8FTtKDC8Q==}
-    engines: {node: '>=16.13'}
-
   '@cloudflare/kv-asset-handler@0.4.0':
     resolution: {integrity: sha512-+tv3z+SPp+gqTIcImN9o0hqE9xyfQjI1XD9pL6NuKjua9B1y7mNYv0S9cP+QEbA4ppVgGZEmKOvHX5G5Ei1CVA==}
     engines: {node: '>=18.0.0'}
@@ -2953,12 +2913,6 @@ packages:
       vite: ^6.1.0
       wrangler: ^3.101.0 || ^4.0.0
 
-  '@cloudflare/vite-plugin@0.1.7':
-    resolution: {integrity: sha512-s3j4eHvGsz2eTv78na1YZ0HvTgj78SZ9iq10p1SbgiEE4SXLOlqYCifJiNP32nUQga9678OUeHqdV39thkD9vQ==}
-    peerDependencies:
-      vite: ^6.1.0
-      wrangler: ^3.101.0
-
   '@cloudflare/workerd-darwin-64@1.20250224.0':
     resolution: {integrity: sha512-sBbaAF2vgQ9+T50ik1ihekdepStBp0w4fvNghBfXIw1iWqfNWnypcjDMmi/7JhXJt2uBxBrSlXCvE5H7Gz+kbw==}
     engines: {node: '>=16'}
@@ -3008,16 +2962,6 @@ packages:
   '@emotion/hash@0.9.1':
     resolution: {integrity: sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==}
 
-  '@esbuild-plugins/node-globals-polyfill@0.2.3':
-    resolution: {integrity: sha512-r3MIryXDeXDOZh7ih1l/yE9ZLORCd5e8vWg02azWRGj5SPTuoh69A2AIyn0Z31V/kHBfZ4HgWJ+OK3GTTwLmnw==}
-    peerDependencies:
-      esbuild: '*'
-
-  '@esbuild-plugins/node-modules-polyfill@0.2.2':
-    resolution: {integrity: sha512-LXV7QsWJxRuMYvKbiznh+U1ilIop3g2TeKRzUxOG5X3YITc8JyyTa90BmLwqqv0YnX4v32CSlG+vsziZp9dMvA==}
-    peerDependencies:
-      esbuild: '*'
-
   '@esbuild/aix-ppc64@0.19.12':
     resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==}
     engines: {node: '>=12'}
@@ -3036,12 +2980,6 @@ packages:
     cpu: [ppc64]
     os: [aix]
 
-  '@esbuild/android-arm64@0.17.19':
-    resolution: {integrity: sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-
   '@esbuild/android-arm64@0.19.12':
     resolution: {integrity: sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==}
     engines: {node: '>=12'}
@@ -3060,12 +2998,6 @@ packages:
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm@0.17.19':
-    resolution: {integrity: sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-
   '@esbuild/android-arm@0.19.12':
     resolution: {integrity: sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==}
     engines: {node: '>=12'}
@@ -3084,12 +3016,6 @@ packages:
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-x64@0.17.19':
-    resolution: {integrity: sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-
   '@esbuild/android-x64@0.19.12':
     resolution: {integrity: sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==}
     engines: {node: '>=12'}
@@ -3108,12 +3034,6 @@ packages:
     cpu: [x64]
     os: [android]
 
-  '@esbuild/darwin-arm64@0.17.19':
-    resolution: {integrity: sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-
   '@esbuild/darwin-arm64@0.19.12':
     resolution: {integrity: sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==}
     engines: {node: '>=12'}
@@ -3132,12 +3052,6 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.17.19':
-    resolution: {integrity: sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-
   '@esbuild/darwin-x64@0.19.12':
     resolution: {integrity: sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==}
     engines: {node: '>=12'}
@@ -3156,12 +3070,6 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/freebsd-arm64@0.17.19':
-    resolution: {integrity: sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-
   '@esbuild/freebsd-arm64@0.19.12':
     resolution: {integrity: sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==}
     engines: {node: '>=12'}
@@ -3180,12 +3088,6 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.17.19':
-    resolution: {integrity: sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-
   '@esbuild/freebsd-x64@0.19.12':
     resolution: {integrity: sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==}
     engines: {node: '>=12'}
@@ -3204,12 +3106,6 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/linux-arm64@0.17.19':
-    resolution: {integrity: sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-
   '@esbuild/linux-arm64@0.19.12':
     resolution: {integrity: sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==}
     engines: {node: '>=12'}
@@ -3228,12 +3124,6 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm@0.17.19':
-    resolution: {integrity: sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-
   '@esbuild/linux-arm@0.19.12':
     resolution: {integrity: sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==}
     engines: {node: '>=12'}
@@ -3252,12 +3142,6 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.17.19':
-    resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-
   '@esbuild/linux-ia32@0.19.12':
     resolution: {integrity: sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==}
     engines: {node: '>=12'}
@@ -3276,12 +3160,6 @@ packages:
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.17.19':
-    resolution: {integrity: sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
-    os: [linux]
-
   '@esbuild/linux-loong64@0.19.12':
     resolution: {integrity: sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==}
     engines: {node: '>=12'}
@@ -3300,12 +3178,6 @@ packages:
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.17.19':
-    resolution: {integrity: sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-
   '@esbuild/linux-mips64el@0.19.12':
     resolution: {integrity: sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==}
     engines: {node: '>=12'}
@@ -3324,12 +3196,6 @@ packages:
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.17.19':
-    resolution: {integrity: sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-
   '@esbuild/linux-ppc64@0.19.12':
     resolution: {integrity: sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==}
     engines: {node: '>=12'}
@@ -3348,12 +3214,6 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.17.19':
-    resolution: {integrity: sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-
   '@esbuild/linux-riscv64@0.19.12':
     resolution: {integrity: sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==}
     engines: {node: '>=12'}
@@ -3372,12 +3232,6 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.17.19':
-    resolution: {integrity: sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-
   '@esbuild/linux-s390x@0.19.12':
     resolution: {integrity: sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==}
     engines: {node: '>=12'}
@@ -3396,12 +3250,6 @@ packages:
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-x64@0.17.19':
-    resolution: {integrity: sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-
   '@esbuild/linux-x64@0.19.12':
     resolution: {integrity: sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==}
     engines: {node: '>=12'}
@@ -3432,12 +3280,6 @@ packages:
     cpu: [arm64]
     os: [netbsd]
 
-  '@esbuild/netbsd-x64@0.17.19':
-    resolution: {integrity: sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-
   '@esbuild/netbsd-x64@0.19.12':
     resolution: {integrity: sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==}
     engines: {node: '>=12'}
@@ -3468,12 +3310,6 @@ packages:
     cpu: [arm64]
     os: [openbsd]
 
-  '@esbuild/openbsd-x64@0.17.19':
-    resolution: {integrity: sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-
   '@esbuild/openbsd-x64@0.19.12':
     resolution: {integrity: sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==}
     engines: {node: '>=12'}
@@ -3492,12 +3328,6 @@ packages:
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/sunos-x64@0.17.19':
-    resolution: {integrity: sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-
   '@esbuild/sunos-x64@0.19.12':
     resolution: {integrity: sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==}
     engines: {node: '>=12'}
@@ -3516,12 +3346,6 @@ packages:
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/win32-arm64@0.17.19':
-    resolution: {integrity: sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-
   '@esbuild/win32-arm64@0.19.12':
     resolution: {integrity: sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==}
     engines: {node: '>=12'}
@@ -3540,12 +3364,6 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.17.19':
-    resolution: {integrity: sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-
   '@esbuild/win32-ia32@0.19.12':
     resolution: {integrity: sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==}
     engines: {node: '>=12'}
@@ -3564,12 +3382,6 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-x64@0.17.19':
-    resolution: {integrity: sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-
   '@esbuild/win32-x64@0.19.12':
     resolution: {integrity: sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==}
     engines: {node: '>=12'}
@@ -3636,6 +3448,16 @@ packages:
     resolution: {integrity: sha512-AgJgKLooZyQnzMfoFg5Mo/aHM+HGBC9ExpXIjNqGimYTRgNbL/K7X5EM1kR2JY90BNKk9lo6Usq1T/nWFdT7TQ==}
     hasBin: true
 
+  '@hiogawa/transforms@0.1.1':
+    resolution: {integrity: sha512-NAJ38s8lMMSDv7HOupWt1w5EJ8poMOWPd+JCmmfHg8sdWgFCjCGHnaDi5pTGEBxYLzso9K2urfyK2rW6HORsHw==}
+
+  '@hiogawa/vite-rsc@0.4.1':
+    resolution: {integrity: sha512-GQ19F8q004E7wjCL/RARhblPXx6W2SC+hdVc8xw85xPy22iU0Ft67jJtY1gI7k3jqoPWrBNaUjgmemJIZRoazw==}
+    peerDependencies:
+      react: '*'
+      react-dom: '*'
+      vite: '*'
+
   '@humanwhocodes/config-array@0.11.14':
     resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==}
     engines: {node: '>=10.10.0'}
@@ -3797,19 +3619,6 @@ packages:
     resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==}
     engines: {node: '>=8'}
 
-  '@jacob-ebey/react-server-dom-vite@19.0.0-experimental.14':
-    resolution: {integrity: sha512-4bBG0uLS/XuddOi1KjJb6j/A49rdEe62yzcFjd7jghQmPXT8jNinyIislylz9xupJB3TvHB8JGv5/PB+LPASHg==}
-    engines: {node: '>=0.10.0'}
-    peerDependencies:
-      react: ^19.0.0
-      react-dom: ^19.0.0
-
-  '@jacob-ebey/vite-react-server-dom@0.0.12':
-    resolution: {integrity: sha512-XzaqcFlnXgRv2ZVyHJEhJGLvTsx0XCpnGqlHywzrp6XjUMujyRvEdNp4EGt8VGpGtH0o+TlS6YxLTc8MVH3jGQ==}
-    peerDependencies:
-      '@jacob-ebey/react-server-dom-vite': '*'
-      vite: ^6.0.0
-
   '@jest/console@29.7.0':
     resolution: {integrity: sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -3960,9 +3769,6 @@ packages:
   '@mjackson/node-fetch-server@0.2.0':
     resolution: {integrity: sha512-EMlH1e30yzmTpGLQjlFmaDAjyOeZhng1/XCd7DExR8PNAnG/G1tyruZxEoUe11ClnwGhGrtsdnyyUx1frSzjng==}
 
-  '@mjackson/node-fetch-server@0.5.0':
-    resolution: {integrity: sha512-GZrkGuP3N7he0GdK9CCqpjabqsXjJa4tp0yKw973FoGAAOGE6WTcp3kcosRdeGYqtoFn7IEu84g3pItk4wRBFg==}
-
   '@mjackson/node-fetch-server@0.6.1':
     resolution: {integrity: sha512-9ZJnk/DJjt805uv5PPv11haJIW+HHf3YEEyVXv+8iLQxLD/iXA68FH220XoiTPBC4gCg5q+IMadDw8qPqlA5wg==}
 
@@ -4767,6 +4573,9 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@rolldown/pluginutils@1.0.0-beta.11':
+    resolution: {integrity: sha512-L/gAA/hyCSuzTF1ftlzUSI/IKr2POHsv1Dd78GfqkR83KMNuswWD61JxGV2L7nRwBBBSDr6R1gCkdTmoN7W4ag==}
+
   '@rollup/pluginutils@5.1.0':
     resolution: {integrity: sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==}
     engines: {node: '>=14.0.0'}
@@ -5523,11 +5332,11 @@ packages:
     peerDependencies:
       vite: ^2.2.3 || ^3.0.0 || ^4.0.3 || ^5.0.0
 
-  '@vitejs/plugin-react@4.3.4':
-    resolution: {integrity: sha512-SCCPBJtYLdE8PX/7ZQAs1QAZ8Jqwih+0VBLum1EGqmCCQal+MIUqLCzj3ZUy8ufbC0cAM4LRlSTm7IQJwWT4ug==}
+  '@vitejs/plugin-react@4.5.2':
+    resolution: {integrity: sha512-QNVT3/Lxx99nMQWJWF7K4N6apUEuT0KlZA3mx/mVaoGj3smm/8rc8ezz15J1pcbcjDK0V15rpHetVfya08r76Q==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
-      vite: ^4.2.0 || ^5.0.0 || ^6.0.0
+      vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0-beta.0
 
   '@web3-storage/multipart-parser@1.0.0':
     resolution: {integrity: sha512-BEO6al7BYqcnfX15W2cnGR+Q566ACXAT9UQykORCWW80lmkpWsnEob6zJS1ZVBKsSJC8+7vJkHwlp+lXG1UCdw==}
@@ -6538,11 +6347,6 @@ packages:
     peerDependencies:
       esbuild: '>=0.12 <1'
 
-  esbuild@0.17.19:
-    resolution: {integrity: sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==}
-    engines: {node: '>=12'}
-    hasBin: true
-
   esbuild@0.19.12:
     resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==}
     engines: {node: '>=12'}
@@ -6756,9 +6560,6 @@ packages:
   estree-util-visit@2.0.0:
     resolution: {integrity: sha512-m5KgiH85xAhhW8Wta0vShLcUvOsh3LLPI2YVwcbio1l7E09NTLL1EyMZFM1OyWowoH0skScNbhOPl4kcBgzTww==}
 
-  estree-walker@0.6.1:
-    resolution: {integrity: sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==}
-
   estree-walker@2.0.2:
     resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
 
@@ -7938,9 +7739,6 @@ packages:
     resolution: {integrity: sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==}
     hasBin: true
 
-  magic-string@0.25.9:
-    resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==}
-
   magic-string@0.30.17:
     resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==}
 
@@ -8281,11 +8079,6 @@ packages:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
 
-  miniflare@3.20250214.1:
-    resolution: {integrity: sha512-NE66QV+2n9ZndaP5jgPlcVref3Arvizb+l2QqhgeXtKM5Orhi8UU2mijoiN3mHEUexKaBES2S1VubT4LDPqkxQ==}
-    engines: {node: '>=16.13'}
-    hasBin: true
-
   miniflare@3.20250408.0:
     resolution: {integrity: sha512-URXD7+b0tLbBtchPM/MfWYujymHUrmPtd3EDQbe51qrPPF1zQCdSeNbA4f/GRQMoQIEE6EIhvEYjVjL+hiN+Og==}
     engines: {node: '>=16.13'}
@@ -8742,6 +8535,9 @@ packages:
   periscopic@3.1.0:
     resolution: {integrity: sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==}
 
+  periscopic@4.0.2:
+    resolution: {integrity: sha512-sqpQDUy8vgB7ycLkendSKS6HnVz1Rneoc3Rc+ZBUCe2pbqlVuCC5vF52l0NJ1aiMg/r1qfYF9/myz8CZeI2rjA==}
+
   picocolors@1.1.1:
     resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
 
@@ -8998,6 +8794,10 @@ packages:
     resolution: {integrity: sha512-FPvF2XxTSikpJxcr+bHut2H4gJ17+18Uy20D5/F+SKzFap62R3cM5wH6b8WN3LyGSYeQilLEcJcR1fjBSI2S1A==}
     engines: {node: '>=0.10.0'}
 
+  react-refresh@0.17.0:
+    resolution: {integrity: sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==}
+    engines: {node: '>=0.10.0'}
+
   react-server-dom-parcel@19.1.0:
     resolution: {integrity: sha512-JkfPt/yV1ru8J1CTM0PD74HZZRQTjdoTU5eg2r6Xjn/TmFRS2J/4QsKdwu2X8NsA+ADnPHI8wKCgBh1HCmRr/A==}
     engines: {node: '>=0.10.0'}
@@ -9301,16 +9101,6 @@ packages:
       '@oxc-project/runtime':
         optional: true
 
-  rollup-plugin-inject@3.0.2:
-    resolution: {integrity: sha512-ptg9PQwzs3orn4jkgXJ74bfs5vYz1NCZlSQMBUA0wKcGp5i5pA1AO3fOUEte8enhGUC+iapTCzEWw2jEFFUO/w==}
-    deprecated: This package has been deprecated and is no longer maintained. Please use @rollup/plugin-inject.
-
-  rollup-plugin-node-polyfills@0.2.1:
-    resolution: {integrity: sha512-4kCrKPTJ6sK4/gLL/U5QzVT8cxJcofO0OU74tnB19F40cmuAKSzH5/siithxlofFEjwvw1YAhPmbvGNA6jEroA==}
-
-  rollup-pluginutils@2.8.2:
-    resolution: {integrity: sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==}
-
   rollup@4.34.8:
     resolution: {integrity: sha512-489gTVMzAYdiZHFVA/ig/iYFllCcWFHMvUHI1rpFmkoUtRlQxqh6/yiNqnYibjMZ2b/+FUQwldG+aLsEt6bglQ==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
@@ -9532,10 +9322,6 @@ packages:
     resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==}
     engines: {node: '>= 8'}
 
-  sourcemap-codec@1.4.8:
-    resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
-    deprecated: Please use @jridgewell/sourcemap-codec instead
-
   space-separated-tokens@2.0.2:
     resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==}
 
@@ -10042,13 +9828,6 @@ packages:
     resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
     engines: {node: '>= 0.8'}
 
-  unplugin-rsc@0.0.11:
-    resolution: {integrity: sha512-Sr/WGXBJ7Ur0lo7r/AqLWVufpcJ8DbtXl+zzzdJorEyp8uB2eRawYRIEmB6nqVIdEIJ9i6Iaysw3n+ng91IWFA==}
-
-  unplugin@1.10.1:
-    resolution: {integrity: sha512-d6Mhq8RJeGA8UfKCu54Um4lFA0eSaRa3XxdAJg8tIdxbu1ubW0hBCZUL7yI2uGyYCRndvbK8FLHzqy2XKfeMsg==}
-    engines: {node: '>=14.0.0'}
-
   update-browserslist-db@1.1.3:
     resolution: {integrity: sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==}
     hasBin: true
@@ -10165,14 +9944,6 @@ packages:
       vite:
         optional: true
 
-  vite-tsconfig-paths@5.1.4:
-    resolution: {integrity: sha512-cYj0LRuLV2c2sMqhqhGpaO3LretdtMn/BVX4cPLanIZuwwrkVl+lK84E/miEXkCHWXuq65rhNN4rXsBcOB3S4w==}
-    peerDependencies:
-      vite: '*'
-    peerDependenciesMeta:
-      vite:
-        optional: true
-
   vite@5.1.3:
     resolution: {integrity: sha512-UfmUD36DKkqhi/F75RrxvPpry+9+tTkrXfMNZD+SboZqBCMsxKtO52XeGzzuh7ioz+Eo/SYDBbdb0Z7vgcDJew==}
     engines: {node: ^18.0.0 || >=20.0.0}
@@ -10281,6 +10052,14 @@ packages:
       yaml:
         optional: true
 
+  vitefu@1.0.6:
+    resolution: {integrity: sha512-+Rex1GlappUyNN6UfwbVZne/9cYC4+R2XDk9xkNXBKMw6HQagdX9PgZ8V2v1WUSK1wfBLp7qbI1+XSNIlB1xmA==}
+    peerDependencies:
+      vite: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0
+    peerDependenciesMeta:
+      vite:
+        optional: true
+
   w3c-xmlserializer@4.0.0:
     resolution: {integrity: sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==}
     engines: {node: '>=14'}
@@ -10316,13 +10095,6 @@ packages:
     resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
     engines: {node: '>=12'}
 
-  webpack-sources@3.2.3:
-    resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
-    engines: {node: '>=10.13.0'}
-
-  webpack-virtual-modules@0.6.2:
-    resolution: {integrity: sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==}
-
   whatwg-encoding@2.0.0:
     resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==}
     engines: {node: '>=12'}
@@ -10395,16 +10167,6 @@ packages:
     engines: {node: '>=16'}
     hasBin: true
 
-  wrangler@3.114.5:
-    resolution: {integrity: sha512-iMYC+d0ssbUQDhwRXmcRwidbuvY/dFV8bmTMdVJ1tLTLcmpWrr7bmQZwLawOvjaKBzwQwj7Qp3TKPg6IyRslnQ==}
-    engines: {node: '>=16.17.0'}
-    hasBin: true
-    peerDependencies:
-      '@cloudflare/workers-types': ^4.20250408.0
-    peerDependenciesMeta:
-      '@cloudflare/workers-types':
-        optional: true
-
   wrangler@4.2.0:
     resolution: {integrity: sha512-wY+jq6tsaBVrxCesJ9NF9R63T+96W6Ht9xEkAdw9JnkstUWM6lGywMOeupYP8Ji8x4roNa98XrT0Gw8qu+QRNQ==}
     engines: {node: '>=18.0.0'}
@@ -10509,6 +10271,9 @@ packages:
   youch@3.3.4:
     resolution: {integrity: sha512-UeVBXie8cA35DS6+nBkls68xaBBXCye0CNznrhszZjTbRVnJKQuNsyLKBTTL4ln1o1rh2PKtv35twV7irj5SEg==}
 
+  zimmerframe@1.1.2:
+    resolution: {integrity: sha512-rAbqEGa8ovJy4pyBxZM70hg4pE6gDgaQ0Sl9M3enG3I0d6H4XSAM3GeNGLKnsBpuijUow064sf7ww1nutC5/3w==}
+
   zod-validation-error@3.4.0:
     resolution: {integrity: sha512-ZOPR9SVY6Pb2qqO5XHt+MkkTRxGXb4EVtnjc9JpXUOtUB1T9Ru7mZOT361AN3MsetVe7R0a1KZshJDZdgp9miQ==}
     engines: {node: '>=18.0.0'}
@@ -10555,26 +10320,6 @@ snapshots:
 
   '@babel/compat-data@7.27.5': {}
 
-  '@babel/core@7.24.4':
-    dependencies:
-      '@ampproject/remapping': 2.2.1
-      '@babel/code-frame': 7.27.1
-      '@babel/generator': 7.27.5
-      '@babel/helper-compilation-targets': 7.27.2
-      '@babel/helper-module-transforms': 7.27.3(@babel/core@7.24.4)
-      '@babel/helpers': 7.27.6
-      '@babel/parser': 7.27.5
-      '@babel/template': 7.27.2
-      '@babel/traverse': 7.27.4
-      '@babel/types': 7.27.6
-      convert-source-map: 2.0.0
-      debug: 4.4.0
-      gensync: 1.0.0-beta.2
-      json5: 2.2.3
-      semver: 6.3.1
-    transitivePeerDependencies:
-      - supports-color
-
   '@babel/core@7.27.4':
     dependencies:
       '@ampproject/remapping': 2.2.1
@@ -10651,7 +10396,7 @@ snapshots:
     dependencies:
       '@babel/core': 7.27.4
       '@babel/helper-compilation-targets': 7.27.2
-      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-plugin-utils': 7.27.1
       debug: 4.4.0
       lodash.debounce: 4.0.8
       resolve: 1.22.8
@@ -10688,10 +10433,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-module-imports@7.24.3':
-    dependencies:
-      '@babel/types': 7.27.6
-
   '@babel/helper-module-imports@7.27.1':
     dependencies:
       '@babel/traverse': 7.27.4
@@ -10699,15 +10440,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-module-transforms@7.27.3(@babel/core@7.24.4)':
-    dependencies:
-      '@babel/core': 7.24.4
-      '@babel/helper-module-imports': 7.27.1
-      '@babel/helper-validator-identifier': 7.27.1
-      '@babel/traverse': 7.27.4
-    transitivePeerDependencies:
-      - supports-color
-
   '@babel/helper-module-transforms@7.27.3(@babel/core@7.27.4)':
     dependencies:
       '@babel/core': 7.27.4
@@ -10721,10 +10453,10 @@ snapshots:
     dependencies:
       '@babel/types': 7.27.6
 
-  '@babel/helper-plugin-utils@7.24.0': {}
-
   '@babel/helper-plugin-utils@7.26.5': {}
 
+  '@babel/helper-plugin-utils@7.27.1': {}
+
   '@babel/helper-remap-async-to-generator@7.22.9(@babel/core@7.27.4)':
     dependencies:
       '@babel/core': 7.27.4
@@ -10901,7 +10633,7 @@ snapshots:
   '@babel/plugin-syntax-flow@7.18.6(@babel/core@7.27.4)':
     dependencies:
       '@babel/core': 7.27.4
-      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-plugin-utils': 7.27.1
 
   '@babel/plugin-syntax-import-assertions@7.22.5(@babel/core@7.27.4)':
     dependencies:
@@ -11253,15 +10985,15 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-react-jsx-self@7.25.9(@babel/core@7.27.4)':
+  '@babel/plugin-transform-react-jsx-self@7.27.1(@babel/core@7.27.4)':
     dependencies:
       '@babel/core': 7.27.4
-      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-plugin-utils': 7.27.1
 
-  '@babel/plugin-transform-react-jsx-source@7.25.9(@babel/core@7.27.4)':
+  '@babel/plugin-transform-react-jsx-source@7.27.1(@babel/core@7.27.4)':
     dependencies:
       '@babel/core': 7.27.4
-      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-plugin-utils': 7.27.1
 
   '@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.27.4)':
     dependencies:
@@ -11494,21 +11226,6 @@ snapshots:
       '@babel/parser': 7.27.5
       '@babel/types': 7.27.6
 
-  '@babel/traverse@7.24.1':
-    dependencies:
-      '@babel/code-frame': 7.27.1
-      '@babel/generator': 7.27.5
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-function-name': 7.23.0
-      '@babel/helper-hoist-variables': 7.22.5
-      '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/parser': 7.27.5
-      '@babel/types': 7.27.6
-      debug: 4.4.0
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
-
   '@babel/traverse@7.27.4':
     dependencies:
       '@babel/code-frame': 7.27.1
@@ -11732,10 +11449,6 @@ snapshots:
       human-id: 1.0.2
       prettier: 2.8.8
 
-  '@cloudflare/kv-asset-handler@0.3.4':
-    dependencies:
-      mime: 3.0.0
-
   '@cloudflare/kv-asset-handler@0.4.0':
     dependencies:
       mime: 3.0.0
@@ -11767,20 +11480,6 @@ snapshots:
       - utf-8-validate
       - workerd
 
-  '@cloudflare/vite-plugin@0.1.7(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))(workerd@1.20250224.0)(wrangler@3.114.5(@cloudflare/workers-types@4.20250317.0))':
-    dependencies:
-      '@cloudflare/unenv-preset': 1.1.1(unenv@2.0.0-rc.1)(workerd@1.20250224.0)
-      '@hattip/adapter-node': 0.0.49
-      miniflare: 3.20250214.1
-      unenv: 2.0.0-rc.1
-      vite: 6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)
-      wrangler: 3.114.5(@cloudflare/workers-types@4.20250317.0)
-      ws: 8.18.0
-    transitivePeerDependencies:
-      - bufferutil
-      - utf-8-validate
-      - workerd
-
   '@cloudflare/workerd-darwin-64@1.20250224.0':
     optional: true
 
@@ -11820,16 +11519,6 @@ snapshots:
 
   '@emotion/hash@0.9.1': {}
 
-  '@esbuild-plugins/node-globals-polyfill@0.2.3(esbuild@0.17.19)':
-    dependencies:
-      esbuild: 0.17.19
-
-  '@esbuild-plugins/node-modules-polyfill@0.2.2(esbuild@0.17.19)':
-    dependencies:
-      esbuild: 0.17.19
-      escape-string-regexp: 4.0.0
-      rollup-plugin-node-polyfills: 0.2.1
-
   '@esbuild/aix-ppc64@0.19.12':
     optional: true
 
@@ -11839,9 +11528,6 @@ snapshots:
   '@esbuild/aix-ppc64@0.25.0':
     optional: true
 
-  '@esbuild/android-arm64@0.17.19':
-    optional: true
-
   '@esbuild/android-arm64@0.19.12':
     optional: true
 
@@ -11851,9 +11537,6 @@ snapshots:
   '@esbuild/android-arm64@0.25.0':
     optional: true
 
-  '@esbuild/android-arm@0.17.19':
-    optional: true
-
   '@esbuild/android-arm@0.19.12':
     optional: true
 
@@ -11863,9 +11546,6 @@ snapshots:
   '@esbuild/android-arm@0.25.0':
     optional: true
 
-  '@esbuild/android-x64@0.17.19':
-    optional: true
-
   '@esbuild/android-x64@0.19.12':
     optional: true
 
@@ -11875,9 +11555,6 @@ snapshots:
   '@esbuild/android-x64@0.25.0':
     optional: true
 
-  '@esbuild/darwin-arm64@0.17.19':
-    optional: true
-
   '@esbuild/darwin-arm64@0.19.12':
     optional: true
 
@@ -11887,9 +11564,6 @@ snapshots:
   '@esbuild/darwin-arm64@0.25.0':
     optional: true
 
-  '@esbuild/darwin-x64@0.17.19':
-    optional: true
-
   '@esbuild/darwin-x64@0.19.12':
     optional: true
 
@@ -11899,9 +11573,6 @@ snapshots:
   '@esbuild/darwin-x64@0.25.0':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.17.19':
-    optional: true
-
   '@esbuild/freebsd-arm64@0.19.12':
     optional: true
 
@@ -11911,9 +11582,6 @@ snapshots:
   '@esbuild/freebsd-arm64@0.25.0':
     optional: true
 
-  '@esbuild/freebsd-x64@0.17.19':
-    optional: true
-
   '@esbuild/freebsd-x64@0.19.12':
     optional: true
 
@@ -11923,9 +11591,6 @@ snapshots:
   '@esbuild/freebsd-x64@0.25.0':
     optional: true
 
-  '@esbuild/linux-arm64@0.17.19':
-    optional: true
-
   '@esbuild/linux-arm64@0.19.12':
     optional: true
 
@@ -11935,9 +11600,6 @@ snapshots:
   '@esbuild/linux-arm64@0.25.0':
     optional: true
 
-  '@esbuild/linux-arm@0.17.19':
-    optional: true
-
   '@esbuild/linux-arm@0.19.12':
     optional: true
 
@@ -11947,9 +11609,6 @@ snapshots:
   '@esbuild/linux-arm@0.25.0':
     optional: true
 
-  '@esbuild/linux-ia32@0.17.19':
-    optional: true
-
   '@esbuild/linux-ia32@0.19.12':
     optional: true
 
@@ -11959,9 +11618,6 @@ snapshots:
   '@esbuild/linux-ia32@0.25.0':
     optional: true
 
-  '@esbuild/linux-loong64@0.17.19':
-    optional: true
-
   '@esbuild/linux-loong64@0.19.12':
     optional: true
 
@@ -11971,9 +11627,6 @@ snapshots:
   '@esbuild/linux-loong64@0.25.0':
     optional: true
 
-  '@esbuild/linux-mips64el@0.17.19':
-    optional: true
-
   '@esbuild/linux-mips64el@0.19.12':
     optional: true
 
@@ -11983,9 +11636,6 @@ snapshots:
   '@esbuild/linux-mips64el@0.25.0':
     optional: true
 
-  '@esbuild/linux-ppc64@0.17.19':
-    optional: true
-
   '@esbuild/linux-ppc64@0.19.12':
     optional: true
 
@@ -11995,9 +11645,6 @@ snapshots:
   '@esbuild/linux-ppc64@0.25.0':
     optional: true
 
-  '@esbuild/linux-riscv64@0.17.19':
-    optional: true
-
   '@esbuild/linux-riscv64@0.19.12':
     optional: true
 
@@ -12007,9 +11654,6 @@ snapshots:
   '@esbuild/linux-riscv64@0.25.0':
     optional: true
 
-  '@esbuild/linux-s390x@0.17.19':
-    optional: true
-
   '@esbuild/linux-s390x@0.19.12':
     optional: true
 
@@ -12019,9 +11663,6 @@ snapshots:
   '@esbuild/linux-s390x@0.25.0':
     optional: true
 
-  '@esbuild/linux-x64@0.17.19':
-    optional: true
-
   '@esbuild/linux-x64@0.19.12':
     optional: true
 
@@ -12037,9 +11678,6 @@ snapshots:
   '@esbuild/netbsd-arm64@0.25.0':
     optional: true
 
-  '@esbuild/netbsd-x64@0.17.19':
-    optional: true
-
   '@esbuild/netbsd-x64@0.19.12':
     optional: true
 
@@ -12055,9 +11693,6 @@ snapshots:
   '@esbuild/openbsd-arm64@0.25.0':
     optional: true
 
-  '@esbuild/openbsd-x64@0.17.19':
-    optional: true
-
   '@esbuild/openbsd-x64@0.19.12':
     optional: true
 
@@ -12067,9 +11702,6 @@ snapshots:
   '@esbuild/openbsd-x64@0.25.0':
     optional: true
 
-  '@esbuild/sunos-x64@0.17.19':
-    optional: true
-
   '@esbuild/sunos-x64@0.19.12':
     optional: true
 
@@ -12079,9 +11711,6 @@ snapshots:
   '@esbuild/sunos-x64@0.25.0':
     optional: true
 
-  '@esbuild/win32-arm64@0.17.19':
-    optional: true
-
   '@esbuild/win32-arm64@0.19.12':
     optional: true
 
@@ -12091,9 +11720,6 @@ snapshots:
   '@esbuild/win32-arm64@0.25.0':
     optional: true
 
-  '@esbuild/win32-ia32@0.17.19':
-    optional: true
-
   '@esbuild/win32-ia32@0.19.12':
     optional: true
 
@@ -12103,9 +11729,6 @@ snapshots:
   '@esbuild/win32-ia32@0.25.0':
     optional: true
 
-  '@esbuild/win32-x64@0.17.19':
-    optional: true
-
   '@esbuild/win32-x64@0.19.12':
     optional: true
 
@@ -12172,6 +11795,22 @@ snapshots:
       cac: 6.7.14
       mime-types: 2.1.35
 
+  '@hiogawa/transforms@0.1.1':
+    dependencies:
+      estree-walker: 3.0.3
+      magic-string: 0.30.17
+      periscopic: 4.0.2
+
+  '@hiogawa/vite-rsc@0.4.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))':
+    dependencies:
+      '@hiogawa/transforms': 0.1.1
+      '@mjackson/node-fetch-server': 0.6.1
+      magic-string: 0.30.17
+      react: 19.1.0
+      react-dom: 19.1.0(react@19.1.0)
+      vite: 6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)
+      vitefu: 1.0.6(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))
+
   '@humanwhocodes/config-array@0.11.14':
     dependencies:
       '@humanwhocodes/object-schema': 2.0.3
@@ -12304,22 +11943,6 @@ snapshots:
 
   '@istanbuljs/schema@0.1.3': {}
 
-  '@jacob-ebey/react-server-dom-vite@19.0.0-experimental.14(react-dom@19.1.0(react@19.1.0))(react@19.1.0)':
-    dependencies:
-      react: 19.1.0
-      react-dom: 19.1.0(react@19.1.0)
-
-  '@jacob-ebey/vite-react-server-dom@0.0.12(@jacob-ebey/react-server-dom-vite@19.0.0-experimental.14(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(rollup@4.43.0)(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))':
-    dependencies:
-      '@jacob-ebey/react-server-dom-vite': 19.0.0-experimental.14(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
-      '@mjackson/node-fetch-server': 0.5.0
-      '@vitejs/plugin-react': 4.3.4(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))
-      unplugin-rsc: 0.0.11(rollup@4.43.0)
-      vite: 6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)
-    transitivePeerDependencies:
-      - rollup
-      - supports-color
-
   '@jest/console@29.7.0':
     dependencies:
       '@jest/types': 29.6.3
@@ -12598,8 +12221,6 @@ snapshots:
 
   '@mjackson/node-fetch-server@0.2.0': {}
 
-  '@mjackson/node-fetch-server@0.5.0': {}
-
   '@mjackson/node-fetch-server@0.6.1': {}
 
   '@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.3':
@@ -13681,6 +13302,8 @@ snapshots:
   '@rolldown/binding-win32-x64-msvc@1.0.0-beta.7-commit.e117288':
     optional: true
 
+  '@rolldown/pluginutils@1.0.0-beta.11': {}
+
   '@rollup/pluginutils@5.1.0(rollup@4.43.0)':
     dependencies:
       '@types/estree': 1.0.6
@@ -14550,13 +14173,14 @@ snapshots:
       - terser
       - ts-node
 
-  '@vitejs/plugin-react@4.3.4(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))':
+  '@vitejs/plugin-react@4.5.2(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))':
     dependencies:
       '@babel/core': 7.27.4
-      '@babel/plugin-transform-react-jsx-self': 7.25.9(@babel/core@7.27.4)
-      '@babel/plugin-transform-react-jsx-source': 7.25.9(@babel/core@7.27.4)
+      '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.27.4)
+      '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.27.4)
+      '@rolldown/pluginutils': 1.0.0-beta.11
       '@types/babel__core': 7.20.5
-      react-refresh: 0.14.2
+      react-refresh: 0.17.0
       vite: 6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)
     transitivePeerDependencies:
       - supports-color
@@ -15709,31 +15333,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  esbuild@0.17.19:
-    optionalDependencies:
-      '@esbuild/android-arm': 0.17.19
-      '@esbuild/android-arm64': 0.17.19
-      '@esbuild/android-x64': 0.17.19
-      '@esbuild/darwin-arm64': 0.17.19
-      '@esbuild/darwin-x64': 0.17.19
-      '@esbuild/freebsd-arm64': 0.17.19
-      '@esbuild/freebsd-x64': 0.17.19
-      '@esbuild/linux-arm': 0.17.19
-      '@esbuild/linux-arm64': 0.17.19
-      '@esbuild/linux-ia32': 0.17.19
-      '@esbuild/linux-loong64': 0.17.19
-      '@esbuild/linux-mips64el': 0.17.19
-      '@esbuild/linux-ppc64': 0.17.19
-      '@esbuild/linux-riscv64': 0.17.19
-      '@esbuild/linux-s390x': 0.17.19
-      '@esbuild/linux-x64': 0.17.19
-      '@esbuild/netbsd-x64': 0.17.19
-      '@esbuild/openbsd-x64': 0.17.19
-      '@esbuild/sunos-x64': 0.17.19
-      '@esbuild/win32-arm64': 0.17.19
-      '@esbuild/win32-ia32': 0.17.19
-      '@esbuild/win32-x64': 0.17.19
-
   esbuild@0.19.12:
     optionalDependencies:
       '@esbuild/aix-ppc64': 0.19.12
@@ -16142,8 +15741,6 @@ snapshots:
       '@types/estree-jsx': 1.0.5
       '@types/unist': 3.0.2
 
-  estree-walker@0.6.1: {}
-
   estree-walker@2.0.2: {}
 
   estree-walker@3.0.3:
@@ -17625,10 +17222,6 @@ snapshots:
 
   lz-string@1.4.4: {}
 
-  magic-string@0.25.9:
-    dependencies:
-      sourcemap-codec: 1.4.8
-
   magic-string@0.30.17:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.0
@@ -18305,23 +17898,6 @@ snapshots:
 
   min-indent@1.0.1: {}
 
-  miniflare@3.20250214.1:
-    dependencies:
-      '@cspotcode/source-map-support': 0.8.1
-      acorn: 8.14.0
-      acorn-walk: 8.3.2
-      exit-hook: 2.2.1
-      glob-to-regexp: 0.4.1
-      stoppable: 1.1.0
-      undici: 5.28.5
-      workerd: 1.20250224.0
-      ws: 8.18.0
-      youch: 3.2.3
-      zod: 3.22.3
-    transitivePeerDependencies:
-      - bufferutil
-      - utf-8-validate
-
   miniflare@3.20250408.0:
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
@@ -18899,6 +18475,12 @@ snapshots:
       estree-walker: 3.0.3
       is-reference: 3.0.2
 
+  periscopic@4.0.2:
+    dependencies:
+      '@types/estree': 1.0.7
+      is-reference: 3.0.2
+      zimmerframe: 1.1.2
+
   picocolors@1.1.1: {}
 
   picomatch@2.3.1: {}
@@ -19129,6 +18711,8 @@ snapshots:
 
   react-refresh@0.16.0: {}
 
+  react-refresh@0.17.0: {}
+
   react-server-dom-parcel@19.1.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0):
     dependencies:
       react: 19.1.0
@@ -19428,20 +19012,6 @@ snapshots:
     transitivePeerDependencies:
       - typescript
 
-  rollup-plugin-inject@3.0.2:
-    dependencies:
-      estree-walker: 0.6.1
-      magic-string: 0.25.9
-      rollup-pluginutils: 2.8.2
-
-  rollup-plugin-node-polyfills@0.2.1:
-    dependencies:
-      rollup-plugin-inject: 3.0.2
-
-  rollup-pluginutils@2.8.2:
-    dependencies:
-      estree-walker: 0.6.1
-
   rollup@4.34.8:
     dependencies:
       '@types/estree': 1.0.6
@@ -19789,8 +19359,6 @@ snapshots:
     dependencies:
       whatwg-url: 7.1.0
 
-  sourcemap-codec@1.4.8: {}
-
   space-separated-tokens@2.0.2: {}
 
   spawndamnit@2.0.0:
@@ -20397,25 +19965,6 @@ snapshots:
 
   unpipe@1.0.0: {}
 
-  unplugin-rsc@0.0.11(rollup@4.43.0):
-    dependencies:
-      '@babel/core': 7.24.4
-      '@babel/helper-module-imports': 7.24.3
-      '@babel/helper-plugin-utils': 7.24.0
-      '@babel/traverse': 7.24.1
-      '@rollup/pluginutils': 5.1.0(rollup@4.43.0)
-      unplugin: 1.10.1
-    transitivePeerDependencies:
-      - rollup
-      - supports-color
-
-  unplugin@1.10.1:
-    dependencies:
-      acorn: 8.14.1
-      chokidar: 3.6.0
-      webpack-sources: 3.2.3
-      webpack-virtual-modules: 0.6.2
-
   update-browserslist-db@1.1.3(browserslist@4.24.5):
     dependencies:
       browserslist: 4.24.5
@@ -20669,17 +20218,6 @@ snapshots:
       - supports-color
       - typescript
 
-  vite-tsconfig-paths@5.1.4(typescript@5.4.5)(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)):
-    dependencies:
-      debug: 4.4.0
-      globrex: 0.1.2
-      tsconfck: 3.0.3(typescript@5.4.5)
-    optionalDependencies:
-      vite: 6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
   vite@5.1.3(@types/node@22.14.0)(lightningcss@1.30.1)(terser@5.15.0):
     dependencies:
       esbuild: 0.19.12
@@ -20733,6 +20271,10 @@ snapshots:
       tsx: 4.19.3
       yaml: 2.6.0
 
+  vitefu@1.0.6(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)):
+    optionalDependencies:
+      vite: 6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0)
+
   w3c-xmlserializer@4.0.0:
     dependencies:
       xml-name-validator: 4.0.0
@@ -20771,10 +20313,6 @@ snapshots:
 
   webidl-conversions@7.0.0: {}
 
-  webpack-sources@3.2.3: {}
-
-  webpack-virtual-modules@0.6.2: {}
-
   whatwg-encoding@2.0.0:
     dependencies:
       iconv-lite: 0.6.3
@@ -20876,26 +20414,6 @@ snapshots:
       '@cloudflare/workerd-linux-arm64': 1.20250224.0
       '@cloudflare/workerd-windows-64': 1.20250224.0
 
-  wrangler@3.114.5(@cloudflare/workers-types@4.20250317.0):
-    dependencies:
-      '@cloudflare/kv-asset-handler': 0.3.4
-      '@cloudflare/unenv-preset': 2.0.2(unenv@2.0.0-rc.14)(workerd@1.20250224.0)
-      '@esbuild-plugins/node-globals-polyfill': 0.2.3(esbuild@0.17.19)
-      '@esbuild-plugins/node-modules-polyfill': 0.2.2(esbuild@0.17.19)
-      blake3-wasm: 2.1.5
-      esbuild: 0.17.19
-      miniflare: 3.20250408.0
-      path-to-regexp: 6.3.0
-      unenv: 2.0.0-rc.14
-      workerd: 1.20250224.0
-    optionalDependencies:
-      '@cloudflare/workers-types': 4.20250317.0
-      fsevents: 2.3.3
-      sharp: 0.33.5
-    transitivePeerDependencies:
-      - bufferutil
-      - utf-8-validate
-
   wrangler@4.2.0(@cloudflare/workers-types@4.20250317.0):
     dependencies:
       '@cloudflare/kv-asset-handler': 0.4.0
@@ -21006,6 +20524,8 @@ snapshots:
       mustache: 4.2.0
       stacktracey: 2.1.8
 
+  zimmerframe@1.1.2: {}
+
   zod-validation-error@3.4.0(zod@3.24.2):
     dependencies:
       zod: 3.24.2

From 7883ba8c6f36f5b3956b8c6923349840707a8a7a Mon Sep 17 00:00:00 2001
From: Hiroshi Ogawa 
Date: Wed, 18 Jun 2025 12:36:53 +0900
Subject: [PATCH 140/143] chore(rsc): update vite-rsc and add css example
 (#13823)

---
 contributors.yml                                   |  1 +
 integration/helpers/rsc-vite/package.json          |  2 +-
 playground/rsc-vite/package.json                   |  2 +-
 .../rsc-vite/src/routes/home/home.client.css       |  4 ++++
 .../rsc-vite/src/routes/home/home.client.tsx       |  3 ++-
 playground/rsc-vite/src/routes/root/root.css       |  4 ++++
 playground/rsc-vite/src/routes/root/root.tsx       |  4 +++-
 pnpm-lock.yaml                                     | 14 +++++++-------
 8 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 playground/rsc-vite/src/routes/home/home.client.css
 create mode 100644 playground/rsc-vite/src/routes/root/root.css

diff --git a/contributors.yml b/contributors.yml
index a603914de0..7cab60befb 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -132,6 +132,7 @@
 - hampelm
 - harshmangalam
 - hernanif1
+- hi-ogawa
 - HK-SHAO
 - holynewbie
 - hongji00
diff --git a/integration/helpers/rsc-vite/package.json b/integration/helpers/rsc-vite/package.json
index 43b3e09d18..12413185f1 100644
--- a/integration/helpers/rsc-vite/package.json
+++ b/integration/helpers/rsc-vite/package.json
@@ -9,7 +9,7 @@
     "typecheck": "tsc"
   },
   "devDependencies": {
-    "@hiogawa/vite-rsc": "0.4.1",
+    "@hiogawa/vite-rsc": "0.4.2",
     "@types/express": "^5.0.0",
     "@types/node": "^22.13.1",
     "@types/react": "^19.1.8",
diff --git a/playground/rsc-vite/package.json b/playground/rsc-vite/package.json
index f8aeca055c..aef4b95daa 100644
--- a/playground/rsc-vite/package.json
+++ b/playground/rsc-vite/package.json
@@ -9,7 +9,7 @@
     "typecheck": "tsc"
   },
   "devDependencies": {
-    "@hiogawa/vite-rsc": "0.4.1",
+    "@hiogawa/vite-rsc": "0.4.2",
     "@types/express": "^5.0.0",
     "@types/node": "^22.13.1",
     "@types/react": "^19.1.8",
diff --git a/playground/rsc-vite/src/routes/home/home.client.css b/playground/rsc-vite/src/routes/home/home.client.css
new file mode 100644
index 0000000000..9498c5c2ad
--- /dev/null
+++ b/playground/rsc-vite/src/routes/home/home.client.css
@@ -0,0 +1,4 @@
+.client-box {
+  border: 1px solid black;
+  padding: 5px;
+}
diff --git a/playground/rsc-vite/src/routes/home/home.client.tsx b/playground/rsc-vite/src/routes/home/home.client.tsx
index 308982b883..9f1ea77653 100644
--- a/playground/rsc-vite/src/routes/home/home.client.tsx
+++ b/playground/rsc-vite/src/routes/home/home.client.tsx
@@ -4,6 +4,7 @@ import * as React from "react";
 import { type ClientLoaderFunctionArgs, useLoaderData } from "react-router";
 
 import { Counter } from "../../counter";
+import "./home.client.css";
 
 import type { loader } from "./home";
 
@@ -34,7 +35,7 @@ export function HomeForm({ fn }: { fn: () => unknown }) {
   const [state, formAction, isPending] = React.useActionState(fn, null);
 
   return (
-    
    
+    
       
diff --git a/playground/rsc-vite/src/routes/root/root.css b/playground/rsc-vite/src/routes/root/root.css
new file mode 100644
index 0000000000..f43a09cd0c
--- /dev/null
+++ b/playground/rsc-vite/src/routes/root/root.css
@@ -0,0 +1,4 @@
+.server-box {
+  border: 1px solid black;
+  padding: 10px;
+}
diff --git a/playground/rsc-vite/src/routes/root/root.tsx b/playground/rsc-vite/src/routes/root/root.tsx
index 2387832d3e..af07cd1a21 100644
--- a/playground/rsc-vite/src/routes/root/root.tsx
+++ b/playground/rsc-vite/src/routes/root/root.tsx
@@ -3,6 +3,7 @@ import { type unstable_MiddlewareFunction } from "react-router/rsc";
 
 import { Counter } from "../../counter";
 import { ErrorReporter, NavigationState } from "./root.client";
+import "./root.css"
 
 export { shouldRevalidate } from "./root.client";
 
@@ -63,9 +64,10 @@ export function Layout({ children }: { children: React.ReactNode }) {
         
         React Server
         
+        {import.meta.viteRsc.loadCss()}
       
       
-        
    
+        
    
           
    
             Home
             {" | "}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d636988dfa..8a4ac656f4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -547,8 +547,8 @@ importers:
         version: link:../../../packages/react-router
     devDependencies:
       '@hiogawa/vite-rsc':
-        specifier: 0.4.1
-        version: 0.4.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))
+        specifier: 0.4.2
+        version: 0.4.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))
       '@types/express':
         specifier: ^5.0.0
         version: 5.0.1
@@ -1852,8 +1852,8 @@ importers:
         version: link:../../packages/react-router
     devDependencies:
       '@hiogawa/vite-rsc':
-        specifier: 0.4.1
-        version: 0.4.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))
+        specifier: 0.4.2
+        version: 0.4.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))
       '@types/express':
         specifier: ^5.0.0
         version: 5.0.1
@@ -3451,8 +3451,8 @@ packages:
   '@hiogawa/transforms@0.1.1':
     resolution: {integrity: sha512-NAJ38s8lMMSDv7HOupWt1w5EJ8poMOWPd+JCmmfHg8sdWgFCjCGHnaDi5pTGEBxYLzso9K2urfyK2rW6HORsHw==}
 
-  '@hiogawa/vite-rsc@0.4.1':
-    resolution: {integrity: sha512-GQ19F8q004E7wjCL/RARhblPXx6W2SC+hdVc8xw85xPy22iU0Ft67jJtY1gI7k3jqoPWrBNaUjgmemJIZRoazw==}
+  '@hiogawa/vite-rsc@0.4.2':
+    resolution: {integrity: sha512-MKHX7B6mqcynBJp9MQQLgMipOavvYIfyhasjZGcJqeMhB8kmGo6QHfRxZheiDo1jGjWHyMsHR1ayHIuMcrK+2w==}
     peerDependencies:
       react: '*'
       react-dom: '*'
@@ -11801,7 +11801,7 @@ snapshots:
       magic-string: 0.30.17
       periscopic: 4.0.2
 
-  '@hiogawa/vite-rsc@0.4.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))':
+  '@hiogawa/vite-rsc@0.4.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite@6.2.5(@types/node@22.14.0)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.19.3)(yaml@2.6.0))':
     dependencies:
       '@hiogawa/transforms': 0.1.1
       '@mjackson/node-fetch-server': 0.6.1

From 4303fcb98c46d9760512c9d7d302348073f21142 Mon Sep 17 00:00:00 2001
From: Mark Dalgleish 
Date: Fri, 20 Jun 2025 15:39:22 +1000
Subject: [PATCH 141/143] fix(rsc): export default root ErrorBoundary (#13838)

---
 packages/react-router/index.ts                |   1 +
 packages/react-router/lib/dom/ssr/routes.tsx  |   2 +-
 packages/react-router/lib/rsc/browser.tsx     |  30 ++-
 .../react-router/lib/rsc/errorBoundaries.tsx  | 181 ++++++++++++++++++
 packages/react-router/lib/rsc/server.ssr.tsx  |  19 +-
 5 files changed, 219 insertions(+), 14 deletions(-)
 create mode 100644 packages/react-router/lib/rsc/errorBoundaries.tsx

diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts
index e4fe91afa7..60e1dc34b9 100644
--- a/packages/react-router/index.ts
+++ b/packages/react-router/index.ts
@@ -296,6 +296,7 @@ export {
   RSCStaticRouter as unstable_RSCStaticRouter,
 } from "./lib/rsc/server.ssr";
 export { getServerStream as unstable_getServerStream } from "./lib/rsc/html-stream/browser";
+export { RSCDefaultRootErrorBoundary as UNSAFE_RSCDefaultRootErrorBoundary } from "./lib/rsc/errorBoundaries";
 
 ///////////////////////////////////////////////////////////////////////////////
 // DANGER! PLEASE READ ME!
diff --git a/packages/react-router/lib/dom/ssr/routes.tsx b/packages/react-router/lib/dom/ssr/routes.tsx
index 39f5ca9b6c..fca93b2953 100644
--- a/packages/react-router/lib/dom/ssr/routes.tsx
+++ b/packages/react-router/lib/dom/ssr/routes.tsx
@@ -211,7 +211,7 @@ function preventInvalidServerHandlerCall(
   }
 }
 
-function noActionDefinedError(
+export function noActionDefinedError(
   type: "action" | "clientAction",
   routeId: string
 ) {
diff --git a/packages/react-router/lib/rsc/browser.tsx b/packages/react-router/lib/rsc/browser.tsx
index 0776110510..d232f22f7d 100644
--- a/packages/react-router/lib/rsc/browser.tsx
+++ b/packages/react-router/lib/rsc/browser.tsx
@@ -34,7 +34,11 @@ import {
 } from "../dom/ssr/single-fetch";
 import { createRequestInit } from "../dom/ssr/data";
 import { getHydrationData } from "../dom/ssr/hydration";
-import { shouldHydrateRouteLoader } from "../dom/ssr/routes";
+import {
+  noActionDefinedError,
+  shouldHydrateRouteLoader,
+} from "../dom/ssr/routes";
+import { RSCRouterGlobalErrorBoundary } from "./errorBoundaries";
 
 export type DecodeServerResponseFunction = (
   body: ReadableStream
@@ -446,6 +450,18 @@ export function RSCHydratedRouter({
     }
   }, []);
 
+  let [location, setLocation] = React.useState(router.state.location);
+
+  React.useLayoutEffect(
+    () =>
+      router.subscribe((newState) => {
+        if (newState.location !== location) {
+          setLocation(newState.location);
+        }
+      }),
+    [router, location]
+  );
+
   React.useEffect(() => {
     if (
       routeDiscovery === "lazy" ||
@@ -540,9 +556,11 @@ export function RSCHydratedRouter({
 
   return (
     
-      
-        
-      
+      
+        
+          
+        
+      
     
   );
 }
@@ -625,7 +643,9 @@ function createRouteFromServerManifest(
           })
       : match.hasAction
       ? (_, singleFetch) => callSingleFetch(singleFetch)
-      : undefined,
+      : () => {
+          throw noActionDefinedError("action", match.id);
+        },
     path: match.path,
     shouldRevalidate: match.shouldRevalidate,
     // We always have a "loader" in this RSC world since even if we don't
diff --git a/packages/react-router/lib/rsc/errorBoundaries.tsx b/packages/react-router/lib/rsc/errorBoundaries.tsx
new file mode 100644
index 0000000000..4a1fcb4f44
--- /dev/null
+++ b/packages/react-router/lib/rsc/errorBoundaries.tsx
@@ -0,0 +1,181 @@
+import React from "react";
+import { useRouteError } from "../hooks";
+import type { Location } from "../router/history";
+import { isRouteErrorResponse } from "../router/utils";
+import { ENABLE_DEV_WARNINGS } from "../context";
+
+type RSCRouterGlobalErrorBoundaryProps = React.PropsWithChildren<{
+  location: Location;
+}>;
+
+type RSCRouterGlobalErrorBoundaryState = {
+  error: null | Error;
+  location: Location;
+};
+
+export class RSCRouterGlobalErrorBoundary extends React.Component<
+  RSCRouterGlobalErrorBoundaryProps,
+  RSCRouterGlobalErrorBoundaryState
+> {
+  constructor(props: RSCRouterGlobalErrorBoundaryProps) {
+    super(props);
+    this.state = { error: null, location: props.location };
+  }
+
+  static getDerivedStateFromError(error: Error) {
+    return { error };
+  }
+
+  static getDerivedStateFromProps(
+    props: RSCRouterGlobalErrorBoundaryProps,
+    state: RSCRouterGlobalErrorBoundaryState
+  ) {
+    // When we get into an error state, the user will likely click "back" to the
+    // previous page that didn't have an error. Because this wraps the entire
+    // application (even the HTML!) that will have no effect--the error page
+    // continues to display. This gives us a mechanism to recover from the error
+    // when the location changes.
+    //
+    // Whether we're in an error state or not, we update the location in state
+    // so that when we are in an error state, it gets reset when a new location
+    // comes in and the user recovers from the error.
+    if (state.location !== props.location) {
+      return { error: null, location: props.location };
+    }
+
+    // If we're not changing locations, preserve the location but still surface
+    // any new errors that may come through. We retain the existing error, we do
+    // this because the error provided from the app state may be cleared without
+    // the location changing.
+    return { error: state.error, location: state.location };
+  }
+
+  render() {
+    if (this.state.error) {
+      return (
+        
+      );
+    } else {
+      return this.props.children;
+    }
+  }
+}
+
+function ErrorWrapper({
+  renderAppShell,
+  title,
+  children,
+}: {
+  renderAppShell: boolean;
+  title: string;
+  children: React.ReactNode;
+}) {
+  if (!renderAppShell) {
+    return children;
+  }
+
+  return (
+    
+      
+        
+        
+        {title}
+      
+      
+        
    
+          {children}
+        
    
+      
+    
+  );
+}
+
+function RSCDefaultRootErrorBoundaryImpl({
+  error,
+  renderAppShell,
+}: {
+  error: unknown;
+  renderAppShell: boolean;
+}) {
+  console.error(error);
+
+  let heyDeveloper = (
+