react-router 0.0.0-experimental-4e44d47 → 0.0.0-experimental-3df673e

package/dist/{development/chunk-PSQFTIPQ.mjs → production/chunk-IFXZKZUN.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-4e44d47
+ * react-router v0.0.0-experimental-3df673e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -61,7 +61,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-XVVWTPHF.mjs";
+} from "./chunk-XWLYGPB7.mjs";
 
 // lib/dom/ssr/server.tsx
 import * as React from "react";
@@ -519,7 +519,7 @@ async function callRouteHandler(handler, args) {
     request: stripRoutesParam(stripIndexParam2(args.request)),
     params: args.params,
     context: args.context,
-    pattern: args.pattern
+    unstable_pattern: args.unstable_pattern
   });
   if (isDataWithResponseInit(result) && result.init && result.init.status && isRedirectStatusCode(result.init.status)) {
     throw new Response(null, result.init);

package/dist/production/{chunk-OXRQQZPR.js → chunk-NZTFTCSL.js}

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }/**
- * react-router v0.0.0-experimental-4e44d47
+ * react-router v0.0.0-experimental-3df673e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -985,7 +985,7 @@ async function recurseRight(impls, info, handler, index) {
   }
 }
 function getInstrumentationInfo(args) {
-  let { request, context, params, pattern } = args;
+  let { request, context, params, unstable_pattern } = args;
   return {
     // pseudo "Request" with the info they may want to read from
     request: {
@@ -997,7 +997,7 @@ function getInstrumentationInfo(args) {
       }
     },
     params: { ...params },
-    pattern,
+    unstable_pattern,
     context: {
       get: (...args2) => context.get(...args2)
     }
@@ -3095,7 +3095,7 @@ function createStaticHandler(routes, opts) {
         let response = await runServerMiddlewarePipeline(
           {
             request,
-            pattern: getRoutePattern(matches.map((m) => m.route.path)),
+            unstable_pattern: getRoutePattern(matches.map((m) => m.route.path)),
             matches,
             params: matches[0].params,
             // If we're calling middleware then it must be enabled so we can cast
@@ -3241,7 +3241,7 @@ function createStaticHandler(routes, opts) {
       let response = await runServerMiddlewarePipeline(
         {
           request,
-          pattern: getRoutePattern(matches.map((m) => m.route.path)),
+          unstable_pattern: getRoutePattern(matches.map((m) => m.route.path)),
           matches,
           params: matches[0].params,
           // If we're calling middleware then it must be enabled so we can cast
@@ -3815,6 +3815,8 @@ function getMatchesToLoad(request, scopedContext, mapRouteProperties, manifest,
     actionResult,
     actionStatus
   };
+  let pattern = getRoutePattern(matches.map((m) => m.route.path));
+  console.log(pattern, matches);
   let dsMatches = matches.map((match, index) => {
     let { route } = match;
     let forceShouldLoad = null;
@@ -3838,7 +3840,7 @@ function getMatchesToLoad(request, scopedContext, mapRouteProperties, manifest,
         mapRouteProperties,
         manifest,
         request,
-        getRoutePattern(matches.map((m) => m.route.path)),
+        pattern,
         match,
         lazyRoutePropertiesToSkip,
         scopedContext,
@@ -3859,7 +3861,7 @@ function getMatchesToLoad(request, scopedContext, mapRouteProperties, manifest,
       mapRouteProperties,
       manifest,
       request,
-      getRoutePattern(matches.map((m) => m.route.path)),
+      pattern,
       match,
       lazyRoutePropertiesToSkip,
       scopedContext,
@@ -4322,7 +4324,7 @@ async function runMiddlewarePipeline(args, handler, processResult, isResult, err
       request,
       params,
       context,
-      pattern: getRoutePattern(matches.map((m) => m.route.path))
+      unstable_pattern: getRoutePattern(matches.map((m) => m.route.path))
     },
     tuples,
     handler,
@@ -4401,7 +4403,7 @@ function getDataStrategyMatchLazyPromises(mapRouteProperties, manifest, request,
     handler: lazyRoutePromises.lazyHandlerPromise
   };
 }
-function getDataStrategyMatch(mapRouteProperties, manifest, request, pattern, match, lazyRoutePropertiesToSkip, scopedContext, shouldLoad, unstable_shouldRevalidateArgs = null) {
+function getDataStrategyMatch(mapRouteProperties, manifest, request, unstable_pattern, match, lazyRoutePropertiesToSkip, scopedContext, shouldLoad, unstable_shouldRevalidateArgs = null) {
   let isUsingNewApi = false;
   let _lazyPromises = getDataStrategyMatchLazyPromises(
     mapRouteProperties,
@@ -4435,7 +4437,7 @@ function getDataStrategyMatch(mapRouteProperties, manifest, request, pattern, ma
       if (callHandler && !isMiddlewareOnlyRoute) {
         return callLoaderOrAction({
           request,
-          pattern,
+          unstable_pattern,
           match,
           lazyHandlerPromise: _optionalChain([_lazyPromises, 'optionalAccess', _39 => _39.handler]),
           lazyRoutePromise: _optionalChain([_lazyPromises, 'optionalAccess', _40 => _40.route]),
@@ -4484,7 +4486,7 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
   }
   let dataStrategyArgs = {
     request,
-    pattern: getRoutePattern(matches.map((m) => m.route.path)),
+    unstable_pattern: getRoutePattern(matches.map((m) => m.route.path)),
     params: matches[0].params,
     context: scopedContext,
     matches
@@ -4525,7 +4527,7 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
 }
 async function callLoaderOrAction({
   request,
-  pattern,
+  unstable_pattern,
   match,
   lazyHandlerPromise,
   lazyRoutePromise,
@@ -4552,7 +4554,7 @@ async function callLoaderOrAction({
       return handler(
         {
           request,
-          pattern,
+          unstable_pattern,
           params: match.params,
           context: scopedContext
         },
@@ -7458,7 +7460,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
       let hasInitialError = initialState && initialState.errors && route.id in initialState.errors;
       let initialError = hasInitialError ? _optionalChain([initialState, 'optionalAccess', _91 => _91.errors, 'optionalAccess', _92 => _92[route.id]]) : void 0;
       let isHydrationRequest = needsRevalidation == null && (_optionalChain([routeModule, 'access', _93 => _93.clientLoader, 'optionalAccess', _94 => _94.hydrate]) === true || !route.hasLoader);
-      dataRoute.loader = async ({ request, params, context, pattern }, singleFetch) => {
+      dataRoute.loader = async ({ request, params, context, unstable_pattern }, singleFetch) => {
         try {
           let result = await prefetchStylesAndCallHandler(async () => {
             invariant2(
@@ -7472,7 +7474,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
               request,
               params,
               context,
-              pattern,
+              unstable_pattern,
               async serverLoader() {
                 preventInvalidServerHandlerCall("loader", route);
                 if (isHydrationRequest) {
@@ -7498,7 +7500,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
         route.hasLoader,
         isSpaMode
       );
-      dataRoute.action = ({ request, params, context, pattern }, singleFetch) => {
+      dataRoute.action = ({ request, params, context, unstable_pattern }, singleFetch) => {
         return prefetchStylesAndCallHandler(async () => {
           invariant2(
             routeModule,
@@ -7514,7 +7516,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
             request,
             params,
             context,
-            pattern,
+            unstable_pattern,
             async serverAction() {
               preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);

package/dist/production/{chunk-GSSVRQ6M.mjs → chunk-XWLYGPB7.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-4e44d47
+ * react-router v0.0.0-experimental-3df673e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -985,7 +985,7 @@ async function recurseRight(impls, info, handler, index) {
   }
 }
 function getInstrumentationInfo(args) {
-  let { request, context, params, pattern } = args;
+  let { request, context, params, unstable_pattern } = args;
   return {
     // pseudo "Request" with the info they may want to read from
     request: {
@@ -997,7 +997,7 @@ function getInstrumentationInfo(args) {
       }
     },
     params: { ...params },
-    pattern,
+    unstable_pattern,
     context: {
       get: (...args2) => context.get(...args2)
     }
@@ -3095,7 +3095,7 @@ function createStaticHandler(routes, opts) {
         let response = await runServerMiddlewarePipeline(
           {
             request,
-            pattern: getRoutePattern(matches.map((m) => m.route.path)),
+            unstable_pattern: getRoutePattern(matches.map((m) => m.route.path)),
             matches,
             params: matches[0].params,
             // If we're calling middleware then it must be enabled so we can cast
@@ -3241,7 +3241,7 @@ function createStaticHandler(routes, opts) {
       let response = await runServerMiddlewarePipeline(
         {
           request,
-          pattern: getRoutePattern(matches.map((m) => m.route.path)),
+          unstable_pattern: getRoutePattern(matches.map((m) => m.route.path)),
           matches,
           params: matches[0].params,
           // If we're calling middleware then it must be enabled so we can cast
@@ -3815,6 +3815,8 @@ function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest,
     actionResult,
     actionStatus
   };
+  let pattern = getRoutePattern(matches.map((m) => m.route.path));
+  console.log(pattern, matches);
   let dsMatches = matches.map((match, index) => {
     let { route } = match;
     let forceShouldLoad = null;
@@ -3838,7 +3840,7 @@ function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest,
         mapRouteProperties2,
         manifest,
         request,
-        getRoutePattern(matches.map((m) => m.route.path)),
+        pattern,
         match,
         lazyRoutePropertiesToSkip,
         scopedContext,
@@ -3859,7 +3861,7 @@ function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest,
       mapRouteProperties2,
       manifest,
       request,
-      getRoutePattern(matches.map((m) => m.route.path)),
+      pattern,
       match,
       lazyRoutePropertiesToSkip,
       scopedContext,
@@ -4322,7 +4324,7 @@ async function runMiddlewarePipeline(args, handler, processResult, isResult, err
       request,
       params,
       context,
-      pattern: getRoutePattern(matches.map((m) => m.route.path))
+      unstable_pattern: getRoutePattern(matches.map((m) => m.route.path))
     },
     tuples,
     handler,
@@ -4401,7 +4403,7 @@ function getDataStrategyMatchLazyPromises(mapRouteProperties2, manifest, request
     handler: lazyRoutePromises.lazyHandlerPromise
   };
 }
-function getDataStrategyMatch(mapRouteProperties2, manifest, request, pattern, match, lazyRoutePropertiesToSkip, scopedContext, shouldLoad, unstable_shouldRevalidateArgs = null) {
+function getDataStrategyMatch(mapRouteProperties2, manifest, request, unstable_pattern, match, lazyRoutePropertiesToSkip, scopedContext, shouldLoad, unstable_shouldRevalidateArgs = null) {
   let isUsingNewApi = false;
   let _lazyPromises = getDataStrategyMatchLazyPromises(
     mapRouteProperties2,
@@ -4435,7 +4437,7 @@ function getDataStrategyMatch(mapRouteProperties2, manifest, request, pattern, m
       if (callHandler && !isMiddlewareOnlyRoute) {
         return callLoaderOrAction({
           request,
-          pattern,
+          unstable_pattern,
           match,
           lazyHandlerPromise: _lazyPromises?.handler,
           lazyRoutePromise: _lazyPromises?.route,
@@ -4484,7 +4486,7 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
   }
   let dataStrategyArgs = {
     request,
-    pattern: getRoutePattern(matches.map((m) => m.route.path)),
+    unstable_pattern: getRoutePattern(matches.map((m) => m.route.path)),
     params: matches[0].params,
     context: scopedContext,
     matches
@@ -4525,7 +4527,7 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
 }
 async function callLoaderOrAction({
   request,
-  pattern,
+  unstable_pattern,
   match,
   lazyHandlerPromise,
   lazyRoutePromise,
@@ -4552,7 +4554,7 @@ async function callLoaderOrAction({
       return handler(
         {
           request,
-          pattern,
+          unstable_pattern,
           params: match.params,
           context: scopedContext
         },
@@ -8336,7 +8338,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
       let hasInitialError = initialState && initialState.errors && route.id in initialState.errors;
       let initialError = hasInitialError ? initialState?.errors?.[route.id] : void 0;
       let isHydrationRequest = needsRevalidation == null && (routeModule.clientLoader?.hydrate === true || !route.hasLoader);
-      dataRoute.loader = async ({ request, params, context, pattern }, singleFetch) => {
+      dataRoute.loader = async ({ request, params, context, unstable_pattern }, singleFetch) => {
         try {
           let result = await prefetchStylesAndCallHandler(async () => {
             invariant2(
@@ -8350,7 +8352,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
               request,
               params,
               context,
-              pattern,
+              unstable_pattern,
               async serverLoader() {
                 preventInvalidServerHandlerCall("loader", route);
                 if (isHydrationRequest) {
@@ -8376,7 +8378,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
         route.hasLoader,
         isSpaMode
       );
-      dataRoute.action = ({ request, params, context, pattern }, singleFetch) => {
+      dataRoute.action = ({ request, params, context, unstable_pattern }, singleFetch) => {
         return prefetchStylesAndCallHandler(async () => {
           invariant2(
             routeModule,
@@ -8392,7 +8394,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
             request,
             params,
             context,
-            pattern,
+            unstable_pattern,
             async serverAction() {
               preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);
@@ -9402,7 +9404,7 @@ var isBrowser = typeof window !== "undefined" && typeof window.document !== "und
 try {
   if (isBrowser) {
     window.__reactRouterVersion = // @ts-expect-error
-    "0.0.0-experimental-4e44d47";
+    "0.0.0-experimental-3df673e";
   }
 } catch (e) {
 }

package/dist/production/dom-export.d.mts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { R as RouterProviderProps$1, a as RouterInit, u as unstable_ClientInstrumentation, b as unstable_ClientOnErrorFunction } from './router-2BoB34m1.mjs';
+import { R as RouterProviderProps$1, a as RouterInit, u as unstable_ClientInstrumentation, b as unstable_ClientOnErrorFunction } from './router-B02dMGKy.mjs';
 import './browser-z32v5KVN.mjs';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;

package/dist/production/dom-export.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { RouterProviderProps as RouterProviderProps$1, RouterInit, unstable_ClientOnErrorFunction } from 'react-router';
-import { u as unstable_ClientInstrumentation } from './instrumentation-XYmrzhe3.js';
+import { u as unstable_ClientInstrumentation } from './instrumentation-BsMyG4uF.js';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;
 declare function RouterProvider(props: Omit<RouterProviderProps, "flushSync">): React.JSX.Element;

package/dist/production/dom-export.js

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }/**
- * react-router v0.0.0-experimental-4e44d47
+ * react-router v0.0.0-experimental-3df673e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -11,7 +11,7 @@
 "use client";
 
 
-var _chunkOXRQQZPRjs = require('./chunk-OXRQQZPR.js');
+var _chunkNZTFTCSLjs = require('./chunk-NZTFTCSL.js');
 
 // lib/dom-export/dom-router-provider.tsx
 var _react = require('react'); var React = _interopRequireWildcard(_react); var React2 = _interopRequireWildcard(_react);
@@ -183,7 +183,7 @@ function HydratedRouter(props) {
   }, []);
   React2.useEffect(() => {
     if (process.env.NODE_ENV === "development" && criticalCss === void 0) {
-      document.querySelectorAll(`[${_chunkOXRQQZPRjs.CRITICAL_CSS_DATA_ATTRIBUTE}]`).forEach((element) => element.remove());
+      document.querySelectorAll(`[${_chunkNZTFTCSLjs.CRITICAL_CSS_DATA_ATTRIBUTE}]`).forEach((element) => element.remove());
     }
   }, [criticalCss]);
   let [location, setLocation] = React2.useState(router.state.location);

package/dist/production/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-4e44d47
+ * react-router v0.0.0-experimental-3df673e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -12,7 +12,7 @@
 import {
   deserializeErrors,
   getHydrationData
-} from "./chunk-IZVJSKMU.mjs";
+} from "./chunk-IFXZKZUN.mjs";
 import {
   CRITICAL_CSS_DATA_ATTRIBUTE,
   FrameworkContext,
@@ -29,7 +29,7 @@ import {
   invariant,
   mapRouteProperties,
   useFogOFWarDiscovery
-} from "./chunk-GSSVRQ6M.mjs";
+} from "./chunk-XWLYGPB7.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";

package/dist/production/{index-react-server-client-83aVZHgI.d.ts → index-react-server-client-CCykjjOv.d.ts}

@@ -1,6 +1,6 @@
-import { d as RouteModules, H as HydrationState, D as DataRouteObject, r as ClientLoaderFunction, z as StaticHandlerContext, aN as ServerRouteModule, A as AppLoadContext, h as RelativeRoutingType, au as PageLinkDescriptor, y as GetScrollRestorationKeyFunction, t as RouterInit, aO as FutureConfig$1, v as PatchRoutesOnNavigationFunction, e as NavigateOptions, J as Fetcher, j as RouteObject, c as Router, g as SerializeFrom, B as BlockerFunction, aP as CreateStaticHandlerOptions$1, w as StaticHandler } from './routeModules-Bu1JamQV.js';
+import { d as RouteModules, H as HydrationState, D as DataRouteObject, r as ClientLoaderFunction, z as StaticHandlerContext, aN as ServerRouteModule, A as AppLoadContext, h as RelativeRoutingType, au as PageLinkDescriptor, y as GetScrollRestorationKeyFunction, t as RouterInit, aO as FutureConfig$1, v as PatchRoutesOnNavigationFunction, e as NavigateOptions, J as Fetcher, j as RouteObject, c as Router, g as SerializeFrom, B as BlockerFunction, aP as CreateStaticHandlerOptions$1, w as StaticHandler } from './routeModules-BsBQDHG4.js';
 import * as React from 'react';
-import { ac as RouteManifest, t as MiddlewareEnabled, R as RouterContextProvider, w as LoaderFunctionArgs, v as ActionFunctionArgs, j as unstable_ServerInstrumentation, i as HTMLFormMethod, F as FormEncType, T as To, H as History, u as unstable_ClientInstrumentation, f as DataStrategyFunction, L as Location } from './instrumentation-XYmrzhe3.js';
+import { ac as RouteManifest, t as MiddlewareEnabled, R as RouterContextProvider, w as LoaderFunctionArgs, v as ActionFunctionArgs, j as unstable_ServerInstrumentation, i as HTMLFormMethod, F as FormEncType, T as To, H as History, u as unstable_ClientInstrumentation, f as DataStrategyFunction, L as Location } from './instrumentation-BsMyG4uF.js';
 
 interface Route {
     index?: boolean;

package/dist/{development/index-react-server-client-BDG19ZQl.d.mts → production/index-react-server-client-vPxdwQO-.d.mts}

@@ -1,6 +1,6 @@
-import { b8 as RouteManifest, H as HydrationState, G as DataRouteObject, Q as StaticHandlerContext, e as MiddlewareEnabled, c as RouterContextProvider, f as LoaderFunctionArgs, A as ActionFunctionArgs, b9 as unstable_ServerInstrumentation, a4 as HTMLFormMethod, a2 as FormEncType, n as RelativeRoutingType, T as To, ba as History, O as GetScrollRestorationKeyFunction, a as RouterInit, bb as FutureConfig$1, u as unstable_ClientInstrumentation, l as DataStrategyFunction, F as PatchRoutesOnNavigationFunction, N as NavigateOptions, V as Fetcher, v as RouteObject, k as Router, B as BlockerFunction, L as Location, bc as CreateStaticHandlerOptions$1, J as StaticHandler } from './router-2BoB34m1.mjs';
+import { b8 as RouteManifest, H as HydrationState, G as DataRouteObject, Q as StaticHandlerContext, e as MiddlewareEnabled, c as RouterContextProvider, f as LoaderFunctionArgs, A as ActionFunctionArgs, b9 as unstable_ServerInstrumentation, a4 as HTMLFormMethod, a2 as FormEncType, n as RelativeRoutingType, T as To, ba as History, O as GetScrollRestorationKeyFunction, a as RouterInit, bb as FutureConfig$1, u as unstable_ClientInstrumentation, l as DataStrategyFunction, F as PatchRoutesOnNavigationFunction, N as NavigateOptions, V as Fetcher, v as RouteObject, k as Router, B as BlockerFunction, L as Location, bc as CreateStaticHandlerOptions$1, J as StaticHandler } from './router-B02dMGKy.mjs';
 import * as React from 'react';
-import { c as RouteModules, h as ClientLoaderFunction, o as ServerRouteModule, A as AppLoadContext, m as PageLinkDescriptor, d as SerializeFrom } from './routeModules-CtCOLGtG.mjs';
+import { c as RouteModules, h as ClientLoaderFunction, o as ServerRouteModule, A as AppLoadContext, m as PageLinkDescriptor, d as SerializeFrom } from './routeModules-DSpLybMz.mjs';
 
 interface Route {
     index?: boolean;

package/dist/production/index-react-server-client.d.mts

@@ -1,4 +1,4 @@
-export { aF as MemoryRouter, aG as Navigate, aH as Outlet, aI as Route, aJ as Router, aK as RouterProvider, aL as Routes, as as UNSAFE_AwaitContextProvider, b2 as UNSAFE_WithComponentProps, b6 as UNSAFE_WithErrorBoundaryProps, b4 as UNSAFE_WithHydrateFallbackProps } from './router-2BoB34m1.mjs';
-export { l as BrowserRouter, q as Form, m as HashRouter, n as Link, X as Links, W as Meta, p as NavLink, r as ScrollRestoration, T as StaticRouter, V as StaticRouterProvider, o as unstable_HistoryRouter } from './index-react-server-client-BDG19ZQl.mjs';
+export { aF as MemoryRouter, aG as Navigate, aH as Outlet, aI as Route, aJ as Router, aK as RouterProvider, aL as Routes, as as UNSAFE_AwaitContextProvider, b2 as UNSAFE_WithComponentProps, b6 as UNSAFE_WithErrorBoundaryProps, b4 as UNSAFE_WithHydrateFallbackProps } from './router-B02dMGKy.mjs';
+export { l as BrowserRouter, q as Form, m as HashRouter, n as Link, X as Links, W as Meta, p as NavLink, r as ScrollRestoration, T as StaticRouter, V as StaticRouterProvider, o as unstable_HistoryRouter } from './index-react-server-client-vPxdwQO-.mjs';
 import 'react';
-import './routeModules-CtCOLGtG.mjs';
+import './routeModules-DSpLybMz.mjs';

package/dist/production/index-react-server-client.d.ts

@@ -1,4 +1,4 @@
-export { af as MemoryRouter, ag as Navigate, ah as Outlet, ai as Route, aj as Router, ak as RouterProvider, al as Routes, a0 as UNSAFE_AwaitContextProvider, aH as UNSAFE_WithComponentProps, aL as UNSAFE_WithErrorBoundaryProps, aJ as UNSAFE_WithHydrateFallbackProps } from './routeModules-Bu1JamQV.js';
-export { l as BrowserRouter, q as Form, m as HashRouter, n as Link, X as Links, W as Meta, p as NavLink, r as ScrollRestoration, T as StaticRouter, V as StaticRouterProvider, o as unstable_HistoryRouter } from './index-react-server-client-83aVZHgI.js';
+export { af as MemoryRouter, ag as Navigate, ah as Outlet, ai as Route, aj as Router, ak as RouterProvider, al as Routes, a0 as UNSAFE_AwaitContextProvider, aH as UNSAFE_WithComponentProps, aL as UNSAFE_WithErrorBoundaryProps, aJ as UNSAFE_WithHydrateFallbackProps } from './routeModules-BsBQDHG4.js';
+export { l as BrowserRouter, q as Form, m as HashRouter, n as Link, X as Links, W as Meta, p as NavLink, r as ScrollRestoration, T as StaticRouter, V as StaticRouterProvider, o as unstable_HistoryRouter } from './index-react-server-client-CCykjjOv.js';
 import 'react';
-import './instrumentation-XYmrzhe3.js';
+import './instrumentation-BsMyG4uF.js';

package/dist/production/index-react-server-client.js

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});/**
- * react-router v0.0.0-experimental-4e44d47
+ * react-router v0.0.0-experimental-3df673e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -29,12 +29,12 @@
 
 
 
-var _chunkUNIYMJFUjs = require('./chunk-UNIYMJFU.js');
+var _chunkBJWGLTLVjs = require('./chunk-BJWGLTLV.js');
 
 
 
 
-var _chunkOXRQQZPRjs = require('./chunk-OXRQQZPR.js');
+var _chunkNZTFTCSLjs = require('./chunk-NZTFTCSL.js');
 
 
 
@@ -58,4 +58,4 @@ var _chunkOXRQQZPRjs = require('./chunk-OXRQQZPR.js');
 
 
 
-exports.BrowserRouter = _chunkUNIYMJFUjs.BrowserRouter; exports.Form = _chunkUNIYMJFUjs.Form; exports.HashRouter = _chunkUNIYMJFUjs.HashRouter; exports.Link = _chunkUNIYMJFUjs.Link; exports.Links = _chunkOXRQQZPRjs.Links; exports.MemoryRouter = _chunkUNIYMJFUjs.MemoryRouter; exports.Meta = _chunkOXRQQZPRjs.Meta; exports.NavLink = _chunkUNIYMJFUjs.NavLink; exports.Navigate = _chunkUNIYMJFUjs.Navigate; exports.Outlet = _chunkUNIYMJFUjs.Outlet; exports.Route = _chunkUNIYMJFUjs.Route; exports.Router = _chunkUNIYMJFUjs.Router; exports.RouterProvider = _chunkUNIYMJFUjs.RouterProvider; exports.Routes = _chunkUNIYMJFUjs.Routes; exports.ScrollRestoration = _chunkUNIYMJFUjs.ScrollRestoration; exports.StaticRouter = _chunkUNIYMJFUjs.StaticRouter; exports.StaticRouterProvider = _chunkUNIYMJFUjs.StaticRouterProvider; exports.UNSAFE_AwaitContextProvider = _chunkOXRQQZPRjs.AwaitContextProvider; exports.UNSAFE_WithComponentProps = _chunkUNIYMJFUjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunkUNIYMJFUjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunkUNIYMJFUjs.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunkUNIYMJFUjs.HistoryRouter;
+exports.BrowserRouter = _chunkBJWGLTLVjs.BrowserRouter; exports.Form = _chunkBJWGLTLVjs.Form; exports.HashRouter = _chunkBJWGLTLVjs.HashRouter; exports.Link = _chunkBJWGLTLVjs.Link; exports.Links = _chunkNZTFTCSLjs.Links; exports.MemoryRouter = _chunkBJWGLTLVjs.MemoryRouter; exports.Meta = _chunkNZTFTCSLjs.Meta; exports.NavLink = _chunkBJWGLTLVjs.NavLink; exports.Navigate = _chunkBJWGLTLVjs.Navigate; exports.Outlet = _chunkBJWGLTLVjs.Outlet; exports.Route = _chunkBJWGLTLVjs.Route; exports.Router = _chunkBJWGLTLVjs.Router; exports.RouterProvider = _chunkBJWGLTLVjs.RouterProvider; exports.Routes = _chunkBJWGLTLVjs.Routes; exports.ScrollRestoration = _chunkBJWGLTLVjs.ScrollRestoration; exports.StaticRouter = _chunkBJWGLTLVjs.StaticRouter; exports.StaticRouterProvider = _chunkBJWGLTLVjs.StaticRouterProvider; exports.UNSAFE_AwaitContextProvider = _chunkNZTFTCSLjs.AwaitContextProvider; exports.UNSAFE_WithComponentProps = _chunkBJWGLTLVjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunkBJWGLTLVjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunkBJWGLTLVjs.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunkBJWGLTLVjs.HistoryRouter;

package/dist/production/index-react-server-client.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-4e44d47
+ * react-router v0.0.0-experimental-3df673e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -32,7 +32,7 @@ import {
   WithComponentProps,
   WithErrorBoundaryProps,
   WithHydrateFallbackProps
-} from "./chunk-GSSVRQ6M.mjs";
+} from "./chunk-XWLYGPB7.mjs";
 export {
   BrowserRouter,
   Form,

package/dist/production/index-react-server.d.mts

@@ -355,7 +355,7 @@ interface DataFunctionArgs<Context> {
      * Matched un-interpolated route pattern for the current path (i.e., /blog/:slug).
      * Mostly useful as a identifier to aggregate on for logging/tracing/etc.
      */
-    pattern: string;
+    unstable_pattern: string;
     /**
      * {@link https://reactrouter.com/start/framework/routing#dynamic-segments Dynamic route params} for the current route.
      * @example
@@ -928,7 +928,7 @@ type RouteHandlerInstrumentationInfo = Readonly<{
         headers: Pick<Headers, "get">;
     };
     params: LoaderFunctionArgs["params"];
-    pattern: string;
+    unstable_pattern: string;
     context: Pick<RouterContextProvider, "get">;
 }>;
 interface InstrumentLazyFunction extends GenericInstrumentFunction {
@@ -1911,7 +1911,7 @@ type ClientDataFunctionArgs<Params> = {
      * Matched un-interpolated route pattern for the current path (i.e., /blog/:slug).
      * Mostly useful as a identifier to aggregate on for logging/tracing/etc.
      */
-    pattern: string;
+    unstable_pattern: string;
     /**
      * When `future.v8_middleware` is not enabled, this is undefined.
      *

package/dist/production/index-react-server.d.ts

@@ -355,7 +355,7 @@ interface DataFunctionArgs<Context> {
      * Matched un-interpolated route pattern for the current path (i.e., /blog/:slug).
      * Mostly useful as a identifier to aggregate on for logging/tracing/etc.
      */
-    pattern: string;
+    unstable_pattern: string;
     /**
      * {@link https://reactrouter.com/start/framework/routing#dynamic-segments Dynamic route params} for the current route.
      * @example
@@ -928,7 +928,7 @@ type RouteHandlerInstrumentationInfo = Readonly<{
         headers: Pick<Headers, "get">;
     };
     params: LoaderFunctionArgs["params"];
-    pattern: string;
+    unstable_pattern: string;
     context: Pick<RouterContextProvider, "get">;
 }>;
 interface InstrumentLazyFunction extends GenericInstrumentFunction {
@@ -1911,7 +1911,7 @@ type ClientDataFunctionArgs<Params> = {
      * Matched un-interpolated route pattern for the current path (i.e., /blog/:slug).
      * Mostly useful as a identifier to aggregate on for logging/tracing/etc.
      */
-    pattern: string;
+    unstable_pattern: string;
     /**
      * When `future.v8_middleware` is not enabled, this is undefined.
      *

package/dist/production/index-react-server.js

@@ -27,7 +27,7 @@ function _interopNamespace(e) {
 var React2__namespace = /*#__PURE__*/_interopNamespace(React2);
 
 /**
- * react-router v0.0.0-experimental-4e44d47
+ * react-router v0.0.0-experimental-3df673e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -138,7 +138,7 @@ async function recurseRight(impls, info, handler, index) {
   }
 }
 function getInstrumentationInfo(args) {
-  let { request, context, params, pattern } = args;
+  let { request, context, params, unstable_pattern } = args;
   return {
     // pseudo "Request" with the info they may want to read from
     request: {
@@ -150,7 +150,7 @@ function getInstrumentationInfo(args) {
       }
     },
     params: { ...params },
-    pattern,
+    unstable_pattern,
     context: {
       get: (...args2) => context.get(...args2)
     }
@@ -911,7 +911,7 @@ function createStaticHandler(routes, opts) {
         let response = await runServerMiddlewarePipeline(
           {
             request,
-            pattern: getRoutePattern(matches.map((m) => m.route.path)),
+            unstable_pattern: getRoutePattern(matches.map((m) => m.route.path)),
             matches,
             params: matches[0].params,
             // If we're calling middleware then it must be enabled so we can cast
@@ -1057,7 +1057,7 @@ function createStaticHandler(routes, opts) {
       let response = await runServerMiddlewarePipeline(
         {
           request,
-          pattern: getRoutePattern(matches.map((m) => m.route.path)),
+          unstable_pattern: getRoutePattern(matches.map((m) => m.route.path)),
           matches,
           params: matches[0].params,
           // If we're calling middleware then it must be enabled so we can cast
@@ -1698,7 +1698,7 @@ async function runMiddlewarePipeline(args, handler, processResult, isResult, err
       request,
       params,
       context,
-      pattern: getRoutePattern(matches.map((m) => m.route.path))
+      unstable_pattern: getRoutePattern(matches.map((m) => m.route.path))
     },
     tuples,
     handler,
@@ -1777,7 +1777,7 @@ function getDataStrategyMatchLazyPromises(mapRouteProperties, manifest, request,
     handler: lazyRoutePromises.lazyHandlerPromise
   };
 }
-function getDataStrategyMatch(mapRouteProperties, manifest, request, pattern, match, lazyRoutePropertiesToSkip, scopedContext, shouldLoad, unstable_shouldRevalidateArgs = null) {
+function getDataStrategyMatch(mapRouteProperties, manifest, request, unstable_pattern, match, lazyRoutePropertiesToSkip, scopedContext, shouldLoad, unstable_shouldRevalidateArgs = null) {
   let isUsingNewApi = false;
   let _lazyPromises = getDataStrategyMatchLazyPromises(
     mapRouteProperties,
@@ -1811,7 +1811,7 @@ function getDataStrategyMatch(mapRouteProperties, manifest, request, pattern, ma
       if (callHandler && !isMiddlewareOnlyRoute) {
         return callLoaderOrAction({
           request,
-          pattern,
+          unstable_pattern,
           match,
           lazyHandlerPromise: _lazyPromises?.handler,
           lazyRoutePromise: _lazyPromises?.route,
@@ -1860,7 +1860,7 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
   }
   let dataStrategyArgs = {
     request,
-    pattern: getRoutePattern(matches.map((m) => m.route.path)),
+    unstable_pattern: getRoutePattern(matches.map((m) => m.route.path)),
     params: matches[0].params,
     context: scopedContext,
     matches
@@ -1888,7 +1888,7 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
 }
 async function callLoaderOrAction({
   request,
-  pattern,
+  unstable_pattern,
   match,
   lazyHandlerPromise,
   lazyRoutePromise,
@@ -1915,7 +1915,7 @@ async function callLoaderOrAction({
       return handler(
         {
           request,
-          pattern,
+          unstable_pattern,
           params: match.params,
           context: scopedContext
         },