Revert "Replace @ndhoule/pick with lodash.pick (#210)"

This reverts commit 6e33d3d.

Author: juliofarah

HISTORY.md

@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 # 4.1.7 / 2021-03-17
 
@@ -25,6 +26,8 @@
 
 - Replace `@ndhoule/pick` with `lodash.pick`
 
+=======
+>>>>>>> parent of 6e33d3d... Replace @ndhoule/pick with lodash.pick (#210)
 # 4.1.2 / 2020-09-16
 
 - Replaces `@ndhoule/extend` with `lodash.assignin`

lib/analytics.ts

@@ -10,7 +10,6 @@ import {
 var url = require('component-url');
 
 import cloneDeep from 'lodash.clonedeep';
-import pick from 'lodash.pick';
 
 var _analytics = global.analytics;
 
@@ -43,6 +42,7 @@ var nextTick = require('next-tick');
 var normalize = require('./normalize');
 var on = require('component-event').bind;
 var pageDefaults = require('./pageDefaults');
+var pick = require('@ndhoule/pick');
 var prevent = require('@segment/prevent-default');
 var defaults = require('@ndhoule/defaults');
 var store = require('./store');
@@ -599,20 +599,20 @@ Analytics.prototype.page = function(
 
   // Ensure properties has baseline spec properties.
   // TODO: Eventually move these entirely to `options.context.page`
-  const defs = pageDefaults();
+  var defs = pageDefaults();
   defaults(properties, defs);
 
   // Mirror user overrides to `options.context.page` (but exclude custom properties)
   // (Any page defaults get applied in `this.normalize` for consistency.)
   // Weird, yeah--moving special props to `context.page` will fix this in the long term.
-  const overrides = pick(properties, Object.keys(defs));
+  var overrides = pick(Object.keys(defs), properties);
   if (!is.empty(overrides)) {
     options = options || {};
     options.context = options.context || {};
     options.context.page = overrides;
   }
 
-  const msg = this.normalize({
+  var msg = this.normalize({
     properties: properties,
     category: category,
     options: options,

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@segment/analytics.js-core",
   "author": "Segment <[email protected]>",
-  "version": "4.1.3",
+  "version": "4.1.2",
   "description": "The hassle-free way to integrate analytics into any web application.",
   "types": "lib/index.d.ts",
   "keywords": [
@@ -32,6 +32,7 @@
   "dependencies": {
     "@ndhoule/defaults": "^2.0.1",
     "@ndhoule/includes": "^2.0.1",
+    "@ndhoule/pick": "^2.0.0",
     "@segment/canonical": "^1.0.0",
     "@segment/cookie": "^1.1.5",
     "@segment/is-meta": "^1.0.0",
@@ -53,7 +54,6 @@
     "is": "^3.1.0",
     "lodash.assignin": "^4.2.0",
     "lodash.clonedeep": "^4.5.0",
-    "lodash.pick": "^4.4.0",
     "new-date": "^1.0.0",
     "next-tick": "^0.2.2",
     "package-json-versionify": "^1.0.4",

yarn.lock

@@ -324,6 +324,10 @@
   dependencies:
     "@ndhoule/each" "^2.0.1"
 
+"@ndhoule/pick@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@ndhoule/pick/-/pick-2.0.0.tgz#e1eb1a6ca3243eef56daa095c3a1612c74a52156"
+
 "@ndhoule/rest@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@ndhoule/rest/-/rest-2.0.0.tgz#0346b02a964a513ed2ba24d164f01d34f2107a0f"
@@ -6537,6 +6541,7 @@ lodash.mergewith@^4.6.2:
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
   integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
 
+<<<<<<< HEAD
 lodash.omit@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
@@ -6552,6 +6557,8 @@ lodash.pick@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
   integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=
 
+=======
+>>>>>>> parent of 6e33d3d... Replace @ndhoule/pick with lodash.pick (#210)
 lodash.reduce@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b"