fixed option merge strategies

jpex-js · Mar 28, 2018 · b6b8281 · b6b8281
1 parent 7f38c49
commit b6b8281
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,6 @@
+## 2.0.1
+- Fixed an issue where doing `Vue.extend().use(vueInject)` meant vue inject could not find `optionMergeStrategies`
+
 ## 2.0.0
 - Injecting components/mixins/directives is now optional
 - There is now a default merging strategy for when using mixins with dependencies

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-inject",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Dependency Injection for Vue",
   "main": "src/index.js",
   "scripts": {

diff --git a/src/install.js b/src/install.js
@@ -49,7 +49,15 @@ module.exports = function (Vue, options) {
       });
   }
 
-  Vue.config.optionMergeStrategies.dependencies = Vue.config.optionMergeStrategies.depnedencies || function (toVal, fromVal) {
+  function getOptionMergeStrategies(Vue) {
+    while (Vue && !Vue.config) {
+      Vue = Vue.super;
+    }
+    return (Vue && Vue.config && Vue.config.optionMergeStrategies) || {};
+  }
+
+  var mergeStrategies = getOptionMergeStrategies(Vue);
+  mergeStrategies.dependencies = mergeStrategies.depnedencies || function (toVal, fromVal) {
     if (!toVal) {
       return fromVal;
     }