From fa290273dfd00a7368720d5c2a5074063b6de700 Mon Sep 17 00:00:00 2001 From: Declan de Wet Date: Tue, 8 Nov 2016 13:17:10 +0200 Subject: [PATCH] use object-assign ponyfill --- examples/vue-router/app.js | 3 ++- examples/vuex/app.js | 3 ++- package.json | 3 ++- src/shared/mergeComponentData.js | 4 +++- yarn.lock | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/examples/vue-router/app.js b/examples/vue-router/app.js index 6a3867c..981e847 100644 --- a/examples/vue-router/app.js +++ b/examples/vue-router/app.js @@ -1,3 +1,4 @@ +import assign from 'object-assign' import Vue from 'vue' import VueMeta from 'vue-meta' import Router from 'vue-router' @@ -51,6 +52,6 @@ const App = { ` } -const app = new Vue(Object.assign(App, { router })) +const app = new Vue(assign(App, { router })) app.$mount('#app') diff --git a/examples/vuex/app.js b/examples/vuex/app.js index 62b4434..5d78930 100644 --- a/examples/vuex/app.js +++ b/examples/vuex/app.js @@ -1,8 +1,9 @@ +import assign from 'object-assign' import Vue from 'vue' import store from './store' import router from './router' import App from './App.vue' -const app = new Vue(Object.assign(App, { router, store })) +const app = new Vue(assign(App, { router, store })) app.$mount('#app') diff --git a/package.json b/package.json index 1fab328..068d7c5 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,8 @@ "author": "Declan de Wet ", "bugs": "https://github.com/declandewet/vue-meta/issues", "dependencies": { - "deepmerge": "^1.2.0" + "deepmerge": "^1.2.0", + "object-assign": "^4.1.0" }, "devDependencies": { "babel-cli": "^6.18.0", diff --git a/src/shared/mergeComponentData.js b/src/shared/mergeComponentData.js index 648fd97..78c917c 100644 --- a/src/shared/mergeComponentData.js +++ b/src/shared/mergeComponentData.js @@ -1,3 +1,5 @@ +import assign from 'object-assign' + /** * Recursively shallow-merges component object with it's children component objects. * This function is responsible for obtaining the `this` context of metaInfo props when @@ -9,7 +11,7 @@ export default function mergeComponentData (component) { if (component.$children.length) { return component.$children.reduce((data, child) => { - return Object.assign({}, data, mergeComponentData(child)) + return assign({}, data, mergeComponentData(child)) }, component) } return component diff --git a/yarn.lock b/yarn.lock index f37c52f..9f27741 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3567,7 +3567,7 @@ oauth-sign@~0.8.1: version "0.8.2" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" -object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0: +object-assign, object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"