diff --git a/lib/api/embed.js b/lib/api/embed.js index c7c33e3..afbdd1a 100644 --- a/lib/api/embed.js +++ b/lib/api/embed.js @@ -1,5 +1,4 @@ var client = require("../client"); -var extend = require("extend"); var json = require("../json"); var querystring = require("querystring"); @@ -54,7 +53,9 @@ function create(graphJSON, options, callback){ }; // Use `extend` to merge `options` into `body` // DEV: `extend` will ignore any properties whose value is `undefined` - extend(body, options || {}); + if (typeof options === "object" && options !== null) { + Object.assign(body, options); + } // Create the request var params = { diff --git a/lib/client.js b/lib/client.js index 275c6db..2a6fa1c 100644 --- a/lib/client.js +++ b/lib/client.js @@ -1,4 +1,3 @@ -var extend = require("extend"); var https = require("https"); var json = require("./json"); var url = require("url"); @@ -58,8 +57,8 @@ client.prototype.request = function(method, path, params, callback){ "application_key": this.app_key, }; - if(typeof params["query"] === "object"){ - extend(query, params["query"]); + if(typeof params["query"] === "object" && params["query"] !== null){ + Object.assign(query, params["query"]); } path = url.format({ diff --git a/package-lock.json b/package-lock.json index 83b3031..f3d8dcd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,6 @@ "version": "2.8.3", "license": "MIT", "dependencies": { - "extend": "^3.0.2", "json-bigint": "^1.0.0", "lodash": "^4.17.21", "minimist": "^1.2.5", @@ -243,11 +242,6 @@ "node": ">=0.4.0" } }, - "node_modules/extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" - }, "node_modules/foreach": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", @@ -1097,11 +1091,6 @@ "integrity": "sha1-CZNQL+r2aBODJXVvMPmlH+7sEek=", "dev": true }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" - }, "foreach": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", diff --git a/package.json b/package.json index 12c6ef4..7d63ab6 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,6 @@ "readmeFilename": "README.md", "gitHead": "f388635a5ab4f4da25702dc0999385d437bdf2bc", "dependencies": { - "extend": "^3.0.2", "json-bigint": "^1.0.0", "lodash": "^4.17.21", "minimist": "^1.2.5", diff --git a/test/api/embed.js b/test/api/embed.js index 3de5296..d3ea553 100644 --- a/test/api/embed.js +++ b/test/api/embed.js @@ -1,6 +1,5 @@ var assert = require("assert"); var client = require("../../lib/client"); -var extend = require("extend"); var embed = require("../../lib/api/embed"); var sinon = require("sinon"); var querystring = require("querystring"); diff --git a/test/api/graph.js b/test/api/graph.js index 927cbbc..f0faccd 100644 --- a/test/api/graph.js +++ b/test/api/graph.js @@ -1,6 +1,5 @@ var assert = require("assert"); var client = require("../../lib/client"); -var extend = require("extend"); var graph = require("../../lib/api/graph"); var sinon = require("sinon"); var querystring = require("querystring"); diff --git a/test/api/metric.js b/test/api/metric.js index dd00ed8..73724af 100644 --- a/test/api/metric.js +++ b/test/api/metric.js @@ -1,6 +1,5 @@ var assert = require("assert"); var client = require("../../lib/client"); -var extend = require("extend"); var metric = require("../../lib/api/metric"); var sinon = require("sinon");