fix: ignore non-html links in router and prefetch

vuejs · Jan 13, 2021 · 3e6e61b · 3e6e61b
1 parent 122e026
commit 3e6e61b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/client/app/composables/preFetch.ts b/src/client/app/composables/preFetch.ts
@@ -75,6 +75,11 @@ export function usePrefetch() {
  rIC(() => {
  document.querySelectorAll('#app a').forEach((link) => {
  const { target, hostname, pathname } = link as HTMLAnchorElement
+ const extMatch = pathname.match(/\.\w+$/)
+ if (extMatch && extMatch[0] !== '.html') {
+ return
+ }
+
  if (
  // only prefetch same tab navigation, since a new tab will load
  // the lean js chunk instead.

diff --git a/src/client/app/router.ts b/src/client/app/router.ts
@@ -114,6 +114,7 @@ export function createRouter(
  if (link) {
  const { href, protocol, hostname, pathname, hash, target } = link
  const currentUrl = window.location
+ const extMatch = pathname.match(/\.\w+$/)
  // only intercept inbound links
  if (
  !e.ctrlKey &&
@@ -122,7 +123,8 @@ export function createRouter(
  !e.metaKey &&
  target !== `_blank` &&
  protocol === currentUrl.protocol &&
- hostname === currentUrl.hostname
+ hostname === currentUrl.hostname &&
+ !(extMatch && extMatch[0] !== '.html')
  ) {
  e.preventDefault()
  if (pathname === currentUrl.pathname) {