@hotwired/turbo 8.0.0-beta.3 → 8.0.0-beta.4

package/dist/turbo.es2017-esm.js

@@ -1,5 +1,5 @@
 /*!
-Turbo 8.0.0-beta.3
+Turbo 8.0.0-beta.4
 Copyright © 2024 37signals LLC
  */
 /**
@@ -1937,8 +1937,6 @@ function readScrollBehavior(value, defaultValue) {
   }
 }
 
-const ProgressBarID = "turbo-progress-bar";
-
 class ProgressBar {
   static animationDuration = 300 /*ms*/
 
@@ -2043,8 +2041,6 @@ class ProgressBar {
 
   createStylesheetElement() {
     const element = document.createElement("style");
-    element.id = ProgressBarID;
-    element.setAttribute("data-turbo-permanent", "");
     element.type = "text/css";
     element.textContent = ProgressBar.defaultCSS;
     if (this.cspNonce) {
@@ -3173,14 +3169,11 @@ class LinkPrefetchObserver {
 
     request.headers["Sec-Purpose"] = "prefetch";
 
-    if (link.dataset.turboFrame && link.dataset.turboFrame !== "_top") {
-      request.headers["Turbo-Frame"] = link.dataset.turboFrame;
-    } else if (link.dataset.turboFrame !== "_top") {
-      const turboFrame = link.closest("turbo-frame");
+    const turboFrame = link.closest("turbo-frame");
+    const turboFrameTarget = link.getAttribute("data-turbo-frame") || turboFrame?.getAttribute("target") || turboFrame?.id;
 
-      if (turboFrame) {
-        request.headers["Turbo-Frame"] = turboFrame.id;
-      }
+    if (turboFrameTarget && turboFrameTarget !== "_top") {
+      request.headers["Turbo-Frame"] = turboFrameTarget;
     }
 
     if (link.hasAttribute("data-turbo-stream")) {
@@ -4717,7 +4710,7 @@ class PageRenderer extends Renderer {
     await newStylesheetElements;
 
     if (this.willRender) {
-      this.removeUnusedHeadStylesheetElements();
+      this.removeUnusedDynamicStylesheetElements();
     }
   }
 
@@ -4750,8 +4743,8 @@ class PageRenderer extends Renderer {
     }
   }
 
-  removeUnusedHeadStylesheetElements() {
-    for (const element of this.unusedHeadStylesheetElements) {
+  removeUnusedDynamicStylesheetElements() {
+    for (const element of this.unusedDynamicStylesheetElements) {
       document.head.removeChild(element);
     }
   }
@@ -4821,13 +4814,9 @@ class PageRenderer extends Renderer {
     await this.renderElement(this.currentElement, this.newElement);
   }
 
-  get unusedHeadStylesheetElements() {
+  get unusedDynamicStylesheetElements() {
     return this.oldHeadStylesheetElements.filter((element) => {
-      return !(element.hasAttribute("data-turbo-permanent") ||
-        // Trix dynamically adds styles to the head that we want to keep around which have a
-        // `data-tag-name` attribute. Long term we should moves those styles to Trix's CSS file
-        // but for now we'll just skip removing them
-        element.hasAttribute("data-tag-name"))
+      return element.getAttribute("data-turbo-track") === "dynamic"
     })
   }
 

package/dist/turbo.es2017-umd.js

@@ -1,5 +1,5 @@
 /*!
-Turbo 8.0.0-beta.3
+Turbo 8.0.0-beta.4
 Copyright © 2024 37signals LLC
  */
 (function (global, factory) {
@@ -1943,8 +1943,6 @@ Copyright © 2024 37signals LLC
     }
   }
 
-  const ProgressBarID = "turbo-progress-bar";
-
   class ProgressBar {
     static animationDuration = 300 /*ms*/
 
@@ -2049,8 +2047,6 @@ Copyright © 2024 37signals LLC
 
     createStylesheetElement() {
       const element = document.createElement("style");
-      element.id = ProgressBarID;
-      element.setAttribute("data-turbo-permanent", "");
       element.type = "text/css";
       element.textContent = ProgressBar.defaultCSS;
       if (this.cspNonce) {
@@ -3179,14 +3175,11 @@ Copyright © 2024 37signals LLC
 
       request.headers["Sec-Purpose"] = "prefetch";
 
-      if (link.dataset.turboFrame && link.dataset.turboFrame !== "_top") {
-        request.headers["Turbo-Frame"] = link.dataset.turboFrame;
-      } else if (link.dataset.turboFrame !== "_top") {
-        const turboFrame = link.closest("turbo-frame");
+      const turboFrame = link.closest("turbo-frame");
+      const turboFrameTarget = link.getAttribute("data-turbo-frame") || turboFrame?.getAttribute("target") || turboFrame?.id;
 
-        if (turboFrame) {
-          request.headers["Turbo-Frame"] = turboFrame.id;
-        }
+      if (turboFrameTarget && turboFrameTarget !== "_top") {
+        request.headers["Turbo-Frame"] = turboFrameTarget;
       }
 
       if (link.hasAttribute("data-turbo-stream")) {
@@ -4723,7 +4716,7 @@ Copyright © 2024 37signals LLC
       await newStylesheetElements;
 
       if (this.willRender) {
-        this.removeUnusedHeadStylesheetElements();
+        this.removeUnusedDynamicStylesheetElements();
       }
     }
 
@@ -4756,8 +4749,8 @@ Copyright © 2024 37signals LLC
       }
     }
 
-    removeUnusedHeadStylesheetElements() {
-      for (const element of this.unusedHeadStylesheetElements) {
+    removeUnusedDynamicStylesheetElements() {
+      for (const element of this.unusedDynamicStylesheetElements) {
         document.head.removeChild(element);
       }
     }
@@ -4827,13 +4820,9 @@ Copyright © 2024 37signals LLC
       await this.renderElement(this.currentElement, this.newElement);
     }
 
-    get unusedHeadStylesheetElements() {
+    get unusedDynamicStylesheetElements() {
       return this.oldHeadStylesheetElements.filter((element) => {
-        return !(element.hasAttribute("data-turbo-permanent") ||
-          // Trix dynamically adds styles to the head that we want to keep around which have a
-          // `data-tag-name` attribute. Long term we should moves those styles to Trix's CSS file
-          // but for now we'll just skip removing them
-          element.hasAttribute("data-tag-name"))
+        return element.getAttribute("data-turbo-track") === "dynamic"
       })
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hotwired/turbo",
-  "version": "8.0.0-beta.3",
+  "version": "8.0.0-beta.4",
   "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",