@hotwired/turbo 7.1.0-rc.2 → 7.1.0-rc.3

package/dist/turbo.es2017-esm.js

@@ -1,5 +1,5 @@
 /*
-Turbo 7.1.0-rc.1
+Turbo 7.1.0-rc.3
 Copyright © 2021 Basecamp, LLC
  */
 (function () {
@@ -404,13 +404,10 @@ class FetchRequest {
         this.delegate = delegate;
         this.method = method;
         this.headers = this.defaultHeaders;
-        if (this.isIdempotent) {
-            this.url = mergeFormDataEntries(location, [...body.entries()]);
-        }
-        else {
-            this.body = body;
-            this.url = location;
-        }
+        this.body = body;
+        this.url = this.isIdempotent ?
+            mergeFormDataEntries(new URL(location.href), this.entries) :
+            location;
         this.target = target;
     }
     get location() {
@@ -466,7 +463,7 @@ class FetchRequest {
             credentials: "same-origin",
             headers: this.headers,
             redirect: "follow",
-            body: this.body,
+            body: this.isIdempotent ? null : this.body,
             signal: this.abortSignal,
             referrer: (_a = this.delegate.referrer) === null || _a === void 0 ? void 0 : _a.href
         };
@@ -488,7 +485,7 @@ class FetchRequest {
             cancelable: true,
             detail: {
                 fetchOptions,
-                url: this.url.href,
+                url: this.url,
                 resume: this.resolveRequestPromise
             },
             target: this.target
@@ -498,18 +495,13 @@ class FetchRequest {
     }
 }
 function mergeFormDataEntries(url, entries) {
-    const currentSearchParams = new URLSearchParams(url.search);
+    const searchParams = new URLSearchParams;
     for (const [name, value] of entries) {
         if (value instanceof File)
             continue;
-        if (currentSearchParams.has(name)) {
-            currentSearchParams.delete(name);
-            url.searchParams.set(name, value);
-        }
-        else {
-            url.searchParams.append(name, value);
-        }
+        searchParams.append(name, value);
     }
+    url.search = searchParams.toString();
     return url;
 }
 
@@ -792,7 +784,7 @@ class FormInterceptor {
     constructor(delegate, element) {
         this.submitBubbled = ((event) => {
             const form = event.target;
-            if (form instanceof HTMLFormElement && form.closest("turbo-frame, html") == this.element) {
+            if (!event.defaultPrevented && form instanceof HTMLFormElement && form.closest("turbo-frame, html") == this.element) {
                 const submitter = event.submitter || undefined;
                 const method = (submitter === null || submitter === void 0 ? void 0 : submitter.getAttribute("formmethod")) || form.method;
                 if (method != "dialog" && this.delegate.shouldInterceptFormSubmission(form, submitter)) {
@@ -1715,10 +1707,10 @@ class BrowserAdapter {
         this.navigator.startVisit(location, uuid(), options);
     }
     visitStarted(visit) {
+        visit.loadCachedSnapshot();
         visit.issueRequest();
         visit.changeHistory();
         visit.goToSamePageAnchor();
-        visit.loadCachedSnapshot();
     }
     visitRequestStarted(visit) {
         this.progressBar.setValue(0);
@@ -2902,7 +2894,7 @@ class FrameController {
             this.currentURL = this.sourceURL;
             if (this.sourceURL) {
                 try {
-                    this.element.loaded = this.visit(this.sourceURL);
+                    this.element.loaded = this.visit(expandURL(this.sourceURL));
                     this.appearanceObserver.stop();
                     await this.element.loaded;
                     this.hasBeenLoaded = true;
@@ -3018,7 +3010,7 @@ class FrameController {
     }
     async visit(url) {
         var _a;
-        const request = new FetchRequest(this, FetchMethod.get, expandURL(url), new URLSearchParams, this.element);
+        const request = new FetchRequest(this, FetchMethod.get, url, url.searchParams, this.element);
         (_a = this.currentFetchRequest) === null || _a === void 0 ? void 0 : _a.cancel();
         this.currentFetchRequest = request;
         return new Promise(resolve => {

package/dist/turbo.es2017-umd.js

@@ -1,5 +1,5 @@
 /*
-Turbo 7.1.0-rc.1
+Turbo 7.1.0-rc.3
 Copyright © 2021 Basecamp, LLC
  */
 (function (global, factory) {
@@ -410,13 +410,10 @@ Copyright © 2021 Basecamp, LLC
             this.delegate = delegate;
             this.method = method;
             this.headers = this.defaultHeaders;
-            if (this.isIdempotent) {
-                this.url = mergeFormDataEntries(location, [...body.entries()]);
-            }
-            else {
-                this.body = body;
-                this.url = location;
-            }
+            this.body = body;
+            this.url = this.isIdempotent ?
+                mergeFormDataEntries(new URL(location.href), this.entries) :
+                location;
             this.target = target;
         }
         get location() {
@@ -472,7 +469,7 @@ Copyright © 2021 Basecamp, LLC
                 credentials: "same-origin",
                 headers: this.headers,
                 redirect: "follow",
-                body: this.body,
+                body: this.isIdempotent ? null : this.body,
                 signal: this.abortSignal,
                 referrer: (_a = this.delegate.referrer) === null || _a === void 0 ? void 0 : _a.href
             };
@@ -494,7 +491,7 @@ Copyright © 2021 Basecamp, LLC
                 cancelable: true,
                 detail: {
                     fetchOptions,
-                    url: this.url.href,
+                    url: this.url,
                     resume: this.resolveRequestPromise
                 },
                 target: this.target
@@ -504,18 +501,13 @@ Copyright © 2021 Basecamp, LLC
         }
     }
     function mergeFormDataEntries(url, entries) {
-        const currentSearchParams = new URLSearchParams(url.search);
+        const searchParams = new URLSearchParams;
         for (const [name, value] of entries) {
             if (value instanceof File)
                 continue;
-            if (currentSearchParams.has(name)) {
-                currentSearchParams.delete(name);
-                url.searchParams.set(name, value);
-            }
-            else {
-                url.searchParams.append(name, value);
-            }
+            searchParams.append(name, value);
         }
+        url.search = searchParams.toString();
         return url;
     }
 
@@ -798,7 +790,7 @@ Copyright © 2021 Basecamp, LLC
         constructor(delegate, element) {
             this.submitBubbled = ((event) => {
                 const form = event.target;
-                if (form instanceof HTMLFormElement && form.closest("turbo-frame, html") == this.element) {
+                if (!event.defaultPrevented && form instanceof HTMLFormElement && form.closest("turbo-frame, html") == this.element) {
                     const submitter = event.submitter || undefined;
                     const method = (submitter === null || submitter === void 0 ? void 0 : submitter.getAttribute("formmethod")) || form.method;
                     if (method != "dialog" && this.delegate.shouldInterceptFormSubmission(form, submitter)) {
@@ -1721,10 +1713,10 @@ Copyright © 2021 Basecamp, LLC
             this.navigator.startVisit(location, uuid(), options);
         }
         visitStarted(visit) {
+            visit.loadCachedSnapshot();
             visit.issueRequest();
             visit.changeHistory();
             visit.goToSamePageAnchor();
-            visit.loadCachedSnapshot();
         }
         visitRequestStarted(visit) {
             this.progressBar.setValue(0);
@@ -2908,7 +2900,7 @@ Copyright © 2021 Basecamp, LLC
                 this.currentURL = this.sourceURL;
                 if (this.sourceURL) {
                     try {
-                        this.element.loaded = this.visit(this.sourceURL);
+                        this.element.loaded = this.visit(expandURL(this.sourceURL));
                         this.appearanceObserver.stop();
                         await this.element.loaded;
                         this.hasBeenLoaded = true;
@@ -3024,7 +3016,7 @@ Copyright © 2021 Basecamp, LLC
         }
         async visit(url) {
             var _a;
-            const request = new FetchRequest(this, FetchMethod.get, expandURL(url), new URLSearchParams, this.element);
+            const request = new FetchRequest(this, FetchMethod.get, url, url.searchParams, this.element);
             (_a = this.currentFetchRequest) === null || _a === void 0 ? void 0 : _a.cancel();
             this.currentFetchRequest = request;
             return new Promise(resolve => {

package/dist/types/tests/functional/form_submission_tests.d.ts

@@ -8,9 +8,13 @@ export declare class FormSubmissionTests extends TurboDriveTestCase {
     "test standard form submission does not render a progress bar before expiring the delay"(): Promise<void>;
     "test standard form submission with redirect response"(): Promise<void>;
     "test standard POST form submission events"(): Promise<void>;
+    "test standard POST form submission merges values from both searchParams and body"(): Promise<void>;
     "test standard POST form submission toggles submitter [disabled] attribute"(): Promise<void>;
     "test standard GET form submission"(): Promise<void>;
     "test standard GET form submission events"(): Promise<void>;
+    "test standard GET form submission does not incorporate the current page's URLSearchParams values into the submission"(): Promise<void>;
+    "test standard GET form submission does not merge values into the [action] attribute"(): Promise<void>;
+    "test standard GET form submission omits the [action] value's URLSearchParams from the submission"(): Promise<void>;
     "test standard GET form submission toggles submitter [disabled] attribute"(): Promise<void>;
     "test standard GET form submission appending keys"(): Promise<void>;
     "test standard form submission with empty created response"(): Promise<void>;
@@ -50,6 +54,7 @@ export declare class FormSubmissionTests extends TurboDriveTestCase {
     "test frame form submission with HTTP verb other than GET or POST"(): Promise<void>;
     "test frame form submission with [data-turbo=false] on the form"(): Promise<void>;
     "test frame form submission with [data-turbo=false] on the submitter"(): Promise<void>;
+    "test frame form submission ignores submissions with their defaultPrevented"(): Promise<void>;
     "test form submission with [data-turbo=false] on the form"(): Promise<void>;
     "test form submission with [data-turbo=false] on the submitter"(): Promise<void>;
     "test form submission skipped within method=dialog"(): Promise<void>;

package/dist/types/tests/functional/visit_tests.d.ts

@@ -8,6 +8,7 @@ export declare class VisitTests extends TurboDriveTestCase {
     "test navigation by history is not cancelable"(): Promise<void>;
     "test turbo:before-fetch-request event.detail"(): Promise<void>;
     "test turbo:before-fetch-response open new site"(): Promise<void>;
+    "test cache does not override response after redirect"(): Promise<void>;
     visitLocation(location: string): Promise<void>;
     cancelNextVisit(): Promise<void>;
 }

package/package.json

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