@automattic/vip 2.28.0-dev7 → 2.28.0

package/CHANGELOG.md

@@ -1,5 +1,53 @@
 ## Changelog
 
+### 2.28.0
+
+- #1343 fix(dev-env): Force image pulling after recovering Landofile
+- #1342 fix(dev-env): Do not fail when lando_bridge_network does not exist
+- #1329 feat(dev-env)!: Replace MailHog with Mailpit
+- #1340 feat(dev-env): Kill lando proxy when last env stops
+- #1324 feat(dev-env): Better detection of a Docker socket
+- #1332 Update inline search-replace help for import sql command
+- #1338 chore(dev-deps): Update @automattic/eslint-plugin-wpvip from 0.4.0 to 0.5.2
+- #1337 chore(dev-deps): Update flow-bin from 0.203.1 to 0.204.0
+- #1336 chore(dev-deps): Update eslint from 8.37.0 to 8.38.0
+- #1325 tests: Fix timing out tests on Windows
+- #1333 [dev-env] Readds xdebug_config to vip dev-env update
+- #1328 feat(dev-env): Profile Lando-related functions
+- #1326 tests(e2e): Force Jest to exit after all tests have completed running
+- #1327 ci: Set `DO_NOT_TRACK=1` for E2E tests
+- #1323 Revert "feat(dev-env): Better detection of a Docker socket"
+- #1316 feat(dev-env): Better detection of a Docker socket
+- #1321 chore(dev-deps): Update Babel-related packages
+- #1320 chore(dev-deps): Update flow-bin from 0.202.1 to 0.203.1
+- #1319 chore(dev-deps): Update eslint from 8.36.0 to 8.37.0
+- #1318 chore(deps): Update lando to d75a4e8
+- #1315 Fix preselected options on update
+- #1314 chore(deps): Update socket.io-client to 4.6.1
+- #1311 chore(dev-deps): Update eslint to 8.36.0
+- #1310 chore(deps): Update ejs to 3.1.9
+- #1312 chore(dev-deps): Update prettier to 2.8.7
+- #1309 chore(dev-deps): Update flow-bin to 0.202.1
+- #1308 chore(dev-deps): Update dockerode to 3.3.5
+- #1307 chore(dev-deps): Update nock to 13.3.0
+- #1306 chore(dev-deps): Forcefully update lodash for publish-please to 4.17.21
+- #1305 chore(deps): Update Lando
+- #1303 chore(deps): Replace socket.io-stream with @wearemothership/socket.io-stream
+- #1301 chore(deps): Update lando-cli
+- #1302 fix(ci): Do not prompt for WP update
+- #1297 chore(dev-deps): Update Jest-related packages to 29.5.0
+- #1299 chore(dev-deps): Update eslint-related stuff
+- #1298 chore(dev-deps): Update flow-bin from 0.196.3 to 0.201.0
+- #1293 chore(dev-deps): Update Babel-related packages
+- #1300 chore(deps): Update Lando
+- #1294 chore(dev-deps): Update Jest-related packages to 29.4.3
+- #1296 Add trackers to capture execute, success and error events
+- #1292 Fix requiredArgs for other vip commands
+- #1290 Fail with a msg if an export job with a different backup is running
+- #1254 refactor(dev-env): Remove healthcheck hook
+- #1291 Dev-env: Fix silent failing when passing invalid subcommand
+- #1282 Prefix urls with // to fix the search-replace problem
+
 ### 2.27.0
 
 - #1287 fix(dev-env): Pull fresh images for new environments

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

@@ -9,6 +9,8 @@ proxy:
 <% } %>
   phpmyadmin:
     - <%= siteSlug %>-pma.vipdev.lndo.site
+  mailpit:
+    - <%= siteSlug %>-mailpit.vipdev.lndo.site:8025
 
 services:
   devtools:
@@ -197,9 +199,19 @@ services:
       clientcode_vipconfig: {}
 <% } %>
 
-<% if ( mailhog ) { %>
-  mailhog:
-    type: mailhog
+<% if ( mailpit ) { %>
+  mailpit:
+    type: compose
+    services:
+      image: axllent/mailpit:latest
+      command: /mailpit
+      ports:
+        - ":1025"
+        - ":8025"
+      environment:
+        LANDO_NO_USER_PERMS: 1
+        LANDO_NO_SCRIPTS: 1
+        LANDO_NEEDS_EXEC: 1
 <% } %>
 
 tooling:

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

@@ -62,6 +62,7 @@ cmd.argv(process.argv, async (arg, opt) => {
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
   await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
   debug('Args: ', arg, 'Options: ', opt);
+  (0, _devEnvironmentCli.handleDeprecatedOptions)(opt);
   const trackingInfo = {
     slug,
     app: opt.app,

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

@@ -28,7 +28,8 @@ const userMap = {
   'demo-app-code': 'www-data',
   elasticsearch: 'elasticsearch',
   phpmyadmin: 'www-data',
-  mailhog: 'mailhog'
+  mailhog: 'mailhog',
+  mailpit: 'root'
 };
 const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} shell`,

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

@@ -33,33 +33,27 @@ const cmd = (0, _command.default)().option('slug', 'Custom name of the dev envir
 cmd.examples(examples);
 cmd.argv(process.argv, async (arg, opt) => {
   const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  (0, _devEnvironmentCli.handleDeprecatedOptions)(opt);
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
   await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_update_command_execute', trackingInfo);
   try {
+    var _currentInstanceData$;
     const environmentAlreadyExists = await (0, _devEnvironmentCore.doesEnvironmentExist)((0, _devEnvironmentCore.getEnvironmentPath)(slug));
     if (!environmentAlreadyExists) {
       throw new Error(_devEnvironment.DEV_ENVIRONMENT_NOT_FOUND);
     }
     const currentInstanceData = (0, _devEnvironmentCore.readEnvironmentData)(slug);
     debug('Read instance data', currentInstanceData);
-    const configurationFileOptions = await (0, _devEnvironmentConfigurationFile.getConfigurationFileOptions)();
-    let preselectedOptions = Object.assign({}, opt);
-    if (Object.keys(configurationFileOptions).length > 0) {
-      preselectedOptions = (0, _devEnvironmentConfigurationFile.mergeConfigurationFileOptions)(opt, configurationFileOptions);
-    }
-
-    // Title and multisite can't be changed during update
-    const selectedOptions = {
+    const preselectedOptions = {
       title: currentInstanceData.wpTitle,
-      multisite: currentInstanceData.multisite
+      multisite: currentInstanceData.multisite,
+      ...opt
     };
-    Object.keys(preselectedOptions).forEach(key => {
-      if (!(key in selectedOptions)) {
-        selectedOptions[key] = preselectedOptions[key];
-      }
-    });
+    const configurationFileOptions = await (0, _devEnvironmentConfigurationFile.getConfigurationFileOptions)();
+    const thereAreOptionsFromConfigFile = Object.keys(configurationFileOptions).length > 0;
+    const finalPreselectedOptions = (0, _devEnvironmentConfigurationFile.mergeConfigurationFileOptions)(preselectedOptions, configurationFileOptions);
     const defaultOptions = {
       appCode: currentInstanceData.appCode.dir || currentInstanceData.appCode.tag || 'latest',
       muPlugins: currentInstanceData.muPlugins.dir || currentInstanceData.muPlugins.tag || 'latest',
@@ -69,7 +63,7 @@ cmd.argv(process.argv, async (arg, opt) => {
       mariadb: currentInstanceData.mariadb,
       phpmyadmin: currentInstanceData.phpmyadmin,
       xdebug: currentInstanceData.xdebug,
-      mailhog: currentInstanceData.mailhog,
+      mailpit: (_currentInstanceData$ = currentInstanceData.mailpit) !== null && _currentInstanceData$ !== void 0 ? _currentInstanceData$ : currentInstanceData.mailhog,
       mediaRedirectDomain: currentInstanceData.mediaRedirectDomain,
       multisite: false,
       title: ''
@@ -77,8 +71,8 @@ cmd.argv(process.argv, async (arg, opt) => {
     const providedOptions = Object.keys(opt).filter(option => option.length > 1) // Filter out single letter aliases
     .filter(option => !['debug', 'help', 'slug'].includes(option)); // Filter out options that are not related to instance configuration
 
-    const suppressPrompts = providedOptions.length > 0 || Object.keys(configurationFileOptions).length > 0;
-    const instanceData = await (0, _devEnvironmentCli.promptForArguments)(preselectedOptions, defaultOptions, suppressPrompts);
+    const suppressPrompts = providedOptions.length > 0 || thereAreOptionsFromConfigFile;
+    const instanceData = await (0, _devEnvironmentCli.promptForArguments)(finalPreselectedOptions, defaultOptions, suppressPrompts);
     instanceData.siteSlug = slug;
     await (0, _devEnvironmentCore.updateEnvironment)(instanceData);
     const message = '\n' + _chalk.default.green('✓') + ' environment updated. Restart environment for changes to take an affect.';

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').command('sync', 'Pull data from production to local development 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').argv(process.argv);

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

@@ -168,22 +168,27 @@ async function gates(app, env, fileName) {
 const examples = [
 // `sql` subcommand
 {
-  usage: 'vip import sql @mysite.develop <file.sql>',
+  usage: 'vip import sql @mysite.develop file.sql',
   description: 'Import the given SQL file to your site'
 },
 // `search-replace` flag
 {
-  usage: 'vip import sql @mysite.develop <file.sql> --search-replace="from,to"',
+  usage: 'vip import sql @mysite.develop file.sql --search-replace="https://from.example.com,https://to.example.com"',
   description: 'Perform a Search and Replace, then import the replaced file to your site.\n' + '       * Ensure there are no spaces between your search-replace parameters'
 },
+// `search-replace` flag
+{
+  usage: 'vip import sql @mysite.develop file.sql --search-replace="https://from.example.com,https://to.example.com" --search-replace="example.com/from,example.com/to"',
+  description: 'Perform multiple search and replace tasks, then import the updated file to your site.'
+},
 // `in-place` flag
 {
-  usage: 'vip import sql @mysite.develop <file.sql> --search-replace="from,to" --in-place',
-  description: 'Search and Replace on the input <file.sql>, then import the replaced file to your site'
+  usage: 'vip import sql @mysite.develop file.sql --search-replace="https://from.example.com,https://to.example.com" --in-place',
+  description: 'Search and Replace on the input `file.sql`, then import the updated file to your site'
 },
 // `output` flag
 {
-  usage: 'vip import sql @mysite.develop <file.sql> --search-replace="from,to" --output="<output.sql>"',
+  usage: 'vip import sql @mysite.develop file.sql --search-replace="https://from.example.com,https://to.example.com" --output="output.sql"',
   description: 'Output the performed Search and Replace to the specified output file, then import the replaced file to your site\n' + '       * Has no effect when the `in-place` flag is used'
 },
 // `sql status` subcommand
@@ -319,7 +324,7 @@ const displayPlaybook = ({
   envContext: true,
   requiredArgs: 1,
   module: 'import-sql'
-}).command('status', 'Check the status of the current running import').option('skip-validate', 'Do not perform pre-upload file validation. If unsupported entries are present, the import is likely to fail').option('search-replace', 'Perform Search and Replace on the specified SQL file').option('in-place', 'Search and Replace explicitly on the given input file').option('output', 'Specify the replacement output file for Search and Replace', 'process.stdout').examples(examples).argv(process.argv, async (arg, opts) => {
+}).command('status', 'Check the status of the current running import').option('skip-validate', 'Do not perform pre-upload file validation. If unsupported entries are present, the import is likely to fail').option('search-replace', 'Search for a given URL in the SQL file and replace it with another. The format for the value is `<from-url>,<to-url>` (e.g. --search-replace="https://from.com,https://to.com"').option('in-place', 'Search and Replace explicitly on the given input file').option('output', 'Specify the replacement output file for Search and Replace', 'process.stdout').examples(examples).argv(process.argv, async (arg, opts) => {
   var _env$primaryDomain;
   const {
     app,

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

@@ -16,7 +16,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.DevEnvSyncSQLCommand = void 0;
 var _fs = _interopRequireDefault(require("fs"));
 var _chalk = _interopRequireDefault(require("chalk"));
-var _url = _interopRequireDefault(require("url"));
 var _vipSearchReplace = require("@automattic/vip-search-replace");
 var _clientFileUploader = require("../lib/client-file-uploader");
 var _exportSql = require("./export-sql");
@@ -40,8 +39,8 @@ function findSiteHomeUrl(sql) {
   const regex = "'(siteurl|home)',\\s?'(.*?)'";
   const results = sql.match(regex);
   if (results) {
-    const url = results[2];
-    return _url.default.parse(url).hostname;
+    const domain = results[2].replace(/https?:\/\//, '');
+    return domain;
   }
   return null;
 }
@@ -56,15 +55,15 @@ function findSiteHomeUrl(sql) {
 async function extractSiteUrls(sqlFile) {
   const readInterface = await (0, _lineByLine.getReadInterface)(sqlFile);
   return new Promise((resolve, reject) => {
-    const domains = new Set();
+    const domains = [];
     readInterface.on('line', line => {
       const domain = findSiteHomeUrl(line);
       if (domain) {
-        domains.add('//' + domain);
+        domains.push(domain);
       }
     });
     readInterface.on('close', () => {
-      resolve(Array.from(domains));
+      resolve(domains);
     });
     readInterface.on('error', reject);
   });
@@ -73,20 +72,18 @@ class DevEnvSyncSQLCommand {
   /**
    * Creates a new instance of the command
    *
-   * @param {string}   app       The app object
-   * @param {string}   env       The environment object
-   * @param {string}   slug      The site slug
-   * @param {Function} trackerFn Function to call for tracking
+   * @param {string} app  The app object
+   * @param {string} env  The environment object
+   * @param {string} slug The site slug
    */
-  constructor(app, env, slug, trackerFn = () => {}) {
+  constructor(app, env, slug) {
     this.app = app;
     this.env = env;
     this.slug = slug;
-    this.track = trackerFn;
     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`;
@@ -102,7 +99,7 @@ class DevEnvSyncSQLCommand {
    * @return {Promise<void>} Promise that resolves when the export is complete
    */
   async generateExport() {
-    const exportCommand = new _exportSql.ExportSQLCommand(this.app, this.env, this.gzFile, this.track);
+    const exportCommand = new _exportSql.ExportSQLCommand(this.app, this.env, this.gzFile);
     await exportCommand.run();
   }
 
@@ -117,13 +114,9 @@ class DevEnvSyncSQLCommand {
     const replacements = this.siteUrls.reduce((acc, url) => [...acc, url, this.landoDomain], []);
     const readStream = _fs.default.createReadStream(this.sqlFile);
     const replacedStream = await (0, _vipSearchReplace.replace)(readStream, replacements);
-    const outputFile = `${this.tmpDir}/sql-export-sr.sql`;
-    replacedStream.pipe(_fs.default.createWriteStream(outputFile));
+    replacedStream.pipe(_fs.default.createWriteStream(this.sqlFile));
     return new Promise((resolve, reject) => {
-      replacedStream.on('finish', () => {
-        _fs.default.renameSync(outputFile, this.sqlFile);
-        resolve();
-      });
+      replacedStream.on('finish', resolve);
       replacedStream.on('error', reject);
     });
   }
@@ -136,10 +129,11 @@ class DevEnvSyncSQLCommand {
    */
   async runImport() {
     const importOptions = {
+      slug: this.slug,
       inPlace: true,
       skipValidate: true
     };
-    const importCommand = new _devEnvImportSql.DevEnvImportSQLCommand(this.sqlFile, importOptions, this.slug);
+    const importCommand = new _devEnvImportSql.DevEnvImportSQLCommand(this.sqlFile, importOptions);
     await importCommand.run(true);
   }
 
@@ -160,9 +154,6 @@ class DevEnvSyncSQLCommand {
       await (0, _clientFileUploader.unzipFile)(this.gzFile, this.sqlFile);
       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
-      });
       exit.withError(`Error extracting the SQL export: ${err === null || err === void 0 ? void 0 : err.message}`);
     }
     try {
@@ -179,9 +170,6 @@ class DevEnvSyncSQLCommand {
       await this.runSearchReplace();
       console.log(`${_chalk.default.green('✓')} Search-replace operation is complete`);
     } catch (err) {
-      await this.track('search_replace_error', {
-        errorMessage: err === null || err === void 0 ? void 0 : err.message
-      });
       exit.withError(`Error replacing domains: ${err === null || err === void 0 ? void 0 : err.message}`);
     }
     try {
@@ -189,9 +177,6 @@ class DevEnvSyncSQLCommand {
       await this.runImport();
       console.log(`${_chalk.default.green('✓')} SQL file imported`);
     } catch (err) {
-      await this.track('import_error', {
-        errorMessage: err === null || err === void 0 ? void 0 : err.message
-      });
       exit.withError(`Error importing SQL file: ${err === null || err === void 0 ? void 0 : err.message}`);
     }
   }

package/dist/commands/export-sql.js

@@ -8,7 +8,7 @@ var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _fs = _interopRequireDefault(require("fs"));
 var _https = _interopRequireDefault(require("https"));
 var _path = _interopRequireDefault(require("path"));
-var _api = _interopRequireWildcard(require("../lib/api"));
+var _api = _interopRequireDefault(require("../lib/api"));
 var _format = require("../lib/cli/format");
 var _progress = require("../lib/cli/progress");
 var exit = _interopRequireWildcard(require("../lib/cli/exit"));
@@ -162,10 +162,8 @@ async function generateDownloadLink(appId, envId, backupId) {
  * @throws {Error} Throws an error if the job creation fails
  */
 async function createExportJob(appId, envId, backupId) {
-  // Disable global error handling so that we can handle errors ourselves
-  (0, _api.disableGlobalGraphQLErrorHandling)();
   const api = await (0, _api.default)();
-  await api.mutate({
+  const response = await api.mutate({
     mutation: CREATE_EXPORT_JOB_MUTATION,
     variables: {
       input: {
@@ -175,9 +173,16 @@ async function createExportJob(appId, envId, backupId) {
       }
     }
   });
-
-  // Re-enable global error handling
-  (0, _api.enableGlobalGraphQLErrorHandling)();
+  const {
+    data: {
+      startDBBackupCopy: {
+        success
+      }
+    }
+  } = response;
+  if (!success) {
+    throw new Error();
+  }
 }
 
 /**
@@ -190,15 +195,15 @@ class ExportSQLCommand {
     DOWNLOAD_LINK: 'downloadLink',
     DOWNLOAD: 'download'
   };
+
   /**
    * Creates an instance of SQLExportCommand
    *
-   * @param {any}      app        The application object
-   * @param {any}      env        The environment object
-   * @param {string}   outputFile The output file path
-   * @param {Function} trackerFn  The progress tracker function
+   * @param {any}    app        The application object
+   * @param {any}    env        The environment object
+   * @param {string} outputFile The output file path
    */
-  constructor(app, env, outputFile, trackerFn = () => {}) {
+  constructor(app, env, outputFile) {
     this.app = app;
     this.env = env;
     this.outputFile = outputFile;
@@ -215,7 +220,6 @@ class ExportSQLCommand {
       id: this.steps.DOWNLOAD,
       name: 'Downloading file'
     }]);
-    this.track = trackerFn;
   }
 
   /**
@@ -315,29 +319,21 @@ class ExportSQLCommand {
       latestBackup
     } = await fetchLatestBackupAndJobStatus(this.app.id, this.env.id);
     if (!latestBackup) {
-      await this.track('no_backup_found_error', {
-        errorMessage: 'No backup found for the site'
-      });
       exit.withError(`No backup found for site ${this.app.name}`);
     } else {
       console.log(`${(0, _format.getGlyphForStatus)('success')} Latest backup found with timestamp ${latestBackup.createdAt}`);
     }
-    if (await this.getExportJob()) {
-      console.log(`Attaching to an existing export for the backup with timestamp ${latestBackup.createdAt}`);
-    } else {
+
+    // See if there is an existing export job for the latest backup
+    if (!(await this.getExportJob())) {
       console.log(`Creating a new export for the backup with timestamp ${latestBackup.createdAt}`);
       try {
         await createExportJob(this.app.id, this.env.id, latestBackup.id);
       } catch (err) {
-        // Todo: match error code instead of message substring
-        if (err !== null && err !== void 0 && err.message.includes('Backup Copy already in progress')) {
-          await this.track('export_job_already_running_error', {
-            errorMessage: 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 per site. Please try again later.');
-        }
         exit.withError(`Error creating export job: ${err === null || err === void 0 ? void 0 : err.message}`);
       }
+    } else {
+      console.log(`Attaching to an existing export for the backup with timestamp ${latestBackup.createdAt}`);
     }
     this.progressTracker.stepRunning(this.steps.PREPARE);
     this.progressTracker.startPrinting();
@@ -357,9 +353,6 @@ class ExportSQLCommand {
     } catch (err) {
       this.progressTracker.stepFailed(this.steps.DOWNLOAD);
       this.stopProgressTracker();
-      await this.track('download_failed_error', {
-        errorMessage: err === null || err === void 0 ? void 0 : err.message
-      });
       exit.withError(`Error downloading exported file: ${err === null || err === void 0 ? void 0 : err.message}`);
     }
   }

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

@@ -11,6 +11,7 @@ exports.getEnvironmentStartCommand = getEnvironmentStartCommand;
 exports.getOptionsFromAppInfo = getOptionsFromAppInfo;
 exports.getTagChoices = getTagChoices;
 exports.handleCLIException = handleCLIException;
+exports.handleDeprecatedOptions = handleDeprecatedOptions;
 exports.printTable = printTable;
 exports.processBooleanOption = processBooleanOption;
 exports.processComponentOptionInput = processComponentOptionInput;
@@ -77,6 +78,8 @@ const componentDemoNames = {
 
 // Forward declaration to avoid no-use-before-define
 
+// eslint-disable-next-line no-redeclare
+
 async function handleCLIException(exception, trackKey, trackBaseInfo = {}) {
   const errorPrefix = _chalk.default.red('Error:');
   if (_devEnvironment.DEV_ENVIRONMENT_NOT_FOUND === exception.message) {
@@ -299,12 +302,12 @@ async function promptForArguments(preselectedOptions, defaultOptions, suppressPr
     xdebug: false,
     xdebugConfig: preselectedOptions.xdebugConfig,
     siteSlug: '',
-    mailhog: false
+    mailpit: false
   };
   const promptLabels = {
     xdebug: 'XDebug',
     phpmyadmin: 'phpMyAdmin',
-    mailhog: 'MailHog'
+    mailpit: 'Mailpit'
   };
   if (!instanceData.mediaRedirectDomain && defaultOptions.mediaRedirectDomain) {
     const mediaRedirectPromptText = `Would you like to redirect to ${defaultOptions.mediaRedirectDomain} for missing media files?`;
@@ -332,7 +335,7 @@ async function promptForArguments(preselectedOptions, defaultOptions, suppressPr
   } else {
     instanceData.elasticsearch = await promptForBoolean('Enable Elasticsearch (needed by Enterprise Search)?', !!defaultOptions.elasticsearch);
   }
-  for (const service of ['phpmyadmin', 'xdebug', 'mailhog']) {
+  for (const service of ['phpmyadmin', 'xdebug', 'mailpit']) {
     if (service in instanceData) {
       if (service in preselectedOptions) {
         instanceData[service] = preselectedOptions[service];
@@ -569,7 +572,7 @@ function processVersionOption(value) {
 }
 function addDevEnvConfigurationOptions(command) {
   // We leave the third parameter to undefined on some because the defaults are handled in preProcessInstanceData()
-  return command.option('wordpress', 'Use a specific WordPress version', undefined, processVersionOption).option(['u', 'mu-plugins'], 'Use a specific mu-plugins changeset or local directory').option('app-code', 'Use the application code from a local directory or use "demo" for VIP skeleton code').option('phpmyadmin', 'Enable PHPMyAdmin component. By default it is disabled', undefined, processBooleanOption).option('xdebug', 'Enable XDebug. By default it is disabled', undefined, processBooleanOption).option('xdebug_config', 'Extra configuration to pass to xdebug via XDEBUG_CONFIG environment variable').option('elasticsearch', 'Enable Elasticsearch (needed by Enterprise Search)', undefined, processBooleanOption).option(['r', 'media-redirect-domain'], 'Domain to redirect for missing media files. This can be used to still have images without the need to import them locally.').option('php', 'Explicitly choose PHP version to use', undefined, processVersionOption).option(['A', 'mailhog'], 'Enable MailHog. By default it is disabled', undefined, processBooleanOption);
+  return command.option('wordpress', 'Use a specific WordPress version', undefined, processVersionOption).option(['u', 'mu-plugins'], 'Use a specific mu-plugins changeset or local directory').option('app-code', 'Use the application code from a local directory or use "demo" for VIP skeleton code').option('phpmyadmin', 'Enable PHPMyAdmin component. By default it is disabled', undefined, processBooleanOption).option('xdebug', 'Enable XDebug. By default it is disabled', undefined, processBooleanOption).option('xdebug_config', 'Extra configuration to pass to xdebug via XDEBUG_CONFIG environment variable').option('elasticsearch', 'Enable Elasticsearch (needed by Enterprise Search)', undefined, processBooleanOption).option(['r', 'media-redirect-domain'], 'Domain to redirect for missing media files. This can be used to still have images without the need to import them locally.').option('php', 'Explicitly choose PHP version to use', undefined, processVersionOption).option(['G', 'mailhog'], 'Enable Mailpit. By default it is disabled (deprecated option, please use --mailpit instead)', undefined, processBooleanOption).option(['A', 'mailpit'], 'Enable Mailpit. By default it is disabled', undefined, processBooleanOption);
 }
 
 /**
@@ -634,4 +637,13 @@ function getEnvTrackingInfo(slug) {
       slug
     };
   }
+}
+function handleDeprecatedOptions(opts) {
+  if (opts.mailhog) {
+    console.warn(_chalk.default.yellow('Warning: --mailhog is deprecated and will be removed in a future release. Please use --mailpit instead.'));
+    if (opts.mailpit === undefined) {
+      opts.mailpit = opts.mailhog;
+    }
+    delete opts.mailhog;
+  }
 }

package/dist/lib/dev-environment/dev-environment-configuration-file.js

@@ -63,6 +63,7 @@ async function getConfigurationFileOptions() {
   return configuration;
 }
 async function sanitizeConfiguration(configuration) {
+  var _configuration$mailpi;
   const genericConfigurationError = `Configuration file ${_chalk.default.grey(CONFIGURATION_FILE_NAME)} is available but ` + `couldn't be loaded. Ensure there is a ${_chalk.default.cyan('configuration-version')} and ${_chalk.default.cyan('slug')} ` + `configured. For example:\n\n${_chalk.default.grey(getConfigurationFileExample())}`;
   if (Array.isArray(configuration) || typeof configuration !== 'object') {
     throw new Error(genericConfigurationError);
@@ -91,7 +92,7 @@ async function sanitizeConfiguration(configuration) {
     elasticsearch: stringToBooleanIfDefined(configuration.elasticsearch),
     phpmyadmin: stringToBooleanIfDefined(configuration.phpmyadmin),
     xdebug: stringToBooleanIfDefined(configuration.xdebug),
-    mailhog: stringToBooleanIfDefined(configuration.mailhog)
+    mailpit: stringToBooleanIfDefined((_configuration$mailpi = configuration.mailpit) !== null && _configuration$mailpi !== void 0 ? _configuration$mailpi : configuration.mailhog)
   };
 
   // Remove undefined values
@@ -99,6 +100,7 @@ async function sanitizeConfiguration(configuration) {
   return sanitizedConfiguration;
 }
 function mergeConfigurationFileOptions(preselectedOptions, configurationFileOptions) {
+  var _configurationFileOpt;
   // configurationFileOptions holds different parameters than present in
   // preselectedOptions like "slug", and friendly-named parameters (e.g.
   // 'app-code' vs 'appCode'). Selectively merge configurationFileOptions
@@ -113,7 +115,8 @@ function mergeConfigurationFileOptions(preselectedOptions, configurationFileOpti
     elasticsearch: configurationFileOptions.elasticsearch,
     phpmyadmin: configurationFileOptions.phpmyadmin,
     xdebug: configurationFileOptions.xdebug,
-    mailhog: configurationFileOptions.mailhog
+    xdebugConfig: configurationFileOptions['xdebug-config'],
+    mailpit: (_configurationFileOpt = configurationFileOptions.mailpit) !== null && _configurationFileOpt !== void 0 ? _configurationFileOpt : configurationFileOptions.mailhog
   };
   const mergedOptions = {};
   Object.keys(configurationFileInstanceOptions).forEach(key => {

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

@@ -144,9 +144,10 @@ function preProcessInstanceData(instanceData) {
     newInstanceData.phpmyadmin = false;
   }
 
-  // Mailhog migration
-  if (!newInstanceData.mailhog) {
-    newInstanceData.mailhog = false;
+  // Mailpit migration
+  if (!newInstanceData.mailpit) {
+    var _newInstanceData$mail;
+    newInstanceData.mailpit = (_newInstanceData$mail = newInstanceData.mailhog) !== null && _newInstanceData$mail !== void 0 ? _newInstanceData$mail : false;
   }
 
   // MariaDB migration
@@ -206,7 +207,7 @@ async function showLogs(lando, slug, options = {}) {
   const instancePath = getEnvironmentPath(slug);
   debug('Instance path for', slug, 'is:', instancePath);
   if (options.service) {
-    const appInfo = await (0, _devEnvironmentLando.landoInfo)(lando, instancePath);
+    const appInfo = await (0, _devEnvironmentLando.landoInfo)(lando, instancePath, false);
     if (!appInfo.services.includes(options.service)) {
       throw new _userError.default(`Service '${options.service}' not found. Please choose from one: ${appInfo.services}`);
     }
@@ -277,6 +278,10 @@ function readEnvironmentData(slug) {
     // clientCode was renamed to appCode
     instanceData.appCode = instanceData.clientCode;
   }
+  if (instanceData.mailhog) {
+    instanceData.mailpit = instanceData.mailhog;
+    delete instanceData.mailhog;
+  }
   return instanceData;
 }
 
@@ -468,7 +473,9 @@ async function updateWordPressImage(slug) {
   if (!versions.length) {
     return false;
   }
-  let message, envData, currentWordPressTag;
+  let message;
+  let envData;
+  let currentWordPressTag;
 
   // Get the current environment configuration
   try {