@primate/core 0.9.6 → 0.9.8

package/lib/private/build/client/index.js

@@ -93,8 +93,15 @@ export default async function build_client(app) {
         const NO_HR = app.config("livereload.exclude") ?? [];
         app.entrypoint(`
     const NO_HR = ${JSON.stringify(NO_HR)};
-    new EventSource("/esbuild").addEventListener("change", () => {
-      if (!NO_HR.includes(location.pathname)) location.reload();
+    const live_reload = new EventSource("/esbuild");
+    const close_live_reload = () => live_reload.close();
+    addEventListener("pagehide", close_live_reload);
+    addEventListener("beforeunload", close_live_reload);
+    live_reload.addEventListener("change", () => {
+      if (!NO_HR.includes(location.pathname)) {
+        close_live_reload();
+        location.reload();
+      }
     });
   `);
     }

package/lib/private/client/Data.d.ts

@@ -2,6 +2,7 @@ import type Mode from "#Mode";
 import type RequestView from "#request/RequestView";
 import type { Dict } from "@rcompat/type";
 type ClientData<T extends Dict = Dict> = {
+    frontend: string;
     view: string;
     request: RequestView;
     csr: boolean;

package/lib/private/client/boot.d.ts

@@ -1,5 +1,5 @@
 import type { Updater } from "#client/root";
 import type { Dict } from "@rcompat/type";
 export default _default;
-declare function _default<T extends Dict>(u: Updater<T>): void;
+declare function _default<T extends Dict>(frontend: string, u: Updater<T>): void;
 //# sourceMappingURL=boot.d.ts.map

package/lib/private/client/boot.js

@@ -3,8 +3,12 @@ import root from "#client/root";
 import storage from "#client/storage";
 import submit from "#client/submit";
 import http from "@rcompat/http";
-export default (u) => {
-    root.set(u);
+let booted = false;
+export default (frontend, u) => {
+    root.set(u, frontend);
+    if (booted)
+        return;
+    booted = true;
     const { location, history } = globalThis;
     if (document.contentType === "application/json") {
         location.reload();

package/lib/private/client/index.d.ts

@@ -11,7 +11,7 @@ import type ValidateUpdater from "#client/ValidateUpdater";
 import type ValidationError from "#client/ValidationError";
 import type ViewResponse from "#client/ViewResponse";
 declare const client: {
-    boot: <T extends import("@rcompat/type").Dict>(u: import("./root.js").Updater<T>) => void;
+    boot: <T extends import("@rcompat/type").Dict>(frontend: string, u: import("./root.js").Updater<T>) => void;
     navigate: (href: string, event?: Event) => Promise<void>;
     submit: typeof submit;
     createForm: typeof createForm;

package/lib/private/client/navigate.js

@@ -21,8 +21,14 @@ async function goto(target, state = false, after) {
         const path = target.pathname + target.search;
         const { requested, response } = await transport.refetch(path, { headers });
         if (transport.is_json(response)) {
-            if (response.ok)
-                root.update(await response.json());
+            if (response.ok) {
+                const data = await response.json();
+                if (!root.same(data)) {
+                    location.assign(requested.toString() + target.hash);
+                    return;
+                }
+                root.update(data);
+            }
             if (state) {
                 storage.new({ hash: location.hash, pathname: location.pathname, scrollTop });
                 history.pushState({}, "", `${path}${target.hash}`);

package/lib/private/client/root.d.ts

@@ -2,7 +2,8 @@ import type ClientData from "#client/Data";
 import type { Dict } from "@rcompat/type";
 export type Updater<T extends Dict> = (json: ClientData<T>, after?: () => void) => void;
 declare const root: {
-    set(updater: Updater<any>): void;
+    set(updater: Updater<any>, name: string): void;
+    same(data: ClientData): boolean;
     update(data: any, after?: () => void): void;
 };
 export default root;

package/lib/private/client/root.js

@@ -1,7 +1,12 @@
 let current;
+let frontend;
 const root = {
-    set(updater) {
+    set(updater, name) {
         current = updater;
+        frontend = name;
+    },
+    same(data) {
+        return data.frontend === frontend;
     },
     update(data, after) {
         current(data, after);

package/lib/private/frontend.js

@@ -58,7 +58,7 @@ export default function frontend_module(init) {
             if (app_asset === undefined)
                 throw E.frontend_missing_app_js();
             const app_script = `<script type="module" src="${app_asset.src}"></script>`;
-            const props = JSON.stringify({ frontend: init.name, ...client });
+            const props = JSON.stringify(client);
             const hydrated = await inline(props, http.MIME.APPLICATION_JSON, "hydration");
             const script_src = [hydrated.integrity];
             return {
@@ -84,6 +84,7 @@ export default function frontend_module(init) {
                     }
                     : { props, request: $request };
                 const client = {
+                    frontend: init.name,
                     view: init.layouts ? "root" : await normalize(view),
                     csr,
                     ssr: ssr(),

package/lib/private/response/error.js

@@ -1,7 +1,14 @@
 import location from "#location";
 import http from "@rcompat/http";
 const sse_reload = `<script>
-  new EventSource("/esbuild").addEventListener("change", () => location.reload());
+  const live_reload = new EventSource("/esbuild");
+  const close_live_reload = () => live_reload.close();
+  addEventListener("pagehide", close_live_reload);
+  addEventListener("beforeunload", close_live_reload);
+  live_reload.addEventListener("change", () => {
+    close_live_reload();
+    location.reload();
+  });
 </script>`;
 /**
  * Render an error page.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/core",
-  "version": "0.9.6",
+  "version": "0.9.8",
   "description": "The universal web framework",
   "homepage": "https://primate.run",
   "bugs": "https://github.com/primate-run/primate/issues",