Merge pull request #193 from goatandsheep/bugfix/gh-149

build/configs.js

@@ -5,14 +5,14 @@ export default {
     output: 'dist/umd/index.js',
     format: 'umd',
     target: 'es5',
-    globals: {'lodash.merge': '_.merge'},
+    globals: {'lodash': '_'},
     env: 'development'
   },
   umdMin: {
     output: 'dist/umd/index.min.js',
     format: 'umd',
     target: 'es5',
-    globals: {'lodash.merge': '_.merge'},
+    globals: {'lodash': '_'},
     plugins: {
       post: [uglify()]
     },

build/rollup.config.js

@@ -3,7 +3,7 @@ import typescript from 'rollup-plugin-typescript2'
 import configs from './configs'
 
 const externals = [
-  'lodash.merge',
+  'lodash',
   'vuex',
   'flatted'
 ]

package.json

@@ -53,7 +53,7 @@
   "homepage": "https://github.com/championswimmer/vuex-persist#readme",
   "devDependencies": {
     "@types/chai": "^4.1.4",
-    "@types/lodash.merge": "^4.6.4",
+    "@types/lodash": "^4.6.4",
     "@types/mocha": "^5.2.5",
     "chai": "^4.1.2",
     "localforage": "^1.7.2",
@@ -74,7 +74,7 @@
   },
   "dependencies": {
     "flatted": "^2.0.0",
-    "lodash.merge": "^4.6.2"
+    "lodash": "^4.17.19"
   },
   "peerDependencies": {
     "vuex": ">=2.5"

src/index.ts

@@ -65,7 +65,7 @@ export class VuexPersistence<S> implements PersistOptions<S> {
         this.storage = options.storage || (typeof window !== 'undefined' ? window.localStorage : new MockStorage!())
       } else {
         // If UMD module, then we will only be having localStorage
-        this.storage = options.storage || window.localStorage
+        this.storage = options.storage || window.localStorage || MockStorage && new MockStorage()
       }
     }
 

src/utils.ts

@@ -1,4 +1,4 @@
-import lodashMerge from 'lodash.merge'
+import {merge as lodashMerge} from 'lodash'
 
 export function merge(into: any, from: any) {
   return lodashMerge({}, into, from)