From 4b5d69e090603fc90c830b07a6b039a6a6674955 Mon Sep 17 00:00:00 2001
From: sstephenson <sstephenson@gmail.com>
Date: Thu, 7 Mar 2019 16:39:53 -0600
Subject: [PATCH 1/3] Extract Location.currentLocation

---
 src/controller.ts | 2 +-
 src/history.ts    | 2 +-
 src/location.ts   | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/controller.ts b/src/controller.ts
index 076c1be6..7f1bb0a4 100644
--- a/src/controller.ts
+++ b/src/controller.ts
@@ -95,7 +95,7 @@ export class Controller {
   // History
 
   startHistory() {
-    this.location = Location.wrap(window.location.toString())
+    this.location = Location.currentLocation
     this.restorationIdentifier = uuid()
     this.history.start()
     this.history.replace(this.location, this.restorationIdentifier)
diff --git a/src/history.ts b/src/history.ts
index 6fd577fb..6573d3a6 100644
--- a/src/history.ts
+++ b/src/history.ts
@@ -46,7 +46,7 @@ export class History {
     if (this.shouldHandlePopState()) {
       const { turbolinks } = event.state
       if (turbolinks) {
-        const location = Location.wrap(window.location.toString())
+        const location = Location.currentLocation
         const { restorationIdentifier } = turbolinks
         this.delegate.historyPoppedToLocationWithRestorationIdentifier(location, restorationIdentifier)
       }
diff --git a/src/location.ts b/src/location.ts
index 3f767015..ba5f1c44 100644
--- a/src/location.ts
+++ b/src/location.ts
@@ -1,6 +1,10 @@
 export type Locatable = Location | string
 
 export class Location {
+  static get currentLocation() {
+    return this.wrap(window.location.toString())
+  }
+
   static wrap(locatable: Locatable): Location
   static wrap(locatable?: Locatable | null): Location | undefined
   static wrap(locatable: Locatable) {

From 17719bb21941b9de6e230af731576afe1358b9ff Mon Sep 17 00:00:00 2001
From: sstephenson <sstephenson@gmail.com>
Date: Thu, 7 Mar 2019 17:51:08 -0600
Subject: [PATCH 2/3] Fall back to current location if lastRenderedLocation is
 unset

By design, Controller#pageLoaded may not be called when loading Turbolinks with a <script async> tag.

Fixes #447
---
 src/controller.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/controller.ts b/src/controller.ts
index 7f1bb0a4..812452d3 100644
--- a/src/controller.ts
+++ b/src/controller.ts
@@ -145,8 +145,8 @@ export class Controller {
     if (this.shouldCacheSnapshot()) {
       this.notifyApplicationBeforeCachingSnapshot()
       const snapshot = this.view.getSnapshot()
-      const location = this.lastRenderedLocation
-      defer(() => this.cache.put(location!, snapshot.clone()))
+      const location = this.lastRenderedLocation || Location.currentLocation
+      defer(() => this.cache.put(location, snapshot.clone()))
     }
   }
 

From f2c40b786399f8c80f700d282308e8e16248f4fc Mon Sep 17 00:00:00 2001
From: sstephenson <sstephenson@gmail.com>
Date: Thu, 7 Mar 2019 17:51:32 -0600
Subject: [PATCH 3/3] Test loading asynchronously after DOMContentLoaded

Ref. #274, #278
---
 src/tests/async_script_tests.ts        | 20 ++++++++++++++++++++
 src/tests/fixtures/async_script.html   | 24 ++++++++++++++++++++++++
 src/tests/fixtures/async_script_2.html | 14 ++++++++++++++
 src/tests/index.ts                     |  1 +
 4 files changed, 59 insertions(+)
 create mode 100644 src/tests/async_script_tests.ts
 create mode 100644 src/tests/fixtures/async_script.html
 create mode 100644 src/tests/fixtures/async_script_2.html

diff --git a/src/tests/async_script_tests.ts b/src/tests/async_script_tests.ts
new file mode 100644
index 00000000..77dc4100
--- /dev/null
+++ b/src/tests/async_script_tests.ts
@@ -0,0 +1,20 @@
+import { TurbolinksTestCase } from "./helpers/turbolinks_test_case"
+
+export class AsyncScriptTests extends TurbolinksTestCase {
+  async setup() {
+    await this.goToLocation("/fixtures/async_script.html")
+  }
+
+  async "test does not emit turbolinks:load when loaded asynchronously after DOMContentLoaded"() {
+    const events = await this.eventLogChannel.read()
+    this.assert.deepEqual(events, [])
+  }
+
+  async "test following a link when loaded asynchronously after DOMContentLoaded"() {
+    this.clickSelector("#async-link")
+    await this.nextBody
+    this.assert.equal(await this.visitAction, "advance")
+  }
+}
+
+AsyncScriptTests.registerSuite()
diff --git a/src/tests/fixtures/async_script.html b/src/tests/fixtures/async_script.html
new file mode 100644
index 00000000..7ba14de2
--- /dev/null
+++ b/src/tests/fixtures/async_script.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Turbolinks</title>
+    <script src="/fixtures/test.js"></script>
+    <script>
+      addEventListener("DOMContentLoaded", function() {
+        setTimeout(function() {
+          var script = document.createElement("script")
+          script.src = "/fixtures/turbolinks.js"
+          script.setAttribute("async", "")
+          document.head.appendChild(script)
+        }, 1)
+      })
+    </script>
+  </head>
+  <body>
+    <section>
+      <h1>Async script</h1>
+      <p><a href="async_script_2.html" id="async-link">Async script 2</a></p>
+    </section>
+  </body>
+</html>
diff --git a/src/tests/fixtures/async_script_2.html b/src/tests/fixtures/async_script_2.html
new file mode 100644
index 00000000..89426fdb
--- /dev/null
+++ b/src/tests/fixtures/async_script_2.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Turbolinks</title>
+    <script src="/fixtures/test.js"></script>
+    <script src="/fixtures/turbolinks.js" async></script>
+  </head>
+  <body>
+    <section>
+      <h1>Async script 2</h1>
+    </section>
+  </body>
+</html>
diff --git a/src/tests/index.ts b/src/tests/index.ts
index ac21fbed..06c15c1a 100644
--- a/src/tests/index.ts
+++ b/src/tests/index.ts
@@ -1,3 +1,4 @@
+export * from "./async_script_tests"
 export * from "./navigation_tests"
 export * from "./rendering_tests"
 export * from "./visit_tests"