Revert "Replace @ndhoule/extend with lodash.assignin (#206)"

This reverts commit 017124b.

Author: juliofarah

HISTORY.md

@@ -1,5 +1,6 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 # 4.1.7 / 2021-03-17
 
@@ -32,6 +33,8 @@
 
 - Replaces `@ndhoule/extend` with `lodash.assignin`
 
+=======
+>>>>>>> parent of 017124b... Replace @ndhoule/extend with lodash.assignin (#206)
 # 4.1.1 / 2020-09-15
 
 - Enable `esModuleInterop` in `tsconfig.json`

lib/entity.ts

@@ -2,7 +2,6 @@
 
 import { InitOptions } from './types';
 import cloneDeep from 'lodash.clonedeep'
-import assignIn from 'lodash.assignin'
 
 /*
  * Module dependencies.
@@ -11,6 +10,7 @@ import assignIn from 'lodash.assignin'
 var cookie = require('./cookie');
 var debug = require('debug')('analytics:entity');
 var defaults = require('@ndhoule/defaults');
+var extend = require('@ndhoule/extend');
 var memory = require('./memory');
 var store = require('./store');
 var isodateTraverse = require('@segment/isodate-traverse');
@@ -221,16 +221,10 @@ Entity.prototype._setTraits = function(traits: object) {
 
 Entity.prototype.identify = function(id?: string, traits?: object) {
   traits = traits || {};
-  const current = this.id();
-
-  if (current === null || current === id) {
-    traits = assignIn(this.traits(), traits);
-  }
-
-  if (id) {
-    this.id(id);
-  }
-
+  var current = this.id();
+  if (current === null || current === id)
+    traits = extend(this.traits(), traits);
+  if (id) this.id(id);
   this.debug('identify %o, %o', id, traits);
   this.traits(traits);
   this.save();

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@segment/analytics.js-core",
   "author": "Segment <[email protected]>",
-  "version": "4.1.2",
+  "version": "4.1.1",
   "description": "The hassle-free way to integrate analytics into any web application.",
   "types": "lib/index.d.ts",
   "keywords": [
@@ -31,6 +31,7 @@
   "homepage": "https://github.com/segmentio/analytics.js-core#readme",
   "dependencies": {
     "@ndhoule/defaults": "^2.0.1",
+    "@ndhoule/extend": "^2.0.0",
     "@ndhoule/includes": "^2.0.1",
     "@ndhoule/pick": "^2.0.0",
     "@segment/canonical": "^1.0.0",
@@ -52,7 +53,6 @@
     "inherits": "^2.0.1",
     "install": "^0.7.3",
     "is": "^3.1.0",
-    "lodash.assignin": "^4.2.0",
     "lodash.clonedeep": "^4.5.0",
     "new-date": "^1.0.0",
     "next-tick": "^0.2.2",

test/analytics.test.ts

@@ -1,11 +1,12 @@
-import assignIn from 'lodash.assignin'
+'use strict';
 
 var Analytics = require('../build').constructor;
 var Facade = require('segmentio-facade');
 var analytics = require('../build');
 var assert = require('proclaim');
 var bind = require('component-event').bind;
 var createIntegration = require('@segment/analytics.js-integration');
+var extend = require('@ndhoule/extend');
 var type = require('component-type');
 var pageDefaults = require('../build/pageDefaults');
 var sinon = require('sinon');
@@ -835,7 +836,7 @@ describe('Analytics', function() {
         assert.deepEqual(opts, { context: { page: defaults } });
         assert.deepEqual(
           props,
-          assignIn({ category: 'category', name: 'name' }, defaults)
+          extend(defaults, { category: 'category', name: 'name' })
         );
         done();
       });

yarn.lock

@@ -6347,7 +6347,6 @@ lodash.assign@^4.2.0:
 lodash.assignin@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
-  integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI=
 
 lodash.camelcase@^4.3.0:
   version "4.3.0"