reactive-route 0.0.1-alpha.31 → 0.0.1-alpha.33

package/core/createRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createRouter.d.ts","sourceRoot":"","sources":["../../packages/core/createRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAYhD,wBAAgB,YAAY,CAC1B,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,EACxE,MAAM,EAAE;IACR,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;CAC9B,GAAG,UAAU,CAAC,OAAO,CAAC,CAuPtB"}
+{"version":3,"file":"createRouter.d.ts","sourceRoot":"","sources":["../../packages/core/createRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAWhD,wBAAgB,YAAY,CAC1B,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,EACxE,MAAM,EAAE;IACR,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;CAC9B,GAAG,UAAU,CAAC,OAAO,CAAC,CAuPtB"}

package/core/index.d.ts

@@ -6,7 +6,6 @@ export type { TypePropsRouter } from './types/TypePropsRouter';
 export type { TypeRedirectParams } from './types/TypeRedirectParams';
 export type { TypeRoute } from './types/TypeRoute';
 export type { TypeRouter } from './types/TypeRouter';
-export { history } from './utils/history';
 export { loadComponentToConfig } from './utils/loadComponentToConfig';
 export { RedirectError } from './utils/RedirectError';
 export { replaceDynamicValues } from './utils/replaceDynamicValues';

package/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../packages/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,YAAY,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,YAAY,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,YAAY,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,YAAY,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../packages/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,YAAY,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,YAAY,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,YAAY,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,YAAY,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC"}

package/core/types/TypeRouter.d.ts

@@ -6,7 +6,6 @@ export type TypeRouter<TRoutes extends Record<string | 'notFound' | 'internalErr
     routes: TRoutes;
     adapters: TypeAdapters;
     currentRoute: TypeCurrentRoute<TRoutes[keyof TRoutes]>;
-    routesHistory: Array<string>;
     isRedirecting: boolean;
     redirect<TRouteName extends keyof TRoutes>(config: TypeRedirectParams<TRoutes, TRouteName>): Promise<void>;
     restoreFromURL(params: {
@@ -14,9 +13,9 @@ export type TypeRouter<TRoutes extends Record<string | 'notFound' | 'internalErr
         replace?: boolean;
     }): Promise<void>;
     restoreFromServer(obj: {
-        routesHistory: Array<string>;
         currentRoute: TypeCurrentRoute<TRoutes[keyof TRoutes]>;
     }): Promise<void>;
     lifecycleParams?: Array<any>;
+    destroy(): void;
 };
 //# sourceMappingURL=TypeRouter.d.ts.map

package/core/types/TypeRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TypeRouter.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypeRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,UAAU,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,IAAI;IACjG,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,YAAY,CAAC;IACvB,YAAY,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC;IACvD,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7B,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,UAAU,SAAS,MAAM,OAAO,EACvC,MAAM,EAAE,kBAAkB,CAAC,OAAO,EAAE,UAAU,CAAC,GAC9C,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,cAAc,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/E,iBAAiB,CAAC,GAAG,EAAE;QACrB,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7B,YAAY,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC;KACxD,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClB,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;CAC9B,CAAC"}
+{"version":3,"file":"TypeRouter.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypeRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,UAAU,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,IAAI;IACjG,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,YAAY,CAAC;IACvB,YAAY,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC;IACvD,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,UAAU,SAAS,MAAM,OAAO,EACvC,MAAM,EAAE,kBAAkB,CAAC,OAAO,EAAE,UAAU,CAAC,GAC9C,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,cAAc,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/E,iBAAiB,CAAC,GAAG,EAAE;QAAE,YAAY,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClG,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,OAAO,IAAI,IAAI,CAAC;CACjB,CAAC"}

package/core/utils/getInitialRoute.d.ts

@@ -3,5 +3,6 @@ import { TypeRoute } from '../types/TypeRoute';
 export declare function getInitialRoute<TRoutes extends Record<string | 'notFound' | 'internalError', TypeRoute>>(params: {
     routes: TRoutes;
     pathname: string;
+    replace?: boolean;
 }): TypeRedirectParams<TRoutes, keyof TRoutes>;
 //# sourceMappingURL=getInitialRoute.d.ts.map

package/core/utils/getInitialRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getInitialRoute.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/getInitialRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAK/C,wBAAgB,eAAe,CAC7B,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,EACxE,MAAM,EAAE;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,kBAAkB,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,CAU3F"}
+{"version":3,"file":"getInitialRoute.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/getInitialRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAK/C,wBAAgB,eAAe,CAC7B,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,EACxE,MAAM,EAAE;IACR,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,kBAAkB,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,CAW7C"}

package/index.cjs

@@ -23,7 +23,6 @@ __export(core_exports, {
   RedirectError: () => RedirectError,
   createRouter: () => createRouter,
   createRoutes: () => createRoutes,
-  history: () => history,
   loadComponentToConfig: () => loadComponentToConfig,
   replaceDynamicValues: () => replaceDynamicValues,
   routerSetLoadedComponent: () => routerSetLoadedComponent
@@ -132,14 +131,11 @@ function getInitialRoute(params) {
   return {
     route: route.name,
     query: getQueryValues({ route, pathname: params.pathname }),
-    params: getDynamicValues({ route, pathname: params.pathname })
+    params: getDynamicValues({ route, pathname: params.pathname }),
+    replace: params.replace
   };
 }
 
-// packages/core/utils/history.ts
-var import_history = require("history");
-var history = constants.isClient ? (0, import_history.createBrowserHistory)() : null;
-
 // packages/core/utils/loadComponentToConfig.ts
 function loadComponentToConfig(params) {
   const { route } = params;
@@ -190,12 +186,12 @@ function replaceDynamicValues({
 // packages/core/createRouter.ts
 function createRouter(config) {
   const router = config.adapters.makeObservable({
-    routesHistory: [],
     currentRoute: {},
     isRedirecting: false,
     redirect: void 0,
     restoreFromURL: void 0,
     restoreFromServer: void 0,
+    destroy: void 0,
     get adapters() {
       return config.adapters;
     },
@@ -208,7 +204,6 @@ function createRouter(config) {
   });
   router.restoreFromServer = function restoreFromServer(obj) {
     router.adapters.batch(() => {
-      router.routesHistory.push(...obj.routesHistory || []);
       Object.assign(router.currentRoute, obj.currentRoute);
     });
     const preloadedRouteName = Object.keys(router.routes).find(
@@ -263,14 +258,9 @@ function createRouter(config) {
             ...router.currentRoute,
             query: nextQuery || {}
           });
-          router.routesHistory.push(nextUrl);
         });
-        if (history && !replace) {
-          history.push({
-            hash: history.location.hash,
-            search: nextSearch,
-            pathname: nextPathname
-          });
+        if (constants.isClient) {
+          window.history[replace ? "replaceState" : "pushState"](null, "", nextUrl);
         }
       }
       return Promise.resolve();
@@ -348,21 +338,25 @@ function createRouter(config) {
         params: getDynamicValues({ route: nextRoute, pathname: nextUrl }),
         pageId: router.routes[nextRoute.name].pageId
       });
-      const lastUrl = router.routesHistory[router.routesHistory.length - 1];
-      if (lastUrl !== nextUrl) {
-        router.routesHistory.push(nextUrl);
-      }
-      if (history && !replace) {
-        history.push({
-          hash: history.location.hash,
-          search: "query" in config2 ? `?${queryString.stringify(config2.query)}` : "",
-          pathname: nextPathname
-        });
+      if (constants.isClient) {
+        window.history[replace ? "replaceState" : "pushState"](null, "", nextUrl);
       }
       router.isRedirecting = false;
     });
     return Promise.resolve();
   };
+  function popHandler() {
+    const currentUrl = `${location.pathname}${location.search}`;
+    void router.restoreFromURL({ pathname: currentUrl, replace: true });
+  }
+  if (constants.isClient) {
+    window.addEventListener("popstate", popHandler);
+  }
+  router.destroy = function destroy() {
+    if (constants.isClient) {
+      window.removeEventListener("popstate", popHandler);
+    }
+  };
   return router;
 }
 

package/index.mjs

@@ -100,14 +100,11 @@ function getInitialRoute(params) {
   return {
     route: route.name,
     query: getQueryValues({ route, pathname: params.pathname }),
-    params: getDynamicValues({ route, pathname: params.pathname })
+    params: getDynamicValues({ route, pathname: params.pathname }),
+    replace: params.replace
   };
 }
 
-// packages/core/utils/history.ts
-import { createBrowserHistory } from "history";
-var history = constants.isClient ? createBrowserHistory() : null;
-
 // packages/core/utils/loadComponentToConfig.ts
 function loadComponentToConfig(params) {
   const { route } = params;
@@ -158,12 +155,12 @@ function replaceDynamicValues({
 // packages/core/createRouter.ts
 function createRouter(config) {
   const router = config.adapters.makeObservable({
-    routesHistory: [],
     currentRoute: {},
     isRedirecting: false,
     redirect: void 0,
     restoreFromURL: void 0,
     restoreFromServer: void 0,
+    destroy: void 0,
     get adapters() {
       return config.adapters;
     },
@@ -176,7 +173,6 @@ function createRouter(config) {
   });
   router.restoreFromServer = function restoreFromServer(obj) {
     router.adapters.batch(() => {
-      router.routesHistory.push(...obj.routesHistory || []);
       Object.assign(router.currentRoute, obj.currentRoute);
     });
     const preloadedRouteName = Object.keys(router.routes).find(
@@ -231,14 +227,9 @@ function createRouter(config) {
             ...router.currentRoute,
             query: nextQuery || {}
           });
-          router.routesHistory.push(nextUrl);
         });
-        if (history && !replace) {
-          history.push({
-            hash: history.location.hash,
-            search: nextSearch,
-            pathname: nextPathname
-          });
+        if (constants.isClient) {
+          window.history[replace ? "replaceState" : "pushState"](null, "", nextUrl);
         }
       }
       return Promise.resolve();
@@ -316,21 +307,25 @@ function createRouter(config) {
         params: getDynamicValues({ route: nextRoute, pathname: nextUrl }),
         pageId: router.routes[nextRoute.name].pageId
       });
-      const lastUrl = router.routesHistory[router.routesHistory.length - 1];
-      if (lastUrl !== nextUrl) {
-        router.routesHistory.push(nextUrl);
-      }
-      if (history && !replace) {
-        history.push({
-          hash: history.location.hash,
-          search: "query" in config2 ? `?${queryString.stringify(config2.query)}` : "",
-          pathname: nextPathname
-        });
+      if (constants.isClient) {
+        window.history[replace ? "replaceState" : "pushState"](null, "", nextUrl);
       }
       router.isRedirecting = false;
     });
     return Promise.resolve();
   };
+  function popHandler() {
+    const currentUrl = `${location.pathname}${location.search}`;
+    void router.restoreFromURL({ pathname: currentUrl, replace: true });
+  }
+  if (constants.isClient) {
+    window.addEventListener("popstate", popHandler);
+  }
+  router.destroy = function destroy() {
+    if (constants.isClient) {
+      window.removeEventListener("popstate", popHandler);
+    }
+  };
   return router;
 }
 
@@ -376,7 +371,6 @@ export {
   RedirectError,
   createRouter,
   createRoutes,
-  history,
   loadComponentToConfig,
   replaceDynamicValues,
   routerSetLoadedComponent

package/package.json

@@ -2,15 +2,12 @@
   "name": "reactive-route",
   "author": "Dmitry Kazakov",
   "license": "MIT",
-  "version": "0.0.1-alpha.31",
+  "version": "0.0.1-alpha.33",
   "description": "Reactive Router for different frameworks",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dkazakov8/reactive-route.git"
   },
-  "dependencies": {
-    "history": "5.3.0"
-  },
   "engines": {
     "node": ">=22"
   },

package/preact/Router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/preact/Router.tsx"],"names":[],"mappings":"AACA,OAAO,EAAqC,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAmE/F,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,GAK1D,GAAG,CACzC"}
+{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/preact/Router.tsx"],"names":[],"mappings":"AACA,OAAO,EAA4B,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AA6CtF,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,GAK1D,GAAG,CACzC"}

package/preact/index.cjs

@@ -30,20 +30,6 @@ var import_reactive_route = require("reactive-route");
 var import_jsx_runtime = require("preact/jsx-runtime");
 function RouterInner(props) {
   const disposerRef = (0, import_hooks.useRef)(null);
-  const redirectOnHistoryPop = (0, import_hooks.useCallback)(() => {
-    if (!import_reactive_route.history) return;
-    import_reactive_route.history.listen((params) => {
-      if (params.action !== "POP") return;
-      const previousRoutePathname = props.router.routesHistory[props.router.routesHistory.length - 2];
-      if (previousRoutePathname === params.location.pathname) {
-        props.router.adapters.batch(() => props.router.routesHistory.pop());
-      }
-      void props.router.restoreFromURL({
-        pathname: import_reactive_route.history.location.pathname,
-        replace: true
-      });
-    });
-  }, []);
   const [config] = (0, import_hooks.useState)(
     () => props.router.adapters.makeObservable({
       loadedComponentName: void 0,
@@ -54,7 +40,6 @@ function RouterInner(props) {
   (0, import_hooks.useState)(() => {
     props.router.adapters.batch(() => {
       props.beforeMount?.();
-      redirectOnHistoryPop();
       (0, import_reactive_route.routerSetLoadedComponent)(props, config);
       disposerRef.current = props.router.adapters.autorun(
         () => (0, import_reactive_route.routerSetLoadedComponent)(props, config)

package/preact/index.mjs

@@ -1,23 +1,9 @@
 // packages/preact/Router.tsx
-import { useCallback, useEffect, useRef, useState } from "preact/hooks";
-import { history, routerSetLoadedComponent } from "reactive-route";
+import { useEffect, useRef, useState } from "preact/hooks";
+import { routerSetLoadedComponent } from "reactive-route";
 import { jsx } from "preact/jsx-runtime";
 function RouterInner(props) {
   const disposerRef = useRef(null);
-  const redirectOnHistoryPop = useCallback(() => {
-    if (!history) return;
-    history.listen((params) => {
-      if (params.action !== "POP") return;
-      const previousRoutePathname = props.router.routesHistory[props.router.routesHistory.length - 2];
-      if (previousRoutePathname === params.location.pathname) {
-        props.router.adapters.batch(() => props.router.routesHistory.pop());
-      }
-      void props.router.restoreFromURL({
-        pathname: history.location.pathname,
-        replace: true
-      });
-    });
-  }, []);
   const [config] = useState(
     () => props.router.adapters.makeObservable({
       loadedComponentName: void 0,
@@ -28,7 +14,6 @@ function RouterInner(props) {
   useState(() => {
     props.router.adapters.batch(() => {
       props.beforeMount?.();
-      redirectOnHistoryPop();
       routerSetLoadedComponent(props, config);
       disposerRef.current = props.router.adapters.autorun(
         () => routerSetLoadedComponent(props, config)

package/react/Router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/react/Router.tsx"],"names":[],"mappings":"AACA,OAAO,EAAqC,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAmE/F,iBAAS,aAAa,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,GAK1D,GAAG,CACzC;AAED,eAAO,MAAM,MAAM,EAA0B,OAAO,aAAa,CAAC"}
+{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/react/Router.tsx"],"names":[],"mappings":"AACA,OAAO,EAA4B,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AA6CtF,iBAAS,aAAa,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,GAK1D,GAAG,CACzC;AAED,eAAO,MAAM,MAAM,EAA0B,OAAO,aAAa,CAAC"}

package/react/index.cjs

@@ -30,20 +30,6 @@ var import_reactive_route = require("reactive-route");
 var import_jsx_runtime = require("react/jsx-runtime");
 function RouterInner(props) {
   const disposerRef = (0, import_react.useRef)(null);
-  const redirectOnHistoryPop = (0, import_react.useCallback)(() => {
-    if (!import_reactive_route.history) return;
-    import_reactive_route.history.listen((params) => {
-      if (params.action !== "POP") return;
-      const previousRoutePathname = props.router.routesHistory[props.router.routesHistory.length - 2];
-      if (previousRoutePathname === params.location.pathname) {
-        props.router.adapters.batch(() => props.router.routesHistory.pop());
-      }
-      void props.router.restoreFromURL({
-        pathname: import_reactive_route.history.location.pathname,
-        replace: true
-      });
-    });
-  }, []);
   const [config] = (0, import_react.useState)(
     () => props.router.adapters.makeObservable({
       loadedComponentName: void 0,
@@ -54,7 +40,6 @@ function RouterInner(props) {
   (0, import_react.useState)(() => {
     props.router.adapters.batch(() => {
       props.beforeMount?.();
-      redirectOnHistoryPop();
       (0, import_reactive_route.routerSetLoadedComponent)(props, config);
       disposerRef.current = props.router.adapters.autorun(
         () => (0, import_reactive_route.routerSetLoadedComponent)(props, config)

package/react/index.mjs

@@ -1,23 +1,9 @@
 // packages/react/Router.tsx
-import { memo, useCallback, useEffect, useRef, useState } from "react";
-import { history, routerSetLoadedComponent } from "reactive-route";
+import { memo, useEffect, useRef, useState } from "react";
+import { routerSetLoadedComponent } from "reactive-route";
 import { jsx } from "react/jsx-runtime";
 function RouterInner(props) {
   const disposerRef = useRef(null);
-  const redirectOnHistoryPop = useCallback(() => {
-    if (!history) return;
-    history.listen((params) => {
-      if (params.action !== "POP") return;
-      const previousRoutePathname = props.router.routesHistory[props.router.routesHistory.length - 2];
-      if (previousRoutePathname === params.location.pathname) {
-        props.router.adapters.batch(() => props.router.routesHistory.pop());
-      }
-      void props.router.restoreFromURL({
-        pathname: history.location.pathname,
-        replace: true
-      });
-    });
-  }, []);
   const [config] = useState(
     () => props.router.adapters.makeObservable({
       loadedComponentName: void 0,
@@ -28,7 +14,6 @@ function RouterInner(props) {
   useState(() => {
     props.router.adapters.batch(() => {
       props.beforeMount?.();
-      redirectOnHistoryPop();
       routerSetLoadedComponent(props, config);
       disposerRef.current = props.router.adapters.autorun(
         () => routerSetLoadedComponent(props, config)

package/solid/Router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/solid/Router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAqC,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAI/F,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,kCAwDhG"}
+{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/solid/Router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA4B,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAItF,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,kCAsChG"}

package/solid/index.cjs

@@ -36,28 +36,16 @@ function Router(props) {
     loadedComponentPage: void 0,
     currentProps: {}
   });
-  function redirectOnHistoryPop() {
-    if (!import_reactive_route.history) return;
-    import_reactive_route.history.listen((params) => {
-      if (params.action !== "POP") return;
-      const previousRoutePathname = props.router.routesHistory[props.router.routesHistory.length - 2];
-      if (previousRoutePathname === params.location.pathname) {
-        props.router.routesHistory.pop();
-      }
-      void props.router.restoreFromURL({
-        pathname: import_reactive_route.history.location.pathname,
-        replace: true
-      });
-    });
-  }
   props.beforeMount?.();
-  redirectOnHistoryPop();
   if (props.router.adapters.immediateSetComponent) {
     props.router.adapters.batch(() => {
       (0, import_reactive_route.routerSetLoadedComponent)(props, config);
     });
   }
-  props.router.adapters.autorun(() => (0, import_reactive_route.routerSetLoadedComponent)(props, config));
+  const disposer = props.router.adapters.autorun(() => (0, import_reactive_route.routerSetLoadedComponent)(props, config));
+  (0, import_solid_js.onCleanup)(() => {
+    if (typeof disposer === "function") disposer();
+  });
   return (
     // @ts-ignore
     (0, import_web.createComponent)(import_solid_js.Show, {

package/solid/index.mjs

@@ -1,8 +1,8 @@
 // packages/solid/Router.tsx
 import { createComponent as _$createComponent } from "solid-js/web";
 import { mergeProps as _$mergeProps } from "solid-js/web";
-import { history, routerSetLoadedComponent } from "reactive-route";
-import { Show } from "solid-js";
+import { routerSetLoadedComponent } from "reactive-route";
+import { onCleanup, Show } from "solid-js";
 import { Dynamic } from "solid-js/web";
 function Router(props) {
   const config = props.router.adapters.makeObservable({
@@ -10,28 +10,16 @@ function Router(props) {
     loadedComponentPage: void 0,
     currentProps: {}
   });
-  function redirectOnHistoryPop() {
-    if (!history) return;
-    history.listen((params) => {
-      if (params.action !== "POP") return;
-      const previousRoutePathname = props.router.routesHistory[props.router.routesHistory.length - 2];
-      if (previousRoutePathname === params.location.pathname) {
-        props.router.routesHistory.pop();
-      }
-      void props.router.restoreFromURL({
-        pathname: history.location.pathname,
-        replace: true
-      });
-    });
-  }
   props.beforeMount?.();
-  redirectOnHistoryPop();
   if (props.router.adapters.immediateSetComponent) {
     props.router.adapters.batch(() => {
       routerSetLoadedComponent(props, config);
     });
   }
-  props.router.adapters.autorun(() => routerSetLoadedComponent(props, config));
+  const disposer = props.router.adapters.autorun(() => routerSetLoadedComponent(props, config));
+  onCleanup(() => {
+    if (typeof disposer === "function") disposer();
+  });
   return (
     // @ts-ignore
     _$createComponent(Show, {

package/core/utils/history.d.ts

@@ -1,7 +0,0 @@
-import { createBrowserHistory } from 'history';
-/**
- * @docs: https://github.com/ReactTraining/history
- *
- */
-export declare const history: ReturnType<typeof createBrowserHistory>;
-//# sourceMappingURL=history.d.ts.map

package/core/utils/history.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"history.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/history.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAI/C;;;GAGG;AAEH,eAAO,MAAM,OAAO,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAEnD,CAAC"}