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

package/dist/client.d.mts

@@ -7,8 +7,8 @@ export { UseServerQueryOptions, UseServerQueryResult, useServerQuery } from './s
 export { F as FarmIntegrationAPI, e as FarmIntegrationAPIBodyFormat, f as FarmIntegrationAPIMethod, a as FarmIntegrationAPIOperation, g as FarmIntegrationAPIResponseFormat, b as api, d as defineIntegrationAPI, c as defineIntegrationAPIOperation, i as endpoint } from './config-DtTPh5Ml.mjs';
 export { UseThemeResult, useTheme } from './theme/client.mjs';
 import { FarmRouterPathParams, FarmRouterPathParam, FarmRouterBuildOptions, FarmRouterRouteInput } from './router.mjs';
-import { i as FarmViewTransitionMode, e as FarmNavigationBlockerContext, F as FarmNavigationState } from './spa-router-BD7iUG-C.mjs';
-export { a as FarmNavigateOptions, d as FarmNavigationBlocker, f as FarmNavigationListener, h as FarmNavigationLocation, S as SPARouter, g as getRouter, n as navigateTo, p as prefetch, b as pushState, r as readPageState, c as replaceState } from './spa-router-BD7iUG-C.mjs';
+import { i as FarmViewTransitionMode, e as FarmNavigationBlockerContext, F as FarmNavigationState } from './spa-router-BV71GGW0.mjs';
+export { a as FarmNavigateOptions, d as FarmNavigationBlocker, f as FarmNavigationListener, h as FarmNavigationLocation, S as SPARouter, g as getRouter, n as navigateTo, p as prefetch, b as pushState, r as readPageState, c as replaceState } from './spa-router-BV71GGW0.mjs';
 import { b as FarmI18nLocale } from './types-mP6R6CzS.mjs';
 export { F as FarmChunkRecoveryOptions, i as installChunkErrorRecovery, a as isChunkLoadError } from './chunk-recovery-lnQFzcQP.mjs';
 export { a as FarmClientHydrationCompleteEvent, b as FarmClientHydrationEvent, d as FarmClientHydrationMode, e as FarmClientHydrationSession, f as FarmClientLocation, g as FarmClientNavigationAction, h as FarmClientNavigationErrorEvent, i as FarmClientNavigationEvent, j as FarmClientNavigationLoadedEvent, k as FarmClientNavigationResolvedEvent, l as FarmClientNavigationSession, m as FarmClientPerformanceEvent, n as FarmClientPlugin, o as FarmClientPluginCloseEvent, p as FarmClientPluginEnforce, q as FarmClientPluginErrorEvent, r as FarmClientPluginErrorPhase, F as FarmClientPluginManager, s as FarmClientPluginManagerOptions, t as FarmClientPluginMetadata, u as FarmClientPluginRegistration, v as FarmClientPluginRouter, w as FarmClientPluginSetupEvent, x as FarmClientPluginStateEvent, c as createClientPluginManager } from './lifecycle-CgO0tX2y.mjs';
@@ -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

@@ -7,8 +7,8 @@ export { UseServerQueryOptions, UseServerQueryResult, useServerQuery } from './s
 export { F as FarmIntegrationAPI, e as FarmIntegrationAPIBodyFormat, f as FarmIntegrationAPIMethod, a as FarmIntegrationAPIOperation, g as FarmIntegrationAPIResponseFormat, b as api, d as defineIntegrationAPI, c as defineIntegrationAPIOperation, i as endpoint } from './config-kwlUiWBX.js';
 export { UseThemeResult, useTheme } from './theme/client.js';
 import { FarmRouterPathParams, FarmRouterPathParam, FarmRouterBuildOptions, FarmRouterRouteInput } from './router.js';
-import { i as FarmViewTransitionMode, e as FarmNavigationBlockerContext, F as FarmNavigationState } from './spa-router-swFKTqwR.js';
-export { a as FarmNavigateOptions, d as FarmNavigationBlocker, f as FarmNavigationListener, h as FarmNavigationLocation, S as SPARouter, g as getRouter, n as navigateTo, p as prefetch, b as pushState, r as readPageState, c as replaceState } from './spa-router-swFKTqwR.js';
+import { i as FarmViewTransitionMode, e as FarmNavigationBlockerContext, F as FarmNavigationState } from './spa-router-BylM6JXm.js';
+export { a as FarmNavigateOptions, d as FarmNavigationBlocker, f as FarmNavigationListener, h as FarmNavigationLocation, S as SPARouter, g as getRouter, n as navigateTo, p as prefetch, b as pushState, r as readPageState, c as replaceState } from './spa-router-BylM6JXm.js';
 import { b as FarmI18nLocale } from './types-mP6R6CzS.js';
 export { F as FarmChunkRecoveryOptions, i as installChunkErrorRecovery, a as isChunkLoadError } from './chunk-recovery-lnQFzcQP.js';
 export { a as FarmClientHydrationCompleteEvent, b as FarmClientHydrationEvent, d as FarmClientHydrationMode, e as FarmClientHydrationSession, f as FarmClientLocation, g as FarmClientNavigationAction, h as FarmClientNavigationErrorEvent, i as FarmClientNavigationEvent, j as FarmClientNavigationLoadedEvent, k as FarmClientNavigationResolvedEvent, l as FarmClientNavigationSession, m as FarmClientPerformanceEvent, n as FarmClientPlugin, o as FarmClientPluginCloseEvent, p as FarmClientPluginEnforce, q as FarmClientPluginErrorEvent, r as FarmClientPluginErrorPhase, F as FarmClientPluginManager, s as FarmClientPluginManagerOptions, t as FarmClientPluginMetadata, u as FarmClientPluginRegistration, v as FarmClientPluginRouter, w as FarmClientPluginSetupEvent, x as FarmClientPluginStateEvent, c as createClientPluginManager } from './lifecycle-CgO0tX2y.js';
@@ -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

@@ -3,7 +3,7 @@ import {
   createStore,
   useFetcher,
   useMutation
-} from "./chunk-JECGLPIS.mjs";
+} from "./chunk-PYIVNTDI.mjs";
 import {
   useAction
 } from "./chunk-SALMKQXH.mjs";
@@ -16,7 +16,7 @@ import {
   usePageState,
   useRouter,
   useScrollRestoration
-} from "./chunk-BDHDDITP.mjs";
+} from "./chunk-FPLRESQA.mjs";
 import {
   useTheme
 } from "./chunk-CHITERV2.mjs";
@@ -39,6 +39,12 @@ import {
   fetchServerQuery,
   prefetchServerQuery
 } from "./chunk-3E2WRUR2.mjs";
+import {
+  getTheme,
+  setTheme,
+  toggleTheme
+} from "./chunk-ZUSJ5CDC.mjs";
+import "./chunk-ZBE6MLHL.mjs";
 import {
   SPARouter,
   getRouter,
@@ -47,14 +53,8 @@ import {
   pushState,
   readPageState,
   replaceState
-} from "./chunk-427JQ6OZ.mjs";
+} from "./chunk-5T2XATMK.mjs";
 import "./chunk-ITN462YM.mjs";
-import {
-  getTheme,
-  setTheme,
-  toggleTheme
-} from "./chunk-ZUSJ5CDC.mjs";
-import "./chunk-ZBE6MLHL.mjs";
 import "./chunk-C4XSKA7P.mjs";
 import "./chunk-SCFX4UTD.mjs";
 import {
@@ -62,7 +62,7 @@ import {
   createClientPluginManager,
   installChunkErrorRecovery,
   isChunkLoadError
-} from "./chunk-J34JCW6R.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-ENPB4CSY.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.54";
+    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";
@@ -47933,6 +47970,16 @@ var _SPARouter = class _SPARouter {
     this.navigationListeners = /* @__PURE__ */ new Set();
     this.navigationState = IDLE_NAVIGATION_STATE;
     this.scrollElements = /* @__PURE__ */ new Map();
+    this.onPopState = /* @__PURE__ */ __name((event) => {
+      void this.handlePopState(event);
+    }, "onPopState");
+    this.onBeforeUnload = /* @__PURE__ */ __name((event) => {
+      if (this.blockers.size > 0) {
+        event.preventDefault();
+        event.returnValue = "";
+      }
+      this.saveScrollPosition(window.location.pathname);
+    }, "onBeforeUnload");
     this.options = {
       prefetchTimeout: options.prefetchTimeout ?? 100,
       cacheMaxAge: options.cacheMaxAge ?? 3e4,
@@ -47942,16 +47989,16 @@ var _SPARouter = class _SPARouter {
       deploymentId: options.deploymentId ?? readBrowserDeploymentId()
     };
     if (typeof window !== "undefined") {
-      window.addEventListener("popstate", this.handlePopState.bind(this));
-      window.addEventListener("beforeunload", (event) => {
-        if (this.blockers.size > 0) {
-          event.preventDefault();
-          event.returnValue = "";
-        }
-        this.saveScrollPosition(window.location.pathname);
-      });
+      window.addEventListener("popstate", this.onPopState);
+      window.addEventListener("beforeunload", this.onBeforeUnload);
     }
   }
+  /** Remove global listeners. Intended for tests and teardown. */
+  destroy() {
+    if (typeof window === "undefined") return;
+    window.removeEventListener("popstate", this.onPopState);
+    window.removeEventListener("beforeunload", this.onBeforeUnload);
+  }
   /**
    * Set the navigation handler that updates React
    */
@@ -48345,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
@@ -48414,11 +48461,16 @@ function dispatchDeploymentMismatch(error) {
   window.dispatchEvent(new CustomEvent("farm:deployment-mismatch", { detail: error }));
 }
 __name(dispatchDeploymentMismatch, "dispatchDeploymentMismatch");
+function getInstalledFarmSPARouter() {
+  if (typeof window === "undefined") return void 0;
+  return window.__FARM_SPA_ROUTER__;
+}
+__name(getInstalledFarmSPARouter, "getInstalledFarmSPARouter");
 function getRouter2() {
   if (typeof window === "undefined") {
     return new SPARouter();
   }
-  const installedRouter = window.__FARM_SPA_ROUTER__;
+  const installedRouter = getInstalledFarmSPARouter();
   if (installedRouter) {
     routerInstance = installedRouter;
     return installedRouter;
@@ -48488,6 +48540,22 @@ __name(getScrollElementStorageKey, "getScrollElementStorageKey");
 
 // 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;
@@ -48505,20 +48573,14 @@ function useRouter(options = {}) {
       setState(readRouterState(basePath, routeMatcher));
     }, "handlePopState");
     handlePopState();
-    window.addEventListener("popstate", handlePopState);
-    return () => window.removeEventListener("popstate", 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;
@@ -48557,8 +48619,7 @@ function usePageState() {
       setState(readPageState());
     }, "handlePopState");
     handlePopState();
-    window.addEventListener("popstate", handlePopState);
-    return () => window.removeEventListener("popstate", handlePopState);
+    return subscribeHistoryChange(handlePopState);
   }, []);
   return state;
 }