@automattic/vip 2.17.0 → 2.19.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 ## Changelog
 
+### 2.19.0 (23 Sep 2022)
+- #1108 [dev-env] Validate import file and add debug lines
+- #1107 [dev-env] Validate dns lookup
+- #1104 [dev-env] fetch php and wordpress versions for creation wizard
+- #1049 Fix security issues
+
+### 2.18.0 (15 Sep 2022)
+- #1103	Force the preference for WebSocket in case we see an error during connection
+- #1102	Remove http proxy support
+- #1096	[dev-env] Supports extended information table
+- #1100	Add GitHub action to mark inactive issues and PRs as stale
+- #1099	Add @app.env to commands help
+- #1092	Improve login + logout
+- #1097	Don't pipe output through less
+
 ### 2.17.0 (06 Sep 2022)
 - #1093 [dev-env] use latest proxy image
 - #1091 Extract http helper into standalone function

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

@@ -34,7 +34,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * Internal dependencies
  */
-const baseUsage = 'vip config envvar delete'; // Command examples
+const baseUsage = 'vip @mysite.develop config envvar delete'; // Command examples
 
 const examples = [{
   usage: `${baseUsage} MY_VARIABLE`,

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

@@ -34,7 +34,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * Internal dependencies
  */
-const usage = 'vip config envvar get-all'; // Command examples
+const usage = 'vip @mysite.develop config envvar get-all'; // Command examples
 
 const examples = [{
   usage,

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

@@ -32,7 +32,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * Internal dependencies
  */
-const baseUsage = 'vip config envvar get'; // Command examples
+const baseUsage = 'vip @mysite.develop config envvar get'; // Command examples
 
 const examples = [{
   usage: `${baseUsage} MY_VARIABLE`,

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

@@ -34,7 +34,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * Internal dependencies
  */
-const usage = 'vip config envvar list'; // Command examples
+const usage = 'vip @mysite.develop config envvar list'; // Command examples
 
 const examples = [{
   usage,

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

@@ -36,7 +36,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * Internal dependencies
  */
-const baseUsage = 'vip config envvar set';
+const baseUsage = 'vip @mysite.develop config envvar set';
 const NEW_RELIC_ENVVAR_KEY = 'NEW_RELIC_LICENSE_KEY'; // Command examples
 
 const examples = [{

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

@@ -28,10 +28,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 // Command examples
 const examples = [{
-  usage: 'vip config software get wordpress --format json',
+  usage: 'vip @mysite.develop config software get wordpress --format json',
   description: 'Read current software settings for WordPress in JSON format'
 }, {
-  usage: 'vip config software get',
+  usage: 'vip @mysite.develop config software get',
   description: 'Read current software settings for all components'
 }];
 (0, _command.default)({
@@ -41,7 +41,7 @@ const examples = [{
   envContext: true,
   wildcardCommand: true,
   format: true,
-  usage: 'vip config software get <wordpress|php|nodejs|muplugins>'
+  usage: 'vip @mysite.develop config software get <wordpress|php|nodejs|muplugins>'
 }).examples(examples).argv(process.argv, async (arg, opt) => {
   var _opt$env;
 

package/dist/bin/vip-config-software-update.js

@@ -43,12 +43,12 @@ const cmd = (0, _command.default)({
   appQueryFragments: _software.appQueryFragments,
   envContext: true,
   wildcardCommand: true,
-  usage: 'vip config software update <wordpress|php|nodejs|muplugins> <version>'
+  usage: 'vip @mysite.develop config software update <wordpress|php|nodejs|muplugins> <version>'
 }).examples([{
-  usage: 'vip config software update wordpress 6.0',
+  usage: 'vip @mysite.develop config software update wordpress 6.0',
   description: 'Update WordPress to 6.0.x'
 }, {
-  usage: 'vip config software update nodejs 16',
+  usage: 'vip @mysite.develop config software update nodejs 16',
   description: 'Update Node.js to v16'
 }]);
 cmd.option('force', 'Auto-confirm update');

package/dist/bin/vip-config-software.js

@@ -20,8 +20,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 (0, _command.default)({
   requiredArgs: 1,
-  usage: 'vip config software <action>'
-}).command('get', 'Read current software settings').command('update', 'Update software settings').examples([{
-  usage: 'vip config software update <wordpress|php|nodejs|muplugins> <version>',
-  description: 'Update <component> to <version>'
-}]).argv(process.argv);
+  usage: 'vip @mysite.develop config software <action>'
+}).command('get', 'Read current software settings').command('update', 'Update software settings').argv(process.argv);

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

@@ -56,7 +56,6 @@ const cmd = (0, _command.default)().option('slug', 'Custom name of the dev envir
 (0, _devEnvironmentCli.addDevEnvConfigurationOptions)(cmd);
 cmd.examples(examples);
 cmd.argv(process.argv, async (arg, opt) => {
-  await (0, _devEnvironmentCli.validateDependencies)();
   const environmentNameOptions = {
     slug: opt.slug,
     app: opt.app,
@@ -64,6 +63,7 @@ cmd.argv(process.argv, async (arg, opt) => {
     allowAppEnv: true
   };
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(environmentNameOptions);
+  await (0, _devEnvironmentCli.validateDependencies)(slug);
   debug('Args: ', arg, 'Options: ', opt);
   const trackingInfo = {
     slug
@@ -97,7 +97,9 @@ cmd.argv(process.argv, async (arg, opt) => {
 
   try {
     await (0, _devEnvironmentCore.createEnvironment)(instanceData);
-    await (0, _devEnvironmentCore.printEnvironmentInfo)(slug);
+    await (0, _devEnvironmentCore.printEnvironmentInfo)(slug, {
+      extended: false
+    });
     const message = '\n' + _chalk.default.green('✓') + ` environment created.\n\nTo start it please run:\n\n${startCommand}\n`;
     console.log(message);
     await (0, _tracker.trackEvent)('dev_env_create_command_success', trackingInfo);

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

@@ -38,8 +38,8 @@ const examples = [{
   description: 'Destroys a local dev environment named foo'
 }];
 (0, _command.default)().option('slug', 'Custom name of the dev environment').option('soft', 'Keep config files needed to start an environment intact').examples(examples).argv(process.argv, async (arg, opt) => {
-  await (0, _devEnvironmentCli.validateDependencies)();
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  await (0, _devEnvironmentCli.validateDependencies)(slug);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_destroy_command_execute', trackingInfo);
   debug('Args: ', arg, 'Options: ', opt);

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

@@ -43,8 +43,8 @@ const examples = [{
 
   return 'false' !== (value === null || value === void 0 ? void 0 : (_value$toLowerCase = value.toLowerCase) === null || _value$toLowerCase === void 0 ? void 0 : _value$toLowerCase.call(value));
 }).examples(examples).argv(process.argv, async (unmatchedArgs, opt) => {
-  await (0, _devEnvironmentCli.validateDependencies)();
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  await (0, _devEnvironmentCli.validateDependencies)(slug);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_exec_command_execute', trackingInfo);
 

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

@@ -36,9 +36,9 @@ const examples = [{
 (0, _command.default)({
   requiredArgs: 1
 }).examples(examples).option('slug', 'Custom name of the dev environment').argv(process.argv, async (unmatchedArgs, opt) => {
-  await (0, _devEnvironmentCli.validateDependencies)();
   const [filePath] = unmatchedArgs;
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  await (0, _devEnvironmentCli.validateDependencies)(slug);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_import_media_command_execute', trackingInfo);
 

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

@@ -45,13 +45,13 @@ const examples = [{
 (0, _command.default)({
   requiredArgs: 1
 }).option('slug', 'Custom name of the dev environment').option(['r', 'search-replace'], 'Perform Search and Replace on the specified SQL file').option('in-place', 'Search and Replace explicitly on the given input file').option('skip-validate', 'Do not perform file validation.').examples(examples).argv(process.argv, async (unmatchedArgs, opt) => {
-  await (0, _devEnvironmentCli.validateDependencies)();
   const [fileName] = unmatchedArgs;
   const {
     searchReplace,
     inPlace
   } = opt;
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  await (0, _devEnvironmentCli.validateDependencies)(slug);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_import_sql_command_execute', trackingInfo);
 

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

@@ -35,9 +35,9 @@ const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} info --slug=my_site`,
   description: 'Return information about a local dev environment named "my_site"'
 }];
-(0, _command.default)().option('slug', 'Custom name of the dev environment').option('all', 'Show Info for all local dev environments').examples(examples).argv(process.argv, async (arg, opt) => {
-  await (0, _devEnvironmentCli.validateDependencies)();
+(0, _command.default)().option('slug', 'Custom name of the dev environment').option('all', 'Show Info for all local dev environments').option('extended', 'Show extended information about the dev environment').examples(examples).argv(process.argv, async (arg, opt) => {
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  await (0, _devEnvironmentCli.validateDependencies)(slug);
   const trackingInfo = opt.all ? {
     all: true
   } : (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
@@ -45,10 +45,14 @@ const examples = [{
   debug('Args: ', arg, 'Options: ', opt);
 
   try {
+    const options = {
+      extended: !!opt.extended
+    };
+
     if (opt.all) {
-      await (0, _devEnvironmentCore.printAllEnvironmentsInfo)();
+      await (0, _devEnvironmentCore.printAllEnvironmentsInfo)(options);
     } else {
-      await (0, _devEnvironmentCore.printEnvironmentInfo)(slug);
+      await (0, _devEnvironmentCore.printEnvironmentInfo)(slug, options);
     }
 
     await (0, _tracker.trackEvent)('dev_env_info_command_success', trackingInfo);

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

@@ -38,7 +38,7 @@ const examples = [{
   await (0, _tracker.trackEvent)('dev_env_list_command_execute', trackingInfo);
 
   try {
-    await (0, _devEnvironmentCore.printAllEnvironmentsInfo)();
+    await (0, _devEnvironmentCore.printAllEnvironmentsInfo)({});
     await (0, _tracker.trackEvent)('dev_env_list_command_success', trackingInfo);
   } catch (error) {
     (0, _devEnvironmentCli.handleCLIException)(error, 'dev_env_list_command_error', trackingInfo);

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

@@ -39,9 +39,9 @@ const examples = [{
   description: 'Starts a local dev environment'
 }];
 (0, _command.default)().option('slug', 'Custom name of the dev environment').option('skip-rebuild', 'Only start stopped services').option(['w', 'skip-wp-versions-check'], 'Skip propting for wordpress update if non latest').examples(examples).argv(process.argv, async (arg, opt) => {
-  await (0, _devEnvironmentCli.validateDependencies)();
-  const startProcessing = new Date();
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  await (0, _devEnvironmentCli.validateDependencies)(slug);
+  const startProcessing = new Date();
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_start_command_execute', trackingInfo);
   debug('Args: ', arg, 'Options: ', opt);

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

@@ -35,8 +35,8 @@ const examples = [{
   description: 'Stops a local dev environment'
 }];
 (0, _command.default)().option('slug', 'Custom name of the dev environment').examples(examples).argv(process.argv, async (arg, opt) => {
-  await (0, _devEnvironmentCli.validateDependencies)();
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  await (0, _devEnvironmentCli.validateDependencies)(slug);
   debug('Args: ', arg, 'Options: ', opt);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_stop_command_execute', trackingInfo);

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

@@ -38,8 +38,8 @@ const cmd = (0, _command.default)().option('slug', 'Custom name of the dev envir
 (0, _devEnvironmentCli.addDevEnvConfigurationOptions)(cmd);
 cmd.examples(examples);
 cmd.argv(process.argv, async (arg, opt) => {
-  await (0, _devEnvironmentCli.validateDependencies)();
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  await (0, _devEnvironmentCli.validateDependencies)(slug);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_update_command_execute', trackingInfo);
 

package/dist/bin/vip-wp.js

@@ -229,6 +229,7 @@ const bindReconnectEvents = ({
   currentJob.socket.io.removeAllListeners('reconnect');
   currentJob.socket.io.removeAllListeners('reconnect_attempt');
   currentJob.socket.removeAllListeners('retry');
+  currentJob.socket.removeAllListeners('connect_error');
   currentJob.socket.io.on('reconnect', async () => {
     debug('socket.io: reconnect');
 
@@ -286,6 +287,20 @@ const bindReconnectEvents = ({
       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
+
+
+    currentJob.socket.io.opts.transports = ['websocket', 'polling'];
+  });
   currentJob.socket.on('exit', async ({
     exitCode,
     message
@@ -479,12 +494,16 @@ const bindReconnectEvents = ({
     }
 
     const token = await _token.default.get();
+    const extraHeaders = {
+      Authorization: `Bearer ${token.raw}`
+    };
     const socket = (0, _socket.default)(`${_api.API_HOST}/wp-cli`, {
       transportOptions: {
         polling: {
-          extraHeaders: {
-            Authorization: `Bearer ${token.raw}`
-          }
+          extraHeaders
+        },
+        websocket: {
+          extraHeaders
         }
       },
       agent: (0, _proxyAgent.createProxyAgent)(_api.API_HOST)

package/dist/bin/vip.js

@@ -23,6 +23,8 @@ 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; }
@@ -45,8 +47,7 @@ const tokenURL = 'https://dashboard.wpvip.com/me/cli/token';
 const runCmd = async function () {
   const cmd = (0, _command.default)();
   cmd.command('logout', 'Logout from your current session', async () => {
-    await _token.default.purge();
-    await (0, _tracker.trackEvent)('logout_command_execute');
+    await (0, _logout.default)();
     console.log('You are successfully logged out.');
   }).command('app', 'List and modify your VIP applications').command('cache', 'Manage page cache for your VIP applications').command('config', 'Set configuration for your VIP applications').command('dev-env', 'Use local dev-environment').command('import', 'Import media or SQL files into your VIP applications').command('logs', 'Get logs from your VIP applications').command('search-replace', 'Perform search and replace tasks on files').command('sync', 'Sync production to a development environment').command('whoami', 'Display details about the currently logged-in user').command('wp', 'Run WP CLI commands against an environment');
   cmd.argv(process.argv);
@@ -56,10 +57,11 @@ const rootCmd = async function () {
   let token = await _token.default.get();
   const isHelpCommand = process.argv.some(arg => arg === 'help' || arg === '-h' || arg === '--help');
   const isLogoutCommand = process.argv.some(arg => arg === 'logout');
+  const isLoginCommand = process.argv.some(arg => arg === 'login');
   const isDevEnvCommandWithoutEnv = process.argv.some(arg => arg === 'dev-env') && !(0, _command.containsAppEnvArgument)(process.argv);
   debug('Argv:', process.argv);
 
-  if (isLogoutCommand || isHelpCommand || isDevEnvCommandWithoutEnv || token && token.valid()) {
+  if (!isLoginCommand && (isLogoutCommand || isHelpCommand || isDevEnvCommandWithoutEnv || token && token.valid())) {
     runCmd();
   } else {
     console.log();
@@ -142,6 +144,12 @@ const rootCmd = async function () {
 
     await (0, _tracker.aliasUser)(token.id);
     await (0, _tracker.trackEvent)('login_command_token_submit_success');
+
+    if (isLoginCommand) {
+      console.log('You are now logged in - see `vip -h` for a list of available commands.');
+      process.exit();
+    }
+
     runCmd();
   }
 };

package/dist/lib/cli/command.js

@@ -29,8 +29,6 @@ var _package = _interopRequireDefault(require("../../../package.json"));
 
 var _tracker = require("../tracker");
 
-var _pager = _interopRequireDefault(require("./pager"));
-
 var _envAlias = require("./envAlias");
 
 var _rollbar = require("../rollbar");
@@ -526,9 +524,7 @@ _args.default.argv = async function (argv, cb) {
         format: options.format
       });
       const formattedOut = (0, _format.formatData)(res, options.format);
-      const page = (0, _pager.default)();
-      page.write(formattedOut + '\n');
-      page.end();
+      console.log(formattedOut);
       return {};
     }
   }

package/dist/lib/client-file-uploader.js

@@ -39,7 +39,7 @@ var _xml2js = require("xml2js");
 
 var _debug = _interopRequireDefault(require("debug"));
 
-var _api = _interopRequireDefault(require("./api"));
+var _http = _interopRequireDefault(require("./api/http"));
 
 var _fileSize = require("./constants/file-size");
 
@@ -308,10 +308,7 @@ async function getSignedUploadRequestData({
   uploadId = undefined,
   partNumber = undefined
 }) {
-  const {
-    apiFetch
-  } = await (0, _api.default)();
-  const response = await apiFetch('/upload/site-import-presigned-url', {
+  const response = await (0, _http.default)('/upload/site-import-presigned-url', {
     method: 'POST',
     body: {
       action,

package/dist/lib/dev-environment/dev-environment-cli.js

@@ -71,7 +71,10 @@ const DEFAULT_SLUG = 'vip-local';
 async function handleCLIException(exception, trackKey, trackBaseInfo = {}) {
   const errorPrefix = _chalk.default.red('Error:');
 
-  if (_devEnvironment.DEV_ENVIRONMENT_NOT_FOUND === exception.message) {
+  if (exception instanceof _userError.default) {
+    // User errors are handled in global error handler
+    throw exception;
+  } else if (_devEnvironment.DEV_ENVIRONMENT_NOT_FOUND === exception.message) {
     const createCommand = _chalk.default.bold(_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND + ' create');
 
     const message = `Environment doesn't exist.\n\n\nTo create a new environment run:\n\n${createCommand}\n`;
@@ -104,12 +107,38 @@ async function handleCLIException(exception, trackKey, trackBaseInfo = {}) {
   }
 }
 
-const validateDependencies = async () => {
+const verifyDNSResolution = slug => {
+  const dns = require('dns');
+
+  const expectedIP = '127.0.0.1';
+  const testDomain = `${slug}.vipdev.lndo.site`;
+  const advice = `Please add following line to hosts file on your system:\n${expectedIP} ${testDomain}`;
+  debug(`Verifying DNS resolution for ${testDomain}`);
+  return new Promise((resolve, reject) => {
+    dns.lookup(testDomain, (error, address) => {
+      debug(`Got DNS response ${address}`);
+
+      if (error) {
+        reject(new _userError.default(`DNS resolution for ${testDomain} failed. ${advice}`));
+      }
+
+      if (address !== expectedIP) {
+        reject(new _userError.default(`DNS resolution for ${testDomain} returned unexpected IP ${address}. Expected value is ${expectedIP}. ${advice}`));
+      }
+
+      resolve();
+    });
+  });
+};
+
+const validateDependencies = async slug => {
   try {
     await (0, _devEnvironmentLando.validateDockerInstalled)();
   } catch (exception) {
-    exit.withError(exception.message);
+    throw new _userError.default(exception.message);
   }
+
+  await verifyDNSResolution(slug);
 };
 
 exports.validateDependencies = validateDependencies;
@@ -170,12 +199,14 @@ function processComponentOptionInput(passedParam, allowLocal) {
 }
 
 function getOptionsFromAppInfo(appInfo) {
-  var _appInfo$environment, _appInfo$environment2, _appInfo$environment3;
+  var _appInfo$environment, _appInfo$environment2, _appInfo$environment3, _appInfo$environment4, _appInfo$environment5;
 
   return {
     title: ((_appInfo$environment = appInfo.environment) === null || _appInfo$environment === void 0 ? void 0 : _appInfo$environment.name) || appInfo.name || '',
     multisite: !!(appInfo !== null && appInfo !== void 0 && (_appInfo$environment2 = appInfo.environment) !== null && _appInfo$environment2 !== void 0 && _appInfo$environment2.isMultisite),
-    mediaRedirectDomain: (_appInfo$environment3 = appInfo.environment) === null || _appInfo$environment3 === void 0 ? void 0 : _appInfo$environment3.primaryDomain
+    mediaRedirectDomain: (_appInfo$environment3 = appInfo.environment) === null || _appInfo$environment3 === void 0 ? void 0 : _appInfo$environment3.primaryDomain,
+    php: ((_appInfo$environment4 = appInfo.environment) === null || _appInfo$environment4 === void 0 ? void 0 : _appInfo$environment4.php) || '',
+    wordpress: ((_appInfo$environment5 = appInfo.environment) === null || _appInfo$environment5 === void 0 ? void 0 : _appInfo$environment5.wordpress) || ''
   };
 }
 /**

package/dist/lib/dev-environment/dev-environment-core.js

@@ -50,6 +50,10 @@ var _app = _interopRequireDefault(require("../api/app"));
 
 var _devEnvironment = require("../constants/dev-environment");
 
+var _software = require("../config/software");
+
+var _userError = _interopRequireDefault(require("../user-error"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**
@@ -100,7 +104,9 @@ async function startEnvironment(slug, options) {
     await (0, _devEnvironmentLando.landoRebuild)(instancePath);
   }
 
-  await printEnvironmentInfo(slug);
+  await printEnvironmentInfo(slug, {
+    extended: false
+  });
 }
 
 async function stopEnvironment(slug) {
@@ -191,18 +197,26 @@ async function destroyEnvironment(slug, removeFiles) {
   }
 }
 
-async function printAllEnvironmentsInfo() {
+async function printAllEnvironmentsInfo(options) {
   const allEnvNames = getAllEnvironmentNames();
   debug('Will print info for all environments. Names found: ', allEnvNames);
   console.log('Found ' + _chalk.default.bold(allEnvNames.length) + ' environments' + (allEnvNames.length ? ':' : '.'));
 
   for (const envName of allEnvNames) {
     console.log('\n');
-    await printEnvironmentInfo(envName);
+    await printEnvironmentInfo(envName, options);
   }
 }
 
-async function printEnvironmentInfo(slug) {
+function parseComponentForInfo(component) {
+  if (component.mode === 'local') {
+    return component.dir || '';
+  }
+
+  return component.tag || '[demo-image]';
+}
+
+async function printEnvironmentInfo(slug, options) {
   debug('Will get info for an environment', slug);
   const instancePath = getEnvironmentPath(slug);
   debug('Instance path for', slug, 'is:', instancePath);
@@ -214,6 +228,21 @@ async function printEnvironmentInfo(slug) {
   }
 
   const appInfo = await (0, _devEnvironmentLando.landoInfo)(instancePath);
+
+  if (options.extended) {
+    const environmentData = readEnvironmentData(slug);
+    appInfo.title = environmentData.wpTitle;
+    appInfo.multisite = !!environmentData.multisite;
+    appInfo.php = environmentData.php.split(':')[1];
+    appInfo.wordpress = parseComponentForInfo(environmentData.wordpress);
+    appInfo['Mu plugins'] = parseComponentForInfo(environmentData.muPlugins);
+    appInfo['App Code'] = parseComponentForInfo(environmentData.appCode);
+
+    if (environmentData.mediaRedirectDomain) {
+      appInfo['Media Redirect'] = environmentData.mediaRedirectDomain;
+    }
+  }
+
   (0, _devEnvironmentCli.printTable)(appInfo);
 }
 
@@ -355,9 +384,17 @@ async function getApplicationInformation(appId, envType) {
 			isMultisite,
 			primaryDomain {
 				name
+			},
+			softwareSettings {
+				php {
+				  ...Software
+				}
+				wordpress {
+				  ...Software
+				}
 			}
 		}`;
-  const queryResult = await (0, _app.default)(appId, fieldsQuery);
+  const queryResult = await (0, _app.default)(appId, fieldsQuery, _software.appQueryFragments);
   const appData = {};
 
   if (queryResult) {
@@ -387,14 +424,16 @@ async function getApplicationInformation(appId, envType) {
     }
 
     if (envData) {
-      var _envData$primaryDomai;
+      var _envData$primaryDomai, _envData$softwareSett, _envData$softwareSett2, _envData$softwareSett3, _envData$softwareSett4, _envData$softwareSett5, _envData$softwareSett6;
 
       appData.environment = {
         name: envData.name,
         branch: envData.branch,
         type: envData.type,
         isMultisite: envData.isMultisite,
-        primaryDomain: ((_envData$primaryDomai = envData.primaryDomain) === null || _envData$primaryDomai === void 0 ? void 0 : _envData$primaryDomai.name) || ''
+        primaryDomain: ((_envData$primaryDomai = envData.primaryDomain) === null || _envData$primaryDomai === void 0 ? void 0 : _envData$primaryDomai.name) || '',
+        php: ((_envData$softwareSett = envData.softwareSettings) === null || _envData$softwareSett === void 0 ? void 0 : (_envData$softwareSett2 = _envData$softwareSett.php) === null || _envData$softwareSett2 === void 0 ? void 0 : (_envData$softwareSett3 = _envData$softwareSett2.current) === null || _envData$softwareSett3 === void 0 ? void 0 : _envData$softwareSett3.version) || '',
+        wordpress: ((_envData$softwareSett4 = envData.softwareSettings) === null || _envData$softwareSett4 === void 0 ? void 0 : (_envData$softwareSett5 = _envData$softwareSett4.wordpress) === null || _envData$softwareSett5 === void 0 ? void 0 : (_envData$softwareSett6 = _envData$softwareSett5.current) === null || _envData$softwareSett6 === void 0 ? void 0 : _envData$softwareSett6.version) || ''
       };
     }
   }
@@ -403,10 +442,16 @@ async function getApplicationInformation(appId, envType) {
 }
 
 async function resolveImportPath(slug, fileName, searchReplace, inPlace) {
+  debug(`Will try to resolve path - ${fileName}`);
   let resolvedPath = (0, _devEnvironmentCli.resolvePath)(fileName);
+  debug(`Filename ${fileName} resolved to ${resolvedPath}`);
 
   if (!_fs.default.existsSync(resolvedPath)) {
-    throw new Error('The provided file does not exist or it is not valid (see "--help" for examples)');
+    throw new _userError.default(`The provided file ${resolvedPath} does not exist or it is not valid (see "--help" for examples)`);
+  }
+
+  if (_fs.default.lstatSync(resolvedPath).isDirectory()) {
+    throw new _userError.default(`The provided file ${resolvedPath} is a directory. Please point to a sql file.`);
   } // Run Search and Replace if the --search-replace flag was provided