@alignable/bifrost 0.0.10 → 0.0.12

package/dist/lib/{mergeHead.js → turbolinks/mergeHead.js}

@@ -1,14 +1,23 @@
-import { dispatchTurbolinks } from "./dispatchTurbolinks.js";
-import { activateNewBodyScriptElements, createScriptElement } from "./domUtils.js";
+import { createScriptElement } from "./util";
 const allHeadScriptsEverRun = {};
 let firstLoad = true;
-// takes in innerHTML of head
-export function mergeHead(head) {
-    const parsed = document.createRange().createContextualFragment(head); // Create a 'tiny' document and parse the html string
-    const newHead = categorizeHead(parsed);
+let lastTrackedScriptSignature;
+export async function mergeHead(head, trackScripts, reload) {
+    const newHead = categorizeHead(head);
     const oldHead = categorizeHead(document.head);
-    if (!trackedScriptsIdentical(oldHead.scripts, newHead.scripts)) {
-        window.location.reload();
+    if (head
+        .querySelector('meta[name="turbolinks-visit-control"]')
+        ?.getAttribute("content") === "reload") {
+        reload();
+    }
+    if (trackScripts) {
+        lastTrackedScriptSignature =
+            lastTrackedScriptSignature ||
+                trackedElementSignature([...oldHead.scripts, ...oldHead.stylesheets]);
+        if (lastTrackedScriptSignature !==
+            trackedElementSignature([...newHead.scripts, ...newHead.stylesheets])) {
+            reload();
+        }
     }
     if (firstLoad) {
         // TODO: messy code
@@ -22,17 +31,15 @@ export function mergeHead(head) {
     copyNewHeadStylesheetElements(newHead.stylesheets, oldHead.stylesheets);
     removeCurrentHeadProvisionalElements(oldHead.provisional);
     copyNewHeadProvisionalElements(newHead.provisional);
-    copyNewHeadScriptElements(newHead.scripts);
+    return new Promise((resolve) => {
+        copyNewHeadScriptElements(newHead.scripts, resolve);
+    });
 }
-function trackedScriptsIdentical(prev, next) {
-    return (prev
+function trackedElementSignature(scripts) {
+    return scripts
         .filter(elementIsTracked)
         .map((s) => s.outerHTML)
-        .join() ===
-        next
-            .filter(elementIsTracked)
-            .map((s) => s.outerHTML)
-            .join());
+        .join();
 }
 function copyNewHeadStylesheetElements(next, prev) {
     const existing = prev.map((s) => s.outerHTML);
@@ -42,17 +49,10 @@ function copyNewHeadStylesheetElements(next, prev) {
         }
     }
 }
-function copyNewHeadScriptElements(next) {
+function copyNewHeadScriptElements(next, onScriptsLoaded) {
     let blockingLoaded = [];
     function dispatch() {
-        const scripts = document.body
-            .querySelector("#proxied-body")
-            .querySelectorAll("script");
-        // TODO: maybe this goes in onTransitionEnd? Need to test.
-        activateNewBodyScriptElements(Array.from(scripts));
-        focusFirstAutofocusableElement();
-        dispatchTurbolinks("turbolinks:render", {});
-        dispatchTurbolinks("turbolinks:load", { url: window.location.href });
+        onScriptsLoaded();
     }
     for (const element of next) {
         const runBefore = element.outerHTML in allHeadScriptsEverRun;
@@ -75,8 +75,8 @@ function copyNewHeadScriptElements(next) {
         }
     }
     if (blockingLoaded.length === 0) {
-        //TODO: raf waits for react to run... not 100% sure of the reliability
-        requestAnimationFrame(() => requestAnimationFrame(dispatch));
+        // raf waits for react to finish
+        requestAnimationFrame(dispatch);
     }
 }
 function removeCurrentHeadProvisionalElements(prev) {
@@ -89,12 +89,6 @@ function copyNewHeadProvisionalElements(next) {
         document.head.appendChild(element);
     }
 }
-function focusFirstAutofocusableElement() {
-    const element = document.body.querySelector("[autofocus]");
-    if (element && "focus" in element && typeof element.focus === "function") {
-        element.focus();
-    }
-}
 function elementIsTracked(element) {
     return element.getAttribute("data-turbolinks-track") == "reload";
 }

package/dist/lib/turbolinks/util.d.ts

@@ -11,4 +11,8 @@ export declare function dispatch(eventName: string, { target, cancelable, data }
 };
 export declare function unindent(strings: TemplateStringsArray, ...values: any[]): string;
 export declare function uuid(): string;
+export declare function createScriptElement(element: Element, cb?: () => void): Element;
+export declare function copyElementAttributes(destinationElement: Element, sourceElement: Element): void;
+export declare function activateNewBodyScriptElements(newScriptElements: HTMLScriptElement[]): void;
+export declare function focusFirstAutofocusableElement(): void;
 //# sourceMappingURL=util.d.ts.map

package/dist/lib/turbolinks/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../lib/turbolinks/util.ts"],"names":[],"mappings":"AAAA,wBAAgB,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAElD;AAED,eAAO,MAAM,OAAO,YAwBQ,OAAO,YAAY,MAAM,mBAGjD,CAAC;AAEL,wBAAgB,KAAK,CAAC,QAAQ,EAAE,MAAM,GAAG,QAExC;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,WAAW,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,GAAG,CAAC;CACX,CAAC;AAEF,wBAAgB,QAAQ,CACtB,SAAS,EAAE,MAAM,EACjB,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAE,OAAO,CAAC,eAAe,CAAM;UAEK,GAAG;EAkBpE;AASD,wBAAgB,QAAQ,CACtB,OAAO,EAAE,oBAAoB,EAC7B,GAAG,MAAM,EAAE,GAAG,EAAE,GACf,MAAM,CAKR;AAaD,wBAAgB,IAAI,WAcnB"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../lib/turbolinks/util.ts"],"names":[],"mappings":"AAAA,wBAAgB,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAElD;AAED,eAAO,MAAM,OAAO,YAwBQ,OAAO,YAAY,MAAM,mBAGjD,CAAC;AAEL,wBAAgB,KAAK,CAAC,QAAQ,EAAE,MAAM,GAAG,QAExC;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,WAAW,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,GAAG,CAAC;CACX,CAAC;AAEF,wBAAgB,QAAQ,CACtB,SAAS,EAAE,MAAM,EACjB,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAE,OAAO,CAAC,eAAe,CAAM;UAEK,GAAG;EAkBpE;AASD,wBAAgB,QAAQ,CACtB,OAAO,EAAE,oBAAoB,EAC7B,GAAG,MAAM,EAAE,GAAG,EAAE,GACf,MAAM,CAKR;AAaD,wBAAgB,IAAI,WAcnB;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,MAAM,IAAI,WAepE;AAED,wBAAgB,qBAAqB,CACnC,kBAAkB,EAAE,OAAO,EAC3B,aAAa,EAAE,OAAO,QAKvB;AAQD,wBAAgB,6BAA6B,CAC3C,iBAAiB,EAAE,iBAAiB,EAAE,QAMvC;AAED,wBAAgB,8BAA8B,SAK7C"}

package/dist/lib/turbolinks/util.js

@@ -83,3 +83,43 @@ export function uuid() {
     })
         .join("");
 }
+export function createScriptElement(element, cb) {
+    if (element.getAttribute("data-turbolinks-eval") == "false") {
+        return element;
+    }
+    else {
+        const createdScriptElement = document.createElement("script");
+        createdScriptElement.textContent = element.textContent;
+        // async false makes scripts run in-order. it wont block js execution (thankfully)
+        //   https://github.com/turbolinks/turbolinks/issues/282#issuecomment-355731712
+        createdScriptElement.async = false;
+        copyElementAttributes(createdScriptElement, element);
+        if (cb) {
+            createdScriptElement.addEventListener("load", cb);
+        }
+        return createdScriptElement;
+    }
+}
+export function copyElementAttributes(destinationElement, sourceElement) {
+    for (const { name, value } of array(sourceElement.attributes)) {
+        destinationElement.setAttribute(name, value);
+    }
+}
+function replaceElementWithElement(fromElement, toElement) {
+    const parentElement = fromElement.parentElement;
+    if (parentElement) {
+        return parentElement.replaceChild(toElement, fromElement);
+    }
+}
+export function activateNewBodyScriptElements(newScriptElements) {
+    for (const inertScriptElement of newScriptElements) {
+        const activatedScriptElement = createScriptElement(inertScriptElement);
+        replaceElementWithElement(inertScriptElement, activatedScriptElement);
+    }
+}
+export function focusFirstAutofocusableElement() {
+    const element = document.body.querySelector("[autofocus]");
+    if (element && "focus" in element && typeof element.focus === "function") {
+        element.focus();
+    }
+}

package/dist/lib/turbolinks/visit.d.ts

@@ -1,9 +1,6 @@
 import { Adapter } from "./adapter";
-import { Controller, RestorationData } from "./controller";
-import { HttpRequest } from "./http_request";
+import { Controller } from "./controller.js";
 import { Location } from "./location";
-import { RenderCallback } from "./renderer";
-import { Snapshot } from "./snapshot";
 import { Action } from "./types";
 export declare enum TimingMetric {
     visitStart = "visitStart",
@@ -28,19 +25,15 @@ export declare class Visit {
     readonly identifier: string;
     readonly restorationIdentifier: string;
     readonly timingMetrics: TimingMetrics;
-    followedRedirect: boolean;
     frame?: number;
-    historyChanged: boolean;
     location: Location;
     progress: number;
     referrer?: Location;
     redirectedToLocation?: Location;
-    request?: HttpRequest;
-    response?: string;
-    restorationData?: RestorationData;
-    scrolled: boolean;
     snapshotCached: boolean;
     state: VisitState;
+    requestInFlight: boolean;
+    renderFn?: () => Promise<void>;
     constructor(controller: Controller, location: Location, action: Action, restorationIdentifier?: string);
     start(): void;
     cancel(): void;
@@ -48,26 +41,15 @@ export declare class Visit {
     fail(): void;
     changeHistory(): void;
     issueRequest(): void;
-    getCachedSnapshot(): Snapshot | undefined;
+    getCachedSnapshot(): import("./controller.js").Snapshot | undefined;
     hasCachedSnapshot(): boolean;
     loadCachedSnapshot(): void;
     loadResponse(): void;
-    followRedirect(): void;
-    requestStarted(): void;
-    requestProgressed(progress: number): void;
-    requestCompletedWithResponse(response: string, redirectedToLocation?: Location): void;
-    requestFailedWithStatusCode(statusCode: number, response?: string): void;
-    requestFinished(): void;
-    performScroll: () => void;
-    scrollToRestoredPosition(): true | undefined;
-    scrollToAnchor(): true | undefined;
-    scrollToTop(): void;
     recordTimingMetric(metric: TimingMetric): void;
     getTimingMetrics(): TimingMetrics;
-    getHistoryMethodForAction(action: Action): (locatable: import("./location").Locatable, restorationIdentifier: string) => void;
     shouldIssueRequest(): boolean;
     cacheSnapshot(): void;
-    render(callback: RenderCallback): void;
+    render(callback: () => Promise<void>): void;
     cancelRender(): void;
 }
 //# sourceMappingURL=visit.d.ts.map

package/dist/lib/turbolinks/visit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"visit.d.ts","sourceRoot":"","sources":["../../../lib/turbolinks/visit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGjC,oBAAY,YAAY;IACtB,UAAU,eAAe;IACzB,YAAY,iBAAiB;IAC7B,UAAU,eAAe;IACzB,QAAQ,aAAa;CACtB;AAED,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC;KAAG,MAAM,IAAI,YAAY,GAAG,GAAG;CAAE,CAAC,CAAC;AAEvE,oBAAY,UAAU;IACpB,WAAW,gBAAgB;IAC3B,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,MAAM,WAAW;IACjB,SAAS,cAAc;CACxB;AAED,qBAAa,KAAK;IAChB,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,UAAU,SAAU;IAC7B,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC;IACvC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAM;IAE3C,gBAAgB,UAAS;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,UAAS;IACvB,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,SAAK;IACb,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,oBAAoB,CAAC,EAAE,QAAQ,CAAC;IAChC,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,QAAQ,UAAS;IACjB,cAAc,UAAS;IACvB,KAAK,aAA0B;gBAG7B,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,qBAAqB,GAAE,MAAe;IASxC,KAAK;IAQL,MAAM;IAUN,QAAQ;IASR,IAAI;IAOJ,aAAa;IAWb,YAAY;IAQZ,iBAAiB;IAcjB,iBAAiB;IAIjB,kBAAkB;IAelB,YAAY;IAqBZ,cAAc;IAad,cAAc;IAKd,iBAAiB,CAAC,QAAQ,EAAE,MAAM;IAOlC,4BAA4B,CAC1B,QAAQ,EAAE,MAAM,EAChB,oBAAoB,CAAC,EAAE,QAAQ;IAOjC,2BAA2B,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM;IAKjE,eAAe;IAOf,aAAa,aASX;IAEF,wBAAwB;IAUxB,cAAc;IAOd,WAAW;IAMX,kBAAkB,CAAC,MAAM,EAAE,YAAY;IAIvC,gBAAgB,IAAI,aAAa;IAMjC,yBAAyB,CAAC,MAAM,EAAE,MAAM;IAUxC,kBAAkB;IAIlB,aAAa;IAOb,MAAM,CAAC,QAAQ,EAAE,cAAc;IAQ/B,YAAY;CAMb"}
+{"version":3,"file":"visit.d.ts","sourceRoot":"","sources":["../../../lib/turbolinks/visit.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGjC,oBAAY,YAAY;IACtB,UAAU,eAAe;IACzB,YAAY,iBAAiB;IAC7B,UAAU,eAAe;IACzB,QAAQ,aAAa;CACtB;AAED,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC;KAAG,MAAM,IAAI,YAAY,GAAG,GAAG;CAAE,CAAC,CAAC;AAEvE,oBAAY,UAAU;IACpB,WAAW,gBAAgB;IAC3B,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,MAAM,WAAW;IACjB,SAAS,cAAc;CACxB;AAED,qBAAa,KAAK;IAChB,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,UAAU,SAAU;IAC7B,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC;IACvC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAM;IAE3C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,SAAK;IACb,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,oBAAoB,CAAC,EAAE,QAAQ,CAAC;IAChC,cAAc,UAAS;IACvB,KAAK,aAA0B;IAE/B,eAAe,UAAS;IACxB,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;gBAG7B,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,qBAAqB,GAAE,MAAe;IASxC,KAAK;IAQL,MAAM;IAQN,QAAQ;IASR,IAAI;IAOJ,aAAa;IAKb,YAAY;IAgBZ,iBAAiB;IAWjB,iBAAiB;IAIjB,kBAAkB;IAKlB,YAAY;IA+CZ,kBAAkB,CAAC,MAAM,EAAE,YAAY;IAIvC,gBAAgB,IAAI,aAAa;IAMjC,kBAAkB;IAIlB,aAAa;IAOb,MAAM,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;IAQpC,YAAY;CAMb"}

package/dist/lib/turbolinks/visit.js

@@ -1,5 +1,4 @@
-import { HttpRequest } from "./http_request";
-import { Snapshot } from "./snapshot";
+import { navigate } from "vite-plugin-ssr/client/router";
 import { uuid } from "./util";
 export var TimingMetric;
 (function (TimingMetric) {
@@ -20,24 +19,10 @@ export class Visit {
     constructor(controller, location, action, restorationIdentifier = uuid()) {
         this.identifier = uuid();
         this.timingMetrics = {};
-        this.followedRedirect = false;
-        this.historyChanged = false;
         this.progress = 0;
-        this.scrolled = false;
         this.snapshotCached = false;
         this.state = VisitState.initialized;
-        // Scrolling
-        this.performScroll = () => {
-            if (!this.scrolled) {
-                if (this.action == "restore") {
-                    this.scrollToRestoredPosition() || this.scrollToTop();
-                }
-                else {
-                    this.scrollToAnchor() || this.scrollToTop();
-                }
-                this.scrolled = true;
-            }
-        };
+        this.requestInFlight = false;
         this.controller = controller;
         this.location = location;
         this.action = action;
@@ -53,9 +38,7 @@ export class Visit {
     }
     cancel() {
         if (this.state == VisitState.started) {
-            if (this.request) {
-                this.request.cancel();
-            }
+            this.requestInFlight = false;
             this.cancelRender();
             this.state = VisitState.canceled;
         }
@@ -75,27 +58,25 @@ export class Visit {
         }
     }
     changeHistory() {
-        if (!this.historyChanged) {
-            const actionForHistory = this.location.isEqualTo(this.referrer)
-                ? "replace"
-                : this.action;
-            const method = this.getHistoryMethodForAction(actionForHistory);
-            method.call(this.controller, this.location, this.restorationIdentifier);
-            this.historyChanged = true;
-        }
+        // no-op since issueRequest calls navigate which handles all of this already
+        return;
     }
     issueRequest() {
-        if (this.shouldIssueRequest() && !this.request) {
-            this.progress = 0;
-            this.request = new HttpRequest(this, this.location, this.referrer);
-            this.request.send();
+        if (!this.requestInFlight) {
+            if (this.shouldIssueRequest()) {
+                const url = new URL(this.location.toString(), this.location.getOrigin());
+                navigate(url.pathname + url.hash + url.search, {
+                    overwriteLastHistoryEntry: this.action === "replace",
+                }).catch(console.error);
+                this.progress = 0;
+                this.requestInFlight = true;
+            }
         }
     }
     getCachedSnapshot() {
         const snapshot = this.controller.getCachedSnapshotForLocation(this.location);
-        if (snapshot &&
-            (!this.location.anchor || snapshot.hasAnchor(this.location.anchor))) {
-            if (this.action == "restore" || snapshot.isPreviewable()) {
+        if (snapshot) {
+            if (this.action == "restore") {
                 return snapshot;
             }
         }
@@ -104,86 +85,51 @@ export class Visit {
         return this.getCachedSnapshot() != null;
     }
     loadCachedSnapshot() {
-        const snapshot = this.getCachedSnapshot();
-        if (snapshot) {
-            const isPreview = this.shouldIssueRequest();
-            this.render(() => {
-                this.cacheSnapshot();
-                this.controller.render({ snapshot, isPreview }, this.performScroll);
-                this.adapter.visitRendered(this);
-                if (!isPreview) {
-                    this.complete();
-                }
-            });
-        }
+        // no-op since issueRequest calls navigate which handles all of this already
+        return;
     }
     loadResponse() {
-        const { request, response } = this;
-        if (request && response) {
-            this.render(() => {
-                this.cacheSnapshot();
-                if (request.failed) {
-                    this.controller.render({ error: this.response }, this.performScroll);
-                    this.adapter.visitRendered(this);
-                    this.fail();
-                }
-                else {
-                    this.controller.render({ snapshot: Snapshot.fromHTMLString(response) }, this.performScroll);
-                    this.adapter.visitRendered(this);
-                    this.complete();
-                }
-            });
-        }
-    }
-    followRedirect() {
-        if (this.redirectedToLocation && !this.followedRedirect) {
-            this.location = this.redirectedToLocation;
-            this.controller.replaceHistoryWithLocationAndRestorationIdentifier(this.redirectedToLocation, this.restorationIdentifier);
-            this.followedRedirect = true;
-        }
+        this.render(async () => {
+            if (!this.renderFn)
+                throw new Error("Render details not set before rendering");
+            this.cacheSnapshot();
+            await this.renderFn();
+            this.complete();
+        });
     }
     // HTTP request delegate
+    /*
     requestStarted() {
-        this.recordTimingMetric(TimingMetric.requestStart);
-        this.adapter.visitRequestStarted(this);
-    }
-    requestProgressed(progress) {
-        this.progress = progress;
-        if (this.adapter.visitRequestProgressed) {
-            this.adapter.visitRequestProgressed(this);
-        }
-    }
-    requestCompletedWithResponse(response, redirectedToLocation) {
-        this.response = response;
-        this.redirectedToLocation = redirectedToLocation;
-        this.adapter.visitRequestCompleted(this);
-    }
-    requestFailedWithStatusCode(statusCode, response) {
-        this.response = response;
-        this.adapter.visitRequestFailedWithStatusCode(this, statusCode);
-    }
+      this.recordTimingMetric(TimingMetric.requestStart);
+      this.adapter.visitRequestStarted(this);
+    }
+  
+    requestProgressed(progress: number) {
+      this.progress = progress;
+      if (this.adapter.visitRequestProgressed) {
+        this.adapter.visitRequestProgressed(this);
+      }
+    }
+  
+    requestCompletedWithResponse(
+      response: string,
+      redirectedToLocation?: Location
+    ) {
+      this.response = response;
+      this.redirectedToLocation = redirectedToLocation;
+      this.adapter.visitRequestCompleted(this);
+    }
+  
+    requestFailedWithStatusCode(statusCode: number, response?: string) {
+      this.response = response;
+      this.adapter.visitRequestFailedWithStatusCode(this, statusCode);
+    }
+  
     requestFinished() {
-        this.recordTimingMetric(TimingMetric.requestEnd);
-        this.adapter.visitRequestFinished(this);
-    }
-    scrollToRestoredPosition() {
-        const position = this.restorationData
-            ? this.restorationData.scrollPosition
-            : undefined;
-        if (position) {
-            this.controller.scrollToPosition(position);
-            return true;
-        }
-    }
-    scrollToAnchor() {
-        if (this.location.anchor != null) {
-            this.controller.scrollToAnchor(this.location.anchor);
-            return true;
-        }
-    }
-    scrollToTop() {
-        this.controller.scrollToPosition({ x: 0, y: 0 });
+      this.recordTimingMetric(TimingMetric.requestEnd);
+      this.adapter.visitRequestFinished(this);
     }
+    */
     // Instrumentation
     recordTimingMetric(metric) {
         this.timingMetrics[metric] = new Date().getTime();
@@ -192,16 +138,6 @@ export class Visit {
         return { ...this.timingMetrics };
     }
     // Private
-    getHistoryMethodForAction(action) {
-        switch (action) {
-            case "replace":
-                return this.controller
-                    .replaceHistoryWithLocationAndRestorationIdentifier;
-            case "advance":
-            case "restore":
-                return this.controller.pushHistoryWithLocationAndRestorationIdentifier;
-        }
-    }
     shouldIssueRequest() {
         return this.action == "restore" ? !this.hasCachedSnapshot() : true;
     }

package/dist/proxy/pages/onRenderClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onRenderClient.d.ts","sourceRoot":"","sources":["../../../proxy/pages/onRenderClient.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAajE,wBAA8B,cAAc,CAC1C,WAAW,EAAE,sBAAsB,iBAgDpC"}
+{"version":3,"file":"onRenderClient.d.ts","sourceRoot":"","sources":["../../../proxy/pages/onRenderClient.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AASjE,wBAA8B,cAAc,CAC1C,WAAW,EAAE,sBAAsB,iBA4DpC"}

package/dist/proxy/pages/onRenderClient.js

@@ -1,45 +1,56 @@
 import React from "react";
 import { renderReact } from "../../lib/renderReact.js";
 import { PageShell } from "../../lib/PageShell.js";
-import { turbolinksClickListener } from "../../lib/linkInterceptor.js";
-import { dispatchTurbolinks } from "../../lib/dispatchTurbolinks.js";
-import { mergeHead } from "../../lib/mergeHead.js";
-import { cacheProxiedBody, writeRestorationIdentifier, } from "../../lib/snapshots.js";
-import { navigateAnywhere } from "../../lib/navigateAnywhere.js";
-import { setupTurbolinks } from "../../lib/turbolinks.js";
-setupTurbolinks();
+import { Turbolinks } from "../../lib/turbolinks/index.js";
+import { copyElementAttributes, } from "../../lib/turbolinks/util.js";
+import { getElementAttributes } from "../../lib/getElementAttributes.js";
+Turbolinks.start();
 export default async function onRenderClient(pageContext) {
-    if (navigateAnywhere(pageContext.redirectTo))
+    if (pageContext.redirectTo) {
+        Turbolinks.visit(pageContext.redirectTo);
         return;
-    let body;
+    }
     const { layoutProps, layout } = pageContext;
-    const Layout = pageContext.config.layoutMap[layout];
+    const { layoutMap } = pageContext.config;
+    if (!layoutMap) {
+        throw new Error("layoutMap needs to be defined in config");
+    }
+    const Layout = layoutMap[layout];
+    function render(body) {
+        renderReact(React.createElement(PageShell, { key: pageContext.urlOriginal, pageContext: pageContext },
+            React.createElement(Layout, { ...layoutProps },
+                React.createElement("div", { id: "proxied-body", dangerouslySetInnerHTML: { __html: body } }))), pageContext.isHydration);
+    }
+    let bodyEl;
     if (pageContext.isHydration) {
         // During hydration of initial ssr, body is in dom, not page props (to avoid double-send)
-        body = document.getElementById("proxied-body").innerHTML;
+        bodyEl = document.getElementById("proxied-body");
+        render(bodyEl.innerHTML);
     }
     else {
         const { proxySendClient: proxy } = pageContext;
         if (!proxy) {
-            console.error("proxy/+onRenderClient did not receive proxySendClient nor is there a cached snapshot");
+            console.error("proxy/+onRenderClient did not receive proxySendClient");
             return;
         }
-        cacheProxiedBody();
-        dispatchTurbolinks("turbolinks:before-render", { newBody: proxy.body });
-        body = proxy.body;
-        document.body
-            .getAttributeNames()
-            .forEach((n) => document.body.removeAttribute(n));
-        for (const [name, value] of Object.entries(proxy.bodyAttrs)) {
-            document.body.setAttribute(name, value);
-        }
-        mergeHead(proxy.head);
+        const parsed = document.createElement("html");
+        parsed.innerHTML = proxy;
+        bodyEl = parsed.querySelector("body");
+        const headEl = parsed.querySelector("head");
+        Turbolinks._vpsOnRenderClient(headEl, true, () => {
+            // merge body attributes
+            document.body
+                .getAttributeNames()
+                .forEach((n) => document.body.removeAttribute(n));
+            copyElementAttributes(document.body, bodyEl);
+            // render body with react
+            render(bodyEl.innerHTML);
+        });
     }
-    writeRestorationIdentifier(pageContext);
-    // addEventListener de-dupes so we are safe to just blindly call this every time
-    // non-proxy pages remove the listener
-    document.addEventListener("click", turbolinksClickListener);
-    renderReact(React.createElement(PageShell, { key: pageContext.urlOriginal, pageContext: pageContext },
-        React.createElement(Layout, { ...layoutProps },
-            React.createElement("div", { id: "proxied-body", dangerouslySetInnerHTML: { __html: body } }))), pageContext.isHydration);
+    // cache page context will save it and return it to us during restoration visits
+    Turbolinks._vpsCachePageContext({
+        layoutProps,
+        layout,
+        bodyAttrs: getElementAttributes(bodyEl),
+    });
 }

package/dist/proxy/pages/onRenderHtml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onRenderHtml.d.ts","sourceRoot":"","sources":["../../../proxy/pages/onRenderHtml.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAGjE,wBAA8B,YAAY,CACxC,WAAW,EAAE,sBAAsB;;;;;;GAsDpC"}
+{"version":3,"file":"onRenderHtml.d.ts","sourceRoot":"","sources":["../../../proxy/pages/onRenderHtml.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAKjE,wBAA8B,YAAY,CACxC,WAAW,EAAE,sBAAsB;;;;;;GAkEpC"}

package/dist/proxy/pages/onRenderHtml.js

@@ -2,25 +2,39 @@ import React from "react";
 import ReactDOMServer from "react-dom/server";
 import { dangerouslySkipEscape, escapeInject } from "vite-plugin-ssr/server";
 import { PageShell } from "../../lib/PageShell.js";
+import jsdom from "jsdom";
+import { getElementAttributes } from "../../lib/getElementAttributes.js";
 export default async function onRenderHtml(pageContext) {
     if (pageContext.proxy) {
-        const { proxy: { head, body, bodyAttrs }, layoutProps, layout, } = pageContext;
-        const Layout = pageContext.config.layoutMap[layout];
+        const { proxy, layoutProps, layout } = pageContext;
+        const dom = new jsdom.JSDOM(proxy);
+        const doc = dom.window.document;
+        const bodyEl = doc.querySelector("body");
+        const head = doc.querySelector("head");
+        if (!bodyEl || !head) {
+            throw new Error("Proxy failed");
+        }
+        const { layoutMap } = pageContext.config;
+        if (!layoutMap) {
+            throw new Error("layoutMap needs to be defined in config");
+        }
+        const Layout = layoutMap[layout];
         if (!Layout)
             throw new Error(`${layout} layout not found`);
         const pageHtml = ReactDOMServer.renderToString(React.createElement(PageShell, { pageContext: pageContext },
             React.createElement(Layout, { ...layoutProps },
-                React.createElement("div", { id: "proxied-body", dangerouslySetInnerHTML: { __html: body } }))));
+                React.createElement("div", { id: "proxied-body", dangerouslySetInnerHTML: { __html: bodyEl.innerHTML } }))));
         const documentHtml = escapeInject `
     <!DOCTYPE html>
     <html>
         <head>
-          ${dangerouslySkipEscape(head)}
+          ${dangerouslySkipEscape(head.innerHTML)}
           ${
         // We need to fire turbolinks:load exactly on DCL, so it must be a blocking head script to catch DCL event.
         // Vite loads scripts with type="module" so the rest of our code will show up too late.
         // TODO: figure out how to bundle this better. at least read from a .js file
         dangerouslySkipEscape(`<script>
+          window.Turbolinks = {controller:{restorationIdentifier: ''}};
           addEventListener("DOMContentLoaded", () => {
             const event = new Event("turbolinks:load", { bubbles: true, cancelable: true });
             event.data = {url: window.location.href};
@@ -28,7 +42,7 @@ export default async function onRenderHtml(pageContext) {
           })
           </script>`)}
         </head>
-        <body ${dangerouslySkipEscape(Object.entries(bodyAttrs)
+        <body ${dangerouslySkipEscape(Object.entries(getElementAttributes(bodyEl))
             .map(([name, value]) => `${name}="${value}"`)
             .join(" "))}>
           <div id="page-view">${dangerouslySkipEscape(pageHtml)}</div>

package/dist/proxy/pages/restorationVisit/+config.d.ts

@@ -1,6 +1,8 @@
 declare const _default: {
     route: string;
     Page: string;
+    onRenderClient: "import:@alignable/bifrost/proxy/pages/restorationVisit/onRenderClient";
+    passToClient: string[];
     meta: {
         onBeforeRender: {
             env: "server-and-client";

package/dist/proxy/pages/restorationVisit/+config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"+config.d.ts","sourceRoot":"","sources":["../../../../proxy/pages/restorationVisit/+config.ts"],"names":[],"mappings":";;;;;;;;;AAEA,wBAWgC"}
+{"version":3,"file":"+config.d.ts","sourceRoot":"","sources":["../../../../proxy/pages/restorationVisit/+config.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,wBAcgC"}

package/dist/proxy/pages/restorationVisit/+config.js

@@ -1,6 +1,9 @@
 export default {
     route: "import:@alignable/bifrost/proxy/pages/restorationVisit/route",
     Page: "import:@alignable/bifrost/proxy/pages/Page",
+    onRenderClient: "import:@alignable/bifrost/proxy/pages/restorationVisit/onRenderClient",
+    // See onBeforeRoute for how head and body are inserted from Turbolinks snapshot
+    passToClient: ["headEl", "bodyEl", "layout", "layoutProps"],
     meta: {
         onBeforeRender: {
             // We tell vite-plugin-ssr to load and execute onBeforeRender()

package/dist/proxy/pages/restorationVisit/onRenderClient.d.ts

@@ -0,0 +1,3 @@
+import { PageContextProxyRestorationVisit } from "../../../types/internal.js";
+export default function onRenderClient(pageContext: PageContextProxyRestorationVisit): Promise<void>;
+//# sourceMappingURL=onRenderClient.d.ts.map

package/dist/proxy/pages/restorationVisit/onRenderClient.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"onRenderClient.d.ts","sourceRoot":"","sources":["../../../../proxy/pages/restorationVisit/onRenderClient.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,gCAAgC,EAAE,MAAM,4BAA4B,CAAC;AAO9E,wBAA8B,cAAc,CAC1C,WAAW,EAAE,gCAAgC,iBA2C9C"}