chore: resolve conflicts

Author: lmiller1990

package.json

@@ -22,7 +22,6 @@
     "@rollup/plugin-replace": "^2.3.2",
     "@types/estree": "^0.0.42",
     "@types/jest": "^24.9.1",
-    "@types/lodash": "^4.14.149",
     "@types/node": "12.12.35",
     "@vue/compiler-dom": "^3.0.0-beta.10",
     "@vue/compiler-sfc": "^3.0.0-beta.10",

src/utils.ts

@@ -2,54 +2,29 @@ import { GlobalMountOptions } from './types'
 
 const isString = (val: unknown): val is string => typeof val === 'string'
 
-function deepMerge(...objects: object[]) {
-  const isObject = (obj: any) => obj && typeof obj === 'object'
-
-  function deepMergeInner(target: object, source: object) {
-    Object.keys(source).forEach((key: string) => {
-      const targetValue = target[key]
-      const sourceValue = source[key]
-
-      if (Array.isArray(targetValue) && Array.isArray(sourceValue)) {
-        target[key] = targetValue.concat(sourceValue)
-      } else if (isObject(targetValue) && isObject(sourceValue)) {
-        target[key] = deepMergeInner(
-          Object.assign({}, targetValue),
-          sourceValue
-        )
-      } else {
-        target[key] = sourceValue
+// Deep merge function, adapted from from https://gist.github.com/ahtcx/0cd94e62691f539160b32ecda18af3d6
+// Merge a `source` object to a `target` recursively
+const merge = (target: object, source: object) => {
+  // Iterate through `source` properties and if an `Object` set property to merge of `target` and `source` properties
+  for (const key of Object.keys(source)) {
+    if (!target[key]) {
+      target[key] = source[key]
+    } else {
+      if (source[key] instanceof Object) {
+        Object.assign(source[key], merge(target[key], source[key]))
       }
-    })
-
-    return target
-  }
-
-  if (objects.length < 2) {
-    throw new Error(
-      'deepMerge: this function expects at least 2 objects to be provided'
-    )
-  }
-
-  if (objects.some((object) => !isObject(object))) {
-    throw new Error('deepMerge: all values should be of type "object"')
-  }
-
-  const target = objects.shift()
-  let source: object
-
-  while ((source = objects.shift())) {
-    deepMergeInner(target, source)
+    }
   }
 
-  return target
+  Object.assign(target || {}, source)
 }
 
 function mergeGlobalProperties(
   configGlobal: GlobalMountOptions = {},
   mountGlobal: GlobalMountOptions = {}
 ): GlobalMountOptions {
-  return deepMerge(configGlobal, mountGlobal)
+  merge(configGlobal, mountGlobal)
+  return configGlobal
 }
 
 export { isString, mergeGlobalProperties }

tests/config.spec.ts

@@ -1,5 +1,3 @@
-import { h } from 'vue'
-
 import { config, mount } from '../src'
 import Hello from './components/Hello.vue'
 
@@ -23,19 +21,19 @@ describe('config', () => {
     }
 
     it('allows setting components globally', () => {
-      console.log('TODO: Fix this')
-      const HelloOverride = {
-        name: 'HelloOverride',
+      const HelloLocal = {
         props: ['msg'],
-        render() {
-          return () => h('div', `${this.msg} Hello world override`)
-        }
+        template: '<div>{{ msg }}</div>'
       }
-      config.global.components = { Hello: HelloOverride }
-      const wrapper1 = mount(Component, { props: { msg: 'Wrapper1' } })
-      const wrapper2 = mount(Component, { props: { msg: 'Wrapper2' } })
-      expect(wrapper1.text()).toEqual('Wrapper1 Hello world override')
-      expect(wrapper2.text()).toEqual('Wrapper2 Hello world override')
+      config.global.components = { Hello: HelloLocal }
+      const wrapper1 = mount(Component, {
+        props: { msg: 'Wrapper1 Overwritten' }
+      })
+      const wrapper2 = mount(Component, {
+        props: { msg: 'Wrapper2 Overwritten' }
+      })
+      expect(wrapper1.text()).toEqual('Wrapper1 Overwritten')
+      expect(wrapper2.text()).toEqual('Wrapper2 Overwritten')
     })
 
     it('allows overwriting globally set component config on a per mount instance', () => {

tests/mountingOptions/stubs.global.spec.ts

@@ -6,6 +6,14 @@ import ComponentWithoutName from '../components/ComponentWithoutName.vue'
 import ComponentWithSlots from '../components/ComponentWithSlots.vue'
 
 describe('mounting options: stubs', () => {
+  beforeEach(() => {
+    config.global.stubs = {}
+  })
+
+  afterEach(() => {
+    config.global.stubs = {}
+  })
+
   it('handles Array syntax', () => {
     const Foo = {
       name: 'Foo',

yarn.lock

@@ -1127,11 +1127,6 @@
   dependencies:
     jest-diff "^24.3.0"
 
-"@types/lodash@^4.14.149":
-  version "4.14.150"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.150.tgz#649fe44684c3f1fcb6164d943c5a61977e8cf0bd"
-  integrity sha512-kMNLM5JBcasgYscD9x/Gvr6lTAv2NVgsKtet/hm93qMyf/D1pt+7jeEZklKJKxMVmXjxbRVQQGfqDSfipYCO6w==
-
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"