fix: correctly resolve hash including a search

Fix #1422

diff --git a/__tests__/location.spec.ts b/__tests__/location.spec.ts
index 4846f87a17c830d126a3e9b9f4d4482d5050f0d1..6e1ea82caceb9e33efb21240b41335598d77b123 100644 (file)
--- a/__tests__/location.spec.ts
+++ b/__tests__/location.spec.ts
@@ -133,6 +133,15 @@ describe('parseURL', () => {
     })
   })
 
+  it('parses ? after the hash', () => {
+    expect(parseURL('/foo/#?a=one')).toEqual({
+      fullPath: '/foo/#?a=one',
+      path: '/foo/',
+      hash: '#?a=one',
+      query: {},
+    })
+  })
+
   it('calls parseQuery', () => {
     const parseQuery = jest.fn()
     originalParseURL(parseQuery, '/?é=é&é=a')

diff --git a/src/location.ts b/src/location.ts
index c6e6f49867f08959b74581c6f987e7f4e05c8e0b..18ca533957a5ea19b5e0c45bce1e037a065bfc18 100644 (file)
--- a/src/location.ts
+++ b/src/location.ts
@@ -53,8 +53,13 @@ export function parseURL(
     hash = ''
 
   // Could use URL and URLSearchParams but IE 11 doesn't support it
-  const searchPos = location.indexOf('?')
-  const hashPos = location.indexOf('#', searchPos > -1 ? searchPos : 0)
+  // TODO: move to new URL()
+  const hashPos = location.indexOf('#')
+  let searchPos = location.indexOf('?')
+  // the hash appears before the search, so it's not part of the search string
+  if (hashPos < searchPos && hashPos >= 0) {
+    searchPos = -1
+  }
 
   if (searchPos > -1) {
     path = location.slice(0, searchPos)