@alignable/bifrost 1.0.10 → 1.0.12

package/dist/renderer/Wrapper.js

@@ -3,10 +3,9 @@ import React from "react";
 import { usePageContext } from "vike-react/usePageContext";
 function Wrapper({ children }) {
   const pageContext = usePageContext();
-  const beforeRender = pageContext.isClientSide && pageContext._beforeRender;
-  if (beforeRender) {
-    beforeRender();
-    pageContext._beforeRender = void 0;
+  if (pageContext.isClientSide && pageContext._shouldEmitBeforeRender) {
+    window.Turbolinks.controller.viewWillRender();
+    pageContext._shouldEmitBeforeRender = false;
   }
   return /* @__PURE__ */ React.createElement(React.Fragment, null, children);
 }

package/dist/renderer/Wrapper.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../renderer/Wrapper.tsx"],"sourcesContent":["import React from \"react\";\nimport { usePageContext } from \"vike-react/usePageContext\";\n\nexport default function Wrapper({ children }: { children: React.ReactNode }) {\n  const pageContext = usePageContext();\n\n  // We want to fire `turbolinks:before-render` as late as possible - synchronously before rendering the page.\n  // This is important because before-render scripts may clear the DOM, and we want to paint the new page immediately\n  // onBeforeRenderClient awaits for promises so there is a delay\n  const beforeRender = pageContext.isClientSide && pageContext._beforeRender;\n  if (beforeRender) {\n    beforeRender();\n    pageContext._beforeRender = undefined;\n  }\n  return <>{children}</>;\n}\n"],"mappings":";AAAA,OAAO,WAAW;AAClB,SAAS,sBAAsB;AAEhB,SAAR,QAAyB,EAAE,SAAS,GAAkC;AAC3E,QAAM,cAAc,eAAe;AAKnC,QAAM,eAAe,YAAY,gBAAgB,YAAY;AAC7D,MAAI,cAAc;AAChB,iBAAa;AACb,gBAAY,gBAAgB;AAAA,EAC9B;AACA,SAAO,0DAAG,QAAS;AACrB;","names":[]}
+{"version":3,"sources":["../../renderer/Wrapper.tsx"],"sourcesContent":["import React from \"react\";\nimport { usePageContext } from \"vike-react/usePageContext\";\n\nexport default function Wrapper({ children }: { children: React.ReactNode }) {\n  const pageContext = usePageContext();\n\n  // We want to fire `turbolinks:before-render` as late as possible - synchronously before rendering the page.\n  // This is important because before-render scripts may clear the DOM, and we want to paint the new page immediately\n  // onBeforeRenderClient awaits for promises so there is a delay\n  if (pageContext.isClientSide && pageContext._shouldEmitBeforeRender) {\n    window.Turbolinks.controller.viewWillRender();\n    pageContext._shouldEmitBeforeRender = false;\n  }\n  \n  return <>{children}</>;\n}\n"],"mappings":";AAAA,OAAO,WAAW;AAClB,SAAS,sBAAsB;AAEhB,SAAR,QAAyB,EAAE,SAAS,GAAkC;AAC3E,QAAM,cAAc,eAAe;AAKnC,MAAI,YAAY,gBAAgB,YAAY,yBAAyB;AACnE,WAAO,WAAW,WAAW,eAAe;AAC5C,gBAAY,0BAA0B;AAAA,EACxC;AAEA,SAAO,0DAAG,QAAS;AACrB;","names":[]}

package/dist/renderer/bifrost/onAfterRenderClient.d.ts

@@ -1,5 +1,5 @@
 import { PageContextClient } from 'vike/types';
-import '../../type-813ffb18.js';
+import '../../type-d58626e7.js';
 import '../../controller-01a828bc.js';
 
 declare function bifrostOnAfterRenderClient(pageContext: PageContextClient): Promise<void>;

package/dist/renderer/bifrost/onBeforeRenderClient.js

@@ -8,9 +8,7 @@ import {
 // renderer/bifrost/onBeforeRenderClient.ts
 async function bifrostOnBeforeRenderClient(pageContext) {
   if (!pageContext.isHydration) {
-    pageContext._beforeRender = () => {
-      Turbolinks.controller.viewWillRender();
-    };
+    pageContext._shouldEmitBeforeRender = true;
     await Turbolinks._vikeBeforeRender(
       pageContext._turbolinksVisit,
       pageContext.errorWhileRendering

package/dist/renderer/bifrost/onBeforeRenderClient.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../renderer/bifrost/onBeforeRenderClient.ts"],"sourcesContent":["import { PageContextClient } from \"vike/types\";\nimport { Turbolinks } from \"../../lib/turbolinks\";\nimport { setBodyAttributes } from \"../../lib/elementUtils\";\n\nexport default async function bifrostOnBeforeRenderClient(\n  pageContext: PageContextClient\n) {\n  if (!pageContext.isHydration) {\n    pageContext._beforeRender = () => {\n      Turbolinks.controller.viewWillRender(); // turbolinks:before-render\n    };\n    await Turbolinks._vikeBeforeRender(\n      pageContext._turbolinksVisit,\n      pageContext.errorWhileRendering\n    );\n\n    // Copy over body attributes because vike-react only handles body on initial render, and we need to reset when coming from wrapped\n    if (pageContext.config.bodyAttributes)\n      setBodyAttributes(\n        pageContext.config.bodyAttributes.reduce(\n          (acc, attrs) => ({ ...acc, ...attrs }),\n          {}\n        )\n      );\n  }\n}\n"],"mappings":";;;;;;;;AAIA,eAAO,4BACL,aACA;AACA,MAAI,CAAC,YAAY,aAAa;AAC5B,gBAAY,gBAAgB,MAAM;AAChC,iBAAW,WAAW,eAAe;AAAA,IACvC;AACA,UAAM,WAAW;AAAA,MACf,YAAY;AAAA,MACZ,YAAY;AAAA,IACd;AAGA,QAAI,YAAY,OAAO;AACrB;AAAA,QACE,YAAY,OAAO,eAAe;AAAA,UAChC,CAAC,KAAK,WAAW,EAAE,GAAG,KAAK,GAAG,MAAM;AAAA,UACpC,CAAC;AAAA,QACH;AAAA,MACF;AAAA,EACJ;AACF;","names":[]}
+{"version":3,"sources":["../../../renderer/bifrost/onBeforeRenderClient.ts"],"sourcesContent":["import { PageContextClient } from \"vike/types\";\nimport { Turbolinks } from \"../../lib/turbolinks\";\nimport { setBodyAttributes } from \"../../lib/elementUtils\";\n\nexport default async function bifrostOnBeforeRenderClient(\n  pageContext: PageContextClient\n) {\n  if (!pageContext.isHydration) {\n    pageContext._shouldEmitBeforeRender = true;\n    await Turbolinks._vikeBeforeRender(\n      pageContext._turbolinksVisit,\n      pageContext.errorWhileRendering\n    );\n\n    // Copy over body attributes because vike-react only handles body on initial render, and we need to reset when coming from wrapped\n    if (pageContext.config.bodyAttributes)\n      setBodyAttributes(\n        pageContext.config.bodyAttributes.reduce(\n          (acc, attrs) => ({ ...acc, ...attrs }),\n          {}\n        )\n      );\n  }\n}\n"],"mappings":";;;;;;;;AAIA,eAAO,4BACL,aACA;AACA,MAAI,CAAC,YAAY,aAAa;AAC5B,gBAAY,0BAA0B;AACtC,UAAM,WAAW;AAAA,MACf,YAAY;AAAA,MACZ,YAAY;AAAA,IACd;AAGA,QAAI,YAAY,OAAO;AACrB;AAAA,QACE,YAAY,OAAO,eAAe;AAAA,UAChC,CAAC,KAAK,WAAW,EAAE,GAAG,KAAK,GAAG,MAAM;AAAA,UACpC,CAAC;AAAA,QACH;AAAA,MACF;AAAA,EACJ;AACF;","names":[]}

package/dist/renderer/config.d.ts

@@ -1,4 +1,4 @@
-export { W as WrappedServerOnly } from '../type-813ffb18.js';
+export { W as WrappedServerOnly } from '../type-d58626e7.js';
 import '../controller-01a828bc.js';
 import 'vike/types';
 

package/dist/renderer/headHtmlEnd.d.ts

@@ -1,5 +1,5 @@
 import { PageContextServer } from 'vike/types';
-import '../type-813ffb18.js';
+import '../type-d58626e7.js';
 import '../controller-01a828bc.js';
 
 declare function headHtmlEnd(pageContext: PageContextServer): string;

package/dist/renderer/wrapped/Page.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import '../config.js';
-import '../../type-813ffb18.js';
+import '../../type-d58626e7.js';
 import '../../controller-01a828bc.js';
 import 'vike/types';
 

package/dist/renderer/wrapped/onAfterRenderClient.d.ts

@@ -1,4 +1,4 @@
-import '../../type-813ffb18.js';
+import '../../type-d58626e7.js';
 import { PageContextClient } from 'vike/types';
 import '../../controller-01a828bc.js';
 

package/dist/renderer/wrapped/onBeforeRender.client.d.ts

@@ -1,4 +1,4 @@
-import '../../type-813ffb18.js';
+import '../../type-d58626e7.js';
 import { PageContextClient } from 'vike/types';
 import '../../controller-01a828bc.js';
 

package/dist/renderer/wrapped/onBeforeRenderClient.d.ts

@@ -1,4 +1,4 @@
-import '../../type-813ffb18.js';
+import '../../type-d58626e7.js';
 import { PageContextClient } from 'vike/types';
 import '../../controller-01a828bc.js';
 

package/dist/renderer/wrapped/onBeforeRenderClient.js

@@ -14,13 +14,21 @@ var lastTrackedScriptSignature;
 function mergeHead(head) {
   const newHead = categorizeHead(head);
   const oldHead = categorizeHead(document.head);
-  const reload = () => window.Turbolinks.controller.viewInvalidated();
+  const reload = () => {
+    window.Turbolinks.controller.viewInvalidated();
+    return {
+      waitForReload: () => new Promise(() => {
+      }),
+      waitForHeadScripts: () => new Promise(() => {
+      })
+    };
+  };
   if (head.querySelector('meta[name="turbolinks-visit-control"]')?.getAttribute("content") === "reload") {
-    reload();
+    return reload();
   }
   lastTrackedScriptSignature = lastTrackedScriptSignature || trackedElementSignature([...oldHead.scripts, ...oldHead.stylesheets]);
   if (lastTrackedScriptSignature !== trackedElementSignature([...newHead.scripts, ...newHead.stylesheets])) {
-    reload();
+    return reload();
   }
   if (firstLoad) {
     for (const element of oldHead.scripts) {
@@ -33,7 +41,10 @@ function mergeHead(head) {
   copyNewHeadStylesheetElements(newHead.stylesheets, oldHead.stylesheets);
   removeCurrentHeadProvisionalElements(oldHead.provisional);
   copyNewHeadProvisionalElements(newHead.provisional);
-  return copyNewHeadScriptElements(newHead.scripts);
+  return {
+    waitForReload: () => Promise.resolve(),
+    waitForHeadScripts: copyNewHeadScriptElements(newHead.scripts)
+  };
 }
 function trackedElementSignature(scripts) {
   return scripts.filter(elementIsTracked).map((s) => s.outerHTML).join();
@@ -131,6 +142,11 @@ function categorizeHead(head) {
 // renderer/wrapped/onBeforeRenderClient.ts
 async function wrappedOnBeforeRenderClient(pageContext) {
   if (pageContext.isHydration) {
+    if (document.readyState === "loading") {
+      await new Promise(
+        (resolve) => document.addEventListener("DOMContentLoaded", () => resolve(null))
+      );
+    }
     pageContext._turbolinksProxy = {
       body: document.getElementById("proxied-body")
     };
@@ -156,14 +172,14 @@ async function wrappedOnBeforeRenderClient(pageContext) {
     };
   }
   const { head, bodyAttrs } = pageContext._turbolinksProxy;
-  pageContext._beforeRender = () => {
-    pageContext._waitForHeadScripts = mergeHead(head);
-    Turbolinks.controller.viewWillRender();
-  };
+  pageContext._shouldEmitBeforeRender = true;
   await Turbolinks._vikeBeforeRender(
     pageContext._turbolinksVisit,
     pageContext.errorWhileRendering
   );
+  const { waitForReload, waitForHeadScripts } = mergeHead(head);
+  await waitForReload();
+  pageContext._waitForHeadScripts = waitForHeadScripts;
   if (bodyAttrs)
     setBodyAttributes(bodyAttrs);
 }

package/dist/renderer/wrapped/onBeforeRenderClient.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../lib/turbolinks/mergeHead.ts","../../../renderer/wrapped/onBeforeRenderClient.ts"],"sourcesContent":["import { createScriptElement } from \"./util\";\n\ninterface ElementDetails {\n  tracked: boolean;\n}\nconst allHeadScriptsEverRun: { [outerHTML: string]: ElementDetails } = {};\nlet firstLoad = true;\nlet lastTrackedScriptSignature: string;\n\n// Returns function which resolves when all new blocking head scripts have loaded\nexport function mergeHead(head: HTMLHeadElement) {\n  const newHead = categorizeHead(head);\n  const oldHead = categorizeHead(document.head);\n  const reload = () => window.Turbolinks.controller.viewInvalidated();\n\n  if (\n    head\n      .querySelector('meta[name=\"turbolinks-visit-control\"]')\n      ?.getAttribute(\"content\") === \"reload\"\n  ) {\n    reload();\n  }\n\n  lastTrackedScriptSignature =\n    lastTrackedScriptSignature ||\n    trackedElementSignature([...oldHead.scripts, ...oldHead.stylesheets]);\n  if (\n    lastTrackedScriptSignature !==\n    trackedElementSignature([...newHead.scripts, ...newHead.stylesheets])\n  ) {\n    reload();\n  }\n\n  if (firstLoad) {\n    // TODO: messy code\n    for (const element of oldHead.scripts) {\n      allHeadScriptsEverRun[element.outerHTML] = {\n        tracked: elementIsTracked(element),\n      };\n    }\n    firstLoad = false;\n  }\n\n  copyNewHeadStylesheetElements(newHead.stylesheets, oldHead.stylesheets);\n  removeCurrentHeadProvisionalElements(oldHead.provisional);\n  copyNewHeadProvisionalElements(newHead.provisional);\n\n  return copyNewHeadScriptElements(newHead.scripts);\n}\n\nfunction trackedElementSignature(scripts: Element[]) {\n  return scripts\n    .filter(elementIsTracked)\n    .map((s) => s.outerHTML)\n    .join();\n}\n\nfunction copyNewHeadStylesheetElements(next: Element[], prev: Element[]) {\n  const existing = prev.map((s) => s.outerHTML);\n  for (const element of next) {\n    if (!existing.includes(element.outerHTML)) {\n      document.head.appendChild(element);\n    }\n  }\n}\n\nfunction copyNewHeadScriptElements(next: Element[]): () => Promise<void> {\n  const deferredScripts: Element[] = [];\n  let blockingLoaded: boolean[] = [];\n  const scriptsLoadedPromise = new Promise<void>((onScriptsLoaded) => {\n    for (const element of next as HTMLScriptElement[]) {\n      const runBefore = element.outerHTML in allHeadScriptsEverRun;\n      if (!runBefore) {\n        let cb;\n        if (!element.defer && element.src) {\n          const idx = blockingLoaded.length;\n          cb = () => {\n            blockingLoaded[idx] = true;\n            if (blockingLoaded.every((v) => v)) {\n              onScriptsLoaded();\n            }\n          };\n          blockingLoaded.push(false);\n        }\n        const newElement = createScriptElement(element, cb);\n        if (element.defer) {\n          deferredScripts.push(newElement);\n        } else {\n          document.head.appendChild(newElement);\n        }\n        allHeadScriptsEverRun[element.outerHTML] = {\n          tracked: elementIsTracked(element),\n        };\n      }\n    }\n    if (blockingLoaded.length === 0) {\n      // raf waits for react to finish\n      onScriptsLoaded();\n    }\n  });\n  return () => {\n    deferredScripts.forEach((s) => document.head.appendChild(s));\n    return scriptsLoadedPromise;\n  };\n}\n\nfunction removeCurrentHeadProvisionalElements(prev: Element[]) {\n  for (const element of prev) {\n    document.head.removeChild(element);\n  }\n}\n\nfunction copyNewHeadProvisionalElements(next: Element[]) {\n  for (const element of next) {\n    document.head.appendChild(element);\n  }\n}\n\nfunction elementIsTracked(element: Element) {\n  return element.getAttribute(\"data-turbolinks-track\") == \"reload\";\n}\n\nfunction elementIsScript(element: Element) {\n  const tagName = element.tagName.toLowerCase();\n  return tagName == \"script\";\n}\n\nfunction elementIsStylesheet(element: Element) {\n  const tagName = element.tagName.toLowerCase();\n  return (\n    tagName == \"style\" ||\n    (tagName == \"link\" && element.getAttribute(\"rel\") == \"stylesheet\")\n  );\n}\n\nfunction elementIsFavicon(element: Element) {\n  const tagName = element.tagName.toLowerCase();\n\n  return tagName == \"link\" && element.getAttribute(\"rel\") == \"icon\";\n}\n\nfunction categorizeHead(head: ParentNode) {\n  const scripts = [];\n  const stylesheets = [];\n  const provisional = [];\n  for (const element of head.children) {\n    // we want to keep the same favicon on page transitions\n    if (elementIsFavicon(element)) {\n      continue;\n    }\n\n    if (elementIsScript(element)) {\n      scripts.push(element);\n    } else if (elementIsStylesheet(element)) {\n      stylesheets.push(element);\n    } else {\n      provisional.push(element);\n    }\n  }\n  return { scripts, stylesheets, provisional };\n}\n","import \"../../lib/type\";\nimport type { PageContextClient } from \"vike/types\";\nimport { Turbolinks } from \"../../lib/turbolinks\";\nimport { copyElementAttributes } from \"../../lib/turbolinks/util\";\nimport { mergeHead } from \"../../lib/turbolinks/mergeHead\";\nimport {\n  setBodyAttributes,\n  getElementAttributes,\n} from \"../../lib/elementUtils\";\n\nexport default async function wrappedOnBeforeRenderClient(\n  pageContext: PageContextClient\n) {\n  if (pageContext.isHydration) {\n    pageContext._turbolinksProxy = {\n      body: document.getElementById(\"proxied-body\")!,\n    };\n    return;\n  }\n\n  if (pageContext?._snapshot) {\n    if (pageContext.isHydration) {\n      throw new Error(\n        \"restoration visit should never happen on initial render\"\n      );\n    }\n    const { proxyLayoutInfo } = pageContext._snapshot.pageContext;\n    const { bodyEl, headEl } = pageContext._snapshot;\n    const proxyBodyEl = bodyEl.querySelector(\"#proxied-body\")!;\n    if (!proxyBodyEl || !(proxyBodyEl instanceof HTMLElement)) {\n      throw new Error(\"proxied body not found in cached snapshot\");\n    }\n    pageContext.proxyLayoutInfo = proxyLayoutInfo;\n    pageContext._turbolinksProxy = {\n      bodyAttrs: getElementAttributes(bodyEl),\n      body: proxyBodyEl,\n      head: headEl,\n    };\n  }\n  const { head, bodyAttrs } = pageContext._turbolinksProxy!;\n  pageContext._beforeRender = () => {\n    pageContext._waitForHeadScripts = mergeHead(head!);\n    Turbolinks.controller.viewWillRender(); // turbolinks:before-render\n  };\n\n  await Turbolinks._vikeBeforeRender(\n    pageContext._turbolinksVisit,\n    pageContext.errorWhileRendering\n  );\n\n  if (bodyAttrs) setBodyAttributes(bodyAttrs);\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../../lib/turbolinks/mergeHead.ts","../../../renderer/wrapped/onBeforeRenderClient.ts"],"sourcesContent":["import { createScriptElement } from \"./util\";\n\ninterface ElementDetails {\n  tracked: boolean;\n}\nconst allHeadScriptsEverRun: { [outerHTML: string]: ElementDetails } = {};\nlet firstLoad = true;\nlet lastTrackedScriptSignature: string;\n\n// Returns function which resolves when all new blocking head scripts have loaded\nexport function mergeHead(head: HTMLHeadElement) {\n  const newHead = categorizeHead(head);\n  const oldHead = categorizeHead(document.head);\n  const reload = () => {\n    window.Turbolinks.controller.viewInvalidated()\n    return {\n      waitForReload: () => new Promise<void>(() => {}),\n      waitForHeadScripts: () => new Promise<void>(() => {}),\n    }\n  };\n\n  if (\n    head\n      .querySelector('meta[name=\"turbolinks-visit-control\"]')\n      ?.getAttribute(\"content\") === \"reload\"\n  ) {\n    return reload();\n  }\n\n  lastTrackedScriptSignature =\n    lastTrackedScriptSignature ||\n    trackedElementSignature([...oldHead.scripts, ...oldHead.stylesheets]);\n  if (\n    lastTrackedScriptSignature !==\n    trackedElementSignature([...newHead.scripts, ...newHead.stylesheets])\n  ) {\n    return reload();\n  }\n\n  if (firstLoad) {\n    // TODO: messy code\n    for (const element of oldHead.scripts) {\n      allHeadScriptsEverRun[element.outerHTML] = {\n        tracked: elementIsTracked(element),\n      };\n    }\n    firstLoad = false;\n  }\n\n  copyNewHeadStylesheetElements(newHead.stylesheets, oldHead.stylesheets);\n  removeCurrentHeadProvisionalElements(oldHead.provisional);\n  copyNewHeadProvisionalElements(newHead.provisional);\n\n  return {\n    waitForReload: () => Promise.resolve(),\n    waitForHeadScripts: copyNewHeadScriptElements(newHead.scripts),\n  };\n}\n\nfunction trackedElementSignature(scripts: Element[]) {\n  return scripts\n    .filter(elementIsTracked)\n    .map((s) => s.outerHTML)\n    .join();\n}\n\nfunction copyNewHeadStylesheetElements(next: Element[], prev: Element[]) {\n  const existing = prev.map((s) => s.outerHTML);\n  for (const element of next) {\n    if (!existing.includes(element.outerHTML)) {\n      document.head.appendChild(element);\n    }\n  }\n}\n\nfunction copyNewHeadScriptElements(next: Element[]): () => Promise<void> {\n  const deferredScripts: Element[] = [];\n  let blockingLoaded: boolean[] = [];\n  const scriptsLoadedPromise = new Promise<void>((onScriptsLoaded) => {\n    for (const element of next as HTMLScriptElement[]) {\n      const runBefore = element.outerHTML in allHeadScriptsEverRun;\n      if (!runBefore) {\n        let cb;\n        if (!element.defer && element.src) {\n          const idx = blockingLoaded.length;\n          cb = () => {\n            blockingLoaded[idx] = true;\n            if (blockingLoaded.every((v) => v)) {\n              onScriptsLoaded();\n            }\n          };\n          blockingLoaded.push(false);\n        }\n        const newElement = createScriptElement(element, cb);\n        if (element.defer) {\n          deferredScripts.push(newElement);\n        } else {\n          document.head.appendChild(newElement);\n        }\n        allHeadScriptsEverRun[element.outerHTML] = {\n          tracked: elementIsTracked(element),\n        };\n      }\n    }\n    if (blockingLoaded.length === 0) {\n      // raf waits for react to finish\n      onScriptsLoaded();\n    }\n  });\n  return () => {\n    deferredScripts.forEach((s) => document.head.appendChild(s));\n    return scriptsLoadedPromise;\n  };\n}\n\nfunction removeCurrentHeadProvisionalElements(prev: Element[]) {\n  for (const element of prev) {\n    document.head.removeChild(element);\n  }\n}\n\nfunction copyNewHeadProvisionalElements(next: Element[]) {\n  for (const element of next) {\n    document.head.appendChild(element);\n  }\n}\n\nfunction elementIsTracked(element: Element) {\n  return element.getAttribute(\"data-turbolinks-track\") == \"reload\";\n}\n\nfunction elementIsScript(element: Element) {\n  const tagName = element.tagName.toLowerCase();\n  return tagName == \"script\";\n}\n\nfunction elementIsStylesheet(element: Element) {\n  const tagName = element.tagName.toLowerCase();\n  return (\n    tagName == \"style\" ||\n    (tagName == \"link\" && element.getAttribute(\"rel\") == \"stylesheet\")\n  );\n}\n\nfunction elementIsFavicon(element: Element) {\n  const tagName = element.tagName.toLowerCase();\n\n  return tagName == \"link\" && element.getAttribute(\"rel\") == \"icon\";\n}\n\nfunction categorizeHead(head: ParentNode) {\n  const scripts = [];\n  const stylesheets = [];\n  const provisional = [];\n  for (const element of head.children) {\n    // we want to keep the same favicon on page transitions\n    if (elementIsFavicon(element)) {\n      continue;\n    }\n\n    if (elementIsScript(element)) {\n      scripts.push(element);\n    } else if (elementIsStylesheet(element)) {\n      stylesheets.push(element);\n    } else {\n      provisional.push(element);\n    }\n  }\n  return { scripts, stylesheets, provisional };\n}\n","import \"../../lib/type\";\nimport type { PageContextClient } from \"vike/types\";\nimport { Turbolinks } from \"../../lib/turbolinks\";\nimport { copyElementAttributes } from \"../../lib/turbolinks/util\";\nimport { mergeHead } from \"../../lib/turbolinks/mergeHead\";\nimport {\n  setBodyAttributes,\n  getElementAttributes,\n} from \"../../lib/elementUtils\";\n\nexport default async function wrappedOnBeforeRenderClient(\n  pageContext: PageContextClient\n) {\n  if (pageContext.isHydration) {\n    // Vike scripts load async so can run before document.body exists. we need to delay rendering.\n    // This is only an issue if user sets `injectScriptsAt: \"HTML_BEGIN\"` in +config.ts\n    if (document.readyState === \"loading\") {\n      await new Promise((resolve) =>\n        document.addEventListener(\"DOMContentLoaded\", () => resolve(null))\n      );\n    }\n    pageContext._turbolinksProxy = {\n      body: document.getElementById(\"proxied-body\")!,\n    };\n    return;\n  }\n\n  if (pageContext?._snapshot) {\n    if (pageContext.isHydration) {\n      throw new Error(\n        \"restoration visit should never happen on initial render\"\n      );\n    }\n    const { proxyLayoutInfo } = pageContext._snapshot.pageContext;\n    const { bodyEl, headEl } = pageContext._snapshot;\n    const proxyBodyEl = bodyEl.querySelector(\"#proxied-body\")!;\n    if (!proxyBodyEl || !(proxyBodyEl instanceof HTMLElement)) {\n      throw new Error(\"proxied body not found in cached snapshot\");\n    }\n    pageContext.proxyLayoutInfo = proxyLayoutInfo;\n    pageContext._turbolinksProxy = {\n      bodyAttrs: getElementAttributes(bodyEl),\n      body: proxyBodyEl,\n      head: headEl,\n    };\n  }\n  const { head, bodyAttrs } = pageContext._turbolinksProxy!;\n  pageContext._shouldEmitBeforeRender = true;\n\n  await Turbolinks._vikeBeforeRender(\n    pageContext._turbolinksVisit,\n    pageContext.errorWhileRendering\n  );\n  const { waitForReload, waitForHeadScripts } = mergeHead(head!);\n\n  // If a full reload is required, wait for it here\n  await waitForReload();\n  pageContext._waitForHeadScripts = waitForHeadScripts;\n\n  if (bodyAttrs) setBodyAttributes(bodyAttrs);\n}\n"],"mappings":"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","names":[]}

package/dist/{type-813ffb18.d.ts → type-d58626e7.d.ts}

@@ -20,9 +20,9 @@ declare global {
         }
         interface PageContextClient {
             _snapshot?: Snapshot;
-            _beforeRender?: () => void;
             _waitForHeadScripts?: () => Promise<void>;
             _turbolinksVisit?: Visit;
+            _shouldEmitBeforeRender?: boolean;
         }
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alignable/bifrost",
   "repository": "https://github.com/Alignable/bifrost.git",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "type": "module",
   "types": "./dist/index.d.ts",
   "exports": {