zudoku 0.3.0-dev.57 → 0.3.0-dev.59

package/lib/{router-CBw2vqJE.js → router-BiRCp01d.js}

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.17.1
+ * @remix-run/router v1.18.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -23,7 +23,7 @@ var V;
   e.Pop = "POP", e.Push = "PUSH", e.Replace = "REPLACE";
 })(V || (V = {}));
 const _t = "popstate";
-function Br(e) {
+function Wr(e) {
   e === void 0 && (e = {});
   let {
     initialEntries: t = ["/"],
@@ -61,7 +61,7 @@ function Br(e) {
       return new URL(p(m), "http://localhost");
     },
     encodeLocation(m) {
-      let y = typeof m == "string" ? ie(m) : m;
+      let y = typeof m == "string" ? oe(m) : m;
       return {
         pathname: y.pathname || "",
         search: y.search || "",
@@ -102,7 +102,7 @@ function Br(e) {
     }
   };
 }
-function Wr(e) {
+function Kr(e) {
   e === void 0 && (e = {});
   function t(a, n) {
     let {
@@ -127,14 +127,14 @@ function Wr(e) {
   }
   return Gt(t, r, null, e);
 }
-function Kr(e) {
+function $r(e) {
   e === void 0 && (e = {});
   function t(n, s) {
     let {
       pathname: l = "/",
       search: f = "",
       hash: u = ""
-    } = ie(n.location.hash.substr(1));
+    } = oe(n.location.hash.substr(1));
     return !l.startsWith("/") && !l.startsWith(".") && (l = "/" + l), ge(
       "",
       {
@@ -173,7 +173,7 @@ function de(e, t) {
     }
   }
 }
-function $r() {
+function kr() {
   return Math.random().toString(36).substr(2, 8);
 }
 function Ut(e, t) {
@@ -188,13 +188,13 @@ function ge(e, t, r, a) {
     pathname: typeof e == "string" ? e : e.pathname,
     search: "",
     hash: ""
-  }, typeof t == "string" ? ie(t) : t, {
+  }, typeof t == "string" ? oe(t) : t, {
     state: r,
     // TODO: This could be cleaned up.  push/replace should probably just take
     // full Locations now and avoid the need to run through this flow at all
     // But that's a pretty big refactor to the current test suite so going to
     // keep as is for the time being and just let any incoming keys take precedence
-    key: t && t.key || a || $r()
+    key: t && t.key || a || kr()
   });
 }
 function ue(e) {
@@ -205,7 +205,7 @@ function ue(e) {
   } = e;
   return r && r !== "?" && (t += r.charAt(0) === "?" ? r : "?" + r), a && a !== "#" && (t += a.charAt(0) === "#" ? a : "#" + a), t;
 }
-function ie(e) {
+function oe(e) {
   let t = {};
   if (e) {
     let r = e.indexOf("#");
@@ -238,17 +238,17 @@ function Gt(e, t, r, a) {
       delta: A
     });
   }
-  function S(P, A) {
+  function R(P, A) {
     f = V.Push;
     let x = ge(g.location, P, A);
     r && r(x, P), v = b() + 1;
-    let _ = Ut(x, v), R = g.createHref(x);
+    let U = Ut(x, v), S = g.createHref(x);
     try {
-      l.pushState(_, "", R);
+      l.pushState(U, "", S);
     } catch (N) {
       if (N instanceof DOMException && N.name === "DataCloneError")
         throw N;
-      n.location.assign(R);
+      n.location.assign(S);
     }
     s && u && u({
       action: f,
@@ -260,8 +260,8 @@ function Gt(e, t, r, a) {
     f = V.Replace;
     let x = ge(g.location, P, A);
     r && r(x, P), v = b();
-    let _ = Ut(x, v), R = g.createHref(x);
-    l.replaceState(_, "", R), s && u && u({
+    let U = Ut(x, v), S = g.createHref(x);
+    l.replaceState(U, "", S), s && u && u({
       action: f,
       location: g.location,
       delta: 0
@@ -297,7 +297,7 @@ function Gt(e, t, r, a) {
         hash: A.hash
       };
     },
-    push: S,
+    push: R,
     replace: m,
     go(P) {
       return l.go(P);
@@ -305,18 +305,18 @@ function Gt(e, t, r, a) {
   };
   return g;
 }
-var z;
+var H;
 (function(e) {
   e.data = "data", e.deferred = "deferred", e.redirect = "redirect", e.error = "error";
-})(z || (z = {}));
-const kr = /* @__PURE__ */ new Set(["lazy", "caseSensitive", "path", "id", "index", "children"]);
-function Vr(e) {
+})(H || (H = {}));
+const Vr = /* @__PURE__ */ new Set(["lazy", "caseSensitive", "path", "id", "index", "children"]);
+function Yr(e) {
   return e.index === !0;
 }
-function Me(e, t, r, a) {
+function je(e, t, r, a) {
   return r === void 0 && (r = []), a === void 0 && (a = {}), e.map((n, s) => {
     let l = [...r, String(s)], f = typeof n.id == "string" ? n.id : l.join("-");
-    if (O(n.index !== !0 || !n.children, "Cannot specify children on an index route"), O(!a[f], 'Found a route id collision on id "' + f + `".  Route id's must be globally unique within Data Router usages`), Vr(n)) {
+    if (O(n.index !== !0 || !n.children, "Cannot specify children on an index route"), O(!a[f], 'Found a route id collision on id "' + f + `".  Route id's must be globally unique within Data Router usages`), Yr(n)) {
       let u = I({}, n, t(n), {
         id: f
       });
@@ -326,7 +326,7 @@ function Me(e, t, r, a) {
         id: f,
         children: void 0
       });
-      return a[f] = u, n.children && (u.children = Me(n.children, t, l, a)), u;
+      return a[f] = u, n.children && (u.children = je(n.children, t, l, a)), u;
     }
   });
 }
@@ -334,15 +334,15 @@ function me(e, t, r) {
   return r === void 0 && (r = "/"), at(e, t, r, !1);
 }
 function at(e, t, r, a) {
-  let n = typeof t == "string" ? ie(t) : t, s = Ye(n.pathname || "/", r);
+  let n = typeof t == "string" ? oe(t) : t, s = Ye(n.pathname || "/", r);
   if (s == null)
     return null;
   let l = Qt(e);
-  Yr(l);
+  Jr(l);
   let f = null;
   for (let u = 0; f == null && u < l.length; ++u) {
-    let v = oa(s);
-    f = ra(l[u], v, a);
+    let v = qt(s);
+    f = aa(l[u], v, a);
   }
   return f;
 }
@@ -370,7 +370,7 @@ function Qt(e, t, r, a) {
       route: s
     };
     u.relativePath.startsWith("/") && (O(u.relativePath.startsWith(a), 'Absolute route path "' + u.relativePath + '" nested under path ' + ('"' + a + '" is not valid. An absolute child route path ') + "must start with the combined path of all its parent routes."), u.relativePath = u.relativePath.slice(a.length));
-    let v = Ne([a, u.relativePath]), b = r.concat(u);
+    let v = He([a, u.relativePath]), b = r.concat(u);
     s.children && s.children.length > 0 && (O(
       // Our types know better, but runtime JS may not!
       // @ts-expect-error
@@ -378,7 +378,7 @@ function Qt(e, t, r, a) {
       "Index routes must not have child routes. Please remove " + ('all child routes from route path "' + v + '".')
     ), Qt(s.children, t, b, v)), !(s.path == null && !s.index) && t.push({
       path: v,
-      score: ea(v, s.index),
+      score: ta(v, s.index),
       routesMeta: b
     });
   };
@@ -400,15 +400,15 @@ function Zt(e) {
   let l = Zt(a.join("/")), f = [];
   return f.push(...l.map((u) => u === "" ? s : [s, u].join("/"))), n && f.push(...l), f.map((u) => e.startsWith("/") && u === "" ? "/" : u);
 }
-function Yr(e) {
-  e.sort((t, r) => t.score !== r.score ? r.score - t.score : ta(t.routesMeta.map((a) => a.childrenIndex), r.routesMeta.map((a) => a.childrenIndex)));
+function Jr(e) {
+  e.sort((t, r) => t.score !== r.score ? r.score - t.score : ra(t.routesMeta.map((a) => a.childrenIndex), r.routesMeta.map((a) => a.childrenIndex)));
 }
-const Jr = /^:[\w-]+$/, Gr = 3, Xr = 2, Qr = 1, Zr = 10, qr = -2, At = (e) => e === "*";
-function ea(e, t) {
+const Gr = /^:[\w-]+$/, Xr = 3, Qr = 2, Zr = 1, qr = 10, ea = -2, At = (e) => e === "*";
+function ta(e, t) {
   let r = e.split("/"), a = r.length;
-  return r.some(At) && (a += qr), t && (a += Xr), r.filter((n) => !At(n)).reduce((n, s) => n + (Jr.test(s) ? Gr : s === "" ? Qr : Zr), a);
+  return r.some(At) && (a += ea), t && (a += Qr), r.filter((n) => !At(n)).reduce((n, s) => n + (Gr.test(s) ? Xr : s === "" ? Zr : qr), a);
 }
-function ta(e, t) {
+function ra(e, t) {
   return e.length === t.length && e.slice(0, -1).every((a, n) => a === t[n]) ? (
     // If two routes are siblings, we should try to match the earlier sibling
     // first. This allows people to have fine-grained control over the matching
@@ -421,7 +421,7 @@ function ta(e, t) {
     0
   );
 }
-function ra(e, t, r) {
+function aa(e, t, r) {
   r === void 0 && (r = !1);
   let {
     routesMeta: a
@@ -431,7 +431,7 @@ function ra(e, t, r) {
       path: u.relativePath,
       caseSensitive: u.caseSensitive,
       end: v
-    }, b), S = u.route;
+    }, b), R = u.route;
     if (!p && v && r && !a[a.length - 1].route.index && (p = ht({
       path: u.relativePath,
       caseSensitive: u.caseSensitive,
@@ -441,14 +441,14 @@ function ra(e, t, r) {
     Object.assign(n, p.params), l.push({
       // TODO: Can this as be avoided?
       params: n,
-      pathname: Ne([s, p.pathname]),
-      pathnameBase: ar(Ne([s, p.pathnameBase])),
-      route: S
-    }), p.pathnameBase !== "/" && (s = Ne([s, p.pathnameBase]));
+      pathname: He([s, p.pathname]),
+      pathnameBase: nr(He([s, p.pathnameBase])),
+      route: R
+    }), p.pathnameBase !== "/" && (s = He([s, p.pathnameBase]));
   }
   return l;
 }
-function aa(e, t) {
+function na(e, t) {
   t === void 0 && (t = {});
   let r = e;
   r.endsWith("*") && r !== "*" && !r.endsWith("/*") && (de(!1, 'Route path "' + r + '" will be treated as if it were ' + ('"' + r.replace(/\*$/, "/*") + '" because the `*` character must ') + "always follow a `/` in the pattern. To get rid of this warning, " + ('please change the route path to "' + r.replace(/\*$/, "/*") + '".')), r = r.replace(/\*$/, "/*"));
@@ -457,9 +457,9 @@ function aa(e, t) {
       return n(t["*"]);
     const b = l.match(/^:([\w-]+)(\??)$/);
     if (b) {
-      const [, p, S] = b;
+      const [, p, R] = b;
       let m = t[p];
-      return O(S === "?" || m != null, 'Missing ":' + p + '" param'), n(m);
+      return O(R === "?" || m != null, 'Missing ":' + p + '" param'), n(m);
     }
     return l.replace(/\?$/g, "");
   }).filter((l) => !!l);
@@ -471,28 +471,28 @@ function ht(e, t) {
     caseSensitive: !1,
     end: !0
   });
-  let [r, a] = na(e.path, e.caseSensitive, e.end), n = t.match(r);
+  let [r, a] = ia(e.path, e.caseSensitive, e.end), n = t.match(r);
   if (!n) return null;
   let s = n[0], l = s.replace(/(.)\/+$/, "$1"), f = n.slice(1);
   return {
     params: a.reduce((v, b, p) => {
       let {
-        paramName: S,
+        paramName: R,
         isOptional: m
       } = b;
-      if (S === "*") {
+      if (R === "*") {
         let g = f[p] || "";
         l = s.slice(0, s.length - g.length).replace(/(.)\/+$/, "$1");
       }
       const y = f[p];
-      return m && !y ? v[S] = void 0 : v[S] = (y || "").replace(/%2F/g, "/"), v;
+      return m && !y ? v[R] = void 0 : v[R] = (y || "").replace(/%2F/g, "/"), v;
     }, {}),
     pathname: s,
     pathnameBase: l,
     pattern: e
   };
 }
-function na(e, t, r) {
+function ia(e, t, r) {
   t === void 0 && (t = !1), r === void 0 && (r = !0), de(e === "*" || !e.endsWith("*") || e.endsWith("/*"), 'Route path "' + e + '" will be treated as if it were ' + ('"' + e.replace(/\*$/, "/*") + '" because the `*` character must ') + "always follow a `/` in the pattern. To get rid of this warning, " + ('please change the route path to "' + e.replace(/\*$/, "/*") + '".'));
   let a = [], n = "^" + e.replace(/\/*\*?$/, "").replace(/^\/*/, "/").replace(/[\\.*+^${}|()[\]]/g, "\\$&").replace(/\/:([\w-]+)(\?)?/g, (l, f, u) => (a.push({
     paramName: f,
@@ -502,7 +502,7 @@ function na(e, t, r) {
     paramName: "*"
   }), n += e === "*" || e === "/*" ? "(.*)$" : "(?:\\/(.+)|\\/*)$") : r ? n += "\\/*$" : e !== "" && e !== "/" && (n += "(?:(?=\\/|$))"), [new RegExp(n, t ? void 0 : "i"), a];
 }
-function oa(e) {
+function qt(e) {
   try {
     return e.split("/").map((t) => decodeURIComponent(t).replace(/\//g, "%2F")).join("/");
   } catch (t) {
@@ -516,20 +516,20 @@ function Ye(e, t) {
   let r = t.endsWith("/") ? t.length - 1 : t.length, a = e.charAt(r);
   return a && a !== "/" ? null : e.slice(r) || "/";
 }
-function qt(e, t) {
+function er(e, t) {
   t === void 0 && (t = "/");
   let {
     pathname: r,
     search: a = "",
     hash: n = ""
-  } = typeof e == "string" ? ie(e) : e;
+  } = typeof e == "string" ? oe(e) : e;
   return {
-    pathname: r ? r.startsWith("/") ? r : ia(r, t) : t,
+    pathname: r ? r.startsWith("/") ? r : oa(r, t) : t,
     search: sa(a),
     hash: da(n)
   };
 }
-function ia(e, t) {
+function oa(e, t) {
   let r = t.replace(/\/+$/, "").split("/");
   return e.split("/").forEach((n) => {
     n === ".." ? r.length > 1 && r.pop() : n !== "." && r.push(n);
@@ -538,37 +538,37 @@ function ia(e, t) {
 function ft(e, t, r, a) {
   return "Cannot include a '" + e + "' character in a manually specified " + ("`to." + t + "` field [" + JSON.stringify(a) + "].  Please separate it out to the ") + ("`to." + r + "` field. Alternatively you may provide the full path as ") + 'a string in <Link to="..."> and the router will parse it for you.';
 }
-function er(e) {
+function tr(e) {
   return e.filter((t, r) => r === 0 || t.route.path && t.route.path.length > 0);
 }
-function tr(e, t) {
-  let r = er(e);
+function rr(e, t) {
+  let r = tr(e);
   return t ? r.map((a, n) => n === r.length - 1 ? a.pathname : a.pathnameBase) : r.map((a) => a.pathnameBase);
 }
-function rr(e, t, r, a) {
+function ar(e, t, r, a) {
   a === void 0 && (a = !1);
   let n;
-  typeof e == "string" ? n = ie(e) : (n = I({}, e), O(!n.pathname || !n.pathname.includes("?"), ft("?", "pathname", "search", n)), O(!n.pathname || !n.pathname.includes("#"), ft("#", "pathname", "hash", n)), O(!n.search || !n.search.includes("#"), ft("#", "search", "hash", n)));
+  typeof e == "string" ? n = oe(e) : (n = I({}, e), O(!n.pathname || !n.pathname.includes("?"), ft("?", "pathname", "search", n)), O(!n.pathname || !n.pathname.includes("#"), ft("#", "pathname", "hash", n)), O(!n.search || !n.search.includes("#"), ft("#", "search", "hash", n)));
   let s = e === "" || n.pathname === "", l = s ? "/" : n.pathname, f;
   if (l == null)
     f = r;
   else {
     let p = t.length - 1;
     if (!a && l.startsWith("..")) {
-      let S = l.split("/");
-      for (; S[0] === ".."; )
-        S.shift(), p -= 1;
-      n.pathname = S.join("/");
+      let R = l.split("/");
+      for (; R[0] === ".."; )
+        R.shift(), p -= 1;
+      n.pathname = R.join("/");
     }
     f = p >= 0 ? t[p] : "/";
   }
-  let u = qt(n, f), v = l && l !== "/" && l.endsWith("/"), b = (s || l === ".") && r.endsWith("/");
+  let u = er(n, f), v = l && l !== "/" && l.endsWith("/"), b = (s || l === ".") && r.endsWith("/");
   return !u.pathname.endsWith("/") && (v || b) && (u.pathname += "/"), u;
 }
 function la(e) {
-  return e === "" || e.pathname === "" ? "/" : typeof e == "string" ? ie(e).pathname : e.pathname;
+  return e === "" || e.pathname === "" ? "/" : typeof e == "string" ? oe(e).pathname : e.pathname;
 }
-const Ne = (e) => e.join("/").replace(/\/\/+/g, "/"), ar = (e) => e.replace(/\/+$/, "").replace(/^\/*/, "/"), sa = (e) => !e || e === "?" ? "" : e.startsWith("?") ? e : "?" + e, da = (e) => !e || e === "#" ? "" : e.startsWith("#") ? e : "#" + e, ua = function(t, r) {
+const He = (e) => e.join("/").replace(/\/\/+/g, "/"), nr = (e) => e.replace(/\/+$/, "").replace(/^\/*/, "/"), sa = (e) => !e || e === "?" ? "" : e.startsWith("?") ? e : "?" + e, da = (e) => !e || e === "#" ? "" : e.startsWith("#") ? e : "#" + e, ua = function(t, r) {
   r === void 0 && (r = {});
   let a = typeof r == "number" ? {
     status: r
@@ -579,7 +579,7 @@ const Ne = (e) => e.join("/").replace(/\/\/+/g, "/"), ar = (e) => e.replace(/\/+
 };
 class pt extends Error {
 }
-class nr {
+class ir {
   constructor(t, r) {
     this.pendingKeysSet = /* @__PURE__ */ new Set(), this.subscribers = /* @__PURE__ */ new Set(), this.deferredKeys = [], O(t && typeof t == "object" && !Array.isArray(t), "defer() only accepts plain objects");
     let a;
@@ -670,7 +670,7 @@ const ha = function(t, r) {
   let a = typeof r == "number" ? {
     status: r
   } : r;
-  return new nr(t, a);
+  return new ir(t, a);
 }, or = function(t, r) {
   r === void 0 && (r = 302);
   let a = r;
@@ -693,7 +693,7 @@ class vt {
 function ze(e) {
   return e != null && typeof e.status == "number" && typeof e.statusText == "string" && typeof e.internal == "boolean" && "data" in e;
 }
-const ir = ["post", "put", "patch", "delete"], ma = new Set(ir), ga = ["get", ...ir], ya = new Set(ga), va = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]), wa = /* @__PURE__ */ new Set([307, 308]), nt = {
+const lr = ["post", "put", "patch", "delete"], ma = new Set(lr), ga = ["get", ...lr], ya = new Set(ga), va = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]), wa = /* @__PURE__ */ new Set([307, 308]), nt = {
   state: "idle",
   location: void 0,
   formMethod: void 0,
@@ -702,7 +702,7 @@ const ir = ["post", "put", "patch", "delete"], ma = new Set(ir), ga = ["get", ..
   formData: void 0,
   json: void 0,
   text: void 0
-}, lr = {
+}, sr = {
   state: "idle",
   data: void 0,
   formMethod: void 0,
@@ -711,14 +711,14 @@ const ir = ["post", "put", "patch", "delete"], ma = new Set(ir), ga = ["get", ..
   formData: void 0,
   json: void 0,
   text: void 0
-}, Ie = {
+}, Ne = {
   state: "unblocked",
   proceed: void 0,
   reset: void 0,
   location: void 0
-}, wt = /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i, sr = (e) => ({
+}, wt = /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i, dr = (e) => ({
   hasErrorBoundary: !!e.hasErrorBoundary
-}), dr = "remix-router-transitions";
+}), ur = "remix-router-transitions";
 function ba(e) {
   const t = e.window ? e.window : typeof window < "u" ? window : void 0, r = typeof t < "u" && typeof t.document < "u" && typeof t.document.createElement < "u", a = !r;
   O(e.routes.length > 0, "You must provide a non-empty routes array to createRouter");
@@ -726,53 +726,53 @@ function ba(e) {
   if (e.mapRouteProperties)
     n = e.mapRouteProperties;
   else if (e.detectErrorBoundary) {
-    let o = e.detectErrorBoundary;
-    n = (i) => ({
-      hasErrorBoundary: o(i)
+    let i = e.detectErrorBoundary;
+    n = (o) => ({
+      hasErrorBoundary: i(o)
     });
   } else
-    n = sr;
-  let s = {}, l = Me(e.routes, n, void 0, s), f, u = e.basename || "/", v = e.unstable_dataStrategy || pr, b = e.unstable_patchRoutesOnMiss, p = I({
+    n = dr;
+  let s = {}, l = je(e.routes, n, void 0, s), f, u = e.basename || "/", v = e.unstable_dataStrategy || mr, b = e.unstable_patchRoutesOnMiss, p = I({
     v7_fetcherPersist: !1,
     v7_normalizeFormMethod: !1,
     v7_partialHydration: !1,
     v7_prependBasename: !1,
     v7_relativeSplatPath: !1,
-    unstable_skipActionErrorRevalidation: !1
-  }, e.future), S = null, m = /* @__PURE__ */ new Set(), y = null, g = null, P = null, A = e.hydrationData != null, x = me(l, e.history.location, u), _ = null;
+    v7_skipActionErrorRevalidation: !1
+  }, e.future), R = null, m = /* @__PURE__ */ new Set(), y = null, g = null, P = null, A = e.hydrationData != null, x = me(l, e.history.location, u), U = null;
   if (x == null && !b) {
-    let o = Y(404, {
+    let i = Y(404, {
       pathname: e.history.location.pathname
     }), {
-      matches: i,
+      matches: o,
       route: d
-    } = ot(l);
-    x = i, _ = {
-      [d.id]: o
+    } = it(l);
+    x = o, U = {
+      [d.id]: i
     };
   }
-  x && b && ut(x, l, e.history.location.pathname).active && (x = null);
-  let R;
+  x && b && !e.hydrationData && ut(x, l, e.history.location.pathname).active && (x = null);
+  let S;
   if (!x)
-    R = !1, x = [];
-  else if (x.some((o) => o.route.lazy))
-    R = !1;
-  else if (!x.some((o) => o.route.loader))
-    R = !0;
+    S = !1, x = [];
+  else if (x.some((i) => i.route.lazy))
+    S = !1;
+  else if (!x.some((i) => i.route.loader))
+    S = !0;
   else if (p.v7_partialHydration) {
-    let o = e.hydrationData ? e.hydrationData.loaderData : null, i = e.hydrationData ? e.hydrationData.errors : null, d = (h) => h.route.loader ? typeof h.route.loader == "function" && h.route.loader.hydrate === !0 ? !1 : o && o[h.route.id] !== void 0 || i && i[h.route.id] !== void 0 : !0;
-    if (i) {
-      let h = x.findIndex((D) => i[D.route.id] !== void 0);
-      R = x.slice(0, h + 1).every(d);
+    let i = e.hydrationData ? e.hydrationData.loaderData : null, o = e.hydrationData ? e.hydrationData.errors : null, d = (h) => h.route.loader ? typeof h.route.loader == "function" && h.route.loader.hydrate === !0 ? !1 : i && i[h.route.id] !== void 0 || o && o[h.route.id] !== void 0 : !0;
+    if (o) {
+      let h = x.findIndex((D) => o[D.route.id] !== void 0);
+      S = x.slice(0, h + 1).every(d);
     } else
-      R = x.every(d);
+      S = x.every(d);
   } else
-    R = e.hydrationData != null;
+    S = e.hydrationData != null;
   let N, c = {
     historyAction: e.history.action,
     location: e.history.location,
     matches: x,
-    initialized: R,
+    initialized: S,
     navigation: nt,
     // Don't restore on initial updateState() if we were SSR'd
     restoreScrollPosition: e.hydrationData != null ? !1 : null,
@@ -780,29 +780,29 @@ function ba(e) {
     revalidation: "idle",
     loaderData: e.hydrationData && e.hydrationData.loaderData || {},
     actionData: e.hydrationData && e.hydrationData.actionData || null,
-    errors: e.hydrationData && e.hydrationData.errors || _,
+    errors: e.hydrationData && e.hydrationData.errors || U,
     fetchers: /* @__PURE__ */ new Map(),
     blockers: /* @__PURE__ */ new Map()
-  }, C = V.Pop, J = !1, F, X = !1, K = /* @__PURE__ */ new Map(), ne = null, le = !1, te = !1, je = [], Je = [], Q = /* @__PURE__ */ new Map(), Ge = 0, Be = -1, Ce = /* @__PURE__ */ new Map(), fe = /* @__PURE__ */ new Set(), Te = /* @__PURE__ */ new Map(), We = /* @__PURE__ */ new Map(), ce = /* @__PURE__ */ new Set(), Ee = /* @__PURE__ */ new Map(), Pe = /* @__PURE__ */ new Map(), Dr = /* @__PURE__ */ new Map(), it = !1;
-  function Er() {
-    if (S = e.history.listen((o) => {
+  }, C = V.Pop, J = !1, F, X = !1, K = /* @__PURE__ */ new Map(), ne = null, le = !1, te = !1, Ce = [], Je = [], Q = /* @__PURE__ */ new Map(), Ge = 0, Be = -1, Te = /* @__PURE__ */ new Map(), fe = /* @__PURE__ */ new Set(), Fe = /* @__PURE__ */ new Map(), We = /* @__PURE__ */ new Map(), ce = /* @__PURE__ */ new Set(), Ee = /* @__PURE__ */ new Map(), Pe = /* @__PURE__ */ new Map(), Er = /* @__PURE__ */ new Map(), ot = !1;
+  function Pr() {
+    if (R = e.history.listen((i) => {
       let {
-        action: i,
+        action: o,
         location: d,
         delta: h
-      } = o;
-      if (it) {
-        it = !1;
+      } = i;
+      if (ot) {
+        ot = !1;
         return;
       }
       de(Pe.size === 0 || h != null, "You are trying to use a blocker on a POP navigation to a location that was not created by @remix-run/router. This will fail silently in production. This can happen if you are navigating outside the router via `window.history.pushState`/`window.location.hash` instead of using router navigation APIs.  This can also happen if you are using createHashRouter and the user manually changes the URL.");
       let D = jt({
         currentLocation: c.location,
         nextLocation: d,
-        historyAction: i
+        historyAction: o
       });
       if (D && h != null) {
-        it = !0, e.history.go(h * -1), Qe(D, {
+        ot = !0, e.history.go(h * -1), Qe(D, {
           state: "blocked",
           location: d,
           proceed() {
@@ -815,116 +815,116 @@ function ba(e) {
           },
           reset() {
             let E = new Map(c.blockers);
-            E.set(D, Ie), re({
+            E.set(D, Ne), re({
               blockers: E
             });
           }
         });
         return;
       }
-      return xe(i, d);
+      return xe(o, d);
     }), r) {
       _a(t, K);
-      let o = () => Ua(t, K);
-      t.addEventListener("pagehide", o), ne = () => t.removeEventListener("pagehide", o);
+      let i = () => Ua(t, K);
+      t.addEventListener("pagehide", i), ne = () => t.removeEventListener("pagehide", i);
     }
     return c.initialized || xe(V.Pop, c.location, {
       initialHydration: !0
     }), N;
   }
-  function Pr() {
-    S && S(), ne && ne(), m.clear(), F && F.abort(), c.fetchers.forEach((o, i) => Xe(i)), c.blockers.forEach((o, i) => Mt(i));
+  function xr() {
+    R && R(), ne && ne(), m.clear(), F && F.abort(), c.fetchers.forEach((i, o) => Xe(o)), c.blockers.forEach((i, o) => Mt(o));
   }
-  function xr(o) {
-    return m.add(o), () => m.delete(o);
+  function Lr(i) {
+    return m.add(i), () => m.delete(i);
   }
-  function re(o, i) {
-    i === void 0 && (i = {}), c = I({}, c, o);
+  function re(i, o) {
+    o === void 0 && (o = {}), c = I({}, c, i);
     let d = [], h = [];
     p.v7_fetcherPersist && c.fetchers.forEach((D, E) => {
       D.state === "idle" && (ce.has(E) ? h.push(E) : d.push(E));
     }), [...m].forEach((D) => D(c, {
       deletedFetchers: h,
-      unstable_viewTransitionOpts: i.viewTransitionOpts,
-      unstable_flushSync: i.flushSync === !0
+      unstable_viewTransitionOpts: o.viewTransitionOpts,
+      unstable_flushSync: o.flushSync === !0
     })), p.v7_fetcherPersist && (d.forEach((D) => c.fetchers.delete(D)), h.forEach((D) => Xe(D)));
   }
-  function Fe(o, i, d) {
+  function _e(i, o, d) {
     var h, D;
     let {
       flushSync: E
-    } = d === void 0 ? {} : d, j = c.actionData != null && c.navigation.formMethod != null && oe(c.navigation.formMethod) && c.navigation.state === "loading" && ((h = o.state) == null ? void 0 : h._isRedirect) !== !0, w;
-    i.actionData ? Object.keys(i.actionData).length > 0 ? w = i.actionData : w = null : j ? w = c.actionData : w = null;
-    let T = i.loaderData ? $t(c.loaderData, i.loaderData, i.matches || [], i.errors) : c.loaderData, L = c.blockers;
-    L.size > 0 && (L = new Map(L), L.forEach((H, $) => L.set($, Ie)));
-    let M = J === !0 || c.navigation.formMethod != null && oe(c.navigation.formMethod) && ((D = o.state) == null ? void 0 : D._isRedirect) !== !0;
-    f && (l = f, f = void 0), le || C === V.Pop || (C === V.Push ? e.history.push(o, o.state) : C === V.Replace && e.history.replace(o, o.state));
+    } = d === void 0 ? {} : d, j = c.actionData != null && c.navigation.formMethod != null && ie(c.navigation.formMethod) && c.navigation.state === "loading" && ((h = i.state) == null ? void 0 : h._isRedirect) !== !0, w;
+    o.actionData ? Object.keys(o.actionData).length > 0 ? w = o.actionData : w = null : j ? w = c.actionData : w = null;
+    let T = o.loaderData ? $t(c.loaderData, o.loaderData, o.matches || [], o.errors) : c.loaderData, L = c.blockers;
+    L.size > 0 && (L = new Map(L), L.forEach((B, $) => L.set($, Ne)));
+    let M = J === !0 || c.navigation.formMethod != null && ie(c.navigation.formMethod) && ((D = i.state) == null ? void 0 : D._isRedirect) !== !0;
+    f && (l = f, f = void 0), le || C === V.Pop || (C === V.Push ? e.history.push(i, i.state) : C === V.Replace && e.history.replace(i, i.state));
     let W;
     if (C === V.Pop) {
-      let H = K.get(c.location.pathname);
-      H && H.has(o.pathname) ? W = {
+      let B = K.get(c.location.pathname);
+      B && B.has(i.pathname) ? W = {
         currentLocation: c.location,
-        nextLocation: o
-      } : K.has(o.pathname) && (W = {
-        currentLocation: o,
+        nextLocation: i
+      } : K.has(i.pathname) && (W = {
+        currentLocation: i,
         nextLocation: c.location
       });
     } else if (X) {
-      let H = K.get(c.location.pathname);
-      H ? H.add(o.pathname) : (H = /* @__PURE__ */ new Set([o.pathname]), K.set(c.location.pathname, H)), W = {
+      let B = K.get(c.location.pathname);
+      B ? B.add(i.pathname) : (B = /* @__PURE__ */ new Set([i.pathname]), K.set(c.location.pathname, B)), W = {
         currentLocation: c.location,
-        nextLocation: o
+        nextLocation: i
       };
     }
-    re(I({}, i, {
+    re(I({}, o, {
       actionData: w,
       loaderData: T,
       historyAction: C,
-      location: o,
+      location: i,
       initialized: !0,
       navigation: nt,
       revalidation: "idle",
-      restoreScrollPosition: Tt(o, i.matches || c.matches),
+      restoreScrollPosition: Tt(i, o.matches || c.matches),
       preventScrollReset: M,
       blockers: L
     }), {
       viewTransitionOpts: W,
       flushSync: E === !0
-    }), C = V.Pop, J = !1, X = !1, le = !1, te = !1, je = [], Je = [];
+    }), C = V.Pop, J = !1, X = !1, le = !1, te = !1, Ce = [], Je = [];
   }
-  async function St(o, i) {
-    if (typeof o == "number") {
-      e.history.go(o);
+  async function Rt(i, o) {
+    if (typeof i == "number") {
+      e.history.go(i);
       return;
     }
-    let d = mt(c.location, c.matches, u, p.v7_prependBasename, o, p.v7_relativeSplatPath, i == null ? void 0 : i.fromRouteId, i == null ? void 0 : i.relative), {
+    let d = mt(c.location, c.matches, u, p.v7_prependBasename, i, p.v7_relativeSplatPath, o == null ? void 0 : o.fromRouteId, o == null ? void 0 : o.relative), {
       path: h,
       submission: D,
       error: E
-    } = It(p.v7_normalizeFormMethod, !1, d, i), j = c.location, w = ge(c.location, h, i && i.state);
+    } = It(p.v7_normalizeFormMethod, !1, d, o), j = c.location, w = ge(c.location, h, o && o.state);
     w = I({}, w, e.history.encodeLocation(w));
-    let T = i && i.replace != null ? i.replace : void 0, L = V.Push;
-    T === !0 ? L = V.Replace : T === !1 || D != null && oe(D.formMethod) && D.formAction === c.location.pathname + c.location.search && (L = V.Replace);
-    let M = i && "preventScrollReset" in i ? i.preventScrollReset === !0 : void 0, W = (i && i.unstable_flushSync) === !0, H = jt({
+    let T = o && o.replace != null ? o.replace : void 0, L = V.Push;
+    T === !0 ? L = V.Replace : T === !1 || D != null && ie(D.formMethod) && D.formAction === c.location.pathname + c.location.search && (L = V.Replace);
+    let M = o && "preventScrollReset" in o ? o.preventScrollReset === !0 : void 0, W = (o && o.unstable_flushSync) === !0, B = jt({
       currentLocation: j,
       nextLocation: w,
       historyAction: L
     });
-    if (H) {
-      Qe(H, {
+    if (B) {
+      Qe(B, {
         state: "blocked",
         location: w,
         proceed() {
-          Qe(H, {
+          Qe(B, {
             state: "proceeding",
             proceed: void 0,
             reset: void 0,
             location: w
-          }), St(o, i);
+          }), Rt(i, o);
         },
         reset() {
           let $ = new Map(c.blockers);
-          $.set(H, Ie), re({
+          $.set(B, Ne), re({
             blockers: $
           });
         }
@@ -937,12 +937,12 @@ function ba(e) {
       // render at the right error boundary after we match routes
       pendingError: E,
       preventScrollReset: M,
-      replace: i && i.replace,
-      enableViewTransition: i && i.unstable_viewTransition,
+      replace: o && o.replace,
+      enableViewTransition: o && o.unstable_viewTransition,
       flushSync: W
     });
   }
-  function Lr() {
+  function Mr() {
     if (lt(), re({
       revalidation: "loading"
     }), c.navigation.state !== "submitting") {
@@ -957,28 +957,28 @@ function ba(e) {
       });
     }
   }
-  async function xe(o, i, d) {
-    F && F.abort(), F = null, C = o, le = (d && d.startUninterruptedRevalidation) === !0, Ir(c.location, c.matches), J = (d && d.preventScrollReset) === !0, X = (d && d.enableViewTransition) === !0;
-    let h = f || l, D = d && d.overrideNavigation, E = me(h, i, u), j = (d && d.flushSync) === !0, w = ut(E, h, i.pathname);
+  async function xe(i, o, d) {
+    F && F.abort(), F = null, C = i, le = (d && d.startUninterruptedRevalidation) === !0, Nr(c.location, c.matches), J = (d && d.preventScrollReset) === !0, X = (d && d.enableViewTransition) === !0;
+    let h = f || l, D = d && d.overrideNavigation, E = me(h, o, u), j = (d && d.flushSync) === !0, w = ut(E, h, o.pathname);
     if (w.active && w.matches && (E = w.matches), !E) {
       let {
-        error: B,
+        error: z,
         notFoundMatches: q,
         route: Z
-      } = st(i.pathname);
-      Fe(i, {
+      } = st(o.pathname);
+      _e(o, {
         matches: q,
         loaderData: {},
         errors: {
-          [Z.id]: B
+          [Z.id]: z
         }
       }, {
         flushSync: j
       });
       return;
     }
-    if (c.initialized && !te && La(c.location, i) && !(d && d.submission && oe(d.submission.formMethod))) {
-      Fe(i, {
+    if (c.initialized && !te && La(c.location, o) && !(d && d.submission && ie(d.submission.formMethod))) {
+      _e(o, {
         matches: E
       }, {
         flushSync: j
@@ -986,24 +986,24 @@ function ba(e) {
       return;
     }
     F = new AbortController();
-    let T = Oe(e.history, i, F.signal, d && d.submission), L;
+    let T = Ie(e.history, o, F.signal, d && d.submission), L;
     if (d && d.pendingError)
-      L = [He(E).route.id, {
-        type: z.error,
+      L = [Le(E).route.id, {
+        type: H.error,
         error: d.pendingError
       }];
-    else if (d && d.submission && oe(d.submission.formMethod)) {
-      let B = await Mr(T, i, d.submission, E, w.active, {
+    else if (d && d.submission && ie(d.submission.formMethod)) {
+      let z = await jr(T, o, d.submission, E, w.active, {
         replace: d.replace,
         flushSync: j
       });
-      if (B.shortCircuited)
+      if (z.shortCircuited)
         return;
-      if (B.pendingActionResult) {
-        let [q, Z] = B.pendingActionResult;
+      if (z.pendingActionResult) {
+        let [q, Z] = z.pendingActionResult;
         if (ee(Z) && ze(Z.error) && Z.error.status === 404) {
-          F = null, Fe(i, {
-            matches: B.matches,
+          F = null, _e(o, {
+            matches: z.matches,
             loaderData: {},
             errors: {
               [q]: Z.error
@@ -1012,45 +1012,44 @@ function ba(e) {
           return;
         }
       }
-      E = B.matches || E, L = B.pendingActionResult, D = ct(i, d.submission), j = !1, w.active = !1, T = Oe(e.history, T.url, T.signal);
+      E = z.matches || E, L = z.pendingActionResult, D = ct(o, d.submission), j = !1, w.active = !1, T = Ie(e.history, T.url, T.signal);
     }
     let {
       shortCircuited: M,
       matches: W,
-      loaderData: H,
+      loaderData: B,
       errors: $
-    } = await jr(T, i, E, w.active, D, d && d.submission, d && d.fetcherSubmission, d && d.replace, d && d.initialHydration === !0, j, L);
-    M || (F = null, Fe(i, I({
+    } = await Cr(T, o, E, w.active, D, d && d.submission, d && d.fetcherSubmission, d && d.replace, d && d.initialHydration === !0, j, L);
+    M || (F = null, _e(o, I({
       matches: W || E
     }, kt(L), {
-      loaderData: H,
+      loaderData: B,
       errors: $
     })));
   }
-  async function Mr(o, i, d, h, D, E) {
+  async function jr(i, o, d, h, D, E) {
     E === void 0 && (E = {}), lt();
-    let j = Ta(i, d);
+    let j = Ta(o, d);
     if (re({
       navigation: j
     }, {
       flushSync: E.flushSync === !0
     }), D) {
-      let L = await qe(h, i.pathname, o.signal);
+      let L = await qe(h, o.pathname, i.signal);
       if (L.type === "aborted")
         return {
           shortCircuited: !0
         };
       if (L.type === "error") {
         let {
-          error: M,
-          notFoundMatches: W,
-          route: H
-        } = Ze(i.pathname, L);
+          boundaryId: M,
+          error: W
+        } = Ze(o.pathname, L);
         return {
-          matches: W,
-          pendingActionResult: [H.id, {
-            type: z.error,
-            error: M
+          matches: L.partialMatches,
+          pendingActionResult: [M, {
+            type: H.error,
+            error: W
           }]
         };
       } else if (L.matches)
@@ -1059,46 +1058,46 @@ function ba(e) {
         let {
           notFoundMatches: M,
           error: W,
-          route: H
-        } = st(i.pathname);
+          route: B
+        } = st(o.pathname);
         return {
           matches: M,
-          pendingActionResult: [H.id, {
-            type: z.error,
+          pendingActionResult: [B.id, {
+            type: H.error,
             error: W
           }]
         };
       }
     }
-    let w, T = Le(h, i);
+    let w, T = Me(h, o);
     if (!T.route.action && !T.route.lazy)
       w = {
-        type: z.error,
+        type: H.error,
         error: Y(405, {
-          method: o.method,
-          pathname: i.pathname,
+          method: i.method,
+          pathname: o.pathname,
           routeId: T.route.id
         })
       };
-    else if (w = (await $e("action", o, [T], h))[0], o.signal.aborted)
+    else if (w = (await $e("action", i, [T], h))[0], i.signal.aborted)
       return {
         shortCircuited: !0
       };
     if (De(w)) {
       let L;
-      return E && E.replace != null ? L = E.replace : L = Bt(w.response.headers.get("Location"), new URL(o.url), u) === c.location.pathname + c.location.search, await Ke(o, w, {
+      return E && E.replace != null ? L = E.replace : L = Bt(w.response.headers.get("Location"), new URL(i.url), u) === c.location.pathname + c.location.search, await Ke(i, w, {
         submission: d,
         replace: L
       }), {
         shortCircuited: !0
       };
     }
-    if (Re(w))
+    if (Se(w))
       throw Y(400, {
         type: "defer-action"
       });
     if (ee(w)) {
-      let L = He(h, T.route.id);
+      let L = Le(h, T.route.id);
       return (E && E.replace) !== !0 && (C = V.Push), {
         matches: h,
         pendingActionResult: [L.route.id, w]
@@ -1109,11 +1108,11 @@ function ba(e) {
       pendingActionResult: [T.route.id, w]
     };
   }
-  async function jr(o, i, d, h, D, E, j, w, T, L, M) {
-    let W = D || ct(i, E), H = E || j || Jt(W), $ = !le && (!p.v7_partialHydration || !T);
+  async function Cr(i, o, d, h, D, E, j, w, T, L, M) {
+    let W = D || ct(o, E), B = E || j || Jt(W), $ = !le && (!p.v7_partialHydration || !T);
     if (h) {
       if ($) {
-        let G = Rt(M);
+        let G = St(M);
         re(I({
           navigation: W
         }, G !== void 0 ? {
@@ -1122,32 +1121,31 @@ function ba(e) {
           flushSync: L
         });
       }
-      let U = await qe(d, i.pathname, o.signal);
-      if (U.type === "aborted")
+      let _ = await qe(d, o.pathname, i.signal);
+      if (_.type === "aborted")
         return {
           shortCircuited: !0
         };
-      if (U.type === "error") {
+      if (_.type === "error") {
         let {
-          error: G,
-          notFoundMatches: ae,
-          route: k
-        } = Ze(i.pathname, U);
+          boundaryId: G,
+          error: ae
+        } = Ze(o.pathname, _);
         return {
-          matches: ae,
+          matches: _.partialMatches,
           loaderData: {},
           errors: {
-            [k.id]: G
+            [G]: ae
           }
         };
-      } else if (U.matches)
-        d = U.matches;
+      } else if (_.matches)
+        d = _.matches;
       else {
         let {
           error: G,
           notFoundMatches: ae,
           route: k
-        } = st(i.pathname);
+        } = st(o.pathname);
         return {
           matches: ae,
           loaderData: {},
@@ -1157,17 +1155,17 @@ function ba(e) {
         };
       }
     }
-    let B = f || l, [q, Z] = Nt(e.history, c, d, H, i, p.v7_partialHydration && T === !0, p.unstable_skipActionErrorRevalidation, te, je, Je, ce, Te, fe, B, u, M);
-    if (dt((U) => !(d && d.some((G) => G.route.id === U)) || q && q.some((G) => G.route.id === U)), Be = ++Ge, q.length === 0 && Z.length === 0) {
-      let U = xt();
-      return Fe(i, I({
+    let z = f || l, [q, Z] = Nt(e.history, c, d, B, o, p.v7_partialHydration && T === !0, p.v7_skipActionErrorRevalidation, te, Ce, Je, ce, Fe, fe, z, u, M);
+    if (dt((_) => !(d && d.some((G) => G.route.id === _)) || q && q.some((G) => G.route.id === _)), Be = ++Ge, q.length === 0 && Z.length === 0) {
+      let _ = xt();
+      return _e(o, I({
         matches: d,
         loaderData: {},
         // Commit pending error if we're short circuiting
         errors: M && ee(M[1]) ? {
           [M[0]]: M[1].error
         } : null
-      }, kt(M), U ? {
+      }, kt(M), _ ? {
         fetchers: new Map(c.fetchers)
       } : {}), {
         flushSync: L
@@ -1176,55 +1174,55 @@ function ba(e) {
       };
     }
     if ($) {
-      let U = {};
+      let _ = {};
       if (!h) {
-        U.navigation = W;
-        let G = Rt(M);
-        G !== void 0 && (U.actionData = G);
+        _.navigation = W;
+        let G = St(M);
+        G !== void 0 && (_.actionData = G);
       }
-      Z.length > 0 && (U.fetchers = Cr(Z)), re(U, {
+      Z.length > 0 && (_.fetchers = Tr(Z)), re(_, {
         flushSync: L
       });
     }
-    Z.forEach((U) => {
-      Q.has(U.key) && ve(U.key), U.controller && Q.set(U.key, U.controller);
+    Z.forEach((_) => {
+      Q.has(_.key) && ve(_.key), _.controller && Q.set(_.key, _.controller);
     });
-    let ke = () => Z.forEach((U) => ve(U.key));
+    let ke = () => Z.forEach((_) => ve(_.key));
     F && F.signal.addEventListener("abort", ke);
     let {
       loaderResults: we,
-      fetcherResults: _e
-    } = await Dt(c.matches, d, q, Z, o);
-    if (o.signal.aborted)
+      fetcherResults: Ue
+    } = await Dt(c.matches, d, q, Z, i);
+    if (i.signal.aborted)
       return {
         shortCircuited: !0
       };
-    F && F.signal.removeEventListener("abort", ke), Z.forEach((U) => Q.delete(U.key));
-    let Ue = Vt([...we, ..._e]);
-    if (Ue) {
-      if (Ue.idx >= q.length) {
-        let U = Z[Ue.idx - q.length].key;
-        fe.add(U);
+    F && F.signal.removeEventListener("abort", ke), Z.forEach((_) => Q.delete(_.key));
+    let Ae = Vt([...we, ...Ue]);
+    if (Ae) {
+      if (Ae.idx >= q.length) {
+        let _ = Z[Ae.idx - q.length].key;
+        fe.add(_);
       }
-      return await Ke(o, Ue.result, {
+      return await Ke(i, Ae.result, {
         replace: w
       }), {
         shortCircuited: !0
       };
     }
     let {
-      loaderData: Ae,
+      loaderData: Oe,
       errors: se
-    } = Kt(c, d, q, we, M, Z, _e, Ee);
-    Ee.forEach((U, G) => {
-      U.subscribe((ae) => {
-        (ae || U.done) && Ee.delete(G);
+    } = Kt(c, d, q, we, M, Z, Ue, Ee);
+    Ee.forEach((_, G) => {
+      _.subscribe((ae) => {
+        (ae || _.done) && Ee.delete(G);
       });
-    }), p.v7_partialHydration && T && c.errors && Object.entries(c.errors).filter((U) => {
-      let [G] = U;
+    }), p.v7_partialHydration && T && c.errors && Object.entries(c.errors).filter((_) => {
+      let [G] = _;
       return !q.some((ae) => ae.route.id === G);
-    }).forEach((U) => {
-      let [G, ae] = U;
+    }).forEach((_) => {
+      let [G, ae] = _;
       se = Object.assign(se || {}, {
         [G]: ae
       });
@@ -1232,33 +1230,33 @@ function ba(e) {
     let et = xt(), tt = Lt(Be), rt = et || tt || Z.length > 0;
     return I({
       matches: d,
-      loaderData: Ae,
+      loaderData: Oe,
       errors: se
     }, rt ? {
       fetchers: new Map(c.fetchers)
     } : {});
   }
-  function Rt(o) {
-    if (o && !ee(o[1]))
+  function St(i) {
+    if (i && !ee(i[1]))
       return {
-        [o[0]]: o[1].data
+        [i[0]]: i[1].data
       };
     if (c.actionData)
       return Object.keys(c.actionData).length === 0 ? null : c.actionData;
   }
-  function Cr(o) {
-    return o.forEach((i) => {
-      let d = c.fetchers.get(i.key), h = Ve(void 0, d ? d.data : void 0);
-      c.fetchers.set(i.key, h);
+  function Tr(i) {
+    return i.forEach((o) => {
+      let d = c.fetchers.get(o.key), h = Ve(void 0, d ? d.data : void 0);
+      c.fetchers.set(o.key, h);
     }), new Map(c.fetchers);
   }
-  function Tr(o, i, d, h) {
+  function Fr(i, o, d, h) {
     if (a)
       throw new Error("router.fetch() was called during the server render, but it shouldn't be. You are likely calling a useFetcher() method in the body of your component. Try moving it to a useEffect or a callback.");
-    Q.has(o) && ve(o);
-    let D = (h && h.unstable_flushSync) === !0, E = f || l, j = mt(c.location, c.matches, u, p.v7_prependBasename, d, p.v7_relativeSplatPath, i, h == null ? void 0 : h.relative), w = me(E, j, u), T = ut(w, E, j);
+    Q.has(i) && ve(i);
+    let D = (h && h.unstable_flushSync) === !0, E = f || l, j = mt(c.location, c.matches, u, p.v7_prependBasename, d, p.v7_relativeSplatPath, o, h == null ? void 0 : h.relative), w = me(E, j, u), T = ut(w, E, j);
     if (T.active && T.matches && (w = T.matches), !w) {
-      he(o, i, Y(404, {
+      he(i, o, Y(404, {
         pathname: j
       }), {
         flushSync: D
@@ -1271,31 +1269,31 @@ function ba(e) {
       error: W
     } = It(p.v7_normalizeFormMethod, !0, j, h);
     if (W) {
-      he(o, i, W, {
+      he(i, o, W, {
         flushSync: D
       });
       return;
     }
-    let H = Le(w, L);
-    if (J = (h && h.preventScrollReset) === !0, M && oe(M.formMethod)) {
-      Fr(o, i, L, H, w, T.active, D, M);
+    let B = Me(w, L);
+    if (J = (h && h.preventScrollReset) === !0, M && ie(M.formMethod)) {
+      _r(i, o, L, B, w, T.active, D, M);
       return;
     }
-    Te.set(o, {
-      routeId: i,
+    Fe.set(i, {
+      routeId: o,
       path: L
-    }), _r(o, i, L, H, w, T.active, D, M);
+    }), Ur(i, o, L, B, w, T.active, D, M);
   }
-  async function Fr(o, i, d, h, D, E, j, w) {
-    lt(), Te.delete(o);
+  async function _r(i, o, d, h, D, E, j, w) {
+    lt(), Fe.delete(i);
     function T(k) {
       if (!k.route.action && !k.route.lazy) {
         let pe = Y(405, {
           method: w.formMethod,
           pathname: d,
-          routeId: i
+          routeId: o
         });
-        return he(o, i, pe, {
+        return he(i, o, pe, {
           flushSync: j
         }), !0;
       }
@@ -1303,11 +1301,11 @@ function ba(e) {
     }
     if (!E && T(h))
       return;
-    let L = c.fetchers.get(o);
-    ye(o, Fa(w, L), {
+    let L = c.fetchers.get(i);
+    ye(i, Fa(w, L), {
       flushSync: j
     });
-    let M = new AbortController(), W = Oe(e.history, d, M.signal, w);
+    let M = new AbortController(), W = Ie(e.history, d, M.signal, w);
     if (E) {
       let k = await qe(D, d, W.signal);
       if (k.type === "aborted")
@@ -1316,15 +1314,15 @@ function ba(e) {
         let {
           error: pe
         } = Ze(d, k);
-        he(o, i, pe, {
+        he(i, o, pe, {
           flushSync: j
         });
         return;
       } else if (k.matches) {
-        if (D = k.matches, h = Le(D, d), T(h))
+        if (D = k.matches, h = Me(D, d), T(h))
           return;
       } else {
-        he(o, i, Y(404, {
+        he(i, o, Y(404, {
           pathname: d
         }), {
           flushSync: j
@@ -1332,45 +1330,45 @@ function ba(e) {
         return;
       }
     }
-    Q.set(o, M);
-    let H = Ge, B = (await $e("action", W, [h], D))[0];
+    Q.set(i, M);
+    let B = Ge, z = (await $e("action", W, [h], D))[0];
     if (W.signal.aborted) {
-      Q.get(o) === M && Q.delete(o);
+      Q.get(i) === M && Q.delete(i);
       return;
     }
-    if (p.v7_fetcherPersist && ce.has(o)) {
-      if (De(B) || ee(B)) {
-        ye(o, be(void 0));
+    if (p.v7_fetcherPersist && ce.has(i)) {
+      if (De(z) || ee(z)) {
+        ye(i, be(void 0));
         return;
       }
     } else {
-      if (De(B))
-        if (Q.delete(o), Be > H) {
-          ye(o, be(void 0));
+      if (De(z))
+        if (Q.delete(i), Be > B) {
+          ye(i, be(void 0));
           return;
         } else
-          return fe.add(o), ye(o, Ve(w)), Ke(W, B, {
+          return fe.add(i), ye(i, Ve(w)), Ke(W, z, {
             fetcherSubmission: w
           });
-      if (ee(B)) {
-        he(o, i, B.error);
+      if (ee(z)) {
+        he(i, o, z.error);
         return;
       }
     }
-    if (Re(B))
+    if (Se(z))
       throw Y(400, {
         type: "defer-action"
       });
-    let q = c.navigation.location || c.location, Z = Oe(e.history, q, M.signal), ke = f || l, we = c.navigation.state !== "idle" ? me(ke, c.navigation.location, u) : c.matches;
+    let q = c.navigation.location || c.location, Z = Ie(e.history, q, M.signal), ke = f || l, we = c.navigation.state !== "idle" ? me(ke, c.navigation.location, u) : c.matches;
     O(we, "Didn't find any matches after fetcher action");
-    let _e = ++Ge;
-    Ce.set(o, _e);
-    let Ue = Ve(w, B.data);
-    c.fetchers.set(o, Ue);
-    let [Ae, se] = Nt(e.history, c, we, w, q, !1, p.unstable_skipActionErrorRevalidation, te, je, Je, ce, Te, fe, ke, u, [h.route.id, B]);
-    se.filter((k) => k.key !== o).forEach((k) => {
-      let pe = k.key, Ft = c.fetchers.get(pe), zr = Ve(void 0, Ft ? Ft.data : void 0);
-      c.fetchers.set(pe, zr), Q.has(pe) && ve(pe), k.controller && Q.set(pe, k.controller);
+    let Ue = ++Ge;
+    Te.set(i, Ue);
+    let Ae = Ve(w, z.data);
+    c.fetchers.set(i, Ae);
+    let [Oe, se] = Nt(e.history, c, we, w, q, !1, p.v7_skipActionErrorRevalidation, te, Ce, Je, ce, Fe, fe, ke, u, [h.route.id, z]);
+    se.filter((k) => k.key !== i).forEach((k) => {
+      let pe = k.key, Ft = c.fetchers.get(pe), Br = Ve(void 0, Ft ? Ft.data : void 0);
+      c.fetchers.set(pe, Br), Q.has(pe) && ve(pe), k.controller && Q.set(pe, k.controller);
     }), re({
       fetchers: new Map(c.fetchers)
     });
@@ -1379,27 +1377,27 @@ function ba(e) {
     let {
       loaderResults: tt,
       fetcherResults: rt
-    } = await Dt(c.matches, we, Ae, se, Z);
+    } = await Dt(c.matches, we, Oe, se, Z);
     if (M.signal.aborted)
       return;
-    M.signal.removeEventListener("abort", et), Ce.delete(o), Q.delete(o), se.forEach((k) => Q.delete(k.key));
-    let U = Vt([...tt, ...rt]);
-    if (U) {
-      if (U.idx >= Ae.length) {
-        let k = se[U.idx - Ae.length].key;
+    M.signal.removeEventListener("abort", et), Te.delete(i), Q.delete(i), se.forEach((k) => Q.delete(k.key));
+    let _ = Vt([...tt, ...rt]);
+    if (_) {
+      if (_.idx >= Oe.length) {
+        let k = se[_.idx - Oe.length].key;
         fe.add(k);
       }
-      return Ke(Z, U.result);
+      return Ke(Z, _.result);
     }
     let {
       loaderData: G,
       errors: ae
-    } = Kt(c, c.matches, Ae, tt, void 0, se, rt, Ee);
-    if (c.fetchers.has(o)) {
-      let k = be(B.data);
-      c.fetchers.set(o, k);
+    } = Kt(c, c.matches, Oe, tt, void 0, se, rt, Ee);
+    if (c.fetchers.has(i)) {
+      let k = be(z.data);
+      c.fetchers.set(i, k);
     }
-    Lt(_e), c.navigation.state === "loading" && _e > Be ? (O(C, "Expected pending action"), F && F.abort(), Fe(c.navigation.location, {
+    Lt(Ue), c.navigation.state === "loading" && Ue > Be ? (O(C, "Expected pending action"), F && F.abort(), _e(c.navigation.location, {
       matches: we,
       loaderData: G,
       errors: ae,
@@ -1410,28 +1408,28 @@ function ba(e) {
       fetchers: new Map(c.fetchers)
     }), te = !1);
   }
-  async function _r(o, i, d, h, D, E, j, w) {
-    let T = c.fetchers.get(o);
-    ye(o, Ve(w, T ? T.data : void 0), {
+  async function Ur(i, o, d, h, D, E, j, w) {
+    let T = c.fetchers.get(i);
+    ye(i, Ve(w, T ? T.data : void 0), {
       flushSync: j
     });
-    let L = new AbortController(), M = Oe(e.history, d, L.signal);
+    let L = new AbortController(), M = Ie(e.history, d, L.signal);
     if (E) {
-      let B = await qe(D, d, M.signal);
-      if (B.type === "aborted")
+      let z = await qe(D, d, M.signal);
+      if (z.type === "aborted")
         return;
-      if (B.type === "error") {
+      if (z.type === "error") {
         let {
           error: q
-        } = Ze(d, B);
-        he(o, i, q, {
+        } = Ze(d, z);
+        he(i, o, q, {
           flushSync: j
         });
         return;
-      } else if (B.matches)
-        D = B.matches, h = Le(D, d);
+      } else if (z.matches)
+        D = z.matches, h = Me(D, d);
       else {
-        he(o, i, Y(404, {
+        he(i, o, Y(404, {
           pathname: d
         }), {
           flushSync: j
@@ -1439,49 +1437,49 @@ function ba(e) {
         return;
       }
     }
-    Q.set(o, L);
+    Q.set(i, L);
     let W = Ge, $ = (await $e("loader", M, [h], D))[0];
-    if (Re($) && ($ = await Rr($, M.signal, !0) || $), Q.get(o) === L && Q.delete(o), !M.signal.aborted) {
-      if (ce.has(o)) {
-        ye(o, be(void 0));
+    if (Se($) && ($ = await Dr($, M.signal, !0) || $), Q.get(i) === L && Q.delete(i), !M.signal.aborted) {
+      if (ce.has(i)) {
+        ye(i, be(void 0));
         return;
       }
       if (De($))
         if (Be > W) {
-          ye(o, be(void 0));
+          ye(i, be(void 0));
           return;
         } else {
-          fe.add(o), await Ke(M, $);
+          fe.add(i), await Ke(M, $);
           return;
         }
       if (ee($)) {
-        he(o, i, $.error);
+        he(i, o, $.error);
         return;
       }
-      O(!Re($), "Unhandled fetcher deferred data"), ye(o, be($.data));
+      O(!Se($), "Unhandled fetcher deferred data"), ye(i, be($.data));
     }
   }
-  async function Ke(o, i, d) {
+  async function Ke(i, o, d) {
     let {
       submission: h,
       fetcherSubmission: D,
       replace: E
     } = d === void 0 ? {} : d;
-    i.response.headers.has("X-Remix-Revalidate") && (te = !0);
-    let j = i.response.headers.get("Location");
-    O(j, "Expected a Location header on the redirect Response"), j = Bt(j, new URL(o.url), u);
+    o.response.headers.has("X-Remix-Revalidate") && (te = !0);
+    let j = o.response.headers.get("Location");
+    O(j, "Expected a Location header on the redirect Response"), j = Bt(j, new URL(i.url), u);
     let w = ge(c.location, j, {
       _isRedirect: !0
     });
     if (r) {
       let $ = !1;
-      if (i.response.headers.has("X-Remix-Reload-Document"))
+      if (o.response.headers.has("X-Remix-Reload-Document"))
         $ = !0;
       else if (wt.test(j)) {
-        const B = e.history.createURL(j);
+        const z = e.history.createURL(j);
         $ = // Hard reload if it's an absolute URL to a new origin
-        B.origin !== t.location.origin || // Hard reload if it's an absolute URL that does not match our basename
-        Ye(B.pathname, u) == null;
+        z.origin !== t.location.origin || // Hard reload if it's an absolute URL that does not match our basename
+        Ye(z.pathname, u) == null;
       }
       if ($) {
         E ? t.location.replace(j) : t.location.assign(j);
@@ -1495,10 +1493,10 @@ function ba(e) {
       formEncType: W
     } = c.navigation;
     !h && !D && L && M && W && (h = Jt(c.navigation));
-    let H = h || D;
-    if (wa.has(i.response.status) && H && oe(H.formMethod))
+    let B = h || D;
+    if (wa.has(o.response.status) && B && ie(B.formMethod))
       await xe(T, w, {
-        submission: I({}, H, {
+        submission: I({}, B, {
           formAction: j
         }),
         // Preserve this flag across redirects
@@ -1515,60 +1513,60 @@ function ba(e) {
       });
     }
   }
-  async function $e(o, i, d, h) {
+  async function $e(i, o, d, h) {
     try {
-      let D = await mr(v, o, i, d, h, s, n);
+      let D = await gr(v, i, o, d, h, s, n);
       return await Promise.all(D.map((E, j) => {
-        if (br(E)) {
+        if (Rr(E)) {
           let w = E.result;
           return {
-            type: z.redirect,
-            response: yr(w, i, d[j].route.id, h, u, p.v7_relativeSplatPath)
+            type: H.redirect,
+            response: vr(w, o, d[j].route.id, h, u, p.v7_relativeSplatPath)
           };
         }
-        return gr(E);
+        return yr(E);
       }));
     } catch (D) {
       return d.map(() => ({
-        type: z.error,
+        type: H.error,
         error: D
       }));
     }
   }
-  async function Dt(o, i, d, h, D) {
-    let [E, ...j] = await Promise.all([d.length ? $e("loader", D, d, i) : [], ...h.map((w) => {
+  async function Dt(i, o, d, h, D) {
+    let [E, ...j] = await Promise.all([d.length ? $e("loader", D, d, o) : [], ...h.map((w) => {
       if (w.matches && w.match && w.controller) {
-        let T = Oe(e.history, w.path, w.controller.signal);
+        let T = Ie(e.history, w.path, w.controller.signal);
         return $e("loader", T, [w.match], w.matches).then((L) => L[0]);
       } else
         return Promise.resolve({
-          type: z.error,
+          type: H.error,
           error: Y(404, {
             pathname: w.path
           })
         });
     })]);
-    return await Promise.all([Yt(o, d, E, E.map(() => D.signal), !1, c.loaderData), Yt(o, h.map((w) => w.match), j, h.map((w) => w.controller ? w.controller.signal : null), !0)]), {
+    return await Promise.all([Yt(i, d, E, E.map(() => D.signal), !1, c.loaderData), Yt(i, h.map((w) => w.match), j, h.map((w) => w.controller ? w.controller.signal : null), !0)]), {
       loaderResults: E,
       fetcherResults: j
     };
   }
   function lt() {
-    te = !0, je.push(...dt()), Te.forEach((o, i) => {
-      Q.has(i) && (Je.push(i), ve(i));
+    te = !0, Ce.push(...dt()), Fe.forEach((i, o) => {
+      Q.has(o) && (Je.push(o), ve(o));
     });
   }
-  function ye(o, i, d) {
-    d === void 0 && (d = {}), c.fetchers.set(o, i), re({
+  function ye(i, o, d) {
+    d === void 0 && (d = {}), c.fetchers.set(i, o), re({
       fetchers: new Map(c.fetchers)
     }, {
       flushSync: (d && d.flushSync) === !0
     });
   }
-  function he(o, i, d, h) {
+  function he(i, o, d, h) {
     h === void 0 && (h = {});
-    let D = He(c.matches, i);
-    Xe(o), re({
+    let D = Le(c.matches, o);
+    Xe(i), re({
       errors: {
         [D.route.id]: d
       },
@@ -1577,116 +1575,113 @@ function ba(e) {
       flushSync: (h && h.flushSync) === !0
     });
   }
-  function Et(o) {
-    return p.v7_fetcherPersist && (We.set(o, (We.get(o) || 0) + 1), ce.has(o) && ce.delete(o)), c.fetchers.get(o) || lr;
+  function Et(i) {
+    return p.v7_fetcherPersist && (We.set(i, (We.get(i) || 0) + 1), ce.has(i) && ce.delete(i)), c.fetchers.get(i) || sr;
   }
-  function Xe(o) {
-    let i = c.fetchers.get(o);
-    Q.has(o) && !(i && i.state === "loading" && Ce.has(o)) && ve(o), Te.delete(o), Ce.delete(o), fe.delete(o), ce.delete(o), c.fetchers.delete(o);
+  function Xe(i) {
+    let o = c.fetchers.get(i);
+    Q.has(i) && !(o && o.state === "loading" && Te.has(i)) && ve(i), Fe.delete(i), Te.delete(i), fe.delete(i), ce.delete(i), c.fetchers.delete(i);
   }
-  function Ur(o) {
+  function Ar(i) {
     if (p.v7_fetcherPersist) {
-      let i = (We.get(o) || 0) - 1;
-      i <= 0 ? (We.delete(o), ce.add(o)) : We.set(o, i);
+      let o = (We.get(i) || 0) - 1;
+      o <= 0 ? (We.delete(i), ce.add(i)) : We.set(i, o);
     } else
-      Xe(o);
+      Xe(i);
     re({
       fetchers: new Map(c.fetchers)
     });
   }
-  function ve(o) {
-    let i = Q.get(o);
-    O(i, "Expected fetch controller: " + o), i.abort(), Q.delete(o);
+  function ve(i) {
+    let o = Q.get(i);
+    O(o, "Expected fetch controller: " + i), o.abort(), Q.delete(i);
   }
-  function Pt(o) {
-    for (let i of o) {
-      let d = Et(i), h = be(d.data);
-      c.fetchers.set(i, h);
+  function Pt(i) {
+    for (let o of i) {
+      let d = Et(o), h = be(d.data);
+      c.fetchers.set(o, h);
     }
   }
   function xt() {
-    let o = [], i = !1;
+    let i = [], o = !1;
     for (let d of fe) {
       let h = c.fetchers.get(d);
-      O(h, "Expected fetcher: " + d), h.state === "loading" && (fe.delete(d), o.push(d), i = !0);
+      O(h, "Expected fetcher: " + d), h.state === "loading" && (fe.delete(d), i.push(d), o = !0);
     }
-    return Pt(o), i;
+    return Pt(i), o;
   }
-  function Lt(o) {
-    let i = [];
-    for (let [d, h] of Ce)
-      if (h < o) {
+  function Lt(i) {
+    let o = [];
+    for (let [d, h] of Te)
+      if (h < i) {
         let D = c.fetchers.get(d);
-        O(D, "Expected fetcher: " + d), D.state === "loading" && (ve(d), Ce.delete(d), i.push(d));
+        O(D, "Expected fetcher: " + d), D.state === "loading" && (ve(d), Te.delete(d), o.push(d));
       }
-    return Pt(i), i.length > 0;
+    return Pt(o), o.length > 0;
   }
-  function Ar(o, i) {
-    let d = c.blockers.get(o) || Ie;
-    return Pe.get(o) !== i && Pe.set(o, i), d;
+  function Or(i, o) {
+    let d = c.blockers.get(i) || Ne;
+    return Pe.get(i) !== o && Pe.set(i, o), d;
   }
-  function Mt(o) {
-    c.blockers.delete(o), Pe.delete(o);
+  function Mt(i) {
+    c.blockers.delete(i), Pe.delete(i);
   }
-  function Qe(o, i) {
-    let d = c.blockers.get(o) || Ie;
-    O(d.state === "unblocked" && i.state === "blocked" || d.state === "blocked" && i.state === "blocked" || d.state === "blocked" && i.state === "proceeding" || d.state === "blocked" && i.state === "unblocked" || d.state === "proceeding" && i.state === "unblocked", "Invalid blocker state transition: " + d.state + " -> " + i.state);
+  function Qe(i, o) {
+    let d = c.blockers.get(i) || Ne;
+    O(d.state === "unblocked" && o.state === "blocked" || d.state === "blocked" && o.state === "blocked" || d.state === "blocked" && o.state === "proceeding" || d.state === "blocked" && o.state === "unblocked" || d.state === "proceeding" && o.state === "unblocked", "Invalid blocker state transition: " + d.state + " -> " + o.state);
     let h = new Map(c.blockers);
-    h.set(o, i), re({
+    h.set(i, o), re({
       blockers: h
     });
   }
-  function jt(o) {
+  function jt(i) {
     let {
-      currentLocation: i,
+      currentLocation: o,
       nextLocation: d,
       historyAction: h
-    } = o;
+    } = i;
     if (Pe.size === 0)
       return;
     Pe.size > 1 && de(!1, "A router only supports one blocker at a time");
     let D = Array.from(Pe.entries()), [E, j] = D[D.length - 1], w = c.blockers.get(E);
     if (!(w && w.state === "proceeding") && j({
-      currentLocation: i,
+      currentLocation: o,
       nextLocation: d,
       historyAction: h
     }))
       return E;
   }
-  function st(o) {
-    let i = Y(404, {
-      pathname: o
+  function st(i) {
+    let o = Y(404, {
+      pathname: i
     }), d = f || l, {
       matches: h,
       route: D
-    } = ot(d);
+    } = it(d);
     return dt(), {
       notFoundMatches: h,
       route: D,
-      error: i
+      error: o
     };
   }
-  function Ze(o, i) {
-    let d = i.partialMatches, h = d[d.length - 1].route, D = Y(400, {
-      type: "route-discovery",
-      routeId: h.id,
-      pathname: o,
-      message: i.error != null && "message" in i.error ? i.error : String(i.error)
-    });
+  function Ze(i, o) {
     return {
-      notFoundMatches: d,
-      route: h,
-      error: D
+      boundaryId: Le(o.partialMatches).route.id,
+      error: Y(400, {
+        type: "route-discovery",
+        pathname: i,
+        message: o.error != null && "message" in o.error ? o.error : String(o.error)
+      })
     };
   }
-  function dt(o) {
-    let i = [];
+  function dt(i) {
+    let o = [];
     return Ee.forEach((d, h) => {
-      (!o || o(h)) && (d.cancel(), i.push(h), Ee.delete(h));
-    }), i;
+      (!i || i(h)) && (d.cancel(), o.push(h), Ee.delete(h));
+    }), o;
   }
-  function Or(o, i, d) {
-    if (y = o, P = i, g = d || null, !A && c.navigation === nt) {
+  function Ir(i, o, d) {
+    if (y = i, P = o, g = d || null, !A && c.navigation === nt) {
       A = !0;
       let h = Tt(c.location, c.matches);
       h != null && re({
@@ -1697,48 +1692,48 @@ function ba(e) {
       y = null, P = null, g = null;
     };
   }
-  function Ct(o, i) {
-    return g && g(o, i.map((h) => Xt(h, c.loaderData))) || o.key;
+  function Ct(i, o) {
+    return g && g(i, o.map((h) => Xt(h, c.loaderData))) || i.key;
   }
-  function Ir(o, i) {
+  function Nr(i, o) {
     if (y && P) {
-      let d = Ct(o, i);
+      let d = Ct(i, o);
       y[d] = P();
     }
   }
-  function Tt(o, i) {
+  function Tt(i, o) {
     if (y) {
-      let d = Ct(o, i), h = y[d];
+      let d = Ct(i, o), h = y[d];
       if (typeof h == "number")
         return h;
     }
     return null;
   }
-  function ut(o, i, d) {
+  function ut(i, o, d) {
     if (b)
-      if (o) {
-        let h = o[o.length - 1].route;
+      if (i) {
+        let h = i[i.length - 1].route;
         if (h.path && (h.path === "*" || h.path.endsWith("/*")))
           return {
             active: !0,
-            matches: at(i, d, u, !0)
+            matches: at(o, d, u, !0)
           };
       } else
         return {
           active: !0,
-          matches: at(i, d, u, !0) || []
+          matches: at(o, d, u, !0) || []
         };
     return {
       active: !1,
       matches: null
     };
   }
-  async function qe(o, i, d) {
-    let h = o, D = h.length > 0 ? h[h.length - 1].route : null;
+  async function qe(i, o, d) {
+    let h = i, D = h.length > 0 ? h[h.length - 1].route : null;
     for (; ; ) {
       let E = f == null, j = f || l;
       try {
-        await Pa(b, i, h, j, s, n, Dr, d);
+        await Pa(b, o, h, j, s, n, Er, d);
       } catch (M) {
         return {
           type: "error",
@@ -1752,7 +1747,7 @@ function ba(e) {
         return {
           type: "aborted"
         };
-      let w = me(j, i, u), T = !1;
+      let w = me(j, o, u), T = !1;
       if (w) {
         let M = w[w.length - 1].route;
         if (M.index)
@@ -1769,7 +1764,7 @@ function ba(e) {
               matches: w
             };
       }
-      let L = at(j, i, u, !0);
+      let L = at(j, o, u, !0);
       if (!L || h.map((M) => M.route.id).join("-") === L.map((M) => M.route.id).join("-"))
         return {
           type: "success",
@@ -1782,12 +1777,12 @@ function ba(e) {
         };
     }
   }
-  function Nr(o) {
-    s = {}, f = Me(o, n, void 0, s);
+  function Hr(i) {
+    s = {}, f = je(i, n, void 0, s);
   }
-  function Hr(o, i) {
+  function zr(i, o) {
     let d = f == null;
-    hr(o, i, f || l, s, n), d && (l = [...l], re({}));
+    pr(i, o, f || l, s, n), d && (l = [...l], re({}));
   }
   return N = {
     get basename() {
@@ -1805,31 +1800,31 @@ function ba(e) {
     get window() {
       return t;
     },
-    initialize: Er,
-    subscribe: xr,
-    enableScrollRestoration: Or,
-    navigate: St,
-    fetch: Tr,
-    revalidate: Lr,
+    initialize: Pr,
+    subscribe: Lr,
+    enableScrollRestoration: Ir,
+    navigate: Rt,
+    fetch: Fr,
+    revalidate: Mr,
     // Passthrough to history-aware createHref used by useHref so we get proper
     // hash-aware URLs in DOM paths
-    createHref: (o) => e.history.createHref(o),
-    encodeLocation: (o) => e.history.encodeLocation(o),
+    createHref: (i) => e.history.createHref(i),
+    encodeLocation: (i) => e.history.encodeLocation(i),
     getFetcher: Et,
-    deleteFetcher: Ur,
-    dispose: Pr,
-    getBlocker: Ar,
+    deleteFetcher: Ar,
+    dispose: xr,
+    getBlocker: Or,
     deleteBlocker: Mt,
-    patchRoutes: Hr,
+    patchRoutes: zr,
     _internalFetchControllers: Q,
     _internalActiveDeferreds: Ee,
     // TODO: Remove setRoutes, it's temporary to avoid dealing with
     // updating the tree while validating the update algorithm.
-    _internalSetRoutes: Nr
+    _internalSetRoutes: Hr
   }, N;
 }
-const ur = Symbol("deferred");
-function Sa(e, t) {
+const fr = Symbol("deferred");
+function Ra(e, t) {
   O(e.length > 0, "You must provide a non-empty routes array to createStaticHandler");
   let r = {}, a = (t ? t.basename : null) || "/", n;
   if (t != null && t.mapRouteProperties)
@@ -1840,27 +1835,27 @@ function Sa(e, t) {
       hasErrorBoundary: m(y)
     });
   } else
-    n = sr;
+    n = dr;
   let s = I({
     v7_relativeSplatPath: !1,
     v7_throwAbortReason: !1
-  }, t ? t.future : null), l = Me(e, n, void 0, r);
+  }, t ? t.future : null), l = je(e, n, void 0, r);
   async function f(m, y) {
     let {
       requestContext: g,
       skipLoaderErrorBubbling: P,
       unstable_dataStrategy: A
-    } = y === void 0 ? {} : y, x = new URL(m.url), _ = m.method, R = ge("", ue(x), null, "default"), N = me(l, R, a);
-    if (!yt(_) && _ !== "HEAD") {
+    } = y === void 0 ? {} : y, x = new URL(m.url), U = m.method, S = ge("", ue(x), null, "default"), N = me(l, S, a);
+    if (!yt(U) && U !== "HEAD") {
       let C = Y(405, {
-        method: _
+        method: U
       }), {
         matches: J,
         route: F
-      } = ot(l);
+      } = it(l);
       return {
         basename: a,
-        location: R,
+        location: S,
         matches: J,
         loaderData: {},
         actionData: null,
@@ -1874,14 +1869,14 @@ function Sa(e, t) {
       };
     } else if (!N) {
       let C = Y(404, {
-        pathname: R.pathname
+        pathname: S.pathname
       }), {
         matches: J,
         route: F
-      } = ot(l);
+      } = it(l);
       return {
         basename: a,
-        location: R,
+        location: S,
         matches: J,
         loaderData: {},
         actionData: null,
@@ -1894,9 +1889,9 @@ function Sa(e, t) {
         activeDeferreds: null
       };
     }
-    let c = await v(m, R, N, g, A || null, P === !0, null);
-    return Se(c) ? c : I({
-      location: R,
+    let c = await v(m, S, N, g, A || null, P === !0, null);
+    return Re(c) ? c : I({
+      location: S,
       basename: a
     }, c);
   }
@@ -1905,27 +1900,27 @@ function Sa(e, t) {
       routeId: g,
       requestContext: P,
       unstable_dataStrategy: A
-    } = y === void 0 ? {} : y, x = new URL(m.url), _ = m.method, R = ge("", ue(x), null, "default"), N = me(l, R, a);
-    if (!yt(_) && _ !== "HEAD" && _ !== "OPTIONS")
+    } = y === void 0 ? {} : y, x = new URL(m.url), U = m.method, S = ge("", ue(x), null, "default"), N = me(l, S, a);
+    if (!yt(U) && U !== "HEAD" && U !== "OPTIONS")
       throw Y(405, {
-        method: _
+        method: U
       });
     if (!N)
       throw Y(404, {
-        pathname: R.pathname
+        pathname: S.pathname
       });
-    let c = g ? N.find((X) => X.route.id === g) : Le(N, R);
+    let c = g ? N.find((X) => X.route.id === g) : Me(N, S);
     if (g && !c)
       throw Y(403, {
-        pathname: R.pathname,
+        pathname: S.pathname,
         routeId: g
       });
     if (!c)
       throw Y(404, {
-        pathname: R.pathname
+        pathname: S.pathname
       });
-    let C = await v(m, R, N, P, A || null, !1, c);
-    if (Se(C))
+    let C = await v(m, S, N, P, A || null, !1, c);
+    if (Re(C))
       return C;
     let J = C.errors ? Object.values(C.errors)[0] : void 0;
     if (J !== void 0)
@@ -1935,72 +1930,72 @@ function Sa(e, t) {
     if (C.loaderData) {
       var F;
       let X = Object.values(C.loaderData)[0];
-      return (F = C.activeDeferreds) != null && F[c.route.id] && (X[ur] = C.activeDeferreds[c.route.id]), X;
+      return (F = C.activeDeferreds) != null && F[c.route.id] && (X[fr] = C.activeDeferreds[c.route.id]), X;
     }
   }
-  async function v(m, y, g, P, A, x, _) {
+  async function v(m, y, g, P, A, x, U) {
     O(m.signal, "query()/queryRoute() requests must contain an AbortController signal");
     try {
-      if (oe(m.method.toLowerCase()))
-        return await b(m, g, _ || Le(g, y), P, A, x, _ != null);
-      let R = await p(m, g, P, A, x, _);
-      return Se(R) ? R : I({}, R, {
+      if (ie(m.method.toLowerCase()))
+        return await b(m, g, U || Me(g, y), P, A, x, U != null);
+      let S = await p(m, g, P, A, x, U);
+      return Re(S) ? S : I({}, S, {
         actionData: null,
         actionHeaders: {}
       });
-    } catch (R) {
-      if (ja(R) && Se(R.result)) {
-        if (R.type === z.error)
-          throw R.result;
-        return R.result;
+    } catch (S) {
+      if (ja(S) && Re(S.result)) {
+        if (S.type === H.error)
+          throw S.result;
+        return S.result;
       }
-      if (Ca(R))
-        return R;
-      throw R;
+      if (Ca(S))
+        return S;
+      throw S;
     }
   }
-  async function b(m, y, g, P, A, x, _) {
-    let R;
+  async function b(m, y, g, P, A, x, U) {
+    let S;
     if (!g.route.action && !g.route.lazy) {
       let C = Y(405, {
         method: m.method,
         pathname: new URL(m.url).pathname,
         routeId: g.route.id
       });
-      if (_)
+      if (U)
         throw C;
-      R = {
-        type: z.error,
+      S = {
+        type: H.error,
         error: C
       };
     } else
-      R = (await S("action", m, [g], y, _, P, A))[0], m.signal.aborted && Ot(m, _, s);
-    if (De(R))
+      S = (await R("action", m, [g], y, U, P, A))[0], m.signal.aborted && Ot(m, U, s);
+    if (De(S))
       throw new Response(null, {
-        status: R.response.status,
+        status: S.response.status,
         headers: {
-          Location: R.response.headers.get("Location")
+          Location: S.response.headers.get("Location")
         }
       });
-    if (Re(R)) {
+    if (Se(S)) {
       let C = Y(400, {
         type: "defer-action"
       });
-      if (_)
+      if (U)
         throw C;
-      R = {
-        type: z.error,
+      S = {
+        type: H.error,
         error: C
       };
     }
-    if (_) {
-      if (ee(R))
-        throw R.error;
+    if (U) {
+      if (ee(S))
+        throw S.error;
       return {
         matches: [g],
         loaderData: {},
         actionData: {
-          [g.route.id]: R.data
+          [g.route.id]: S.data
         },
         errors: null,
         // Note: statusCode + headers are unused here since queryRoute will
@@ -2016,38 +2011,38 @@ function Sa(e, t) {
       redirect: m.redirect,
       signal: m.signal
     });
-    if (ee(R)) {
-      let C = x ? g : He(y, g.route.id), J = await p(N, y, P, A, x, null, [C.route.id, R]);
+    if (ee(S)) {
+      let C = x ? g : Le(y, g.route.id), J = await p(N, y, P, A, x, null, [C.route.id, S]);
       return I({}, J, {
-        statusCode: ze(R.error) ? R.error.status : R.statusCode != null ? R.statusCode : 500,
+        statusCode: ze(S.error) ? S.error.status : S.statusCode != null ? S.statusCode : 500,
         actionData: null,
-        actionHeaders: I({}, R.headers ? {
-          [g.route.id]: R.headers
+        actionHeaders: I({}, S.headers ? {
+          [g.route.id]: S.headers
         } : {})
       });
     }
     let c = await p(N, y, P, A, x, null);
     return I({}, c, {
       actionData: {
-        [g.route.id]: R.data
+        [g.route.id]: S.data
       }
-    }, R.statusCode ? {
-      statusCode: R.statusCode
+    }, S.statusCode ? {
+      statusCode: S.statusCode
     } : {}, {
-      actionHeaders: R.headers ? {
-        [g.route.id]: R.headers
+      actionHeaders: S.headers ? {
+        [g.route.id]: S.headers
       } : {}
     });
   }
-  async function p(m, y, g, P, A, x, _) {
-    let R = x != null;
-    if (R && !(x != null && x.route.loader) && !(x != null && x.route.lazy))
+  async function p(m, y, g, P, A, x, U) {
+    let S = x != null;
+    if (S && !(x != null && x.route.loader) && !(x != null && x.route.lazy))
       throw Y(400, {
         method: m.method,
         pathname: new URL(m.url).pathname,
         routeId: x == null ? void 0 : x.route.id
       });
-    let c = (x ? [x] : _ && ee(_[1]) ? fr(y, _[0]) : y).filter((K) => K.route.loader || K.route.lazy);
+    let c = (x ? [x] : U && ee(U[1]) ? cr(y, U[0]) : y).filter((K) => K.route.loader || K.route.lazy);
     if (c.length === 0)
       return {
         matches: y,
@@ -2055,16 +2050,16 @@ function Sa(e, t) {
         loaderData: y.reduce((K, ne) => Object.assign(K, {
           [ne.route.id]: null
         }), {}),
-        errors: _ && ee(_[1]) ? {
-          [_[0]]: _[1].error
+        errors: U && ee(U[1]) ? {
+          [U[0]]: U[1].error
         } : null,
         statusCode: 200,
         loaderHeaders: {},
         activeDeferreds: null
       };
-    let C = await S("loader", m, c, y, R, g, P);
-    m.signal.aborted && Ot(m, R, s);
-    let J = /* @__PURE__ */ new Map(), F = vr(y, c, C, _, J, A), X = new Set(c.map((K) => K.route.id));
+    let C = await R("loader", m, c, y, S, g, P);
+    m.signal.aborted && Ot(m, S, s);
+    let J = /* @__PURE__ */ new Map(), F = wr(y, c, C, U, J, A), X = new Set(c.map((K) => K.route.id));
     return y.forEach((K) => {
       X.has(K.route.id) || (F.loaderData[K.route.id] = null);
     }), I({}, F, {
@@ -2072,16 +2067,16 @@ function Sa(e, t) {
       activeDeferreds: J.size > 0 ? Object.fromEntries(J.entries()) : null
     });
   }
-  async function S(m, y, g, P, A, x, _) {
-    let R = await mr(_ || pr, m, y, g, P, r, n, x);
-    return await Promise.all(R.map((N, c) => {
-      if (br(N)) {
+  async function R(m, y, g, P, A, x, U) {
+    let S = await gr(U || mr, m, y, g, P, r, n, x);
+    return await Promise.all(S.map((N, c) => {
+      if (Rr(N)) {
         let C = N.result;
-        throw yr(C, y, g[c].route.id, P, a, s.v7_relativeSplatPath);
+        throw vr(C, y, g[c].route.id, P, a, s.v7_relativeSplatPath);
       }
-      if (Se(N.result) && A)
+      if (Re(N.result) && A)
         throw N;
-      return gr(N);
+      return yr(N);
     }));
   }
   return {
@@ -2090,7 +2085,7 @@ function Sa(e, t) {
     queryRoute: u
   };
 }
-function Ra(e, t, r) {
+function Sa(e, t, r) {
   return I({}, t, {
     statusCode: ze(r) ? r.status : 500,
     errors: {
@@ -2118,8 +2113,8 @@ function mt(e, t, r, a, n, s, l, f) {
       }
   } else
     u = t, v = t[t.length - 1];
-  let b = rr(n || ".", tr(u, s), Ye(e.pathname, r) || e.pathname, f === "path");
-  return n == null && (b.search = e.search, b.hash = e.hash), (n == null || n === "" || n === ".") && v && v.route.index && !bt(b.search) && (b.search = b.search ? b.search.replace(/^\?/, "?index&") : "?index"), a && r !== "/" && (b.pathname = b.pathname === "/" ? r : Ne([r, b.pathname])), ue(b);
+  let b = ar(n || ".", rr(u, s), Ye(e.pathname, r) || e.pathname, f === "path");
+  return n == null && (b.search = e.search, b.hash = e.hash), (n == null || n === "" || n === ".") && v && v.route.index && !bt(b.search) && (b.search = b.search ? b.search.replace(/^\?/, "?index&") : "?index"), a && r !== "/" && (b.pathname = b.pathname === "/" ? r : He([r, b.pathname])), ue(b);
 }
 function It(e, t, r, a) {
   if (!a || !Da(a))
@@ -2138,12 +2133,12 @@ function It(e, t, r, a) {
     error: Y(400, {
       type: "invalid-body"
     })
-  }), s = a.formMethod || "get", l = e ? s.toUpperCase() : s.toLowerCase(), f = wr(r);
+  }), s = a.formMethod || "get", l = e ? s.toUpperCase() : s.toLowerCase(), f = br(r);
   if (a.body !== void 0) {
     if (a.formEncType === "text/plain") {
-      if (!oe(l))
+      if (!ie(l))
         return n();
-      let S = typeof a.body == "string" ? a.body : a.body instanceof FormData || a.body instanceof URLSearchParams ? (
+      let R = typeof a.body == "string" ? a.body : a.body instanceof FormData || a.body instanceof URLSearchParams ? (
         // https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#plain-text-form-data
         Array.from(a.body.entries()).reduce((m, y) => {
           let [g, P] = y;
@@ -2159,14 +2154,14 @@ function It(e, t, r, a) {
           formEncType: a.formEncType,
           formData: void 0,
           json: void 0,
-          text: S
+          text: R
         }
       };
     } else if (a.formEncType === "application/json") {
-      if (!oe(l))
+      if (!ie(l))
         return n();
       try {
-        let S = typeof a.body == "string" ? JSON.parse(a.body) : a.body;
+        let R = typeof a.body == "string" ? JSON.parse(a.body) : a.body;
         return {
           path: r,
           submission: {
@@ -2174,7 +2169,7 @@ function It(e, t, r, a) {
             formAction: f,
             formEncType: a.formEncType,
             formData: void 0,
-            json: S,
+            json: R,
             text: void 0
           }
         };
@@ -2207,18 +2202,18 @@ function It(e, t, r, a) {
     json: void 0,
     text: void 0
   };
-  if (oe(b.formMethod))
+  if (ie(b.formMethod))
     return {
       path: r,
       submission: b
     };
-  let p = ie(r);
+  let p = oe(r);
   return t && p.search && bt(p.search) && u.append("index", ""), p.search = "?" + u, {
     path: ue(p),
     submission: b
   };
 }
-function fr(e, t) {
+function cr(e, t) {
   let r = e;
   if (t) {
     let a = e.findIndex((n) => n.route.id === t);
@@ -2226,8 +2221,8 @@ function fr(e, t) {
   }
   return r;
 }
-function Nt(e, t, r, a, n, s, l, f, u, v, b, p, S, m, y, g) {
-  let P = g ? ee(g[1]) ? g[1].error : g[1].data : void 0, A = e.createURL(t.location), x = e.createURL(n), _ = g && ee(g[1]) ? g[0] : void 0, R = _ ? fr(r, _) : r, N = g ? g[1].statusCode : void 0, c = l && N && N >= 400, C = R.filter((F, X) => {
+function Nt(e, t, r, a, n, s, l, f, u, v, b, p, R, m, y, g) {
+  let P = g ? ee(g[1]) ? g[1].error : g[1].data : void 0, A = e.createURL(t.location), x = e.createURL(n), U = g && ee(g[1]) ? g[0] : void 0, S = U ? cr(r, U) : r, N = g ? g[1].statusCode : void 0, c = l && N && N >= 400, C = S.filter((F, X) => {
     let {
       route: K
     } = F;
@@ -2248,16 +2243,16 @@ function Nt(e, t, r, a, n, s, l, f, u, v, b, p, S, m, y, g) {
       nextParams: le.params
     }, a, {
       actionResult: P,
-      unstable_actionStatus: N,
+      actionStatus: N,
       defaultShouldRevalidate: c ? !1 : (
         // Forced revalidation due to submission, useRevalidator, or X-Remix-Revalidate
         f || A.pathname + A.search === x.pathname + x.search || // Search params affect all loaders
-        A.search !== x.search || cr(ne, le)
+        A.search !== x.search || hr(ne, le)
       )
     }));
   }), J = [];
   return p.forEach((F, X) => {
-    if (s || !r.some((je) => je.route.id === F.routeId) || b.has(X))
+    if (s || !r.some((Ce) => Ce.route.id === F.routeId) || b.has(X))
       return;
     let K = me(m, F.path, y);
     if (!K) {
@@ -2271,15 +2266,15 @@ function Nt(e, t, r, a, n, s, l, f, u, v, b, p, S, m, y, g) {
       });
       return;
     }
-    let ne = t.fetchers.get(X), le = Le(K, F.path), te = !1;
-    S.has(X) ? te = !1 : v.includes(X) ? te = !0 : ne && ne.state !== "idle" && ne.data === void 0 ? te = f : te = Ht(le, I({
+    let ne = t.fetchers.get(X), le = Me(K, F.path), te = !1;
+    R.has(X) ? te = !1 : v.includes(X) ? te = !0 : ne && ne.state !== "idle" && ne.data === void 0 ? te = f : te = Ht(le, I({
       currentUrl: A,
       currentParams: t.matches[t.matches.length - 1].params,
       nextUrl: x,
       nextParams: r[r.length - 1].params
     }, a, {
       actionResult: P,
-      unstable_actionStatus: N,
+      actionStatus: N,
       defaultShouldRevalidate: c ? !1 : f
     })), te && J.push({
       key: X,
@@ -2299,7 +2294,7 @@ function Ea(e, t, r) {
   ), n = e[r.route.id] === void 0;
   return a || n;
 }
-function cr(e, t) {
+function hr(e, t) {
   let r = e.route.path;
   return (
     // param change for this match, /users/123 -> /users/456
@@ -2324,22 +2319,22 @@ async function Pa(e, t, r, a, n, s, l, f) {
       path: t,
       matches: r,
       patch: (b, p) => {
-        f.aborted || hr(b, p, a, n, s);
+        f.aborted || pr(b, p, a, n, s);
       }
     }), l.set(u, v)), v && Ma(v) && await v;
   } finally {
     l.delete(u);
   }
 }
-function hr(e, t, r, a, n) {
+function pr(e, t, r, a, n) {
   if (e) {
     var s;
     let l = a[e];
     O(l, "No route found to patch children into: routeId = " + e);
-    let f = Me(t, n, [e, "patch", String(((s = l.children) == null ? void 0 : s.length) || "0")], a);
+    let f = je(t, n, [e, "patch", String(((s = l.children) == null ? void 0 : s.length) || "0")], a);
     l.children ? l.children.push(...f) : l.children = f;
   } else {
-    let l = Me(t, n, ["patch", String(r.length || "0")], a);
+    let l = je(t, n, ["patch", String(r.length || "0")], a);
     r.push(...l);
   }
 }
@@ -2356,23 +2351,23 @@ async function zt(e, t, r) {
     let u = n[l] !== void 0 && // This property isn't static since it should always be updated based
     // on the route updates
     l !== "hasErrorBoundary";
-    de(!u, 'Route "' + n.id + '" has a static property "' + l + '" defined but its lazy function is also returning a value for this property. ' + ('The lazy route property "' + l + '" will be ignored.')), !u && !kr.has(l) && (s[l] = a[l]);
+    de(!u, 'Route "' + n.id + '" has a static property "' + l + '" defined but its lazy function is also returning a value for this property. ' + ('The lazy route property "' + l + '" will be ignored.')), !u && !Vr.has(l) && (s[l] = a[l]);
   }
   Object.assign(n, s), Object.assign(n, I({}, t(n), {
     lazy: void 0
   }));
 }
-function pr(e) {
+function mr(e) {
   return Promise.all(e.matches.map((t) => t.resolve()));
 }
-async function mr(e, t, r, a, n, s, l, f) {
-  let u = a.reduce((p, S) => p.add(S.route.id), /* @__PURE__ */ new Set()), v = /* @__PURE__ */ new Set(), b = await e({
+async function gr(e, t, r, a, n, s, l, f) {
+  let u = a.reduce((p, R) => p.add(R.route.id), /* @__PURE__ */ new Set()), v = /* @__PURE__ */ new Set(), b = await e({
     matches: n.map((p) => {
-      let S = u.has(p.route.id);
+      let R = u.has(p.route.id);
       return I({}, p, {
-        shouldLoad: S,
-        resolve: (y) => (v.add(p.route.id), S ? xa(t, r, p, s, l, y, f) : Promise.resolve({
-          type: z.data,
+        shouldLoad: R,
+        resolve: (y) => (v.add(p.route.id), R ? xa(t, r, p, s, l, y, f) : Promise.resolve({
+          type: H.data,
           result: void 0
         }))
       });
@@ -2381,11 +2376,11 @@ async function mr(e, t, r, a, n, s, l, f) {
     params: n[0].params,
     context: f
   });
-  return n.forEach((p) => O(v.has(p.route.id), '`match.resolve()` was not called for route id "' + p.route.id + '". You must call `match.resolve()` on every match passed to `dataStrategy` to ensure all routes are properly loaded.')), b.filter((p, S) => u.has(n[S].route.id));
+  return n.forEach((p) => O(v.has(p.route.id), '`match.resolve()` was not called for route id "' + p.route.id + '". You must call `match.resolve()` on every match passed to `dataStrategy` to ensure all routes are properly loaded.')), b.filter((p, R) => u.has(n[R].route.id));
 }
 async function xa(e, t, r, a, n, s, l) {
   let f, u, v = (b) => {
-    let p, S = new Promise((g, P) => p = P);
+    let p, R = new Promise((g, P) => p = P);
     u = () => p(), t.signal.addEventListener("abort", u);
     let m = (g) => typeof b != "function" ? Promise.reject(new Error("You cannot call the handler for a route which defines a boolean " + ('"' + e + '" [routeId: ' + r.route.id + "]"))) : b({
       request: t,
@@ -2404,13 +2399,13 @@ async function xa(e, t, r, a, n, s, l) {
           result: g
         };
       }
-    })(), Promise.race([y, S]);
+    })(), Promise.race([y, R]);
   };
   try {
     let b = r.route[e];
     if (r.route.lazy)
       if (b) {
-        let p, [S] = await Promise.all([
+        let p, [R] = await Promise.all([
           // If the handler throws, don't let it immediately bubble out,
           // since we need to let the lazy() execution finish so we know if this
           // route has a boundary that can handle the error
@@ -2421,33 +2416,33 @@ async function xa(e, t, r, a, n, s, l) {
         ]);
         if (p !== void 0)
           throw p;
-        f = S;
+        f = R;
       } else if (await zt(r.route, n, a), b = r.route[e], b)
         f = await v(b);
       else if (e === "action") {
-        let p = new URL(t.url), S = p.pathname + p.search;
+        let p = new URL(t.url), R = p.pathname + p.search;
         throw Y(405, {
           method: t.method,
-          pathname: S,
+          pathname: R,
           routeId: r.route.id
         });
       } else
         return {
-          type: z.data,
+          type: H.data,
           result: void 0
         };
     else if (b)
       f = await v(b);
     else {
-      let p = new URL(t.url), S = p.pathname + p.search;
+      let p = new URL(t.url), R = p.pathname + p.search;
       throw Y(404, {
-        pathname: S
+        pathname: R
       });
     }
     O(f.result !== void 0, "You defined " + (e === "action" ? "an action" : "a loader") + " for route " + ('"' + r.route.id + "\" but didn't return anything from your `" + e + "` ") + "function. Please return a value or `null`.");
   } catch (b) {
     return {
-      type: z.error,
+      type: H.error,
       result: b
     };
   } finally {
@@ -2455,57 +2450,57 @@ async function xa(e, t, r, a, n, s, l) {
   }
   return f;
 }
-async function gr(e) {
+async function yr(e) {
   let {
     result: t,
     type: r,
     status: a
   } = e;
-  if (Se(t)) {
+  if (Re(t)) {
     let l;
     try {
       let f = t.headers.get("Content-Type");
       f && /\bapplication\/json\b/.test(f) ? t.body == null ? l = null : l = await t.json() : l = await t.text();
     } catch (f) {
       return {
-        type: z.error,
+        type: H.error,
         error: f
       };
     }
-    return r === z.error ? {
-      type: z.error,
+    return r === H.error ? {
+      type: H.error,
       error: new vt(t.status, t.statusText, l),
       statusCode: t.status,
       headers: t.headers
     } : {
-      type: z.data,
+      type: H.data,
       data: l,
       statusCode: t.status,
       headers: t.headers
     };
   }
-  if (r === z.error)
+  if (r === H.error)
     return {
-      type: z.error,
+      type: H.error,
       error: t,
       statusCode: ze(t) ? t.status : a
     };
   if (Sr(t)) {
     var n, s;
     return {
-      type: z.deferred,
+      type: H.deferred,
       deferredData: t,
       statusCode: (n = t.init) == null ? void 0 : n.status,
       headers: ((s = t.init) == null ? void 0 : s.headers) && new Headers(t.init.headers)
     };
   }
   return {
-    type: z.data,
+    type: H.data,
     data: t,
     statusCode: a
   };
 }
-function yr(e, t, r, a, n, s) {
+function vr(e, t, r, a, n, s) {
   let l = e.headers.get("Location");
   if (O(l, "Redirects returned/thrown from loaders/actions must have a Location header"), !wt.test(l)) {
     let f = a.slice(0, a.findIndex((u) => u.route.id === r) + 1);
@@ -2521,11 +2516,11 @@ function Bt(e, t, r) {
   }
   return e;
 }
-function Oe(e, t, r, a) {
-  let n = e.createURL(wr(t)).toString(), s = {
+function Ie(e, t, r, a) {
+  let n = e.createURL(br(t)).toString(), s = {
     signal: r
   };
-  if (a && oe(a.formMethod)) {
+  if (a && ie(a.formMethod)) {
     let {
       formMethod: l,
       formEncType: f
@@ -2548,21 +2543,21 @@ function Wt(e) {
     t.append(r, a);
   return t;
 }
-function vr(e, t, r, a, n, s) {
+function wr(e, t, r, a, n, s) {
   let l = {}, f = null, u, v = !1, b = {}, p = a && ee(a[1]) ? a[1].error : void 0;
-  return r.forEach((S, m) => {
+  return r.forEach((R, m) => {
     let y = t[m].route.id;
-    if (O(!De(S), "Cannot handle redirect results in processLoaderData"), ee(S)) {
-      let g = S.error;
+    if (O(!De(R), "Cannot handle redirect results in processLoaderData"), ee(R)) {
+      let g = R.error;
       if (p !== void 0 && (g = p, p = void 0), f = f || {}, s)
         f[y] = g;
       else {
-        let P = He(e, y);
+        let P = Le(e, y);
         f[P.route.id] == null && (f[P.route.id] = g);
       }
-      l[y] = void 0, v || (v = !0, u = ze(S.error) ? S.error.status : 500), S.headers && (b[y] = S.headers);
+      l[y] = void 0, v || (v = !0, u = ze(R.error) ? R.error.status : 500), R.headers && (b[y] = R.headers);
     } else
-      Re(S) ? (n.set(y, S.deferredData), l[y] = S.deferredData.data, S.statusCode != null && S.statusCode !== 200 && !v && (u = S.statusCode), S.headers && (b[y] = S.headers)) : (l[y] = S.data, S.statusCode && S.statusCode !== 200 && !v && (u = S.statusCode), S.headers && (b[y] = S.headers));
+      Se(R) ? (n.set(y, R.deferredData), l[y] = R.deferredData.data, R.statusCode != null && R.statusCode !== 200 && !v && (u = R.statusCode), R.headers && (b[y] = R.headers)) : (l[y] = R.data, R.statusCode && R.statusCode !== 200 && !v && (u = R.statusCode), R.headers && (b[y] = R.headers));
   }), p !== void 0 && a && (f = {
     [a[0]]: p
   }, l[a[0]] = void 0), {
@@ -2576,7 +2571,7 @@ function Kt(e, t, r, a, n, s, l, f) {
   let {
     loaderData: u,
     errors: v
-  } = vr(
+  } = wr(
     t,
     r,
     a,
@@ -2588,20 +2583,20 @@ function Kt(e, t, r, a, n, s, l, f) {
   for (let b = 0; b < s.length; b++) {
     let {
       key: p,
-      match: S,
+      match: R,
       controller: m
     } = s[b];
     O(l !== void 0 && l[b] !== void 0, "Did not find corresponding fetcher result");
     let y = l[b];
     if (!(m && m.signal.aborted))
       if (ee(y)) {
-        let g = He(e.matches, S == null ? void 0 : S.route.id);
+        let g = Le(e.matches, R == null ? void 0 : R.route.id);
         v && v[g.route.id] || (v = I({}, v, {
           [g.route.id]: y.error
         })), e.fetchers.delete(p);
       } else if (De(y))
         O(!1, "Unhandled fetcher revalidation redirect");
-      else if (Re(y))
+      else if (Se(y))
         O(!1, "Unhandled fetcher deferred data");
       else {
         let g = be(y.data);
@@ -2632,10 +2627,10 @@ function kt(e) {
     }
   } : {};
 }
-function He(e, t) {
+function Le(e, t) {
   return (t ? e.slice(0, e.findIndex((a) => a.route.id === t) + 1) : [...e]).reverse().find((a) => a.route.hasErrorBoundary === !0) || e[0];
 }
-function ot(e) {
+function it(e) {
   let t = e.length === 1 ? e[0] : e.find((r) => r.index || !r.path || r.path === "/") || {
     id: "__shim-error-route__"
   };
@@ -2657,7 +2652,8 @@ function Y(e, t) {
     type: s,
     message: l
   } = t === void 0 ? {} : t, f = "Unknown Server Error", u = "Unknown @remix-run/router error";
-  return e === 400 ? (f = "Bad Request", s === "route-discovery" ? u = 'Unable to match URL "' + r + '" - the `children()` function for ' + ("route `" + a + "` threw the following error:\n" + l) : n && r && a ? u = "You made a " + n + ' request to "' + r + '" but ' + ('did not provide a `loader` for route "' + a + '", ') + "so there is no way to handle the request." : s === "defer-action" ? u = "defer() is not supported in actions" : s === "invalid-body" && (u = "Unable to encode submission body")) : e === 403 ? (f = "Forbidden", u = 'Route "' + a + '" does not match URL "' + r + '"') : e === 404 ? (f = "Not Found", u = 'No route matches URL "' + r + '"') : e === 405 && (f = "Method Not Allowed", n && r && a ? u = "You made a " + n.toUpperCase() + ' request to "' + r + '" but ' + ('did not provide an `action` for route "' + a + '", ') + "so there is no way to handle the request." : n && (u = 'Invalid request method "' + n.toUpperCase() + '"')), new vt(e || 500, f, new Error(u), !0);
+  return e === 400 ? (f = "Bad Request", s === "route-discovery" ? u = 'Unable to match URL "' + r + '" - the `unstable_patchRoutesOnMiss()` ' + (`function threw the following error:
+` + l) : n && r && a ? u = "You made a " + n + ' request to "' + r + '" but ' + ('did not provide a `loader` for route "' + a + '", ') + "so there is no way to handle the request." : s === "defer-action" ? u = "defer() is not supported in actions" : s === "invalid-body" && (u = "Unable to encode submission body")) : e === 403 ? (f = "Forbidden", u = 'Route "' + a + '" does not match URL "' + r + '"') : e === 404 ? (f = "Not Found", u = 'No route matches URL "' + r + '"') : e === 405 && (f = "Method Not Allowed", n && r && a ? u = "You made a " + n.toUpperCase() + ' request to "' + r + '" but ' + ('did not provide an `action` for route "' + a + '", ') + "so there is no way to handle the request." : n && (u = 'Invalid request method "' + n.toUpperCase() + '"')), new vt(e || 500, f, new Error(u), !0);
 }
 function Vt(e) {
   for (let t = e.length - 1; t >= 0; t--) {
@@ -2669,8 +2665,8 @@ function Vt(e) {
       };
   }
 }
-function wr(e) {
-  let t = typeof e == "string" ? ie(e) : e;
+function br(e) {
+  let t = typeof e == "string" ? oe(e) : e;
   return ue(I({}, t, {
     hash: ""
   }));
@@ -2682,29 +2678,29 @@ function Ma(e) {
   return typeof e == "object" && e != null && "then" in e;
 }
 function ja(e) {
-  return e != null && typeof e == "object" && "type" in e && "result" in e && (e.type === z.data || e.type === z.error);
+  return e != null && typeof e == "object" && "type" in e && "result" in e && (e.type === H.data || e.type === H.error);
 }
-function br(e) {
-  return Se(e.result) && va.has(e.result.status);
+function Rr(e) {
+  return Re(e.result) && va.has(e.result.status);
 }
-function Re(e) {
-  return e.type === z.deferred;
+function Se(e) {
+  return e.type === H.deferred;
 }
 function ee(e) {
-  return e.type === z.error;
+  return e.type === H.error;
 }
 function De(e) {
-  return (e && e.type) === z.redirect;
+  return (e && e.type) === H.redirect;
 }
 function Sr(e) {
   let t = e;
   return t && typeof t == "object" && typeof t.data == "object" && typeof t.subscribe == "function" && typeof t.cancel == "function" && typeof t.resolveData == "function";
 }
-function Se(e) {
+function Re(e) {
   return e != null && typeof e.status == "number" && typeof e.statusText == "string" && typeof e.headers == "object" && typeof e.body < "u";
 }
 function Ca(e) {
-  if (!Se(e))
+  if (!Re(e))
     return !1;
   let t = e.status, r = e.headers.get("Location");
   return t >= 300 && t <= 399 && r != null;
@@ -2712,7 +2708,7 @@ function Ca(e) {
 function yt(e) {
   return ya.has(e.toLowerCase());
 }
-function oe(e) {
+function ie(e) {
   return ma.has(e.toLowerCase());
 }
 async function Yt(e, t, r, a, n, s) {
@@ -2720,31 +2716,31 @@ async function Yt(e, t, r, a, n, s) {
     let f = r[l], u = t[l];
     if (!u)
       continue;
-    let v = e.find((p) => p.route.id === u.route.id), b = v != null && !cr(v, u) && (s && s[u.route.id]) !== void 0;
-    if (Re(f) && (n || b)) {
+    let v = e.find((p) => p.route.id === u.route.id), b = v != null && !hr(v, u) && (s && s[u.route.id]) !== void 0;
+    if (Se(f) && (n || b)) {
       let p = a[l];
-      O(p, "Expected an AbortSignal for revalidating fetcher deferred result"), await Rr(f, p, n).then((S) => {
-        S && (r[l] = S || r[l]);
+      O(p, "Expected an AbortSignal for revalidating fetcher deferred result"), await Dr(f, p, n).then((R) => {
+        R && (r[l] = R || r[l]);
       });
     }
   }
 }
-async function Rr(e, t, r) {
+async function Dr(e, t, r) {
   if (r === void 0 && (r = !1), !await e.deferredData.resolveData(t)) {
     if (r)
       try {
         return {
-          type: z.data,
+          type: H.data,
           data: e.deferredData.unwrappedData
         };
       } catch (n) {
         return {
-          type: z.error,
+          type: H.error,
           error: n
         };
       }
     return {
-      type: z.data,
+      type: H.data,
       data: e.deferredData.data
     };
   }
@@ -2752,11 +2748,11 @@ async function Rr(e, t, r) {
 function bt(e) {
   return new URLSearchParams(e).getAll("index").some((t) => t === "");
 }
-function Le(e, t) {
-  let r = typeof t == "string" ? ie(t).search : t.search;
+function Me(e, t) {
+  let r = typeof t == "string" ? oe(t).search : t.search;
   if (e[e.length - 1].route.index && bt(r || ""))
     return e[e.length - 1];
-  let a = er(e);
+  let a = tr(e);
   return a[a.length - 1];
 }
 function Jt(e) {
@@ -2878,7 +2874,7 @@ function be(e) {
 }
 function _a(e, t) {
   try {
-    let r = e.sessionStorage.getItem(dr);
+    let r = e.sessionStorage.getItem(ur);
     if (r) {
       let a = JSON.parse(r);
       for (let [n, s] of Object.entries(a || {}))
@@ -2893,7 +2889,7 @@ function Ua(e, t) {
     for (let [a, n] of t)
       r[a] = [...n];
     try {
-      e.sessionStorage.setItem(dr, JSON.stringify(r));
+      e.sessionStorage.setItem(ur, JSON.stringify(r));
     } catch (a) {
       de(!1, "Failed to save applied view transitions in sessionStorage (" + a + ").");
     }
@@ -2905,69 +2901,71 @@ const Aa = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get Action() {
     return V;
   },
-  IDLE_BLOCKER: Ie,
-  IDLE_FETCHER: lr,
+  IDLE_BLOCKER: Ne,
+  IDLE_FETCHER: sr,
   IDLE_NAVIGATION: nt,
-  UNSAFE_DEFERRED_SYMBOL: ur,
-  UNSAFE_DeferredData: nr,
+  UNSAFE_DEFERRED_SYMBOL: fr,
+  UNSAFE_DeferredData: ir,
   UNSAFE_ErrorResponseImpl: vt,
   UNSAFE_convertRouteMatchToUiMatch: Xt,
-  UNSAFE_convertRoutesToDataRoutes: Me,
-  UNSAFE_getResolveToMatches: tr,
+  UNSAFE_convertRoutesToDataRoutes: je,
+  UNSAFE_decodePath: qt,
+  UNSAFE_getResolveToMatches: rr,
   UNSAFE_invariant: O,
   UNSAFE_warning: de,
-  createBrowserHistory: Wr,
-  createHashHistory: Kr,
-  createMemoryHistory: Br,
+  createBrowserHistory: Kr,
+  createHashHistory: $r,
+  createMemoryHistory: Wr,
   createPath: ue,
   createRouter: ba,
-  createStaticHandler: Sa,
+  createStaticHandler: Ra,
   defer: ha,
-  generatePath: aa,
-  getStaticContextFromError: Ra,
+  generatePath: na,
+  getStaticContextFromError: Sa,
   getToPathname: la,
   isDeferredData: Sr,
   isRouteErrorResponse: ze,
-  joinPaths: Ne,
+  joinPaths: He,
   json: ua,
   matchPath: ht,
   matchRoutes: me,
-  normalizePathname: ar,
-  parsePath: ie,
+  normalizePathname: nr,
+  parsePath: oe,
   redirect: or,
   redirectDocument: pa,
-  resolvePath: qt,
-  resolveTo: rr,
+  resolvePath: er,
+  resolveTo: ar,
   stripBasename: Ye
 }, Symbol.toStringTag, { value: "Module" }));
 export {
   V as A,
   vt as E,
-  Ie as I,
-  O as a,
-  rr as b,
-  me as c,
-  Xt as d,
-  Br as e,
-  pt as f,
-  tr as g,
-  ba as h,
+  Ne as I,
+  or as a,
+  O as b,
+  ar as c,
+  me as d,
+  qt as e,
+  Xt as f,
+  rr as g,
+  Wr as h,
   ze as i,
-  Ne as j,
-  ue as k,
-  ha as l,
+  He as j,
+  pt as k,
+  ba as l,
   ht as m,
-  aa as n,
-  ua as o,
-  ie as p,
-  or as q,
+  ue as n,
+  ha as o,
+  oe as p,
+  na as q,
   Aa as r,
   Ye as s,
-  pa as t,
-  qt as u,
-  Wr as v,
+  ua as t,
+  pa as u,
+  er as v,
   de as w,
   Kr as x,
-  lr as y
+  $r as y,
+  sr as z
 };
-//# sourceMappingURL=router-CBw2vqJE.js.map
+//# sourceMappingURL=router-BiRCp01d.js.map