diff --git a/lib/browser/api/net.js b/lib/browser/api/net.js index 330faa82a8d3..d588e238d43a 100644 --- a/lib/browser/api/net.js +++ b/lib/browser/api/net.js @@ -2,7 +2,6 @@ const url = require('url') const {EventEmitter} = require('events') -const util = require('util') const {Readable} = require('stream') const {app} = require('electron') const {Session} = process.atomBinding('session') @@ -115,7 +114,7 @@ class ClientRequest extends EventEmitter { if (typeof options === 'string') { options = url.parse(options) } else { - options = util._extend({}, options) + options = Object.assign({}, options) } const method = (options.method || 'GET').toUpperCase() diff --git a/lib/common/asar.js b/lib/common/asar.js index e30199812d86..e35efc279958 100644 --- a/lib/common/asar.js +++ b/lib/common/asar.js @@ -3,7 +3,6 @@ const {Buffer} = require('buffer') const childProcess = require('child_process') const path = require('path') - const util = require('util') const hasProp = {}.hasOwnProperty @@ -460,7 +459,7 @@ options = { encoding: null } - } else if (util.isString(options)) { + } else if (typeof options === 'string') { options = { encoding: options } @@ -468,7 +467,7 @@ options = { encoding: null } - } else if (!util.isObject(options)) { + } else if (typeof options !== 'object') { throw new TypeError('Bad arguments') } const {encoding} = options @@ -531,11 +530,11 @@ options = { encoding: null } - } else if (util.isString(options)) { + } else if (typeof options === 'string') { options = { encoding: options } - } else if (!util.isObject(options)) { + } else if (typeof options !== 'object') { throw new TypeError('Bad arguments') } const {encoding} = options