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

Author: bryanmikaelian

HISTORY.md

@@ -10,6 +10,10 @@
 
 - Fix Potential DOM-based XSS via prototype pollution
 
+# 4.1.4 / 2020-09-16
+
+- Replace `@ndhoule/includes` with `lodash.includes`
+
 # 4.1.3 / 2020-09-16
 
 - Replace `@ndhoule/pick` with `lodash.pick`

lib/normalize.ts

@@ -1,14 +1,12 @@
-'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;
@@ -43,14 +41,14 @@ interface NormalizedMessage {
 }
 
 function normalize(msg: Message, list: Array<any>): NormalizedMessage {
-  var lower = list?.map(function(s) {
+  const lower = list?.map(function(s) {
     return s.toLowerCase();
   });
-  var opts: Message = msg.options || {};
-  var integrations = opts.integrations || {};
-  var providers = opts.providers || {};
-  var context = opts.context || {};
-  var ret: {
+  const opts: Message = msg.options || {};
+  const integrations = opts.integrations || {};
+  const providers = opts.providers || {};
+  const context = opts.context || {};
+  let ret: {
     integrations?: { [key: string]: string };
     context?: unknown;
   } = {};
@@ -76,7 +74,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(key, toplevel)) {
+    if (includes(toplevel, key)) {
       ret[key] = opts[key];
     } else {
       context[key] = opts[key];
@@ -96,9 +94,9 @@ function normalize(msg: Message, list: Array<any>): NormalizedMessage {
 
   function integration(name: string) {
     return !!(
-      includes(name, list) ||
+      includes(list, name) ||
       name.toLowerCase() === 'all' ||
-      includes(name.toLowerCase(), lower)
+      includes(lower, name.toLowerCase())
     );
   }
 }

lib/pageDefaults.ts

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

package.json

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

@@ -6032,6 +6032,11 @@ lodash.has@^4.5.2:
   resolved "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz#d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"
   integrity sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI=
 
+lodash.includes@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
+  integrity sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=
+
 lodash.isarray@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-4.0.0.tgz#2aca496b28c4ca6d726715313590c02e6ea34403"