@automattic/vip 2.30.0-dev1 → 2.31.0-dev1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## Changelog
 
+### 2.30.0
+
+- #1264	feature(dev-env): Add dev-env-sync-sql command
+- #1376	refactor: Convert keychain to TypeScript
+- #1370	fix: Fix issues found by SonarCloud
+- #1374	Add TypeScript support
+- #1334	Dev-env: Allow --multisite to accept boolean, subdirectory, or subdomain values
+- #1375	fix(api): Set non-zero exit code on error
+- #1373	Reverting accidental push to vip-cli
+
 ### 2.29.1
 
 - #1372 fix(export): Make vip-export-sql.js executable

package/assets/dev-env.lando.template.yml.ejs

@@ -74,8 +74,13 @@ services:
     run_as_root:
       - chown www-data:www-data /wp/wp-content/mu-plugins /wp/config /wp/log /wp/wp-content/uploads /wp
     run:
-      - sh /dev-tools/setup.sh database root "http://<%= siteSlug %>.vipdev.lndo.site/" "<%= wpTitle %>" <% if ( multisite ) { %> <%= siteSlug %>.vipdev.lndo.site <% } %>
-
+      - >
+        sh /dev-tools/setup.sh
+        --host database
+        --user root
+        --domain "http://<%= siteSlug %>.vipdev.lndo.site/"
+        --title "<%= wpTitle %>"
+        <% if ( multisite ) { %>--ms-domain "<%= siteSlug %>.vipdev.lndo.site" <% if ( multisite === true || multisite === 'subdomain' ) { %>--subdomain <% } %> <% } %>
   database:
     type: compose
     services:

package/dist/bin/vip-dev-env-create.js

@@ -42,8 +42,11 @@ const examples = [{
 }, {
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} create --multisite --wordpress="5.8" --app-code="~/git/my_code"`,
   description: 'Creates a local multisite dev environment using WP 5.8 and application code is expected to be in "~/git/my_code"'
+}, {
+  usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} create --multisite=subdirectory --wordpress="5.8" --app-code="~/git/my_code"`,
+  description: 'Creates a local multisite dev environment with a subdirectory URL structure using WP 5.8 and application code is expected to be in "~/git/my_code"'
 }];
-const cmd = (0, _command.default)().option('slug', 'Custom name of the dev environment').option('title', 'Title for the WordPress site').option('multisite', 'Enable multisite install', undefined, _devEnvironmentCli.processBooleanOption);
+const cmd = (0, _command.default)().option('slug', 'Custom name of the dev environment').option('title', 'Title for the WordPress site').option('multisite', 'Enable multisite install', undefined, _devEnvironmentCli.processStringOrBooleanOption);
 (0, _devEnvironmentCli.addDevEnvConfigurationOptions)(cmd);
 cmd.examples(examples);
 cmd.argv(process.argv, async (arg, opt) => {

package/dist/bin/vip-dev-env-sync-sql.js

@@ -8,9 +8,12 @@
 /**
  * External dependencies
  */
+
+/**
+ * Internal dependencies
+ */
 "use strict";
 
-var _chalk = _interopRequireDefault(require("chalk"));
 var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
 var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
@@ -19,9 +22,6 @@ var _devEnvSyncSql = require("../commands/dev-env-sync-sql");
 var _devEnvironment = require("../lib/constants/dev-environment");
 var _tracker = require("../lib/tracker");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * Internal dependencies
- */
 const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} sync sql @my-test.develop --slug=my_site`,
   description: 'Syncs with the `my-test` site\'s `develop` environment database into `my_site`'
@@ -39,6 +39,13 @@ const appQuery = `
 		primaryDomain { name }
 		uniqueLabel
 		isMultisite
+		wpSitesSDS(first:500) {
+			nodes {
+				id
+				blogId
+				homeUrl
+			}
+		}
 	}
 `;
 (0, _command.default)({
@@ -58,20 +65,6 @@ const appQuery = `
     slug
   });
   await trackerFn('execute');
-  if (env.isMultisite) {
-    console.log(_chalk.default.yellow('You seem to be trying to sync a SQL database for a network site.'));
-    console.log(_chalk.default.yellow('Unfortunately, the current version of our tool does not yet support syncing network sites.\n'));
-    console.log(_chalk.default.yellow('However, you can manually export the database using the following command:'));
-    console.log(_chalk.default.yellow(_chalk.default.bold(`vip export sql @${app.id}.${env.uniqueLabel} --output=${app.id}-${env.uniqueLabel}-exported.sql.gz\n`)));
-    console.log(_chalk.default.yellow('After exporting the database, you\'ll need to perform the necessary search and replace operations on the exported file to update any relevant data or configurations.'));
-    console.log(_chalk.default.yellow('See: https://docs.wpvip.com/how-tos/dev-env-add-content/#h-3-import-the-sql-file\n'));
-    console.log(_chalk.default.yellow('Once you\'ve made the required changes, you can import the modified SQL file into your development environment using the following command:'));
-    console.log(_chalk.default.yellow(_chalk.default.bold(`vip dev-env import sql ${app.id}-${env.uniqueLabel}-exported.sql.gz --slug=${slug}`)));
-    await trackerFn('aborted', {
-      error_type: 'multisite_not_supported'
-    });
-    process.exit(0);
-  }
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
   const envPath = (0, _devEnvironmentCore.getEnvironmentPath)(slug);
   if (!(await (0, _devEnvironmentLando.isEnvUp)(lando, envPath))) {

package/dist/bin/vip-export-sql.js

@@ -26,17 +26,18 @@ const examples = [{
   description: 'The output file can be specified with the --output flag'
 }];
 const appQuery = `
-  id,
-  name,
-  type,
-  organization { id, name },
-  environments{
-    id
-    appId
-    type
-    name
-    primaryDomain { name }
-  }
+	id,
+	name,
+	type,
+	organization { id, name },
+	environments{
+		id
+		appId
+		type
+		name
+		primaryDomain { name }
+		uniqueLabel
+	}
 `;
 (0, _command.default)({
   appContext: true,

package/dist/bin/vip-import-sql.js

@@ -317,7 +317,7 @@ const displayPlaybook = ({
     }
   }
 };
-(0, _command.default)({
+void (0, _command.default)({
   appContext: true,
   appQuery,
   envContext: true,
@@ -498,7 +498,7 @@ Processing the SQL import for your environment...
   } catch (uploadError) {
     await track('import_sql_command_error', {
       error_type: 'upload_failed',
-      upload_error: uploadError
+      upload_error: uploadError.message
     });
     progressTracker.stepFailed('upload');
     return failWithError(uploadError);

package/dist/bin/vip-import-validate-sql.js

@@ -17,8 +17,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
   requiredArgs: 1
 }).example('vip import validate-sql <file>', 'Run the import validation against file').argv(process.argv, async arg => {
   const filename = arg[0];
-  if (!arg && !filename) {
+  if (!filename) {
     exit.withError('You must pass in a filename');
   }
-  (0, _sql.validate)(filename);
+  await (0, _sql.validate)(filename);
 });

package/dist/bin/vip-whoami.js

@@ -1,10 +1,5 @@
 #!/usr/bin/env node
 
-/**
- * 
- * @format
- */
-
 /**
  * External dependencies
  */
@@ -26,28 +21,30 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 async function whoamiCommand() {
+  var _currentUser$displayN, _currentUser$id;
   const trackingParams = {
     command: 'vip whoami'
   };
   await (0, _tracker.trackEvent)('whoami_command_execute', trackingParams);
-  let currentUser = {};
+  let currentUser;
   try {
     currentUser = await (0, _user.getCurrentUserInfo)();
   } catch (err) {
+    const error = err instanceof Error ? err : new Error('Unknown error');
     await (0, _tracker.trackEvent)('whoami_command_error', {
       ...trackingParams,
-      error: err.message
+      error: error.message
     });
-    exit.withError(`Failed to fetch information about the currently logged-in user error: ${err.message}`);
+    exit.withError(`Failed to fetch information about the currently logged-in user error: ${error.message}`);
   }
   await (0, _tracker.trackEvent)('whoami_command_success', trackingParams);
-  const output = [`- Howdy ${currentUser.displayName}!`, `- Your user ID is ${currentUser.id}`];
+  const output = [`- Howdy ${(_currentUser$displayN = currentUser.displayName) !== null && _currentUser$displayN !== void 0 ? _currentUser$displayN : 'user'}!`, `- Your user ID is ${(_currentUser$id = currentUser.id) !== null && _currentUser$id !== void 0 ? _currentUser$id : ' not found'}`];
   if (currentUser.isVIP) {
     output.push('- Your account has VIP Staff permissions');
   }
   console.log(output.join('\n'));
 }
-(0, _command.default)({
+void (0, _command.default)({
   usage: 'vip whoami'
 }).examples([{
   usage: 'vip whoami',

package/dist/bin/vip-wp.js

@@ -207,7 +207,7 @@ const bindReconnectEvents = ({
       stdin: currentJob.stdinStream,
       stdout: currentJob.stdoutStream
     });
-    (0, _tracker.trackEvent)('wpcli_command_reconnect', commonTrackingParams);
+    (0, _tracker.trackEvent)('wpcli_command_reconnect', commonTrackingParams).catch(() => {});
     currentJob = await launchCommandAndGetStreams({
       socket: currentJob.socket,
       guid: cliCommand.guid,
@@ -319,7 +319,7 @@ const bindReconnectEvents = ({
   };
   /* eslint-enable camelcase */
 
-  (0, _tracker.trackEvent)('wpcli_command_execute', commonTrackingParams);
+  (0, _tracker.trackEvent)('wpcli_command_execute', commonTrackingParams).catch(() => {});
   if (isSubShell) {
     // Reset the cursor (can get messed up with enquirer)
     process.stdout.write('\u001b[?25h');
@@ -330,7 +330,7 @@ const bindReconnectEvents = ({
       value: `wp ${cmd}`
     }], `Are you sure you want to run this command on ${(0, _format.formatEnvironment)(envName)} for site ${appName}?`));
     if (!yes) {
-      (0, _tracker.trackEvent)('wpcli_confirm_cancel', commonTrackingParams);
+      (0, _tracker.trackEvent)('wpcli_confirm_cancel', commonTrackingParams).catch(() => {});
       console.log('Command cancelled');
       process.exit();
     }
@@ -458,12 +458,14 @@ const bindReconnectEvents = ({
   process.stdin.on('data', data => {
     // only run this in interactive mode for prompts from WP commands
     if (commandRunning && 0 === Buffer.compare(data, Buffer.from('\r'))) {
-      if (currentJob && currentJob.stdinStream) {
+      var _currentJob;
+      if ((_currentJob = currentJob) !== null && _currentJob !== void 0 && _currentJob.stdinStream) {
         currentJob.stdinStream.write('\n');
       }
     }
   });
   subShellRl.on('SIGINT', async () => {
+    var _currentJob2;
     // if we have a 2nd SIGINT, exit immediately
     if (countSIGINT >= 1) {
       process.exit();
@@ -472,7 +474,7 @@ const bindReconnectEvents = ({
 
     // write out CTRL-C/SIGINT
     process.stdin.write(cancelCommandChar);
-    if (currentJob && currentJob.stdoutStream) {
+    if ((_currentJob2 = currentJob) !== null && _currentJob2 !== void 0 && _currentJob2.stdoutStream) {
       currentJob.stdoutStream.end();
     }
     await (0, _tracker.trackEvent)('wpcli_cancel_command', commonTrackingParams);

package/dist/bin/vip.js

@@ -10,7 +10,7 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _debug = _interopRequireDefault(require("debug"));
 var _config = _interopRequireDefault(require("../lib/cli/config"));
 var _command = _interopRequireWildcard(require("../lib/cli/command"));
-var _token = _interopRequireDefault(require("../lib/token"));
+var _token2 = _interopRequireDefault(require("../lib/token"));
 var _tracker = require("../lib/tracker");
 var _logout = _interopRequireDefault(require("../lib/logout"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -39,14 +39,15 @@ function doesArgvHaveAtLeastOneParam(argv, params) {
   return argv.some(arg => params.includes(arg));
 }
 const rootCmd = async function () {
-  let token = await _token.default.get();
+  var _token;
+  let token = await _token2.default.get();
   const isHelpCommand = doesArgvHaveAtLeastOneParam(process.argv, ['help', '-h', '--help']);
   const isVersionCommand = doesArgvHaveAtLeastOneParam(process.argv, ['-v', '--version']);
   const isLogoutCommand = doesArgvHaveAtLeastOneParam(process.argv, ['logout']);
   const isLoginCommand = doesArgvHaveAtLeastOneParam(process.argv, ['login']);
   const isDevEnvCommandWithoutEnv = doesArgvHaveAtLeastOneParam(process.argv, ['dev-env']) && !(0, _command.containsAppEnvArgument)(process.argv);
   debug('Argv:', process.argv);
-  if (!isLoginCommand && (isLogoutCommand || isHelpCommand || isVersionCommand || isDevEnvCommandWithoutEnv || token && token.valid())) {
+  if (!isLoginCommand && (isLogoutCommand || isHelpCommand || isVersionCommand || isDevEnvCommandWithoutEnv || (_token = token) !== null && _token !== void 0 && _token.valid())) {
     await runCmd();
   } else {
     console.log();
@@ -82,7 +83,7 @@ const rootCmd = async function () {
       message: 'Access Token:'
     });
     try {
-      token = new _token.default(tokenInput);
+      token = new _token2.default(tokenInput);
     } catch (err) {
       console.log('The token provided is malformed. Please check the token and try again.');
       await (0, _tracker.trackEvent)('login_command_token_submit_error', {
@@ -105,7 +106,7 @@ const rootCmd = async function () {
       return;
     }
     try {
-      await _token.default.set(token.raw);
+      await _token2.default.set(token.raw);
     } catch (err) {
       await (0, _tracker.trackEvent)('login_command_token_submit_error', {
         error: err.message
@@ -123,4 +124,6 @@ const rootCmd = async function () {
     await runCmd();
   }
 };
-rootCmd();
+
+// We may end up having an unhandled rejection here :-(
+void rootCmd();

package/dist/commands/dev-env-sync-sql.js

@@ -37,13 +37,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @return {string} Site home url. null if not found
  */
 function findSiteHomeUrl(sql) {
+  var _sql$match;
   const regex = "'(siteurl|home)',\\s?'(.*?)'";
-  const results = sql.match(regex);
-  if (results) {
-    const url = results[2];
-    return _url.default.parse(url).hostname;
-  }
-  return null;
+  const url = ((_sql$match = sql.match(regex)) === null || _sql$match === void 0 ? void 0 : _sql$match[2]) || '';
+  return _url.default.parse(url).hostname || null;
 }
 
 /**
@@ -60,11 +57,12 @@ async function extractSiteUrls(sqlFile) {
     readInterface.on('line', line => {
       const domain = findSiteHomeUrl(line);
       if (domain) {
-        domains.add('//' + domain);
+        domains.add(domain);
       }
     });
     readInterface.on('close', () => {
-      resolve(Array.from(domains));
+      // Soring by length so that longest domains are replaced first
+      resolve(Array.from(domains).sort((dom1, dom2) => dom2.length - dom1.length));
     });
     readInterface.on('error', reject);
   });
@@ -86,7 +84,7 @@ class DevEnvSyncSQLCommand {
     this.tmpDir = (0, _utils.makeTempDir)();
   }
   get landoDomain() {
-    return `//${this.slug}.vipdev.lndo.site`;
+    return `${this.slug}.vipdev.lndo.site`;
   }
   get sqlFile() {
     return `${this.tmpDir}/sql-export.sql`;
@@ -114,7 +112,7 @@ class DevEnvSyncSQLCommand {
    * @throws {Error} If there is an error reading the file
    */
   async runSearchReplace() {
-    const replacements = this.siteUrls.reduce((acc, url) => [...acc, url, this.landoDomain], []);
+    const replacements = Object.entries(this.searchReplaceMap).flat();
     const readStream = _fs.default.createReadStream(this.sqlFile);
     const replacedStream = await (0, _vipSearchReplace.replace)(readStream, replacements);
     const outputFile = `${this.tmpDir}/sql-export-sr.sql`;
@@ -127,6 +125,20 @@ class DevEnvSyncSQLCommand {
       replacedStream.on('error', reject);
     });
   }
+  generateSearchReplaceMap() {
+    this.searchReplaceMap = {};
+    for (const url of this.siteUrls) {
+      this.searchReplaceMap[url] = this.landoDomain;
+    }
+    const networkSites = this.env.wpSitesSDS.nodes;
+    if (!networkSites) return;
+    for (const site of networkSites) {
+      if (!site.blogId || site.blogId === 1) continue;
+      const url = site.homeUrl.replace(/https?:\/\//, '');
+      if (!this.searchReplaceMap[url]) return;
+      this.searchReplaceMap[url] = `${site.blogId}.${this.landoDomain}`;
+    }
+  }
 
   /**
    * Runs the SQL import command to import the SQL file
@@ -161,9 +173,9 @@ class DevEnvSyncSQLCommand {
       console.log(`${_chalk.default.green('✓')} Extracted to ${this.sqlFile}`);
     } catch (err) {
       await this.track('archive_extraction_error', {
-        errorMessage: err === null || err === void 0 ? void 0 : err.message
+        errorMessage: err.message
       });
-      exit.withError(`Error extracting the SQL export: ${err === null || err === void 0 ? void 0 : err.message}`);
+      exit.withError(`Error extracting the SQL export: ${err.message}`);
     }
     try {
       console.log('Extracting site urls from the SQL file...');
@@ -171,11 +183,13 @@ class DevEnvSyncSQLCommand {
     } catch (err) {
       exit.withError(`Error extracting site URLs: ${err === null || err === void 0 ? void 0 : err.message}`);
     }
+    console.log('Generating search-replace configuration...');
+    this.generateSearchReplaceMap();
     try {
       console.log('Running the following search-replace operations on the SQL file:');
-      this.siteUrls.forEach(domain => {
-        console.log(`  ${domain} -> ${this.landoDomain}`);
-      });
+      for (const [domain, landoDomain] of Object.entries(this.searchReplaceMap)) {
+        console.log(`  ${domain} -> ${landoDomain}`);
+      }
       await this.runSearchReplace();
       console.log(`${_chalk.default.green('✓')} Search-replace operation is complete`);
     } catch (err) {

package/dist/commands/export-sql.js

@@ -353,7 +353,7 @@ class ExportSQLCommand {
             error_type: 'job_already_running',
             error_message: err === null || err === void 0 ? void 0 : err.message
           });
-          exit.withError('There is an export job already running for this site: ' + `https://dashboard.wpvip.com/apps/${this.app.id}/${this.env.uniqueLabel}/data/database/backups\n` + 'Currently, we allow only one export job at a time, per site. Please try again later.');
+          exit.withError('There is an export job already running for this environment: ' + `https://dashboard.wpvip.com/apps/${this.app.id}/${this.env.uniqueLabel}/data/database/backups\n` + 'Currently, we allow only one export job at a time, per site. Please try again later.');
         }
         exit.withError(`Error creating export job: ${err === null || err === void 0 ? void 0 : err.message}`);
       }

package/dist/lib/analytics/clients/pendo.js

@@ -4,36 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _debug = _interopRequireDefault(require("debug"));
 var _http = _interopRequireDefault(require("../../../lib/api/http"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * External dependencies
  */
-const debug = require('debug')('@automattic/vip:analytics:clients:pendo');
 
 /**
  * Internal dependencies
  */
 
+const debug = (0, _debug.default)('@automattic/vip:analytics:clients:pendo');
 /**
  * Pendo analytics client.
  */
-
 class Pendo {
-  context = {};
-  static get ENDPOINT() {
-    return '/pendo';
-  }
-  constructor({
-    userId,
-    eventPrefix,
-    env
-  }) {
-    this.eventPrefix = eventPrefix;
-    this.userAgent = env.userAgent;
-    this.userId = userId;
+  static ENDPOINT = '/pendo';
+  constructor(options) {
+    this.eventPrefix = options.eventPrefix;
+    this.userAgent = options.env.userAgent;
+    this.userId = options.userId;
     this.context = {
-      ...env
+      ...options.env
     };
   }
   async trackEvent(eventName, eventProps = {}) {
@@ -52,10 +45,8 @@ class Pendo {
       return await this.send(eventName, eventProps);
     } catch (error) {
       debug(error);
+      return Promise.resolve(false);
     }
-
-    // Resolve to false instead of rejecting
-    return Promise.resolve(false);
   }
   async send(eventName, eventProps) {
     const body = {
@@ -69,11 +60,11 @@ class Pendo {
     debug('send()', body);
     const response = await (0, _http.default)(Pendo.ENDPOINT, {
       method: 'POST',
-      body
+      body: JSON.stringify(body)
     });
     const responseText = await response.text();
     debug('response', responseText);
-    return responseText;
+    return response;
   }
 }
 exports.default = Pendo;

package/dist/lib/analytics/clients/tracks.js

@@ -6,19 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
 var _querystring = _interopRequireDefault(require("querystring"));
+var _debug = _interopRequireDefault(require("debug"));
 var _apiConfig = require("../../cli/apiConfig");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * External dependencies
  */
-const debug = require('debug')('@automattic/vip:analytics:clients:tracks');
 
 /**
  * Internal dependencies
  */
 
+const debug = (0, _debug.default)('@automattic/vip:analytics:clients:tracks');
 const validEventOrPropNamePattern = /^[a-z_][a-z0-9_]*$/;
-
 /**
  * Simple class for tracking using Automattic Tracks.
  *
@@ -28,9 +28,7 @@ const validEventOrPropNamePattern = /^[a-z_][a-z0-9_]*$/;
 // TODO: add batch support (can include multiples in `events` array)
 
 class Tracks {
-  static get ENDPOINT() {
-    return 'https://public-api.wordpress.com/rest/v1.1/tracks/record';
-  }
+  static ENDPOINT = 'https://public-api.wordpress.com/rest/v1.1/tracks/record';
   constructor(userId, userType, eventPrefix, env) {
     this.eventPrefix = eventPrefix;
     this.userAgent = env.userAgent;
@@ -54,9 +52,10 @@ class Tracks {
     });
     eventProps.is_vip = await (0, _apiConfig.checkIfUserIsVip)(); // Add `is_vip` flag to every Tracks event recorded
 
-    const event = Object.assign({
-      _en: name
-    }, eventProps);
+    const event = {
+      _en: name,
+      ...eventProps
+    };
 
     // For when we want to support batched events
     const events = [event];
@@ -89,10 +88,13 @@ class Tracks {
     }
 
     // Resolve to false instead of rejecting
-    return Promise.resolve(false);
+    return false;
   }
   send(extraParams) {
-    const params = Object.assign({}, this.baseParams, extraParams);
+    const params = {
+      ...this.baseParams,
+      ...extraParams
+    };
     const method = 'POST';
     const body = _querystring.default.stringify(params);
     const headers = {
@@ -100,8 +102,6 @@ class Tracks {
       'User-Agent': this.userAgent
     };
     debug('send()', body);
-
-    // eslint-disable-next-line no-undef
     return (0, _nodeFetch.default)(Tracks.ENDPOINT, {
       method,
       body,

package/dist/lib/analytics/index.js

@@ -5,15 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _debug = _interopRequireDefault(require("debug"));
-var _stub = _interopRequireDefault(require("./clients/stub"));
 var _env = _interopRequireDefault(require("../env"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * External dependencies
  */
+
 /**
  * Internal dependencies
  */
+
 const debug = (0, _debug.default)('@automattic/vip:analytics');
 
 /* eslint-disable camelcase */
@@ -26,23 +27,19 @@ const client_info = {
 /* eslint-enable camelcase */
 
 class Analytics {
-  constructor({
-    clients = new _stub.default()
-  }) {
+  constructor(clients) {
     this.clients = clients;
   }
   async trackEvent(name, props = {}) {
     if (process.env.DO_NOT_TRACK) {
       debug(`trackEvent() for ${name} => skipping per DO_NOT_TRACK variable`);
-      return Promise.resolve(`Skipping trackEvent for ${name} (DO_NOT_TRACK)`);
+      return [];
     }
-    return Promise.all(this.clients.map(client => {
-      return client.trackEvent(name, {
-        // eslint-disable-next-line camelcase
-        ...client_info,
-        ...props
-      });
-    }));
+    return Promise.all(this.clients.map(client => client.trackEvent(name, {
+      // eslint-disable-next-line camelcase
+      ...client_info,
+      ...props
+    })));
   }
 }
 exports.default = Analytics;