Skip to content
This repository has been archived by the owner on Sep 19, 2023. It is now read-only.

Commit

Permalink
Fix issue with vuera loading the incorrect component when you have tw…
Browse files Browse the repository at this point in the history
…o components registered with the same name (#79)

* Fix issue with vuera loading the incorrect component when you have two components registered under the same name. Return the mergedValue supplied from vuejs merged with the react wrapped components

* Run yarn build
  • Loading branch information
khashish authored and akxcv committed Apr 22, 2019
1 parent d365b07 commit 22fc761
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion dist/vuera.cjs.js
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ var VuePlugin = {

return _extends({}, acc, defineProperty({}, k, isReactComponent(v) ? VueResolver$$1(v) : v));
}, {}) : mergedValue;
return Object.assign(parent, wrappedComponents);
return Object.assign(mergedValue, wrappedComponents);
};
Vue$$1.prototype.constructor.isVue = true;
}
Expand Down
2 changes: 1 addition & 1 deletion dist/vuera.es.js
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ var VuePlugin = {

return _extends({}, acc, defineProperty({}, k, isReactComponent(v) ? VueResolver$$1(v) : v));
}, {}) : mergedValue;
return Object.assign(parent, wrappedComponents);
return Object.assign(mergedValue, wrappedComponents);
};
Vue$$1.prototype.constructor.isVue = true;
}
Expand Down
2 changes: 1 addition & 1 deletion dist/vuera.iife.js
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ var VuePlugin = {

return _extends({}, acc, defineProperty({}, k, isReactComponent(v) ? VueResolver$$1(v) : v));
}, {}) : mergedValue;
return Object.assign(parent, wrappedComponents);
return Object.assign(mergedValue, wrappedComponents);
};
Vue$$1.prototype.constructor.isVue = true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/VuePlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default {
{}
)
: mergedValue
return Object.assign(parent, wrappedComponents)
return Object.assign(mergedValue, wrappedComponents)
}
Vue.prototype.constructor.isVue = true
},
Expand Down

0 comments on commit 22fc761

Please sign in to comment.