refactor(utils): merge extend and assign util function

Author: posva

Diff for: src/components/link.js

@@ -1,7 +1,7 @@
 /* @flow */
 
 import { createRoute, isSameRoute, isIncludedRoute } from '../util/route'
-import { _Vue } from '../install'
+import { extend } from '../util/misc'
 
 // work around weird flow bug
 const toTypes: Array<Function> = [String, Object]
@@ -88,7 +88,6 @@ export default {
       if (a) {
         // in case the <a> is a static node
         a.isStatic = false
-        const extend = _Vue.util.extend
         const aData = a.data = extend({}, a.data)
         aData.on = on
         const aAttrs = a.data.attrs = extend({}, a.data.attrs)

Diff for: src/components/view.js

@@ -1,4 +1,5 @@
 import { warn } from '../util/warn'
+import { extend } from '../util/misc'
 
 export default {
   name: 'RouterView',
@@ -10,6 +11,7 @@ export default {
     }
   },
   render (_, { props, children, parent, data }) {
+    // used by devtools to display a router-view badge
     data.routerView = true
 
     // directly use parent context's createElement() function
@@ -106,10 +108,3 @@ function resolveProps (route, config) {
       }
   }
 }
-
-function extend (to, from) {
-  for (const key in from) {
-    to[key] = from[key]
-  }
-  return to
-}

Diff for: src/util/location.js

@@ -5,6 +5,7 @@ import { parsePath, resolvePath } from './path'
 import { resolveQuery } from './query'
 import { fillParams } from './params'
 import { warn } from './warn'
+import { extend } from './misc'
 
 export function normalizeLocation (
   raw: RawLocation,
@@ -20,9 +21,9 @@ export function normalizeLocation (
 
   // relative params
   if (!next.path && next.params && current) {
-    next = assign({}, next)
+    next = extend({}, next)
     next._normalized = true
-    const params: any = assign(assign({}, current.params), next.params)
+    const params: any = extend(extend({}, current.params), next.params)
     if (current.name) {
       next.name = current.name
       next.params = params
@@ -59,10 +60,3 @@ export function normalizeLocation (
     hash
   }
 }
-
-function assign (a, b) {
-  for (const key in b) {
-    a[key] = b[key]
-  }
-  return a
-}

Diff for: src/util/misc.js

@@ -0,0 +1,6 @@
+export function extend (a, b) {
+  for (const key in b) {
+    a[key] = b[key]
+  }
+  return a
+}