turbo-rails 0.7.11 → 0.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fe3ad5cd094491982825ff80d21c619aab81bbcbe7e07168e467beeb3daa493
-  data.tar.gz: 757f2faa9d39389014fc277ef75d3c806c9864b1deb87f6efae5118c604cf89b
+  metadata.gz: 85771aa7f175db32f70c6b54ed5ae8ef2dd5e5538bf987b40d68eb6e4699e7b0
+  data.tar.gz: 946d4845a3f2478c5ca443507114d9a7fc5231a86ecf17a294dbe40c28b10174
 SHA512:
-  metadata.gz: e38bd507e3eaeeccd3e8e570e3341cdc8ae27074ba03d3e509605a13f3df4188bd54250bbbb8f6161e3d3e261e5ae6edd928d3fb2aac7fd8d9ede9e7c1810717
-  data.tar.gz: 77f0a351ce8ab0cca1bc69413a508d6d8b790f61e18623ae16aad7d929536baa4f8c75b6407e6752d5301d022f0b49472c4376506181d1ffd31ed91b033459a2
+  metadata.gz: 41651d40a449a1622e479b2c2950f82149749fce699b88a1a723a77fc3c23af543e491bb2aefafa4ad0cfe5e85db95b7ea8e059d15294db22537b74a39a18ceb
+  data.tar.gz: 78f1a8a26ddc16fa9263eac070b7311223decaa69409715f4931f03f410435374a883759e360410f8ae8729c6fd6fdeafbe9d3b9e57211aaa5af677aa9b884a7

data/app/assets/javascripts/turbo.js

@@ -31,6 +31,7 @@ function clickCaptured(event) {
 
 (function() {
   if ("SubmitEvent" in window) return;
+  if ("submitter" in Event.prototype) return;
   addEventListener("click", clickCaptured, true);
   Object.defineProperty(Event.prototype, "submitter", {
     get() {
@@ -226,11 +227,11 @@ class FetchResponse {
     return this.header("Content-Type");
   }
   get responseText() {
-    return this.response.text();
+    return this.response.clone().text();
   }
   get responseHTML() {
     if (this.isHTML) {
-      return this.response.text();
+      return this.response.clone().text();
     } else {
       return Promise.resolve(undefined);
     }
@@ -326,7 +327,7 @@ function fetchMethodFromString(method) {
 }
 
 class FetchRequest {
-  constructor(delegate, method, location, body = new URLSearchParams) {
+  constructor(delegate, method, location, body = new URLSearchParams, target = null) {
     this.abortController = new AbortController;
     this.resolveRequestPromise = value => {};
     this.delegate = delegate;
@@ -338,6 +339,7 @@ class FetchRequest {
       this.body = body;
       this.url = location;
     }
+    this.target = target;
   }
   get location() {
     return this.url;
@@ -375,7 +377,8 @@ class FetchRequest {
       cancelable: true,
       detail: {
         fetchResponse: fetchResponse
-      }
+      },
+      target: this.target
     });
     if (event.defaultPrevented) {
       this.delegate.requestPreventedHandlingResponse(this, fetchResponse);
@@ -417,7 +420,8 @@ class FetchRequest {
         fetchOptions: fetchOptions,
         url: this.url.href,
         resume: this.resolveRequestPromise
-      }
+      },
+      target: this.target
     });
     if (event.defaultPrevented) await requestInterception;
   }
@@ -538,7 +542,7 @@ class FormSubmission {
     this.formElement = formElement;
     this.submitter = submitter;
     this.formData = buildFormData(formElement, submitter);
-    this.fetchRequest = new FetchRequest(this, this.method, this.location, this.body);
+    this.fetchRequest = new FetchRequest(this, this.method, this.location, this.body, this.formElement);
     this.mustRedirect = mustRedirect;
   }
   get method() {
@@ -1173,7 +1177,7 @@ ProgressBar.animationDuration = 300;
 class HeadSnapshot extends Snapshot {
   constructor() {
     super(...arguments);
-    this.detailsByOuterHTML = this.children.filter((element => !elementIsNoscript(element))).reduce(((result, element) => {
+    this.detailsByOuterHTML = this.children.filter((element => !elementIsNoscript(element))).map((element => elementWithoutNonce(element))).reduce(((result, element) => {
       const {outerHTML: outerHTML} = element;
       const details = outerHTML in result ? result[outerHTML] : {
         type: elementType(element),
@@ -1255,6 +1259,13 @@ function elementIsMetaElementWithName(element, name) {
   return tagName == "meta" && element.getAttribute("name") == name;
 }
 
+function elementWithoutNonce(element) {
+  if (element.hasAttribute("nonce")) {
+    element.setAttribute("nonce", "");
+  }
+  return element;
+}
+
 class PageSnapshot extends Snapshot {
   constructor(element, headSnapshot) {
     super(element);
@@ -1805,18 +1816,18 @@ class FrameRedirector {
     return this.shouldRedirect(element, submitter);
   }
   formSubmissionIntercepted(element, submitter) {
-    const frame = this.findFrameElement(element);
+    const frame = this.findFrameElement(element, submitter);
     if (frame) {
       frame.removeAttribute("reloadable");
       frame.delegate.formSubmissionIntercepted(element, submitter);
     }
   }
   shouldRedirect(element, submitter) {
-    const frame = this.findFrameElement(element);
+    const frame = this.findFrameElement(element, submitter);
     return frame ? frame != element.closest("turbo-frame") : false;
   }
-  findFrameElement(element) {
-    const id = element.getAttribute("data-turbo-frame");
+  findFrameElement(element, submitter) {
+    const id = (submitter === null || submitter === void 0 ? void 0 : submitter.getAttribute("data-turbo-frame")) || element.getAttribute("data-turbo-frame");
     if (id && id != "_top") {
       const frame = this.element.querySelector(`#${id}:not([disabled])`);
       if (frame instanceof FrameElement) {
@@ -2539,12 +2550,13 @@ class Session {
     });
   }
   convertLinkWithMethodClickToFormSubmission(link) {
+    var _a;
     const linkMethod = link.getAttribute("data-turbo-method");
     if (linkMethod) {
       const form = document.createElement("form");
       form.method = linkMethod;
       form.action = link.getAttribute("href") || "undefined";
-      document.body.appendChild(form);
+      (_a = link.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(form, link);
       return dispatch("submit", {
         cancelable: true,
         target: form
@@ -2896,7 +2908,7 @@ class FrameController {
     this.reloadable = false;
     this.formSubmission = new FormSubmission(this, element, submitter);
     if (this.formSubmission.fetchRequest.isIdempotent) {
-      this.navigateFrame(element, this.formSubmission.fetchRequest.url.href);
+      this.navigateFrame(element, this.formSubmission.fetchRequest.url.href, submitter);
     } else {
       const {fetchRequest: fetchRequest} = this.formSubmission;
       this.prepareHeadersForRequest(fetchRequest.headers, fetchRequest);
@@ -2932,7 +2944,7 @@ class FrameController {
     frame.setAttribute("busy", "");
   }
   formSubmissionSucceededWithResponse(formSubmission, response) {
-    const frame = this.findFrameElement(formSubmission.formElement);
+    const frame = this.findFrameElement(formSubmission.formElement, formSubmission.submitter);
     frame.delegate.loadResponse(response);
   }
   formSubmissionFailedWithResponse(formSubmission, fetchResponse) {
@@ -2951,7 +2963,7 @@ class FrameController {
   viewRenderedSnapshot(snapshot, isPreview) {}
   viewInvalidated() {}
   async visit(url) {
-    const request = new FetchRequest(this, FetchMethod.get, expandURL(url));
+    const request = new FetchRequest(this, FetchMethod.get, expandURL(url), undefined, this.element);
     return new Promise((resolve => {
       this.resolveVisitPromise = () => {
         this.resolveVisitPromise = () => {};
@@ -2960,13 +2972,14 @@ class FrameController {
       request.perform();
     }));
   }
-  navigateFrame(element, url) {
-    const frame = this.findFrameElement(element);
+  navigateFrame(element, url, submitter) {
+    const frame = this.findFrameElement(element, submitter);
+    frame.setAttribute("reloadable", "");
     frame.src = url;
   }
-  findFrameElement(element) {
+  findFrameElement(element, submitter) {
     var _a;
-    const id = element.getAttribute("data-turbo-frame") || this.element.getAttribute("target");
+    const id = (submitter === null || submitter === void 0 ? void 0 : submitter.getAttribute("data-turbo-frame")) || element.getAttribute("data-turbo-frame") || this.element.getAttribute("target");
     return (_a = getFrameElementById(id)) !== null && _a !== void 0 ? _a : this.element;
   }
   async extractForeignFrameElement(container) {
@@ -2987,7 +3000,7 @@ class FrameController {
     return new FrameElement;
   }
   shouldInterceptNavigation(element, submitter) {
-    const id = element.getAttribute("data-turbo-frame") || this.element.getAttribute("target");
+    const id = (submitter === null || submitter === void 0 ? void 0 : submitter.getAttribute("data-turbo-frame")) || element.getAttribute("data-turbo-frame") || this.element.getAttribute("target");
     if (!this.enabled || id == "_top") {
       return false;
     }

data/lib/install/turbo_needs_redis.rb

@@ -1,6 +1,6 @@
 if (cable_config_path = Rails.root.join("config/cable.yml")).exist?
   say "Enable redis in bundle"
-  uncomment_lines "Gemfile", %(gem 'redis')
+  uncomment_lines "Gemfile", /gem ['"]redis['"]/
 
   say "Switch development cable to use redis"
   gsub_file cable_config_path.to_s, /development:\n\s+adapter: async/, "development:\n  adapter: redis\n  url: redis://localhost:6379/1"

data/lib/turbo/version.rb

@@ -1,3 +1,3 @@
 module Turbo
-  VERSION = "0.7.11"
+  VERSION = "0.7.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbo-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.11
+  version: 0.7.12
 platform: ruby
 authors:
 - Sam Stephenson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-03 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails