Merge pull request #21 from El-Dringo-Brannde/hotfix

Fixed ES7 issue
El-Dringo-Brannde · Aug 9, 2018 · 8be69d2 · 8be69d2
2 parents a916ecc + 2b75ac1
commit 8be69d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,11 +1,11 @@
 {
    "name": "perfected-prototypes",
-   "version": "1.6.0",
+   "version": "1.6.1",
    "description": "An easy way to extend the built in Javascript prototype chains and make JS fun again",
    "main": "index.js",
    "scripts": {
       "test": "mocha ",
-      "build": "rm -rf ./lib && cp -r ./src/ ./lib && cp package.json ./lib",
+      "build": "rm -rf ./lib && cp -r ./src/ ./lib && cp package.json ./lib && cp README.md ./lib",
       "precommit": "npm run prettier",
       "prepush": "npm run prettier && npm run linter",
       "prettier": "node ./node_modules/.bin/prettier --config .prettierrc.json  './src/**/*.js' --write",

diff --git a/src/Object/index.js b/src/Object/index.js
@@ -1,4 +1,5 @@
 const safeD = require('lodash/get');
+const merger = require('lodash/merge');
 const { mergeExtension } = require('./../merger');
 
 const newObject = {};
@@ -28,7 +29,7 @@ newObject.isEmpty = function isEmpty() {
 newObject.merge = function merge(...objs) {
 	let mergedObj = this;
 	objs.forEach(obj => {
-		mergedObj = { ...mergedObj, ...obj };
+		mergedObj = merger(this, obj);
 	});
 	return mergedObj;
 };