@octanejs/remix-router 0.1.0 → 0.1.2

package/README.md

@@ -2,11 +2,11 @@
 
 [react-router](https://reactrouter.com) for the [octane](https://github.com/octanejs/octane) UI framework.
 
-react-router v7 ships as a single package, so this port **vendors the
+react-router v8 ships as a single package, so this port **vendors the
 framework-agnostic router core byte-close** (loaders, actions, redirects,
-matching, history — validated by 161 of upstream's own router unit tests
-running against the vendored copy) and transcribes the React layer onto
-octane's hooks. The shipped surface matches react-router 1:1 — existing code
+matching, history — validated by 161 ported upstream router tests plus four
+focused v8.2 regression pins) and transcribes the React layer onto octane's
+hooks. The shipped runtime surface matches react-router 1:1 — existing code
 works by changing the import.
 
 **The port is complete — full export parity.** Data mode, declarative mode
@@ -59,11 +59,25 @@ function User() @{
 | `@octanejs/remix-router` | the vendored core surface (matchPath, redirect, data, …) + `createMemoryRouter`, `RouterProvider`, `Outlet`, `Await`, `Link`, `useLinkClickHandler`, the full read-hook family (`useLoaderData`, `useNavigate`, `useNavigation`, `useRouteError`, …), declarative mode (`MemoryRouter`, `Routes`/`Route`, `Navigate`, `createRoutesFromChildren`/`Elements`), the DOM layer (`createBrowserRouter`/`createHashRouter`, `BrowserRouter`/`HashRouter`/`unstable_HistoryRouter`, `NavLink`, `useSearchParams`), mutations (`Form`, `useSubmit`, `useFormAction`, `useFetcher`/`useFetchers`), guards/scroll (`useBlocker`, `ScrollRestoration`, …), static SSR (`StaticRouter`/`StaticRouterProvider`/`createStaticHandler`/`createStaticRouter`), and cookies/sessions (`createCookie`, `createCookieSessionStorage`, …) | full parity |
 | `@octanejs/remix-router/dom` | `RouterProvider` with octane's `flushSync` wired in | mirror of `react-router/dom` |
 
+## React Router 8 migration
+
+- React Router 8 no longer publishes a `react-router-dom` package. Import
+  everything from `@octanejs/remix-router`, except the flushSync-enabled
+  `RouterProvider`, which comes from `@octanejs/remix-router/dom`.
+- Middleware is always enabled. Loader, action, and middleware `context` is a
+  `RouterContextProvider`; the `future.v8_middleware`,
+  `future.v8_passThroughRequests`, and
+  `future.v8_trailingSlashAwareDataRequests` flags are gone.
+- The internal `hasErrorBoundary` route property is gone. Use `ErrorBoundary`
+  or `errorElement`.
+- The package follows Octane's repository-wide Node.js 22 or newer runtime
+  contract.
+
 ## How it works
 
 - The router core under `src/lib/router/` is vendored verbatim from
-  react-router 7.18.1 (`scripts/vendor-remix-router.mjs`; two documented
-  type-only deviations; hand-edits prohibited).
+  react-router 8.2.0 (`scripts/vendor-remix-router.mjs`; two documented
+  Octane integration deviations; hand-edits prohibited).
 - `RouterProvider` preserves upstream's exact commit paths — `startTransition`
   wrapping, the `flushSync` option, and the ViewTransition dance (dormant until
   Phase E) — on octane's `useState`/`useLayoutEffect`/`useOptimistic`/

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "@octanejs/remix-router",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "license": "MIT",
   "type": "module",
+  "engines": {
+    "node": ">=22"
+  },
   "octane": {
     "hookSlots": {
       "manual": [
@@ -10,7 +13,7 @@
       ]
     }
   },
-  "description": "react-router for the octane renderer — the framework-agnostic router core vendored byte-close from react-router v7, with the React layer (RouterProvider, hooks, Link, boundaries) transcribed onto octane.",
+  "description": "react-router for the octane renderer — the framework-agnostic router core vendored byte-close from react-router v8, with the React layer (RouterProvider, hooks, Link, boundaries) transcribed onto octane.",
   "author": {
     "name": "Dominic Gannaway",
     "email": "dg@domgan.com"
@@ -35,17 +38,19 @@
     "./dom": "./src/dom.ts"
   },
   "dependencies": {
-    "cookie": "^1.0.1",
-    "octane": "0.1.4"
+    "cookie-es": "^3.1.1"
+  },
+  "peerDependencies": {
+    "octane": "0.1.6"
   },
   "devDependencies": {
     "@tsrx/react": "^0.2.37",
     "esbuild": "^0.28.1",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
-    "react-router": "7.18.1",
-    "react-router-dom": "7.18.1",
-    "vitest": "^4.1.9"
+    "react-router": "8.2.0",
+    "vitest": "^4.1.9",
+    "octane": "0.1.6"
   },
   "scripts": {
     "test": "vitest run"

package/src/index.ts

@@ -1,6 +1,6 @@
 // @octanejs/remix-router — react-router for the octane renderer.
 //
-// react-router v7 ships as a single package whose framework-agnostic core has
+// react-router v8 ships as a single package whose framework-agnostic core has
 // no runtime subpath, so the core (lib/router/* + framework-free lib helpers)
 // is VENDORED byte-close (see scripts/vendor-remix-router.mjs) and only the
 // React layer is transcribed onto octane's hooks. This entry mirrors upstream
@@ -24,8 +24,15 @@ export type {
 	InstrumentRouterFunction,
 	InstrumentRouteFunction,
 	InstrumentationHandlerResult,
+	InstrumentationClientRouterResult,
+	InstrumentationServerHandlerResult,
 } from './lib/router/instrumentation';
-export { IDLE_NAVIGATION, IDLE_FETCHER, IDLE_BLOCKER } from './lib/router/router';
+export {
+	createStaticHandler,
+	IDLE_NAVIGATION,
+	IDLE_FETCHER,
+	IDLE_BLOCKER,
+} from './lib/router/router';
 export {
 	data,
 	generatePath,
@@ -179,12 +186,7 @@ export type {
 	FetcherWithComponents,
 } from './lib/dom/lib';
 export { Form } from './lib/dom/Form.tsrx';
-export {
-	StaticRouter,
-	StaticRouterProvider,
-	createStaticHandler,
-	createStaticRouter,
-} from './lib/dom/server.tsrx';
+export { StaticRouter, StaticRouterProvider, createStaticRouter } from './lib/dom/server.tsrx';
 
 // ── UNSAFE_ surface (shipped subset) ────────────────────────────────────────
 export {
@@ -194,7 +196,10 @@ export {
 	invariant as UNSAFE_invariant,
 } from './lib/router/history';
 export { createRouter as UNSAFE_createRouter } from './lib/router/router';
-export { ErrorResponseImpl as UNSAFE_ErrorResponseImpl } from './lib/router/utils';
+export {
+	defaultMapRouteProperties as UNSAFE_defaultMapRouteProperties,
+	ErrorResponseImpl as UNSAFE_ErrorResponseImpl,
+} from './lib/router/utils';
 export {
 	DataRouterContext as UNSAFE_DataRouterContext,
 	DataRouterStateContext as UNSAFE_DataRouterStateContext,
@@ -204,10 +209,7 @@ export {
 	RouteContext as UNSAFE_RouteContext,
 	ViewTransitionContext as UNSAFE_ViewTransitionContext,
 } from './lib/context';
-export {
-	hydrationRouteProperties as UNSAFE_hydrationRouteProperties,
-	mapRouteProperties as UNSAFE_mapRouteProperties,
-} from './lib/components/utils';
+export { hydrationRouteProperties as UNSAFE_hydrationRouteProperties } from './lib/components/utils';
 export {
 	WithComponentProps as UNSAFE_WithComponentProps,
 	withComponentProps as UNSAFE_withComponentProps,
@@ -217,7 +219,7 @@ export {
 	withErrorBoundaryProps as UNSAFE_withErrorBoundaryProps,
 } from './lib/components/with-props';
 export type { Register } from './lib/types/register';
-export type { MiddlewareEnabled as UNSAFE_MiddlewareEnabled } from './lib/types/future';
+export type { Future } from './lib/types/future';
 
 // ── Server runtime (vendored cookie/session surface) ────────────────────────
 export { createCookie, isCookie } from './lib/server-runtime/cookies';

package/src/lib/Await.tsrx

@@ -1,4 +1,4 @@
-// Await — port of react-router@7.18.1 lib/components.tsx's Await +
+// Await — port of react-router@8.2.0 lib/components.tsx's Await +
 // AwaitErrorBoundary + ResolveAwait onto octane. The class boundary becomes an
 // octane @try/@catch; the "throw to the suspense boundary" becomes use(promise)
 // (octane's suspend primitive); the TrackedPromise decoration (_tracked/_data/

package/src/lib/DefaultErrorComponent.tsrx

@@ -1,9 +1,9 @@
-// DefaultErrorComponent — port of react-router@7.18.1 lib/hooks.tsx's default
+// DefaultErrorComponent — port of react-router@8.2.0 lib/hooks.tsx's default
 // error UI. Markup-identical (differential fixtures still avoid it — the dev
 // stack trace can never byte-match across runtimes).
 import { useContext } from 'octane';
-import { RouteErrorContext, ENABLE_DEV_WARNINGS } from './context.ts';
-import { isRouteErrorResponse } from './router/utils.ts';
+import { RouteErrorContext } from './context.ts';
+import { ENABLE_DEV_WARNINGS, isRouteErrorResponse } from './router/utils.ts';
 
 export function DefaultErrorComponent() @{
 	const error = useContext(RouteErrorContext);

package/src/lib/RenderErrorBoundary.tsrx

@@ -1,4 +1,4 @@
-// RenderErrorBoundary — port of the class boundary in react-router@7.18.1
+// RenderErrorBoundary — port of the class boundary in react-router@8.2.0
 // lib/hooks.tsx onto octane's @try/@catch (octane has no class components).
 // RSC digest branches are dropped (RSCRouterContext is hardwired false here).
 //

package/src/lib/actions.ts

@@ -1,4 +1,4 @@
-// Vendored from react-router@7.18.1 packages/react-router/lib/actions.ts — unmodified.
+// Vendored from react-router@8.2.0 packages/react-router/lib/actions.ts — unmodified.
 // Re-vendor with `node scripts/vendor-remix-router.mjs`; never hand-edit.
 export function throwIfPotentialCSRFAttack(
 	request: Request,

package/src/lib/components/MemoryRouter.tsrx

@@ -1,4 +1,4 @@
-// MemoryRouter — transcribed from react-router@7.18.1 lib/components.tsx.
+// MemoryRouter — transcribed from react-router@8.2.0 lib/components.tsx.
 // A declarative Router over an in-memory history stack.
 import { startTransition, useCallback, useLayoutEffect, useRef, useState } from 'octane';
 import { createMemoryHistory } from '../router/history.ts';

package/src/lib/components/Navigate.ts

@@ -1,4 +1,4 @@
-// Navigate — transcribed from react-router@7.18.1 lib/components.tsx.
+// Navigate — transcribed from react-router@8.2.0 lib/components.tsx.
 // Renders nothing; navigates from an effect on mount/update. Plain .ts (no
 // JSX needed); the hooks it composes handle a slotless caller via bare-tag
 // sub-slots.

package/src/lib/components/Router.tsrx

@@ -1,4 +1,4 @@
-// Router — transcribed from react-router@7.18.1 lib/components.tsx. The
+// Router — transcribed from react-router@8.2.0 lib/components.tsx. The
 // low-level context provider every router variant renders through.
 import { useMemo } from 'octane';
 import { LocationContext, NavigationContext } from '../context.ts';

package/src/lib/components/RouterProvider.tsrx

@@ -1,4 +1,4 @@
-// RouterProvider + DataRoutes + Outlet — transcribed from react-router@7.18.1
+// RouterProvider + DataRoutes + Outlet — transcribed from react-router@8.2.0
 // lib/components.tsx onto octane. Structure preserved verbatim: useState for
 // router state + layout-effect subscription (early enough for render-driven
 // redirects; subscribe() replays a pre-attach notification), useOptimistic for

package/src/lib/components/Routes.tsrx

@@ -1,4 +1,4 @@
-// Routes — transcribed from react-router@7.18.1 lib/components.tsx, hybrid
+// Routes — transcribed from react-router@8.2.0 lib/components.tsx, hybrid
 // per docs/remix-router-port-plan.md §2a:
 // - descriptor children (createRoutesFromElements results, `{expr}` arrays,
 //   prop-position elements) go through createRoutesFromChildren verbatim;

package/src/lib/components/routes-collector.ts

@@ -1,5 +1,5 @@
 // Declarative `<Routes>`/`<Route>` support — transcribed from
-// react-router@7.18.1 lib/components.tsx with ONE octane-specific mechanism.
+// react-router@8.2.0 lib/components.tsx with ONE octane-specific mechanism.
 //
 // Upstream walks React children (`createRoutesFromChildren`) reading
 // `element.type === Route`. Octane value-position JSX (argument position, prop
@@ -60,7 +60,6 @@ const ROUTE_PROP_KEYS = [
 	'HydrateFallback',
 	'errorElement',
 	'ErrorBoundary',
-	'hasErrorBoundary',
 	'shouldRevalidate',
 	'handle',
 	'lazy',
@@ -170,8 +169,6 @@ function buildRoute(entry: CollectorEntry, treePath: number[]): RouteObject {
 		HydrateFallback: p.HydrateFallback,
 		errorElement: p.errorElement,
 		ErrorBoundary: p.ErrorBoundary,
-		hasErrorBoundary:
-			p.hasErrorBoundary === true || p.ErrorBoundary != null || p.errorElement != null,
 		shouldRevalidate: p.shouldRevalidate,
 		handle: p.handle,
 		lazy: p.lazy,
@@ -295,10 +292,6 @@ export function createRoutesFromChildren(
 			HydrateFallback: element.props.HydrateFallback,
 			errorElement: element.props.errorElement,
 			ErrorBoundary: element.props.ErrorBoundary,
-			hasErrorBoundary:
-				element.props.hasErrorBoundary === true ||
-				element.props.ErrorBoundary != null ||
-				element.props.errorElement != null,
 			shouldRevalidate: element.props.shouldRevalidate,
 			handle: element.props.handle,
 			lazy: element.props.lazy,

package/src/lib/components/utils.ts

@@ -1,16 +1,14 @@
-// Transcribed from react-router@7.18.1 lib/components.tsx (the non-component
-// utilities) onto octane: mapRouteProperties / hydrationRouteProperties /
+// Transcribed from react-router@8.2.0 lib/components.tsx (the non-component
+// utilities) onto octane: hydrationRouteProperties /
 // createMemoryRouter / Deferred / getOptimisticRouterState, plus warnOnce
 // (upstream imports it from lib/server-runtime/warnings.ts — inlined here,
 // the server runtime is out of scope).
-import { createElement } from 'octane';
 import type { InitialEntry } from '../router/history';
 import { createMemoryHistory } from '../router/history';
-import { warning } from '../router/history';
 import type { Router as DataRouter, RouterState } from '../router/router';
 import { createRouter } from '../router/router';
 import type { RouteMatch, RouteObject } from '../router/utils';
-import { ENABLE_DEV_WARNINGS } from '../context';
+import { defaultMapRouteProperties } from '../router/utils';
 import { _renderMatches } from '../hooks';
 
 /**
@@ -29,65 +27,6 @@ export function warnOnce(condition: boolean, message: string): void {
 	}
 }
 
-export function mapRouteProperties(route: RouteObject) {
-	let updates: Partial<RouteObject> & { hasErrorBoundary: boolean } = {
-		// Note: this check also occurs in createRoutesFromChildren so update
-		// there if you change this -- please and thank you!
-		hasErrorBoundary:
-			route.hasErrorBoundary || route.ErrorBoundary != null || route.errorElement != null,
-	};
-
-	if (route.Component) {
-		if (ENABLE_DEV_WARNINGS) {
-			if (route.element) {
-				warning(
-					false,
-					'You should not include both `Component` and `element` on your route - ' +
-						'`Component` will be used.',
-				);
-			}
-		}
-		Object.assign(updates, {
-			element: createElement(route.Component as any),
-			Component: undefined,
-		});
-	}
-
-	if (route.HydrateFallback) {
-		if (ENABLE_DEV_WARNINGS) {
-			if (route.hydrateFallbackElement) {
-				warning(
-					false,
-					'You should not include both `HydrateFallback` and `hydrateFallbackElement` on your route - ' +
-						'`HydrateFallback` will be used.',
-				);
-			}
-		}
-		Object.assign(updates, {
-			hydrateFallbackElement: createElement(route.HydrateFallback as any),
-			HydrateFallback: undefined,
-		});
-	}
-
-	if (route.ErrorBoundary) {
-		if (ENABLE_DEV_WARNINGS) {
-			if (route.errorElement) {
-				warning(
-					false,
-					'You should not include both `ErrorBoundary` and `errorElement` on your route - ' +
-						'`ErrorBoundary` will be used.',
-				);
-			}
-		}
-		Object.assign(updates, {
-			errorElement: createElement(route.ErrorBoundary as any),
-			ErrorBoundary: undefined,
-		});
-	}
-
-	return updates;
-}
-
 export const hydrationRouteProperties: (keyof RouteObject)[] = [
 	'HydrateFallback',
 	'hydrateFallbackElement',
@@ -117,7 +56,7 @@ export function createMemoryRouter(routes: RouteObject[], opts?: MemoryRouterOpt
 		hydrationData: opts?.hydrationData,
 		routes,
 		hydrationRouteProperties,
-		mapRouteProperties,
+		mapRouteProperties: defaultMapRouteProperties,
 		dataStrategy: opts?.dataStrategy,
 		patchRoutesOnNavigation: opts?.patchRoutesOnNavigation,
 		instrumentations: opts?.instrumentations,

package/src/lib/components/with-props.ts

@@ -1,4 +1,4 @@
-// UNSAFE_With*Props wrappers — transcribed from react-router@7.18.1
+// UNSAFE_With*Props wrappers — transcribed from react-router@8.2.0
 // lib/components.tsx. Used by framework-mode codegen upstream; exported here
 // for surface parity. Plain .ts: cloneElement/createElement over descriptors.
 import { cloneElement, createElement } from 'octane';

package/src/lib/context.ts

@@ -1,4 +1,4 @@
-// Transcribed from react-router@7.18.1 lib/context.ts onto octane. The ten
+// Transcribed from react-router@8.2.0 lib/context.ts onto octane. The ten
 // contexts and their shapes are verbatim; octane substitutions: createContext/
 // createElement from 'octane', `__DEV__` → NODE_ENV, no displayName (octane
 // contexts carry none). RSCRouterContext is kept (hardwired default false — no
@@ -48,7 +48,7 @@ export const ViewTransitionContext = createContext<ViewTransitionContextObject>(
 	isTransitioning: false,
 });
 
-// TODO: (v7) Change the useFetcher data from `any` to `unknown`
+// TODO: (v9) Change the useFetcher data from `any` to `unknown`
 export type FetchersContextObject = Map<string, any>;
 
 export const FetchersContext = createContext<FetchersContextObject>(new Map());
@@ -125,5 +125,3 @@ export const RouteContext = createContext<RouteContextObject>({
 });
 
 export const RouteErrorContext = createContext<any>(null);
-
-export const ENABLE_DEV_WARNINGS = process.env.NODE_ENV !== 'production';

package/src/lib/dom/Form.tsrx

@@ -1,4 +1,4 @@
-// Form — transcribed from react-router@7.18.1 lib/dom/lib.tsx onto octane.
+// Form — transcribed from react-router@8.2.0 lib/dom/lib.tsx onto octane.
 // forwardRef → ref-as-prop. The submit handler is a NATIVE delegated `submit`
 // listener (octane has no synthetic events): `event.submitter` is read
 // directly off the native SubmitEvent where React goes through

package/src/lib/dom/Link.tsrx

@@ -1,4 +1,4 @@
-// Link — transcribed from react-router@7.18.1 lib/dom/lib.tsx onto octane.
+// Link — transcribed from react-router@8.2.0 lib/dom/lib.tsx onto octane.
 // forwardRef → ref-as-prop (octane refs are props; documented divergence).
 // Framework-mode prefetching (usePrefetchBehavior / PrefetchPageLinks) is
 // inert outside a FrameworkContext upstream and is dropped here — the

package/src/lib/dom/NavLink.tsrx

@@ -1,4 +1,4 @@
-// NavLink — transcribed from react-router@7.18.1 lib/dom/lib.tsx onto octane.
+// NavLink — transcribed from react-router@8.2.0 lib/dom/lib.tsx onto octane.
 // forwardRef → ref-as-prop. Renders <Link> with active/pending-derived
 // className/style/aria-current; `className`, `style`, and `children` accept
 // render props receiving { isActive, isPending, isTransitioning }. Octane

package/src/lib/dom/dom.ts

@@ -1,4 +1,4 @@
-// Vendored from react-router@7.18.1 packages/react-router/lib/dom/dom.ts — unmodified.
+// Vendored from react-router@8.2.0 packages/react-router/lib/dom/dom.ts — unmodified.
 // Re-vendor with `node scripts/vendor-remix-router.mjs`; never hand-edit.
 import { warning } from '../router/history';
 import type { RelativeRoutingType } from '../router/router';

package/src/lib/dom/hooks.ts

@@ -1,4 +1,4 @@
-// DOM hooks — transcribed from react-router@7.18.1 lib/dom/lib.tsx onto
+// DOM hooks — transcribed from react-router@8.2.0 lib/dom/lib.tsx onto
 // octane. This PR ships useLinkClickHandler (Link's engine); the remaining DOM
 // hooks (useSearchParams, useSubmit, useFetcher, …) land in later phases per
 // docs/remix-router-port-plan.md.

package/src/lib/dom/lib.ts

@@ -1,4 +1,4 @@
-// DOM-mode entry points + hooks — transcribed from react-router@7.18.1
+// DOM-mode entry points + hooks — transcribed from react-router@8.2.0
 // lib/dom/lib.tsx onto octane: createBrowserRouter / createHashRouter (with
 // upstream's __staticRouterHydrationData parsing + error deserialization),
 // useSearchParams, and useViewTransitionState (needed internally by NavLink;
@@ -38,11 +38,12 @@ import type { RouteObject } from '../router/utils';
 import {
 	ErrorResponseImpl,
 	SUPPORTED_ERROR_TYPES,
+	defaultMapRouteProperties,
 	joinPaths,
 	matchPath,
 	stripBasename,
 } from '../router/utils';
-import { hydrationRouteProperties, mapRouteProperties } from '../components/utils';
+import { hydrationRouteProperties } from '../components/utils';
 import {
 	useBlocker,
 	useLocation,
@@ -81,7 +82,7 @@ export function createBrowserRouter(routes: RouteObject[], opts?: DOMRouterOpts)
 		history: createBrowserHistory({ window: opts?.window }),
 		hydrationData: opts?.hydrationData || parseHydrationData(),
 		routes,
-		mapRouteProperties,
+		mapRouteProperties: defaultMapRouteProperties,
 		hydrationRouteProperties,
 		dataStrategy: opts?.dataStrategy,
 		patchRoutesOnNavigation: opts?.patchRoutesOnNavigation,
@@ -102,7 +103,7 @@ export function createHashRouter(routes: RouteObject[], opts?: DOMRouterOpts): D
 		history: createHashHistory({ window: opts?.window }),
 		hydrationData: opts?.hydrationData || parseHydrationData(),
 		routes,
-		mapRouteProperties,
+		mapRouteProperties: defaultMapRouteProperties,
 		hydrationRouteProperties,
 		dataStrategy: opts?.dataStrategy,
 		patchRoutesOnNavigation: opts?.patchRoutesOnNavigation,
@@ -134,7 +135,7 @@ function deserializeErrors(errors: DataRouter['state']['errors']): DataRouter['s
 	let serialized: DataRouter['state']['errors'] = {};
 	for (let [key, val] of entries) {
 		// Hey you!  If you change this, please change the corresponding logic in
-		// serializeErrors in react-router-dom/server.tsx :)
+		// serializeErrors in lib/dom/server.tsx :)
 		if (val && val.__type === 'RouteErrorResponse') {
 			serialized[key] = new ErrorResponseImpl(
 				val.status,
@@ -246,7 +247,7 @@ export function useViewTransitionState(to: To, ...args: any[]): boolean {
 
 	invariant(
 		vtContext != null,
-		"`useViewTransitionState` must be used within `react-router-dom`'s `RouterProvider`.  " +
+		"`useViewTransitionState` must be used within `react-router/dom`'s `RouterProvider`.  " +
 			'Did you accidentally import `RouterProvider` from `react-router`?',
 	);
 
@@ -276,7 +277,7 @@ export function useViewTransitionState(to: To, ...args: any[]): boolean {
 
 // ── Phase D — mutations ─────────────────────────────────────────────────────
 // useSubmit / useFormAction / useFetcher / useFetchers — transcribed from
-// react-router@7.18.1 lib/dom/lib.tsx. The dom-side data-router guards mirror
+// react-router@8.2.0 lib/dom/lib.tsx. The dom-side data-router guards mirror
 // upstream's local DataRouterHook enum + console errors.
 
 enum DataRouterHook {

package/src/lib/dom/routers.tsrx

@@ -1,5 +1,5 @@
 // BrowserRouter / HashRouter / HistoryRouter — transcribed from
-// react-router@7.18.1 lib/dom/lib.tsx. Declarative routers over browser /
+// react-router@8.2.0 lib/dom/lib.tsx. Declarative routers over browser /
 // hash / caller-provided history (upstream repeats the subscribe body in each;
 // so does this transcription).
 import { startTransition, useCallback, useLayoutEffect, useRef, useState } from 'octane';

package/src/lib/dom/server.tsrx

@@ -1,22 +1,15 @@
-// Static SSR — transcribed from react-router@7.18.1 lib/dom/server.tsx onto
+// Static SSR — transcribed from react-router@8.2.0 lib/dom/server.tsx onto
 // octane: StaticRouter (a Router that may not navigate), StaticRouterProvider
 // (renders a static data router + the __staticRouterHydrationData script),
-// createStaticHandler (the dom wrapper adding mapRouteProperties), and
-// createStaticRouter (a stateless DataRouter over a StaticHandlerContext).
+// and createStaticRouter (a stateless DataRouter over a StaticHandlerContext).
 // Render through `octane/server` (renderToString / renderToPipeableStream).
 import type { Location, Path, To } from '../router/history.ts';
 import { Action as NavigationType, createPath, invariant, parsePath } from '../router/history.ts';
-import {
-	IDLE_BLOCKER,
-	IDLE_FETCHER,
-	IDLE_NAVIGATION,
-	createStaticHandler as routerCreateStaticHandler,
-} from '../router/router.ts';
+import { IDLE_BLOCKER, IDLE_FETCHER, IDLE_NAVIGATION } from '../router/router.ts';
 import { convertRoutesToDataRoutes, isRouteErrorResponse } from '../router/utils.ts';
 import { ABSOLUTE_URL_REGEX } from '../router/url.ts';
 import { Router } from '../components/Router.tsrx';
 import { DataRoutes } from '../components/RouterProvider.tsrx';
-import { mapRouteProperties } from '../components/utils.ts';
 import {
 	DataRouterContext,
 	DataRouterStateContext,
@@ -136,7 +129,7 @@ function serializeErrors(errors) {
 	const serialized = {};
 	for (const [key, val] of entries) {
 		// Hey you!  If you change this, please change the corresponding logic in
-		// deserializeErrors in react-router-dom/index.tsx :)
+		// deserializeErrors in lib/dom/lib.tsx :)
 		if (isRouteErrorResponse(val)) {
 			serialized[key] = { ...val, __type: 'RouteErrorResponse' };
 		} else if (val instanceof Error) {
@@ -190,22 +183,12 @@ function getStatelessNavigator() {
 	};
 }
 
-/**
- * Create a static handler to perform server-side data loading.
- */
-export function createStaticHandler(routes, opts) {
-	return routerCreateStaticHandler(routes, {
-		...opts,
-		mapRouteProperties,
-	});
-}
-
 /**
  * Create a static DataRouter for server-side rendering.
  */
 export function createStaticRouter(routes, context, opts = {}) {
 	const manifest = {};
-	const dataRoutes = convertRoutesToDataRoutes(routes, mapRouteProperties, undefined, manifest);
+	const dataRoutes = convertRoutesToDataRoutes(routes, undefined, undefined, manifest);
 
 	// Because our context matches may be from a set of routes passed to
 	// createStaticHandler(), we update them here with our newly created/enhanced
@@ -226,12 +209,7 @@ export function createStaticRouter(routes, context, opts = {}) {
 			return context.basename;
 		},
 		get future() {
-			return {
-				v8_middleware: false,
-				v8_passThroughRequests: false,
-				v8_trailingSlashAwareDataRequests: false,
-				...opts?.future,
-			};
+			return { ...opts?.future };
 		},
 		get state() {
 			return {

package/src/lib/errors.ts

@@ -1,4 +1,4 @@
-// Vendored from react-router@7.18.1 packages/react-router/lib/errors.ts — unmodified.
+// Vendored from react-router@8.2.0 packages/react-router/lib/errors.ts — unmodified.
 // Re-vendor with `node scripts/vendor-remix-router.mjs`; never hand-edit.
 import { isDataWithResponseInit } from './router/router';
 import { ErrorResponseImpl } from './router/utils';

package/src/lib/hooks.ts

@@ -1,4 +1,4 @@
-// Transcribed from react-router@7.18.1 lib/hooks.tsx onto octane. Upstream
+// Transcribed from react-router@8.2.0 lib/hooks.tsx onto octane. Upstream
 // logic, comments, and warning strings are verbatim; octane substitutions:
 // hooks from 'octane' with the binding slot idiom (splitSlot/subSlot — this
 // file is NOT compiled, so exported hooks peel the caller's compiler-injected
@@ -23,7 +23,6 @@ import {
 	AwaitContext,
 	DataRouterContext,
 	DataRouterStateContext,
-	ENABLE_DEV_WARNINGS,
 	LocationContext,
 	NavigationContext,
 	RouteContext,
@@ -55,6 +54,7 @@ import type {
 import {
 	convertRouteMatchToUiMatch,
 	decodePath,
+	ENABLE_DEV_WARNINGS,
 	getResolveToMatches,
 	getRoutePattern,
 	joinPaths,
@@ -223,18 +223,6 @@ export interface NavigateFunction {
 const navigateEffectWarning =
 	`You should call navigate() in a useEffect(), not when ` + `your component is first rendered.`;
 
-// Mute warnings for calls to useNavigate in SSR environments
-function useIsomorphicLayoutEffect(cb: Parameters<typeof useLayoutEffect>[0], slot?: symbol) {
-	let isStatic = useContext(NavigationContext).static;
-	if (!isStatic) {
-		// We should be able to get rid of this once react 18.3 is released
-		// See: https://github.com/facebook/react/pull/26395
-		// OCTANE: conditional hook calls are fine — hooks are slot-keyed, not
-		// call-order keyed.
-		useLayoutEffect(cb, undefined, subSlot(slot, 'ile'));
-	}
-}
-
 /**
  * Returns a function that lets you navigate programmatically in the browser in
  * response to user interactions or effects.
@@ -406,10 +394,11 @@ function useNavigateUnstable(slot?: symbol): NavigateFunction {
 	let routePathnamesJson = JSON.stringify(getResolveToMatches(matches));
 
 	let activeRef = useRef(false, subSlot(slot, 'unav:ref'));
-	useIsomorphicLayoutEffect(
+	useLayoutEffect(
 		() => {
 			activeRef.current = true;
 		},
+		undefined,
 		subSlot(slot, 'unav:ile'),
 	);
 
@@ -1628,10 +1617,11 @@ function useNavigateStable(slot?: symbol): NavigateFunction {
 	let id = useCurrentRouteId(DataRouterStateHook.UseNavigateStable);
 
 	let activeRef = useRef(false, subSlot(slot, 'snav:ref'));
-	useIsomorphicLayoutEffect(
+	useLayoutEffect(
 		() => {
 			activeRef.current = true;
 		},
+		undefined,
 		subSlot(slot, 'snav:ile'),
 	);