@hotwired/turbo 8.0.6 → 8.0.11

package/dist/turbo.es2017-esm.js

@@ -1,5 +1,5 @@
 /*!
-Turbo 8.0.6
+Turbo 8.0.11
 Copyright © 2024 37signals LLC
  */
 /**
@@ -313,7 +313,7 @@ function activateScriptElement(element) {
     return element
   } else {
     const createdScriptElement = document.createElement("script");
-    const cspNonce = getMetaContent("csp-nonce");
+    const cspNonce = getCspNonce();
     if (cspNonce) {
       createdScriptElement.nonce = cspNonce;
     }
@@ -486,6 +486,15 @@ function getMetaContent(name) {
   return element && element.content
 }
 
+function getCspNonce() {
+  const element = getMetaElement("csp-nonce");
+
+  if (element) {
+    const { nonce, content } = element;
+    return nonce == "" ? content : nonce
+  }
+}
+
 function setMetaContent(name, content) {
   let element = getMetaElement(name);
 
@@ -1843,12 +1852,16 @@ function createPlaceholderForPermanentElement(permanentElement) {
 class Renderer {
   #activeElement = null
 
-  constructor(currentSnapshot, newSnapshot, renderElement, isPreview, willRender = true) {
+  static renderElement(currentElement, newElement) {
+    // Abstract method
+  }
+
+  constructor(currentSnapshot, newSnapshot, isPreview, willRender = true) {
     this.currentSnapshot = currentSnapshot;
     this.newSnapshot = newSnapshot;
     this.isPreview = isPreview;
     this.willRender = willRender;
-    this.renderElement = renderElement;
+    this.renderElement = this.constructor.renderElement;
     this.promise = new Promise((resolve, reject) => (this.resolvingFunctions = { resolve, reject }));
   }
 
@@ -2919,6 +2932,10 @@ class MorphingFrameRenderer extends FrameRenderer {
 
     morphChildren(currentElement, newElement);
   }
+
+  async preservingPermanentElements(callback) {
+    return await callback()
+  }
 }
 
 class ProgressBar {
@@ -3027,8 +3044,9 @@ class ProgressBar {
     const element = document.createElement("style");
     element.type = "text/css";
     element.textContent = ProgressBar.defaultCSS;
-    if (this.cspNonce) {
-      element.nonce = this.cspNonce;
+    const cspNonce = getCspNonce();
+    if (cspNonce) {
+      element.nonce = cspNonce;
     }
     return element
   }
@@ -3038,10 +3056,6 @@ class ProgressBar {
     element.className = "turbo-progress-bar";
     return element
   }
-
-  get cspNonce() {
-    return getMetaContent("csp-nonce")
-  }
 }
 
 class HeadSnapshot extends Snapshot {
@@ -5032,7 +5046,7 @@ class PageView extends View {
     const shouldMorphPage = this.isPageRefresh(visit) && this.snapshot.shouldMorphPage;
     const rendererClass = shouldMorphPage ? MorphingPageRenderer : PageRenderer;
 
-    const renderer = new rendererClass(this.snapshot, snapshot, rendererClass.renderElement, isPreview, willRender);
+    const renderer = new rendererClass(this.snapshot, snapshot, isPreview, willRender);
 
     if (!renderer.shouldRender) {
       this.forceReloaded = true;
@@ -5045,7 +5059,7 @@ class PageView extends View {
 
   renderError(snapshot, visit) {
     visit?.changeHistory();
-    const renderer = new ErrorRenderer(this.snapshot, snapshot, ErrorRenderer.renderElement, false);
+    const renderer = new ErrorRenderer(this.snapshot, snapshot, false);
     return this.render(renderer)
   }
 
@@ -5816,6 +5830,7 @@ class FrameController {
   #connected = false
   #hasBeenLoaded = false
   #ignoredAttributes = new Set()
+  #shouldMorphFrame = false
   action = null
 
   constructor(element) {
@@ -5873,13 +5888,10 @@ class FrameController {
   }
 
   sourceURLReloaded() {
-    if (this.element.shouldReloadWithMorph) {
-      this.element.addEventListener("turbo:before-frame-render", ({ detail }) => {
-        detail.render = MorphingFrameRenderer.renderElement;
-      }, { once: true });
-    }
+    const { refresh, src } = this.element;
+
+    this.#shouldMorphFrame = src && refresh === "morph";
 
-    const { src } = this.element;
     this.element.removeAttribute("complete");
     this.element.src = null;
     this.element.src = src;
@@ -5922,6 +5934,7 @@ class FrameController {
         }
       }
     } finally {
+      this.#shouldMorphFrame = false;
       this.fetchResponseLoaded = () => Promise.resolve();
     }
   }
@@ -6087,11 +6100,11 @@ class FrameController {
 
   async #loadFrameResponse(fetchResponse, document) {
     const newFrameElement = await this.extractForeignFrameElement(document.body);
+    const rendererClass = this.#shouldMorphFrame ? MorphingFrameRenderer : FrameRenderer;
 
     if (newFrameElement) {
       const snapshot = new Snapshot(newFrameElement);
-      const renderer = new FrameRenderer(this, this.view.snapshot, snapshot, FrameRenderer.renderElement, false, false);
-
+      const renderer = new rendererClass(this, this.view.snapshot, snapshot, false, false);
       if (this.view.renderPromise) await this.view.renderPromise;
       this.changeHistory();
 

package/dist/turbo.es2017-umd.js

@@ -1,5 +1,5 @@
 /*!
-Turbo 8.0.6
+Turbo 8.0.11
 Copyright © 2024 37signals LLC
  */
 (function (global, factory) {
@@ -319,7 +319,7 @@ Copyright © 2024 37signals LLC
       return element
     } else {
       const createdScriptElement = document.createElement("script");
-      const cspNonce = getMetaContent("csp-nonce");
+      const cspNonce = getCspNonce();
       if (cspNonce) {
         createdScriptElement.nonce = cspNonce;
       }
@@ -492,6 +492,15 @@ Copyright © 2024 37signals LLC
     return element && element.content
   }
 
+  function getCspNonce() {
+    const element = getMetaElement("csp-nonce");
+
+    if (element) {
+      const { nonce, content } = element;
+      return nonce == "" ? content : nonce
+    }
+  }
+
   function setMetaContent(name, content) {
     let element = getMetaElement(name);
 
@@ -1849,12 +1858,16 @@ Copyright © 2024 37signals LLC
   class Renderer {
     #activeElement = null
 
-    constructor(currentSnapshot, newSnapshot, renderElement, isPreview, willRender = true) {
+    static renderElement(currentElement, newElement) {
+      // Abstract method
+    }
+
+    constructor(currentSnapshot, newSnapshot, isPreview, willRender = true) {
       this.currentSnapshot = currentSnapshot;
       this.newSnapshot = newSnapshot;
       this.isPreview = isPreview;
       this.willRender = willRender;
-      this.renderElement = renderElement;
+      this.renderElement = this.constructor.renderElement;
       this.promise = new Promise((resolve, reject) => (this.resolvingFunctions = { resolve, reject }));
     }
 
@@ -2925,6 +2938,10 @@ Copyright © 2024 37signals LLC
 
       morphChildren(currentElement, newElement);
     }
+
+    async preservingPermanentElements(callback) {
+      return await callback()
+    }
   }
 
   class ProgressBar {
@@ -3033,8 +3050,9 @@ Copyright © 2024 37signals LLC
       const element = document.createElement("style");
       element.type = "text/css";
       element.textContent = ProgressBar.defaultCSS;
-      if (this.cspNonce) {
-        element.nonce = this.cspNonce;
+      const cspNonce = getCspNonce();
+      if (cspNonce) {
+        element.nonce = cspNonce;
       }
       return element
     }
@@ -3044,10 +3062,6 @@ Copyright © 2024 37signals LLC
       element.className = "turbo-progress-bar";
       return element
     }
-
-    get cspNonce() {
-      return getMetaContent("csp-nonce")
-    }
   }
 
   class HeadSnapshot extends Snapshot {
@@ -5038,7 +5052,7 @@ Copyright © 2024 37signals LLC
       const shouldMorphPage = this.isPageRefresh(visit) && this.snapshot.shouldMorphPage;
       const rendererClass = shouldMorphPage ? MorphingPageRenderer : PageRenderer;
 
-      const renderer = new rendererClass(this.snapshot, snapshot, rendererClass.renderElement, isPreview, willRender);
+      const renderer = new rendererClass(this.snapshot, snapshot, isPreview, willRender);
 
       if (!renderer.shouldRender) {
         this.forceReloaded = true;
@@ -5051,7 +5065,7 @@ Copyright © 2024 37signals LLC
 
     renderError(snapshot, visit) {
       visit?.changeHistory();
-      const renderer = new ErrorRenderer(this.snapshot, snapshot, ErrorRenderer.renderElement, false);
+      const renderer = new ErrorRenderer(this.snapshot, snapshot, false);
       return this.render(renderer)
     }
 
@@ -5822,6 +5836,7 @@ Copyright © 2024 37signals LLC
     #connected = false
     #hasBeenLoaded = false
     #ignoredAttributes = new Set()
+    #shouldMorphFrame = false
     action = null
 
     constructor(element) {
@@ -5879,13 +5894,10 @@ Copyright © 2024 37signals LLC
     }
 
     sourceURLReloaded() {
-      if (this.element.shouldReloadWithMorph) {
-        this.element.addEventListener("turbo:before-frame-render", ({ detail }) => {
-          detail.render = MorphingFrameRenderer.renderElement;
-        }, { once: true });
-      }
+      const { refresh, src } = this.element;
+
+      this.#shouldMorphFrame = src && refresh === "morph";
 
-      const { src } = this.element;
       this.element.removeAttribute("complete");
       this.element.src = null;
       this.element.src = src;
@@ -5928,6 +5940,7 @@ Copyright © 2024 37signals LLC
           }
         }
       } finally {
+        this.#shouldMorphFrame = false;
         this.fetchResponseLoaded = () => Promise.resolve();
       }
     }
@@ -6093,11 +6106,11 @@ Copyright © 2024 37signals LLC
 
     async #loadFrameResponse(fetchResponse, document) {
       const newFrameElement = await this.extractForeignFrameElement(document.body);
+      const rendererClass = this.#shouldMorphFrame ? MorphingFrameRenderer : FrameRenderer;
 
       if (newFrameElement) {
         const snapshot = new Snapshot(newFrameElement);
-        const renderer = new FrameRenderer(this, this.view.snapshot, snapshot, FrameRenderer.renderElement, false, false);
-
+        const renderer = new rendererClass(this, this.view.snapshot, snapshot, false, false);
         if (this.view.renderPromise) await this.view.renderPromise;
         this.changeHistory();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hotwired/turbo",
-  "version": "8.0.6",
+  "version": "8.0.11",
   "description": "The speed of a single-page web application without having to write any JavaScript",
   "module": "dist/turbo.es2017-esm.js",
   "main": "dist/turbo.es2017-umd.js",