Merge pull request #1 from OmgImAlexis/master

Adds proper ESM and CJS support

index.js

@@ -1,6 +1,6 @@
 import Vue from "vue";
 
-export const stateMerge = function(state, value, propName, ignoreNull) {
+export const stateMerge = (state, value, propName, ignoreNull) => {
 	if (
 		Object.prototype.toString.call(value) === "[object Object]" &&
 		(propName == null || state.hasOwnProperty(propName))
@@ -13,3 +13,5 @@ export const stateMerge = function(state, value, propName, ignoreNull) {
 	}
 	if (!ignoreNull || value !== null) Vue.set(state, propName, value);
 };
+
+export default stateMerge;

main.js

@@ -0,0 +1,3 @@
+/* eslint-disable-next-line no-global-assign */
+require = require('esm')(module);
+module.exports = require('./index.js');

package.json

@@ -1,18 +1,25 @@
 {
 	"name": "vue-object-merge",
-	"version": "0.1.5",
-	"description":
-		"Utility function for merging an object into a reactive object in Vue",
-	"main": "index.js",
+	"version": "0.1.6",
+	"description": "Utility function for merging an object into a reactive object in Vue",
+	"main": "main.js",
+	"module": "index.js",
 	"scripts": {
 		"test": "echo \"Error: no test specified\" && exit 1"
 	},
 	"author": "Richard Tallent <richard@tallent.us> (https://www.tallent.us)",
-	"keywords": ["vue", "vuejs", "vuex", "merge", "deep assign"],
+	"keywords": [
+		"vue",
+		"vuejs",
+		"vuex",
+		"merge",
+		"deep assign"
+	],
 	"repository": "https://github.com/richardtallent/vue-object-merge",
 	"license": "MIT",
 	"dependencies": {
-		"vue": "^2.5.13"
+		"vue": "2.5.17",
+		"esm": "3.0.84"
 	},
 	"prettier": {
 		"useTabs": true,