From 71b8eaf0855cb0008e9b6d04ad6a056a450d7fcd Mon Sep 17 00:00:00 2001 From: Felix Rieseberg Date: Mon, 20 Nov 2017 09:40:47 -0800 Subject: [PATCH 1/4] =?UTF-8?q?:wrench:=20Don=E2=80=99t=20use=20deprecated?= =?UTF-8?q?=20util.is*=20methods?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common/asar.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/common/asar.js b/lib/common/asar.js index e30199812d86..80f154a3a490 100644 --- a/lib/common/asar.js +++ b/lib/common/asar.js @@ -460,7 +460,7 @@ options = { encoding: null } - } else if (util.isString(options)) { + } else if (typeof options === 'string') { options = { encoding: options } @@ -468,7 +468,7 @@ options = { encoding: null } - } else if (!util.isObject(options)) { + } else if (typeof options !== 'object') { throw new TypeError('Bad arguments') } const {encoding} = options @@ -531,11 +531,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 From b8b3b441a7b77809814916c4f51c7e877b374ae4 Mon Sep 17 00:00:00 2001 From: Felix Rieseberg Date: Mon, 20 Nov 2017 09:46:02 -0800 Subject: [PATCH 2/4] :wrench: util._extend is deprecated, too --- lib/browser/api/net.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/browser/api/net.js b/lib/browser/api/net.js index 330faa82a8d3..bca50bdc2ca4 100644 --- a/lib/browser/api/net.js +++ b/lib/browser/api/net.js @@ -115,7 +115,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() From b029c088dbe3e4688bf0a822d14dffe82b63ff9d Mon Sep 17 00:00:00 2001 From: Felix Rieseberg Date: Mon, 20 Nov 2017 09:48:33 -0800 Subject: [PATCH 3/4] :wrench: Bonus ; --- lib/browser/api/net.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/browser/api/net.js b/lib/browser/api/net.js index bca50bdc2ca4..e55fdffa06be 100644 --- a/lib/browser/api/net.js +++ b/lib/browser/api/net.js @@ -115,7 +115,7 @@ class ClientRequest extends EventEmitter { if (typeof options === 'string') { options = url.parse(options) } else { - options = Object.assign({}, options); + options = Object.assign({}, options) } const method = (options.method || 'GET').toUpperCase() From 05bae0b4c453dafa366490e42e92e9ceb5169421 Mon Sep 17 00:00:00 2001 From: Felix Rieseberg Date: Mon, 20 Nov 2017 09:52:13 -0800 Subject: [PATCH 4/4] :wrench: Util is no longer used here --- lib/browser/api/net.js | 1 - lib/common/asar.js | 1 - 2 files changed, 2 deletions(-) diff --git a/lib/browser/api/net.js b/lib/browser/api/net.js index e55fdffa06be..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') diff --git a/lib/common/asar.js b/lib/common/asar.js index 80f154a3a490..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