@hotwired/turbo 8.0.0-rc.3 → 8.0.1

package/dist/turbo.es2017-esm.js

@@ -1,5 +1,5 @@
 /*!
-Turbo 8.0.0-rc.3
+Turbo 8.0.1
 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);
       }
     }
@@ -3085,8 +3085,7 @@ class History {
 
 class LinkPrefetchObserver {
   started = false
-  hoverTriggerEvent = "mouseenter"
-  touchTriggerEvent = "touchstart"
+  #prefetchedLink = null
 
   constructor(delegate, eventTarget) {
     this.delegate = delegate;
@@ -3106,27 +3105,29 @@ class LinkPrefetchObserver {
   stop() {
     if (!this.started) return
 
-    this.eventTarget.removeEventListener(this.hoverTriggerEvent, this.#tryToPrefetchRequest, {
+    this.eventTarget.removeEventListener("mouseenter", this.#tryToPrefetchRequest, {
       capture: true,
       passive: true
     });
-    this.eventTarget.removeEventListener(this.touchTriggerEvent, this.#tryToPrefetchRequest, {
+    this.eventTarget.removeEventListener("mouseleave", this.#cancelRequestIfObsolete, {
       capture: true,
       passive: true
     });
+
     this.eventTarget.removeEventListener("turbo:before-fetch-request", this.#tryToUsePrefetchedRequest, true);
     this.started = false;
   }
 
   #enable = () => {
-    this.eventTarget.addEventListener(this.hoverTriggerEvent, this.#tryToPrefetchRequest, {
+    this.eventTarget.addEventListener("mouseenter", this.#tryToPrefetchRequest, {
       capture: true,
       passive: true
     });
-    this.eventTarget.addEventListener(this.touchTriggerEvent, this.#tryToPrefetchRequest, {
+    this.eventTarget.addEventListener("mouseleave", this.#cancelRequestIfObsolete, {
       capture: true,
       passive: true
     });
+
     this.eventTarget.addEventListener("turbo:before-fetch-request", this.#tryToUsePrefetchedRequest, true);
     this.started = true;
   }
@@ -3142,6 +3143,8 @@ class LinkPrefetchObserver {
       const location = getLocationForLink(link);
 
       if (this.delegate.canPrefetchRequestToLocation(link, location)) {
+        this.#prefetchedLink = link;
+
         const fetchRequest = new FetchRequest(
           this,
           FetchMethod.get,
@@ -3151,12 +3154,19 @@ class LinkPrefetchObserver {
         );
 
         prefetchCache.setLater(location.toString(), fetchRequest, this.#cacheTtl);
-
-        link.addEventListener("mouseleave", () => prefetchCache.clear(), { once: true });
       }
     }
   }
 
+  #cancelRequestIfObsolete = (event) => {
+    if (event.target === this.#prefetchedLink) this.#cancelPrefetchRequest();
+  }
+
+  #cancelPrefetchRequest = () => {
+    prefetchCache.clear();
+    this.#prefetchedLink = null;
+  }
+
   #tryToUsePrefetchedRequest = (event) => {
     if (event.target.tagName !== "FORM" && event.detail.fetchOptions.method === "get") {
       const cached = prefetchCache.get(event.detail.url.toString());

package/dist/turbo.es2017-umd.js

@@ -1,5 +1,5 @@
 /*!
-Turbo 8.0.0-rc.3
+Turbo 8.0.1
 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);
         }
       }
@@ -3091,8 +3091,7 @@ Copyright © 2024 37signals LLC
 
   class LinkPrefetchObserver {
     started = false
-    hoverTriggerEvent = "mouseenter"
-    touchTriggerEvent = "touchstart"
+    #prefetchedLink = null
 
     constructor(delegate, eventTarget) {
       this.delegate = delegate;
@@ -3112,27 +3111,29 @@ Copyright © 2024 37signals LLC
     stop() {
       if (!this.started) return
 
-      this.eventTarget.removeEventListener(this.hoverTriggerEvent, this.#tryToPrefetchRequest, {
+      this.eventTarget.removeEventListener("mouseenter", this.#tryToPrefetchRequest, {
         capture: true,
         passive: true
       });
-      this.eventTarget.removeEventListener(this.touchTriggerEvent, this.#tryToPrefetchRequest, {
+      this.eventTarget.removeEventListener("mouseleave", this.#cancelRequestIfObsolete, {
         capture: true,
         passive: true
       });
+
       this.eventTarget.removeEventListener("turbo:before-fetch-request", this.#tryToUsePrefetchedRequest, true);
       this.started = false;
     }
 
     #enable = () => {
-      this.eventTarget.addEventListener(this.hoverTriggerEvent, this.#tryToPrefetchRequest, {
+      this.eventTarget.addEventListener("mouseenter", this.#tryToPrefetchRequest, {
         capture: true,
         passive: true
       });
-      this.eventTarget.addEventListener(this.touchTriggerEvent, this.#tryToPrefetchRequest, {
+      this.eventTarget.addEventListener("mouseleave", this.#cancelRequestIfObsolete, {
         capture: true,
         passive: true
       });
+
       this.eventTarget.addEventListener("turbo:before-fetch-request", this.#tryToUsePrefetchedRequest, true);
       this.started = true;
     }
@@ -3148,6 +3149,8 @@ Copyright © 2024 37signals LLC
         const location = getLocationForLink(link);
 
         if (this.delegate.canPrefetchRequestToLocation(link, location)) {
+          this.#prefetchedLink = link;
+
           const fetchRequest = new FetchRequest(
             this,
             FetchMethod.get,
@@ -3157,12 +3160,19 @@ Copyright © 2024 37signals LLC
           );
 
           prefetchCache.setLater(location.toString(), fetchRequest, this.#cacheTtl);
-
-          link.addEventListener("mouseleave", () => prefetchCache.clear(), { once: true });
         }
       }
     }
 
+    #cancelRequestIfObsolete = (event) => {
+      if (event.target === this.#prefetchedLink) this.#cancelPrefetchRequest();
+    }
+
+    #cancelPrefetchRequest = () => {
+      prefetchCache.clear();
+      this.#prefetchedLink = null;
+    }
+
     #tryToUsePrefetchedRequest = (event) => {
       if (event.target.tagName !== "FORM" && event.detail.fetchOptions.method === "get") {
         const cached = prefetchCache.get(event.detail.url.toString());

package/package.json

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