@farm.js/core 0.1.0-beta.80 → 0.1.0-beta.81

package/dist/client-plugins.d.mts

@@ -1,5 +1,5 @@
 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-De0vQG45.mjs';
-export { a7 as FarmPlugin, aO as FarmPluginContext, aR as FarmRequestPluginContext, aS as FarmRequestStore } from './client-plugins-BtfLE4dW.mjs';
+export { a7 as FarmPlugin, aO as FarmPluginContext, aR as FarmRequestPluginContext, aS as FarmRequestStore } from './client-plugins-HizW0gLc.mjs';
 import './renderer.mjs';
 import 'http';
 import './types-D1A6-XvH.mjs';

package/dist/client-plugins.d.ts

@@ -1,5 +1,5 @@
 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-De0vQG45.js';
-export { a7 as FarmPlugin, aO as FarmPluginContext, aR as FarmRequestPluginContext, aS as FarmRequestStore } from './client-plugins-C4me5UPd.js';
+export { a7 as FarmPlugin, aO as FarmPluginContext, aR as FarmRequestPluginContext, aS as FarmRequestStore } from './client-plugins-w_b1wA8e.js';
 import './renderer.js';
 import 'http';
 import './types-D1A6-XvH.js';

package/dist/client-plugins.mjs

@@ -1,9 +1,9 @@
 import {
   FarmClientPluginManager,
   createClientPluginManager
-} from "./chunk-3UGGCJT5.mjs";
+} from "./chunk-HSCQGINR.mjs";
 import "./chunk-FXG2PS27.mjs";
-import "./chunk-OEI62POE.mjs";
+import "./chunk-6NV2RJSZ.mjs";
 import "./chunk-CGILA3WO.mjs";
 export {
   FarmClientPluginManager,

package/dist/client.cjs

@@ -5146,6 +5146,14 @@ __name(rejectPendingDeferred, "rejectPendingDeferred");
 
 // src/client/history-sync.ts
 var FARM_HISTORY_CHANGE_EVENT = "farm:historychange";
+function dispatchHistoryChange(kind) {
+  window.dispatchEvent(
+    new CustomEvent(FARM_HISTORY_CHANGE_EVENT, {
+      detail: { kind }
+    })
+  );
+}
+__name(dispatchHistoryChange, "dispatchHistoryChange");
 function notifyHistoryChange(kind) {
   if (typeof window === "undefined") return;
   setTimeout(() => {
@@ -5153,14 +5161,15 @@ function notifyHistoryChange(kind) {
       window.dispatchEvent(new PopStateEvent("popstate"));
       return;
     }
-    window.dispatchEvent(
-      new CustomEvent(FARM_HISTORY_CHANGE_EVENT, {
-        detail: { kind }
-      })
-    );
+    dispatchHistoryChange(kind);
   }, 0);
 }
 __name(notifyHistoryChange, "notifyHistoryChange");
+function notifyRouterHistoryChange() {
+  if (typeof window === "undefined") return;
+  setTimeout(() => dispatchHistoryChange("url-search"), 0);
+}
+__name(notifyRouterHistoryChange, "notifyRouterHistoryChange");
 function subscribeHistoryChange(listener) {
   if (typeof window === "undefined") return () => {
   };
@@ -5270,6 +5279,7 @@ var _SPARouter = class _SPARouter {
     this.prefetchingUrls = /* @__PURE__ */ new Set();
     this.observers = /* @__PURE__ */ new Map();
     this.blockers = /* @__PURE__ */ new Set();
+    this.unloadBlockers = /* @__PURE__ */ new Map();
     this.navigationListeners = /* @__PURE__ */ new Set();
     this.navigationState = IDLE_NAVIGATION_STATE;
     this.currentHistoryPath = null;
@@ -5281,7 +5291,7 @@ var _SPARouter = class _SPARouter {
       void this.handlePopState(event);
     }, "onPopState");
     this.onBeforeUnload = /* @__PURE__ */ __name((event) => {
-      if (this.blockers.size > 0) {
+      if (this.shouldBlockUnload()) {
         event.preventDefault();
         event.returnValue = "";
       }
@@ -5459,6 +5469,7 @@ var _SPARouter = class _SPARouter {
     if (isFarmLocaleChangeHref(href)) return;
     const url = new URL(href, window.location.origin);
     if (isFarmExternalNavigationURL(url, window.location.origin)) return;
+    if (this.options.shouldUseDocumentNavigation(url.pathname)) return;
     const fullPath = url.pathname + url.search;
     const interceptFrom = window.location.pathname + window.location.search;
     if (this.prefetchingUrls.has(fullPath)) return;
@@ -5507,10 +5518,15 @@ var _SPARouter = class _SPARouter {
       this.observers.delete(element);
     }
   }
-  addBlocker(blocker) {
+  addBlocker(blocker, shouldBlockUnload2) {
     this.blockers.add(blocker);
+    this.unloadBlockers.set(
+      blocker,
+      shouldBlockUnload2 ?? (() => this.evaluateBlockerForUnload(blocker))
+    );
     return () => {
       this.blockers.delete(blocker);
+      this.unloadBlockers.delete(blocker);
     };
   }
   getNavigationState() {
@@ -5539,11 +5555,16 @@ var _SPARouter = class _SPARouter {
     this.writePageState("replace", state, href);
   }
   async commitNavigation(options) {
-    const historyPath = options.pageData.canonicalPath || options.fullPath;
+    const historyUrl = new URL(
+      options.pageData.canonicalPath || options.fullPath,
+      window.location.origin
+    );
+    historyUrl.hash = options.url.hash;
+    const historyPath = historyUrl.pathname + historyUrl.search + historyUrl.hash;
     const historyState = createHistoryState(
       historyPath,
       options.state,
-      void 0,
+      options.replace ? window.history.state : void 0,
       options.pageData.interception?.from ?? null
     );
     const nextHistoryIndex = this.currentHistoryIndex == null ? null : options.replace ? this.currentHistoryIndex : this.currentHistoryIndex + 1;
@@ -5557,18 +5578,8 @@ var _SPARouter = class _SPARouter {
     }
     this.currentHistoryIndex = nextHistoryIndex;
     this.currentHistoryPath = new URL(historyPath, window.location.origin).pathname + new URL(historyPath, window.location.origin).search;
-    if (options.pageData.metadata?.title) {
-      document.title = options.pageData.metadata.title;
-    }
-    if (options.pageData.metadata?.description) {
-      let metaDesc = document.querySelector('meta[name="description"]');
-      if (!metaDesc) {
-        metaDesc = document.createElement("meta");
-        metaDesc.setAttribute("name", "description");
-        document.head.appendChild(metaDesc);
-      }
-      metaDesc.setAttribute("content", options.pageData.metadata.description);
-    }
+    notifyRouterHistoryChange();
+    this.updateDocumentMetadata(options.pageData.metadata);
     _hydrateFarmI18n(options.pageData.i18n);
     if (this.onNavigate) {
       await this.onNavigate(options.pageData);
@@ -5718,9 +5729,7 @@ var _SPARouter = class _SPARouter {
         await this.clientPlugins?.markNavigationLoaded(clientNavigation, pageData);
       }
       if (!this.isCurrentNavigation(navigation, clientNavigation)) return;
-      if (pageData.metadata?.title) {
-        document.title = pageData.metadata.title;
-      }
+      this.updateDocumentMetadata(pageData.metadata);
       _hydrateFarmI18n(pageData.i18n);
       if (this.onNavigate) {
         await this.onNavigate(pageData);
@@ -5764,6 +5773,39 @@ var _SPARouter = class _SPARouter {
     }
     return false;
   }
+  evaluateBlockerForUnload(blocker) {
+    const path = window.location.pathname + window.location.search;
+    const result = blocker({ from: path, to: path, action: "replace" });
+    if (result && typeof result !== "boolean") {
+      void result.catch(() => void 0);
+      return true;
+    }
+    return result === true;
+  }
+  shouldBlockUnload() {
+    for (const blocker of this.blockers) {
+      try {
+        if (this.unloadBlockers.get(blocker)?.()) return true;
+      } catch {
+        return true;
+      }
+    }
+    return false;
+  }
+  updateDocumentMetadata(metadata) {
+    document.title = metadata?.title || "Farm.js App";
+    let description = document.querySelector('meta[name="description"]');
+    if (!metadata?.description) {
+      description?.remove();
+      return;
+    }
+    if (!description) {
+      description = document.createElement("meta");
+      description.setAttribute("name", "description");
+      document.head.appendChild(description);
+    }
+    description.setAttribute("content", metadata.description);
+  }
   startNavigation(options) {
     this.activeNavigation?.controller.abort("superseded");
     const navigation = {
@@ -5974,6 +6016,26 @@ function _resolveCurrentRequest() {
 __name(_resolveCurrentRequest, "_resolveCurrentRequest");
 
 // src/client/router.ts
+function shouldBlockUnload(options) {
+  const path = window.location.pathname + window.location.search;
+  const context2 = {
+    from: path,
+    to: path,
+    action: "replace"
+  };
+  const when = typeof options.when === "function" ? options.when(context2) : options.when;
+  if (!when) return false;
+  if (!options.shouldBlock) return true;
+  try {
+    const result = options.shouldBlock(context2);
+    if (typeof result === "boolean") return result;
+    void result.catch(() => void 0);
+    return true;
+  } catch {
+    return true;
+  }
+}
+__name(shouldBlockUnload, "shouldBlockUnload");
 function navigateViaRouter(href, basePath, replace) {
   if (typeof window === "undefined") return;
   const url = applyFarmBasePath(href, basePath);
@@ -6077,18 +6139,21 @@ function useBlocker(options) {
     if (typeof window === "undefined" || !active) {
       return;
     }
-    return getRouter2().addBlocker(async (context2) => {
-      const current = optionsRef.current;
-      const when = typeof current.when === "function" ? current.when(context2) : current.when;
-      if (!when) return false;
-      if (current.shouldBlock && !await current.shouldBlock(context2)) {
-        return false;
-      }
-      if (current.message && typeof window.confirm === "function") {
-        return !window.confirm(current.message);
-      }
-      return true;
-    });
+    return getRouter2().addBlocker(
+      async (context2) => {
+        const current = optionsRef.current;
+        const when = typeof current.when === "function" ? current.when(context2) : current.when;
+        if (!when) return false;
+        if (current.shouldBlock && !await current.shouldBlock(context2)) {
+          return false;
+        }
+        if (current.message && typeof window.confirm === "function") {
+          return !window.confirm(current.message);
+        }
+        return true;
+      },
+      () => shouldBlockUnload(optionsRef.current)
+    );
   }, [active]);
   return { active };
 }
@@ -6767,7 +6832,7 @@ body {
 `;
 
 // package.json
-var version = "0.1.0-beta.80";
+var version = "0.1.0-beta.81";
 
 // src/version.ts
 var FARM_VERSION = version;