@automattic/vip 3.1.1-dev.1 → 3.3.0

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

@@ -3,14 +3,14 @@ env_file:
   - .env
 proxy:
   nginx:
-    - <%= siteSlug %>.vipdev.lndo.site
+    - <%= siteSlug %>.<%= domain %>
 <% if ( multisite ) { %>
-    - '*.<%= siteSlug %>.vipdev.lndo.site'
+    - '*.<%= siteSlug %>.<%= domain %>'
 <% } %>
   phpmyadmin:
-    - <%= siteSlug %>-pma.vipdev.lndo.site
+    - <%= siteSlug %>-pma.<%= domain %>
   mailpit:
-    - <%= siteSlug %>-mailpit.vipdev.lndo.site:8025
+    - <%= siteSlug %>-mailpit.<%= domain %>:8025
 
 services:
   devtools:
@@ -38,7 +38,6 @@ services:
       image: ghcr.io/automattic/vip-container-images/nginx:latest
       command: nginx -g "daemon off;"
       environment:
-        LANDO_NO_SCRIPTS: 1
         LANDO_NEEDS_EXEC: 1
       volumes:
         - ./nginx/extra.conf:/etc/nginx/conf.extra/extra.conf
@@ -79,9 +78,9 @@ services:
         sh /dev-tools/setup.sh
         --host database
         --user root
-        --domain "http://<%= siteSlug %>.vipdev.lndo.site/"
+        --domain "http://<%= siteSlug %>.<%= domain %>/"
         --title "<%= wpTitle %>"
-        <% if ( multisite ) { %>--ms-domain "<%= siteSlug %>.vipdev.lndo.site" <% if ( multisite === true || multisite === 'subdomain' ) { %>--subdomain <% } %> <% } %>
+        <% if ( multisite ) { %>--ms-domain "<%= siteSlug %>.<%= domain %>" <% if ( multisite === true || multisite === 'subdomain' ) { %>--subdomain <% } %> <% } %>
   database:
     type: compose
     services:
@@ -226,7 +225,6 @@ services:
         - ":8025"
       environment:
         LANDO_NO_USER_PERMS: 1
-        LANDO_NO_SCRIPTS: 1
         LANDO_NEEDS_EXEC: 1
 <% } %>
 

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

@@ -84,10 +84,10 @@ cmd.argv(process.argv, async (arg, opt) => {
     preselectedOptions = (0, _devEnvironmentConfigurationFile.mergeConfigurationFileOptions)(opt, configurationFileOptions);
     suppressPrompts = true;
   }
-  const instanceData = await (0, _devEnvironmentCli.promptForArguments)(preselectedOptions, defaultOptions, suppressPrompts);
+  const instanceData = await (0, _devEnvironmentCli.promptForArguments)(preselectedOptions, defaultOptions, suppressPrompts, true);
   instanceData.siteSlug = slug;
   try {
-    await (0, _devEnvironmentCore.createEnvironment)(instanceData);
+    await (0, _devEnvironmentCore.createEnvironment)(lando, instanceData);
     await (0, _devEnvironmentCore.printEnvironmentInfo)(lando, slug, {
       extended: false,
       suppressWarnings: true

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

@@ -15,23 +15,59 @@ const usage = 'vip dev-env stop';
 const examples = [{
   usage: `${exampleUsage} --slug=example-site`,
   description: 'Stop a local environment named "example-site".'
+}, {
+  usage: `${exampleUsage} --all`,
+  description: 'Stops all local environments.'
 }];
 (0, _command.default)({
   usage
-}).option('slug', 'A unique name for a local environment. Default is "vip-local".', undefined, _devEnvironmentCli.processSlug).examples(examples).argv(process.argv, async (arg, opt) => {
-  const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
+}).option('slug', 'A unique name for a local environment. Default is "vip-local".', undefined, _devEnvironmentCli.processSlug).option('all', 'Stop all local environments.').examples(examples).argv(process.argv, async (arg, opt) => {
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
-  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
+  await (0, _devEnvironmentCli.validateDependencies)(lando, '');
   debug('Args: ', arg, 'Options: ', opt);
-  const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
+
+  /** @type {Record< string, unknown >} */
+  let trackingInfo;
+  /** @type {string[]} */
+  let environments;
+  if (opt.all) {
+    trackingInfo = {
+      all: true
+    };
+    environments = (0, _devEnvironmentCore.getAllEnvironmentNames)();
+  } else {
+    const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
+    trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
+    environments = [slug];
+  }
   await (0, _tracker.trackEvent)('dev_env_stop_command_execute', trackingInfo);
-  try {
-    await (0, _devEnvironmentCore.stopEnvironment)(lando, slug);
-    const message = _chalk.default.green('✓') + ' environment stopped.\n';
-    console.log(message);
+  for (const slug of environments) {
+    try {
+      // eslint-disable-next-line no-await-in-loop
+      await (0, _devEnvironmentCore.stopEnvironment)(lando, slug);
+      const message = _chalk.default.green('✓') + ` environment "${slug}" stopped.\n`;
+      console.log(message);
+    } catch (error) {
+      let err;
+      if (!(error instanceof Error)) {
+        err = new Error(error?.toString());
+      } else {
+        err = error;
+      }
+      process.exitCode = 1;
+      const errorTrackingInfo = {
+        ...trackingInfo,
+        failure: err.message,
+        stack: err.stack
+      };
+
+      // trackEvent does not throw
+      // eslint-disable-next-line no-await-in-loop
+      await (0, _tracker.trackEvent)('dev_env_stop_command_error', errorTrackingInfo);
+      console.error(_chalk.default.red('Error:'), err.message.replace('ERROR: ', ''));
+    }
+  }
+  if (process.exitCode === 0) {
     await (0, _tracker.trackEvent)('dev_env_stop_command_success', trackingInfo);
-  } catch (error) {
-    await (0, _devEnvironmentCli.handleCLIException)(error, 'dev_env_stop_command_error', trackingInfo);
-    process.exitCode = 1;
   }
 });

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

@@ -55,8 +55,8 @@ cmd.argv(process.argv, async (arg, opt) => {
 
     /** @type {InstanceOptions} */
     const defaultOptions = {
-      appCode: currentInstanceData.appCode.dir || currentInstanceData.appCode.tag || 'latest',
-      muPlugins: currentInstanceData.muPlugins.dir || currentInstanceData.muPlugins.tag || 'latest',
+      appCode: currentInstanceData.appCode.dir || currentInstanceData.appCode.tag || 'demo',
+      muPlugins: currentInstanceData.muPlugins.dir || currentInstanceData.muPlugins.tag || 'demo',
       wordpress: currentInstanceData.wordpress.tag || 'trunk',
       elasticsearch: currentInstanceData.elasticsearch,
       php: currentInstanceData.php || _devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS[Object.keys(_devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS)[0]].image,
@@ -73,9 +73,9 @@ cmd.argv(process.argv, async (arg, opt) => {
     .filter(option => !['debug', 'help', 'slug'].includes(option)); // Filter out options that are not related to instance configuration
 
     const suppressPrompts = providedOptions.length > 0 || thereAreOptionsFromConfigFile;
-    const instanceData = await (0, _devEnvironmentCli.promptForArguments)(finalPreselectedOptions, defaultOptions, suppressPrompts);
+    const instanceData = await (0, _devEnvironmentCli.promptForArguments)(finalPreselectedOptions, defaultOptions, suppressPrompts, false);
     instanceData.siteSlug = slug;
-    await (0, _devEnvironmentCore.updateEnvironment)(instanceData);
+    await (0, _devEnvironmentCore.updateEnvironment)(lando, instanceData);
     const message = '\n' + _chalk.default.green('✓') + ' environment updated. Please start environment again for changes to take effect: ' + _chalk.default.bold(`vip dev-env --slug ${slug} start`);
     console.log(message);
     await (0, _tracker.trackEvent)('dev_env_update_command_success', trackingInfo);

package/dist/bin/vip-slowlogs.js

@@ -22,6 +22,8 @@ const ALLOWED_FORMATS = ['csv', 'json', 'table'];
 const DEFAULT_POLLING_DELAY_IN_SECONDS = 30;
 const MIN_POLLING_DELAY_IN_SECONDS = 5;
 const MAX_POLLING_DELAY_IN_SECONDS = 300;
+const exampleUsage = 'vip @example-app.develop slowlogs';
+const baseUsage = 'vip slowlogs';
 async function getSlowlogs(arg, opt) {
   validateInputs(opt.limit, opt.format);
   const trackingParams = getBaseTrackingParams(opt);
@@ -167,17 +169,18 @@ void (0, _command.default)({
   appQuery,
   envContext: true,
   format: false,
-  module: 'slowlogs'
-}).option('limit', 'The maximum number of log lines', 500).option('format', 'Output the log lines in CSV or JSON format', 'table').examples([{
-  description: 'Get the most recent app slowlogs',
-  usage: 'vip @mysite.production slowlogs'
+  module: 'slowlogs',
+  usage: baseUsage
+}).option('limit', 'The maximum number of log entries', 500).option('format', 'Output the log entries in CSV or JSON format', 'table').examples([{
+  description: 'Retrieve up to 500 of the most recent entries from the MySQL slow query logs in the default format.',
+  usage: exampleUsage
 }, {
-  usage: 'vip @mysite.production slowlogs --limit 100',
-  description: 'Get the most recent 100 slowlog entries'
+  description: 'Retrieve up to 50 of the most recent entries from the MySQL slow query logs in the default format.',
+  usage: `${exampleUsage} --limit=50`
 }, {
-  usage: 'vip @mysite.production slowlogs --limit 100 --format csv',
-  description: 'Get the most recent 100 slowlog entries formatted as comma-separated values (CSV)'
+  description: 'Retrieve up to 100 of the most recent entries from the MySQL slow query logs in CSV format.',
+  usage: `${exampleUsage} --limit=100 --format=csv`
 }, {
-  usage: 'vip @mysite.production slowlogs --limit 100 --format json',
-  description: 'Get the most recent 100 slowlog entries formatted as JSON'
+  description: 'Retrieve up to 100 of the most recent entries from the MySQL slow query logs in JSON format.',
+  usage: `${exampleUsage} --limit=100 --format=json`
 }]).argv(process.argv, getSlowlogs);

package/dist/bin/vip.js

@@ -22,7 +22,7 @@ const tokenURL = 'https://dashboard.wpvip.com/me/cli/token';
 const customDeployToken = process.env.WPVIP_DEPLOY_TOKEN;
 const runCmd = async function () {
   const cmd = (0, _command.default)();
-  cmd.command('logout', 'Log out the current authenticated VIP-CLI user.').command('app', 'List and modify your VIP applications').command('backup', 'Generate a backup of an environment.').command('cache', 'Manage page cache for your VIP applications').command('config', 'Manage environment configurations.').command('dev-env', 'Create and manage VIP Local Development Environments.').command('export', 'Export a copy of data associated with an 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('slowlogs', 'Get slowlogs from your VIP applications').command('db', "Access an environment's database.").command('sync', 'Sync production to a development environment').command('whoami', 'Retrieve details about the current authenticated VIP-CLI user.').command('validate', 'Validate your VIP application and environment').command('wp', 'Run WP CLI commands against an environment');
+  cmd.command('logout', 'Log out the current authenticated VIP-CLI user.').command('app', 'List and modify your VIP applications').command('backup', 'Generate a backup of an environment.').command('cache', 'Manage page cache for your VIP applications').command('config', 'Manage environment configurations.').command('dev-env', 'Create and manage VIP Local Development Environments.').command('export', 'Export a copy of data associated with an 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('slowlogs', 'Retrieve MySQL slow query logs from an environment.').command('db', "Access an environment's database.").command('sync', 'Sync production to a development environment').command('whoami', 'Retrieve details about the current authenticated VIP-CLI user.').command('validate', 'Validate your VIP application and environment').command('wp', 'Run WP CLI commands against an environment');
   cmd.argv(process.argv);
 };
 

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

@@ -4,11 +4,6 @@ exports.__esModule = true;
 exports.DEV_ENVIRONMENT_WORDPRESS_VERSION_TTL = exports.DEV_ENVIRONMENT_WORDPRESS_VERSIONS_URI = exports.DEV_ENVIRONMENT_WORDPRESS_CACHE_KEY = exports.DEV_ENVIRONMENT_VERSION = exports.DEV_ENVIRONMENT_SUBCOMMAND = exports.DEV_ENVIRONMENT_RAW_GITHUB_HOST = exports.DEV_ENVIRONMENT_PROMPT_INTRO = exports.DEV_ENVIRONMENT_PHP_VERSIONS = exports.DEV_ENVIRONMENT_NOT_FOUND = exports.DEV_ENVIRONMENT_FULL_COMMAND = exports.DEV_ENVIRONMENT_DEFAULTS = exports.DEV_ENVIRONMENT_COMPONENTS_WITH_WP = exports.DEV_ENVIRONMENT_COMPONENTS = void 0;
 const DEV_ENVIRONMENT_SUBCOMMAND = exports.DEV_ENVIRONMENT_SUBCOMMAND = 'dev-env';
 const DEV_ENVIRONMENT_FULL_COMMAND = exports.DEV_ENVIRONMENT_FULL_COMMAND = `vip ${DEV_ENVIRONMENT_SUBCOMMAND}`;
-const DEV_ENVIRONMENT_DEFAULTS = exports.DEV_ENVIRONMENT_DEFAULTS = {
-  title: 'VIP Dev',
-  multisite: false,
-  phpVersion: '8.0'
-};
 const DEV_ENVIRONMENT_PROMPT_INTRO = exports.DEV_ENVIRONMENT_PROMPT_INTRO = 'This is a wizard to help you set up your local dev environment.\n\n' + 'Sensible default values were pre-selected for convenience. ' + 'You may also choose to create multiple environments with different settings using the --slug option.\n\n';
 const DEV_ENVIRONMENT_NOT_FOUND = exports.DEV_ENVIRONMENT_NOT_FOUND = 'Environment not found.';
 const DEV_ENVIRONMENT_COMPONENTS = exports.DEV_ENVIRONMENT_COMPONENTS = ['muPlugins', 'appCode'];
@@ -32,4 +27,9 @@ const DEV_ENVIRONMENT_PHP_VERSIONS = exports.DEV_ENVIRONMENT_PHP_VERSIONS = {
     label: '8.3'
   }
 };
+const DEV_ENVIRONMENT_DEFAULTS = exports.DEV_ENVIRONMENT_DEFAULTS = {
+  title: 'VIP Dev',
+  multisite: false,
+  phpVersion: Object.keys(DEV_ENVIRONMENT_PHP_VERSIONS)[0]
+};
 const DEV_ENVIRONMENT_VERSION = exports.DEV_ENVIRONMENT_VERSION = '2.0.3';

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

@@ -13,6 +13,7 @@ exports.postStart = postStart;
 exports.printTable = printTable;
 exports.processBooleanOption = processBooleanOption;
 exports.processComponentOptionInput = processComponentOptionInput;
+exports.processMediaRedirectDomainOption = processMediaRedirectDomainOption;
 exports.processSlug = processSlug;
 exports.processStringOrBooleanOption = processStringOrBooleanOption;
 exports.processVersionOption = processVersionOption;
@@ -213,7 +214,7 @@ function getOptionsFromAppInfo(appInfo) {
  * @return {any} instance data
  */
 // eslint-disable-next-line complexity
-async function promptForArguments(preselectedOptions, defaultOptions, suppressPrompts = false) {
+async function promptForArguments(preselectedOptions, defaultOptions, suppressPrompts, create) {
   debug('Provided preselected', preselectedOptions, 'and default', defaultOptions);
   if (suppressPrompts) {
     preselectedOptions = {
@@ -257,7 +258,7 @@ async function promptForArguments(preselectedOptions, defaultOptions, suppressPr
     mailpit: 'Mailpit',
     photon: 'Photon'
   };
-  if (!instanceData.mediaRedirectDomain && defaultOptions.mediaRedirectDomain) {
+  if (create && !instanceData.mediaRedirectDomain && defaultOptions.mediaRedirectDomain) {
     const mediaRedirectPromptText = `Would you like to redirect to ${defaultOptions.mediaRedirectDomain} for missing media files?`;
     const setMediaRedirectDomain = await promptForBoolean(mediaRedirectPromptText, true);
     if (setMediaRedirectDomain) {
@@ -304,6 +305,16 @@ async function processWordPress(preselectedValue, defaultValue) {
   } else {
     result = await promptForWordPress(defaultObject);
   }
+  const versions = await (0, _devEnvironmentCore.getVersionList)();
+  if (versions.length) {
+    versions.sort((before, after) => before.tag < after.tag ? 1 : -1);
+    const match = versions.find(({
+      tag
+    }) => tag === result.tag);
+    if (typeof match === 'undefined') {
+      throw new _userError.default(`Unknown or unsupported WordPress version: ${result.tag}.`);
+    }
+  }
   debug(result);
   return result;
 }
@@ -444,24 +455,19 @@ function resolveMultisite(value) {
   return isMultisiteOption(value) ? value : _devEnvironment.DEV_ENVIRONMENT_DEFAULTS.multisite;
 }
 function resolvePhpVersion(version) {
-  debug(`Resolving PHP version %j`, version);
-  if (version.startsWith('image:')) {
-    return version;
+  // It is painful to rewrite tests :-(
+  if (version === '') {
+    return '';
   }
+  debug(`Resolving PHP version %j`, version);
   let result;
   if (!(version in _devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS)) {
     const images = Object.values(_devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS);
     const image = images.find(value => value.image === version);
     if (image) {
       result = image.image;
-    } else if (version.includes('/')) {
-      // Assuming this is a Docker image
-      // This can happen when we first called `vip dev-env update -P image:ghcr.io/...`
-      // and then called `vip dev-env update` again. The custom image won't match our images
-      // but we still want to use it.
-      result = version;
     } else {
-      result = images[0].image;
+      throw new _userError.default(`Unknown or unsupported PHP version: ${version}.`);
     }
   } else {
     result = _devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS[version].image;
@@ -579,6 +585,17 @@ function processBooleanOption(value) {
   // eslint-disable-next-line @typescript-eslint/no-base-to-string
   return !FALSE_OPTIONS.includes(value.toString().toLowerCase()); // NOSONAR
 }
+function processMediaRedirectDomainOption(value) {
+  // eslint-disable-next-line @typescript-eslint/no-base-to-string
+  const val = (value ?? '').toString();
+  if (FALSE_OPTIONS.includes(val.toLowerCase())) {
+    return '';
+  }
+  if (TRUE_OPTIONS.includes(val.toLowerCase())) {
+    throw new _userError.default('Media redirect domain must be a domain name or an URL');
+  }
+  return val;
+}
 function processStringOrBooleanOption(value) {
   if (typeof value === 'boolean') {
     return value;
@@ -605,7 +622,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', 'mailpit'], 'Enable Mailpit. By default it is disabled', undefined, processBooleanOption).option(['H', 'photon'], 'Enable Photon. 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.', undefined, processMediaRedirectDomainOption).option('php', 'Explicitly choose PHP version to use', undefined, processVersionOption).option(['A', 'mailpit'], 'Enable Mailpit. By default it is disabled', undefined, processBooleanOption).option(['H', 'photon'], 'Enable Photon. By default it is disabled', undefined, processBooleanOption);
 }
 
 /**

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

@@ -169,7 +169,7 @@ function getConfigurationFileExample() {
   return `configuration-version: ${getLatestConfigurationFileVersion()}
 slug: dev-site
 title: Dev Site
-php: 8.0
+php: 8.2
 wordpress: 6.2
 app-code: ../
 mu-plugins: image

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

@@ -70,9 +70,9 @@ async function startEnvironment(lando, slug, options) {
   }
   let updated = false;
   if (!options.skipWpVersionsCheck) {
-    updated = await maybeUpdateWordPressImage(slug);
+    updated = await maybeUpdateWordPressImage(lando, slug);
   }
-  updated = updated || (await maybeUpdateVersion(slug));
+  updated = updated || (await maybeUpdateVersion(lando, slug));
   if (options.skipRebuild && !updated) {
     await (0, _devEnvironmentLando.landoStart)(lando, instancePath);
   } else {
@@ -92,7 +92,7 @@ async function stopEnvironment(lando, slug) {
   }
   await (0, _devEnvironmentLando.landoStop)(lando, instancePath);
 }
-async function createEnvironment(instanceData) {
+async function createEnvironment(lando, instanceData) {
   const slug = instanceData.siteSlug;
   debug('Will process an environment', slug, 'with instanceData for creation: ', instanceData);
   const instancePath = getEnvironmentPath(slug);
@@ -103,9 +103,9 @@ async function createEnvironment(instanceData) {
   }
   const preProcessedInstanceData = preProcessInstanceData(instanceData);
   debug('Will create an environment', slug, 'with instanceData: ', preProcessedInstanceData);
-  await prepareLandoEnv(preProcessedInstanceData, instancePath);
+  await prepareLandoEnv(lando, preProcessedInstanceData, instancePath);
 }
-async function updateEnvironment(instanceData) {
+async function updateEnvironment(lando, instanceData) {
   const slug = instanceData.siteSlug;
   debug('Will process an environment', slug, 'with instanceData for updating: ', instanceData);
   const instancePath = getEnvironmentPath(slug);
@@ -116,7 +116,7 @@ async function updateEnvironment(instanceData) {
   }
   const preProcessedInstanceData = preProcessInstanceData(instanceData);
   debug('Will create an environment', slug, 'with instanceData: ', preProcessedInstanceData);
-  await prepareLandoEnv(preProcessedInstanceData, instancePath);
+  await prepareLandoEnv(lando, preProcessedInstanceData, instancePath);
 }
 function preProcessInstanceData(instanceData) {
   const newInstanceData = {
@@ -131,9 +131,6 @@ function preProcessInstanceData(instanceData) {
   newInstanceData.elasticsearch = instanceData.elasticsearch || false; // NOSONAR
 
   newInstanceData.php = instanceData.php || _devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS[Object.keys(_devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS)[0]].image;
-  if (newInstanceData.php.startsWith('image:')) {
-    newInstanceData.php = newInstanceData.php.slice('image:'.length);
-  }
 
   // FIXME: isNaN supports only number in TypeScript, actually, because isNaN('123') returns false despite being a string
   if (isNaN(instanceData.wordpress.tag)) {
@@ -211,7 +208,7 @@ function parseComponentForInfo(component) {
   }
 
   // Environments created by the old code will have `component.tag` set to `demo` instead of `undefined`.
-  if (component.tag === 'demo') {
+  if (component.tag === 'demo' || component.tag === 'latest') {
     component.tag = undefined;
   }
   return component.tag ?? '[demo-image]';
@@ -245,6 +242,11 @@ async function printEnvironmentInfo(lando, slug, options) {
     appInfo.title = environmentData.wpTitle;
     appInfo.multisite = Boolean(environmentData.multisite);
     appInfo.php = environmentData.php.split(':')[1];
+    let xdebug = environmentData.xdebug ? 'enabled' : 'disabled';
+    if (environmentData.xdebug && environmentData.xdebugConfig) {
+      xdebug += ' (with additional configuration)';
+    }
+    appInfo.xdebug = xdebug;
     appInfo.wordpress = parseComponentForInfo(environmentData.wordpress);
     appInfo['Mu plugins'] = parseComponentForInfo(environmentData.muPlugins);
     appInfo['App Code'] = parseComponentForInfo(environmentData.appCode);
@@ -327,9 +329,13 @@ function writeEnvironmentData(slug, data) {
   const instanceDataTargetPath = _nodePath.default.join(instancePath, instanceDataFileName);
   return _nodeFs.default.promises.writeFile(instanceDataTargetPath, JSON.stringify(data, null, 2));
 }
-async function prepareLandoEnv(instanceData, instancePath) {
-  const landoFile = await _ejs.default.renderFile(landoFileTemplatePath, instanceData);
-  const nginxFile = await _ejs.default.renderFile(nginxFileTemplatePath, instanceData);
+async function prepareLandoEnv(lando, instanceData, instancePath) {
+  const templateData = {
+    ...instanceData,
+    domain: lando.config.domain
+  };
+  const landoFile = await _ejs.default.renderFile(landoFileTemplatePath, templateData);
+  const nginxFile = await _ejs.default.renderFile(nginxFileTemplatePath, templateData);
   const instanceDataFile = JSON.stringify(instanceData);
   const landoFileTargetPath = _nodePath.default.join(instancePath, landoFileName);
   const landoBackupFileTargetPath = _nodePath.default.join(instancePath, landoBackupFileName);
@@ -507,7 +513,7 @@ async function importMediaPath(slug, filePath) {
  * @param {string} slug slug
  * @return {boolean} boolean
  */
-async function maybeUpdateWordPressImage(slug) {
+async function maybeUpdateWordPressImage(lando, slug) {
   const versions = await getVersionList();
   if (!versions.length) {
     return false;
@@ -588,7 +594,7 @@ async function maybeUpdateWordPressImage(slug) {
     // FIXME: version?.tag is possibly null. Should we throw if we can't find a version somehow?
     envData.wordpress.tag = version?.tag ?? '';
     envData.wordpress.ref = version?.ref;
-    await updateEnvironment(envData);
+    await updateEnvironment(lando, envData);
     return true;
   }
   if (confirm.upgrade === "no (don't ask anymore)") {
@@ -596,16 +602,16 @@ async function maybeUpdateWordPressImage(slug) {
     envData.wordpress.doNotUpgrade = true;
     console.log("We won't ask about upgrading this environment anymore.");
     console.log(`To manually upgrade please run: ${_chalk.default.yellow(updateCommand)}`);
-    await updateEnvironment(envData);
+    await updateEnvironment(lando, envData);
   }
   return false;
 }
-async function maybeUpdateVersion(slug) {
+async function maybeUpdateVersion(lando, slug) {
   const envData = readEnvironmentData(slug);
   const currentVersion = envData.version;
   console.log('Current local environment version is: ' + _chalk.default.yellow(currentVersion));
   if (!currentVersion || _semver.default.lt(currentVersion, _devEnvironment.DEV_ENVIRONMENT_VERSION)) {
-    await updateEnvironment(envData);
+    await updateEnvironment(lando, envData);
     console.log('Local environment version updated to: ' + _chalk.default.green(_devEnvironment.DEV_ENVIRONMENT_VERSION));
     return true;
   }

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

@@ -106,7 +106,7 @@ async function initLandoApplication(lando, instancePath) {
   await app.init();
   return app;
 }
-async function regenerateLandofile(instancePath) {
+async function regenerateLandofile(lando, instancePath) {
   const landoFile = _nodePath.default.join(instancePath, '.lando.yml');
   try {
     const now = new Date().toISOString().replace(/[^\d]/g, '').slice(0, -3);
@@ -119,13 +119,13 @@ async function regenerateLandofile(instancePath) {
   const slug = _nodePath.default.basename(instancePath);
   const currentInstanceData = (0, _devEnvironmentCore.readEnvironmentData)(slug);
   currentInstanceData.pullAfter = 0;
-  await (0, _devEnvironmentCore.updateEnvironment)(currentInstanceData);
+  await (0, _devEnvironmentCore.updateEnvironment)(lando, currentInstanceData);
 }
 async function landoRecovery(lando, instancePath, error) {
   debug('Error initializing Lando app', error);
   console.warn(_chalk.default.yellow('There was an error initializing Lando, trying to recover...'));
   try {
-    await regenerateLandofile(instancePath);
+    await regenerateLandofile(lando, instancePath);
   } catch (err) {
     console.error(`${_chalk.default.bold.red('Recovery failed, aborting.')} Please recreate the environment or contact support.`);
     throw err;

package/docs/CHANGELOG.md

@@ -1,5 +1,26 @@
 ## Changelog
 
+### 3.3.0
+
+* fix(dev-env): make sure wildcard subdomains work with SSL/TLS
+* feat(dev-env): add XDebug information to `vip dev-env info --extended`
+
+**Full Changelog**: https://github.com/Automattic/vip-cli/compare/3.2.0...3.3.0
+
+### 3.2.0
+
+* feat(dev-env): make `domain` configurable
+* build(deps): bump actions/dependency-review-action from 4.3.2 to 4.3.3
+* build(deps-dev): bump the babel group with 4 updates
+* Update the slowlogs command to follow the VIP-CLI styleguide
+* feat(dev-env): add `--all` to `vip dev-env stop`
+* chore: update lando to 77dad3a
+* fix: CVE-2024-29415 in `socks`
+* fix(dev-env): allow for unsetting media redirect domain
+* fix(dev-env): validate version values
+
+**Full Changelog**: https://github.com/Automattic/vip-cli/compare/3.1.0...3.2.0
+
 ### 3.1.0
 
 * Integrate Media Import v2 flow and expand on media import error report messaging