Fixed option merging

README.md

@@ -22,6 +22,8 @@ Vue.use(VueMeteorTracker);
 
 *Note: if you are using the Meteor [akryum:vue](https://github.com/Akryum/meteor-vue-component/tree/master/packages/vue) package, you don't need to install the plugin.*
 
+**⚠️ You may need to polyfill `Object.assign`.**
+
 ## Usage
 
 In your Vue component, add a `meteor` object :

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-meteor-tracker",
-  "version": "1.0.4",
+  "version": "1.1.1",
   "description": "Use Meteor Tracker reactivity inside Vue components",
   "main": "index.js",
   "scripts": {

src/vue-plugin.js

@@ -8,7 +8,7 @@ function defaultSubscription(...args) {
 
 export default {
   install(Vue, options) {
-
+    
     const vueVersion = parseInt(Vue.version.charAt(0));
 
     const { defineReactive } = Vue.util;
@@ -21,6 +21,25 @@ export default {
     for(const k in options) {
       Vue.config.meteor[k] = options[k];
     }
+
+    const merge = Vue.config.optionMergeStrategies.methods
+    Vue.config.optionMergeStrategies.meteor = function (toVal, fromVal, vm) {
+      if (!toVal) return fromVal
+      if (!fromVal) return toVal
+
+      const toData = Object.assign({}, omit(toVal, [
+        'subscribe',
+        'data',
+      ]), toVal.data);
+      const fromData = Object.assign({}, omit(fromVal, [
+        'subscribe',
+        'data',
+      ]), fromVal.data);
+
+      return Object.assign({
+        subscribe: merge(toVal.subscribe, fromVal.subscribe),
+      }, merge(toData, fromData))
+    }
 
     function prepare() {
       this._trackerHandles = [];