Fixed #4003 – replace per-method lodash packages with the main `lodas…

…h` package. (#4005)

lib/api/_loaders/page-object.js

@@ -1,4 +1,4 @@
-const lodashMerge = require('lodash.merge');
+const lodashMerge = require('lodash/merge');
 const BaseLoader = require('./_base-loader.js');
 const Page = require('../../page-object');
 

lib/api/_loaders/within-context.js

@@ -1,9 +1,8 @@
-const lodashMerge = require('lodash.merge');
 const BaseLoader = require('./_base-loader.js');
 const CommandWrapper = require('../../page-object/command-wrapper.js');
 const Element = require('../../element');
 
-let __commands_cache = {
+const __commands_cache = {
   __commands_cache: true
 };
 

lib/core/client.js

@@ -1,7 +1,7 @@
 const EventEmitter = require('events');
 const {Key, Capabilities, Browser} = require('selenium-webdriver');
 
-const lodashMerge = require('lodash.merge');
+const lodashMerge = require('lodash/merge');
 const HttpRequest = require('../http/request.js');
 const Utils = require('../utils');
 const Settings = require('../settings/settings.js');

lib/index.js

@@ -1,5 +1,5 @@
 const {By, Key, Capabilities} = require('selenium-webdriver');
-const lodashMerge = require('lodash.merge');
+const lodashMerge = require('lodash/merge');
 const Utils = require('./utils');
 const Settings = require('./settings/settings.js');
 const ElementGlobal = require('./api/_loaders/element-global.js');

lib/reporter/reporters/html.js

@@ -1,6 +1,6 @@
 const open = require('open');
 const path = require('path');
-const lodashPick = require('lodash.pick');
+const lodashPick = require('lodash/pick');
 const HtmlReact = require('@nightwatch/html-reporter-template');
 const AnsiConverter = require('ansi-to-html');
 

lib/reporter/reporters/minimalJson.js

@@ -1,4 +1,4 @@
-const lodashPick = require('lodash.pick');
+const lodashPick = require('lodash/pick');
 const path = require('path');
 const Utils = require('../../utils');
 const {Logger} = Utils;

lib/reporter/results.js

@@ -1,4 +1,4 @@
-const lodashMerge = require('lodash.merge');
+const lodashMerge = require('lodash/merge');
 const Utils = require('../utils');
 const {Logger} = Utils;
 

lib/runner/cli/cli.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const lodashClone = require('lodash.clone');
+const lodashCloneDeep = require('lodash/cloneDeep');
 const ArgvSetup = require('./argv-setup.js');
 const Settings = require('../../settings/settings.js');
 const Globals = require('../../testsuite/globals.js');
@@ -383,7 +383,7 @@ class CliRunner {
    * @returns {CliRunner|Promise}
    */
   parseTestSettings(settings = {}, asyncLoading = true) {
-    this.userSettings = lodashClone(settings, true);
+    this.userSettings = lodashCloneDeep(settings);
     const result = this.initTestSettings(settings, this.baseSettings, this.argv, this.testEnv, asyncLoading);
 
     if (result instanceof Promise) {

lib/runner/concurrency/index.js

@@ -1,7 +1,7 @@
 const EventEmitter = require('events');
 const Utils = require('../../utils');
 const {isObject, isNumber} = Utils;
-const lodashClone = require('lodash.clone');
+const lodashCloneDeep = require('lodash/cloneDeep');
 const ChildProcess = require('./child-process.js');
 const WorkerPool = require('./worker-process.js');
 const {Logger} = Utils;
@@ -11,7 +11,7 @@ class Concurrency extends EventEmitter {
     super();
 
     this.argv = argv;
-    this.settings = lodashClone(settings, true);
+    this.settings = lodashCloneDeep(settings);
     this.useChildProcess = settings.use_child_process;
     this.childProcessOutput = {};
     this.globalExitCode = 0;

lib/runner/folder-walk.js

@@ -1,6 +1,6 @@
 const path = require('path');
 const minimatch = require('minimatch');
-const lodashClone = require('lodash.clone');
+const lodashCloneDeep = require('lodash/cloneDeep');
 const Utils = require('../utils');
 const FilenameMatcher = require('./matchers/filename.js');
 const TagsMatcher = require('./matchers/tags.js');
@@ -36,7 +36,7 @@ class Walker {
     }
 
     this.testSource = testSource;
-    this.settings = lodashClone(settings, true);
+    this.settings = lodashCloneDeep(settings);
     this.argv = argv;
     this.usingMocha = this.settings.test_runner && this.settings.test_runner.type === 'mocha';
     this.usingCucumber = this.settings.test_runner?.type === 'cucumber';

lib/settings/settings.js

@@ -1,8 +1,8 @@
 const dotenv = require('dotenv');
 const path = require('path');
-const defaultsDeep = require('lodash.defaultsdeep');
-const lodashClone = require('lodash.clone');
-const lodashMerge = require('lodash.merge');
+const defaultsDeep = require('lodash/defaultsDeep');
+const lodashCloneDeep = require('lodash/cloneDeep');
+const lodashMerge = require('lodash/merge');
 const CI_Info = require('ci-info');
 const Defaults = require('./defaults.js');
 const Utils = require('../utils');
@@ -41,7 +41,7 @@ class Settings {
   }
 
   static getDefaults() {
-    return lodashClone(Settings.DEFAULTS, true);
+    return lodashCloneDeep(Settings.DEFAULTS);
   }
 
   /**
@@ -160,7 +160,7 @@ class Settings {
         return;
       }
 
-      const copyVal = lodashClone(this.baseSettings[key], true);
+      const copyVal = lodashCloneDeep(this.baseSettings[key]);
 
       if (isObject(this.settings[key])) {
         Object.assign(this.settings[key], copyVal);

lib/testsuite/globals.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const lodashClone = require('lodash.clone');
+const lodashCloneDeep = require('lodash/cloneDeep');
 const TestHooks = require('./hooks.js');
 const Context = require('./context.js');
 const Utils = require('../utils');
@@ -123,7 +123,7 @@ class GlobalsContext extends Context {
       externalGlobals = this.externalGlobals;
     } else {
       // if we already have globals, make a copy of them
-      externalGlobals = lodashClone(this.externalGlobals, true);
+      externalGlobals = lodashCloneDeep(this.externalGlobals);
     }
 
     Object.assign(this.__module, externalGlobals);
@@ -160,8 +160,8 @@ class GlobalsContext extends Context {
     }
 
 
-    let fnAsync = Utils.makeFnAsync(expectedArgs, this.module[fnName], this.module);
-    let args = this.getHookFnArgs(done, api, expectedArgs);
+    const fnAsync = Utils.makeFnAsync(expectedArgs, this.module[fnName], this.module);
+    const args = this.getHookFnArgs(done, api, expectedArgs);
 
     return fnAsync.apply(this.module, args);
   }
@@ -201,7 +201,7 @@ class GlobalsContext extends Context {
   }
 
   setCurrentEnv() {
-    this.moduleCopy = lodashClone(this.module, true);
+    this.moduleCopy = lodashCloneDeep(this.module);
 
     // select globals from the current environment
     if (this.currentEnv) {
@@ -252,7 +252,7 @@ class Globals {
    * Shallow merge with existing globals on the settings object
    */
   mergeWithExisting() {
-    const settingsCopy = lodashClone(this.settings, true);
+    const settingsCopy = lodashCloneDeep(this.settings);
     delete settingsCopy.globals;
 
     try {

lib/transport/selenium-webdriver/browserstack/browserstack.js

@@ -1,7 +1,7 @@
 const stripAnsi = require('strip-ansi');
 const {Logger} = require('../../../utils');
 const AppiumBaseServer = require('../appiumBase.js');
-const defaultsDeep = require('lodash.defaultsdeep');
+const defaultsDeep = require('lodash/defaultsDeep');
 
 
 class Browserstack extends AppiumBaseServer {

lib/utils/index.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const fs = require('fs');
 const glob = require('glob');
-const lodashMerge = require('lodash.merge');
+const lodashMerge = require('lodash/merge');
 const {By, Capabilities} = require('selenium-webdriver');
 const {inspect} = require('util');
 

lib/utils/logger/index.js

@@ -2,7 +2,7 @@ const util = require('util');
 const boxen = require('boxen');
 const didYouMean = require('didyoumean');
 const AssertionError = require('assertion-error');
-const lodashEscape = require('lodash.escape');
+const lodashEscape = require('lodash/escape');
 
 const LogSettings = require('./log_settings.js');
 const chalkColors = require('../chalkColors.js');