@alignable/bifrost 0.0.11 → 0.0.13

package/dist/lib/turbolinks/visit.js

@@ -0,0 +1,163 @@
+import { navigate } from "vite-plugin-ssr/client/router";
+import { uuid } from "./util";
+export var TimingMetric;
+(function (TimingMetric) {
+    TimingMetric["visitStart"] = "visitStart";
+    TimingMetric["requestStart"] = "requestStart";
+    TimingMetric["requestEnd"] = "requestEnd";
+    TimingMetric["visitEnd"] = "visitEnd";
+})(TimingMetric || (TimingMetric = {}));
+export var VisitState;
+(function (VisitState) {
+    VisitState["initialized"] = "initialized";
+    VisitState["started"] = "started";
+    VisitState["canceled"] = "canceled";
+    VisitState["failed"] = "failed";
+    VisitState["completed"] = "completed";
+})(VisitState || (VisitState = {}));
+export class Visit {
+    constructor(controller, location, action, restorationIdentifier = uuid()) {
+        this.identifier = uuid();
+        this.timingMetrics = {};
+        this.progress = 0;
+        this.snapshotCached = false;
+        this.state = VisitState.initialized;
+        this.requestInFlight = false;
+        this.controller = controller;
+        this.location = location;
+        this.action = action;
+        this.adapter = controller.adapter;
+        this.restorationIdentifier = restorationIdentifier;
+    }
+    start() {
+        if (this.state == VisitState.initialized) {
+            this.recordTimingMetric(TimingMetric.visitStart);
+            this.state = VisitState.started;
+            this.adapter.visitStarted(this);
+        }
+    }
+    cancel() {
+        if (this.state == VisitState.started) {
+            this.requestInFlight = false;
+            this.cancelRender();
+            this.state = VisitState.canceled;
+        }
+    }
+    complete() {
+        if (this.state == VisitState.started) {
+            this.recordTimingMetric(TimingMetric.visitEnd);
+            this.state = VisitState.completed;
+            this.adapter.visitCompleted(this);
+            this.controller.visitCompleted(this);
+        }
+    }
+    fail() {
+        if (this.state == VisitState.started) {
+            this.state = VisitState.failed;
+            this.adapter.visitFailed(this);
+        }
+    }
+    changeHistory() {
+        // no-op since issueRequest calls navigate which handles all of this already
+        return;
+    }
+    issueRequest() {
+        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) {
+            if (this.action == "restore") {
+                return snapshot;
+            }
+        }
+    }
+    hasCachedSnapshot() {
+        return this.getCachedSnapshot() != null;
+    }
+    loadCachedSnapshot() {
+        // no-op since issueRequest calls navigate which handles all of this already
+        return;
+    }
+    loadResponse() {
+        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: 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);
+    }
+    */
+    // Instrumentation
+    recordTimingMetric(metric) {
+        this.timingMetrics[metric] = new Date().getTime();
+    }
+    getTimingMetrics() {
+        return { ...this.timingMetrics };
+    }
+    // Private
+    shouldIssueRequest() {
+        return this.action == "restore" ? !this.hasCachedSnapshot() : true;
+    }
+    cacheSnapshot() {
+        if (!this.snapshotCached) {
+            this.controller.cacheSnapshot();
+            this.snapshotCached = true;
+        }
+    }
+    render(callback) {
+        this.cancelRender();
+        this.frame = requestAnimationFrame(() => {
+            delete this.frame;
+            callback.call(this);
+        });
+    }
+    cancelRender() {
+        if (this.frame) {
+            cancelAnimationFrame(this.frame);
+            delete this.frame;
+        }
+    }
+}

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"}

package/dist/proxy/pages/restorationVisit/onRenderClient.js

@@ -0,0 +1,41 @@
+import React from "react";
+import { PageShell } from "../../../lib/PageShell.js";
+import { renderReact } from "../../../lib/renderReact.js";
+import { Turbolinks } from "../../../lib/turbolinks/index.js";
+import { getElementAttributes } from "../../../lib/getElementAttributes.js";
+import { copyElementAttributes } from "../../../lib/turbolinks/util.js";
+export default async function onRenderClient(pageContext) {
+    if (pageContext.isHydration) {
+        throw new Error("restoration visit should never happen on initial render");
+    }
+    const { layoutProps, layout, bodyEl, headEl } = pageContext;
+    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);
+    }
+    const proxyBodyEl = bodyEl.querySelector("#proxied-body");
+    if (!proxyBodyEl) {
+        throw new Error("proxied body not found in cached snapshot");
+    }
+    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(proxyBodyEl.innerHTML);
+    });
+    // cache page context will save it and return it to us during restoration visits
+    Turbolinks._vpsCachePageContext({
+        layoutProps,
+        layout,
+        bodyAttrs: getElementAttributes(bodyEl),
+    });
+}

package/dist/renderer/getConfigOrPageContext.d.ts

@@ -0,0 +1,8 @@
+import { PageContextNoProxy } from "../types/internal.js";
+type ConfigOrContext = PageContextNoProxy | PageContextNoProxy["config"];
+/**
+ * Get page configs that are definable in config and in runtime via onBeforeRoute. documentProps, for example.
+ */
+export declare function getPageContextOrConfig<T extends keyof ConfigOrContext>(pageContext: PageContextNoProxy, prop: T): ConfigOrContext[T];
+export {};
+//# sourceMappingURL=getConfigOrPageContext.d.ts.map

package/dist/renderer/getConfigOrPageContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getConfigOrPageContext.d.ts","sourceRoot":"","sources":["../../renderer/getConfigOrPageContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,KAAK,eAAe,GAAG,kBAAkB,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;AAEzE;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,MAAM,eAAe,EACpE,WAAW,EAAE,kBAAkB,EAC/B,IAAI,EAAE,CAAC,GACN,eAAe,CAAC,CAAC,CAAC,CAEpB"}

package/dist/renderer/getConfigOrPageContext.js

@@ -0,0 +1,6 @@
+/**
+ * Get page configs that are definable in config and in runtime via onBeforeRoute. documentProps, for example.
+ */
+export function getPageContextOrConfig(pageContext, prop) {
+    return pageContext[prop] || pageContext.config[prop];
+}

package/dist/renderer/onBeforeRoute.d.ts

@@ -1,9 +1,4 @@
 export default function onBeforeRoute(_pageContext: any): {
-    pageContext: {
-        _pageId: string;
-        layoutProps: Record<string, unknown>;
-        proxySendClient?: import("../types/internal.js").Proxy | undefined;
-        layout: string;
-    };
+    pageContext: any;
 } | undefined;
 //# sourceMappingURL=onBeforeRoute.d.ts.map

package/dist/renderer/onBeforeRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onBeforeRoute.d.ts","sourceRoot":"","sources":["../../renderer/onBeforeRoute.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,YAAY,EAAE,GAAG;;;;;;;cAYtD"}
+{"version":3,"file":"onBeforeRoute.d.ts","sourceRoot":"","sources":["../../renderer/onBeforeRoute.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,YAAY,EAAE,GAAG;;cA2BtD"}

package/dist/renderer/onBeforeRoute.js

@@ -1,15 +1,23 @@
-import { getSnapshot } from "../lib/snapshots.js";
+// do NOT import turbolinks in this file. It is used on server side.
 export default function onBeforeRoute(_pageContext) {
-    const snapshot = getSnapshot();
-    if (!!snapshot?.proxySendClient) {
-        return {
-            pageContext: {
-                ...snapshot,
-                _pageId: "/proxy/pages/restorationVisit",
-            },
-        };
-    }
-    else {
+    if (typeof window === "undefined")
         return undefined;
+    const Turbolinks = window.Turbolinks;
+    const currentVisit = Turbolinks.controller.currentVisit;
+    if (!currentVisit || currentVisit.state === "completed") {
+        // old/nonexistent currentVisit means VPS is doing history navigation. Ideally we might turn off VPS' onpopstate listener.
+        const snapshot = Turbolinks.controller.getCachedSnapshotForLocation(window.location.href);
+        Turbolinks.controller.historyPoppedToLocationWithRestorationIdentifier(window.location.href, "");
+        if (!!snapshot) {
+            return {
+                pageContext: {
+                    ...snapshot.pageContext,
+                    bodyEl: snapshot.bodyEl,
+                    headEl: snapshot.headEl,
+                    _pageId: "/proxy/pages/restorationVisit",
+                },
+            };
+        }
     }
+    return undefined;
 }

package/dist/renderer/onRenderClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onRenderClient.d.ts","sourceRoot":"","sources":["../../renderer/onRenderClient.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAWhE,wBAA8B,cAAc,CAC1C,WAAW,EAAE,wBAAwB,iBAmCtC"}
+{"version":3,"file":"onRenderClient.d.ts","sourceRoot":"","sources":["../../renderer/onRenderClient.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAahE,wBAA8B,cAAc,CAC1C,WAAW,EAAE,wBAAwB,iBA6CtC"}

package/dist/renderer/onRenderClient.js

@@ -1,36 +1,43 @@
 import React from "react";
 import { renderReact } from "../lib/renderReact.js";
 import { PageShell } from "../lib/PageShell.js";
-import { turbolinksClickListener } from "../lib/linkInterceptor.js";
-import { getDocumentProps } from "./getDocumentProps.js";
-import { cacheProxiedBody } from "../lib/snapshots.js";
-import { navigateAnywhere } from "../lib/navigateAnywhere.js";
-import { setupTurbolinks } from "../lib/turbolinks.js";
-import { formatMetaObject } from "./utils/formatMetaObject.js";
-setupTurbolinks();
+import { Turbolinks } from "../lib/turbolinks/index.js";
+import { documentPropsToReact } from "./utils/buildHead.js";
+import { getPageContextOrConfig } from "./getConfigOrPageContext.js";
+import { createRoot } from "react-dom/client";
+Turbolinks.start();
+const PassThruLayout = ({ children, }) => React.createElement(React.Fragment, null, children);
 export default async function onRenderClient(pageContext) {
-    if (navigateAnywhere(pageContext.redirectTo))
+    if (pageContext.redirectTo) {
+        Turbolinks.visit(pageContext.redirectTo);
         return;
+    }
     const { Page, pageProps } = pageContext;
-    const { Layout, layoutProps } = pageContext.config;
+    const { Layout = PassThruLayout } = pageContext.config;
+    const layoutProps = getPageContextOrConfig(pageContext, "layoutProps") || {};
     if (!Page)
         throw new Error("Client-side render() hook expects Page to be exported");
-    if (!Layout)
-        throw new Error("Client-side render() hook expects Layout to be exported");
-    document.removeEventListener("click", turbolinksClickListener);
-    cacheProxiedBody();
-    const { title = "", description = "", viewport } = getDocumentProps(pageContext);
-    document.title = title;
-    document.head
-        .querySelector("meta[name='description']")
-        ?.setAttribute("content", description);
-    if (viewport) {
-        document.head
-            .querySelector("meta[name='viewport']")
-            ?.setAttribute("content", formatMetaObject(viewport));
-    }
     const page = (React.createElement(PageShell, { pageContext: pageContext },
         React.createElement(Layout, { ...layoutProps },
             React.createElement(Page, { ...pageProps }))));
-    renderReact(page, pageContext.isHydration);
+    if (pageContext.isHydration) {
+        // During hydration of initial ssr, body is in dom, not page props (to avoid double-send)
+        renderReact(page, pageContext.isHydration);
+    }
+    else {
+        const head = document.createElement("head");
+        createRoot(head).render(documentPropsToReact(getPageContextOrConfig(pageContext, "documentProps") || {}));
+        pageContext.config.scripts?.forEach((s) => {
+            head.insertAdjacentHTML("beforeend", s);
+        });
+        requestAnimationFrame(() => {
+            Turbolinks._vpsOnRenderClient(head, false, () => {
+                // clear anything on body
+                document.body
+                    .getAttributeNames()
+                    .forEach((n) => document.body.removeAttribute(n));
+                renderReact(page, pageContext.isHydration);
+            });
+        });
+    }
 }

package/dist/renderer/onRenderHtml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onRenderHtml.d.ts","sourceRoot":"","sources":["../../renderer/onRenderHtml.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAIhE,wBAA8B,YAAY,CACxC,WAAW,EAAE,wBAAwB;;;GAmDtC"}
+{"version":3,"file":"onRenderHtml.d.ts","sourceRoot":"","sources":["../../renderer/onRenderHtml.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAIhE,wBAA8B,YAAY,CACxC,WAAW,EAAE,wBAAwB;;;GAoDtC"}

package/dist/renderer/onRenderHtml.js

@@ -2,11 +2,12 @@ import ReactDOMServer from "react-dom/server";
 import React from "react";
 import { PageShell } from "../lib/PageShell.js";
 import { escapeInject, dangerouslySkipEscape } from "vite-plugin-ssr/server";
-import { getDocumentProps } from "./getDocumentProps.js";
-import { formatMetaObject } from "./utils/formatMetaObject.js";
+import { documentPropsToReact } from "./utils/buildHead.js";
+import { getPageContextOrConfig } from "./getConfigOrPageContext.js";
 export default async function onRenderHtml(pageContext) {
     const { Page, pageProps } = pageContext;
-    const { Layout, layoutProps } = pageContext.config;
+    const { Layout } = pageContext.config;
+    const layoutProps = getPageContextOrConfig(pageContext, "layoutProps") || {};
     if (!Page)
         throw new Error("Server-side render() hook expects Page to be exported");
     if (!Layout)
@@ -14,24 +15,20 @@ export default async function onRenderHtml(pageContext) {
     const pageHtml = ReactDOMServer.renderToString(React.createElement(PageShell, { pageContext: pageContext },
         React.createElement(Layout, { ...layoutProps },
             React.createElement(Page, { ...pageProps }))));
-    const { googleAnalytics, osano } = pageContext.config.scripts;
-    const googleAnalyticsTag = dangerouslySkipEscape(googleAnalytics);
-    const osanoTag = dangerouslySkipEscape(osano);
-    // // See https://vite-plugin-ssr.com/head
-    const { title = "", description = "", viewport } = getDocumentProps(pageContext);
-    if (!title) {
-        console.warn(`No title set for ${pageContext.urlOriginal}!`);
-    }
-    const viewportTag = !viewport ? "" : escapeInject `<meta content="${formatMetaObject(viewport)}" name="viewport">`;
+    const headHtml = ReactDOMServer.renderToString(documentPropsToReact(getPageContextOrConfig(pageContext, "documentProps") || {}));
     const documentHtml = escapeInject `<!DOCTYPE html>
     <html lang="en">
       <head>
-      ${googleAnalyticsTag}
-      ${osanoTag}
-      <title>${title}</title>
-      <meta name="title" property="og:title" content="${title}"/>
-      <meta name="description" content="${description}"/>
-      ${viewportTag}
+      ${dangerouslySkipEscape(headHtml)}
+      ${dangerouslySkipEscape(Object.values(pageContext.config.scripts || {}).join(""))}
+      ${dangerouslySkipEscape(`<script>
+      window.Turbolinks = {controller:{restorationIdentifier: ''}};
+      addEventListener("DOMContentLoaded", () => {
+        const event = new Event("turbolinks:load", { bubbles: true, cancelable: true });
+        event.data = {url: window.location.href};
+        document.dispatchEvent(event);  
+      })
+      </script>`)}
       </head>
       <body>
         <div id="page-view">${dangerouslySkipEscape(pageHtml)}</div>

package/dist/renderer/utils/buildHead.d.ts

@@ -0,0 +1,4 @@
+import React from "react";
+import { DocumentProps } from "../../types/internal";
+export declare function documentPropsToReact({ title, description, viewport, }: DocumentProps): React.ReactElement;
+//# sourceMappingURL=buildHead.d.ts.map

package/dist/renderer/utils/buildHead.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildHead.d.ts","sourceRoot":"","sources":["../../../renderer/utils/buildHead.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,wBAAgB,oBAAoB,CAAC,EACnC,KAAU,EACV,WAAgB,EAChB,QAAa,GACd,EAAE,aAAa,GAAG,KAAK,CAAC,YAAY,CAcpC"}

package/dist/renderer/utils/buildHead.js

@@ -0,0 +1,10 @@
+import React from "react";
+export function documentPropsToReact({ title = "", description = "", viewport = {}, }) {
+    return (React.createElement(React.Fragment, null,
+        React.createElement("title", null, title),
+        React.createElement("meta", { name: "title", property: "og:title", content: title }),
+        React.createElement("meta", { name: "description", content: description }),
+        React.createElement("meta", { name: "viewport", content: Object.entries(viewport)
+                .map((e) => e.join("="))
+                .join(", ") })));
+}