@tanstack/react-router 0.0.1-beta.53 → 0.0.1-beta.55

package/build/umd/index.development.js

@@ -59,10 +59,56 @@
       throw new Error(value);
   }
 
-  function n(n){for(var r=arguments.length,t=Array(r>1?r-1:0),e=1;e<r;e++)t[e-1]=arguments[e];{var i=Y[n],o=i?"function"==typeof i?i.apply(null,t):i:"unknown error nr: "+n;throw Error("[Immer] "+o)}}function r(n){return !!n&&!!n[Q]}function t(n){var r;return !!n&&(function(n){if(!n||"object"!=typeof n)return !1;var r=Object.getPrototypeOf(n);if(null===r)return !0;var t=Object.hasOwnProperty.call(r,"constructor")&&r.constructor;return t===Object||"function"==typeof t&&Function.toString.call(t)===Z}(n)||Array.isArray(n)||!!n[L]||!!(null===(r=n.constructor)||void 0===r?void 0:r[L])||s(n)||v(n))}function i(n,r,t){void 0===t&&(t=!1),0===o(n)?(t?Object.keys:nn)(n).forEach((function(e){t&&"symbol"==typeof e||r(e,n[e],n);})):n.forEach((function(t,e){return r(e,t,n)}));}function o(n){var r=n[Q];return r?r.i>3?r.i-4:r.i:Array.isArray(n)?1:s(n)?2:v(n)?3:0}function u(n,r){return 2===o(n)?n.has(r):Object.prototype.hasOwnProperty.call(n,r)}function a(n,r){return 2===o(n)?n.get(r):n[r]}function f(n,r,t){var e=o(n);2===e?n.set(r,t):3===e?(n.delete(r),n.add(t)):n[r]=t;}function c(n,r){return n===r?0!==n||1/n==1/r:n!=n&&r!=r}function s(n){return X&&n instanceof Map}function v(n){return q&&n instanceof Set}function p(n){return n.o||n.t}function l(n){if(Array.isArray(n))return Array.prototype.slice.call(n);var r=rn(n);delete r[Q];for(var t=nn(r),e=0;e<t.length;e++){var i=t[e],o=r[i];!1===o.writable&&(o.writable=!0,o.configurable=!0),(o.get||o.set)&&(r[i]={configurable:!0,writable:!0,enumerable:o.enumerable,value:n[i]});}return Object.create(Object.getPrototypeOf(n),r)}function d(n,e){return void 0===e&&(e=!1),y(n)||r(n)||!t(n)?n:(o(n)>1&&(n.set=n.add=n.clear=n.delete=h),Object.freeze(n),e&&i(n,(function(n,r){return d(r,!0)}),!0),n)}function h(){n(2);}function y(n){return null==n||"object"!=typeof n||Object.isFrozen(n)}function b(r){var t=tn[r];return t||n(18,r),t}function _(){return U||n(0),U}function j(n,r){r&&(b("Patches"),n.u=[],n.s=[],n.v=r);}function O(n){g(n),n.p.forEach(S),n.p=null;}function g(n){n===U&&(U=n.l);}function w(n){return U={p:[],l:U,h:n,m:!0,_:0}}function S(n){var r=n[Q];0===r.i||1===r.i?r.j():r.O=!0;}function P(r,e){e._=e.p.length;var i=e.p[0],o=void 0!==r&&r!==i;return e.h.g||b("ES5").S(e,r,o),o?(i[Q].P&&(O(e),n(4)),t(r)&&(r=M(e,r),e.l||x(e,r)),e.u&&b("Patches").M(i[Q].t,r,e.u,e.s)):r=M(e,i,[]),O(e),e.u&&e.v(e.u,e.s),r!==H?r:void 0}function M(n,r,t){if(y(r))return r;var e=r[Q];if(!e)return i(r,(function(i,o){return A(n,e,r,i,o,t)}),!0),r;if(e.A!==n)return r;if(!e.P)return x(n,e.t,!0),e.t;if(!e.I){e.I=!0,e.A._--;var o=4===e.i||5===e.i?e.o=l(e.k):e.o;i(3===e.i?new Set(o):o,(function(r,i){return A(n,e,o,r,i,t)})),x(n,o,!1),t&&n.u&&b("Patches").R(e,t,n.u,n.s);}return e.o}function A(e,i,o,a,c,s){if(c===o&&n(5),r(c)){var v=M(e,c,s&&i&&3!==i.i&&!u(i.D,a)?s.concat(a):void 0);if(f(o,a,v),!r(v))return;e.m=!1;}if(t(c)&&!y(c)){if(!e.h.F&&e._<1)return;M(e,c),i&&i.A.l||x(e,c);}}function x(n,r,t){void 0===t&&(t=!1),n.h.F&&n.m&&d(r,t);}function z(n,r){var t=n[Q];return (t?p(t):n)[r]}function I(n,r){if(r in n)for(var t=Object.getPrototypeOf(n);t;){var e=Object.getOwnPropertyDescriptor(t,r);if(e)return e;t=Object.getPrototypeOf(t);}}function k(n){n.P||(n.P=!0,n.l&&k(n.l));}function E(n){n.o||(n.o=l(n.t));}function R(n,r,t){var e=s(r)?b("MapSet").N(r,t):v(r)?b("MapSet").T(r,t):n.g?function(n,r){var t=Array.isArray(n),e={i:t?1:0,A:r?r.A:_(),P:!1,I:!1,D:{},l:r,t:n,k:null,o:null,j:null,C:!1},i=e,o=en;t&&(i=[e],o=on);var u=Proxy.revocable(i,o),a=u.revoke,f=u.proxy;return e.k=f,e.j=a,f}(r,t):b("ES5").J(r,t);return (t?t.A:_()).p.push(e),e}function D(e){return r(e)||n(22,e),function n(r){if(!t(r))return r;var e,u=r[Q],c=o(r);if(u){if(!u.P&&(u.i<4||!b("ES5").K(u)))return u.t;u.I=!0,e=F(r,c),u.I=!1;}else e=F(r,c);return i(e,(function(r,t){u&&a(u.t,r)===t||f(e,r,n(t));})),3===c?new Set(e):e}(e)}function F(n,r){switch(r){case 2:return new Map(n);case 3:return Array.from(n)}return l(n)}var G,U,W="undefined"!=typeof Symbol&&"symbol"==typeof Symbol("x"),X="undefined"!=typeof Map,q="undefined"!=typeof Set,B="undefined"!=typeof Proxy&&void 0!==Proxy.revocable&&"undefined"!=typeof Reflect,H=W?Symbol.for("immer-nothing"):((G={})["immer-nothing"]=!0,G),L=W?Symbol.for("immer-draftable"):"__$immer_draftable",Q=W?Symbol.for("immer-state"):"__$immer_state",Y={0:"Illegal state",1:"Immer drafts cannot have computed properties",2:"This object has been frozen and should not be mutated",3:function(n){return "Cannot use a proxy that has been revoked. Did you pass an object from inside an immer function to an async process? "+n},4:"An immer producer returned a new value *and* modified its draft. Either return a new value *or* modify the draft.",5:"Immer forbids circular references",6:"The first or second argument to `produce` must be a function",7:"The third argument to `produce` must be a function or undefined",8:"First argument to `createDraft` must be a plain object, an array, or an immerable object",9:"First argument to `finishDraft` must be a draft returned by `createDraft`",10:"The given draft is already finalized",11:"Object.defineProperty() cannot be used on an Immer draft",12:"Object.setPrototypeOf() cannot be used on an Immer draft",13:"Immer only supports deleting array indices",14:"Immer only supports setting array indices and the 'length' property",15:function(n){return "Cannot apply patch, path doesn't resolve: "+n},16:'Sets cannot have "replace" patches.',17:function(n){return "Unsupported patch operation: "+n},18:function(n){return "The plugin for '"+n+"' has not been loaded into Immer. To enable the plugin, import and call `enable"+n+"()` when initializing your application."},20:"Cannot use proxies if Proxy, Proxy.revocable or Reflect are not available",21:function(n){return "produce can only be called on things that are draftable: plain objects, arrays, Map, Set or classes that are marked with '[immerable]: true'. Got '"+n+"'"},22:function(n){return "'current' expects a draft, got: "+n},23:function(n){return "'original' expects a draft, got: "+n},24:"Patching reserved attributes like __proto__, prototype and constructor is not allowed"},Z=""+Object.prototype.constructor,nn="undefined"!=typeof Reflect&&Reflect.ownKeys?Reflect.ownKeys:void 0!==Object.getOwnPropertySymbols?function(n){return Object.getOwnPropertyNames(n).concat(Object.getOwnPropertySymbols(n))}:Object.getOwnPropertyNames,rn=Object.getOwnPropertyDescriptors||function(n){var r={};return nn(n).forEach((function(t){r[t]=Object.getOwnPropertyDescriptor(n,t);})),r},tn={},en={get:function(n,r){if(r===Q)return n;var e=p(n);if(!u(e,r))return function(n,r,t){var e,i=I(r,t);return i?"value"in i?i.value:null===(e=i.get)||void 0===e?void 0:e.call(n.k):void 0}(n,e,r);var i=e[r];return n.I||!t(i)?i:i===z(n.t,r)?(E(n),n.o[r]=R(n.A.h,i,n)):i},has:function(n,r){return r in p(n)},ownKeys:function(n){return Reflect.ownKeys(p(n))},set:function(n,r,t){var e=I(p(n),r);if(null==e?void 0:e.set)return e.set.call(n.k,t),!0;if(!n.P){var i=z(p(n),r),o=null==i?void 0:i[Q];if(o&&o.t===t)return n.o[r]=t,n.D[r]=!1,!0;if(c(t,i)&&(void 0!==t||u(n.t,r)))return !0;E(n),k(n);}return n.o[r]===t&&"number"!=typeof t&&(void 0!==t||r in n.o)||(n.o[r]=t,n.D[r]=!0,!0)},deleteProperty:function(n,r){return void 0!==z(n.t,r)||r in n.t?(n.D[r]=!1,E(n),k(n)):delete n.D[r],n.o&&delete n.o[r],!0},getOwnPropertyDescriptor:function(n,r){var t=p(n),e=Reflect.getOwnPropertyDescriptor(t,r);return e?{writable:!0,configurable:1!==n.i||"length"!==r,enumerable:e.enumerable,value:t[r]}:e},defineProperty:function(){n(11);},getPrototypeOf:function(n){return Object.getPrototypeOf(n.t)},setPrototypeOf:function(){n(12);}},on={};i(en,(function(n,r){on[n]=function(){return arguments[0]=arguments[0][0],r.apply(this,arguments)};})),on.deleteProperty=function(r,t){return isNaN(parseInt(t))&&n(13),on.set.call(this,r,t,void 0)},on.set=function(r,t,e){return "length"!==t&&isNaN(parseInt(t))&&n(14),en.set.call(this,r[0],t,e,r[0])};var un=function(){function e(r){var e=this;this.g=B,this.F=!0,this.produce=function(r,i,o){if("function"==typeof r&&"function"!=typeof i){var u=i;i=r;var a=e;return function(n){var r=this;void 0===n&&(n=u);for(var t=arguments.length,e=Array(t>1?t-1:0),o=1;o<t;o++)e[o-1]=arguments[o];return a.produce(n,(function(n){var t;return (t=i).call.apply(t,[r,n].concat(e))}))}}var f;if("function"!=typeof i&&n(6),void 0!==o&&"function"!=typeof o&&n(7),t(r)){var c=w(e),s=R(e,r,void 0),v=!0;try{f=i(s),v=!1;}finally{v?O(c):g(c);}return "undefined"!=typeof Promise&&f instanceof Promise?f.then((function(n){return j(c,o),P(n,c)}),(function(n){throw O(c),n})):(j(c,o),P(f,c))}if(!r||"object"!=typeof r){if(void 0===(f=i(r))&&(f=r),f===H&&(f=void 0),e.F&&d(f,!0),o){var p=[],l=[];b("Patches").M(r,f,p,l),o(p,l);}return f}n(21,r);},this.produceWithPatches=function(n,r){if("function"==typeof n)return function(r){for(var t=arguments.length,i=Array(t>1?t-1:0),o=1;o<t;o++)i[o-1]=arguments[o];return e.produceWithPatches(r,(function(r){return n.apply(void 0,[r].concat(i))}))};var t,i,o=e.produce(n,r,(function(n,r){t=n,i=r;}));return "undefined"!=typeof Promise&&o instanceof Promise?o.then((function(n){return [n,t,i]})):[o,t,i]},"boolean"==typeof(null==r?void 0:r.useProxies)&&this.setUseProxies(r.useProxies),"boolean"==typeof(null==r?void 0:r.autoFreeze)&&this.setAutoFreeze(r.autoFreeze);}var i=e.prototype;return i.createDraft=function(e){t(e)||n(8),r(e)&&(e=D(e));var i=w(this),o=R(this,e,void 0);return o[Q].C=!0,g(i),o},i.finishDraft=function(r,t){var e=r&&r[Q];(e&&e.C||n(9),e.I&&n(10));var i=e.A;return j(i,t),P(void 0,i)},i.setAutoFreeze=function(n){this.F=n;},i.setUseProxies=function(r){r&&!B&&n(20),this.g=r;},i.applyPatches=function(n,t){var e;for(e=t.length-1;e>=0;e--){var i=t[e];if(0===i.path.length&&"replace"===i.op){n=i.value;break}}e>-1&&(t=t.slice(e+1));var o=b("Patches").$;return r(n)?o(n,t):this.produce(n,(function(n){return o(n,t)}))},e}(),an=new un,fn=an.produce;an.produceWithPatches.bind(an);var sn=an.setAutoFreeze.bind(an);an.setUseProxies.bind(an);an.applyPatches.bind(an);an.createDraft.bind(an);an.finishDraft.bind(an);
+  /**
+   * store
+   *
+   * Copyright (c) TanStack
+   *
+   * This source code is licensed under the MIT license found in the
+   * LICENSE.md file in the root directory of this source tree.
+   *
+   * @license MIT
+   */
+  class Store {
+    listeners = new Set();
+    batching = false;
+    queue = [];
+    constructor(initialState, options) {
+      this.state = initialState;
+      this.options = options;
+    }
+    subscribe = listener => {
+      this.listeners.add(listener);
+      const unsub = this.options?.onSubscribe?.(listener, this);
+      return () => {
+        this.listeners.delete(listener);
+        unsub?.();
+      };
+    };
+    setState = updater => {
+      const previous = this.state;
+      this.state = this.options?.updateFn ? this.options.updateFn(previous)(updater) : updater(previous);
+      this.queue.push(() => {
+        this.listeners.forEach(listener => listener(this.state, previous));
+        this.options?.onUpdate?.(this.state, previous);
+      });
+      this.#flush();
+    };
+    #flush = () => {
+      if (this.batching) return;
+      this.queue.forEach(cb => cb());
+      this.queue = [];
+    };
+    batch = cb => {
+      this.batching = true;
+      cb();
+      this.batching = false;
+      this.#flush();
+    };
+  }
 
   /**
-   * router-core
+   * router
    *
    * Copyright (c) TanStack
    *
@@ -239,6 +285,66 @@
     }, {});
   }
 
+  /**
+   * This function returns `a` if `b` is deeply equal.
+   * If not, it will replace any deeply equal children of `b` with those of `a`.
+   * This can be used for structural sharing between immutable JSON values for example.
+   * Do not use this with signals
+   */
+  function replaceEqualDeep(prev, _next) {
+    if (prev === _next) {
+      return prev;
+    }
+    const next = _next;
+    const array = Array.isArray(prev) && Array.isArray(next);
+    if (array || isPlainObject(prev) && isPlainObject(next)) {
+      const prevSize = array ? prev.length : Object.keys(prev).length;
+      const nextItems = array ? next : Object.keys(next);
+      const nextSize = nextItems.length;
+      const copy = array ? [] : {};
+      let equalItems = 0;
+      for (let i = 0; i < nextSize; i++) {
+        const key = array ? i : nextItems[i];
+        copy[key] = replaceEqualDeep(prev[key], next[key]);
+        if (copy[key] === prev[key]) {
+          equalItems++;
+        }
+      }
+      return prevSize === nextSize && equalItems === prevSize ? prev : copy;
+    }
+    return next;
+  }
+
+  // Copied from: https://github.com/jonschlinkert/is-plain-object
+  function isPlainObject(o) {
+    if (!hasObjectPrototype(o)) {
+      return false;
+    }
+
+    // If has modified constructor
+    const ctor = o.constructor;
+    if (typeof ctor === 'undefined') {
+      return true;
+    }
+
+    // If has modified prototype
+    const prot = ctor.prototype;
+    if (!hasObjectPrototype(prot)) {
+      return false;
+    }
+
+    // If constructor does not have an Object-specific method
+    if (!prot.hasOwnProperty('isPrototypeOf')) {
+      return false;
+    }
+
+    // Most likely a plain Object
+    return true;
+  }
+  function hasObjectPrototype(o) {
+    return Object.prototype.toString.call(o) === '[object Object]';
+  }
+
   function joinPaths(paths) {
     return cleanPath(paths.filter(Boolean).join('/'));
   }
@@ -515,204 +621,11 @@
     };
   };
 
-  sn(false);
-  let queue = [];
-  let batching = false;
-  function flush() {
-    if (batching) return;
-    queue.forEach(cb => cb());
-    queue = [];
-  }
-  function createStore(initialState, debug) {
-    const listeners = new Set();
-    const store = {
-      state: initialState,
-      subscribe: listener => {
-        listeners.add(listener);
-        return () => listeners.delete(listener);
-      },
-      setState: updater => {
-        const previous = store.state;
-        store.state = fn(d => {
-          updater(d);
-        })(previous);
-        if (debug) console.log(store.state);
-        queue.push(() => listeners.forEach(listener => listener(store.state, previous)));
-        flush();
-      }
-    };
-    return store;
-  }
-  function batch(cb) {
-    batching = true;
-    cb();
-    batching = false;
-    flush();
-  }
-
-  // /**
-  //  * This function converts a store to an immutable value, which is
-  //  * more complex than you think. On first read, (when prev is undefined)
-  //  * every value must be recursively touched so tracking is "deep".
-  //  * Every object/array structure must also be cloned to
-  //  * have a new reference, otherwise it will get mutated by subsequent
-  //  * store updates.
-  //  *
-  //  * In the case that prev is supplied, we have to do deep comparisons
-  //  * between prev and next objects/array references and if they are deeply
-  //  * equal, we can return the prev version for referential equality.
-  //  */
-  // export function storeToImmutable<T>(prev: any, next: T): T {
-  //   const cache = new Map()
-
-  //   // Visit all nodes
-  //   // clone all next structures
-  //   // from bottom up, if prev === next, return prev
-
-  //   function recurse(prev: any, next: any) {
-  //     if (cache.has(next)) {
-  //       return cache.get(next)
-  //     }
-
-  //     const prevIsArray = Array.isArray(prev)
-  //     const nextIsArray = Array.isArray(next)
-  //     const prevIsObj = isPlainObject(prev)
-  //     const nextIsObj = isPlainObject(next)
-  //     const nextIsComplex = nextIsArray || nextIsObj
-
-  //     const isArray = prevIsArray && nextIsArray
-  //     const isObj = prevIsObj && nextIsObj
-
-  //     const isSameStructure = isArray || isObj
-
-  //     if (nextIsComplex) {
-  //       const prevSize = isArray
-  //         ? prev.length
-  //         : isObj
-  //         ? Object.keys(prev).length
-  //         : -1
-  //       const nextKeys = isArray ? next : Object.keys(next)
-  //       const nextSize = nextKeys.length
-
-  //       let changed = false
-  //       const copy: any = nextIsArray ? [] : {}
-
-  //       for (let i = 0; i < nextSize; i++) {
-  //         const key = isArray ? i : nextKeys[i]
-  //         const prevValue = isSameStructure ? prev[key] : undefined
-  //         const nextValue = next[key]
-
-  //         // Recurse the new value
-  //         try {
-  //           console.count(key)
-  //           copy[key] = recurse(prevValue, nextValue)
-  //         } catch {}
-
-  //         // If the new value has changed reference,
-  //         // mark the obj/array as changed
-  //         if (!changed && copy[key] !== prevValue) {
-  //           changed = true
-  //         }
-  //       }
-
-  //       // No items have changed!
-  //       // If something has changed, return a clone of the next obj/array
-  //       if (changed || prevSize !== nextSize) {
-  //         cache.set(next, copy)
-  //         return copy
-  //       }
-
-  //       // If they are exactly the same, return the prev obj/array
-  //       cache.set(next, prev)
-  //       return prev
-  //     }
-
-  //     cache.set(next, next)
-  //     return next
-  //   }
-
-  //   return recurse(prev, next)
-  // }
-
-  /**
-   * This function returns `a` if `b` is deeply equal.
-   * If not, it will replace any deeply equal children of `b` with those of `a`.
-   * This can be used for structural sharing between immutable JSON values for example.
-   * Do not use this with signals
-   */
-  function replaceEqualDeep(prev, _next) {
-    if (prev === _next) {
-      return prev;
-    }
-    const next = _next;
-    const array = Array.isArray(prev) && Array.isArray(next);
-    if (array || isPlainObject(prev) && isPlainObject(next)) {
-      const prevSize = array ? prev.length : Object.keys(prev).length;
-      const nextItems = array ? next : Object.keys(next);
-      const nextSize = nextItems.length;
-      const copy = array ? [] : {};
-      let equalItems = 0;
-      for (let i = 0; i < nextSize; i++) {
-        const key = array ? i : nextItems[i];
-        copy[key] = replaceEqualDeep(prev[key], next[key]);
-        if (copy[key] === prev[key]) {
-          equalItems++;
-        }
-      }
-      return prevSize === nextSize && equalItems === prevSize ? prev : copy;
-    }
-    return next;
-  }
-
-  // Copied from: https://github.com/jonschlinkert/is-plain-object
-  function isPlainObject(o) {
-    if (!hasObjectPrototype(o)) {
-      return false;
-    }
-
-    // If has modified constructor
-    const ctor = o.constructor;
-    if (typeof ctor === 'undefined') {
-      return true;
-    }
-
-    // If has modified prototype
-    const prot = ctor.prototype;
-    if (!hasObjectPrototype(prot)) {
-      return false;
-    }
-
-    // If constructor does not have an Object-specific method
-    if (!prot.hasOwnProperty('isPrototypeOf')) {
-      return false;
-    }
-
-    // Most likely a plain Object
-    return true;
-  }
-  function hasObjectPrototype(o) {
-    return Object.prototype.toString.call(o) === '[object Object]';
-  }
-  function trackDeep(obj) {
-    const seen = new Set();
-    JSON.stringify(obj, (_, value) => {
-      if (typeof value === 'function') {
-        return undefined;
-      }
-      if (typeof value === 'object' && value !== null) {
-        if (seen.has(value)) return;
-        seen.add(value);
-      }
-      return value;
-    });
-    return obj;
-  }
+  //
 
   const componentTypes = ['component', 'errorComponent', 'pendingComponent'];
   class RouteMatch {
     abortController = new AbortController();
-    #latestId = '';
-    #resolve = () => {};
     onLoaderDataListeners = new Set();
     constructor(router, route, opts) {
       Object.assign(this, {
@@ -721,80 +634,49 @@
         id: opts.id,
         pathname: opts.pathname,
         params: opts.params,
-        store: createStore({
+        store: new Store({
+          updatedAt: 0,
           routeSearch: {},
           search: {},
-          status: 'idle',
-          routeLoaderData: {},
-          loaderData: {},
-          isFetching: false,
-          invalid: false,
-          invalidAt: Infinity
+          status: 'idle'
         })
       });
-      if (!this.__hasLoaders()) {
-        this.store.setState(s => s.status = 'success');
+      if (!this.#hasLoaders()) {
+        this.store.setState(s => ({
+          ...s,
+          status: 'success'
+        }));
       }
     }
-    setLoaderData = loaderData => {
-      batch(() => {
-        this.store.setState(s => {
-          s.routeLoaderData = loaderData;
-        });
-        this.#updateLoaderData();
-      });
-    };
     cancel = () => {
       this.abortController?.abort();
     };
-    load = async loaderOpts => {
-      const now = Date.now();
-      const minMaxAge = loaderOpts?.preload ? Math.max(loaderOpts?.maxAge, loaderOpts?.gcMaxAge) : 0;
-
-      // If this is a preload, add it to the preload cache
-      if (loaderOpts?.preload && minMaxAge > 0) {
-        // If the match is currently active, don't preload it
-        if (this.router.store.state.currentMatches.find(d => d.id === this.id)) {
-          return;
-        }
-        this.router.store.setState(s => {
-          s.matchCache[this.id] = {
-            gc: now + loaderOpts.gcMaxAge,
-            match: this
-          };
-        });
-      }
-
+    load = async () => {
       // If the match is invalid, errored or idle, trigger it to load
-      if (this.store.state.status === 'success' && this.getIsInvalid() || this.store.state.status === 'error' || this.store.state.status === 'idle') {
-        const maxAge = loaderOpts?.preload ? loaderOpts?.maxAge : undefined;
-        await this.fetch({
-          maxAge
-        });
+      if (this.store.state.status !== 'pending') {
+        await this.fetch();
       }
     };
-    fetch = async opts => {
-      this.__loadPromise = new Promise(async resolve => {
+    #latestId = '';
+    fetch = async () => {
+      this.__loadPromise = Promise.resolve().then(async () => {
         const loadId = '' + Date.now() + Math.random();
         this.#latestId = loadId;
-        const checkLatest = () => loadId !== this.#latestId ? this.__loadPromise?.then(() => resolve()) : undefined;
+        const checkLatest = () => {
+          return loadId !== this.#latestId ? this.__loadPromise : undefined;
+        };
         let latestPromise;
-        batch(() => {
+        this.store.batch(() => {
           // If the match was in an error state, set it
           // to a loading state again. Otherwise, keep it
           // as loading or resolved
           if (this.store.state.status === 'idle') {
-            this.store.setState(s => s.status = 'loading');
+            this.store.setState(s => ({
+              ...s,
+              status: 'pending'
+            }));
           }
-
-          // We started loading the route, so it's no longer invalid
-          this.store.setState(s => s.invalid = false);
         });
-
-        // We are now fetching, even if it's in the background of a
-        // resolved state
-        this.store.setState(s => s.isFetching = true);
-        this.#resolve = resolve;
         const componentsPromise = (async () => {
           // then run all component and data loaders in parallel
           // For each component type, potentially load it asynchronously
@@ -806,103 +688,61 @@
             }
           }));
         })();
-        const dataPromise = Promise.resolve().then(async () => {
-          try {
-            if (this.route.options.loader) {
-              const data = await this.router.loadMatchData(this);
-              if (latestPromise = checkLatest()) return latestPromise;
-              this.setLoaderData(data);
-            }
-            this.store.setState(s => {
-              s.error = undefined;
-              s.status = 'success';
-              s.updatedAt = Date.now();
-              s.invalidAt = s.updatedAt + (opts?.maxAge ?? this.route.options.loaderMaxAge ?? this.router.options.defaultLoaderMaxAge ?? 0);
-            });
-            return this.store.state.routeLoaderData;
-          } catch (err) {
-            if (latestPromise = checkLatest()) return latestPromise;
-            {
-              console.error(err);
-            }
-            this.store.setState(s => {
-              s.error = err;
-              s.status = 'error';
-              s.updatedAt = Date.now();
+        const dataPromise = Promise.resolve().then(() => {
+          if (this.route.options.onLoad) {
+            return this.route.options.onLoad({
+              params: this.params,
+              search: this.store.state.search,
+              signal: this.abortController.signal
             });
-            throw err;
           }
+          return;
         });
-        const after = async () => {
-          if (latestPromise = checkLatest()) return latestPromise;
-          this.store.setState(s => s.isFetching = false);
-          this.#resolve();
-          delete this.__loadPromise;
-        };
         try {
-          await Promise.all([componentsPromise, dataPromise.catch(() => {})]);
-          after();
-        } catch {
-          after();
+          await componentsPromise;
+          await dataPromise;
+          if (latestPromise = checkLatest()) return await latestPromise;
+          this.store.setState(s => ({
+            ...s,
+            error: undefined,
+            status: 'success',
+            updatedAt: Date.now()
+          }));
+        } catch (err) {
+          this.store.setState(s => ({
+            ...s,
+            error: err,
+            status: 'error',
+            updatedAt: Date.now()
+          }));
+        } finally {
+          delete this.__loadPromise;
         }
       });
       return this.__loadPromise;
     };
-    invalidate = async () => {
-      this.store.setState(s => s.invalid = true);
-      if (this.router.store.state.currentMatches.find(d => d.id === this.id)) {
-        await this.load();
-      }
-    };
-    __hasLoaders = () => {
-      return !!(this.route.options.loader || componentTypes.some(d => this.route.options[d]?.preload));
-    };
-    getIsInvalid = () => {
-      const now = Date.now();
-      return this.store.state.invalid || this.store.state.invalidAt < now;
-    };
-    #updateLoaderData = () => {
-      this.store.setState(s => {
-        s.loaderData = replaceEqualDeep(s.loaderData, {
-          ...this.parentMatch?.store.state.loaderData,
-          ...s.routeLoaderData
-        });
-      });
-      this.onLoaderDataListeners.forEach(listener => listener());
+    #hasLoaders = () => {
+      return !!(this.route.options.onLoad || componentTypes.some(d => this.route.options[d]?.preload));
     };
     __setParentMatch = parentMatch => {
       if (!this.parentMatch && parentMatch) {
         this.parentMatch = parentMatch;
-        this.parentMatch.__onLoaderData(() => {
-          this.#updateLoaderData();
-        });
       }
     };
-    __onLoaderData = listener => {
-      this.onLoaderDataListeners.add(listener);
-      // return () => this.onLoaderDataListeners.delete(listener)
-    };
-
     __validate = () => {
       // Validate the search params and stabilize them
       const parentSearch = this.parentMatch?.store.state.search ?? this.router.store.state.latestLocation.search;
       try {
-        const prevSearch = this.store.state.routeSearch;
         const validator = typeof this.route.options.validateSearch === 'object' ? this.route.options.validateSearch.parse : this.route.options.validateSearch;
         let nextSearch = validator?.(parentSearch) ?? {};
-        batch(() => {
-          // Invalidate route matches when search param stability changes
-          if (prevSearch !== nextSearch) {
-            this.store.setState(s => s.invalid = true);
+        this.store.setState(s => ({
+          ...s,
+          routeSearch: nextSearch,
+          search: {
+            ...parentSearch,
+            ...nextSearch
           }
-          this.store.setState(s => {
-            s.routeSearch = nextSearch;
-            s.search = {
-              ...parentSearch,
-              ...nextSearch
-            };
-          });
-        });
+        }));
         componentTypes.map(async type => {
           const component = this.route.options[type];
           if (typeof this[type] !== 'function') {
@@ -915,10 +755,11 @@
           cause: err
         });
         error.code = 'INVALID_SEARCH_PARAMS';
-        this.store.setState(s => {
-          s.status = 'error';
-          s.error = error;
-        });
+        this.store.setState(s => ({
+          ...s,
+          status: 'error',
+          error: error
+        }));
 
         // Do not proceed with loading the route
         return;
@@ -1001,9 +842,6 @@
     resolveNavigation = () => {};
     constructor(options) {
       this.options = {
-        defaultLoaderGcMaxAge: 5 * 60 * 1000,
-        defaultLoaderMaxAge: 0,
-        defaultPreloadMaxAge: 2000,
         defaultPreloadDelay: 50,
         context: undefined,
         ...options,
@@ -1011,7 +849,7 @@
         parseSearch: options?.parseSearch ?? defaultParseSearch,
         fetchServerDataFn: options?.fetchServerDataFn ?? defaultFetchServerDataFn
       };
-      this.store = createStore(getInitialRouterState());
+      this.store = new Store(getInitialRouterState());
       this.basepath = '';
       this.update(options);
 
@@ -1057,10 +895,12 @@
           this.#unsubHistory();
         }
         this.history = this.options.history ?? (isServer ? createMemoryHistory() : createBrowserHistory());
-        this.store.setState(s => {
-          s.latestLocation = this.#parseLocation();
-          s.currentLocation = s.latestLocation;
-        });
+        const parsedLocation = this.#parseLocation();
+        this.store.setState(s => ({
+          ...s,
+          latestLocation: parsedLocation,
+          currentLocation: parsedLocation
+        }));
         this.#unsubHistory = this.history.listen(() => {
           this.load(this.#parseLocation(this.store.state.latestLocation));
         });
@@ -1100,23 +940,25 @@
       // Cancel any pending matches
       this.cancelMatches();
       let matches;
-      batch(() => {
+      this.store.batch(() => {
         if (next) {
           // Ingest the new location
-          this.store.setState(s => {
-            s.latestLocation = next;
-          });
+          this.store.setState(s => ({
+            ...s,
+            latestLocation: next
+          }));
         }
 
         // Match the routes
         matches = this.matchRoutes(this.store.state.latestLocation.pathname, {
           strictParseParams: true
         });
-        this.store.setState(s => {
-          s.status = 'loading';
-          s.pendingMatches = matches;
-          s.pendingLocation = this.store.state.latestLocation;
-        });
+        this.store.setState(s => ({
+          ...s,
+          status: 'pending',
+          pendingMatches: matches,
+          pendingLocation: this.store.state.latestLocation
+        }));
       });
 
       // Load the matches
@@ -1151,20 +993,12 @@
         });
 
         // Clear non-loading error states when match leaves
-        if (d.store.state.status === 'error' && !d.store.state.isFetching) {
-          d.store.setState(s => {
-            s.status = 'idle';
-            s.error = undefined;
-          });
-        }
-        const gc = Math.max(d.route.options.loaderGcMaxAge ?? this.options.defaultLoaderGcMaxAge ?? 0, d.route.options.loaderMaxAge ?? this.options.defaultLoaderMaxAge ?? 0);
-        if (gc > 0) {
-          this.store.setState(s => {
-            s.matchCache[d.id] = {
-              gc: gc == Infinity ? Number.MAX_SAFE_INTEGER : now + gc,
-              match: d
-            };
-          });
+        if (d.store.state.status === 'error') {
+          this.store.setState(s => ({
+            ...s,
+            status: 'idle',
+            error: undefined
+          }));
         }
       });
       staying.forEach(d => {
@@ -1178,41 +1012,20 @@
           params: d.params,
           search: d.store.state.search
         });
-        delete this.store.state.matchCache[d.id];
-      });
-      this.store.setState(s => {
-        Object.assign(s, {
-          status: 'idle',
-          currentLocation: this.store.state.latestLocation,
-          currentMatches: matches,
-          pendingLocation: undefined,
-          pendingMatches: undefined
-        });
+        // delete this.store.state.matchCache[d.id] // TODO:
       });
+
+      this.store.setState(s => ({
+        ...s,
+        status: 'idle',
+        currentLocation: this.store.state.latestLocation,
+        currentMatches: matches,
+        pendingLocation: undefined,
+        pendingMatches: undefined
+      }));
       this.options.onRouteChange?.();
       this.resolveNavigation();
     };
-    cleanMatchCache = () => {
-      const now = Date.now();
-      this.store.setState(s => {
-        Object.keys(s.matchCache).forEach(matchId => {
-          const entry = s.matchCache[matchId];
-
-          // Don't remove loading matches
-          if (entry.match.store.state.status === 'loading') {
-            return;
-          }
-
-          // Do not remove successful matches that are still valid
-          if (entry.gc > 0 && entry.gc > now) {
-            return;
-          }
-
-          // Everything else gets removed
-          delete s.matchCache[matchId];
-        });
-      });
-    };
     getRoute = id => {
       const route = this.routesById[id];
       invariant(route, `Route with id "${id}" not found`);
@@ -1226,15 +1039,13 @@
       await this.loadMatches(matches);
       return matches;
     };
-    preloadRoute = async (navigateOpts = this.store.state.latestLocation, loaderOpts) => {
+    preloadRoute = async (navigateOpts = this.store.state.latestLocation) => {
       const next = this.buildNext(navigateOpts);
       const matches = this.matchRoutes(next.pathname, {
         strictParseParams: true
       });
       await this.loadMatches(matches, {
-        preload: true,
-        maxAge: loaderOpts.maxAge ?? this.options.defaultPreloadMaxAge ?? this.options.defaultLoaderMaxAge ?? 0,
-        gcMaxAge: loaderOpts.gcMaxAge ?? this.options.defaultPreloadGcMaxAge ?? this.options.defaultLoaderGcMaxAge ?? 0
+        preload: true
       });
       return matches;
     };
@@ -1288,7 +1099,9 @@
         foundRoutes.forEach(foundRoute => {
           const interpolatedPath = interpolatePath(foundRoute.path, params);
           const matchId = interpolatePath(foundRoute.id, params, true);
-          const match = existingMatches.find(d => d.id === matchId) || this.store.state.matchCache[matchId]?.match || new RouteMatch(this, foundRoute, {
+          const match = existingMatches.find(d => d.id === matchId) ||
+          // this.store.state.matchCache[matchId]?.match || // TODO:
+          new RouteMatch(this, foundRoute, {
             id: matchId,
             params,
             pathname: joinPaths([this.basepath, interpolatedPath])
@@ -1305,7 +1118,7 @@
       return matches;
     };
     loadMatches = async (resolvedMatches, loaderOpts) => {
-      this.cleanMatchCache();
+      // this.cleanMatchCache()
       resolvedMatches.forEach(async match => {
         // Validate the match (loads search params etc)
         match.__validate();
@@ -1331,7 +1144,7 @@
         if (search.__data?.matchId && search.__data.matchId !== match.id) {
           return;
         }
-        match.load(loaderOpts);
+        match.load();
         if (match.store.state.status !== 'success' && match.__loadPromise) {
           // Wait for the first sign of activity from the match
           await match.__loadPromise;
@@ -1342,41 +1155,6 @@
       });
       await Promise.all(matchPromises);
     };
-    loadMatchData = async routeMatch => {
-      if (isServer || !this.options.useServerData) {
-        return (await routeMatch.route.options.loader?.({
-          // parentLoaderPromise: routeMatch.parentMatch.dataPromise,
-          params: routeMatch.params,
-          search: routeMatch.store.state.routeSearch,
-          signal: routeMatch.abortController.signal
-        })) || {};
-      } else {
-        // Refresh:
-        // '/dashboard'
-        // '/dashboard/invoices/'
-        // '/dashboard/invoices/123'
-
-        // New:
-        // '/dashboard/invoices/456'
-
-        // TODO: batch requests when possible
-
-        const res = await this.options.fetchServerDataFn({
-          router: this,
-          routeMatch
-        });
-        return res;
-      }
-    };
-    invalidateRoute = async opts => {
-      const next = this.buildNext(opts);
-      const unloadedMatchIds = this.matchRoutes(next.pathname).map(d => d.id);
-      await Promise.allSettled([...this.store.state.currentMatches, ...(this.store.state.pendingMatches ?? [])].map(async match => {
-        if (unloadedMatchIds.includes(match.id)) {
-          return match.invalidate();
-        }
-      }));
-    };
     reload = () => {
       this.navigate({
         fromCurrent: true,
@@ -1401,7 +1179,7 @@
       // If this `to` is a valid external URL, return
       // null for LinkUtils
       const toString = String(to);
-      const fromString = String(from);
+      const fromString = typeof from === 'undefined' ? from : String(from);
       let isExternal;
       try {
         new URL(`${toString}`);
@@ -1494,9 +1272,6 @@
       const handleClick = e => {
         if (!disabled && !isCtrlEvent(e) && !e.defaultPrevented && (!target || target === '_self') && e.button === 0) {
           e.preventDefault();
-          if (pathIsEqual && !search && !hash) {
-            this.invalidateRoute(nextOpts);
-          }
 
           // All is well? Navigate!
           this.#commitLocation(nextOpts);
@@ -1506,10 +1281,7 @@
       // The click handler
       const handleFocus = e => {
         if (preload) {
-          this.preloadRoute(nextOpts, {
-            maxAge: userPreloadMaxAge,
-            gcMaxAge: userPreloadGcMaxAge
-          }).catch(err => {
+          this.preloadRoute(nextOpts).catch(err => {
             console.warn(err);
             console.warn('Error preloading route! ☝️');
           });
@@ -1523,10 +1295,7 @@
           }
           target.preloadTimeout = setTimeout(() => {
             target.preloadTimeout = null;
-            this.preloadRoute(nextOpts, {
-              maxAge: userPreloadMaxAge,
-              gcMaxAge: userPreloadGcMaxAge
-            }).catch(err => {
+            this.preloadRoute(nextOpts).catch(err => {
               console.warn(err);
               console.warn('Error preloading route! ☝️');
             });
@@ -1558,7 +1327,7 @@
           currentMatches: this.store.state.currentMatches.map(match => ({
             id: match.id,
             state: {
-              ...pick(match.store.state, ['status', 'routeLoaderData', 'invalidAt', 'invalid'])
+              ...pick(match.store.state, ['status'])
             }
           }))
         },
@@ -1567,7 +1336,6 @@
     };
     hydrate = dehydratedRouter => {
       this.store.setState(s => {
-        // Update the context TODO: make this part of state?
         this.options.context = dehydratedRouter.context;
 
         // Match the routes
@@ -1576,54 +1344,20 @@
         });
         currentMatches.forEach((match, index) => {
           const dehydratedMatch = dehydratedRouter.state.currentMatches[index];
-          invariant(dehydratedMatch && dehydratedMatch.id === match.id, 'Oh no! There was a hydration mismatch when attempting to rethis.store the state of the router! 😬');
-          match.store.setState(s => {
-            Object.assign(s, dehydratedMatch.state);
-          });
-          match.setLoaderData(dehydratedMatch.state.routeLoaderData);
+          invariant(dehydratedMatch && dehydratedMatch.id === match.id, 'Oh no! There was a hydration mismatch when attempting to hydrate the state of the router! 😬');
+          match.store.setState(s => ({
+            ...s,
+            ...dehydratedMatch.state
+          }));
         });
         currentMatches.forEach(match => match.__validate());
-        Object.assign(s, {
+        return {
+          ...s,
           ...dehydratedRouter.state,
           currentMatches
-        });
+        };
       });
     };
-    getLoader = opts => {
-      const id = opts.from || '/';
-      const route = this.getRoute(id);
-      if (!route) return undefined;
-      let loader = this.store.state.loaders[id] || (() => {
-        this.store.setState(s => {
-          s.loaders[id] = {
-            pending: [],
-            fetch: async loaderContext => {
-              if (!route) {
-                return;
-              }
-              const loaderState = {
-                loadedAt: Date.now(),
-                loaderContext
-              };
-              this.store.setState(s => {
-                s.loaders[id].current = loaderState;
-                s.loaders[id].latest = loaderState;
-                s.loaders[id].pending.push(loaderState);
-              });
-              try {
-                return await route.options.loader?.(loaderContext);
-              } finally {
-                this.store.setState(s => {
-                  s.loaders[id].pending = s.loaders[id].pending.filter(d => d !== loaderState);
-                });
-              }
-            }
-          };
-        });
-        return this.store.state.loaders[id];
-      })();
-      return loader;
-    };
     #buildRouteTree = rootRouteConfig => {
       const recurseRoutes = (routeConfigs, parent) => {
         return routeConfigs.map((routeConfig, i) => {
@@ -1747,17 +1481,24 @@
       latestLocation: null,
       currentLocation: null,
       currentMatches: [],
-      loaders: {},
-      lastUpdated: Date.now(),
-      matchCache: {},
-      get isFetching() {
-        return this.status === 'loading' || this.currentMatches.some(d => d.store.state.isFetching);
-      },
-      get isPreloading() {
-        return Object.values(this.matchCache).some(d => d.match.store.state.isFetching && !this.currentMatches.find(dd => dd.id === d.match.id));
-      }
+      lastUpdated: Date.now()
+      // matchCache: {}, // TODO:
+      // get isFetching() {
+      //   return (
+      //     this.status === 'loading' ||
+      //     this.currentMatches.some((d) => d.store.state.isFetching)
+      //   )
+      // },
+      // get isPreloading() {
+      //   return Object.values(this.matchCache).some(
+      //     (d) =>
+      //       d.match.store.state.isFetching &&
+      //       !this.currentMatches.find((dd) => dd.id === d.match.id),
+      //   )
+      // },
     };
   }
+
   function isCtrlEvent(e) {
     return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey);
   }
@@ -1770,76 +1511,16 @@
     });
   }
 
-  // RouterAction is a constrained identify function that takes options: key, action, onSuccess, onError, onSettled, etc
-  function createAction(options) {
-    const store = createStore({
-      submissions: []
-    }, options.debug);
-    return {
-      options,
-      store,
-      reset: () => {
-        store.setState(s => {
-          s.submissions = [];
-        });
-      },
-      submit: async payload => {
-        const submission = {
-          submittedAt: Date.now(),
-          status: 'pending',
-          payload: payload,
-          invalidate: () => {
-            setSubmission(s => {
-              s.isInvalid = true;
-            });
-          },
-          getIsLatest: () => store.state.submissions[store.state.submissions.length - 1]?.submittedAt === submission.submittedAt
-        };
-        const setSubmission = updater => {
-          store.setState(s => {
-            const a = s.submissions.find(d => d.submittedAt === submission.submittedAt);
-            invariant(a, 'Could not find submission in store');
-            updater(a);
-          });
-        };
-        store.setState(s => {
-          s.submissions.push(submission);
-          s.submissions.reverse();
-          s.submissions = s.submissions.slice(0, options.maxSubmissions ?? 10);
-          s.submissions.reverse();
-        });
-        const after = async () => {
-          options.onEachSettled?.(submission);
-          if (submission.getIsLatest()) await options.onLatestSettled?.(submission);
-        };
-        try {
-          const res = await options.action?.(submission.payload);
-          setSubmission(s => {
-            s.response = res;
-          });
-          await options.onEachSuccess?.(submission);
-          if (submission.getIsLatest()) await options.onLatestSuccess?.(submission);
-          await after();
-          setSubmission(s => {
-            s.status = 'success';
-          });
-          return res;
-        } catch (err) {
-          console.error(err);
-          setSubmission(s => {
-            s.error = err;
-          });
-          await options.onEachError?.(submission);
-          if (submission.getIsLatest()) await options.onLatestError?.(submission);
-          await after();
-          setSubmission(s => {
-            s.status = 'error';
-          });
-          throw err;
-        }
-      }
-    };
-  }
+  /**
+   * react-store
+   *
+   * Copyright (c) TanStack
+   *
+   * This source code is licensed under the MIT license found in the
+   * LICENSE.md file in the root directory of this source tree.
+   *
+   * @license MIT
+   */
 
   function useStore(store, selector = d => d, compareShallow) {
     const slice = withSelector.useSyncExternalStoreWithSelector(store.subscribe, () => store.state, () => store.state, selector, compareShallow ? shallow : undefined);
@@ -2066,12 +1747,6 @@
     invariant(resolvedRoute, `Could not find a route for route "${routeId}"! Did you forget to add it to your route config?`);
     return resolvedRoute;
   }
-  function useLoaderData(opts) {
-    const match = useMatch(opts);
-    invariant(match, `Could not find ${opts?.from ? `an active match from "${opts.from}"` : 'a nearest match!'}`);
-    useStore(match.store, d => opts?.track?.(d.loaderData) ?? d.loaderData);
-    return match.store.state.loaderData;
-  }
   function useSearch(opts) {
     const match = useMatch(opts);
     useStore(match.store, d => opts?.track?.(d.search) ?? d.search);
@@ -2144,7 +1819,7 @@
       if (props.match.store.state.status === 'success') {
         return /*#__PURE__*/React__namespace.createElement(props.match.component ?? router.options.defaultComponent ?? Outlet);
       }
-      if (props.match.store.state.status === 'loading') {
+      if (props.match.store.state.status === 'pending') {
         throw props.match.__loadPromise;
       }
       invariant(false, 'Idle routeMatch status encountered during rendering! You should never see this. File an issue!');
@@ -2189,34 +1864,24 @@
   // router's location key changes.
   function CatchBoundaryInner(props) {
     const [activeErrorState, setActiveErrorState] = React__namespace.useState(props.errorState);
-    useRouter();
+    const router = useRouter();
     const errorComponent = props.errorComponent ?? DefaultErrorBoundary;
-
-    // React.useEffect(() => {
-    //   if (activeErrorState) {
-    //     let prevKey = router.store.state.currentLocation.key
-    //     return createRoot((dispose) => {
-    //       createEffect(() => {
-    //         if (router.store.state.currentLocation.key !== prevKey) {
-    //           prevKey = router.store.state.currentLocation.key
-    //           setActiveErrorState({} as any)
-    //         }
-    //       })
-
-    //       return dispose
-    //     })
-    //   }
-
-    //   return
-    // }, [activeErrorState])
-
+    const prevKeyRef = React__namespace.useRef('');
+    React__namespace.useEffect(() => {
+      if (activeErrorState) {
+        if (router.store.state.currentLocation.key !== prevKeyRef.current) {
+          setActiveErrorState({});
+        }
+      }
+      prevKeyRef.current = router.store.state.currentLocation.key;
+    }, [activeErrorState, router.store.state.currentLocation.key]);
     React__namespace.useEffect(() => {
       if (props.errorState.error) {
         setActiveErrorState(props.errorState);
       }
-      props.reset();
+      // props.reset()
     }, [props.errorState.error]);
-    if (props.errorState.error) {
+    if (props.errorState.error && activeErrorState.error) {
       return /*#__PURE__*/React__namespace.createElement(errorComponent, activeErrorState);
     }
     return props.children;
@@ -2247,16 +1912,6 @@
       }
     }, error.message) : null)));
   }
-  function useAction(action, opts) {
-    useStore(action.store, d => opts?.track?.(d) ?? d, true);
-    const [ref] = React__namespace.useState({});
-    Object.assign(ref, {
-      ...action,
-      latestSubmission: action.store.state.submissions[action.store.state.submissions.length - 1],
-      pendingSubmissions: React__namespace.useMemo(() => action.store.state.submissions.filter(d => d.status === 'pending'), [action.store.state.submissions])
-    });
-    return ref;
-  }
 
   // TODO: While we migrate away from the history package, these need to be disabled
   // export function usePrompt(message: string, when: boolean | any): void {
@@ -2294,14 +1949,11 @@
   exports.RouteMatch = RouteMatch;
   exports.Router = Router;
   exports.RouterProvider = RouterProvider;
-  exports.batch = batch;
   exports.cleanPath = cleanPath;
-  exports.createAction = createAction;
   exports.createBrowserHistory = createBrowserHistory;
   exports.createHashHistory = createHashHistory;
   exports.createMemoryHistory = createMemoryHistory;
   exports.createRouteConfig = createRouteConfig;
-  exports.createStore = createStore;
   exports.decode = decode;
   exports.defaultFetchServerDataFn = defaultFetchServerDataFn;
   exports.defaultParseSearch = defaultParseSearch;
@@ -2310,6 +1962,7 @@
   exports.functionalUpdate = functionalUpdate;
   exports.interpolatePath = interpolatePath;
   exports.invariant = invariant;
+  exports.isPlainObject = isPlainObject;
   exports.joinPaths = joinPaths;
   exports.last = last;
   exports.lazy = lazy;
@@ -2324,13 +1977,10 @@
   exports.rootRouteId = rootRouteId;
   exports.routerContext = routerContext;
   exports.stringifySearchWith = stringifySearchWith;
-  exports.trackDeep = trackDeep;
   exports.trimPath = trimPath;
   exports.trimPathLeft = trimPathLeft;
   exports.trimPathRight = trimPathRight;
-  exports.useAction = useAction;
   exports.useLinkProps = useLinkProps;
-  exports.useLoaderData = useLoaderData;
   exports.useMatch = useMatch;
   exports.useMatchRoute = useMatchRoute;
   exports.useMatches = useMatches;