eslint | util._extend is deprecated since 2016

nodejs/node#4903
macbre · Nov 4, 2020 · d243266 · d243266
1 parent 52d2171
commit d243266
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -3,14 +3,13 @@
  */
 "use strict";
 
-var Browser = require("./browser"),
+const Browser = require("./browser"),
   EventEmitter = require("./AwaitEventEmitter"),
   debug = require("debug")("phantomas:core"),
   loader = require("./loader"),
   puppeteer = require("puppeteer"),
   path = require("path"),
   Results = require("../core/results"),
-  util = require("util"),
   VERSION = require("./../package").version;
 
 /**
@@ -35,7 +34,7 @@ function phantomas(url, opts) {
   debug("URL: <%s>", url);
 
   // options handling
-  options = util._extend({}, opts || {}); // use util._extend to avoid #563
+  options = Object.assign({}, opts || {}); // avoid #563
   options.url = options.url || url || false;
 
   debug("Options: %s", JSON.stringify(options));

diff --git a/lib/loader.js b/lib/loader.js
@@ -2,7 +2,6 @@
  * Handles loading of modules and extensions
  */
 const debug = require("debug"),
-  extend = require("util")._extend,
   fs = require("fs");
 
 /**
@@ -35,7 +34,7 @@ function loadCoreModules(scope) {
 
   modules.forEach((name) => {
     var log = debug("phantomas:modules:" + name),
-      _scope = extend({}, scope);
+      _scope = Object.extend({}, scope);
 
     _scope.log = log;
 
@@ -55,7 +54,7 @@ function loadExtensions(scope) {
 
   extensions.forEach((name) => {
     var log = debug("phantomas:extensions:" + name),
-      _scope = extend({}, scope);
+      _scope = Object.extend({}, scope);
 
     _scope.log = log;
 
@@ -69,7 +68,7 @@ function loadModules(scope) {
 
   extensions.forEach((name) => {
     var log = debug("phantomas:modules:" + name),
-      _scope = extend({}, scope);
+      _scope = Object.extend({}, scope);
 
     _scope.log = log;
 

diff --git a/test/modules/requestsMonitor-test.js b/test/modules/requestsMonitor-test.js
@@ -1,10 +1,9 @@
 /**
  * Test requestsMonitor core module
  */
-var vows = require("vows"),
+const vows = require("vows"),
   assert = require("assert"),
-  mock = require("./mock"),
-  extend = require("util")._extend;
+  mock = require("./mock");
 
 function sendReq(url, extra) {
   return function () {
@@ -15,7 +14,7 @@ function sendReq(url, extra) {
       ret = entry;
     });
     phantomas.sendRequest(
-      extend(
+      Object.extend(
         {
           url: url,
         },