ensure wildcard routes are always matched last (fix #1176)

vuejs · Apr 14, 2017 · 0fed200 · 0fed200
1 parent 16430de
commit 0fed200
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/create-route-map.js b/src/create-route-map.js
@@ -22,6 +22,15 @@ export function createRouteMap (
     addRouteRecord(pathList, pathMap, nameMap, route)
   })
 
+  // ensure wildcard routes are always at the end
+  for (let i = 0, l = pathList.length; i < l; i++) {
+    if (pathList[i] === '*') {
+      pathList.push(pathList.splice(i, 1)[0])
+      l--
+      i--
+    }
+  }
+
   return {
     pathList,
     pathMap,

diff --git a/test/unit/specs/create-map.spec.js b/test/unit/specs/create-map.spec.js
@@ -9,6 +9,7 @@ const Baz = { template: '<div>This is Baz</div>' }
 const routes = [
   { path: '/', name: 'home', component: Home },
   { path: '/foo', name: 'foo', component: Foo },
+  { path: '*', name: 'wildcard', component: Baz },
   {
     path: '/bar',
     name: 'bar',
@@ -40,6 +41,10 @@ describe('Creating Route Map', function () {
     expect(maps.pathMap['/bar/']).not.toBeUndefined()
   })
 
+  it('has a pathList which places wildcards at the end', () => {
+    expect(maps.pathList).toEqual(['', '/foo', '/bar/', '/bar', '*'])
+  })
+
   it('has a nameMap object for default subroute at \'bar.baz\'', function () {
     expect(maps.nameMap['bar.baz']).not.toBeUndefined()
   })