@automattic/vip 3.25.2-dev.0 → 3.25.3-dev.0

package/dist/lib/cli/command.js

@@ -4,18 +4,14 @@ exports.__esModule = true;
 exports.containsAppEnvArgument = containsAppEnvArgument;
 exports.default = _default;
 exports.getEnvIdentifier = getEnvIdentifier;
+var _args = _interopRequireDefault(require("args"));
 var _chalk = _interopRequireDefault(require("chalk"));
-var _commander = require("commander");
 var _debug = _interopRequireDefault(require("debug"));
 var _enquirer = require("enquirer");
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
-var _nodeChild_process = require("node:child_process");
-var _nodeFs = _interopRequireDefault(require("node:fs"));
-var _nodePath = _interopRequireDefault(require("node:path"));
 var _envAlias = require("./envAlias");
 var exit = _interopRequireWildcard(require("./exit"));
 var _format = require("./format");
-var _internalBinLoader = require("./internal-bin-loader");
 var _prompt = require("./prompt");
 var _package = _interopRequireDefault(require("../../../package.json"));
 var _api = _interopRequireDefault(require("../../lib/api"));
@@ -41,209 +37,15 @@ process.on('uncaughtException', uncaughtError);
 process.on('unhandledRejection', uncaughtError);
 let _opts = {};
 let alreadyConfirmedDebugAttachment = false;
-const RESERVED_AUTO_SHORT_ALIASES = new Set(['h', 'v', 'd']);
-function normalizeUsage(program, usage) {
-  if (!usage) {
-    return;
-  }
-  const [rootCommand, ...rest] = usage.trim().split(/\s+/);
-  if (rootCommand) {
-    program.name(rootCommand);
-  }
-  if (rest.length) {
-    const usageString = rest.join(' ');
-    program.usage(usageString.includes('[options]') ? usageString : `${usageString} [options]`);
-  }
-}
-function createOptionDefinition(name, description, defaultValue, parseFn, usedShortNames) {
-  const isArray = Array.isArray(name);
-  const shortName = isArray ? name[0] : null;
-  const longName = isArray ? name[1] : name;
-  const normalizedLongName = String(longName).trim().replace(/^--?/, '');
-  const explicitShortName = shortName ? String(shortName).trim().replace(/^-/, '') : null;
-  let normalizedShortName = explicitShortName;
-  if (!normalizedShortName) {
-    const autoShortName = normalizedLongName.charAt(0);
-    const canUseAutoShortName = autoShortName && !RESERVED_AUTO_SHORT_ALIASES.has(autoShortName) && !usedShortNames.has(autoShortName);
-    if (canUseAutoShortName) {
-      normalizedShortName = autoShortName;
-    }
-  }
-  if (normalizedShortName) {
-    usedShortNames.add(normalizedShortName);
-  }
-  const isBooleanOption = typeof defaultValue === 'boolean';
-  const usesOptionalValue = !isBooleanOption;
-  const parseOptionValue = value => {
-    if (parseFn) {
-      return parseFn(value);
-    }
-    return value;
-  };
-  let parser;
-  if (usesOptionalValue) {
-    parser = (value, previousValue) => {
-      const parsedValue = parseOptionValue(value);
-      if (previousValue === undefined) {
-        return parsedValue;
-      }
-      if (Array.isArray(previousValue)) {
-        return [...previousValue, parsedValue];
-      }
-      return [previousValue, parsedValue];
-    };
-  }
-  let flags = `--${normalizedLongName}`;
-  if (usesOptionalValue) {
-    flags += ' [value]';
-  }
-  if (normalizedShortName) {
-    flags = `-${normalizedShortName}, ${flags}`;
-  }
-  return {
-    flags,
-    description,
-    defaultValue,
-    parser
-  };
-}
-class CommanderArgsCompat {
-  constructor(opts) {
-    this.details = {
-      commands: []
-    };
-    this.sub = [];
-    this.examplesList = [];
-    this.usedShortNames = new Set();
-    this._opts = opts;
-    this.program = new _commander.Command();
-    this.program.allowUnknownOption(true);
-    this.program.allowExcessArguments(true);
-    this.program.helpOption(false);
-    normalizeUsage(this.program, this._opts.usage);
-  }
-  option(name, description, defaultValue, parseFn) {
-    const definition = createOptionDefinition(name, description, defaultValue, parseFn, this.usedShortNames);
-    const {
-      flags,
-      parser
-    } = definition;
-    if (parser && defaultValue !== undefined) {
-      this.program.option(flags, description, parser, defaultValue);
-    } else if (parser) {
-      this.program.option(flags, description, parser);
-    } else if (defaultValue !== undefined) {
-      this.program.option(flags, description, defaultValue);
-    } else {
-      this.program.option(flags, description);
-    }
-    return this;
-  }
-  command(name, description = '') {
-    this.details.commands.push({
-      usage: name,
-      description
-    });
-    return this;
-  }
-  example(usage, description) {
-    this.examplesList.push({
-      usage,
-      description
-    });
-    return this;
-  }
-  examples(examples = []) {
-    for (const example of examples) {
-      this.example(example.usage, example.description);
-    }
-    return this;
-  }
-  showVersion() {
-    console.log(_package.default.version);
-    process.exit(0);
-  }
-  showHelp() {
-    const lines = [this.program.helpInformation().trimEnd()];
-    if (this.details.commands.length) {
-      lines.push('');
-      lines.push('Commands:');
-      for (const entry of this.details.commands) {
-        const commandName = entry.usage.padEnd(26, ' ');
-        lines.push(`  ${commandName}${entry.description}`);
-      }
-    }
-    if (this.examplesList.length) {
-      lines.push('');
-      lines.push('Examples:');
-      for (const example of this.examplesList) {
-        lines.push(`  - ${example.description}`);
-        lines.push(`    $ ${example.usage}`);
-      }
-    }
-    console.log(lines.join('\n'));
-    process.exit(0);
-  }
-  isDefined(value, key) {
-    if (key !== 'commands') {
-      return false;
-    }
-    return this.details.commands.some(entry => entry.usage === value);
-  }
-  parse(argv) {
-    this.program.parse(argv, {
-      from: 'node'
-    });
-    this.sub = this.program.args.slice();
-    return this.program.opts();
-  }
-  async executeSubcommand(argv, parsedAlias, subcommand) {
-    const currentScript = argv[1];
-    const extension = _nodePath.default.extname(currentScript);
-    const baseScriptPath = extension ? currentScript.slice(0, -extension.length) : currentScript;
-    const childScriptPath = extension ? `${baseScriptPath}-${subcommand}${extension}` : `${baseScriptPath}-${subcommand}`;
-    const aliasFromRawArgv = argv.slice(2).find(arg => (0, _envAlias.isAlias)(arg));
-    const subcommandIndex = parsedAlias.argv.findIndex((arg, index) => {
-      return index > 1 && arg === subcommand;
-    });
-    let childArgs = subcommandIndex > -1 ? parsedAlias.argv.slice(subcommandIndex + 1) : [];
-    if (aliasFromRawArgv) {
-      childArgs = [aliasFromRawArgv, ...childArgs];
-    }
-    let runResult;
-    if (_nodeFs.default.existsSync(childScriptPath)) {
-      runResult = (0, _nodeChild_process.spawnSync)(process.execPath, [childScriptPath, ...childArgs], {
-        stdio: 'inherit',
-        env: process.env
-      });
-    } else {
-      const fallbackCommand = `${_nodePath.default.basename(baseScriptPath)}-${subcommand}`;
-      if (process.env.VIP_CLI_SEA_MODE === '1' && (0, _internalBinLoader.hasInternalBin)(fallbackCommand)) {
-        process.argv = [process.argv[0], process.argv[1], ...childArgs];
-        const loaded = await (0, _internalBinLoader.loadInternalBin)(fallbackCommand);
-        if (!loaded) {
-          throw new Error(`Unable to load SEA subcommand "${fallbackCommand}"`);
-        }
-        return;
-      }
-      runResult = (0, _nodeChild_process.spawnSync)(fallbackCommand, childArgs, {
-        stdio: 'inherit',
-        env: process.env,
-        shell: process.platform === 'win32'
-      });
-    }
-    if (runResult.error) {
-      throw runResult.error;
-    }
-    process.exit(runResult.status ?? 1);
-  }
-}
 
 /**
  * @param {string[]} argv
  */
 // eslint-disable-next-line complexity
-CommanderArgsCompat.prototype.argv = async function (argv, cb) {
+_args.default.argv = async function (argv, cb) {
+  if (process.platform !== 'win32' && argv[1]?.endsWith('.js')) {
+    argv[1] = argv[1].slice(0, -3);
+  }
   if (process.execArgv.includes('--inspect') && !alreadyConfirmedDebugAttachment) {
     await (0, _enquirer.prompt)({
       type: 'confirm',
@@ -253,13 +55,25 @@ CommanderArgsCompat.prototype.argv = async function (argv, cb) {
     alreadyConfirmedDebugAttachment = true;
   }
   const parsedAlias = (0, _envAlias.parseEnvAliasFromArgv)(argv);
-  const options = this.parse(parsedAlias.argv);
 
-  // If there's a sub-command, run that instead
-  if (this.isDefined(this.sub[0], 'commands')) {
-    await this.executeSubcommand(argv, parsedAlias, this.sub[0]);
-    return {};
-  }
+  // A usage option allows us to override the default usage text, which isn't
+  // accurate for subcommands. By default, it will display something like (note
+  // the hyphen):
+  //   Usage: vip command-subcommand [options]
+  //
+  // We can pass "vip command subcommand" to the name param for more accurate
+  // usage text:
+  //   Usage: vip command subcommand [options]
+  //
+  // It also allows us to represent required args in usage text:
+  //   Usage: vip command subcommand <arg1> <arg2> [options]
+  const name = _opts.usage || null;
+  const options = this.parse(parsedAlias.argv, {
+    help: false,
+    name,
+    version: false,
+    debug: false
+  });
   if (_opts.format && !options.format) {
     options.format = 'table';
   }
@@ -291,7 +105,12 @@ CommanderArgsCompat.prototype.argv = async function (argv, cb) {
     });
     exit.withError(error);
   }
-  if (process.env.NODE_ENV !== 'test' && process.env.VIP_CLI_SEA_MODE !== '1') {
+
+  // If there's a sub-command, run that instead
+  if (this.isDefined(this.sub[0], 'commands')) {
+    return {};
+  }
+  if (process.env.NODE_ENV !== 'test') {
     const {
       default: updateNotifier
     } = await import('update-notifier');
@@ -302,7 +121,18 @@ CommanderArgsCompat.prototype.argv = async function (argv, cb) {
       isGlobal: true
     });
   }
-  const customCommands = this.details.commands;
+
+  // `help` and `version` are always defined as subcommands
+  const customCommands = this.details.commands.filter(command => {
+    switch (command.usage) {
+      case 'help':
+      case 'version':
+      case 'debug':
+        return false;
+      default:
+        return true;
+    }
+  });
 
   // Show help if no args passed
   if (Boolean(customCommands.length) && !this.sub.length) {
@@ -322,7 +152,7 @@ CommanderArgsCompat.prototype.argv = async function (argv, cb) {
 
   // Show help if subcommand is invalid
   const subCommands = this.details.commands.map(cmd => cmd.usage);
-  if (!_opts.wildcardCommand && this.sub[_opts.requiredArgs] && subCommands.length && 0 > subCommands.indexOf(this.sub[_opts.requiredArgs])) {
+  if (!_opts.wildcardCommand && this.sub[_opts.requiredArgs] && 0 > subCommands.indexOf(this.sub[_opts.requiredArgs])) {
     const subcommand = this.sub.join(' ');
     await (0, _tracker.trackEvent)('command_validation_error', {
       error: `Invalid subcommand: ${subcommand}`
@@ -538,7 +368,7 @@ CommanderArgsCompat.prototype.argv = async function (argv, cb) {
               value: `${_chalk.default.cyan(launched)}`
             });
           }
-          if (this.sub.length) {
+          if (this.sub) {
             info.push({
               key: 'SQL File',
               value: `${_chalk.default.blueBright(this.sub)}`
@@ -611,7 +441,7 @@ CommanderArgsCompat.prototype.argv = async function (argv, cb) {
         }
       case 'import-media':
         {
-          const isUrl = this.sub.length && (String(this.sub).startsWith('http://') || String(this.sub).startsWith('https://'));
+          const isUrl = this.sub && (String(this.sub).startsWith('http://') || String(this.sub).startsWith('https://'));
           const archiveLabel = isUrl ? 'Archive URL' : 'Archive Path';
           info.push({
             key: archiveLabel,
@@ -706,7 +536,7 @@ function validateOpts(opts) {
 }
 
 /**
- * @returns {CommanderArgsCompat}
+ * @returns {args}
  */
 function _default(opts) {
   _opts = {
@@ -720,25 +550,24 @@ function _default(opts) {
     wildcardCommand: false,
     ...opts
   };
-  const args = new CommanderArgsCompat(_opts);
   if (_opts.appContext || _opts.requireConfirm) {
-    args.option('app', 'Target an application. Accepts a string value for the application name or an integer for the application ID.');
+    _args.default.option('app', 'Target an application. Accepts a string value for the application name or an integer for the application ID.');
   }
   if (_opts.envContext || _opts.childEnvContext) {
-    args.option('env', 'Target an environment. Accepts a string value for the environment type.');
+    _args.default.option('env', 'Target an environment. Accepts a string value for the environment type.');
   }
   if (_opts.requireConfirm) {
-    args.option('force', 'Skip confirmation.', false);
+    _args.default.option('force', 'Skip confirmation.', false);
   }
   if (_opts.format) {
-    args.option('format', 'Render output in a particular format. Accepts “table“ (default), “csv“, and “json“.');
+    _args.default.option('format', 'Render output in a particular format. Accepts “table“ (default), “csv“, and “json“.');
   }
 
   // Add help and version to all subcommands
-  args.option(['h', 'help'], 'Retrieve a description, examples, and available options for a (sub)command.', false);
-  args.option(['v', 'version'], 'Retrieve the version number of VIP-CLI currently installed on the local machine.', false);
-  args.option(['d', 'debug'], 'Generate verbose output during command execution to help identify or fix errors or bugs.');
-  return args;
+  _args.default.option('help', 'Retrieve a description, examples, and available options for a (sub)command.');
+  _args.default.option('version', 'Retrieve the version number of VIP-CLI currently installed on the local machine.');
+  _args.default.option('debug', 'Generate verbose output during command execution to help identify or fix errors or bugs.');
+  return _args.default;
 }
 function getEnvIdentifier(env) {
   let identifier = env.type;

package/dist/lib/cli/config.js

@@ -4,9 +4,8 @@ exports.__esModule = true;
 exports.default = void 0;
 exports.loadConfigFile = loadConfigFile;
 var _debug = _interopRequireDefault(require("debug"));
-var _nodeFs = _interopRequireDefault(require("node:fs"));
+var _nodeFs = require("node:fs");
 var _nodePath = _interopRequireDefault(require("node:path"));
-var _configPublish = _interopRequireDefault(require("../../../config/config.publish.json"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // I don't like using synchronous versions, but until we migrate to ESM, we have to.
 
@@ -15,33 +14,26 @@ function loadConfigFile() {
   const paths = [
   // Get `local` config first; this will only exist in dev as it's npmignore-d.
   _nodePath.default.join(__dirname, '../../../config/config.local.json'), _nodePath.default.join(__dirname, '../../../config/config.publish.json')];
-  let hasNonEnoentError = false;
   for (const filePath of paths) {
     try {
-      const data = _nodeFs.default.readFileSync(filePath, 'utf-8');
+      const data = (0, _nodeFs.readFileSync)(filePath, 'utf-8');
       debug(`Found config file at ${filePath}`);
       return JSON.parse(data);
     } catch (err) {
-      const isEnoent = err instanceof Error && 'code' in err && err.code === 'ENOENT';
-      if (!isEnoent) {
-        hasNonEnoentError = true;
+      if (!(err instanceof Error) || !('code' in err) || err.code !== 'ENOENT') {
         debug(`Error reading config file at ${filePath}:`, err);
       }
     }
   }
-
-  // SEA builds can miss on-disk config files, so use the bundled publish config only for ENOENT.
-  if (!hasNonEnoentError) {
-    return _configPublish.default;
-  }
   return null;
 }
 const configFromFile = loadConfigFile();
 if (null === configFromFile) {
+  // This should not happen because `config/config.publish.json` is always present.
   console.error('FATAL ERROR: Could not find a valid configuration file');
   process.exit(1);
 }
 
-// Without this, TypeScript will export `configFromFile` as `Config | null`.
+// Without this, TypeScript will export `configFromFile` as `Config | null`
 const exportedConfig = configFromFile;
 var _default = exports.default = exportedConfig;

package/dist/lib/cli/exit.js

@@ -4,7 +4,6 @@ exports.__esModule = true;
 exports.withError = withError;
 var _chalk = _interopRequireDefault(require("chalk"));
 var _debug = _interopRequireDefault(require("debug"));
-var _runtimeMode = require("./runtime-mode");
 var _env = _interopRequireDefault(require("../../lib/env"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function withError(message) {
@@ -14,7 +13,7 @@ function withError(message) {
   // Debug ouput is printed below error output both for information
   // hierarchy and to make it more likely that the user copies it to their
   // clipboard when dragging across output.
-  console.log(`${_chalk.default.yellow('Debug: ')} VIP-CLI v${_env.default.app.version}, Node ${_env.default.node.version}, ${_env.default.os.name} ${_env.default.os.version} ${_env.default.os.arch}, Runtime ${(0, _runtimeMode.getRuntimeModeLabel)()}`);
+  console.log(`${_chalk.default.yellow('Debug: ')} VIP-CLI v${_env.default.app.version}, Node ${_env.default.node.version}, ${_env.default.os.name} ${_env.default.os.version} ${_env.default.os.arch}`);
   if (_debug.default.names.length > 0 && message instanceof Error) {
     console.error(_chalk.default.yellow('Debug: '), message);
   }

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

@@ -38,6 +38,7 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _child_process = require("child_process");
 var _debug = _interopRequireDefault(require("debug"));
 var _enquirer = require("enquirer");
+var _formatters = _interopRequireDefault(require("lando/lib/formatters"));
 var _nodeFs = require("node:fs");
 var _nodeOs = require("node:os");
 var _path = _interopRequireDefault(require("path"));
@@ -45,7 +46,6 @@ var _shelljs = require("shelljs");
 var _devEnvironmentConfigurationFile = require("./dev-environment-configuration-file");
 var _devEnvironmentCore = require("./dev-environment-core");
 var _devEnvironmentLando = require("./dev-environment-lando");
-var _landoLoader = require("./lando-loader");
 var _user = require("../api/user");
 var _devEnvironment = require("../constants/dev-environment");
 var _tracker = require("../tracker");
@@ -55,13 +55,6 @@ const debug = (0, _debug.default)('@automattic/vip:bin:dev-environment');
 const DEFAULT_SLUG = exports.DEFAULT_SLUG = 'vip-local';
 const CONFIGURATION_FOLDER = exports.CONFIGURATION_FOLDER = '.wpvip';
 let isStdinTTY = Boolean(process.stdin.isTTY);
-let landoFormatters = null;
-const getLandoFormatters = () => {
-  if (!landoFormatters) {
-    landoFormatters = (0, _landoLoader.loadLandoModule)('lando/lib/formatters');
-  }
-  return landoFormatters;
-};
 
 /**
  * Used internally for tests
@@ -157,7 +150,7 @@ function getEnvironmentStartCommand(slug, configurationFileOptions) {
   return `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} start --slug ${slug}`;
 }
 function printTable(data) {
-  const formattedData = getLandoFormatters().formatData(data, {
+  const formattedData = _formatters.default.formatData(data, {
     format: 'table'
   }, {
     border: false

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

@@ -28,6 +28,7 @@ var _debug = _interopRequireDefault(require("debug"));
 var _ejs = _interopRequireDefault(require("ejs"));
 var _enquirer = require("enquirer");
 var _graphql = require("graphql");
+var _utils = require("lando/lib/utils");
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
 var _nodeCrypto = require("node:crypto");
 var _nodeFs = _interopRequireDefault(require("node:fs"));
@@ -36,7 +37,6 @@ var _nodePath = _interopRequireDefault(require("node:path"));
 var _semver = _interopRequireDefault(require("semver"));
 var _devEnvironmentCli = require("./dev-environment-cli");
 var _devEnvironmentLando = require("./dev-environment-lando");
-var _landoLoader = require("./lando-loader");
 var _app = _interopRequireDefault(require("../api/app"));
 var _software = require("../config/software");
 var _devEnvironment = require("../constants/dev-environment");
@@ -47,9 +47,7 @@ var _xdgData = require("../xdg-data");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const debug = (0, _debug.default)('@automattic/vip:bin:dev-environment');
 const landoFileTemplatePath = _nodePath.default.join(__dirname, '..', '..', '..', 'assets', 'dev-env.lando.template.yml.ejs');
-const landoTemplateAssetKey = 'dev-env.lando.template.yml.ejs';
 const nginxFileTemplatePath = _nodePath.default.join(__dirname, '..', '..', '..', 'assets', 'dev-env.nginx.template.conf.ejs');
-const nginxTemplateAssetKey = 'dev-env.nginx.template.conf.ejs';
 const landoFileName = '.lando.yml';
 const landoOverridesFileName = '.lando.local.yml';
 const landoBackupFileName = '.lando.backup.yml';
@@ -60,53 +58,6 @@ const integrationsConfigBackupFileName = 'integrations.json.bak';
 const uploadPathString = 'uploads';
 const nginxPathString = 'nginx';
 const integrationsConfigPathString = 'integrations-config';
-const STARTUP_READY_ATTEMPTS = 6;
-const STARTUP_READY_DELAY_MS = 2000;
-let dockerComposifyFromLando = null;
-const dockerComposify = value => {
-  if (!dockerComposifyFromLando) {
-    const landoUtils = (0, _landoLoader.loadLandoModule)('lando/lib/utils');
-    dockerComposifyFromLando = landoUtils.dockerComposify;
-  }
-  return dockerComposifyFromLando(value);
-};
-const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
-let seaModulePromise = null;
-const getSeaModule = async () => {
-  if (!seaModulePromise) {
-    seaModulePromise = (async () => {
-      try {
-        return await import('node:sea');
-      } catch {
-        return null;
-      }
-    })();
-  }
-  return seaModulePromise;
-};
-const renderTemplateFile = async (filePath, assetKey, templateData) => {
-  const sea = await getSeaModule();
-  if (sea?.isSea?.() && sea.getAsset) {
-    const template = sea.getAsset(assetKey, 'utf8');
-    if (typeof template === 'string') {
-      return _ejs.default.render(template, templateData);
-    }
-  }
-  return _ejs.default.renderFile(filePath, templateData);
-};
-async function waitForEnvironmentToBeUp(lando, instancePath) {
-  return pollEnvironmentUpStatus(lando, instancePath, 1);
-}
-async function pollEnvironmentUpStatus(lando, instancePath, attempt) {
-  if (await (0, _devEnvironmentLando.isEnvUp)(lando, instancePath)) {
-    return true;
-  }
-  if (attempt >= STARTUP_READY_ATTEMPTS) {
-    return false;
-  }
-  await sleep(STARTUP_READY_DELAY_MS);
-  return pollEnvironmentUpStatus(lando, instancePath, attempt + 1);
-}
 async function startEnvironment(lando, slug, options) {
   debug('Will start an environment', slug);
   const instancePath = getEnvironmentPath(slug);
@@ -127,18 +78,9 @@ async function startEnvironment(lando, slug, options) {
     await (0, _devEnvironmentLando.removeProxyCache)(lando);
   }
   if (options.skipRebuild && !updated) {
-    await (0, _devEnvironmentLando.landoStart)(lando, instancePath);
+    await (0, _devEnvironmentLando.landoStart)(lando, instancePath, options.autofixDomains);
   } else {
-    await (0, _devEnvironmentLando.landoRebuild)(lando, instancePath);
-  }
-  let isEnvironmentUp = await waitForEnvironmentToBeUp(lando, instancePath);
-  if (!isEnvironmentUp) {
-    // A second startup pass helps recover after Docker network auto-cleanup edge cases.
-    await (0, _devEnvironmentLando.landoStart)(lando, instancePath);
-    isEnvironmentUp = await waitForEnvironmentToBeUp(lando, instancePath);
-  }
-  if (!isEnvironmentUp) {
-    throw new _userError.default(`Environment "${slug}" did not reach a running state. Please try "${_chalk.default.bold(`vip dev-env start --slug ${slug}`)}" again.`);
+    await (0, _devEnvironmentLando.landoRebuild)(lando, instancePath, options.autofixDomains);
   }
   await printEnvironmentInfo(lando, slug, {
     extended: false
@@ -224,7 +166,7 @@ async function destroyEnvironment(lando, slug, removeFiles) {
   } else {
     debug("Lando file doesn't exist, skipping lando destroy.");
   }
-  await _nodeFs.default.promises.rm(_nodePath.default.join((0, _xdgData.xdgData)(), 'vip', 'lando', 'compose', dockerComposify(slug)), {
+  await _nodeFs.default.promises.rm(_nodePath.default.join((0, _xdgData.xdgData)(), 'vip', 'lando', 'compose', (0, _utils.dockerComposify)(slug)), {
     force: true,
     recursive: true
   });
@@ -407,8 +349,8 @@ async function prepareLandoEnv(lando, instanceData, instancePath, integrationsCo
     ...instanceData,
     domain: lando.config.domain
   };
-  const landoFile = await renderTemplateFile(landoFileTemplatePath, landoTemplateAssetKey, templateData);
-  const nginxFile = await renderTemplateFile(nginxFileTemplatePath, nginxTemplateAssetKey, templateData);
+  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 landoOverridesFileTargetPath = _nodePath.default.join(instancePath, landoOverridesFileName);