decred · chappjc · Jun 8, 2021
diff --git a/cmd/dcrdata/package-lock.json b/cmd/dcrdata/package-lock.json
diff --git a/cmd/dcrdata/package.json b/cmd/dcrdata/package.json
@@ -53,6 +53,7 @@
     "webpack-merge": "^5.7.3"
   },
   "dependencies": {
+    "@hotwired/turbo": "^7.0.0-beta.5",
     "bootstrap": "^4.6.0",
     "dompurify": "^2.2.8",
     "lodash-es": "^4.17.21",

diff --git a/cmd/dcrdata/public/index.js b/cmd/dcrdata/public/index.js
@@ -17,7 +17,7 @@ const application = Application.start()
 const context = require.context('./js/controllers', true, /\.js$/)
 application.load(definitionsFromContext(context))
 
-document.addEventListener('turbolinks:load', function (e) {
+document.addEventListener('turbo:load', function (e) {
   document.querySelectorAll('.jsonly').forEach((el) => {
     el.classList.remove('jsonly')
   })

diff --git a/cmd/dcrdata/public/js/controllers/address_controller.js b/cmd/dcrdata/public/js/controllers/address_controller.js
@@ -5,7 +5,7 @@ import { getDefault } from '../helpers/module_helper'
 import { padPoints, sizedBarPlotter } from '../helpers/chart_helper'
 import Zoom from '../helpers/zoom_helper'
 import globalEventBus from '../services/event_bus_service'
-import TurboQuery from '../helpers/turbolinks_helper'
+import TurboQuery from '../helpers/turbodrive_helper'
 import axios from 'axios'
 import humanize from '../helpers/humanize_helper'
 import txInBlock from '../helpers/block_helper'

diff --git a/cmd/dcrdata/public/js/controllers/attackcost_controller.js b/cmd/dcrdata/public/js/controllers/attackcost_controller.js
@@ -1,5 +1,5 @@
 import { Controller } from 'stimulus'
-import TurboQuery from '../helpers/turbolinks_helper'
+import TurboQuery from '../helpers/turbodrive_helper'
 import { getDefault } from '../helpers/module_helper'
 import globalEventBus from '../services/event_bus_service'
 import dompurify from 'dompurify'

diff --git a/cmd/dcrdata/public/js/controllers/charts_controller.js b/cmd/dcrdata/public/js/controllers/charts_controller.js
@@ -5,7 +5,7 @@ import { darkEnabled } from '../services/theme_service'
 import { animationFrame } from '../helpers/animation_helper'
 import { getDefault } from '../helpers/module_helper'
 import axios from 'axios'
-import TurboQuery from '../helpers/turbolinks_helper'
+import TurboQuery from '../helpers/turbodrive_helper'
 import globalEventBus from '../services/event_bus_service'
 import { isEqual } from '../helpers/chart_helper'
 import dompurify from 'dompurify'

diff --git a/cmd/dcrdata/public/js/controllers/market_controller.js b/cmd/dcrdata/public/js/controllers/market_controller.js
@@ -1,5 +1,5 @@
 import { Controller } from 'stimulus'
-import TurboQuery from '../helpers/turbolinks_helper'
+import TurboQuery from '../helpers/turbodrive_helper'
 import { getDefault } from '../helpers/module_helper'
 import humanize from '../helpers/humanize_helper'
 import { darkEnabled } from '../services/theme_service'

diff --git a/cmd/dcrdata/public/js/controllers/pagenavigation_controller.js b/cmd/dcrdata/public/js/controllers/pagenavigation_controller.js
@@ -1,6 +1,6 @@
-/* global Turbolinks */
 import { Controller } from 'stimulus'
 import Url from 'url-parse'
+import * as Turbo from '@hotwired/turbo'
 
 export default class extends Controller {
   static get targets () {
@@ -18,15 +18,15 @@ export default class extends Controller {
       q.byvotestatus = this.votestatusTarget.selectedOptions[0].value
     }
     url.set('query', q)
-    Turbolinks.visit(url.toString())
+    Turbo.visit(url.toString())
   }
 
   setFilterbyVoteStatus () {
     const url = Url(window.location.href)
     const q = {}
     q.byvotestatus = this.votestatusTarget.selectedOptions[0].value
     url.set('query', q)
-    Turbolinks.visit(url.toString())
+    Turbo.visit(url.toString())
   }
 
   setListView () {
@@ -36,6 +36,6 @@ export default class extends Controller {
       url.set('query', {})
     }
     url.set('pathname', newPeriod)
-    Turbolinks.visit(url.href)
+    Turbo.visit(url.href)
   }
 }
diff --git a/cmd/dcrdata/public/js/controllers/search_controller.js b/cmd/dcrdata/public/js/controllers/search_controller.js
@@ -1,5 +1,5 @@
-/* global Turbolinks */
 import { Controller } from 'stimulus'
+import * as Turbo from '@hotwired/turbo'
 
 export default class extends Controller {
   execute (e) {
@@ -8,6 +8,6 @@ export default class extends Controller {
     if (search === '') {
       return
     }
-    Turbolinks.visit('/search?search=' + search)
+    Turbo.visit('/search?search=' + search)
   }
 }
diff --git a/cmd/dcrdata/public/js/controllers/status_controller.js b/cmd/dcrdata/public/js/controllers/status_controller.js
@@ -1,9 +1,9 @@
-/* global Turbolinks */
 import { Controller } from 'stimulus'
 import dompurify from 'dompurify'
 import ws from '../services/messagesocket_service'
 import Notify from 'notifyjs'
 import globalEventBus from '../services/event_bus_service'
+import * as Turbo from '@hotwired/turbo'
 
 function buildProgressBar (data) {
   const clean = dompurify.sanitize
@@ -91,7 +91,7 @@ export default class extends Controller {
           if (!Notify.needsPermission) doNotification()
 
           this.messageTarget.querySelector('h5').textContent = 'Blockchain sync is complete. Redirecting to home in 20 secs.'
-          setTimeout(() => Turbolinks.visit('/'), 20000)
+          setTimeout(() => Turbo.visit('/'), 20000)
           return
         }
       }
@@ -107,7 +107,7 @@ export default class extends Controller {
 
   _processBlock (blockData) {
     if (this.hasFutureBlockTarget) {
-      Turbolinks.visit(window.location, { action: 'replace' })
+      Turbo.visit(window.location, { action: 'replace' })
     }
   }
 }
diff --git a/...ta/public/js/helpers/turbolinks_helper.js → ...ta/public/js/helpers/turbodrive_helper.js b/...ta/public/js/helpers/turbolinks_helper.js → ...ta/public/js/helpers/turbodrive_helper.js
@@ -1,14 +1,14 @@
-/* global Turbolinks */
 import Url from 'url-parse'
+import * as Turbo from '@hotwired/turbo'
 
 export default class TurboQuery {
-  constructor (turbolinks) {
+  constructor (turbo) {
     const tq = this
     tq.replaceTimer = 0
     tq.appendTimer = 0
-    tq.turbolinks = turbolinks || Turbolinks || false
-    if (!tq.turbolinks || !tq.turbolinks.supported) {
-      console.error('No passed or global Turbolinks instance detected. TurboQuery requires Turbolinks.')
+    tq.turbo = turbo || Turbo || false
+    if (!tq.turbo) {
+      console.error('No passed or global Turbo instance detected. TurboQuery requires Turbo.')
       return
     }
     // These are timer callbacks. Bind them to the TurboQuery instance.
@@ -33,16 +33,17 @@ export default class TurboQuery {
 
   _replaceHistory () {
     // see https://github.com/turbolinks/turbolinks/issues/219. This also works:
-    // window.history.replaceState(window.history.state, this.addr, this.url.href)
-    this.turbolinks.controller.replaceHistoryWithLocationAndRestorationIdentifier(this.turbolinks.Location.wrap(this.url.href), this.turbolinks.uuid())
+    window.history.replaceState(window.history.state, this.addr, this.url.href)
+    // this.turbo.controller.replaceHistoryWithLocationAndRestorationIdentifier(this.turbo.Location.wrap(this.url.href), this.turbo.uuid())
     this.replaceTimer = 0
   }
 
   _appendHistory () {
     // same as replaceHref, but creates a new entry in history for navigating
     // with the browsers forward and back buttons. May still not work because of
     // TurboLinks caching behavior, I think.
-    this.turbolinks.controller.pushHistoryWithLocationAndRestorationIdentifier(this.turbolinks.Location.wrap(this.url.href), this.turbolinks.uuid())
+    window.history.pushState(window.history.state, this.addr, this.url.href)
+    // this.turbo.controller.pushHistoryWithLocationAndRestorationIdentifier(this.turbo.Location.wrap(this.url.href), this.turbo.uuid())
     this.appendTimer = 0
   }
 

diff --git a/cmd/dcrdata/public/js/services/keyboard_navigation_service.js b/cmd/dcrdata/public/js/services/keyboard_navigation_service.js
@@ -1,8 +1,8 @@
-/* global Turbolinks */
 import { toggleMenu, toggleSun, closeMenu } from '../services/theme_service'
 import { setCookie } from './cookie_service'
 import Mousetrap from 'mousetrap'
 import { addPauseToMousetrap } from '../vendor/mousetrap-pause'
+import * as Turbo from '@hotwired/turbo'
 
 addPauseToMousetrap(Mousetrap)
 
@@ -130,7 +130,7 @@ Mousetrap.bind('enter', function (e) {
       jumpToIndexOnLoad = currentIndex
     }
     currentTarget.classList.add('activated')
-    Turbolinks.visit(location)
+    Turbo.visit(location)
   }
 })
 
@@ -169,7 +169,7 @@ if (keyNavEnabled()) {
 
 keyNavToggle.querySelector('.text').textContent = keyNavEnabled() ? 'Disable Hot Keys' : 'Enable Hot Keys'
 
-document.addEventListener('turbolinks:load', function (e) {
+document.addEventListener('turbo:load', function (e) {
   closeMenu(e)
   if (keyNavEnabled()) {
     keyNav(e, true)

diff --git a/cmd/dcrdata/public/js/services/theme_service.js b/cmd/dcrdata/public/js/services/theme_service.js
@@ -39,7 +39,7 @@ export function toggleSun () {
   }
 }
 
-document.addEventListener('turbolinks:before-render', function (event) {
+document.addEventListener('turbo:before-render', function (event) {
   if (darkEnabled()) {
     toggleToDarkClasses(event.data.newBody)
   } else {

diff --git a/cmd/dcrdata/public/scss/themes.scss b/cmd/dcrdata/public/scss/themes.scss
@@ -174,6 +174,7 @@ body.darkBG {
   .nav-pills .nav-link.active {
     background-color: #2dd8a3;
     color: black;
+    cursor: pointer;
   }
 
   .dcrdata-logo {

diff --git a/cmd/dcrdata/views/address.tmpl b/cmd/dcrdata/views/address.tmpl
@@ -207,7 +207,7 @@
                           data-target="address.pageminus">
                           <a  class="page-link"
                               href="{{.Path}}?n={{.Limit}}&start={{if gt (subtract .Offset .Limit) 0}}{{subtract .Offset .Limit}}{{else}}0{{end}}&txntype={{$txType}}"
-                              data-turbolinks="false"
+                              data-turbo="false"
                               data-target="address.paginator"
                               data-action="address#prevPage"
                           >Previous</a>
@@ -216,7 +216,7 @@
                           data-target="address.pageplus">
                           <a  class="page-link"
                               href="{{.Path}}?n={{.Limit}}&start={{add .Offset .Limit}}&txntype={{$txType}}"
-                              data-turbolinks="false"
+                              data-turbo="false"
                               data-target="address.paginator"
                               data-action="address#nextPage"
                           >Next</a>

diff --git a/cmd/dcrdata/views/block.tmpl b/cmd/dcrdata/views/block.tmpl
@@ -46,7 +46,7 @@
 						{{- else }}
 						<a class="fs13" href="/mempool">mempool </a>|
 						{{- end}}
-						<a class="fs13" href="/api/block/{{.Height}}/verbose?indent=true" data-turbolinks="false">api</a>
+						<a class="fs13" href="/api/block/{{.Height}}/verbose?indent=true" data-turbo="false">api</a>
 					</div>
 				</div>
 			</div>

diff --git a/cmd/dcrdata/views/extras.tmpl b/cmd/dcrdata/views/extras.tmpl
@@ -1,5 +1,5 @@
 {{define "html-head"}}
-<head data-turbolinks-eval="false">
+<head data-turbo-eval="false">
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
@@ -36,7 +36,7 @@
 		<meta name="msapplication-config" content="/images/favicon/browserconfig.xml?v=65tv3">
 	<!-- End custom favicon -->
 
-	<meta name="turbolinks-cache-control" content="no-cache">
+	<meta name="turbo-cache-control" content="no-cache">
 	<title>{{.}}</title>
 	<link rel="preload" href="/fonts/icomoon.ttf?g003m6" as="font" type="font/ttf" crossorigin="anonymous" />
 	<link rel="preload" href="/fonts/inconsolata-v15-latin-regular.woff?x=65tv3" as="font" type="font/woff" crossorigin="anonymous" />
@@ -47,8 +47,6 @@
 	<link rel="preload" href="/images/connected.svg?x=65tv3" as="image" type="image/svg+xml" />
 	<link rel="preload" href="/images/disconnected.svg?x=65tv3" as="image" type="image/svg+xml" />
 	<link href="/dist/css/style.css?v=uV0HsM7" rel="stylesheet">
-
-	<script src="/js/vendor/turbolinks.min.js?v=65tv3"></script>
 </head>
 {{end}}
 
@@ -77,7 +75,7 @@
 			/>
 			<button class="search-bttn" type="submit"><span class="dcricon-search"></span></button>
 		</form>
-		<nav id="hamburger-menu" data-controller="menu" data-turbolinks-permanent>
+		<nav id="hamburger-menu" data-controller="menu" data-turbo-permanent>
 			<div id="menuToggle">
 				<input type="checkbox" data-target="menu.toggle" data-action="change->menu#toggle"/>
 				<span class="patty"></span>
@@ -113,7 +111,7 @@
 								</div>
 						</button>
 					</form>
-					<a class="menu-item jsonly" data-keynav-skip data-turbolinks="false" href="#" id="keynav-toggle">
+					<a class="menu-item jsonly" data-keynav-skip data-turbo="false" href="#" id="keynav-toggle">
 						<span class="text">Enable Hot Keys</span><span class="keys-hint">(&nbsp;&nbsp;<span class="arrows"> &#8592;<br>&#8594;</span>&nbsp;&nbsp;enter&nbsp;&nbsp;\&nbsp;&nbsp;=&nbsp;&nbsp;)</span>
 					</a>
 					<a class="menu-item" data-keynav-skip href="{{.Links.APIDocs}}" title="API Endpoints" target="_blank" rel="noopener noreferrer">JSON API Docs</a>
@@ -157,7 +155,7 @@
 		<span
 			id="connection"
 			class="text-nowrap align-items-center clickable d-inline-block"
-			data-turbolinks-permanent
+			data-turbo-permanent
 			data-controller="connection"
 			data-target="connection.indicator"
 			data-action="click->connection#requestNotifyPermission"
@@ -167,13 +165,13 @@
 	</div>
 	<script
 		src="/dist/js/4.bundle.js?v=uV0HsM5"
-		data-turbolinks-eval="false"
-		data-turbolinks-suppress-warning
+		data-turbo-eval="false"
+		data-turbo-suppress-warning
 	></script>
 	<script
 		src="/dist/js/app.bundle.js?v=uV0HsM5"
-		data-turbolinks-eval="false"
-		data-turbolinks-suppress-warning
+		data-turbo-eval="false"
+		data-turbo-suppress-warning
 	></script>
 </footer>
 {{end}}

diff --git a/cmd/dcrdata/views/treasury.tmpl b/cmd/dcrdata/views/treasury.tmpl
@@ -163,7 +163,7 @@
                   data-target="address.pageminus">
                 <a class="page-link"
                    href="{{.Path}}?n={{.Limit}}&start={{if gt (subtract .Offset .Limit) 0}}{{subtract .Offset .Limit}}{{else}}0{{end}}&txntype={{$txType}}"
-                   data-turbolinks="false"
+                   data-turbo="false"
                    data-target="address.paginator"
                    data-action="address#prevPage"
                 >Previous</a>
@@ -172,7 +172,7 @@
                   data-target="address.pageplus">
                 <a class="page-link"
                    href="{{.Path}}?n={{.Limit}}&start={{add .Offset .Limit}}&txntype={{$txType}}"
-                   data-turbolinks="false"
+                   data-turbo="false"
                    data-target="address.paginator"
                    data-action="address#nextPage"
                 >Next</a>

diff --git a/cmd/dcrdata/views/tx.tmpl b/cmd/dcrdata/views/tx.tmpl
@@ -232,8 +232,8 @@
                   >Raw Tx:
                 </td>
                 <td class="text-left py-1 text-secondary"><a
-                  href="/api/tx/decoded/{{.TxID}}?indent=true" data-turbolinks="false">decoded</a> &middot; <a
-                  href="/api/tx/hex/{{.TxID}}" data-turbolinks="false">hex</a>
+                  href="/api/tx/decoded/{{.TxID}}?indent=true" data-turbo="false">decoded</a> &middot; <a
+                  href="/api/tx/hex/{{.TxID}}" data-turbo="false">hex</a>
                 </td>
                 <td class="text-right medium-sans text-nowrap pr-2 py-2"
                   >Time:
@@ -254,7 +254,7 @@
                     >Swaps Info:
                   </td>
                   <td class="text-left py-1 text-secondary"><a
-                    href="/api/tx/swaps/{{.TxID}}?indent=true" data-turbolinks="false">swaps</a>
+                    href="/api/tx/swaps/{{.TxID}}?indent=true" data-turbo="false">swaps</a>
                   </td>
                 </tr>
               {{end}}

diff --git a/cmd/dcrdata/webpack.common.js b/cmd/dcrdata/webpack.common.js
@@ -7,9 +7,6 @@ module.exports = {
   entry: {
     app: './public/index.js'
   },
-  externals: {
-    turbolinks: 'Turbolinks'
-  },
   optimization: {
     chunkIds: 'natural',
     splitChunks: {