@hotwired/turbo 8.0.0 → 8.0.2

package/dist/turbo.es2017-esm.js

@@ -1,5 +1,5 @@
 /*!
-Turbo 8.0.0
+Turbo 8.0.2
 Copyright © 2024 37signals LLC
  */
 /**
@@ -2417,11 +2417,11 @@ class Visit {
   complete() {
     if (this.state == VisitState.started) {
       this.recordTimingMetric(TimingMetric.visitEnd);
+      this.adapter.visitCompleted(this);
       this.state = VisitState.completed;
       this.followRedirect();
 
       if (!this.followedRedirect) {
-        this.adapter.visitCompleted(this);
         this.delegate.visitCompleted(this);
       }
     }
@@ -3191,10 +3191,6 @@ class LinkPrefetchObserver {
     if (turboFrameTarget && turboFrameTarget !== "_top") {
       request.headers["Turbo-Frame"] = turboFrameTarget;
     }
-
-    if (link.hasAttribute("data-turbo-stream")) {
-      request.acceptResponseType(StreamMessage.contentType);
-    }
   }
 
   // Fetch request interface
@@ -3218,52 +3214,54 @@ class LinkPrefetchObserver {
   #isPrefetchable(link) {
     const href = link.getAttribute("href");
 
-    if (!href || href.startsWith("#") || link.getAttribute("data-turbo") === "false" || link.getAttribute("data-turbo-prefetch") === "false") {
-      return false
-    }
+    if (!href) return false
 
-    const event = dispatch("turbo:before-prefetch", {
-      target: link,
-      cancelable: true
-    });
+    if (unfetchableLink(link)) return false
+    if (linkToTheSamePage(link)) return false
+    if (linkOptsOut(link)) return false
+    if (nonSafeLink(link)) return false
+    if (eventPrevented(link)) return false
 
-    if (event.defaultPrevented) {
-      return false
-    }
+    return true
+  }
+}
 
-    if (link.origin !== document.location.origin) {
-      return false
-    }
+const unfetchableLink = (link) => {
+  return link.origin !== document.location.origin || !["http:", "https:"].includes(link.protocol) || link.hasAttribute("target")
+};
 
-    if (!["http:", "https:"].includes(link.protocol)) {
-      return false
-    }
+const linkToTheSamePage = (link) => {
+  return (link.pathname + link.search === document.location.pathname + document.location.search) || link.href.startsWith("#")
+};
 
-    if (link.pathname + link.search === document.location.pathname + document.location.search) {
-      return false
-    }
+const linkOptsOut = (link) => {
+  if (link.getAttribute("data-turbo-prefetch") === "false") return true
+  if (link.getAttribute("data-turbo") === "false") return true
 
-    const turboMethod = link.getAttribute("data-turbo-method");
-    if (turboMethod && turboMethod !== "get") {
-      return false
-    }
+  const turboPrefetchParent = findClosestRecursively(link, "[data-turbo-prefetch]");
+  if (turboPrefetchParent && turboPrefetchParent.getAttribute("data-turbo-prefetch") === "false") return true
 
-    if (targetsIframe(link)) {
-      return false
-    }
+  return false
+};
 
-    const turboPrefetchParent = findClosestRecursively(link, "[data-turbo-prefetch]");
+const nonSafeLink = (link) => {
+  const turboMethod = link.getAttribute("data-turbo-method");
+  if (turboMethod && turboMethod.toLowerCase() !== "get") return true
 
-    if (turboPrefetchParent && turboPrefetchParent.getAttribute("data-turbo-prefetch") === "false") {
-      return false
-    }
+  if (isUJS(link)) return true
+  if (link.hasAttribute("data-turbo-confirm")) return true
+  if (link.hasAttribute("data-turbo-stream")) return true
 
-    return true
-  }
-}
+  return false
+};
+
+const isUJS = (link) => {
+  return link.hasAttribute("data-remote") || link.hasAttribute("data-behavior") || link.hasAttribute("data-confirm") || link.hasAttribute("data-method")
+};
 
-const targetsIframe = (link) => {
-  return !doesNotTargetIFrame(link)
+const eventPrevented = (link) => {
+  const event = dispatch("turbo:before-prefetch", { target: link, cancelable: true });
+  return event.defaultPrevented
 };
 
 class Navigator {

package/dist/turbo.es2017-umd.js

@@ -1,5 +1,5 @@
 /*!
-Turbo 8.0.0
+Turbo 8.0.2
 Copyright © 2024 37signals LLC
  */
 (function (global, factory) {
@@ -2423,11 +2423,11 @@ Copyright © 2024 37signals LLC
     complete() {
       if (this.state == VisitState.started) {
         this.recordTimingMetric(TimingMetric.visitEnd);
+        this.adapter.visitCompleted(this);
         this.state = VisitState.completed;
         this.followRedirect();
 
         if (!this.followedRedirect) {
-          this.adapter.visitCompleted(this);
           this.delegate.visitCompleted(this);
         }
       }
@@ -3197,10 +3197,6 @@ Copyright © 2024 37signals LLC
       if (turboFrameTarget && turboFrameTarget !== "_top") {
         request.headers["Turbo-Frame"] = turboFrameTarget;
       }
-
-      if (link.hasAttribute("data-turbo-stream")) {
-        request.acceptResponseType(StreamMessage.contentType);
-      }
     }
 
     // Fetch request interface
@@ -3224,52 +3220,54 @@ Copyright © 2024 37signals LLC
     #isPrefetchable(link) {
       const href = link.getAttribute("href");
 
-      if (!href || href.startsWith("#") || link.getAttribute("data-turbo") === "false" || link.getAttribute("data-turbo-prefetch") === "false") {
-        return false
-      }
+      if (!href) return false
 
-      const event = dispatch("turbo:before-prefetch", {
-        target: link,
-        cancelable: true
-      });
+      if (unfetchableLink(link)) return false
+      if (linkToTheSamePage(link)) return false
+      if (linkOptsOut(link)) return false
+      if (nonSafeLink(link)) return false
+      if (eventPrevented(link)) return false
 
-      if (event.defaultPrevented) {
-        return false
-      }
+      return true
+    }
+  }
 
-      if (link.origin !== document.location.origin) {
-        return false
-      }
+  const unfetchableLink = (link) => {
+    return link.origin !== document.location.origin || !["http:", "https:"].includes(link.protocol) || link.hasAttribute("target")
+  };
 
-      if (!["http:", "https:"].includes(link.protocol)) {
-        return false
-      }
+  const linkToTheSamePage = (link) => {
+    return (link.pathname + link.search === document.location.pathname + document.location.search) || link.href.startsWith("#")
+  };
 
-      if (link.pathname + link.search === document.location.pathname + document.location.search) {
-        return false
-      }
+  const linkOptsOut = (link) => {
+    if (link.getAttribute("data-turbo-prefetch") === "false") return true
+    if (link.getAttribute("data-turbo") === "false") return true
 
-      const turboMethod = link.getAttribute("data-turbo-method");
-      if (turboMethod && turboMethod !== "get") {
-        return false
-      }
+    const turboPrefetchParent = findClosestRecursively(link, "[data-turbo-prefetch]");
+    if (turboPrefetchParent && turboPrefetchParent.getAttribute("data-turbo-prefetch") === "false") return true
 
-      if (targetsIframe(link)) {
-        return false
-      }
+    return false
+  };
 
-      const turboPrefetchParent = findClosestRecursively(link, "[data-turbo-prefetch]");
+  const nonSafeLink = (link) => {
+    const turboMethod = link.getAttribute("data-turbo-method");
+    if (turboMethod && turboMethod.toLowerCase() !== "get") return true
 
-      if (turboPrefetchParent && turboPrefetchParent.getAttribute("data-turbo-prefetch") === "false") {
-        return false
-      }
+    if (isUJS(link)) return true
+    if (link.hasAttribute("data-turbo-confirm")) return true
+    if (link.hasAttribute("data-turbo-stream")) return true
 
-      return true
-    }
-  }
+    return false
+  };
+
+  const isUJS = (link) => {
+    return link.hasAttribute("data-remote") || link.hasAttribute("data-behavior") || link.hasAttribute("data-confirm") || link.hasAttribute("data-method")
+  };
 
-  const targetsIframe = (link) => {
-    return !doesNotTargetIFrame(link)
+  const eventPrevented = (link) => {
+    const event = dispatch("turbo:before-prefetch", { target: link, cancelable: true });
+    return event.defaultPrevented
   };
 
   class Navigator {

package/package.json

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