@automattic/vip 2.29.1 → 2.30.0

package/.sonarcloud.properties

@@ -0,0 +1,2 @@
+sonar.sources=src, helpers
+sonar.tests=__tests__

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-app-list.js

@@ -8,7 +8,6 @@ var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _api = _interopRequireDefault(require("../lib/api"));
 var _tracker = require("../lib/tracker");
-var _rollbar = require("../lib/rollbar");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Internal dependencies
@@ -43,7 +42,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
     await (0, _tracker.trackEvent)('app_list_command_fetch_error', {
       error: message
     });
-    _rollbar.rollbar.error(err);
     console.log('Failed to fetch apps: %s', message);
     return;
   }

package/dist/bin/vip-config-envvar-delete.js

@@ -19,7 +19,6 @@ var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _api = require("../lib/envvar/api");
 var _input = require("../lib/envvar/input");
 var _logging = require("../lib/envvar/logging");
-var _rollbar = require("../lib/rollbar");
 var _tracker = require("../lib/tracker");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
@@ -60,7 +59,6 @@ async function deleteEnvVarCommand(arg, opt) {
     }
   }
   await (0, _api.deleteEnvVar)(opt.app.id, opt.env.id, name).catch(async err => {
-    _rollbar.rollbar.error(err);
     await (0, _tracker.trackEvent)('envvar_delete_mutation_error', {
       ...trackingParams,
       error: err.message

package/dist/bin/vip-config-envvar-get-all.js

@@ -19,7 +19,6 @@ var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _format = require("../lib/cli/format");
 var _api = require("../lib/envvar/api");
 var _logging = require("../lib/envvar/logging");
-var _rollbar = require("../lib/rollbar");
 var _tracker = require("../lib/tracker");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
@@ -43,7 +42,6 @@ async function getAllEnvVarsCommand(arg, opt) {
   (0, _logging.debug)(`Request: Get all environment variables for ${(0, _logging.getEnvContext)(opt.app, opt.env)}`);
   await (0, _tracker.trackEvent)('envvar_get_all_command_execute', trackingParams);
   const envvars = await (0, _api.getEnvVars)(opt.app.id, opt.env.id).catch(async err => {
-    _rollbar.rollbar.error(err);
     await (0, _tracker.trackEvent)('envvar_get_all_query_error', {
       ...trackingParams,
       error: err.message

package/dist/bin/vip-config-envvar-get.js

@@ -18,7 +18,6 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _api = require("../lib/envvar/api");
 var _logging = require("../lib/envvar/logging");
-var _rollbar = require("../lib/rollbar");
 var _tracker = require("../lib/tracker");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
@@ -44,7 +43,6 @@ async function getEnvVarCommand(arg, opt) {
   (0, _logging.debug)(`Request: Get environment variable ${JSON.stringify(name)} for ${(0, _logging.getEnvContext)(opt.app, opt.env)}`);
   await (0, _tracker.trackEvent)('envvar_get_command_execute', trackingParams);
   const envvar = await (0, _api.getEnvVar)(opt.app.id, opt.env.id, name).catch(async err => {
-    _rollbar.rollbar.error(err);
     await (0, _tracker.trackEvent)('envvar_get_query_error', {
       ...trackingParams,
       error: err.message

package/dist/bin/vip-config-envvar-list.js

@@ -19,7 +19,6 @@ var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _format = require("../lib/cli/format");
 var _api = require("../lib/envvar/api");
 var _logging = require("../lib/envvar/logging");
-var _rollbar = require("../lib/rollbar");
 var _tracker = require("../lib/tracker");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
@@ -43,7 +42,6 @@ async function listEnvVarsCommand(arg, opt) {
   (0, _logging.debug)(`Request: list environment variables for ${(0, _logging.getEnvContext)(opt.app, opt.env)}`);
   await (0, _tracker.trackEvent)('envvar_list_command_execute', trackingParams);
   const envvars = await (0, _api.listEnvVars)(opt.app.id, opt.env.id).catch(async err => {
-    _rollbar.rollbar.error(err);
     await (0, _tracker.trackEvent)('envvar_list_query_error', {
       ...trackingParams,
       error: err.message

package/dist/bin/vip-config-envvar-set.js

@@ -20,7 +20,6 @@ var _api = require("../lib/envvar/api");
 var _input = require("../lib/envvar/input");
 var _logging = require("../lib/envvar/logging");
 var _readFile = require("../lib/envvar/read-file");
-var _rollbar = require("../lib/rollbar");
 var _tracker = require("../lib/tracker");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
@@ -82,7 +81,6 @@ async function setEnvVarCommand(arg, opt) {
     }
   }
   await (0, _api.setEnvVar)(opt.app.id, opt.env.id, name, value).catch(async err => {
-    _rollbar.rollbar.error(err);
     await (0, _tracker.trackEvent)('envvar_set_mutation_error', {
       ...trackingParams,
       error: err.message

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

@@ -0,0 +1,86 @@
+#!/usr/bin/env node
+
+/**
+ * 
+ * @format
+ */
+
+/**
+ * External 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");
+var _userError = _interopRequireDefault(require("../lib/user-error"));
+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`'
+}];
+const appQuery = `
+	id,
+	name,
+	type,
+	organization { id, name },
+	environments{
+		id
+		appId
+		type
+		name
+		primaryDomain { name }
+		uniqueLabel
+		isMultisite
+	}
+`;
+(0, _command.default)({
+  appContext: true,
+  appQuery,
+  envContext: true,
+  requiredArgs: 0,
+  module: 'dev-env-sync-sql'
+}).option('slug', 'Custom name of the dev environment').examples(examples).argv(process.argv, async (arg, {
+  app,
+  env,
+  slug
+}) => {
+  const trackerFn = (0, _tracker.makeCommandTracker)('dev_env_sync_sql', {
+    app: app.id,
+    env: env.uniqueLabel,
+    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))) {
+    await trackerFn('env_not_running_error', {
+      errorMessage: 'Environment was not running'
+    });
+    throw new _userError.default('Environment needs to be started first');
+  }
+  const cmd = new _devEnvSyncSql.DevEnvSyncSQLCommand(app, env, slug, trackerFn);
+  await cmd.run();
+  await trackerFn('success');
+});

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

@@ -0,0 +1,21 @@
+#!/usr/bin/env node
+
+/**
+ * 
+ * @format
+ */
+
+/**
+ * External dependencies
+ */
+
+/**
+ * Internal dependencies
+ */
+"use strict";
+
+var _command = _interopRequireDefault(require("../lib/cli/command"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+(0, _command.default)({
+  requiredArgs: 1
+}).command('sql', 'Sync local database with a production environment').argv(process.argv);

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

@@ -18,4 +18,4 @@ var _command = _interopRequireDefault(require("../lib/cli/command"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 (0, _command.default)({
   requiredArgs: 0
-}).command('create', 'Create a new local dev environment').command('update', 'Update an already created local dev environment').command('start', 'Start a local dev environment').command('stop', 'Stop a local dev environment').command('destroy', 'Remove containers, networks, volumes and configuration files of a local dev environment').command('info', 'Provides basic info about one or multiple local dev environments').command('list', 'Provides basic info about all local dev environments').command('exec', 'Execute a WP-CLI command in local dev environment').command('import', 'Import data into a local WordPress environment').command('shell', 'Spawns a shell in a dev environment').command('logs', 'View logs from a local WordPress environment').argv(process.argv);
+}).command('create', 'Create a new local dev environment').command('update', 'Update an already created local dev environment').command('start', 'Start a local dev environment').command('stop', 'Stop a local dev environment').command('destroy', 'Remove containers, networks, volumes and configuration files of a local dev environment').command('info', 'Provides basic info about one or multiple local dev environments').command('list', 'Provides basic info about all local dev environments').command('exec', 'Execute a WP-CLI command in local dev environment').command('import', 'Import data into a local WordPress environment').command('shell', 'Spawns a shell in a dev environment').command('logs', 'View logs from a local WordPress environment').command('sync', 'Pull data from production to local development environment').argv(process.argv);

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

@@ -34,7 +34,6 @@ var _lineByLine = require("../lib/validations/line-by-line");
 var _format = require("../lib/cli/format");
 var _progress = require("../lib/cli/progress");
 var _isMultiSite = require("../lib/validations/is-multi-site");
-var _rollbar = require("../lib/rollbar");
 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 }; }
@@ -419,7 +418,6 @@ Processing the SQL import for your environment...
     progressTracker.print({
       clearAfter: true
     });
-    _rollbar.rollbar.error(failureError);
     exit.withError(failureError);
   };
   progressTracker.startPrinting(setProgressTrackerPrefixAndSuffix);

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-logs.js

@@ -14,7 +14,6 @@ exports.validateInputs = validateInputs;
 var _chalk = _interopRequireDefault(require("chalk"));
 var _promises = require("timers/promises");
 var _command = _interopRequireDefault(require("../lib/cli/command"));
-var _rollbar = require("../lib/rollbar");
 var _tracker = require("../lib/tracker");
 var logsLib = _interopRequireWildcard(require("../lib/app-logs/app-logs"));
 var exit = _interopRequireWildcard(require("../lib/cli/exit"));
@@ -43,7 +42,6 @@ async function getLogs(arg, opt) {
     }
     logs = await logsLib.getRecentLogs(opt.app.id, opt.env.id, opt.type, opt.limit);
   } catch (error) {
-    _rollbar.rollbar.error(error);
     await (0, _tracker.trackEvent)('logs_command_error', {
       ...trackingParams,
       error: error.message
@@ -104,7 +102,6 @@ async function followLogs(opt) {
       delay += DEFAULT_POLLING_DELAY_IN_SECONDS;
       delay = Math.min(delay, MAX_POLLING_DELAY_IN_SECONDS);
       console.error(`${_chalk.default.red('Error:')} Failed to fetch logs. Trying again in ${delay} seconds.`);
-      _rollbar.rollbar.error(error);
     }
     if (logs) {
       var _logs2, _logs3, _logs4;

package/dist/bin/vip-wp.js

@@ -18,7 +18,6 @@ var _format = require("../lib/cli/format");
 var _prompt = require("../lib/cli/prompt");
 var _tracker = require("../lib/tracker");
 var _token = _interopRequireDefault(require("../lib/token"));
-var _rollbar = require("../lib/rollbar");
 var _proxyAgent = require("../lib/http/proxy-agent");
 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; }
@@ -174,7 +173,6 @@ const launchCommandAndGetStreams = async ({
   });
   (0, _socket2.default)(socket).on('error', err => {
     // This returns the error so it can be catched by the socket.on('error')
-    _rollbar.rollbar.error(err);
     return err;
   });
   socket.on('error', err => {
@@ -182,7 +180,6 @@ const launchCommandAndGetStreams = async ({
       console.log(_chalk.default.red('\nError:'), 'Rate limit exceeded: Please wait a moment and try again.');
       return;
     }
-    _rollbar.rollbar.error(err);
     console.log(err);
   });
   return {
@@ -204,19 +201,13 @@ const bindReconnectEvents = ({
   currentJob.socket.removeAllListeners('connect_error');
   currentJob.socket.io.on('reconnect', async () => {
     debug('socket.io: reconnect');
-    _rollbar.rollbar.info('WP-CLI socket.io.on( \'reconnect\' )', {
-      custom: {
-        code: 'wp-cli-on-reconnect',
-        commandGuid: cliCommand.guid
-      }
-    });
 
     // Close old streams
     unpipeStreamsFromProcess({
       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,
@@ -248,24 +239,12 @@ const bindReconnectEvents = ({
   });
   currentJob.socket.on('retry', async () => {
     debug('socket: retry');
-    _rollbar.rollbar.info('WP-CLI socket.io.on( \'retry\' )', {
-      custom: {
-        code: 'wp-cli-on-retry',
-        commandGuid: cliCommand.guid
-      }
-    });
     setTimeout(() => {
       currentJob.socket.io.engine.close();
     }, 5000);
   });
   currentJob.socket.on('connect_error', () => {
     debug('socket: connect_error; forcing the preference for websocket');
-    _rollbar.rollbar.info('WP-CLI socket.on( \'connect_error\' )', {
-      custom: {
-        code: 'wp-cli-on-connect_error',
-        commandGuid: cliCommand.guid
-      }
-    });
 
     // Force the preference for WebSocket in case we see an error during connection
     // https://socket.io/docs/v3/client-initialization/#low-level-engine-options
@@ -340,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');
@@ -351,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();
     }
@@ -418,7 +397,6 @@ const bindReconnectEvents = ({
         });
       } else {
         // Else, other type of error, just dump it
-        _rollbar.rollbar.error(error);
         console.log(error);
       }
       if (!isSubShell) {
@@ -436,14 +414,6 @@ const bindReconnectEvents = ({
         }
       }
     } = result;
-    if (line.includes("'")) {
-      _rollbar.rollbar.info('WP-CLI Command containing single quotes', {
-        custom: {
-          code: 'wp-cli-single-quotes',
-          commandGuid: cliCommand.guid
-        }
-      });
-    }
     const token = await _token.default.get();
     const extraHeaders = {
       Authorization: `Bearer ${token.raw}`
@@ -488,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();
@@ -502,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,9 +10,8 @@ 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 _rollbar = require("../lib/rollbar");
 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); }
 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; }
@@ -40,15 +39,16 @@ 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())) {
-    runCmd();
+  if (!isLoginCommand && (isLogoutCommand || isHelpCommand || isVersionCommand || isDevEnvCommandWithoutEnv || (_token = token) !== null && _token !== void 0 && _token.valid())) {
+    await runCmd();
   } else {
     console.log();
     console.log('   _    __ ________         ________    ____');
@@ -83,10 +83,9 @@ 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.');
-      _rollbar.rollbar.error(err);
       await (0, _tracker.trackEvent)('login_command_token_submit_error', {
         error: err.message
       });
@@ -107,12 +106,11 @@ const rootCmd = async function () {
       return;
     }
     try {
-      _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
       });
-      _rollbar.rollbar.error(err);
       throw err;
     }
 
@@ -123,7 +121,9 @@ const rootCmd = async function () {
       console.log('You are now logged in - see `vip -h` for a list of available commands.');
       process.exit();
     }
-    runCmd();
+    await runCmd();
   }
 };
-rootCmd();
+
+// We may end up having an unhandled rejection here :-(
+void rootCmd();