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

Author: bryanmikaelian

Diff for: HISTORY.md

@@ -10,6 +10,10 @@
 
 - Fix Potential DOM-based XSS via prototype pollution
 
+# 4.1.2 / 2020-09-16
+
+- Replaces `@ndhoule/extend` with `lodash.assignin`
+
 # 4.1.1 / 2020-09-15
 
 - Enable `esModuleInterop` in `tsconfig.json`

Diff for: lib/entity.ts

@@ -2,6 +2,7 @@
 
 import { InitOptions } from './types';
 import cloneDeep from 'lodash.clonedeep'
+import assignIn from 'lodash.assignin'
 
 /*
  * Module dependencies.
@@ -10,7 +11,6 @@ import cloneDeep from 'lodash.clonedeep'
 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,10 +221,16 @@ Entity.prototype._setTraits = function(traits: object) {
 
 Entity.prototype.identify = function(id?: string, traits?: object) {
   traits = traits || {};
-  var current = this.id();
-  if (current === null || current === id)
-    traits = extend(this.traits(), traits);
-  if (id) this.id(id);
+  const current = this.id();
+
+  if (current === null || current === id) {
+    traits = assignIn(this.traits(), traits);
+  }
+
+  if (id) {
+    this.id(id);
+  }
+
   this.debug('identify %o, %o', id, traits);
   this.traits(traits);
   this.save();

Diff for: package.json

@@ -31,7 +31,6 @@
   "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",
@@ -53,6 +52,7 @@
     "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",

Diff for: test/analytics.test.ts

@@ -1,12 +1,11 @@
-'use strict';
+import assignIn from 'lodash.assignin'
 
 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');
@@ -836,7 +835,7 @@ describe('Analytics', function() {
         assert.deepEqual(opts, { context: { page: defaults } });
         assert.deepEqual(
           props,
-          extend(defaults, { category: 'category', name: 'name' })
+          assignIn({ category: 'category', name: 'name' }, defaults)
         );
         done();
       });

Diff for: yarn.lock

@@ -5977,6 +5977,7 @@ 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.clone@^4.5.0:
   version "4.5.0"