Revert "Replace @ndhoule/includes with lodash.includes (#211)"

This reverts commit c70c3af.

Author: juliofarah

HISTORY.md

@@ -1,3 +1,5 @@
+<<<<<<< HEAD
+
 # 4.1.7 / 2021-03-17
 
 - Fix Potential DOM-based XSS via prototype pollution
@@ -15,6 +17,10 @@
 
 - Replace `@ndhoule/includes` with `lodash.includes`
 
+=======
+
+> > > > > > > parent of c70c3af... Replace @ndhoule/includes with lodash.includes (#211)
+
 # 4.1.3 / 2020-09-16
 
 - Replace `@ndhoule/pick` with `lodash.pick`

lib/normalize.ts

@@ -1,12 +1,14 @@
+'use strict';
+
 import { Message } from './types';
-import includes from 'lodash.includes'
 
 /**
  * Module Dependencies.
  */
 
 var debug = require('debug')('analytics.js:normalize');
 var defaults = require('@ndhoule/defaults');
+var includes = require('@ndhoule/includes');
 var type = require('component-type');
 var uuid = require('uuid/v4');
 var md5 = require('spark-md5').hash;
@@ -41,14 +43,14 @@ interface NormalizedMessage {
 }
 
 function normalize(msg: Message, list: Array<any>): NormalizedMessage {
-  const lower = list?.map(function(s) {
+  var lower = list?.map(function(s) {
     return s.toLowerCase();
   });
-  const opts: Message = msg.options || {};
-  const integrations = opts.integrations || {};
-  const providers = opts.providers || {};
-  const context = opts.context || {};
-  let ret: {
+  var opts: Message = msg.options || {};
+  var integrations = opts.integrations || {};
+  var providers = opts.providers || {};
+  var context = opts.context || {};
+  var ret: {
     integrations?: { [key: string]: string };
     context?: unknown;
   } = {};
@@ -74,7 +76,7 @@ function normalize(msg: Message, list: Array<any>): NormalizedMessage {
   // move all toplevel options to msg
   // and the rest to context.
   Object.keys(opts).forEach(key => {
-    if (includes(toplevel, key)) {
+    if (includes(key, toplevel)) {
       ret[key] = opts[key];
     } else {
       context[key] = opts[key];
@@ -94,9 +96,9 @@ function normalize(msg: Message, list: Array<any>): NormalizedMessage {
 
   function integration(name: string) {
     return !!(
-      includes(list, name) ||
+      includes(name, list) ||
       name.toLowerCase() === 'all' ||
-      includes(lower, name.toLowerCase())
+      includes(name.toLowerCase(), lower)
     );
   }
 }

lib/pageDefaults.ts

@@ -1,7 +1,14 @@
+'use strict';
+
 import { PageDefaults } from './types';
-import includes from 'lodash.includes'
-import canonical from '@segment/canonical'
-import url from 'component-url'
+
+/*
+ * Module dependencies.
+ */
+
+var canonical = require('@segment/canonical');
+var includes = require('@ndhoule/includes');
+var url = require('component-url');
 
 /**
  * Return a default `options.context.page` object.
@@ -24,9 +31,9 @@ function pageDefaults(): PageDefaults {
  */
 
 function canonicalPath(): string {
-  const canon = canonical();
+  var canon = canonical();
   if (!canon) return window.location.pathname;
-  const parsed = url.parse(canon);
+  var parsed = url.parse(canon);
   return parsed.pathname;
 }
 
@@ -36,10 +43,10 @@ function canonicalPath(): string {
  */
 
 function canonicalUrl(search: string): string {
-  const canon = canonical();
-  if (canon) return includes(canon, '?') ? canon : canon + search;
-  const url = window.location.href;
-  const i = url.indexOf('#');
+  var canon = canonical();
+  if (canon) return includes('?', canon) ? canon : canon + search;
+  var url = window.location.href;
+  var i = url.indexOf('#');
   return i === -1 ? url : url.slice(0, i);
 }
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@segment/analytics.js-core",
   "author": "Segment <[email protected]>",
-  "version": "4.1.4",
+  "version": "4.1.3",
   "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/includes": "^2.0.1",
     "@segment/canonical": "^1.0.0",
     "@segment/cookie": "^1.1.5",
     "@segment/is-meta": "^1.0.0",
@@ -52,7 +53,6 @@
     "is": "^3.1.0",
     "lodash.assignin": "^4.2.0",
     "lodash.clonedeep": "^4.5.0",
-    "lodash.includes": "^4.3.0",
     "lodash.pick": "^4.4.0",
     "new-date": "^1.0.0",
     "next-tick": "^0.2.2",

yarn.lock

@@ -6440,6 +6440,7 @@ lodash.has@^4.5.2:
   resolved "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz#d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"
   integrity sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI=
 
+<<<<<<< HEAD
 lodash.includes@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
@@ -6454,6 +6455,12 @@ lodash.isboolean@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
   integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=
+=======
+lodash.isarray@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-4.0.0.tgz#2aca496b28c4ca6d726715313590c02e6ea34403"
+  integrity sha1-KspJayjEym1yZxUxNZDALm6jRAM=
+>>>>>>> parent of c70c3af... Replace @ndhoule/includes with lodash.includes (#211)
 
 lodash.isempty@^4.4.0:
   version "4.4.0"