vuejs-rails 2.0.8 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b14ac4b1d7d9e883b4206f5c7559d9be7ab40005
-  data.tar.gz: 80d3709c219eafee3a329dbace290b31091bd656
+  metadata.gz: 16478f016f5826347b878c367ff26308f302f743
+  data.tar.gz: 4da439179cae0bb30c41b0c2524c6e36ab82fe54
 SHA512:
-  metadata.gz: 11de3fcb8ffba8780d5168d486770d1f69d84efdef0753c59ad032fb7023299f82e1aeb53df33cacb8729951342aaf379d6249a09afc8b4bcb13d18e204e0c4c
-  data.tar.gz: 537fa5971ef546f6c40f2b3b44a9f99389b9fa142720bfd029f702bb0045a2ce74173419aef1302117dd1ade16b316b804788156cb9e0712388869e0299d982c
+  metadata.gz: f12ffd66a5d7f826495d25a6f04ea8c9611af8cd6189a2cc9bae9b0a04a124eee2e1fee20199464f074d69202e925db16b319ef49e66382396cd2c3cba9e743d
+  data.tar.gz: 2bef31553724fba5407941397c6976f98fe0ff00873ab1d70fe600d85d19cdf7832adf36cfb6b8e577b13f1a478faaf7bb0f0c2b5aadfeb1259002d54609ef24

data/Readme.md

@@ -9,8 +9,8 @@ Rails 3.1+ asset-pipeline gem to provide Vue.js
 
 ### Package Versions
 
-- vue v2.0.8
-- vue-router v2.0.3
+- vue v2.1.6
+- vue-router v2.1.1
 - vue-resource v1.0.3
 
 ### Setup

data/lib/vuejs-rails/version.rb

@@ -1,5 +1,5 @@
 module Vue
   module Rails
-    VERSION = '2.0.8'
+    VERSION = '2.1.6'
   end
 end

data/vendor/assets/javascripts/vue-router.js

@@ -1,8 +1,8 @@
 /**
- * vue-router v2.0.3
- * (c) 2016 Evan You
- * @license MIT
- */
+  * vue-router v2.1.1
+  * (c) 2016 Evan You
+  * @license MIT
+  */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
@@ -73,78 +73,6 @@ var View = {
 
 /*  */
 
-function resolvePath (
-  relative,
-  base,
-  append
-) {
-  if (relative.charAt(0) === '/') {
-    return relative
-  }
-
-  if (relative.charAt(0) === '?' || relative.charAt(0) === '#') {
-    return base + relative
-  }
-
-  var stack = base.split('/')
-
-  // remove trailing segment if:
-  // - not appending
-  // - appending to trailing slash (last segment is empty)
-  if (!append || !stack[stack.length - 1]) {
-    stack.pop()
-  }
-
-  // resolve relative path
-  var segments = relative.replace(/^\//, '').split('/')
-  for (var i = 0; i < segments.length; i++) {
-    var segment = segments[i]
-    if (segment === '.') {
-      continue
-    } else if (segment === '..') {
-      stack.pop()
-    } else {
-      stack.push(segment)
-    }
-  }
-
-  // ensure leading slash
-  if (stack[0] !== '') {
-    stack.unshift('')
-  }
-
-  return stack.join('/')
-}
-
-function parsePath (path) {
-  var hash = ''
-  var query = ''
-
-  var hashIndex = path.indexOf('#')
-  if (hashIndex >= 0) {
-    hash = path.slice(hashIndex)
-    path = path.slice(0, hashIndex)
-  }
-
-  var queryIndex = path.indexOf('?')
-  if (queryIndex >= 0) {
-    query = path.slice(queryIndex + 1)
-    path = path.slice(0, queryIndex)
-  }
-
-  return {
-    path: path,
-    query: query,
-    hash: hash
-  }
-}
-
-function cleanPath (path) {
-  return path.replace(/\/\//g, '/')
-}
-
-/*  */
-
 function assert (condition, message) {
   if (!condition) {
     throw new Error(("[vue-router] " + message))
@@ -173,7 +101,7 @@ function resolveQuery (
     try {
       parsedQuery = parseQuery(query)
     } catch (e) {
-      warn(false, e.message)
+      "development" !== 'production' && warn(false, e.message)
       parsedQuery = {}
     }
     for (var key in extraQuery) {
@@ -214,7 +142,7 @@ function parseQuery (query) {
 }
 
 function stringifyQuery (obj) {
-  var res = obj ? Object.keys(obj).sort().map(function (key) {
+  var res = obj ? Object.keys(obj).map(function (key) {
     var val = obj[key]
 
     if (val === undefined) {
@@ -345,37 +273,6 @@ function queryIncludes (current, target) {
 
 /*  */
 
-function normalizeLocation (
-  raw,
-  current,
-  append
-) {
-  var next = typeof raw === 'string' ? { path: raw } : raw
-  if (next.name || next._normalized) {
-    return next
-  }
-
-  var parsedPath = parsePath(next.path || '')
-  var basePath = (current && current.path) || '/'
-  var path = parsedPath.path
-    ? resolvePath(parsedPath.path, basePath, append)
-    : (current && current.path) || '/'
-  var query = resolveQuery(parsedPath.query, next.query)
-  var hash = next.hash || parsedPath.hash
-  if (hash && hash.charAt(0) !== '#') {
-    hash = "#" + hash
-  }
-
-  return {
-    _normalized: true,
-    path: path,
-    query: query,
-    hash: hash
-  }
-}
-
-/*  */
-
 // work around weird flow bug
 var toTypes = [String, Object]
 
@@ -393,50 +290,45 @@ var Link = {
     exact: Boolean,
     append: Boolean,
     replace: Boolean,
-    activeClass: String
+    activeClass: String,
+    event: {
+      type: [String, Array],
+      default: 'click'
+    }
   },
   render: function render (h) {
     var this$1 = this;
 
     var router = this.$router
     var current = this.$route
-    var to = normalizeLocation(this.to, current, this.append)
-    var resolved = router.match(to, current)
-    var fullPath = resolved.redirectedFrom || resolved.fullPath
-    var base = router.history.base
-    var href = createHref(base, fullPath, router.mode)
+    var ref = router.resolve(this.to, current, this.append);
+    var normalizedTo = ref.normalizedTo;
+    var resolved = ref.resolved;
+    var href = ref.href;
     var classes = {}
     var activeClass = this.activeClass || router.options.linkActiveClass || 'router-link-active'
-    var compareTarget = to.path ? createRoute(null, to) : resolved
+    var compareTarget = normalizedTo.path ? createRoute(null, normalizedTo) : resolved
     classes[activeClass] = this.exact
       ? isSameRoute(current, compareTarget)
       : isIncludedRoute(current, compareTarget)
 
-    var on = {
-      click: function (e) {
-        // don't redirect with control keys
-        /* istanbul ignore if */
-        if (e.metaKey || e.ctrlKey || e.shiftKey) { return }
-        // don't redirect when preventDefault called
-        /* istanbul ignore if */
-        if (e.defaultPrevented) { return }
-        // don't redirect on right click
-        /* istanbul ignore if */
-        if (e.button !== 0) { return }
-        // don't redirect if `target="_blank"`
-        /* istanbul ignore if */
-        var target = e.target.getAttribute('target')
-        if (/\b_blank\b/i.test(target)) { return }
-
-        e.preventDefault()
+    var handler = function (e) {
+      if (guardEvent(e)) {
         if (this$1.replace) {
-          router.replace(to)
+          router.replace(normalizedTo)
         } else {
-          router.push(to)
+          router.push(normalizedTo)
         }
       }
     }
 
+    var on = { click: guardEvent }
+    if (Array.isArray(this.event)) {
+      this.event.forEach(function (e) { on[e] = handler })
+    } else {
+      on[this.event] = handler
+    }
+
     var data = {
       class: classes
     }
@@ -465,6 +357,25 @@ var Link = {
   }
 }
 
+function guardEvent (e) {
+  // don't redirect with control keys
+  /* istanbul ignore if */
+  if (e.metaKey || e.ctrlKey || e.shiftKey) { return }
+  // don't redirect when preventDefault called
+  /* istanbul ignore if */
+  if (e.defaultPrevented) { return }
+  // don't redirect on right click
+  /* istanbul ignore if */
+  if (e.button !== 0) { return }
+  // don't redirect if `target="_blank"`
+  /* istanbul ignore if */
+  var target = e.target.getAttribute('target')
+  if (/\b_blank\b/i.test(target)) { return }
+
+  e.preventDefault()
+  return true
+}
+
 function findAnchor (children) {
   if (children) {
     var child
@@ -480,11 +391,6 @@ function findAnchor (children) {
   }
 }
 
-function createHref (base, fullPath, mode) {
-  var path = mode === 'hash' ? '/#' + fullPath : fullPath
-  return base ? cleanPath(base + path) : path
-}
-
 var _Vue
 
 function install (Vue) {
@@ -519,6 +425,168 @@ function install (Vue) {
   strats.beforeRouteEnter = strats.beforeRouteLeave = strats.created
 }
 
+/*  */
+
+function resolvePath (
+  relative,
+  base,
+  append
+) {
+  if (relative.charAt(0) === '/') {
+    return relative
+  }
+
+  if (relative.charAt(0) === '?' || relative.charAt(0) === '#') {
+    return base + relative
+  }
+
+  var stack = base.split('/')
+
+  // remove trailing segment if:
+  // - not appending
+  // - appending to trailing slash (last segment is empty)
+  if (!append || !stack[stack.length - 1]) {
+    stack.pop()
+  }
+
+  // resolve relative path
+  var segments = relative.replace(/^\//, '').split('/')
+  for (var i = 0; i < segments.length; i++) {
+    var segment = segments[i]
+    if (segment === '.') {
+      continue
+    } else if (segment === '..') {
+      stack.pop()
+    } else {
+      stack.push(segment)
+    }
+  }
+
+  // ensure leading slash
+  if (stack[0] !== '') {
+    stack.unshift('')
+  }
+
+  return stack.join('/')
+}
+
+function parsePath (path) {
+  var hash = ''
+  var query = ''
+
+  var hashIndex = path.indexOf('#')
+  if (hashIndex >= 0) {
+    hash = path.slice(hashIndex)
+    path = path.slice(0, hashIndex)
+  }
+
+  var queryIndex = path.indexOf('?')
+  if (queryIndex >= 0) {
+    query = path.slice(queryIndex + 1)
+    path = path.slice(0, queryIndex)
+  }
+
+  return {
+    path: path,
+    query: query,
+    hash: hash
+  }
+}
+
+function cleanPath (path) {
+  return path.replace(/\/\//g, '/')
+}
+
+/*  */
+
+function createRouteMap (routes) {
+  var pathMap = Object.create(null)
+  var nameMap = Object.create(null)
+
+  routes.forEach(function (route) {
+    addRouteRecord(pathMap, nameMap, route)
+  })
+
+  return {
+    pathMap: pathMap,
+    nameMap: nameMap
+  }
+}
+
+function addRouteRecord (
+  pathMap,
+  nameMap,
+  route,
+  parent,
+  matchAs
+) {
+  var path = route.path;
+  var name = route.name;
+  if ("development" !== 'production') {
+    assert(path != null, "\"path\" is required in a route configuration.")
+    assert(
+      typeof route.component !== 'string',
+      "route config \"component\" for path: " + (String(path || name)) + " cannot be a " +
+      "string id. Use an actual component instead."
+    )
+  }
+
+  var record = {
+    path: normalizePath(path, parent),
+    components: route.components || { default: route.component },
+    instances: {},
+    name: name,
+    parent: parent,
+    matchAs: matchAs,
+    redirect: route.redirect,
+    beforeEnter: route.beforeEnter,
+    meta: route.meta || {}
+  }
+
+  if (route.children) {
+    // Warn if route is named and has a default child route.
+    // If users navigate to this route by name, the default child will
+    // not be rendered (GH Issue #629)
+    if ("development" !== 'production') {
+      if (route.name && route.children.some(function (child) { return /^\/?$/.test(child.path); })) {
+        warn(false, ("Named Route '" + (route.name) + "' has a default child route.\n          When navigating to this named route (:to=\"{name: '" + (route.name) + "'\"), the default child route will not be rendered.\n          Remove the name from this route and use the name of the default child route for named links instead.")
+        )
+      }
+    }
+    route.children.forEach(function (child) {
+      addRouteRecord(pathMap, nameMap, child, record)
+    })
+  }
+
+  if (route.alias !== undefined) {
+    if (Array.isArray(route.alias)) {
+      route.alias.forEach(function (alias) {
+        addRouteRecord(pathMap, nameMap, { path: alias }, parent, record.path)
+      })
+    } else {
+      addRouteRecord(pathMap, nameMap, { path: route.alias }, parent, record.path)
+    }
+  }
+
+  if (!pathMap[record.path]) {
+    pathMap[record.path] = record
+  }
+  if (name) {
+    if (!nameMap[name]) {
+      nameMap[name] = record
+    } else if ("development" !== 'production') {
+      warn(false, ("Duplicate named routes definition: { name: \"" + name + "\", path: \"" + (record.path) + "\" }"))
+    }
+  }
+}
+
+function normalizePath (path, parent) {
+  path = path.replace(/\/$/, '')
+  if (path[0] === '/') { return path }
+  if (parent == null) { return path }
+  return cleanPath(((parent.path) + "/" + path))
+}
+
 var __moduleExports = Array.isArray || function (arr) {
   return Object.prototype.toString.call(arr) == '[object Array]';
 };
@@ -957,88 +1025,102 @@ index.tokensToRegExp = tokensToRegExp_1;
 
 /*  */
 
-function createRouteMap (routes) {
-  var pathMap = Object.create(null)
-  var nameMap = Object.create(null)
+var regexpCache = Object.create(null)
 
-  routes.forEach(function (route) {
-    addRouteRecord(pathMap, nameMap, route)
-  })
+function getRouteRegex (path) {
+  var hit = regexpCache[path]
+  var keys, regexp
 
-  return {
-    pathMap: pathMap,
-    nameMap: nameMap
+  if (hit) {
+    keys = hit.keys
+    regexp = hit.regexp
+  } else {
+    keys = []
+    regexp = index(path, keys)
+    regexpCache[path] = { keys: keys, regexp: regexp }
   }
+
+  return { keys: keys, regexp: regexp }
 }
 
-function addRouteRecord (
-  pathMap,
-  nameMap,
-  route,
-  parent,
-  matchAs
-) {
-  var path = route.path;
-  var name = route.name;
-  assert(path != null, "\"path\" is required in a route configuration.")
+var regexpCompileCache = Object.create(null)
 
-  var record = {
-    path: normalizePath(path, parent),
-    components: route.components || { default: route.component },
-    instances: {},
-    name: name,
-    parent: parent,
-    matchAs: matchAs,
-    redirect: route.redirect,
-    beforeEnter: route.beforeEnter,
-    meta: route.meta || {}
+function fillParams (
+  path,
+  params,
+  routeMsg
+) {
+  try {
+    var filler =
+      regexpCompileCache[path] ||
+      (regexpCompileCache[path] = index.compile(path))
+    return filler(params || {}, { pretty: true })
+  } catch (e) {
+    if ("development" !== 'production') {
+      warn(false, ("missing param for " + routeMsg + ": " + (e.message)))
+    }
+    return ''
   }
+}
 
-  if (route.children) {
-    // Warn if route is named and has a default child route.
-    // If users navigate to this route by name, the default child will
-    // not be rendered (GH Issue #629)
-    if ("production" !== 'production') {}
-    route.children.forEach(function (child) {
-      addRouteRecord(pathMap, nameMap, child, record)
-    })
+/*  */
+
+function normalizeLocation (
+  raw,
+  current,
+  append
+) {
+  var next = typeof raw === 'string' ? { path: raw } : raw
+  // named target
+  if (next.name || next._normalized) {
+    return next
   }
 
-  if (route.alias !== undefined) {
-    if (Array.isArray(route.alias)) {
-      route.alias.forEach(function (alias) {
-        addRouteRecord(pathMap, nameMap, { path: alias }, parent, record.path)
-      })
-    } else {
-      addRouteRecord(pathMap, nameMap, { path: route.alias }, parent, record.path)
+  // relative params
+  if (!next.path && next.params && current) {
+    next = assign({}, next)
+    next._normalized = true
+    var params = assign(assign({}, current.params), next.params)
+    if (current.name) {
+      next.name = current.name
+      next.params = params
+    } else if (current.matched) {
+      var rawPath = current.matched[current.matched.length - 1].path
+      next.path = fillParams(rawPath, params, ("path " + (current.path)))
+    } else if ("development" !== 'production') {
+      warn(false, "relative params navigation requires a current route.")
     }
+    return next
   }
 
-  pathMap[record.path] = record
-  if (name) {
-    if (!nameMap[name]) {
-      nameMap[name] = record
-    } else {
-      warn(false, ("Duplicate named routes definition: { name: \"" + name + "\", path: \"" + (record.path) + "\" }"))
-    }
+  var parsedPath = parsePath(next.path || '')
+  var basePath = (current && current.path) || '/'
+  var path = parsedPath.path
+    ? resolvePath(parsedPath.path, basePath, append || next.append)
+    : (current && current.path) || '/'
+  var query = resolveQuery(parsedPath.query, next.query)
+  var hash = next.hash || parsedPath.hash
+  if (hash && hash.charAt(0) !== '#') {
+    hash = "#" + hash
+  }
+
+  return {
+    _normalized: true,
+    path: path,
+    query: query,
+    hash: hash
   }
 }
 
-function normalizePath (path, parent) {
-  path = path.replace(/\/$/, '')
-  if (path[0] === '/') { return path }
-  if (parent == null) { return path }
-  return cleanPath(((parent.path) + "/" + path))
+function assign (a, b) {
+  for (var key in b) {
+    a[key] = b[key]
+  }
+  return a
 }
 
 /*  */
 
-var regexpCache = Object.create(null)
-
-var regexpParamsCache = Object.create(null)
-
-var regexpCompileCache = Object.create(null)
-
 function createMatcher (routes) {
   var ref = createRouteMap(routes);
   var pathMap = ref.pathMap;
@@ -1054,7 +1136,9 @@ function createMatcher (routes) {
 
     if (name) {
       var record = nameMap[name]
-      var paramNames = getParams(record.path)
+      var paramNames = getRouteRegex(record.path).keys
+        .filter(function (key) { return !key.optional; })
+        .map(function (key) { return key.name; })
 
       if (typeof location.params !== 'object') {
         location.params = {}
@@ -1098,7 +1182,9 @@ function createMatcher (routes) {
     }
 
     if (!redirect || typeof redirect !== 'object') {
-      warn(false, ("invalid redirect option: " + (JSON.stringify(redirect))))
+      "development" !== 'production' && warn(
+        false, ("invalid redirect option: " + (JSON.stringify(redirect)))
+      )
       return _createRoute(null, location)
     }
 
@@ -1115,7 +1201,9 @@ function createMatcher (routes) {
     if (name) {
       // resolved named direct
       var targetRecord = nameMap[name]
-      assert(targetRecord, ("redirect failed: named route \"" + name + "\" not found."))
+      if ("development" !== 'production') {
+        assert(targetRecord, ("redirect failed: named route \"" + name + "\" not found."))
+      }
       return match({
         _normalized: true,
         name: name,
@@ -1177,22 +1265,6 @@ function createMatcher (routes) {
   return match
 }
 
-function getRouteRegex (path) {
-  var hit = regexpCache[path]
-  var keys, regexp
-
-  if (hit) {
-    keys = hit.keys
-    regexp = hit.regexp
-  } else {
-    keys = []
-    regexp = index(path, keys)
-    regexpCache[path] = { keys: keys, regexp: regexp }
-  }
-
-  return { keys: keys, regexp: regexp }
-}
-
 function matchRoute (
   path,
   params,
@@ -1218,27 +1290,6 @@ function matchRoute (
   return true
 }
 
-function fillParams (
-  path,
-  params,
-  routeMsg
-) {
-  try {
-    var filler =
-      regexpCompileCache[path] ||
-      (regexpCompileCache[path] = index.compile(path))
-    return filler(params || {}, { pretty: true })
-  } catch (e) {
-    assert(false, ("missing param for " + routeMsg + ": " + (e.message)))
-    return ''
-  }
-}
-
-function getParams (path) {
-  return regexpParamsCache[path] ||
-    (regexpParamsCache[path] = getRouteRegex(path).keys.map(function (key) { return key.name; }))
-}
-
 function resolveRecordPath (path, record) {
   return resolvePath(path, record.parent ? record.parent.path : '/', true)
 }
@@ -1296,24 +1347,25 @@ History.prototype.listen = function listen (cb) {
   this.cb = cb
 };
 
-History.prototype.transitionTo = function transitionTo (location, cb) {
+History.prototype.transitionTo = function transitionTo (location, onComplete, onAbort) {
     var this$1 = this;
 
   var route = this.router.match(location, this.current)
   this.confirmTransition(route, function () {
     this$1.updateRoute(route)
-    cb && cb(route)
+    onComplete && onComplete(route)
     this$1.ensureURL()
-  })
+  }, onAbort)
 };
 
-History.prototype.confirmTransition = function confirmTransition (route, cb) {
+History.prototype.confirmTransition = function confirmTransition (route, onComplete, onAbort) {
     var this$1 = this;
 
   var current = this.current
+  var abort = function () { onAbort && onAbort() }
   if (isSameRoute(route, current)) {
     this.ensureURL()
-    return
+    return abort()
   }
 
   var ref = resolveQueue(this.current.matched, route.matched);
@@ -1333,14 +1385,18 @@ History.prototype.confirmTransition = function confirmTransition (route, cb) {
 
   this.pending = route
   var iterator = function (hook, next) {
-    if (this$1.pending !== route) { return }
+    if (this$1.pending !== route) {
+      return abort()
+    }
     hook(route, current, function (to) {
       if (to === false) {
         // next(false) -> abort navigation, ensure current URL
         this$1.ensureURL(true)
+        abort()
       } else if (typeof to === 'string' || typeof to === 'object') {
         // next('/') or next({ path: '/' }) -> redirect
-        this$1.push(to)
+        (typeof to === 'object' && to.replace) ? this$1.replace(to) : this$1.push(to)
+        abort()
       } else {
         // confirm transition and pass on the value
         next(to)
@@ -1356,9 +1412,12 @@ History.prototype.confirmTransition = function confirmTransition (route, cb) {
     // wait until async components are resolved before
     // extracting in-component enter guards
     runQueue(enterGuards, iterator, function () {
-      if (this$1.pending === route) {
-        this$1.pending = null
-        cb(route)
+      if (this$1.pending !== route) {
+        return abort()
+      }
+      this$1.pending = null
+      onComplete(route)
+      if (this$1.router.app) {
         this$1.router.app.$nextTick(function () {
           postEnterCbs.forEach(function (cb) { return cb(); })
         })
@@ -1657,7 +1716,9 @@ var HTML5History = (function (History) {
     if (!behavior) {
       return
     }
-    assert(typeof behavior === 'function', "scrollBehavior must be a function")
+    if ("development" !== 'production') {
+      assert(typeof behavior === 'function', "scrollBehavior must be a function")
+    }
 
     // wait until re-render finishes before scrolling
     router.app.$nextTick(function () {
@@ -1722,12 +1783,10 @@ function replaceState (url) {
 var HashHistory = (function (History) {
   function HashHistory (router, base, fallback) {
     History.call(this, router, base)
-
     // check history fallback deeplinking
     if (fallback && this.checkFallback()) {
       return
     }
-
     ensureSlash()
   }
 
@@ -1892,7 +1951,7 @@ var VueRouter = function VueRouter (options) {
       this.history = new AbstractHistory(this)
       break
     default:
-      assert(false, ("invalid mode: " + mode))
+      "development" !== 'production' && assert(false, ("invalid mode: " + mode))
   }
 };
 
@@ -1905,7 +1964,7 @@ prototypeAccessors.currentRoute.get = function () {
 VueRouter.prototype.init = function init (app /* Vue component instance */) {
     var this$1 = this;
 
-  assert(
+  "development" !== 'production' && assert(
     install.installed,
     "not installed. Make sure to call `Vue.use(VueRouter)` " +
     "before creating root instance."
@@ -1918,11 +1977,12 @@ VueRouter.prototype.init = function init (app /* Vue component instance */) {
   if (history instanceof HTML5History) {
     history.transitionTo(getLocation(history.base))
   } else if (history instanceof HashHistory) {
-    history.transitionTo(getHash(), function () {
+    var setupHashListener = function () {
       window.addEventListener('hashchange', function () {
         history.onHashChange()
       })
-    })
+    }
+    history.transitionTo(getHash(), setupHashListener, setupHashListener)
   }
 
   history.listen(function (route) {
@@ -1958,19 +2018,44 @@ VueRouter.prototype.forward = function forward () {
   this.go(1)
 };
 
-VueRouter.prototype.getMatchedComponents = function getMatchedComponents () {
-  if (!this.currentRoute) {
+VueRouter.prototype.getMatchedComponents = function getMatchedComponents (to) {
+  var route = to
+    ? this.resolve(to).resolved
+    : this.currentRoute
+  if (!route) {
     return []
   }
-  return [].concat.apply([], this.currentRoute.matched.map(function (m) {
+  return [].concat.apply([], route.matched.map(function (m) {
     return Object.keys(m.components).map(function (key) {
       return m.components[key]
     })
   }))
 };
 
+VueRouter.prototype.resolve = function resolve (
+  to,
+  current,
+  append
+) {
+  var normalizedTo = normalizeLocation(to, current || this.history.current, append)
+  var resolved = this.match(normalizedTo, current)
+  var fullPath = resolved.redirectedFrom || resolved.fullPath
+  var base = this.history.base
+  var href = createHref(base, fullPath, this.mode)
+  return {
+    normalizedTo: normalizedTo,
+    resolved: resolved,
+    href: href
+  }
+};
+
 Object.defineProperties( VueRouter.prototype, prototypeAccessors );
 
+function createHref (base, fullPath, mode) {
+  var path = mode === 'hash' ? '#' + fullPath : fullPath
+  return base ? cleanPath(base + '/' + path) : path
+}
+
 VueRouter.install = install
 
 if (inBrowser && window.Vue) {