@farm.js/core 0.1.0-beta.55 → 0.1.0-beta.56

package/dist/internal/client-runtime.mjs

@@ -1,12 +1,12 @@
 import {
   createClientPluginManager,
   installChunkErrorRecovery
-} from "../chunk-MSQDIAQW.mjs";
+} from "../chunk-FOEPWRHM.mjs";
 import {
   searchParamsToObject
 } from "../chunk-4DCGM2BW.mjs";
 import "../chunk-FXG2PS27.mjs";
-import "../chunk-BLTATPSB.mjs";
+import "../chunk-XLQVJDK2.mjs";
 import {
   __name
 } from "../chunk-CGILA3WO.mjs";

package/dist/navigation.cjs

@@ -435,6 +435,35 @@ function rejectPendingDeferred(controllers, message) {
 }
 __name(rejectPendingDeferred, "rejectPendingDeferred");
 
+// src/client/history-sync.ts
+var FARM_HISTORY_CHANGE_EVENT = "farm:historychange";
+function notifyHistoryChange(kind) {
+  if (typeof window === "undefined") return;
+  setTimeout(() => {
+    if (kind === "url-search" && !getInstalledFarmSPARouter()) {
+      window.dispatchEvent(new PopStateEvent("popstate"));
+      return;
+    }
+    window.dispatchEvent(
+      new CustomEvent(FARM_HISTORY_CHANGE_EVENT, {
+        detail: { kind }
+      })
+    );
+  }, 0);
+}
+__name(notifyHistoryChange, "notifyHistoryChange");
+function subscribeHistoryChange(listener) {
+  if (typeof window === "undefined") return () => {
+  };
+  window.addEventListener("popstate", listener);
+  window.addEventListener(FARM_HISTORY_CHANGE_EVENT, listener);
+  return () => {
+    window.removeEventListener("popstate", listener);
+    window.removeEventListener(FARM_HISTORY_CHANGE_EVENT, listener);
+  };
+}
+__name(subscribeHistoryChange, "subscribeHistoryChange");
+
 // src/deployment.ts
 var FARM_DEPLOYMENT_ID_HEADER = "x-farm-deployment-id";
 var FARM_DEPLOYMENT_MISMATCH_HEADER = "x-farm-deployment-mismatch";
@@ -1038,7 +1067,7 @@ var _SPARouter = class _SPARouter {
     } else {
       window.history.pushState(nextState, "", url);
     }
-    window.dispatchEvent(new PopStateEvent("popstate", { state: nextState }));
+    notifyHistoryChange("page-state");
   }
   /**
    * Save scroll position for a path
@@ -1168,21 +1197,23 @@ function getScrollElementStorageKey(path, key) {
 }
 __name(getScrollElementStorageKey, "getScrollElementStorageKey");
 
-// src/client/url-search-sync.ts
-var FARM_URL_SEARCH_CHANGE_EVENT = "farm:urlsearchchange";
-function subscribeUrlSearchObservers(listener) {
-  if (typeof window === "undefined") return () => {
-  };
-  window.addEventListener("popstate", listener);
-  window.addEventListener(FARM_URL_SEARCH_CHANGE_EVENT, listener);
-  return () => {
-    window.removeEventListener("popstate", listener);
-    window.removeEventListener(FARM_URL_SEARCH_CHANGE_EVENT, listener);
-  };
-}
-__name(subscribeUrlSearchObservers, "subscribeUrlSearchObservers");
-
 // src/client/router.ts
+function navigateViaRouter(href, basePath, replace) {
+  if (typeof window === "undefined") return;
+  const url = href.startsWith("/") ? basePath + href : href;
+  const spaRouter = getInstalledFarmSPARouter();
+  if (spaRouter) {
+    void spaRouter.navigate(url, { replace });
+    return;
+  }
+  if (replace) {
+    window.history.replaceState(null, "", url);
+  } else {
+    window.history.pushState(null, "", url);
+  }
+  notifyHistoryChange("url-search");
+}
+__name(navigateViaRouter, "navigateViaRouter");
 function useRouter(options = {}) {
   const basePath = options.basePath || "";
   const routes = options.routes;
@@ -1200,20 +1231,14 @@ function useRouter(options = {}) {
       setState(readRouterState(basePath, routeMatcher));
     }, "handlePopState");
     handlePopState();
-    const unsubscribe = subscribeUrlSearchObservers(handlePopState);
+    const unsubscribe = subscribeHistoryChange(handlePopState);
     return unsubscribe;
   }, [basePath, routeMatcher]);
   const push = /* @__PURE__ */ __name((href) => {
-    if (typeof window === "undefined") return;
-    const url = href.startsWith("/") ? basePath + href : href;
-    window.history.pushState(null, "", url);
-    window.dispatchEvent(new PopStateEvent("popstate"));
+    navigateViaRouter(href, basePath, false);
   }, "push");
   const replace = /* @__PURE__ */ __name((href) => {
-    if (typeof window === "undefined") return;
-    const url = href.startsWith("/") ? basePath + href : href;
-    window.history.replaceState(null, "", url);
-    window.dispatchEvent(new PopStateEvent("popstate"));
+    navigateViaRouter(href, basePath, true);
   }, "replace");
   const pushState = /* @__PURE__ */ __name((pageState, href) => {
     if (typeof window === "undefined") return;