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

package/dist/client.d.mts

@@ -286,9 +286,6 @@ interface UseBlockerOptions {
 interface UseBlockerReturn {
     active: boolean;
 }
-/**
- * Hook for accessing router state and navigation
- */
 declare function useRouter(options?: UseRouterOptions): {
     push: (href: string) => void;
     replace: (href: string) => void;

package/dist/client.d.ts

@@ -286,9 +286,6 @@ interface UseBlockerOptions {
 interface UseBlockerReturn {
     active: boolean;
 }
-/**
- * Hook for accessing router state and navigation
- */
 declare function useRouter(options?: UseRouterOptions): {
     push: (href: string) => void;
     replace: (href: string) => void;

package/dist/client.mjs

@@ -16,7 +16,7 @@ import {
   usePageState,
   useRouter,
   useScrollRestoration
-} from "./chunk-ZP5IWDTE.mjs";
+} from "./chunk-FPLRESQA.mjs";
 import {
   useTheme
 } from "./chunk-CHITERV2.mjs";
@@ -53,7 +53,7 @@ import {
   pushState,
   readPageState,
   replaceState
-} from "./chunk-YBHLSG7E.mjs";
+} from "./chunk-5T2XATMK.mjs";
 import "./chunk-ITN462YM.mjs";
 import "./chunk-C4XSKA7P.mjs";
 import "./chunk-SCFX4UTD.mjs";
@@ -62,7 +62,7 @@ import {
   createClientPluginManager,
   installChunkErrorRecovery,
   isChunkLoadError
-} from "./chunk-MSQDIAQW.mjs";
+} from "./chunk-FOEPWRHM.mjs";
 import "./chunk-GQVQESLY.mjs";
 import {
   api,
@@ -80,7 +80,7 @@ import "./chunk-RBRLLZL5.mjs";
 import "./chunk-WZ5QFROO.mjs";
 import "./chunk-7ZMKVETU.mjs";
 import "./chunk-FXG2PS27.mjs";
-import "./chunk-BLTATPSB.mjs";
+import "./chunk-XLQVJDK2.mjs";
 import "./chunk-CGILA3WO.mjs";
 export {
   APIClientError,

package/dist/index.cjs

@@ -15255,7 +15255,7 @@ var init_server3 = __esm({
 var version;
 var init_package = __esm({
   "package.json"() {
-    version = "0.1.0-beta.55";
+    version = "0.1.0-beta.56";
   }
 });
 
@@ -40879,7 +40879,13 @@ function generateUniversalRouterStateProperties() {
     } else {
       window.history.pushState(nextState, "", url);
     }
-    window.dispatchEvent(new PopStateEvent("popstate", { state: nextState }));
+    // Announce on the dedicated history channel; a synthetic popstate would
+    // be treated as back/forward by the popstate listener below and trigger
+    // a full navigation for a shallow page-state write. The bundled client
+    // hooks subscribe to this event via subscribeHistoryChange.
+    window.dispatchEvent(
+      new CustomEvent("farm:historychange", { detail: { kind: "page-state" } }),
+    );
   },
 
   registerScrollElement: function(key, element) {
@@ -47904,6 +47910,37 @@ var import_react11 = require("react");
 
 // src/client/spa-router.ts
 init_deferred();
+
+// 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/client/spa-router.ts
 init_deployment();
 var FARM_PAGE_STATE_KEY = "__farmPageState";
 var FARM_INTERCEPT_FROM_KEY = "__farmInterceptFrom";
@@ -48355,7 +48392,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
@@ -48501,22 +48538,24 @@ function getScrollElementStorageKey(path38, 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
 init_routing();
+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;
@@ -48534,20 +48573,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 pushState2 = /* @__PURE__ */ __name((pageState, href) => {
     if (typeof window === "undefined") return;
@@ -48586,8 +48619,7 @@ function usePageState() {
       setState(readPageState());
     }, "handlePopState");
     handlePopState();
-    window.addEventListener("popstate", handlePopState);
-    return () => window.removeEventListener("popstate", handlePopState);
+    return subscribeHistoryChange(handlePopState);
   }, []);
   return state;
 }