react-router 7.18.3 → 7.18.4

package/dist/development/{chunk-BV7QT456.mjs → chunk-OB3PAWPO.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.18.3
+ * react-router v7.18.4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1818,7 +1818,7 @@ function createRouter(init) {
       init.history.replace(location, location.state);
     }
     let viewTransitionOpts;
-    if (pendingAction === "POP" /* Pop */) {
+    if (pendingAction === "POP" /* Pop */ && !isUninterruptedRevalidation && location !== state.location) {
       let priorPaths = appliedViewTransitions.get(state.location.pathname);
       if (priorPaths && priorPaths.has(location.pathname)) {
         viewTransitionOpts = {
@@ -8270,6 +8270,9 @@ var ESCAPE_REGEX = /[&><\u2028\u2029]/g;
 function escapeHtml(html) {
   return html.replace(ESCAPE_REGEX, (match) => ESCAPE_LOOKUP[match]);
 }
+function escapeAttribute(value) {
+  return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
 
 // lib/dom/ssr/invariant.ts
 function invariant2(value, message) {
@@ -10405,7 +10408,7 @@ var isBrowser2 = typeof window !== "undefined" && typeof window.document !== "un
 try {
   if (isBrowser2) {
     window.__reactRouterVersion = // @ts-expect-error
-    "7.18.3";
+    "7.18.4";
   }
 } catch (e) {
 }
@@ -11650,6 +11653,7 @@ export {
   withErrorBoundaryProps,
   createSearchParams,
   escapeHtml,
+  escapeAttribute,
   encode,
   createRequestInit,
   SingleFetchRedirectSymbol,

package/dist/development/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 _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 v7.18.3
+ * react-router v7.18.4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -13,7 +13,7 @@
 
 
 
-var _chunkQPXIKN46js = require('./chunk-QPXIKN46.js');
+var _chunkLVPI3KDGjs = require('./chunk-LVPI3KDG.js');
 
 
 
@@ -38,7 +38,7 @@ var _chunkQPXIKN46js = require('./chunk-QPXIKN46.js');
 
 
 
-var _chunk7SIULPXIjs = require('./chunk-7SIULPXI.js');
+var _chunkGR4NQCSDjs = require('./chunk-GR4NQCSD.js');
 
 // lib/dom-export/dom-router-provider.tsx
 var _react = require('react'); var React = _interopRequireWildcard(_react); var React2 = _interopRequireWildcard(_react); var React3 = _interopRequireWildcard(_react);
@@ -214,7 +214,7 @@ function HydratedRouter(props) {
   }, []);
   React2.useEffect(() => {
     if (process.env.NODE_ENV === "development" && criticalCss === void 0) {
-      document.querySelectorAll(`[${_chunk7SIULPXIjs.CRITICAL_CSS_DATA_ATTRIBUTE}]`).forEach((element) => element.remove());
+      document.querySelectorAll(`[${_chunkGR4NQCSDjs.CRITICAL_CSS_DATA_ATTRIBUTE}]`).forEach((element) => element.remove());
     }
   }, [criticalCss]);
   let [location2, setLocation] = React2.useState(router.state.location);
@@ -308,14 +308,14 @@ function createCallServer({
         Promise.resolve(payloadPromise).then(async (payload) => {
           if (payload.type === "redirect") {
             let location2 = normalizeRedirectLocation(payload.location);
-            _chunk7SIULPXIjs.validateNavigationTarget.call(void 0, 
+            _chunkGR4NQCSDjs.validateNavigationTarget.call(void 0, 
               payload.location,
               location2,
               new URL(window.location.href),
               "allow-explicit"
             );
             if (payload.reload || isExternalLocation(location2)) {
-              if (_chunk7SIULPXIjs.hasInvalidProtocol.call(void 0, location2)) {
+              if (_chunkGR4NQCSDjs.hasInvalidProtocol.call(void 0, location2)) {
                 throw new Error("Invalid redirect location");
               }
               window.location.href = location2;
@@ -335,14 +335,14 @@ function createCallServer({
           if (rerender && landedActionId < actionId && globalVar.__routerActionID <= actionId) {
             if (rerender.type === "redirect") {
               let location2 = normalizeRedirectLocation(rerender.location);
-              _chunk7SIULPXIjs.validateNavigationTarget.call(void 0, 
+              _chunkGR4NQCSDjs.validateNavigationTarget.call(void 0, 
                 rerender.location,
                 location2,
                 new URL(window.location.href),
                 "allow-explicit"
               );
               if (rerender.reload || isExternalLocation(location2)) {
-                if (_chunk7SIULPXIjs.hasInvalidProtocol.call(void 0, location2)) {
+                if (_chunkGR4NQCSDjs.hasInvalidProtocol.call(void 0, location2)) {
                   throw new Error("Invalid redirect location");
                 }
                 window.location.href = location2;
@@ -407,7 +407,7 @@ function createRouterFromPayload({
     };
   if (payload.type !== "render") throw new Error("Invalid payload type");
   globalVar.__reactRouterRouteModules = _nullishCoalesce(globalVar.__reactRouterRouteModules, () => ( {}));
-  _chunkQPXIKN46js.populateRSCRouteModules.call(void 0, globalVar.__reactRouterRouteModules, payload.matches);
+  _chunkLVPI3KDGjs.populateRSCRouteModules.call(void 0, globalVar.__reactRouterRouteModules, payload.matches);
   let routes = payload.matches.reduceRight((previous, match) => {
     const route = createRouteFromServerManifest(
       match,
@@ -421,12 +421,12 @@ function createRouterFromPayload({
     return [route];
   }, []);
   let applyPatchesPromise;
-  globalVar.__reactRouterDataRouter = _chunk7SIULPXIjs.createRouter.call(void 0, {
+  globalVar.__reactRouterDataRouter = _chunkGR4NQCSDjs.createRouter.call(void 0, {
     routes,
     getContext,
     basename: payload.basename,
-    history: _chunk7SIULPXIjs.createBrowserHistory.call(void 0, ),
-    hydrationData: _chunkQPXIKN46js.getHydrationData.call(void 0, {
+    history: _chunkGR4NQCSDjs.createBrowserHistory.call(void 0, ),
+    hydrationData: _chunkLVPI3KDGjs.getHydrationData.call(void 0, {
       state: {
         loaderData: payload.loaderData,
         actionData: payload.actionData,
@@ -435,7 +435,7 @@ function createRouterFromPayload({
       routes,
       getRouteInfo: (routeId) => {
         let match = payload.matches.find((m) => m.id === routeId);
-        _chunk7SIULPXIjs.invariant.call(void 0, match, "Route not found in payload");
+        _chunkGR4NQCSDjs.invariant.call(void 0, match, "Route not found in payload");
         return {
           clientLoader: match.clientLoader,
           hasLoader: match.hasLoader,
@@ -550,9 +550,9 @@ function createRouterFromPayload({
     routeModules: globalVar.__reactRouterRouteModules
   };
 }
-var renderedRoutesContext = _chunk7SIULPXIjs.createContext.call(void 0, );
+var renderedRoutesContext = _chunkGR4NQCSDjs.createContext.call(void 0, );
 function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, createFromReadableStream, fetchImplementation) {
-  let dataStrategy = _chunk7SIULPXIjs.getSingleFetchDataStrategyImpl.call(void 0, 
+  let dataStrategy = _chunkGR4NQCSDjs.getSingleFetchDataStrategyImpl.call(void 0, 
     getRouter,
     (match) => {
       let M = match;
@@ -609,20 +609,20 @@ function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, createFromReada
 function getFetchAndDecodeViaRSC(createFromReadableStream, fetchImplementation) {
   return async (args, basename, trailingSlashAware, targetRoutes) => {
     let { request, context } = args;
-    let url = _chunk7SIULPXIjs.singleFetchUrl.call(void 0, request.url, basename, trailingSlashAware, "rsc");
+    let url = _chunkGR4NQCSDjs.singleFetchUrl.call(void 0, request.url, basename, trailingSlashAware, "rsc");
     if (request.method === "GET") {
-      url = _chunk7SIULPXIjs.stripIndexParam.call(void 0, url);
+      url = _chunkGR4NQCSDjs.stripIndexParam.call(void 0, url);
       if (targetRoutes) {
         url.searchParams.set("_routes", targetRoutes.join(","));
       }
     }
     let res = await fetchImplementation(
-      new Request(url, await _chunk7SIULPXIjs.createRequestInit.call(void 0, request))
+      new Request(url, await _chunkGR4NQCSDjs.createRequestInit.call(void 0, request))
     );
     if (res.status >= 400 && !res.headers.has("X-Remix-Response")) {
-      throw new (0, _chunk7SIULPXIjs.ErrorResponseImpl)(res.status, res.statusText, await res.text());
+      throw new (0, _chunkGR4NQCSDjs.ErrorResponseImpl)(res.status, res.statusText, await res.text());
     }
-    _chunk7SIULPXIjs.invariant.call(void 0, res.body, "No response body to decode");
+    _chunkGR4NQCSDjs.invariant.call(void 0, res.body, "No response body to decode");
     try {
       const payload = await createFromReadableStream(res.body, {
         temporaryReferences: void 0
@@ -646,7 +646,7 @@ function getFetchAndDecodeViaRSC(createFromReadableStream, fetchImplementation)
       }
       context.get(renderedRoutesContext).push(...payload.matches);
       let results = { routes: {} };
-      const dataKey = _chunk7SIULPXIjs.isMutationMethod.call(void 0, request.method) ? "actionData" : "loaderData";
+      const dataKey = _chunkGR4NQCSDjs.isMutationMethod.call(void 0, request.method) ? "actionData" : "loaderData";
       for (let [routeId, data] of Object.entries(payload[dataKey] || {})) {
         results.routes[routeId] = { data };
       }
@@ -679,7 +679,7 @@ function RSCHydratedRouter({
     [createFromReadableStream, payload, fetchImplementation, getContext]
   );
   React3.useEffect(() => {
-    _chunk7SIULPXIjs.setIsHydrated.call(void 0, );
+    _chunkGR4NQCSDjs.setIsHydrated.call(void 0, );
   }, []);
   React3.useLayoutEffect(() => {
     const globalVar = window;
@@ -787,8 +787,8 @@ function RSCHydratedRouter({
     },
     routeModules
   };
-  return /* @__PURE__ */ React3.createElement(_chunk7SIULPXIjs.RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React3.createElement(_chunkQPXIKN46js.RSCRouterGlobalErrorBoundary, { location: state.location }, /* @__PURE__ */ React3.createElement(_chunk7SIULPXIjs.FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React3.createElement(
-    _chunk7SIULPXIjs.RouterProvider,
+  return /* @__PURE__ */ React3.createElement(_chunkGR4NQCSDjs.RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React3.createElement(_chunkLVPI3KDGjs.RSCRouterGlobalErrorBoundary, { location: state.location }, /* @__PURE__ */ React3.createElement(_chunkGR4NQCSDjs.FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React3.createElement(
+    _chunkGR4NQCSDjs.RouterProvider,
     {
       router: transitionEnabledRouter,
       flushSync: ReactDOM2.flushSync
@@ -804,8 +804,8 @@ function createRouteFromServerManifest(match, payload) {
   // the server loader flow regardless of whether the client loader calls
   // `serverLoader` or not, otherwise we'll have nothing to render.
   match.hasComponent && !match.element;
-  _chunk7SIULPXIjs.invariant.call(void 0, window.__reactRouterRouteModules);
-  _chunkQPXIKN46js.populateRSCRouteModules.call(void 0, window.__reactRouterRouteModules, match);
+  _chunkGR4NQCSDjs.invariant.call(void 0, window.__reactRouterRouteModules);
+  _chunkLVPI3KDGjs.populateRSCRouteModules.call(void 0, window.__reactRouterRouteModules, match);
   let dataRoute = {
     id: match.id,
     element: match.element,
@@ -853,7 +853,7 @@ function createRouteFromServerManifest(match, payload) {
         return await callSingleFetch(singleFetch);
       }
     }) : match.hasAction ? (_, singleFetch) => callSingleFetch(singleFetch) : () => {
-      throw _chunk7SIULPXIjs.noActionDefinedError.call(void 0, "action", match.id);
+      throw _chunkGR4NQCSDjs.noActionDefinedError.call(void 0, "action", match.id);
     },
     path: match.path,
     shouldRevalidate: match.shouldRevalidate,
@@ -865,7 +865,7 @@ function createRouteFromServerManifest(match, payload) {
     hasClientAction: match.clientAction != null
   };
   if (typeof dataRoute.loader === "function") {
-    dataRoute.loader.hydrate = _chunk7SIULPXIjs.shouldHydrateRouteLoader.call(void 0, 
+    dataRoute.loader.hydrate = _chunkGR4NQCSDjs.shouldHydrateRouteLoader.call(void 0, 
       match.id,
       match.clientLoader,
       match.hasLoader,
@@ -875,7 +875,7 @@ function createRouteFromServerManifest(match, payload) {
   return dataRoute;
 }
 function callSingleFetch(singleFetch) {
-  _chunk7SIULPXIjs.invariant.call(void 0, typeof singleFetch === "function", "Invalid singleFetch parameter");
+  _chunkGR4NQCSDjs.invariant.call(void 0, typeof singleFetch === "function", "Invalid singleFetch parameter");
   return singleFetch();
 }
 function preventInvalidServerHandlerCall(type, routeId, hasHandler) {
@@ -883,7 +883,7 @@ function preventInvalidServerHandlerCall(type, routeId, hasHandler) {
     let fn = type === "action" ? "serverAction()" : "serverLoader()";
     let msg = `You are trying to call ${fn} on a route that does not have a server ${type} (routeId: "${routeId}")`;
     console.error(msg);
-    throw new (0, _chunk7SIULPXIjs.ErrorResponseImpl)(400, "Bad Request", new Error(msg), true);
+    throw new (0, _chunkGR4NQCSDjs.ErrorResponseImpl)(400, "Bad Request", new Error(msg), true);
   }
 }
 var nextPaths = /* @__PURE__ */ new Set();
@@ -906,12 +906,12 @@ function getManifestUrl(paths) {
   return url;
 }
 async function fetchAndApplyManifestPatches(paths, createFromReadableStream, fetchImplementation, signal) {
-  paths = _chunk7SIULPXIjs.getPathsWithAncestors.call(void 0, paths);
+  paths = _chunkGR4NQCSDjs.getPathsWithAncestors.call(void 0, paths);
   let url = getManifestUrl(paths);
   if (url == null) {
     return;
   }
-  if (url.toString().length > _chunk7SIULPXIjs.URL_LIMIT) {
+  if (url.toString().length > _chunkGR4NQCSDjs.URL_LIMIT) {
     nextPaths.clear();
     return;
   }
@@ -955,8 +955,8 @@ function isExternalLocation(location2) {
   return newLocation.origin !== window.location.origin;
 }
 function normalizeRedirectLocation(location2) {
-  if (_chunk7SIULPXIjs.PROTOCOL_RELATIVE_URL_REGEX.test(location2)) {
-    let path = _chunk7SIULPXIjs.resolvePath.call(void 0, location2);
+  if (_chunkGR4NQCSDjs.PROTOCOL_RELATIVE_URL_REGEX.test(location2)) {
+    let path = _chunkGR4NQCSDjs.resolvePath.call(void 0, location2);
     return path.pathname + path.search + path.hash;
   }
   return location2;

package/dist/development/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.18.3
+ * react-router v7.18.4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -13,7 +13,7 @@ import {
   RSCRouterGlobalErrorBoundary,
   getHydrationData,
   populateRSCRouteModules
-} from "./chunk-HT4INDD5.mjs";
+} from "./chunk-H4DAEOV7.mjs";
 import {
   CRITICAL_CSS_DATA_ATTRIBUTE,
   ErrorResponseImpl,
@@ -47,7 +47,7 @@ import {
   stripIndexParam,
   useFogOFWarDiscovery,
   validateNavigationTarget
-} from "./chunk-BV7QT456.mjs";
+} from "./chunk-OB3PAWPO.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";

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

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});/**
- * react-router v7.18.3
+ * react-router v7.18.4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -19,7 +19,7 @@
 
 
 
-var _chunkYRTY65LJjs = require('./chunk-YRTY65LJ.js');
+var _chunkHQO5H5CCjs = require('./chunk-HQO5H5CC.js');
 
 
 
@@ -34,7 +34,7 @@ var _chunkYRTY65LJjs = require('./chunk-YRTY65LJ.js');
 
 
 
-var _chunk7SIULPXIjs = require('./chunk-7SIULPXI.js');
+var _chunkGR4NQCSDjs = require('./chunk-GR4NQCSD.js');
 
 
 
@@ -58,4 +58,4 @@ var _chunk7SIULPXIjs = require('./chunk-7SIULPXI.js');
 
 
 
-exports.BrowserRouter = _chunkYRTY65LJjs.BrowserRouter; exports.Form = _chunkYRTY65LJjs.Form; exports.HashRouter = _chunkYRTY65LJjs.HashRouter; exports.Link = _chunkYRTY65LJjs.Link; exports.Links = _chunk7SIULPXIjs.Links; exports.MemoryRouter = _chunk7SIULPXIjs.MemoryRouter; exports.Meta = _chunk7SIULPXIjs.Meta; exports.NavLink = _chunkYRTY65LJjs.NavLink; exports.Navigate = _chunk7SIULPXIjs.Navigate; exports.Outlet = _chunk7SIULPXIjs.Outlet; exports.Route = _chunk7SIULPXIjs.Route; exports.Router = _chunk7SIULPXIjs.Router; exports.RouterProvider = _chunk7SIULPXIjs.RouterProvider; exports.Routes = _chunk7SIULPXIjs.Routes; exports.ScrollRestoration = _chunkYRTY65LJjs.ScrollRestoration; exports.StaticRouter = _chunkYRTY65LJjs.StaticRouter; exports.StaticRouterProvider = _chunkYRTY65LJjs.StaticRouterProvider; exports.UNSAFE_AwaitContextProvider = _chunk7SIULPXIjs.AwaitContextProvider; exports.UNSAFE_WithComponentProps = _chunk7SIULPXIjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunk7SIULPXIjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunk7SIULPXIjs.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunkYRTY65LJjs.HistoryRouter;
+exports.BrowserRouter = _chunkHQO5H5CCjs.BrowserRouter; exports.Form = _chunkHQO5H5CCjs.Form; exports.HashRouter = _chunkHQO5H5CCjs.HashRouter; exports.Link = _chunkHQO5H5CCjs.Link; exports.Links = _chunkGR4NQCSDjs.Links; exports.MemoryRouter = _chunkGR4NQCSDjs.MemoryRouter; exports.Meta = _chunkGR4NQCSDjs.Meta; exports.NavLink = _chunkHQO5H5CCjs.NavLink; exports.Navigate = _chunkGR4NQCSDjs.Navigate; exports.Outlet = _chunkGR4NQCSDjs.Outlet; exports.Route = _chunkGR4NQCSDjs.Route; exports.Router = _chunkGR4NQCSDjs.Router; exports.RouterProvider = _chunkGR4NQCSDjs.RouterProvider; exports.Routes = _chunkGR4NQCSDjs.Routes; exports.ScrollRestoration = _chunkHQO5H5CCjs.ScrollRestoration; exports.StaticRouter = _chunkHQO5H5CCjs.StaticRouter; exports.StaticRouterProvider = _chunkHQO5H5CCjs.StaticRouterProvider; exports.UNSAFE_AwaitContextProvider = _chunkGR4NQCSDjs.AwaitContextProvider; exports.UNSAFE_WithComponentProps = _chunkGR4NQCSDjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunkGR4NQCSDjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunkGR4NQCSDjs.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunkHQO5H5CCjs.HistoryRouter;

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

@@ -1,5 +1,5 @@
 /**
- * react-router v7.18.3
+ * react-router v7.18.4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -32,7 +32,7 @@ import {
   WithComponentProps,
   WithErrorBoundaryProps,
   WithHydrateFallbackProps
-} from "./chunk-BV7QT456.mjs";
+} from "./chunk-OB3PAWPO.mjs";
 export {
   BrowserRouter,
   Form,

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

@@ -27,7 +27,7 @@ function _interopNamespace(e) {
 var React3__namespace = /*#__PURE__*/_interopNamespace(React3);
 
 /**
- * react-router v7.18.3
+ * react-router v7.18.4
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -6,7 +6,7 @@ export { BrowserRouter, Form, HashRouter, Link, Links, MemoryRouter, Meta, NavLi
 import { serialize, parse } from 'cookie';
 
 /**
- * react-router v7.18.3
+ * react-router v7.18.4
  *
  * Copyright (c) Remix Software Inc.
  *