@automattic/vip 2.30.0-dev1 → 2.31.0-dev1

package/dist/lib/envvar/api-get-all.js

@@ -10,9 +10,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * External dependencies
  */
+
 /**
  * Internal dependencies
  */
+
 const query = (0, _graphqlTag.default)`
 	query GetEnvironmentVariablesWithValues(
 		$appId: Int!
@@ -38,6 +40,7 @@ const query = (0, _graphqlTag.default)`
 	}
 `;
 async function getEnvVars(appId, envId) {
+  var _ref, _data$app, _data$app$environment, _data$app$environment2, _data$app$environment3;
   const api = await (0, _api.default)();
   const variables = {
     appId,
@@ -49,5 +52,5 @@ async function getEnvVars(appId, envId) {
     query,
     variables
   });
-  return data.app.environments[0].environmentVariables.nodes;
+  return (_ref = (_data$app = data.app) === null || _data$app === void 0 ? void 0 : (_data$app$environment = _data$app.environments) === null || _data$app$environment === void 0 ? void 0 : (_data$app$environment2 = _data$app$environment[0]) === null || _data$app$environment2 === void 0 ? void 0 : (_data$app$environment3 = _data$app$environment2.environmentVariables) === null || _data$app$environment3 === void 0 ? void 0 : _data$app$environment3.nodes) !== null && _ref !== void 0 ? _ref : null;
 }

package/dist/lib/envvar/api-get.js

@@ -9,12 +9,14 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * External dependencies
  */
+
 /**
  * Internal dependencies
  */
+
 async function getEnvVar(appId, envId, name) {
   const envvars = await (0, _apiGetAll.default)(appId, envId);
-  return envvars.find(({
+  return envvars === null || envvars === void 0 ? void 0 : envvars.find(({
     name: foundName
   }) => name === foundName);
 }

package/dist/lib/envvar/api-list.js

@@ -10,9 +10,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * External dependencies
  */
+
 /**
  * Internal dependencies
  */
+
 const query = (0, _graphqlTag.default)`
 	query GetEnvironmentVariables(
 		$appId: Int!
@@ -39,6 +41,7 @@ const query = (0, _graphqlTag.default)`
 
 // List the names (but not values) of environment variables.
 async function listEnvVars(appId, envId) {
+  var _data$app$environment, _data$app, _data$app$environment2, _data$app$environment3, _data$app$environment4;
   const api = await (0, _api.default)();
   const variables = {
     appId,
@@ -50,7 +53,9 @@ async function listEnvVars(appId, envId) {
     query,
     variables
   });
-  return data.app.environments[0].environmentVariables.nodes.map(({
-    name
-  }) => name);
+  const nodes = (_data$app$environment = (_data$app = data.app) === null || _data$app === void 0 ? void 0 : (_data$app$environment2 = _data$app.environments) === null || _data$app$environment2 === void 0 ? void 0 : (_data$app$environment3 = _data$app$environment2[0]) === null || _data$app$environment3 === void 0 ? void 0 : (_data$app$environment4 = _data$app$environment3.environmentVariables) === null || _data$app$environment4 === void 0 ? void 0 : _data$app$environment4.nodes) !== null && _data$app$environment !== void 0 ? _data$app$environment : [];
+  return nodes.map(entry => {
+    var _entry$name;
+    return (_entry$name = entry === null || entry === void 0 ? void 0 : entry.name) !== null && _entry$name !== void 0 ? _entry$name : '';
+  });
 }

package/dist/lib/envvar/api-set.js

@@ -10,9 +10,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * External dependencies
  */
+
 /**
  * Internal dependencies
  */
+
 const mutation = (0, _graphqlTag.default)`
 	mutation AddEnvironmentVariable(
 		$appId: Int!

package/dist/lib/envvar/api.js

@@ -44,10 +44,7 @@ var _apiGetAll = _interopRequireDefault(require("./api-get-all"));
 var _apiList = _interopRequireDefault(require("./api-list"));
 var _apiSet = _interopRequireDefault(require("./api-set"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * 
- * @format
- */
+// @format
 
 /**
  * External dependencies
@@ -83,7 +80,7 @@ function validateName(name) {
   return name === sanitizedName && /^[A-Z]/.test(sanitizedName);
 }
 function validateNameWithMessage(name) {
-  (0, _logging.debug)(`Validating environment variable name ${JSON.stringify(name)}`);
+  (0, _logging.debug)(`Validating environment variable name "${name}"`);
   if (!validateName(name)) {
     const message = ['Environment variable name must consist of A-Z, 0-9, or _,', 'and must start with an uppercase letter.'].join('\n');
     console.log(_chalk.default.bold.red(message));

package/dist/lib/envvar/input.js

@@ -9,10 +9,7 @@ exports.promptForValue = promptForValue;
 var _chalk = _interopRequireDefault(require("chalk"));
 var _enquirer = require("enquirer");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * 
- * @format
- */
+// @format
 
 /**
  * External dependencies
@@ -27,13 +24,15 @@ function cancel() {
   process.exit();
 }
 function confirm(message) {
-  return new _enquirer.BooleanPrompt({
+  return new _enquirer.Confirm({
     message
   }).run().catch(() => false);
 }
 async function promptForValue(message, mustMatch) {
-  var _response$str;
-  const response = await (0, _enquirer.prompt)({
+  var _str$trim;
+  const {
+    str
+  } = await (0, _enquirer.prompt)({
     message,
     name: 'str',
     type: 'input',
@@ -44,5 +43,5 @@ async function promptForValue(message, mustMatch) {
       return true;
     }
   });
-  return ((_response$str = response.str) === null || _response$str === void 0 ? void 0 : _response$str.trim()) || '';
+  return (_str$trim = str === null || str === void 0 ? void 0 : str.trim()) !== null && _str$trim !== void 0 ? _str$trim : '';
 }

package/dist/lib/envvar/read-file.js

@@ -6,10 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.readVariableFromFile = readVariableFromFile;
 var _logging = require("../../lib/envvar/logging");
 var _readFile = require("../read-file");
-/**
- * 
- * @format
- */
+// @format
 
 /**
  * External dependencies
@@ -19,7 +16,7 @@ var _readFile = require("../read-file");
  * Internal dependencies
  */
 
-async function readVariableFromFile(path) {
-  (0, _logging.debug)(`Loading variable value from file ${JSON.stringify(path)}`);
-  return await (0, _readFile.readFromFile)(path);
+function readVariableFromFile(path) {
+  (0, _logging.debug)(`Loading variable value from file "${path}"`);
+  return (0, _readFile.readFromFile)(path);
 }

package/dist/lib/http/proxy-agent.js

@@ -9,6 +9,7 @@ var _httpsProxyAgent = require("https-proxy-agent");
 var _proxyFromEnv = require("proxy-from-env");
 var _debug = _interopRequireDefault(require("debug"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 /**
  * External dependencies
  */
@@ -31,10 +32,10 @@ const debug = (0, _debug.default)('vip:proxy-agent');
 // 5. NO_PROXY is set along with VIP_USE_SYSTEM_PROXY and any system proxy: null is returned if the no proxy applies, otherwise the first active proxy is used
 // This allows near full customization by the client of what proxy should be used, instead of making assumptions based on the URL string
 function createProxyAgent(url) {
-  const VIP_PROXY = process.env.VIP_PROXY || process.env.vip_proxy || null;
-  const SOCKS_PROXY = process.env.SOCKS_PROXY || process.env.socks_proxy || null;
-  const HTTPS_PROXY = process.env.HTTPS_PROXY || process.env.https_proxy || null;
-  const NO_PROXY = process.env.NO_PROXY || process.env.no_proxy || null;
+  const VIP_PROXY = process.env.VIP_PROXY || process.env.vip_proxy || null; // NOSONAR
+  const SOCKS_PROXY = process.env.SOCKS_PROXY || process.env.socks_proxy || null; // NOSONAR
+  const HTTPS_PROXY = process.env.HTTPS_PROXY || process.env.https_proxy || null; // NOSONAR
+  const NO_PROXY = process.env.NO_PROXY || process.env.no_proxy || null; // NOSONAR
 
   // VIP Socks Proxy should take precedence and should be fully backward compatible
   if (VIP_PROXY) {

package/dist/lib/keychain/insecure.js

@@ -4,10 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _configstore = _interopRequireDefault(require("configstore"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * External dependencies
  */
-const Configstore = require('configstore');
 
 /**
  * Internal dependencies
@@ -16,38 +17,36 @@ const Configstore = require('configstore');
 class Insecure {
   constructor(file) {
     this.file = file;
-    this.configstore = new Configstore(this.file);
+    this.configstore = new _configstore.default(this.file);
   }
   getPassword(service) {
-    return new Promise((resolve, reject) => {
-      let password = null;
-      try {
-        password = this.configstore.get(service);
-      } catch (err) {
-        return reject(err);
+    try {
+      const value = this.configstore.get(service);
+      if (null === value || undefined === value) {
+        return Promise.resolve(null);
       }
-      return resolve(password);
-    });
+
+      // eslint-disable-next-line @typescript-eslint/no-base-to-string
+      return Promise.resolve(value.toString()); // NOSONAR
+    } catch (err) {
+      return Promise.reject(err);
+    }
   }
   setPassword(service, password) {
-    return new Promise((resolve, reject) => {
-      try {
-        this.configstore.set(service, password);
-      } catch (err) {
-        return reject(err);
-      }
-      resolve(true);
-    });
+    try {
+      this.configstore.set(service, password);
+      return Promise.resolve(true);
+    } catch (err) {
+      return Promise.reject(err);
+    }
   }
   deletePassword(service) {
-    return new Promise((resolve, reject) => {
-      try {
-        this.configstore.delete(service);
-      } catch (err) {
-        return reject(err);
-      }
-      resolve(true);
-    });
+    try {
+      this.configstore.delete(service);
+      return Promise.resolve(true);
+    } catch (err) {
+      return Promise.reject(err);
+    }
   }
 }
 exports.default = Insecure;

package/dist/lib/keychain/secure.js

@@ -9,15 +9,18 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * External dependencies
  */
+
 /**
  * Internal dependencies
  */
+
 class Secure {
   getPassword(service) {
     return _keytar.default.getPassword(service, service);
   }
-  setPassword(service, password) {
-    return _keytar.default.setPassword(service, service, password);
+  async setPassword(service, password) {
+    await _keytar.default.setPassword(service, service, password);
+    return true;
   }
   deletePassword(service) {
     return _keytar.default.deletePassword(service, service);

package/dist/lib/keychain.js

@@ -4,35 +4,28 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _debug = _interopRequireDefault(require("debug"));
 var _insecure = _interopRequireDefault(require("./keychain/insecure"));
-var _browser = _interopRequireDefault(require("./keychain/browser"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/* global window */
 /**
  * External dependencies
  */
-const debug = require('debug')('@automattic/vip:keychain');
 
 /**
  * Internal dependencies
  */
 
-let exportValue = {};
-if (typeof window === 'undefined' || typeof window.localStorage === 'undefined') {
-  // node
+let exportValue;
+const debug = (0, _debug.default)('@automattic/vip:keychain');
+try {
+  // Try using Secure keychain ("keytar") first
+  const Secure = require("./keychain/secure");
+  exportValue = new Secure();
+} catch (error) {
+  debug('Cannot use Secure keychain; falling back to Insecure keychain (Details: %o)', error);
 
-  try {
-    // Try using Secure keychain ("keytar") first
-    const Secure = require("./keychain/secure");
-    exportValue = new Secure();
-  } catch (error) {
-    debug('Cannot use Secure keychain; falling back to Insecure keychain (Details: %o)', error);
-
-    // Fallback to Insecure keychain if we can't
-    exportValue = new _insecure.default('vip-go-cli');
-  }
-} else {
-  exportValue = new _browser.default();
+  // Fallback to Insecure keychain if we can't
+  exportValue = new _insecure.default('vip-go-cli');
 }
 var _default = exportValue;
 exports.default = _default;

package/dist/lib/media-import/status.js

@@ -234,12 +234,12 @@ ${maybeExitPrompt}
         startDate = Date.now();
       }
       setTimeout(() => {
-        checkStatus(pollInterval);
+        void checkStatus(pollInterval);
       }, pollInterval);
     };
 
     // Kick off the check
-    checkStatus(IMPORT_MEDIA_PROGRESS_POLL_INTERVAL);
+    void checkStatus(IMPORT_MEDIA_PROGRESS_POLL_INTERVAL);
   });
   try {
     var _results$failureDetai;

package/dist/lib/read-file.js

@@ -4,14 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.readFromFile = readFromFile;
-var _fs = require("fs");
+var _promises = require("node:fs/promises");
 var exit = _interopRequireWildcard(require("../lib/cli/exit"));
 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); }
 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; }
-/**
- * 
- * @format
- */
+// @format
 
 /**
  * External dependencies
@@ -22,14 +19,16 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  */
 
 async function readFromFile(path) {
-  const data = await _fs.promises.readFile(path, 'binary').catch(({
-    message
-  }) => {
-    // Provide friendly version of common error.
-    if (message.startsWith('ENOENT: no such file or directory')) {
-      exit.withError(`Could not load file ${JSON.stringify(path)}.`);
+  try {
+    const data = await (0, _promises.readFile)(path, 'utf-8');
+    return data.trim();
+  } catch (error) {
+    if (!(error instanceof Error)) {
+      exit.withError('Unknown error');
+    }
+    if ('code' in error && error.code === 'ENOENT') {
+      exit.withError(`Could not load file "${path}".`);
     }
-    exit.withError(message);
-  });
-  return Buffer.from(data).toString().trim();
+    exit.withError(error.message);
+  }
 }

package/dist/lib/search-and-replace.js

@@ -7,8 +7,9 @@ exports.getReadAndWriteStreams = getReadAndWriteStreams;
 exports.searchAndReplace = void 0;
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
-var _chalk = _interopRequireDefault(require("chalk"));
+var _chalk = require("chalk");
 var _debug = _interopRequireDefault(require("debug"));
+var _promises = require("node:stream/promises");
 var _vipSearchReplace = require("@automattic/vip-search-replace");
 var _tracker = require("../lib/tracker");
 var _prompt = require("../lib/cli/prompt");
@@ -18,10 +19,7 @@ var _utils = require("./utils");
 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); }
 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 }; }
-/**
- * 
- * @format
- */
+// @format
 
 /**
  * External dependencies
@@ -32,11 +30,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 
 const debug = (0, _debug.default)('@automattic/vip:lib:search-and-replace');
-const flatten = arr => {
-  return arr.reduce((flat, toFlatten) => {
-    return flat.concat(Array.isArray(toFlatten) ? flatten(toFlatten) : toFlatten);
-  }, []);
-};
 function getReadAndWriteStreams({
   fileName,
   inPlace,
@@ -103,7 +96,7 @@ const searchAndReplace = async (fileName, pairs, {
   const fileSize = (0, _clientFileUploader.getFileSize)(fileName);
 
   // if we don't have any pairs to replace with, return the input file
-  if (!pairs || !pairs.length) {
+  if (!pairs.length) {
     throw new Error('No search and replace parameters provided.');
   }
 
@@ -113,8 +106,7 @@ const searchAndReplace = async (fileName, pairs, {
   }
 
   // determine all the replacements required
-  const replacementsArr = pairs.map(pair => pair.split(',').map(str => str.trim()));
-  const replacements = flatten(replacementsArr);
+  const replacements = pairs.flatMap(pair => pair.split(',').map(str => str.trim()));
   debug('Pairs: ', pairs, 'Replacements: ', replacements);
   if (inPlace) {
     const approved = await (0, _prompt.confirm)([], 'Are you sure you want to run search and replace on your input file? This operation is not reversible.');
@@ -142,20 +134,15 @@ const searchAndReplace = async (fileName, pairs, {
   try {
     replacedStream = await (0, _vipSearchReplace.replace)(readStream, replacements, binary);
   } catch (replaceError) {
+    // replace() throws strings... OMG
     exit.withError(replaceError);
   }
-  const result = await new Promise((resolve, reject) => {
-    replacedStream.pipe(writeStream).on('finish', () => {
-      resolve({
-        inputFileName: fileName,
-        outputFileName,
-        usingStdOut
-      });
-    }).on('error', () => {
-      console.log(_chalk.default.red("Oh no! We couldn't write to the output file.  Please check your available disk space and file/folder permissions."));
-      reject();
-    });
-  });
+  try {
+    await (0, _promises.pipeline)(replacedStream, writeStream);
+  } catch (error) {
+    console.log((0, _chalk.red)("Oh no! We couldn't write to the output file.  Please check your available disk space and file/folder permissions."));
+    throw error;
+  }
   const endTime = process.hrtime(startTime);
   const end = endTime[1] / 1000000; // time in ms
 
@@ -163,6 +150,10 @@ const searchAndReplace = async (fileName, pairs, {
     time_to_run: end,
     file_size: fileSize
   });
-  return result;
+  return {
+    inputFileName: fileName,
+    outputFileName,
+    usingStdOut
+  };
 };
 exports.searchAndReplace = searchAndReplace;

package/dist/lib/site-import/status.js

@@ -246,8 +246,9 @@ ${maybeExitPrompt}
 
           // if the progress meta isn't filled out yet, wait until it is.
           if (!statusSteps) {
-            return setTimeout(checkStatus, IMPORT_SQL_PROGRESS_POLL_INTERVAL);
+            return setTimeout(checkStatus, IMPORT_SQL_PROGRESS_POLL_INTERVAL); // NOSONAR
           }
+
           jobSteps = statusSteps.map(step => {
             return {
               id: step.name,
@@ -348,11 +349,11 @@ ${maybeExitPrompt}
         return resolve(importJob);
       }
       overallStatus = 'running';
-      setTimeout(checkStatus, IMPORT_SQL_PROGRESS_POLL_INTERVAL);
+      setTimeout(checkStatus, IMPORT_SQL_PROGRESS_POLL_INTERVAL); // NOSONAR
     };
 
     // Kick off the check
-    checkStatus();
+    void checkStatus();
   });
   try {
     const results = await getResults();

package/dist/lib/token.js

@@ -12,9 +12,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * External dependencies
  */
+
 /**
  * Internal dependencies
  */
+
 // Config
 const SERVICE = 'vip-go-cli';
 exports.SERVICE = SERVICE;
@@ -28,9 +30,9 @@ class Token {
       return;
     }
     const decodedToken = (0, _jwtDecode.default)(token);
-    this.raw = token;
+    this._raw = token;
     if (decodedToken.id) {
-      this.id = decodedToken.id;
+      this._id = decodedToken.id;
     }
     if (decodedToken.iat) {
       this.iat = new Date(decodedToken.iat * 1000);
@@ -40,7 +42,7 @@ class Token {
     }
   }
   valid() {
-    if (!this.id) {
+    if (!this._id) {
       return false;
     }
     if (!this.iat) {
@@ -59,6 +61,14 @@ class Token {
     const now = new Date();
     return now > this.exp;
   }
+  get id() {
+    var _this$_id;
+    return (_this$_id = this._id) !== null && _this$_id !== void 0 ? _this$_id : NaN;
+  }
+  get raw() {
+    var _this$_raw;
+    return (_this$_raw = this._raw) !== null && _this$_raw !== void 0 ? _this$_raw : '';
+  }
   static async uuid() {
     const service = Token.getServiceName('-uuid');
     let _uuid = await _keychain.default.getPassword(service);
@@ -72,16 +82,17 @@ class Token {
     const service = Token.getServiceName('-uuid');
     await _keychain.default.setPassword(service, _uuid);
   }
-  static async set(token) {
+  static set(token) {
     const service = Token.getServiceName();
     return _keychain.default.setPassword(service, token);
   }
   static async get() {
+    var _await$keychain$getPa;
     const service = Token.getServiceName();
-    const token = await _keychain.default.getPassword(service);
+    const token = (_await$keychain$getPa = await _keychain.default.getPassword(service)) !== null && _await$keychain$getPa !== void 0 ? _await$keychain$getPa : '';
     return new Token(token);
   }
-  static async purge() {
+  static purge() {
     const service = Token.getServiceName();
     return _keychain.default.deletePassword(service);
   }

package/dist/lib/tracker.js

@@ -7,6 +7,7 @@ exports.aliasUser = aliasUser;
 exports.makeCommandTracker = makeCommandTracker;
 exports.trackEvent = trackEvent;
 exports.trackEventWithEnv = trackEventWithEnv;
+var _debug = _interopRequireDefault(require("debug"));
 var _index = _interopRequireDefault(require("./analytics/index"));
 var _tracks = _interopRequireDefault(require("./analytics/clients/tracks"));
 var _pendo = _interopRequireDefault(require("./analytics/clients/pendo"));
@@ -17,12 +18,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * External dependencies
  */
-const debug = require('debug')('@automattic/vip:analytics');
 
 /**
  * Internal dependencies
  */
 
+const debug = (0, _debug.default)('@automattic/vip:analytics');
 let analytics = null;
 async function init() {
   const uuid = await _token.default.uuid();
@@ -37,10 +38,7 @@ async function init() {
       userId: uuid
     }));
   }
-  analytics = new _index.default({
-    clients
-  });
-  return analytics;
+  return new _index.default(clients);
 }
 async function getInstance() {
   if (analytics) {
@@ -49,30 +47,31 @@ async function getInstance() {
   analytics = await init();
   return analytics;
 }
-async function trackEvent(...args) {
+async function trackEvent(name, props = {}) {
   try {
     await _token.default.uuid();
     const client = await getInstance();
-    return await client.trackEvent(...args);
+    return await client.trackEvent(name, props);
   } catch (err) {
     debug('trackEvent() failed', err);
+    return [];
   }
 }
 async function aliasUser(vipUserId) {
-  try {
-    if (vipUserId) {
+  if (vipUserId) {
+    try {
       await trackEvent('_alias_user', {
         ui: vipUserId,
         _ut: _config.default.tracksUserType,
-        anonid: _token.default.uuid()
+        anonid: await _token.default.uuid()
       });
-      _token.default.setUuid(vipUserId);
+      await _token.default.setUuid(`${vipUserId}`);
+    } catch (err) {
+      debug('aliasUser() failed', err);
     }
-  } catch (err) {
-    debug('aliasUser() failed', err);
   }
 }
-async function trackEventWithEnv(appId, envId, eventName, eventProps = {}) {
+function trackEventWithEnv(appId, envId, eventName, eventProps = {}) {
   return trackEvent(eventName, {
     ...eventProps,
     app_id: appId,