react-router 0.0.0-experimental-ce4015162 → 0.0.0-experimental-8cee090e4

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # `react-router`
 
+## v7.16.0
+
+### Minor Changes
+
+- Stabilize `future.unstable_trailingSlashAwareDataRequests` as `future.v8_trailingSlashAwareDataRequests` ([#15098](https://github.com/remix-run/react-router/pull/15098))
+
+### Patch Changes
+
+- Disable manifest path when lazy route dicovery is disabled ([#15068](https://github.com/remix-run/react-router/pull/15068))
+
+- Fix browser URL creation to use the configured history window instead of the global window. ([#15066](https://github.com/remix-run/react-router/pull/15066))
+  - Pass the history/router window through to `createBrowserURLImpl` so custom window contexts keep the correct URL origin.
+
+- Fix `useNavigation()` return type to preserve discriminated union across navigation states ([#15095](https://github.com/remix-run/react-router/pull/15095))
+
+- Widen `MetaDescriptor` `script:ld+json` type from `LdJsonObject` to `LdJsonObject | LdJsonObject[]` to permit multiple JSON-LD schemas in a single `<script type="application/ld+json">` tag emitted by `<Meta />` ([#15082](https://github.com/remix-run/react-router/pull/15082))
+
 ## v7.15.1
 
 ### Patch Changes

package/dist/development/dom-export.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -1,7 +1,7 @@
 
 import * as React from "react";
+import { CookieParseOptions, CookieParseOptions as CookieParseOptions$1, CookieSerializeOptions, CookieSerializeOptions as CookieSerializeOptions$1 } from "cookie-es";
 import { BrowserRouter, Form, HashRouter, Link, Links, MemoryRouter, Meta, NavLink, Navigate, Outlet, Route, Router, RouterProvider, Routes, ScrollRestoration, StaticRouter, StaticRouterProvider, unstable_HistoryRouter } from "react-router/internal/react-server-client";
-import { ParseOptions, ParseOptions as ParseOptions$1, SerializeOptions, SerializeOptions as SerializeOptions$1 } from "cookie";
 
 //#region lib/router/history.d.ts
 /**
@@ -2038,7 +2038,7 @@ type MetaDescriptor = {
   httpEquiv: string;
   content: string;
 } | {
-  "script:ld+json": LdJsonObject;
+  "script:ld+json": LdJsonObject | LdJsonObject[];
 } | {
   tagName: "meta" | "link";
   [name: string]: string;
@@ -2480,7 +2480,7 @@ interface CookieSignatureOptions {
    */
   secrets?: string[];
 }
-type CookieOptions = ParseOptions & SerializeOptions & CookieSignatureOptions;
+type CookieOptions = CookieParseOptions & CookieSerializeOptions & CookieSignatureOptions;
 /**
  * A HTTP cookie.
  *
@@ -2511,12 +2511,12 @@ interface Cookie {
    * Parses a raw `Cookie` header and returns the value of this cookie or
    * `null` if it's not present.
    */
-  parse(cookieHeader: string | null, options?: ParseOptions): Promise<any>;
+  parse(cookieHeader: string | null, options?: CookieParseOptions): Promise<any>;
   /**
    * Serializes the given value to a string and returns the `Set-Cookie`
    * header.
    */
-  serialize(value: any, options?: SerializeOptions): Promise<string>;
+  serialize(value: any, options?: CookieSerializeOptions): Promise<string>;
 }
 /**
  * Creates a logical container for managing a browser cookie from the server.
@@ -2610,17 +2610,17 @@ interface SessionStorage<Data = SessionData, FlashData = Data> {
    * Session. If there is no session associated with the cookie, this will
    * return a new Session with no data.
    */
-  getSession: (cookieHeader?: string | null, options?: ParseOptions$1) => Promise<Session<Data, FlashData>>;
+  getSession: (cookieHeader?: string | null, options?: CookieParseOptions$1) => Promise<Session<Data, FlashData>>;
   /**
    * Stores all data in the Session and returns the Set-Cookie header to be
    * used in the HTTP response.
    */
-  commitSession: (session: Session<Data, FlashData>, options?: SerializeOptions$1) => Promise<string>;
+  commitSession: (session: Session<Data, FlashData>, options?: CookieSerializeOptions$1) => Promise<string>;
   /**
    * Deletes all data associated with the Session and returns the Set-Cookie
    * header to be used in the HTTP response.
    */
-  destroySession: (session: Session<Data, FlashData>, options?: SerializeOptions$1) => Promise<string>;
+  destroySession: (session: Session<Data, FlashData>, options?: CookieSerializeOptions$1) => Promise<string>;
 }
 /**
  * SessionIdStorageStrategy is designed to allow anyone to easily build their
@@ -2710,4 +2710,4 @@ declare function createMemorySessionStorage<Data = SessionData, FlashData = Data
   cookie
 }?: MemorySessionStorageOptions): SessionStorage<Data, FlashData>;
 //#endregion
-export { Await, BrowserRouter, type Cookie, type CookieOptions, type ParseOptions as CookieParseOptions, type SerializeOptions as CookieSerializeOptions, type CookieSignatureOptions, type FlashSessionData, Form, HashRouter, type IsCookieFunction, type IsSessionFunction, Link, Links, MemoryRouter, Meta, type MiddlewareFunction, type MiddlewareNextFunction, NavLink, Navigate, Outlet, Route, Router, type RouterContext, RouterContextProvider, RouterProvider, Routes, ScrollRestoration, type Session, type SessionData, type SessionIdStorageStrategy, type SessionStorage, StaticRouter, StaticRouterProvider, createContext, createCookie, createCookieSessionStorage, createMemorySessionStorage, createSession, createSessionStorage, createStaticHandler, data, href, isCookie, isRouteErrorResponse, isSession, matchRoutes, redirect, redirectDocument, replace$1 as replace, type DecodeActionFunction as unstable_DecodeActionFunction, type DecodeFormStateFunction as unstable_DecodeFormStateFunction, type DecodeReplyFunction as unstable_DecodeReplyFunction, unstable_HistoryRouter, type LoadServerActionFunction as unstable_LoadServerActionFunction, type RSCManifestPayload as unstable_RSCManifestPayload, type RSCMatch as unstable_RSCMatch, type RSCPayload as unstable_RSCPayload, type RSCRenderPayload as unstable_RSCRenderPayload, type RSCRouteConfig as unstable_RSCRouteConfig, type RSCRouteConfigEntry as unstable_RSCRouteConfigEntry, type RSCRouteManifest as unstable_RSCRouteManifest, type RSCRouteMatch as unstable_RSCRouteMatch, getRequest as unstable_getRequest, matchRSCServerRequest as unstable_matchRSCServerRequest };
+export { Await, BrowserRouter, type Cookie, type CookieOptions, type CookieParseOptions, type CookieSerializeOptions, type CookieSignatureOptions, type FlashSessionData, Form, HashRouter, type IsCookieFunction, type IsSessionFunction, Link, Links, MemoryRouter, Meta, type MiddlewareFunction, type MiddlewareNextFunction, NavLink, Navigate, Outlet, Route, Router, type RouterContext, RouterContextProvider, RouterProvider, Routes, ScrollRestoration, type Session, type SessionData, type SessionIdStorageStrategy, type SessionStorage, StaticRouter, StaticRouterProvider, createContext, createCookie, createCookieSessionStorage, createMemorySessionStorage, createSession, createSessionStorage, createStaticHandler, data, href, isCookie, isRouteErrorResponse, isSession, matchRoutes, redirect, redirectDocument, replace$1 as replace, type DecodeActionFunction as unstable_DecodeActionFunction, type DecodeFormStateFunction as unstable_DecodeFormStateFunction, type DecodeReplyFunction as unstable_DecodeReplyFunction, unstable_HistoryRouter, type LoadServerActionFunction as unstable_LoadServerActionFunction, type RSCManifestPayload as unstable_RSCManifestPayload, type RSCMatch as unstable_RSCMatch, type RSCPayload as unstable_RSCPayload, type RSCRenderPayload as unstable_RSCRenderPayload, type RSCRouteConfig as unstable_RSCRouteConfig, type RSCRouteConfigEntry as unstable_RSCRouteConfigEntry, type RSCRouteManifest as unstable_RSCRouteManifest, type RSCRouteMatch as unstable_RSCRouteMatch, getRequest as unstable_getRequest, matchRSCServerRequest as unstable_matchRSCServerRequest };

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

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -10,9 +10,8 @@
  */
 import { AsyncLocalStorage } from "node:async_hooks";
 import * as React from "react";
-import { splitCookiesString } from "set-cookie-parser";
+import { parse, serialize, splitSetCookieString } from "cookie-es";
 import { BrowserRouter, Form, HashRouter, Link, Links, MemoryRouter, Meta, NavLink, Navigate, Outlet, Outlet as Outlet$1, Route, Router, RouterProvider, Routes, ScrollRestoration, StaticRouter, StaticRouterProvider, UNSAFE_AwaitContextProvider, UNSAFE_WithComponentProps, UNSAFE_WithErrorBoundaryProps, UNSAFE_WithHydrateFallbackProps, unstable_HistoryRouter } from "react-router/internal/react-server-client";
-import { parse, serialize } from "cookie";
 //#region lib/router/history.ts
 function invariant$1(value, message) {
 	if (value === false || value === null || typeof value === "undefined") throw new Error(message);
@@ -730,8 +729,10 @@ const normalizePathname = (pathname) => removeTrailingSlash(pathname).replace(/^
 const normalizeSearch = (search) => !search || search === "?" ? "" : search.startsWith("?") ? search : "?" + search;
 const normalizeHash = (hash) => !hash || hash === "#" ? "" : hash.startsWith("#") ? hash : "#" + hash;
 var DataWithResponseInit = class {
+	type = "DataWithResponseInit";
+	data;
+	init;
 	constructor(data, init) {
-		this.type = "DataWithResponseInit";
 		this.data = data;
 		this.init = init || null;
 	}
@@ -875,6 +876,11 @@ const replace$1 = (url, init) => {
 	return response;
 };
 var ErrorResponseImpl = class {
+	status;
+	statusText;
+	data;
+	error;
+	internal;
 	constructor(status, statusText, data, internal = false) {
 		this.status = status;
 		this.statusText = statusText || "";
@@ -2057,7 +2063,7 @@ function getDocumentHeadersImpl(context, getRouteHeadersFn, _defaultHeaders) {
 function prependCookies(parentHeaders, childHeaders) {
 	let parentSetCookieString = parentHeaders.get("Set-Cookie");
 	if (parentSetCookieString) {
-		let cookies = splitCookiesString(parentSetCookieString);
+		let cookies = splitSetCookieString(parentSetCookieString);
 		let childCookies = new Set(childHeaders.getSetCookie());
 		cookies.forEach((cookie) => {
 			if (!childCookies.has(cookie)) childHeaders.append("Set-Cookie", cookie);
@@ -2150,17 +2156,13 @@ function createRouteErrorResponseDigest(response) {
 }
 //#endregion
 //#region lib/server-runtime/urls.ts
-function getNormalizedPath(request, basename, future) {
+function getNormalizedPath(request, basename) {
 	basename = basename || "/";
 	let url = new URL(request.url);
 	let pathname = url.pathname;
-	if (future?.unstable_trailingSlashAwareDataRequests) if (pathname.endsWith("/_.data")) pathname = pathname.replace(/_\.data$/, "");
+	if (pathname.endsWith("/_.data")) pathname = pathname.replace(/_\.data$/, "");
 	else pathname = pathname.replace(/\.data$/, "");
-	else {
-		if (stripBasename(pathname, basename) === "/_root.data") pathname = basename;
-		else if (pathname.endsWith(".data")) pathname = pathname.replace(/\.data$/, "");
-		if (stripBasename(pathname, basename) !== "/" && pathname.endsWith("/")) pathname = pathname.slice(0, -1);
-	}
+	if (stripBasename(pathname, basename) !== "/" && pathname.endsWith("/")) pathname = pathname.slice(0, -1);
 	let searchParams = new URLSearchParams(url.search);
 	searchParams.delete("_routes");
 	let search = searchParams.toString();
@@ -2443,7 +2445,7 @@ async function generateResourceResponse(request, routes, basename, routeId, requ
 					return generateErrorResponse(error);
 				}
 			},
-			normalizePath: (r) => getNormalizedPath(r, basename, null)
+			normalizePath: (r) => getNormalizedPath(r, basename)
 		});
 	} catch (error) {
 		return generateErrorResponse(error);
@@ -2490,7 +2492,7 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
 		skipLoaderErrorBubbling: isDataRequest,
 		skipRevalidation: isSubmission,
 		...routeIdsToLoad ? { filterMatchesToLoad: (m) => routeIdsToLoad.includes(m.route.id) } : {},
-		normalizePath: (r) => getNormalizedPath(r, basename, null),
+		normalizePath: (r) => getNormalizedPath(r, basename),
 		async generateMiddlewareResponse(query) {
 			let formState;
 			let skipRevalidation = false;

package/dist/development/index.d.ts

@@ -13,7 +13,7 @@ import { BrowserRouter, BrowserRouterProps, DOMRouterOpts, FetcherFormProps, Fet
 import { StaticRouter, StaticRouterProps, StaticRouterProvider, StaticRouterProviderProps, createStaticRouter } from "./lib/dom/server.js";
 import { ServerRouter, ServerRouterProps } from "./lib/dom/ssr/server.js";
 import { RoutesTestStubProps, createRoutesStub } from "./lib/dom/ssr/routes-test-stub.js";
-import { Cookie, CookieOptions, CookieSignatureOptions, IsCookieFunction, ParseOptions, SerializeOptions, createCookie, isCookie } from "./lib/server-runtime/cookies.js";
+import { Cookie, CookieOptions, CookieParseOptions, CookieSerializeOptions, CookieSignatureOptions, IsCookieFunction, createCookie, isCookie } from "./lib/server-runtime/cookies.js";
 import { FlashSessionData, IsSessionFunction, Session, SessionData, SessionIdStorageStrategy, SessionStorage, createSession, createSessionStorage, isSession } from "./lib/server-runtime/sessions.js";
 import { createCookieSessionStorage } from "./lib/server-runtime/sessions/cookieStorage.js";
 import { createMemorySessionStorage } from "./lib/server-runtime/sessions/memoryStorage.js";
@@ -43,4 +43,4 @@ import { ClientInstrumentation, InstrumentRequestHandlerFunction, InstrumentRout
 declare const unstable_getRequest: typeof getRequest;
 declare const unstable_matchRSCServerRequest: typeof matchRSCServerRequest;
 //#endregion
-export { type ActionFunction, type ActionFunctionArgs, type AppLoadContext, Await, type AwaitProps, type BaseRouteObject, type Blocker, type BlockerFunction, BrowserRouter, type BrowserRouterProps, type ClientActionFunction, type ClientActionFunctionArgs, type ClientInstrumentation, type ClientLoaderFunction, type ClientLoaderFunctionArgs, type ClientOnErrorFunction, type Cookie, type CookieOptions, type ParseOptions as CookieParseOptions, type SerializeOptions as CookieSerializeOptions, type CookieSignatureOptions, type CreateRequestHandlerFunction, type DOMRouterOpts, type DataRouteMatch, type DataRouteObject, type Router as DataRouter, type DataStrategyFunction, type DataStrategyFunctionArgs, type DataStrategyMatch, type DataStrategyResult, type DiscoverBehavior, type EntryContext, type ErrorResponse, type Fetcher, type FetcherFormProps, type FetcherSubmitFunction, type FetcherSubmitOptions, type FetcherWithComponents, type FlashSessionData, Form, type FormEncType, type FormMethod, type FormProps, type Future, type GetScrollPositionFunction, type GetScrollRestorationKeyFunction, type HTMLFormMethod, type HandleDataRequestFunction, type HandleDocumentRequestFunction, type HandleErrorFunction, HashRouter, type HashRouterProps, type HeadersArgs, type HeadersFunction, type HistoryRouterProps, type HtmlLinkDescriptor, type HydrationState, IDLE_BLOCKER, IDLE_FETCHER, IDLE_NAVIGATION, type IndexRouteObject, type IndexRouteProps, type InitialEntry, type InstrumentRequestHandlerFunction, type InstrumentRouteFunction, type InstrumentRouterFunction, type InstrumentationHandlerResult, type IsCookieFunction, type IsSessionFunction, type LayoutRouteProps, type LazyRouteFunction, Link, type LinkDescriptor, type LinkProps, Links, type LinksFunction, type LinksProps, type LoaderFunction, type LoaderFunctionArgs, type Location, MemoryRouter, type MemoryRouterOpts, type MemoryRouterProps, Meta, type MetaArgs, type MetaDescriptor, type MetaFunction, type MiddlewareFunction, NavLink, type NavLinkProps, type NavLinkRenderProps, Navigate, type NavigateFunction, type NavigateOptions, type NavigateProps, type Navigation, type NavigationStates, Action as NavigationType, type Navigator, type NonIndexRouteObject, Outlet, type OutletProps, type PageLinkDescriptor, type ParamKeyValuePair, type ParamParseKey, type Params, type PatchRoutesOnNavigationFunction, type PatchRoutesOnNavigationFunctionArgs, type Path, type PathMatch, type PathParam, type PathPattern, type PathRouteProps, type PrefetchBehavior, PrefetchPageLinks, type RedirectFunction, type Register, type RelativeRoutingType, type RequestHandler, type RevalidationState, Route, type RouteMatch, type RouteObject, type RouteProps, Router$1 as Router, type RouterContext, RouterContextProvider, type RouterFetchOptions, type RouterInit, type RouterNavigateOptions, type RouterProps, RouterProvider, type RouterProviderProps, type RouterState, type RouterSubscriber, Routes, type RoutesProps, type RoutesTestStubProps, Scripts, type ScriptsProps, ScrollRestoration, type ScrollRestorationProps, type ServerBuild, type ServerEntryModule, type ServerInstrumentation, ServerRouter, type ServerRouterProps, type Session, type SessionData, type SessionIdStorageStrategy, type SessionStorage, type SetURLSearchParams, type ShouldRevalidateFunction, type ShouldRevalidateFunctionArgs, type StaticHandler, type StaticHandlerContext, StaticRouter, type StaticRouterProps, StaticRouterProvider, type StaticRouterProviderProps, type SubmitFunction, type SubmitOptions, type SubmitTarget, type To, type UIMatch, type AssetsManifest as UNSAFE_AssetsManifest, AwaitContextProvider as UNSAFE_AwaitContextProvider, DataRouterContext as UNSAFE_DataRouterContext, DataRouterStateContext as UNSAFE_DataRouterStateContext, type DataWithResponseInit as UNSAFE_DataWithResponseInit, ErrorResponseImpl as UNSAFE_ErrorResponseImpl, FetchersContext as UNSAFE_FetchersContext, FrameworkContext as UNSAFE_FrameworkContext, LocationContext as UNSAFE_LocationContext, NavigationContext as UNSAFE_NavigationContext, RSCDefaultRootErrorBoundary as UNSAFE_RSCDefaultRootErrorBoundary, RemixErrorBoundary as UNSAFE_RemixErrorBoundary, RouteContext as UNSAFE_RouteContext, type RouteModules as UNSAFE_RouteModules, ServerMode as UNSAFE_ServerMode, SingleFetchRedirectSymbol as UNSAFE_SingleFetchRedirectSymbol, ViewTransitionContext as UNSAFE_ViewTransitionContext, WithComponentProps as UNSAFE_WithComponentProps, WithErrorBoundaryProps as UNSAFE_WithErrorBoundaryProps, WithHydrateFallbackProps as UNSAFE_WithHydrateFallbackProps, createBrowserHistory as UNSAFE_createBrowserHistory, createClientRoutes as UNSAFE_createClientRoutes, createClientRoutesWithHMRRevalidationOptOut as UNSAFE_createClientRoutesWithHMRRevalidationOptOut, createHashHistory as UNSAFE_createHashHistory, createMemoryHistory as UNSAFE_createMemoryHistory, createRouter as UNSAFE_createRouter, decodeViaTurboStream as UNSAFE_decodeViaTurboStream, defaultMapRouteProperties as UNSAFE_defaultMapRouteProperties, deserializeErrors as UNSAFE_deserializeErrors, getHydrationData as UNSAFE_getHydrationData, getPatchRoutesOnNavigationFunction as UNSAFE_getPatchRoutesOnNavigationFunction, getTurboStreamSingleFetchDataStrategy as UNSAFE_getTurboStreamSingleFetchDataStrategy, hydrationRouteProperties as UNSAFE_hydrationRouteProperties, invariant as UNSAFE_invariant, shouldHydrateRouteLoader as UNSAFE_shouldHydrateRouteLoader, useFogOFWarDiscovery as UNSAFE_useFogOFWarDiscovery, useScrollRestoration as UNSAFE_useScrollRestoration, withComponentProps as UNSAFE_withComponentProps, withErrorBoundaryProps as UNSAFE_withErrorBoundaryProps, withHydrateFallbackProps as UNSAFE_withHydrateFallbackProps, type URLSearchParamsInit, createBrowserRouter, createContext, createCookie, createCookieSessionStorage, createHashRouter, createMemoryRouter, createMemorySessionStorage, createPath, createRequestHandler, createRoutesFromChildren, createRoutesFromElements, createRoutesStub, createSearchParams, createSession, createSessionStorage, createStaticHandler, createStaticRouter, data, generatePath, href, isCookie, isRouteErrorResponse, isSession, matchPath, matchRoutes, parsePath, redirect, redirectDocument, renderMatches, replace, resolvePath, type BrowserCreateFromReadableStreamFunction as unstable_BrowserCreateFromReadableStreamFunction, type DecodeActionFunction as unstable_DecodeActionFunction, type DecodeFormStateFunction as unstable_DecodeFormStateFunction, type DecodeReplyFunction as unstable_DecodeReplyFunction, type EncodeReplyFunction as unstable_EncodeReplyFunction, HistoryRouter as unstable_HistoryRouter, type LoadServerActionFunction as unstable_LoadServerActionFunction, type RSCHydratedRouterProps as unstable_RSCHydratedRouterProps, type RSCManifestPayload as unstable_RSCManifestPayload, type RSCMatch as unstable_RSCMatch, type RSCPayload as unstable_RSCPayload, type RSCRenderPayload as unstable_RSCRenderPayload, type RSCRouteConfig as unstable_RSCRouteConfig, type RSCRouteConfigEntry as unstable_RSCRouteConfigEntry, type RSCRouteManifest as unstable_RSCRouteManifest, type RSCRouteMatch as unstable_RSCRouteMatch, RSCStaticRouter as unstable_RSCStaticRouter, type RSCStaticRouterProps as unstable_RSCStaticRouterProps, type unstable_RouterState, type unstable_RouterStateActiveVariant, type unstable_RouterStatePendingVariant, type SSRCreateFromReadableStreamFunction as unstable_SSRCreateFromReadableStreamFunction, type unstable_SerializesTo, unstable_getRequest, unstable_matchRSCServerRequest, routeRSCServerRequest as unstable_routeRSCServerRequest, setDevServerHooks as unstable_setDevServerHooks, usePrompt as unstable_usePrompt, useRoute as unstable_useRoute, useRouterState as unstable_useRouterState, useActionData, useAsyncError, useAsyncValue, useBeforeUnload, useBlocker, useFetcher, useFetchers, useFormAction, useHref, useInRouterContext, useLinkClickHandler, useLoaderData, useLocation, useMatch, useMatches, useNavigate, useNavigation, useNavigationType, useOutlet, useOutletContext, useParams, useResolvedPath, useRevalidator, useRouteError, useRouteLoaderData, useRoutes, useSearchParams, useSubmit, useViewTransitionState };
+export { type ActionFunction, type ActionFunctionArgs, type AppLoadContext, Await, type AwaitProps, type BaseRouteObject, type Blocker, type BlockerFunction, BrowserRouter, type BrowserRouterProps, type ClientActionFunction, type ClientActionFunctionArgs, type ClientInstrumentation, type ClientLoaderFunction, type ClientLoaderFunctionArgs, type ClientOnErrorFunction, type Cookie, type CookieOptions, type CookieParseOptions, type CookieSerializeOptions, type CookieSignatureOptions, type CreateRequestHandlerFunction, type DOMRouterOpts, type DataRouteMatch, type DataRouteObject, type Router as DataRouter, type DataStrategyFunction, type DataStrategyFunctionArgs, type DataStrategyMatch, type DataStrategyResult, type DiscoverBehavior, type EntryContext, type ErrorResponse, type Fetcher, type FetcherFormProps, type FetcherSubmitFunction, type FetcherSubmitOptions, type FetcherWithComponents, type FlashSessionData, Form, type FormEncType, type FormMethod, type FormProps, type Future, type GetScrollPositionFunction, type GetScrollRestorationKeyFunction, type HTMLFormMethod, type HandleDataRequestFunction, type HandleDocumentRequestFunction, type HandleErrorFunction, HashRouter, type HashRouterProps, type HeadersArgs, type HeadersFunction, type HistoryRouterProps, type HtmlLinkDescriptor, type HydrationState, IDLE_BLOCKER, IDLE_FETCHER, IDLE_NAVIGATION, type IndexRouteObject, type IndexRouteProps, type InitialEntry, type InstrumentRequestHandlerFunction, type InstrumentRouteFunction, type InstrumentRouterFunction, type InstrumentationHandlerResult, type IsCookieFunction, type IsSessionFunction, type LayoutRouteProps, type LazyRouteFunction, Link, type LinkDescriptor, type LinkProps, Links, type LinksFunction, type LinksProps, type LoaderFunction, type LoaderFunctionArgs, type Location, MemoryRouter, type MemoryRouterOpts, type MemoryRouterProps, Meta, type MetaArgs, type MetaDescriptor, type MetaFunction, type MiddlewareFunction, NavLink, type NavLinkProps, type NavLinkRenderProps, Navigate, type NavigateFunction, type NavigateOptions, type NavigateProps, type Navigation, type NavigationStates, Action as NavigationType, type Navigator, type NonIndexRouteObject, Outlet, type OutletProps, type PageLinkDescriptor, type ParamKeyValuePair, type ParamParseKey, type Params, type PatchRoutesOnNavigationFunction, type PatchRoutesOnNavigationFunctionArgs, type Path, type PathMatch, type PathParam, type PathPattern, type PathRouteProps, type PrefetchBehavior, PrefetchPageLinks, type RedirectFunction, type Register, type RelativeRoutingType, type RequestHandler, type RevalidationState, Route, type RouteMatch, type RouteObject, type RouteProps, Router$1 as Router, type RouterContext, RouterContextProvider, type RouterFetchOptions, type RouterInit, type RouterNavigateOptions, type RouterProps, RouterProvider, type RouterProviderProps, type RouterState, type RouterSubscriber, Routes, type RoutesProps, type RoutesTestStubProps, Scripts, type ScriptsProps, ScrollRestoration, type ScrollRestorationProps, type ServerBuild, type ServerEntryModule, type ServerInstrumentation, ServerRouter, type ServerRouterProps, type Session, type SessionData, type SessionIdStorageStrategy, type SessionStorage, type SetURLSearchParams, type ShouldRevalidateFunction, type ShouldRevalidateFunctionArgs, type StaticHandler, type StaticHandlerContext, StaticRouter, type StaticRouterProps, StaticRouterProvider, type StaticRouterProviderProps, type SubmitFunction, type SubmitOptions, type SubmitTarget, type To, type UIMatch, type AssetsManifest as UNSAFE_AssetsManifest, AwaitContextProvider as UNSAFE_AwaitContextProvider, DataRouterContext as UNSAFE_DataRouterContext, DataRouterStateContext as UNSAFE_DataRouterStateContext, type DataWithResponseInit as UNSAFE_DataWithResponseInit, ErrorResponseImpl as UNSAFE_ErrorResponseImpl, FetchersContext as UNSAFE_FetchersContext, FrameworkContext as UNSAFE_FrameworkContext, LocationContext as UNSAFE_LocationContext, NavigationContext as UNSAFE_NavigationContext, RSCDefaultRootErrorBoundary as UNSAFE_RSCDefaultRootErrorBoundary, RemixErrorBoundary as UNSAFE_RemixErrorBoundary, RouteContext as UNSAFE_RouteContext, type RouteModules as UNSAFE_RouteModules, ServerMode as UNSAFE_ServerMode, SingleFetchRedirectSymbol as UNSAFE_SingleFetchRedirectSymbol, ViewTransitionContext as UNSAFE_ViewTransitionContext, WithComponentProps as UNSAFE_WithComponentProps, WithErrorBoundaryProps as UNSAFE_WithErrorBoundaryProps, WithHydrateFallbackProps as UNSAFE_WithHydrateFallbackProps, createBrowserHistory as UNSAFE_createBrowserHistory, createClientRoutes as UNSAFE_createClientRoutes, createClientRoutesWithHMRRevalidationOptOut as UNSAFE_createClientRoutesWithHMRRevalidationOptOut, createHashHistory as UNSAFE_createHashHistory, createMemoryHistory as UNSAFE_createMemoryHistory, createRouter as UNSAFE_createRouter, decodeViaTurboStream as UNSAFE_decodeViaTurboStream, defaultMapRouteProperties as UNSAFE_defaultMapRouteProperties, deserializeErrors as UNSAFE_deserializeErrors, getHydrationData as UNSAFE_getHydrationData, getPatchRoutesOnNavigationFunction as UNSAFE_getPatchRoutesOnNavigationFunction, getTurboStreamSingleFetchDataStrategy as UNSAFE_getTurboStreamSingleFetchDataStrategy, hydrationRouteProperties as UNSAFE_hydrationRouteProperties, invariant as UNSAFE_invariant, shouldHydrateRouteLoader as UNSAFE_shouldHydrateRouteLoader, useFogOFWarDiscovery as UNSAFE_useFogOFWarDiscovery, useScrollRestoration as UNSAFE_useScrollRestoration, withComponentProps as UNSAFE_withComponentProps, withErrorBoundaryProps as UNSAFE_withErrorBoundaryProps, withHydrateFallbackProps as UNSAFE_withHydrateFallbackProps, type URLSearchParamsInit, createBrowserRouter, createContext, createCookie, createCookieSessionStorage, createHashRouter, createMemoryRouter, createMemorySessionStorage, createPath, createRequestHandler, createRoutesFromChildren, createRoutesFromElements, createRoutesStub, createSearchParams, createSession, createSessionStorage, createStaticHandler, createStaticRouter, data, generatePath, href, isCookie, isRouteErrorResponse, isSession, matchPath, matchRoutes, parsePath, redirect, redirectDocument, renderMatches, replace, resolvePath, type BrowserCreateFromReadableStreamFunction as unstable_BrowserCreateFromReadableStreamFunction, type DecodeActionFunction as unstable_DecodeActionFunction, type DecodeFormStateFunction as unstable_DecodeFormStateFunction, type DecodeReplyFunction as unstable_DecodeReplyFunction, type EncodeReplyFunction as unstable_EncodeReplyFunction, HistoryRouter as unstable_HistoryRouter, type LoadServerActionFunction as unstable_LoadServerActionFunction, type RSCHydratedRouterProps as unstable_RSCHydratedRouterProps, type RSCManifestPayload as unstable_RSCManifestPayload, type RSCMatch as unstable_RSCMatch, type RSCPayload as unstable_RSCPayload, type RSCRenderPayload as unstable_RSCRenderPayload, type RSCRouteConfig as unstable_RSCRouteConfig, type RSCRouteConfigEntry as unstable_RSCRouteConfigEntry, type RSCRouteManifest as unstable_RSCRouteManifest, type RSCRouteMatch as unstable_RSCRouteMatch, RSCStaticRouter as unstable_RSCStaticRouter, type RSCStaticRouterProps as unstable_RSCStaticRouterProps, type unstable_RouterState, type unstable_RouterStateActiveVariant, type unstable_RouterStatePendingVariant, type SSRCreateFromReadableStreamFunction as unstable_SSRCreateFromReadableStreamFunction, type unstable_SerializesTo, unstable_getRequest, unstable_matchRSCServerRequest, routeRSCServerRequest as unstable_routeRSCServerRequest, setDevServerHooks as unstable_setDevServerHooks, usePrompt as unstable_usePrompt, useRoute as unstable_useRoute, useRouterState as unstable_useRouterState, useActionData, useAsyncError, useAsyncValue, useBeforeUnload, useBlocker, useFetcher, useFetchers, useFormAction, useHref, useInRouterContext, useLinkClickHandler, useLoaderData, useLocation, useMatch, useMatches, useNavigate, useNavigation, useNavigationType, useOutlet, useOutletContext, useParams, useResolvedPath, useRevalidator, useRouteError, useRouteLoaderData, useRoutes, useSearchParams, useSubmit, useViewTransitionState };

package/dist/development/index.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/actions.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/components.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -58,8 +58,11 @@ function createMemoryRouter(routes, opts) {
 	}).initialize();
 }
 var Deferred = class {
+	status = "pending";
+	promise;
+	resolve;
+	reject;
 	constructor() {
-		this.status = "pending";
 		this.promise = new Promise((resolve, reject) => {
 			this.resolve = (value) => {
 				if (this.status === "pending") {

package/dist/development/lib/context.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/dom/dom.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/dom/lib.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -21,7 +21,7 @@ import * as React$1 from "react";
 //#region lib/dom/lib.tsx
 const isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
-	if (isBrowser) window.__reactRouterVersion = "0.0.0-experimental-ce4015162";
+	if (isBrowser) window.__reactRouterVersion = "0.0.0-experimental-8cee090e4";
 } catch (e) {}
 /**
 * Create a new {@link DataRouter| data router} that manages the application
@@ -561,20 +561,6 @@ function ScrollRestoration({ getKey, storageKey, ...props }) {
 	});
 }
 ScrollRestoration.displayName = "ScrollRestoration";
-var DataRouterHook = /* @__PURE__ */ function(DataRouterHook) {
-	DataRouterHook["UseScrollRestoration"] = "useScrollRestoration";
-	DataRouterHook["UseSubmit"] = "useSubmit";
-	DataRouterHook["UseSubmitFetcher"] = "useSubmitFetcher";
-	DataRouterHook["UseFetcher"] = "useFetcher";
-	DataRouterHook["useViewTransitionState"] = "useViewTransitionState";
-	return DataRouterHook;
-}(DataRouterHook || {});
-var DataRouterStateHook = /* @__PURE__ */ function(DataRouterStateHook) {
-	DataRouterStateHook["UseFetcher"] = "useFetcher";
-	DataRouterStateHook["UseFetchers"] = "useFetchers";
-	DataRouterStateHook["UseScrollRestoration"] = "useScrollRestoration";
-	return DataRouterStateHook;
-}(DataRouterStateHook || {});
 function getDataRouterConsoleError(hookName) {
 	return `${hookName} must be used within a data router.  See https://reactrouter.com/en/main/routers/picking-a-router.`;
 }

package/dist/development/lib/dom/server.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/dom/ssr/components.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -238,11 +238,9 @@ function useKeyedPrefetchLinks(matches) {
 }
 function RSCPrefetchPageLinksImpl({ page, matches: nextMatches, ...linkProps }) {
 	let location = useLocation();
-	let { future } = useFrameworkContext();
-	let { basename } = useDataRouterContext();
 	let dataHrefs = React$1.useMemo(() => {
 		if (page === location.pathname + location.search + location.hash) return [];
-		let url = singleFetchUrl(page, basename, future.unstable_trailingSlashAwareDataRequests, "rsc");
+		let url = singleFetchUrl(page, "rsc");
 		let hasSomeRoutesWithShouldRevalidate = false;
 		let targetRoutes = [];
 		for (let match of nextMatches) if (typeof match.route.shouldRevalidate === "function") hasSomeRoutesWithShouldRevalidate = true;
@@ -250,8 +248,6 @@ function RSCPrefetchPageLinksImpl({ page, matches: nextMatches, ...linkProps })
 		if (hasSomeRoutesWithShouldRevalidate && targetRoutes.length > 0) url.searchParams.set("_routes", targetRoutes.join(","));
 		return [url.pathname + url.search];
 	}, [
-		basename,
-		future.unstable_trailingSlashAwareDataRequests,
 		page,
 		location,
 		nextMatches
@@ -266,8 +262,7 @@ function RSCPrefetchPageLinksImpl({ page, matches: nextMatches, ...linkProps })
 }
 function PrefetchPageLinksImpl({ page, matches: nextMatches, ...linkProps }) {
 	let location = useLocation();
-	let { future, manifest, routeModules } = useFrameworkContext();
-	let { basename } = useDataRouterContext();
+	let { manifest, routeModules } = useFrameworkContext();
 	let { loaderData, matches } = useDataRouterStateContext();
 	let newMatchesForData = React$1.useMemo(() => getNewMatchesForLinks(page, nextMatches, matches, manifest, location, "data"), [
 		page,
@@ -295,12 +290,10 @@ function PrefetchPageLinksImpl({ page, matches: nextMatches, ...linkProps }) {
 			else routesParams.add(m.route.id);
 		});
 		if (routesParams.size === 0) return [];
-		let url = singleFetchUrl(page, basename, future.unstable_trailingSlashAwareDataRequests, "data");
+		let url = singleFetchUrl(page, "data");
 		if (foundOptOutRoute && routesParams.size > 0) url.searchParams.set("_routes", nextMatches.filter((m) => routesParams.has(m.route.id)).map((m) => m.route.id).join(","));
 		return [url.pathname + url.search];
 	}, [
-		basename,
-		future.unstable_trailingSlashAwareDataRequests,
 		loaderData,
 		location,
 		manifest,

package/dist/development/lib/dom/ssr/data.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/dom/ssr/entry.d.ts

@@ -36,9 +36,7 @@ interface EntryContext extends FrameworkContextObject {
   staticHandlerContext: StaticHandlerContext;
   serverHandoffStream?: ReadableStream<Uint8Array>;
 }
-interface FutureConfig {
-  unstable_trailingSlashAwareDataRequests: boolean;
-}
+type FutureConfig = Record<string, never>;
 type CriticalCss = string | {
   rel: "stylesheet";
   href: string;

package/dist/development/lib/dom/ssr/errorBoundaries.d.ts

@@ -21,7 +21,7 @@ declare class RemixErrorBoundary extends React$1.Component<RemixErrorBoundaryPro
     error: Error | null;
     location: Location<any>;
   };
-  render(): string | number | bigint | boolean | React$1.JSX.Element | Iterable<React$1.ReactNode> | Promise<string | number | bigint | boolean | React$1.ReactPortal | React$1.ReactElement<unknown, string | React$1.JSXElementConstructor<any>> | Iterable<React$1.ReactNode> | null | undefined> | null | undefined;
+  render(): string | number | bigint | boolean | Iterable<React$1.ReactNode> | Promise<string | number | bigint | boolean | React$1.ReactPortal | React$1.ReactElement<unknown, string | React$1.JSXElementConstructor<any>> | Iterable<React$1.ReactNode> | null | undefined> | React$1.JSX.Element | null | undefined;
 }
 //#endregion
 export { RemixErrorBoundary };

package/dist/development/lib/dom/ssr/errorBoundaries.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/dom/ssr/errors.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/dom/ssr/fallback.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/dom/ssr/fog-of-war.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/dom/ssr/hydration.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/dom/ssr/invariant.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/dom/ssr/links.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/dom/ssr/markup.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/dom/ssr/routeModules.d.ts

@@ -181,7 +181,7 @@ type MetaDescriptor = {
   httpEquiv: string;
   content: string;
 } | {
-  "script:ld+json": LdJsonObject;
+  "script:ld+json": LdJsonObject | LdJsonObject[];
 } | {
   tagName: "meta" | "link";
   [name: string]: string;

package/dist/development/lib/dom/ssr/routeModules.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/dom/ssr/routes-test-stub.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -22,7 +22,7 @@ function createRoutesStub(routes, _context) {
 		let frameworkContextRef = React$1.useRef(null);
 		if (routerRef.current == null || frameworkContextRef.current == null) {
 			frameworkContextRef.current = {
-				future: { unstable_trailingSlashAwareDataRequests: future?.unstable_trailingSlashAwareDataRequests === true },
+				future: {},
 				manifest: {
 					routes: {},
 					entry: {

package/dist/development/lib/dom/ssr/routes.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/dom/ssr/server.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-ce4015162
+ * react-router v0.0.0-experimental-8cee090e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/dom/ssr/single-fetch.d.ts

@@ -5,7 +5,7 @@ import { RouteModules } from "./routeModules.js";
 import { AssetsManifest } from "./entry.js";
 //#region lib/dom/ssr/single-fetch.d.ts
 declare const SingleFetchRedirectSymbol: unique symbol;
-declare function getTurboStreamSingleFetchDataStrategy(getRouter: () => Router, manifest: AssetsManifest, routeModules: RouteModules, ssr: boolean, basename: string | undefined, trailingSlashAware: boolean): DataStrategyFunction;
+declare function getTurboStreamSingleFetchDataStrategy(getRouter: () => Router, manifest: AssetsManifest, routeModules: RouteModules, ssr: boolean): DataStrategyFunction;
 declare function decodeViaTurboStream(body: ReadableStream<Uint8Array>, global: Window | typeof globalThis): Promise<{
   done: Promise<void>;
   value: unknown;