diff --git a/app/components/MobileNav.tsx b/app/components/MobileNav.tsx index ffb92bae7..afac4c978 100644 --- a/app/components/MobileNav.tsx +++ b/app/components/MobileNav.tsx @@ -82,8 +82,7 @@ export function MobileNav({ sidebarData }: { sidebarData: SidebarData }) { useScrollLock(activePanel !== null); useClosePopoversOnNavigation(rootRef); - const chatContextRef = React.useRef(chatContext); - chatContextRef.current = chatContext; + const openChat = React.useEffectEvent(() => chatContext?.setChatOpen(true)); React.useEffect(() => { // a panel can be opened before hydration, its toggle event long gone @@ -93,7 +92,7 @@ export function MobileNav({ sidebarData }: { sidebarData: SidebarData }) { if (openPanel) { setActivePanel(openPanel); if (openPanel === "chat") { - chatContextRef.current?.setChatOpen(true); + openChat(); } } diff --git a/app/components/elements/Select.tsx b/app/components/elements/Select.tsx index 126b52abc..1fe50609e 100644 --- a/app/components/elements/Select.tsx +++ b/app/components/elements/Select.tsx @@ -849,7 +849,9 @@ function SelectOption(props: SendouSelectItemProps) { ); const childrenRef = React.useRef(children); - childrenRef.current = children; + useIsomorphicLayoutEffect(() => { + childrenRef.current = children; + }); const elementRef = React.useRef(null); React.useEffect(() => { diff --git a/app/components/layout/ChatSidebar.tsx b/app/components/layout/ChatSidebar.tsx index 666acc288..20e20abec 100644 --- a/app/components/layout/ChatSidebar.tsx +++ b/app/components/layout/ChatSidebar.tsx @@ -169,9 +169,6 @@ function RoomList({ const { t } = useTranslation(["common"]); const chatContext = useChatContext()!; - const byRecency = (a: ChatRoomListItem, b: ChatRoomListItem) => - (b.latestMessageAt ?? 0) - (a.latestMessageAt ?? 0) || b.id - a.id; - // the context's copy of the room over the route's: it carries the live unread count const routeRooms = useCurrentRouteChatRooms().flatMap((entry) => { const room = chatContext.roomForId(entry.room.id); @@ -539,3 +536,10 @@ function RoomChat({ room }: { room: ChatRoomListItem }) { /> ); } + +function byRecency(a: ChatRoomListItem, b: ChatRoomListItem) { + const recency = (b.latestMessageAt ?? 0) - (a.latestMessageAt ?? 0); + if (recency !== 0) return recency; + + return b.id - a.id; +} diff --git a/app/components/layout/Footer.tsx b/app/components/layout/Footer.tsx index 0bf715163..00e1410d0 100644 --- a/app/components/layout/Footer.tsx +++ b/app/components/layout/Footer.tsx @@ -8,7 +8,7 @@ import { useState, } from "react"; import { useTranslation } from "react-i18next"; -import { Link } from "react-router"; +import { Link, useNavigate } from "react-router"; import * as R from "remeda"; import { Config } from "~/config"; import { leaderboardsPage } from "~/features/leaderboards/leaderboards-urls"; @@ -287,6 +287,7 @@ type Patron = NonNullable["patrons"]>[number]; function PatronMarquee() { const ref = useRef(null); const hasScrolledIntoView = useHasScrolledIntoView(ref); + useClientSideAnchorNavigation(ref); return (
{patrons.map((patron) => (
  • - {patron.username} - +
  • ))} @@ -403,6 +404,39 @@ function useHasScrolledIntoView(ref: RefObject) { return hasScrolledIntoView; } +/** Navigates client side on clicks of the plain anchors inside, instead of hundreds of ``s re-rendering on every navigation. */ +function useClientSideAnchorNavigation(ref: RefObject) { + const navigate = useNavigate(); + + useEffect(() => { + const element = ref.current; + if (!element) return; + + const onClick = (event: MouseEvent) => { + if ( + event.defaultPrevented || + event.button !== 0 || + event.metaKey || + event.ctrlKey || + event.shiftKey || + event.altKey + ) { + return; + } + + const anchor = (event.target as Element).closest("a"); + const href = anchor?.getAttribute("href"); + if (!href) return; + + event.preventDefault(); + navigate(href); + }; + + element.addEventListener("click", onClick); + return () => element.removeEventListener("click", onClick); + }, [ref, navigate]); +} + function customThemeChipStyle( customTheme: Patron["customTheme"], ): React.CSSProperties { diff --git a/app/features/auth/core/user.ts b/app/features/auth/core/user.ts deleted file mode 100644 index 1efdb83d0..000000000 --- a/app/features/auth/core/user.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { useMatches } from "react-router"; -import type { RootLoaderData } from "~/root"; - -export function useUser() { - const [root] = useMatches(); - - return (root.loaderData as RootLoaderData | undefined)?.user; -} diff --git a/app/features/auth/core/user.tsx b/app/features/auth/core/user.tsx new file mode 100644 index 000000000..bbecc1ad8 --- /dev/null +++ b/app/features/auth/core/user.tsx @@ -0,0 +1,31 @@ +import * as React from "react"; +import { isDeepEqual } from "remeda"; +import type { RootLoaderData } from "~/root"; + +type User = RootLoaderData["user"]; + +const UserContext = React.createContext(undefined); + +/** + * Provides the logged in user to {@link useUser}. The value keeps its identity + * while a root revalidation returns an equal user, so its consumers don't re-render. + */ +export function UserProvider({ + user, + children, +}: { + user: User; + children: React.ReactNode; +}) { + const [stableUser, setStableUser] = React.useState(user); + + if (user !== stableUser && !isDeepEqual(user, stableUser)) { + setStableUser(user); + } + + return {children}; +} + +export function useUser() { + return React.useContext(UserContext); +} diff --git a/app/features/plus-suggestions/routes/plus.suggestions.browser.test.tsx b/app/features/plus-suggestions/routes/plus.suggestions.browser.test.tsx index 4528c17f1..8863891ad 100644 --- a/app/features/plus-suggestions/routes/plus.suggestions.browser.test.tsx +++ b/app/features/plus-suggestions/routes/plus.suggestions.browser.test.tsx @@ -1,6 +1,7 @@ import { createBrowserRouter, RouterProvider } from "react-router"; import { describe, expect, test, vi } from "vitest"; import { render } from "vitest-browser-react"; +import { UserProvider } from "~/features/auth/core/user"; import type * as PlusSuggestionRepository from "~/features/plus-suggestions/PlusSuggestionRepository.server"; import { PlusSuggestionComments } from "./plus.suggestions"; @@ -12,6 +13,10 @@ const AUTHOR = { username: "Suggester", }; +type LoggedInUser = NonNullable< + React.ComponentProps["user"] +>; + const AUTHOR_AS_LOGGED_IN_USER = { id: AUTHOR.id, discordId: "1005" }; const suggestedUser = (id: number, username: string) => ({ @@ -58,16 +63,17 @@ describe("PlusSuggestionComments", () => { const router = createBrowserRouter([ { path: "*", - loader: () => ({ user: AUTHOR_AS_LOGGED_IN_USER }), element: ( - + + + ), }, ]); diff --git a/app/features/tournament-bracket/components/Bracket/Elimination.tsx b/app/features/tournament-bracket/components/Bracket/Elimination.tsx index 844513ddb..09cf4f540 100644 --- a/app/features/tournament-bracket/components/Bracket/Elimination.tsx +++ b/app/features/tournament-bracket/components/Bracket/Elimination.tsx @@ -62,7 +62,6 @@ export function EliminationBracketSide(props: EliminationBracketSideProps) { ? firstVisibleRoundMatchCount / 2 : firstVisibleRoundMatchCount; - let atLeastOneColumnHidden = false; return ( {rounds.flatMap((round, roundIdx) => { @@ -92,10 +91,11 @@ export function EliminationBracketSide(props: EliminationBracketSideProps) { (match) => match.opponent1 && match.opponent2 && !match.winnerSide, ); - if (hiddenRoundIds.has(round.id)) { - atLeastOneColumnHidden = true; - return null; - } + if (hiddenRoundIds.has(round.id)) return null; + + const atLeastOneColumnHidden = rounds + .slice(0, roundIdx) + .some((previousRound) => hiddenRoundIds.has(previousRound.id)); return ( diff --git a/app/features/tournament/routes/to.$id.tsx b/app/features/tournament/routes/to.$id.tsx index b8c467242..00a4c5d08 100644 --- a/app/features/tournament/routes/to.$id.tsx +++ b/app/features/tournament/routes/to.$id.tsx @@ -36,7 +36,7 @@ export const meta: MetaFunction = (args) => { if (!rawData) return []; - const data = parseTournamentLoaderData(rawData); + const data = parseLoaderDataForHead(rawData); return metaTags({ title: data.tournament.ctx.name, @@ -56,7 +56,7 @@ export const handle: SendouRouteHandle = { if (!rawData) return []; - const data = parseTournamentLoaderData(rawData); + const data = parseLoaderDataForHead(rawData); return [ { @@ -71,23 +71,17 @@ export const handle: SendouRouteHandle = { export default function TournamentLayout() { const rawData = useLoaderData(); - const data = React.useMemo( - () => parseTournamentLoaderData(rawData), - [rawData], - ); - const tournament = React.useMemo( - () => new Tournament(data.tournament), - [data], - ); + const data = parseTournamentLoaderData(rawData); + const tournament = new Tournament(data.tournament); const [bracketExpanded, setBracketExpanded] = React.useState(true); // for debugging in the browser console - if (process.env.NODE_ENV === "development") { - React.useEffect(() => { - // @ts-expect-error for dev purposes - window.tourney = tournament; - }, [tournament]); - } + React.useEffect(() => { + if (process.env.NODE_ENV !== "development") return; + // @ts-expect-error for dev purposes + window.tourney = tournament; + }, [tournament]); + const content = ( <> @@ -126,6 +120,19 @@ type TournamentContext = { vods: NonNullable; }; +let lastHeadRawData: string | null = null; +let lastHeadData: TournamentLoaderData | null = null; + +/** Parses once per payload for `meta` and `breadcrumb`, which rerun on every navigation and revalidation (read-only use). */ +function parseLoaderDataForHead(rawData: string) { + if (rawData !== lastHeadRawData || !lastHeadData) { + lastHeadData = parseTournamentLoaderData(rawData); + lastHeadRawData = rawData; + } + + return lastHeadData; +} + export function useBracketExpanded() { const { bracketExpanded, setBracketExpanded } = useOutletContext(); diff --git a/app/hooks/useMainContentWidth.ts b/app/hooks/useMainContentWidth.ts index 72bb85979..d6bade3c4 100644 --- a/app/hooks/useMainContentWidth.ts +++ b/app/hooks/useMainContentWidth.ts @@ -2,11 +2,17 @@ import * as React from "react"; const listeners = new Set<() => void>(); let observer: ResizeObserver | null = null; +// read in the observer callback where layout is already clean, never during render +let mainWidth = 0; function subscribe(listener: () => void) { listeners.add(listener); if (!observer) { - observer = new ResizeObserver(() => { + observer = new ResizeObserver(([entry]) => { + const width = (entry.target as HTMLElement).clientWidth; + if (width === mainWidth) return; + + mainWidth = width; for (const notify of listeners) { notify(); } @@ -25,7 +31,7 @@ function subscribe(listener: () => void) { } function getSnapshot() { - return document.querySelector("main")?.clientWidth ?? 0; + return mainWidth; } export function useMainContentWidth() { diff --git a/app/hooks/useVisualViewport.ts b/app/hooks/useVisualViewport.ts index 212b352d7..0acec7743 100644 --- a/app/hooks/useVisualViewport.ts +++ b/app/hooks/useVisualViewport.ts @@ -1,21 +1,29 @@ -import { useIsomorphicLayoutEffect } from "./useIsomorphicLayoutEffect"; +import * as React from "react"; const HEIGHT_PROPERTY = "--visual-viewport-height"; const OFFSET_TOP_PROPERTY = "--visual-viewport-offset-top"; // Syncs the ACTUAL visual viewport to two CSS variables so elements can respect the space taken by the mobile keyboard +// (not written on mount: until the viewport changes the CSS fallbacks match, and every write restyles the whole document) export function useVisualViewport() { - useIsomorphicLayoutEffect(() => { + React.useEffect(() => { const viewport = window.visualViewport; if (!viewport) return; - const update = () => { - const style = document.documentElement.style; - style.setProperty(HEIGHT_PROPERTY, `${viewport.height}px`); - style.setProperty(OFFSET_TOP_PROPERTY, `${viewport.offsetTop}px`); - }; + let lastHeight: number | null = null; + let lastOffsetTop: number | null = null; - update(); + const update = () => { + const { height, offsetTop } = viewport; + if (height === lastHeight && offsetTop === lastOffsetTop) return; + + lastHeight = height; + lastOffsetTop = offsetTop; + + const style = document.documentElement.style; + style.setProperty(HEIGHT_PROPERTY, `${height}px`); + style.setProperty(OFFSET_TOP_PROPERTY, `${offsetTop}px`); + }; viewport.addEventListener("resize", update); viewport.addEventListener("scroll", update); diff --git a/app/root.tsx b/app/root.tsx index 8246d9d46..bc34849ef 100644 --- a/app/root.tsx +++ b/app/root.tsx @@ -35,6 +35,7 @@ import { Catcher } from "./components/Catcher"; import { SendouToastRegion, toastQueue } from "./components/elements/Toast"; import { FusePageInit } from "./components/fuse/Fuse"; import { Layout, NPROGRESS_ANCHOR_ID } from "./components/layout"; +import { UserProvider } from "./features/auth/core/user"; import { getUser } from "./features/auth/core/user.server"; import { userMiddleware } from "./features/auth/core/user-middleware.server"; import { ChatProvider } from "./features/chat/ChatProvider"; @@ -264,23 +265,25 @@ function Document({ {IS_E2E_TEST_RUN ? : null} - - - - - - - - - {children} - - - - - + + + + + + + + + + {children} + + + + + + diff --git a/changelog/2026-10-04-faster-page-updates.md b/changelog/2026-10-04-faster-page-updates.md new file mode 100644 index 000000000..a6beb56e0 --- /dev/null +++ b/changelog/2026-10-04-faster-page-updates.md @@ -0,0 +1,4 @@ +--- +type: feature +--- +Pages respond faster when navigating and when live updates arrive, especially big tournament pages diff --git a/patches/react-router@8.4.0.patch b/patches/react-router@8.4.0.patch index 4e3642a73..ea338cfd8 100644 --- a/patches/react-router@8.4.0.patch +++ b/patches/react-router@8.4.0.patch @@ -26,6 +26,75 @@ index a2b1aca6bfc6cb9a663596780167b58102beb361..2b29018c3bd23ba9bbb307debcf5b456 +} //#endregion export { ServerRouter }; +diff --git a/dist/development/lib/dom-export/hydrated-router.js b/dist/development/lib/dom-export/hydrated-router.js +index 4d0817136a6b1398fd80a0ea1cb864a01796f203..0e91eece494e1ac17a344670fd08404a89d63f1c 100644 +--- a/dist/development/lib/dom-export/hydrated-router.js ++++ b/dist/development/lib/dom-export/hydrated-router.js +@@ -133,7 +133,8 @@ function HydratedRouter(props) { + }, [location]); + UNSAFE_invariant(ssrInfo, "ssrInfo unavailable for HydratedRouter"); + UNSAFE_useFogOFWarDiscovery(router, ssrInfo.manifest, ssrInfo.routeModules, ssrInfo.context.ssr, ssrInfo.context.routeDiscovery, ssrInfo.context.isSpaMode); +- return /* @__PURE__ */ React$1.createElement(React$1.Fragment, null, /* @__PURE__ */ React$1.createElement(UNSAFE_FrameworkContext.Provider, { value: { ++ // patched: a stable value so every doesn't re-render whenever the location changes ++ let frameworkContext = React$1.useMemo(() => ({ + manifest: ssrInfo.manifest, + routeModules: ssrInfo.routeModules, + future: ssrInfo.context.future, +@@ -141,7 +142,13 @@ function HydratedRouter(props) { + ssr: ssrInfo.context.ssr, + isSpaMode: ssrInfo.context.isSpaMode, + routeDiscovery: ssrInfo.context.routeDiscovery +- } }, /* @__PURE__ */ React$1.createElement(UNSAFE_RemixErrorBoundary, { location }, /* @__PURE__ */ React$1.createElement(RouterProvider$1, { ++ }), [ ++ ssrInfo.manifest, ++ ssrInfo.routeModules, ++ ssrInfo.context, ++ criticalCss ++ ]); ++ return /* @__PURE__ */ React$1.createElement(React$1.Fragment, null, /* @__PURE__ */ React$1.createElement(UNSAFE_FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React$1.createElement(UNSAFE_RemixErrorBoundary, { location }, /* @__PURE__ */ React$1.createElement(RouterProvider$1, { + router, + useTransitions: props.useTransitions, + onError: props.onError +diff --git a/dist/development/lib/hooks.js b/dist/development/lib/hooks.js +index 18c69d42e36059faae18922046ea3cd7e9817722..f2c806583352aa61c38ec113c159f0b4a84cac8e 100644 +--- a/dist/development/lib/hooks.js ++++ b/dist/development/lib/hooks.js +@@ -527,10 +527,11 @@ function useParams() { + * Set to `"path"` to make relative routing operate against path segments. + * @returns The resolved {@link Path} object with `pathname`, `search`, and `hash` + */ ++// patched: the resolved-path inputs as a string, so links don't re-render when a router state change recreates the route context ++const RoutePathnamesContext = /* @__PURE__ */ React$1.createContext("[]"); + function useResolvedPath(to, { relative } = {}) { +- let { matches } = React$1.useContext(RouteContext); ++ let routePathnamesJson = React$1.useContext(RoutePathnamesContext); + let { pathname: locationPathname } = useLocation(); +- let routePathnamesJson = JSON.stringify(getResolveToMatches(matches)); + return React$1.useMemo(() => resolveTo(to, JSON.parse(routePathnamesJson), locationPathname, relative === "path"), [ + to, + routePathnamesJson, +@@ -681,10 +682,10 @@ var RenderErrorBoundary = class extends React$1.Component { + const decoded = decodeRouteErrorResponseDigest(error.digest); + if (decoded) error = decoded; + } +- let result = error !== void 0 ? /* @__PURE__ */ React$1.createElement(RouteContext.Provider, { value: this.props.routeContext }, /* @__PURE__ */ React$1.createElement(IsDataRouteContext.Provider, { value: this.props.routeContext.isDataRoute }, /* @__PURE__ */ React$1.createElement(RouteIdContext.Provider, { value: this.props.routeContext.matches[this.props.routeContext.matches.length - 1]?.route.id }, /* @__PURE__ */ React$1.createElement(RouteErrorContext.Provider, { ++ let result = error !== void 0 ? /* @__PURE__ */ React$1.createElement(RouteContext.Provider, { value: this.props.routeContext }, /* @__PURE__ */ React$1.createElement(RoutePathnamesContext.Provider, { value: JSON.stringify(getResolveToMatches(this.props.routeContext.matches)) }, /* @__PURE__ */ React$1.createElement(IsDataRouteContext.Provider, { value: this.props.routeContext.isDataRoute }, /* @__PURE__ */ React$1.createElement(RouteIdContext.Provider, { value: this.props.routeContext.matches[this.props.routeContext.matches.length - 1]?.route.id }, /* @__PURE__ */ React$1.createElement(RouteErrorContext.Provider, { + value: error, + children: this.props.component +- })))) : this.props.children; ++ }))))) : this.props.children; + if (this.context) return /* @__PURE__ */ React$1.createElement(RSCErrorHandler, { error }, result); + return result; + } +@@ -718,7 +719,7 @@ function RSCErrorHandler({ children, error }) { + function RenderedRoute({ routeContext, match, children }) { + let dataRouterContext = React$1.useContext(DataRouterContext); + if (dataRouterContext && dataRouterContext.static && dataRouterContext.staticContext && (match.route.errorElement || match.route.ErrorBoundary)) dataRouterContext.staticContext._deepestRenderedBoundaryId = match.route.id; +- return /* @__PURE__ */ React$1.createElement(RouteContext.Provider, { value: routeContext }, /* @__PURE__ */ React$1.createElement(IsDataRouteContext.Provider, { value: routeContext.isDataRoute }, /* @__PURE__ */ React$1.createElement(RouteIdContext.Provider, { value: match.route.id }, children))); ++ return /* @__PURE__ */ React$1.createElement(RouteContext.Provider, { value: routeContext }, /* @__PURE__ */ React$1.createElement(RoutePathnamesContext.Provider, { value: JSON.stringify(getResolveToMatches(routeContext.matches)) }, /* @__PURE__ */ React$1.createElement(IsDataRouteContext.Provider, { value: routeContext.isDataRoute }, /* @__PURE__ */ React$1.createElement(RouteIdContext.Provider, { value: match.route.id }, children)))); + } + function _renderMatches(matches, parentMatches = [], dataRouterOpts) { + let dataRouterState = dataRouterOpts?.state; diff --git a/dist/development/lib/router/matcher.js b/dist/development/lib/router/matcher.js index 135d8da979b2a7c88c43f2f85c43de0ac6a49ad0..5eb2b3edfda349e5de531559c3313e4d0f4ac8e3 100644 --- a/dist/development/lib/router/matcher.js @@ -79,6 +148,50 @@ index 135d8da979b2a7c88c43f2f85c43de0ac6a49ad0..5eb2b3edfda349e5de531559c3313e4d +} //#endregion export { V6RegExMatcher }; +diff --git a/dist/development/lib/router/router.js b/dist/development/lib/router/router.js +index b6faa6059480c74780c475ebdcf2f1061056328c..c4c2e41142500ffd6f6378daffdea7b98182647e 100644 +--- a/dist/development/lib/router/router.js ++++ b/dist/development/lib/router/router.js +@@ -2725,7 +2725,7 @@ function processLoaderData(state, matches, results, pendingActionResult, revalid + } + function mergeLoaderData(loaderData, newLoaderData, matches, errors) { + let mergedLoaderData = Object.entries(newLoaderData).filter(([, v]) => v !== ResetLoaderDataSymbol).reduce((merged, [k, v]) => { +- merged[k] = v; ++ merged[k] = loaderData.hasOwnProperty(k) ? replaceEqualDeep(loaderData[k], v) : v; + return merged; + }, {}); + let preservedCount = 0; +@@ -2739,6 +2739,30 @@ function mergeLoaderData(loaderData, newLoaderData, matches, errors) { + } + return Object.keys(newLoaderData).length === 0 && preservedCount === Object.keys(loaderData).length ? loaderData : mergedLoaderData; + } ++// patched: a revalidation returning equal data keeps the previous data's identity (per unchanged subtree), so the UI reading it doesn't re-render ++function replaceEqualDeep(prev, next) { ++ if (prev === next) return prev; ++ if (prev instanceof Date && next instanceof Date) return prev.getTime() === next.getTime() ? prev : next; ++ let prevIsArray = Array.isArray(prev); ++ if (prevIsArray !== Array.isArray(next)) return next; ++ if (!prevIsArray && !(isPlainObject(prev) && isPlainObject(next))) return next; ++ let nextKeys = prevIsArray ? null : Object.keys(next); ++ let length = prevIsArray ? next.length : nextKeys.length; ++ let equal = length === (prevIsArray ? prev.length : Object.keys(prev).length); ++ let result = prevIsArray ? new Array(length) : {}; ++ for (let i = 0; i < length; i++) { ++ let key = prevIsArray ? i : nextKeys[i]; ++ let hasPrev = prevIsArray ? i < prev.length : Object.prototype.hasOwnProperty.call(prev, key); ++ result[key] = hasPrev ? replaceEqualDeep(prev[key], next[key]) : next[key]; ++ if (!hasPrev || result[key] !== prev[key]) equal = false; ++ } ++ return equal ? prev : result; ++} ++function isPlainObject(value) { ++ if (value === null || typeof value !== "object") return false; ++ let proto = Object.getPrototypeOf(value); ++ return proto === Object.prototype || proto === null; ++} + function getActionDataForCommit(pendingActionResult) { + if (!pendingActionResult) return {}; + return isErrorResult(pendingActionResult[1]) ? { actionData: {} } : { actionData: { [pendingActionResult[0]]: pendingActionResult[1].data } }; diff --git a/dist/development/lib/server-runtime/crypto.js b/dist/development/lib/server-runtime/crypto.js index a4f6c3f43084bfccf5d9ebe4908868502ce70b58..c0619093ba8a2763d523d5a868896626636123f4 100644 --- a/dist/development/lib/server-runtime/crypto.js @@ -179,6 +292,75 @@ index a2b1aca6bfc6cb9a663596780167b58102beb361..2b29018c3bd23ba9bbb307debcf5b456 +} //#endregion export { ServerRouter }; +diff --git a/dist/production/lib/dom-export/hydrated-router.js b/dist/production/lib/dom-export/hydrated-router.js +index 4d0817136a6b1398fd80a0ea1cb864a01796f203..0e91eece494e1ac17a344670fd08404a89d63f1c 100644 +--- a/dist/production/lib/dom-export/hydrated-router.js ++++ b/dist/production/lib/dom-export/hydrated-router.js +@@ -133,7 +133,8 @@ function HydratedRouter(props) { + }, [location]); + UNSAFE_invariant(ssrInfo, "ssrInfo unavailable for HydratedRouter"); + UNSAFE_useFogOFWarDiscovery(router, ssrInfo.manifest, ssrInfo.routeModules, ssrInfo.context.ssr, ssrInfo.context.routeDiscovery, ssrInfo.context.isSpaMode); +- return /* @__PURE__ */ React$1.createElement(React$1.Fragment, null, /* @__PURE__ */ React$1.createElement(UNSAFE_FrameworkContext.Provider, { value: { ++ // patched: a stable value so every doesn't re-render whenever the location changes ++ let frameworkContext = React$1.useMemo(() => ({ + manifest: ssrInfo.manifest, + routeModules: ssrInfo.routeModules, + future: ssrInfo.context.future, +@@ -141,7 +142,13 @@ function HydratedRouter(props) { + ssr: ssrInfo.context.ssr, + isSpaMode: ssrInfo.context.isSpaMode, + routeDiscovery: ssrInfo.context.routeDiscovery +- } }, /* @__PURE__ */ React$1.createElement(UNSAFE_RemixErrorBoundary, { location }, /* @__PURE__ */ React$1.createElement(RouterProvider$1, { ++ }), [ ++ ssrInfo.manifest, ++ ssrInfo.routeModules, ++ ssrInfo.context, ++ criticalCss ++ ]); ++ return /* @__PURE__ */ React$1.createElement(React$1.Fragment, null, /* @__PURE__ */ React$1.createElement(UNSAFE_FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React$1.createElement(UNSAFE_RemixErrorBoundary, { location }, /* @__PURE__ */ React$1.createElement(RouterProvider$1, { + router, + useTransitions: props.useTransitions, + onError: props.onError +diff --git a/dist/production/lib/hooks.js b/dist/production/lib/hooks.js +index d83812a300d04b1301221b9f2650dc8197257cbb..4ebb1dd7321b19ab2aa1cd4f1784cb1b60be723e 100644 +--- a/dist/production/lib/hooks.js ++++ b/dist/production/lib/hooks.js +@@ -527,10 +527,11 @@ function useParams() { + * Set to `"path"` to make relative routing operate against path segments. + * @returns The resolved {@link Path} object with `pathname`, `search`, and `hash` + */ ++// patched: the resolved-path inputs as a string, so links don't re-render when a router state change recreates the route context ++const RoutePathnamesContext = /* @__PURE__ */ React$1.createContext("[]"); + function useResolvedPath(to, { relative } = {}) { +- let { matches } = React$1.useContext(RouteContext); ++ let routePathnamesJson = React$1.useContext(RoutePathnamesContext); + let { pathname: locationPathname } = useLocation(); +- let routePathnamesJson = JSON.stringify(getResolveToMatches(matches)); + return React$1.useMemo(() => resolveTo(to, JSON.parse(routePathnamesJson), locationPathname, relative === "path"), [ + to, + routePathnamesJson, +@@ -666,10 +667,10 @@ var RenderErrorBoundary = class extends React$1.Component { + const decoded = decodeRouteErrorResponseDigest(error.digest); + if (decoded) error = decoded; + } +- let result = error !== void 0 ? /* @__PURE__ */ React$1.createElement(RouteContext.Provider, { value: this.props.routeContext }, /* @__PURE__ */ React$1.createElement(IsDataRouteContext.Provider, { value: this.props.routeContext.isDataRoute }, /* @__PURE__ */ React$1.createElement(RouteIdContext.Provider, { value: this.props.routeContext.matches[this.props.routeContext.matches.length - 1]?.route.id }, /* @__PURE__ */ React$1.createElement(RouteErrorContext.Provider, { ++ let result = error !== void 0 ? /* @__PURE__ */ React$1.createElement(RouteContext.Provider, { value: this.props.routeContext }, /* @__PURE__ */ React$1.createElement(RoutePathnamesContext.Provider, { value: JSON.stringify(getResolveToMatches(this.props.routeContext.matches)) }, /* @__PURE__ */ React$1.createElement(IsDataRouteContext.Provider, { value: this.props.routeContext.isDataRoute }, /* @__PURE__ */ React$1.createElement(RouteIdContext.Provider, { value: this.props.routeContext.matches[this.props.routeContext.matches.length - 1]?.route.id }, /* @__PURE__ */ React$1.createElement(RouteErrorContext.Provider, { + value: error, + children: this.props.component +- })))) : this.props.children; ++ }))))) : this.props.children; + if (this.context) return /* @__PURE__ */ React$1.createElement(RSCErrorHandler, { error }, result); + return result; + } +@@ -703,7 +704,7 @@ function RSCErrorHandler({ children, error }) { + function RenderedRoute({ routeContext, match, children }) { + let dataRouterContext = React$1.useContext(DataRouterContext); + if (dataRouterContext && dataRouterContext.static && dataRouterContext.staticContext && (match.route.errorElement || match.route.ErrorBoundary)) dataRouterContext.staticContext._deepestRenderedBoundaryId = match.route.id; +- return /* @__PURE__ */ React$1.createElement(RouteContext.Provider, { value: routeContext }, /* @__PURE__ */ React$1.createElement(IsDataRouteContext.Provider, { value: routeContext.isDataRoute }, /* @__PURE__ */ React$1.createElement(RouteIdContext.Provider, { value: match.route.id }, children))); ++ return /* @__PURE__ */ React$1.createElement(RouteContext.Provider, { value: routeContext }, /* @__PURE__ */ React$1.createElement(RoutePathnamesContext.Provider, { value: JSON.stringify(getResolveToMatches(routeContext.matches)) }, /* @__PURE__ */ React$1.createElement(IsDataRouteContext.Provider, { value: routeContext.isDataRoute }, /* @__PURE__ */ React$1.createElement(RouteIdContext.Provider, { value: match.route.id }, children)))); + } + function _renderMatches(matches, parentMatches = [], dataRouterOpts) { + let dataRouterState = dataRouterOpts?.state; diff --git a/dist/production/lib/router/matcher.js b/dist/production/lib/router/matcher.js index 135d8da979b2a7c88c43f2f85c43de0ac6a49ad0..5eb2b3edfda349e5de531559c3313e4d0f4ac8e3 100644 --- a/dist/production/lib/router/matcher.js @@ -232,6 +414,50 @@ index 135d8da979b2a7c88c43f2f85c43de0ac6a49ad0..5eb2b3edfda349e5de531559c3313e4d +} //#endregion export { V6RegExMatcher }; +diff --git a/dist/production/lib/router/router.js b/dist/production/lib/router/router.js +index b6faa6059480c74780c475ebdcf2f1061056328c..c4c2e41142500ffd6f6378daffdea7b98182647e 100644 +--- a/dist/production/lib/router/router.js ++++ b/dist/production/lib/router/router.js +@@ -2725,7 +2725,7 @@ function processLoaderData(state, matches, results, pendingActionResult, revalid + } + function mergeLoaderData(loaderData, newLoaderData, matches, errors) { + let mergedLoaderData = Object.entries(newLoaderData).filter(([, v]) => v !== ResetLoaderDataSymbol).reduce((merged, [k, v]) => { +- merged[k] = v; ++ merged[k] = loaderData.hasOwnProperty(k) ? replaceEqualDeep(loaderData[k], v) : v; + return merged; + }, {}); + let preservedCount = 0; +@@ -2739,6 +2739,30 @@ function mergeLoaderData(loaderData, newLoaderData, matches, errors) { + } + return Object.keys(newLoaderData).length === 0 && preservedCount === Object.keys(loaderData).length ? loaderData : mergedLoaderData; + } ++// patched: a revalidation returning equal data keeps the previous data's identity (per unchanged subtree), so the UI reading it doesn't re-render ++function replaceEqualDeep(prev, next) { ++ if (prev === next) return prev; ++ if (prev instanceof Date && next instanceof Date) return prev.getTime() === next.getTime() ? prev : next; ++ let prevIsArray = Array.isArray(prev); ++ if (prevIsArray !== Array.isArray(next)) return next; ++ if (!prevIsArray && !(isPlainObject(prev) && isPlainObject(next))) return next; ++ let nextKeys = prevIsArray ? null : Object.keys(next); ++ let length = prevIsArray ? next.length : nextKeys.length; ++ let equal = length === (prevIsArray ? prev.length : Object.keys(prev).length); ++ let result = prevIsArray ? new Array(length) : {}; ++ for (let i = 0; i < length; i++) { ++ let key = prevIsArray ? i : nextKeys[i]; ++ let hasPrev = prevIsArray ? i < prev.length : Object.prototype.hasOwnProperty.call(prev, key); ++ result[key] = hasPrev ? replaceEqualDeep(prev[key], next[key]) : next[key]; ++ if (!hasPrev || result[key] !== prev[key]) equal = false; ++ } ++ return equal ? prev : result; ++} ++function isPlainObject(value) { ++ if (value === null || typeof value !== "object") return false; ++ let proto = Object.getPrototypeOf(value); ++ return proto === Object.prototype || proto === null; ++} + function getActionDataForCommit(pendingActionResult) { + if (!pendingActionResult) return {}; + return isErrorResult(pendingActionResult[1]) ? { actionData: {} } : { actionData: { [pendingActionResult[0]]: pendingActionResult[1].data } }; diff --git a/dist/production/lib/server-runtime/crypto.js b/dist/production/lib/server-runtime/crypto.js index a4f6c3f43084bfccf5d9ebe4908868502ce70b58..c0619093ba8a2763d523d5a868896626636123f4 100644 --- a/dist/production/lib/server-runtime/crypto.js diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 17609b270..7b690b8cd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,7 +10,7 @@ patchedDependencies: i18next@26.3.6: 34c245cebb3f9c7861d2576a3a44228364cb898037f86b23a5bbf8b20f55fb1a kysely@0.29.0: c4db877b7832e81d7eb0b710c902cee526020b0bcd4f577c696f0935a2fd1364 react-i18next@17.0.11: 1f928881d134daf116e494299036454a3c311fe6fb81f60ef8d158f27466a269 - react-router@8.4.0: 52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2 + react-router@8.4.0: 01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615 remix-i18next@8.0.0: 2e2cb4c9211d55a0d57b6812c2e31c41d3f17c2163db0f26ce8d941e91a66bae importers: @@ -43,10 +43,10 @@ importers: version: 5.6.3 '@react-router/node': specifier: 8.4.0 - version: 8.4.0(react-router@8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2) + version: 8.4.0(react-router@8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2) '@react-router/serve': specifier: 8.1.0 - version: 8.1.0(patch_hash=f7425beb70a2ce35ca7235672d8df524901983a27c25aa7de489bc559d54d7f1)(react-router@8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2) + version: 8.1.0(patch_hash=f7425beb70a2ce35ca7235672d8df524901983a27c25aa7de489bc559d54d7f1)(react-router@8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2) '@techstark/opencv-js': specifier: 5.0.0-release.1 version: 5.0.0-release.1(patch_hash=810344500e8099b2f8d80c7c3fc28977abfcd115a2616abd1329f7f89f0534b6) @@ -136,7 +136,7 @@ importers: version: 17.0.11(patch_hash=1f928881d134daf116e494299036454a3c311fe6fb81f60ef8d158f27466a269)(i18next@26.3.6(patch_hash=34c245cebb3f9c7861d2576a3a44228364cb898037f86b23a5bbf8b20f55fb1a)(typescript@7.0.2))(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(typescript@7.0.2) react-router: specifier: 8.4.0 - version: 8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + version: 8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) remeda: specifier: 2.50.0 version: 2.50.0 @@ -148,7 +148,7 @@ importers: version: 3.4.1(remix-auth@4.2.0) remix-i18next: specifier: 8.0.0 - version: 8.0.0(patch_hash=2e2cb4c9211d55a0d57b6812c2e31c41d3f17c2163db0f26ce8d941e91a66bae)(i18next@26.3.6(patch_hash=34c245cebb3f9c7861d2576a3a44228364cb898037f86b23a5bbf8b20f55fb1a)(typescript@7.0.2))(react-router@8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)) + version: 8.0.0(patch_hash=2e2cb4c9211d55a0d57b6812c2e31c41d3f17c2163db0f26ce8d941e91a66bae)(i18next@26.3.6(patch_hash=34c245cebb3f9c7861d2576a3a44228364cb898037f86b23a5bbf8b20f55fb1a)(typescript@7.0.2))(react-router@8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)) slugify: specifier: 1.6.9 version: 1.6.9 @@ -182,7 +182,7 @@ importers: version: 1.63.0 '@react-router/dev': specifier: 8.4.0 - version: 8.4.0(@react-router/serve@8.1.0(patch_hash=f7425beb70a2ce35ca7235672d8df524901983a27c25aa7de489bc559d54d7f1)(react-router@8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2))(react-router@8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2)(vite@8.3.0(@types/node@26.6.2)(jiti@2.7.0)(yaml@2.9.1)) + version: 8.4.0(@react-router/serve@8.1.0(patch_hash=f7425beb70a2ce35ca7235672d8df524901983a27c25aa7de489bc559d54d7f1)(react-router@8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2))(react-router@8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2)(vite@8.3.0(@types/node@26.6.2)(jiti@2.7.0)(yaml@2.9.1)) '@types/node': specifier: 26.6.2 version: 26.6.2 @@ -5643,14 +5643,14 @@ snapshots: '@radix-ui/rect@1.1.1': {} - '@react-router/dev@8.4.0(@react-router/serve@8.1.0(patch_hash=f7425beb70a2ce35ca7235672d8df524901983a27c25aa7de489bc559d54d7f1)(react-router@8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2))(react-router@8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2)(vite@8.3.0(@types/node@26.6.2)(jiti@2.7.0)(yaml@2.9.1))': + '@react-router/dev@8.4.0(@react-router/serve@8.1.0(patch_hash=f7425beb70a2ce35ca7235672d8df524901983a27c25aa7de489bc559d54d7f1)(react-router@8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2))(react-router@8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2)(vite@8.3.0(@types/node@26.6.2)(jiti@2.7.0)(yaml@2.9.1))': dependencies: '@babel/core': 7.29.7 '@babel/generator': 7.29.8 '@babel/parser': 7.29.9 '@babel/traverse': 7.29.8 '@babel/types': 7.29.8 - '@react-router/node': 8.4.0(react-router@8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2) + '@react-router/node': 8.4.0(react-router@8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2) '@remix-run/node-fetch-server': 0.14.1 babel-dead-code-elimination: 1.0.12 chokidar: 5.0.0 @@ -5665,49 +5665,49 @@ snapshots: picocolors: 1.1.1 pkg-types: 2.3.3 react-refresh: 0.18.0 - react-router: 8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + react-router: 8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) semver: 7.8.5 tinyglobby: 0.2.17 valibot: 1.5.0(typescript@7.0.2) vite: 8.3.0(@types/node@26.6.2)(jiti@2.7.0)(yaml@2.9.1) optionalDependencies: - '@react-router/serve': 8.1.0(patch_hash=f7425beb70a2ce35ca7235672d8df524901983a27c25aa7de489bc559d54d7f1)(react-router@8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2) + '@react-router/serve': 8.1.0(patch_hash=f7425beb70a2ce35ca7235672d8df524901983a27c25aa7de489bc559d54d7f1)(react-router@8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2) typescript: 7.0.2 transitivePeerDependencies: - babel-plugin-macros - supports-color - '@react-router/express@8.1.0(express@5.2.1)(react-router@8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2)': + '@react-router/express@8.1.0(express@5.2.1)(react-router@8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2)': dependencies: - '@react-router/node': 8.1.0(react-router@8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2) + '@react-router/node': 8.1.0(react-router@8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2) express: 5.2.1 - react-router: 8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + react-router: 8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) optionalDependencies: typescript: 7.0.2 - '@react-router/node@8.1.0(react-router@8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2)': + '@react-router/node@8.1.0(react-router@8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2)': dependencies: '@remix-run/node-fetch-server': 0.13.3 - react-router: 8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + react-router: 8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) optionalDependencies: typescript: 7.0.2 - '@react-router/node@8.4.0(react-router@8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2)': + '@react-router/node@8.4.0(react-router@8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2)': dependencies: '@remix-run/node-fetch-server': 0.14.1 - react-router: 8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + react-router: 8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) optionalDependencies: typescript: 7.0.2 - '@react-router/serve@8.1.0(patch_hash=f7425beb70a2ce35ca7235672d8df524901983a27c25aa7de489bc559d54d7f1)(react-router@8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2)': + '@react-router/serve@8.1.0(patch_hash=f7425beb70a2ce35ca7235672d8df524901983a27c25aa7de489bc559d54d7f1)(react-router@8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2)': dependencies: - '@react-router/express': 8.1.0(express@5.2.1)(react-router@8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2) - '@react-router/node': 8.1.0(react-router@8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2) + '@react-router/express': 8.1.0(express@5.2.1)(react-router@8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2) + '@react-router/node': 8.1.0(react-router@8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(typescript@7.0.2) '@remix-run/node-fetch-server': 0.13.3 compression: 1.8.1 express: 5.2.1 morgan: 1.10.1 - react-router: 8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + react-router: 8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) source-map-support: 0.5.21 transitivePeerDependencies: - supports-color @@ -8104,7 +8104,7 @@ snapshots: optionalDependencies: '@types/react': 19.3.0 - react-router@8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0): + react-router@8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0): dependencies: '@remix-run/route-pattern': 0.22.1 cookie-es: 3.1.1 @@ -8141,10 +8141,10 @@ snapshots: remix-auth@4.2.0: {} - remix-i18next@8.0.0(patch_hash=2e2cb4c9211d55a0d57b6812c2e31c41d3f17c2163db0f26ce8d941e91a66bae)(i18next@26.3.6(patch_hash=34c245cebb3f9c7861d2576a3a44228364cb898037f86b23a5bbf8b20f55fb1a)(typescript@7.0.2))(react-router@8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)): + remix-i18next@8.0.0(patch_hash=2e2cb4c9211d55a0d57b6812c2e31c41d3f17c2163db0f26ce8d941e91a66bae)(i18next@26.3.6(patch_hash=34c245cebb3f9c7861d2576a3a44228364cb898037f86b23a5bbf8b20f55fb1a)(typescript@7.0.2))(react-router@8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)): dependencies: i18next: 26.3.6(patch_hash=34c245cebb3f9c7861d2576a3a44228364cb898037f86b23a5bbf8b20f55fb1a)(typescript@7.0.2) - react-router: 8.4.0(patch_hash=52f9ae163e5f363aaf96cb27d110cfb1bd20c91f34ddcf5b2bf85ee1bc2d1cf2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + react-router: 8.4.0(patch_hash=01b8b38332369cdffe6f720ec14a03617457b64196ebffb9114edc8eb5503615)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) require-directory@2.1.1: {}