@automattic/vip 2.32.2 → 2.32.3

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

@@ -35,6 +35,7 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _enquirer = require("enquirer");
 var _copyDir = _interopRequireDefault(require("copy-dir"));
 var _uuid = require("uuid");
+var _semver = _interopRequireDefault(require("semver"));
 var _devEnvironmentLando = require("./dev-environment-lando");
 var _searchAndReplace = require("../search-and-replace");
 var _devEnvironmentCli = require("./dev-environment-cli");
@@ -55,6 +56,7 @@ const debug = (0, _debug.default)('@automattic/vip:bin:dev-environment');
 const landoFileTemplatePath = _path.default.join(__dirname, '..', '..', '..', 'assets', 'dev-env.lando.template.yml.ejs');
 const nginxFileTemplatePath = _path.default.join(__dirname, '..', '..', '..', 'assets', 'dev-env.nginx.template.conf.ejs');
 const landoFileName = '.lando.yml';
+const landoBackupFileName = '.lando.backup.yml';
 const nginxFileName = 'extra.conf';
 const instanceDataFileName = 'instance_data.json';
 const uploadPathString = 'uploads';
@@ -73,8 +75,9 @@ async function startEnvironment(lando, slug, options) {
   }
   let updated = false;
   if (!options.skipWpVersionsCheck) {
-    updated = await updateWordPressImage(slug);
+    updated = await maybeUpdateWordPressImage(slug);
   }
+  updated = updated || (await maybeUpdateVersion(slug));
   if (options.skipRebuild && !updated) {
     await (0, _devEnvironmentLando.landoStart)(lando, instancePath);
   } else {
@@ -156,8 +159,7 @@ function preProcessInstanceData(instanceData) {
 
   // Mailpit migration
   if (!newInstanceData.mailpit) {
-    var _newInstanceData$mail;
-    newInstanceData.mailpit = (_newInstanceData$mail = newInstanceData.mailhog) !== null && _newInstanceData$mail !== void 0 ? _newInstanceData$mail : false;
+    newInstanceData.mailpit = newInstanceData.mailhog ?? false;
   }
 
   // MariaDB migration
@@ -167,6 +169,7 @@ function preProcessInstanceData(instanceData) {
 
   // newInstanceData
   newInstanceData.autologinKey = (0, _uuid.v4)();
+  newInstanceData.version = _devEnvironment.DEV_ENVIRONMENT_VERSION;
   return newInstanceData;
 }
 async function destroyEnvironment(lando, slug, removeFiles) {
@@ -210,21 +213,19 @@ async function printAllEnvironmentsInfo(lando, options) {
   }
 }
 function parseComponentForInfo(component) {
-  var _component$tag;
   if (component.mode === 'local') {
-    var _component$dir;
-    return (_component$dir = component.dir) !== null && _component$dir !== void 0 ? _component$dir : '';
+    return component.dir ?? '';
   }
-  return (_component$tag = component.tag) !== null && _component$tag !== void 0 ? _component$tag : '[demo-image]';
+  return component.tag ?? '[demo-image]';
 }
 async function showLogs(lando, slug, options = {}) {
   debug('Will display logs command on env', slug, 'with options', options);
   const instancePath = getEnvironmentPath(slug);
   debug('Instance path for', slug, 'is:', instancePath);
   if (options.service) {
-    const appInfo = await (0, _devEnvironmentLando.landoInfo)(lando, instancePath, false);
+    const appInfo = await (0, _devEnvironmentLando.landoInfo)(lando, instancePath);
     if (!appInfo.services.includes(options.service)) {
-      throw new _userError.default(`Service '${options.service}' not found. Please choose from one: ${appInfo.services}`);
+      throw new _userError.default(`Service '${options.service}' not found. Please choose from one: ${appInfo.services.toString()}`);
     }
   }
   return (0, _devEnvironmentLando.landoLogs)(lando, instancePath, options);
@@ -333,6 +334,7 @@ async function prepareLandoEnv(instanceData, instancePath) {
   const nginxFile = await _ejs.default.renderFile(nginxFileTemplatePath, instanceData);
   const instanceDataFile = JSON.stringify(instanceData);
   const landoFileTargetPath = _path.default.join(instancePath, landoFileName);
+  const landoBackupFileTargetPath = _path.default.join(instancePath, landoBackupFileName);
   const nginxFolderPath = _path.default.join(instancePath, nginxPathString);
   const nginxFileTargetPath = _path.default.join(nginxFolderPath, nginxFileName);
   const instanceDataTargetPath = _path.default.join(instancePath, instanceDataFileName);
@@ -342,6 +344,11 @@ async function prepareLandoEnv(instanceData, instancePath) {
   await _fs.default.promises.mkdir(nginxFolderPath, {
     recursive: true
   });
+  const landoFileExists = await _fs.default.promises.stat(landoFileTargetPath).catch(() => false);
+  if (landoFileExists) {
+    await _fs.default.promises.copyFile(landoFileTargetPath, landoBackupFileTargetPath);
+    console.log(`Backup of ${landoFileName} was created in ${landoBackupFileTargetPath}`);
+  }
   await Promise.all([_fs.default.promises.writeFile(landoFileTargetPath, landoFile), _fs.default.promises.writeFile(nginxFileTargetPath, nginxFile), _fs.default.promises.writeFile(instanceDataTargetPath, instanceDataFile)]);
   debug(`Lando file created in ${landoFileTargetPath}`);
   debug(`Nginx file created in ${nginxFileTargetPath}`);
@@ -398,13 +405,13 @@ async function getApplicationInformation(appId, envType) {
   const queryResult = await (0, _app.default)(appId, fieldsQuery, _software.appQueryFragments);
   const appData = {};
   if (queryResult.id) {
-    var _queryResult$reposito, _queryResult$environm;
+    var _queryResult$reposito;
     appData.id = queryResult.id;
     appData.name = queryResult.name;
     appData.repository = (_queryResult$reposito = queryResult.repository) === null || _queryResult$reposito === void 0 ? void 0 : _queryResult$reposito.htmlUrl;
 
     // FIXME: This is casted as AppEnvironment[] but pedantically, Parker's schema made it so that the array may contain nullable. Code-wise though, that doesn't actually happen.
-    const environments = (_queryResult$environm = queryResult.environments) !== null && _queryResult$environm !== void 0 ? _queryResult$environm : [];
+    const environments = queryResult.environments ?? [];
     let envData;
     if (envType) {
       envData = environments.find(candidateEnv => candidateEnv.type === envType);
@@ -423,15 +430,15 @@ async function getApplicationInformation(appId, envType) {
       envData = environments.find(candidateEnv => candidateEnv.type === env);
     }
     if (envData) {
-      var _envData$primaryDomai, _envData$primaryDomai2, _envData$softwareSett, _envData$softwareSett2, _envData$softwareSett3, _envData$softwareSett4, _envData$softwareSett5, _envData$softwareSett6;
+      var _envData$primaryDomai, _envData$softwareSett, _envData$softwareSett2;
       appData.environment = {
         name: envData.name,
         branch: envData.branch,
         type: envData.type,
         isMultisite: envData.isMultisite,
-        primaryDomain: (_envData$primaryDomai = (_envData$primaryDomai2 = envData.primaryDomain) === null || _envData$primaryDomai2 === void 0 ? void 0 : _envData$primaryDomai2.name) !== null && _envData$primaryDomai !== void 0 ? _envData$primaryDomai : '',
-        php: (_envData$softwareSett = (_envData$softwareSett2 = envData.softwareSettings) === null || _envData$softwareSett2 === void 0 ? void 0 : (_envData$softwareSett3 = _envData$softwareSett2.php) === null || _envData$softwareSett3 === void 0 ? void 0 : _envData$softwareSett3.current.version) !== null && _envData$softwareSett !== void 0 ? _envData$softwareSett : '',
-        wordpress: (_envData$softwareSett4 = (_envData$softwareSett5 = envData.softwareSettings) === null || _envData$softwareSett5 === void 0 ? void 0 : (_envData$softwareSett6 = _envData$softwareSett5.wordpress) === null || _envData$softwareSett6 === void 0 ? void 0 : _envData$softwareSett6.current.version) !== null && _envData$softwareSett4 !== void 0 ? _envData$softwareSett4 : ''
+        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 || (_envData$softwareSett = _envData$softwareSett.php) === null || _envData$softwareSett === void 0 ? void 0 : _envData$softwareSett.current.version) ?? '',
+        wordpress: ((_envData$softwareSett2 = envData.softwareSettings) === null || _envData$softwareSett2 === void 0 || (_envData$softwareSett2 = _envData$softwareSett2.wordpress) === null || _envData$softwareSett2 === void 0 ? void 0 : _envData$softwareSett2.current.version) ?? ''
       };
     }
   }
@@ -500,7 +507,7 @@ async function importMediaPath(slug, filePath) {
  * @param {string} slug slug
  * @return {boolean} boolean
  */
-async function updateWordPressImage(slug) {
+async function maybeUpdateWordPressImage(slug) {
   const versions = await getVersionList();
   if (!versions.length) {
     return false;
@@ -569,18 +576,17 @@ async function updateWordPressImage(slug) {
 
   // If the user takes the new WP version path
   if (confirm.upgrade === 'yes') {
-    var _version$tag;
     console.log('Upgrading from: ' + _chalk.default.yellow(currentWordPressTag) + ' to:');
 
     // Select a new image
-    const choice = await (0, _devEnvironmentCli.promptForComponent)('wordpress', false, null);
+    const choice = await (0, _devEnvironmentCli.promptForWordPress)(null);
     const version = versions.find(({
       tag
     }) => tag.trim() === choice.tag.trim());
 
     // Write new data and stage for rebuild
     // FIXME: version?.tag is possibly null. Should we throw if we can't find a version somehow?
-    envData.wordpress.tag = (_version$tag = version === null || version === void 0 ? void 0 : version.tag) !== null && _version$tag !== void 0 ? _version$tag : '';
+    envData.wordpress.tag = (version === null || version === void 0 ? void 0 : version.tag) ?? '';
     envData.wordpress.ref = version === null || version === void 0 ? void 0 : version.ref;
     await updateEnvironment(envData);
     return true;
@@ -594,6 +600,17 @@ async function updateWordPressImage(slug) {
   }
   return false;
 }
+async function maybeUpdateVersion(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);
+    console.log('Local environment version updated to: ' + _chalk.default.green(_devEnvironment.DEV_ENVIRONMENT_VERSION));
+    return true;
+  }
+  return false;
+}
 
 /**
  * Makes a web call to raw.githubusercontent.com

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

@@ -16,42 +16,43 @@ exports.landoStart = landoStart;
 exports.landoStop = landoStop;
 exports.validateDockerAccess = validateDockerAccess;
 exports.validateDockerInstalled = validateDockerInstalled;
+var _nodeOs = require("node:os");
+var _promises = require("node:fs/promises");
+var _promises2 = require("node:dns/promises");
+var _nodePath = _interopRequireDefault(require("node:path"));
 var _debug = _interopRequireDefault(require("debug"));
-var _os = _interopRequireDefault(require("os"));
-var _fs = _interopRequireDefault(require("fs"));
-var _path = _interopRequireDefault(require("path"));
 var _lando = _interopRequireDefault(require("lando/lib/lando"));
 var _bootstrap = require("lando/lib/bootstrap");
 var _utils = _interopRequireDefault(require("lando/plugins/lando-core/lib/utils"));
 var _build = _interopRequireDefault(require("lando/plugins/lando-tooling/lib/build"));
 var _chalk = _interopRequireDefault(require("chalk"));
-var _app = _interopRequireDefault(require("lando/lib/app"));
-var _dns = _interopRequireDefault(require("dns"));
 var _xdgBasedir = _interopRequireDefault(require("xdg-basedir"));
 var _devEnvironmentCore = require("./dev-environment-core");
 var _devEnvironment = require("../constants/dev-environment");
 var _dockerUtils = require("./docker-utils");
 var _userError = _interopRequireDefault(require("../user-error"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-// @format
 /**
  * External dependencies
  */
+
 /**
  * Internal dependencies
  */
+
 /**
  * This file will hold all the interactions with lando library
  */
 const DEBUG_KEY = '@automattic/vip:bin:dev-environment';
 const debug = (0, _debug.default)(DEBUG_KEY);
+
 /**
- * @return {Promise<object>} Lando configuration
+ * @return {Promise<LandoConfig>} Lando configuration
  */
 async function getLandoConfig() {
-  const nodeModulesPath = _path.default.join(__dirname, '..', '..', '..', 'node_modules');
-  const landoPath = _path.default.join(nodeModulesPath, 'lando');
-  const atLandoPath = _path.default.join(nodeModulesPath, '@lando');
+  const nodeModulesPath = _nodePath.default.join(__dirname, '..', '..', '..', 'node_modules');
+  const landoPath = _nodePath.default.join(nodeModulesPath, 'lando');
+  const atLandoPath = _nodePath.default.join(nodeModulesPath, '@lando');
   debug(`Getting Lando config, using paths '${landoPath}' and '${atLandoPath}' for plugins`);
   const isLandoDebugSelected = _debug.default.enabled(DEBUG_KEY);
   const isAllDebugSelected = _debug.default.enabled('"*"');
@@ -63,11 +64,13 @@ async function getLandoConfig() {
   } else {
     logLevelConsole = 'warn';
   }
-  const vipDir = _path.default.join(_xdgBasedir.default.data || _os.default.tmpdir(), 'vip');
-  const landoDir = _path.default.join(vipDir, 'lando');
-  const fakeHomeDir = _path.default.join(landoDir, 'home');
+
+  // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+  const vipDir = _nodePath.default.join(_xdgBasedir.default.data || (0, _nodeOs.tmpdir)(), 'vip'); // NOSONAR
+  const landoDir = _nodePath.default.join(vipDir, 'lando');
+  const fakeHomeDir = _nodePath.default.join(landoDir, 'home');
   try {
-    await _fs.default.promises.mkdir(fakeHomeDir, {
+    await (0, _promises.mkdir)(fakeHomeDir, {
       recursive: true
     });
   } catch (err) {
@@ -75,7 +78,7 @@ async function getLandoConfig() {
   }
   const config = {
     logLevelConsole,
-    configSources: [_path.default.join(landoDir, 'config.yml')],
+    configSources: [_nodePath.default.join(landoDir, 'config.yml')],
     landoFile: '.lando.yml',
     preLandoFiles: ['.lando.base.yml', '.lando.dist.yml', '.lando.upstream.yml'],
     postLandoFiles: ['.lando.local.yml'],
@@ -94,17 +97,32 @@ async function getLandoConfig() {
   return (0, _bootstrap.buildConfig)(config);
 }
 const appMap = new Map();
+async function initLandoApplication(lando, instancePath) {
+  const app = lando.getApp(instancePath);
+  app.events.on('post-init', 1, () => {
+    const initOnly = [];
+    Object.keys(app.config.services).forEach(serviceName => {
+      if (app.config.services[serviceName].initOnly) {
+        initOnly.push(serviceName);
+        app.config.services[serviceName].scanner = false;
+      }
+    });
+    app.services = app.services.filter(service => !initOnly.includes(service));
+  });
+  await app.init();
+  return app;
+}
 async function regenerateLandofile(instancePath) {
-  const landoFile = _path.default.join(instancePath, '.lando.yml');
+  const landoFile = _nodePath.default.join(instancePath, '.lando.yml');
   try {
     const now = new Date().toISOString().replace(/[^\d]/g, '').slice(0, -3);
     const backup = `${landoFile}.${now}`;
-    await _fs.default.promises.rename(landoFile, backup);
+    await (0, _promises.rename)(landoFile, backup);
     console.warn(_chalk.default.yellow('Backed up %s to %s'), landoFile, backup);
   } catch (err) {
     // Rename failed - possibly the file does not exist. Silently ignoring.
   }
-  const slug = _path.default.basename(instancePath);
+  const slug = _nodePath.default.basename(instancePath);
   const currentInstanceData = (0, _devEnvironmentCore.readEnvironmentData)(slug);
   currentInstanceData.pullAfter = 0;
   await (0, _devEnvironmentCore.updateEnvironment)(currentInstanceData);
@@ -120,9 +138,7 @@ async function landoRecovery(lando, instancePath, error) {
   }
   console.error(_chalk.default.green('Recovery successful, trying to initialize again...'));
   try {
-    const app = lando.getApp(instancePath);
-    await app.init();
-    return app;
+    return await initLandoApplication(lando, instancePath);
   } catch (initError) {
     console.error(`${_chalk.default.bold.red('Initialization failed, aborting.')} Please recreate the environment or contact support.`);
     throw initError;
@@ -139,8 +155,7 @@ async function getLandoApplication(lando, instancePath) {
     }
     let app;
     try {
-      app = lando.getApp(instancePath);
-      await app.init();
+      app = await initLandoApplication(lando, instancePath);
     } catch (error) {
       app = await landoRecovery(lando, instancePath, error);
     }
@@ -164,13 +179,13 @@ async function bootstrapLando() {
       const instanceData = (0, _devEnvironmentCore.readEnvironmentData)(data.name);
       let registryResolvable = false;
       try {
-        registryResolvable = (await _dns.default.promises.lookup('ghcr.io')).address || false;
+        registryResolvable = (await (0, _promises2.lookup)('ghcr.io')).address.length > 0 || false;
         debug('Registry ghcr.io is resolvable');
       } catch (err) {
         debug('Registry ghcr.io is not resolvable, image pull might be broken.');
         registryResolvable = false;
       }
-      const pull = registryResolvable && (instanceData.pullAfter || 0) < Date.now();
+      const pull = registryResolvable && (instanceData.pullAfter ?? 0) < Date.now();
       if (Array.isArray(data.opts.pullable) && Array.isArray(data.opts.local) && data.opts.local.length === 0 && !pull) {
         // Setting `data.opts.pullable` to an empty array prevents Lando from pulling images with `docker pull`.
         // Note that if some of the images are not available, they will still be pulled by `docker-compose`.
@@ -206,12 +221,12 @@ async function landoLogs(lando, instancePath, options) {
     debug('Will show lando logs on path:', instancePath, ' with options: ', options);
     const app = await getLandoApplication(lando, instancePath);
     const logTask = lando.tasks.find(task => task.command === 'logs');
-    await logTask.run({
+    await (logTask === null || logTask === void 0 ? void 0 : logTask.run({
       follow: options.follow,
       service: options.service,
       timestamps: options.timestamps,
       _app: app
-    });
+    }));
   } finally {
     const duration = new Date().getTime() - started.getTime();
     debug('landoLogs() took %d ms', duration);
@@ -230,12 +245,8 @@ async function landoRebuild(lando, instancePath) {
     debug('landoRebuild() took %d ms', duration);
   }
 }
-
-/**
- * @return {Promise<import('dockerode').NetworkInspectInfo | null>}
- */
 async function getBridgeNetwork(lando) {
-  const networkName = lando.config.networkBridge || 'lando_bridge_network';
+  const networkName = lando.config.networkBridge ?? 'lando_bridge_network';
   try {
     return await lando.engine.getNetwork(networkName).inspect();
   } catch (err) {
@@ -285,15 +296,15 @@ async function landoInfo(lando, instancePath, options = {}) {
   try {
     var _app$info$find;
     const app = await getLandoApplication(lando, instancePath);
-    let appInfo = _utils.default.startTable(app);
+    const info = _utils.default.startTable(app);
     const reachableServices = app.info.filter(service => service.urls.length);
-    reachableServices.forEach(service => appInfo[`${service.service} urls`] = service.urls);
+    reachableServices.forEach(service => info[`${service.service} urls`] = service.urls);
     const health = await checkEnvHealth(lando, instancePath);
-    const frontEndUrl = (_app$info$find = app.info.find(service => 'nginx' === service.service)) === null || _app$info$find === void 0 ? void 0 : _app$info$find.urls[0];
+    const frontEndUrl = ((_app$info$find = app.info.find(service => 'nginx' === service.service)) === null || _app$info$find === void 0 ? void 0 : _app$info$find.urls[0]) ?? '';
     const extraService = await getExtraServicesConnections(lando, app);
-    appInfo = {
-      slug: appInfo.name.replace(/^vipdev/, ''),
-      ...appInfo,
+    const appInfo = {
+      slug: info.name.replace(/^vipdev/, ''),
+      ...info,
       ...extraService
     };
     delete appInfo.name;
@@ -356,22 +367,21 @@ async function getExtraServicesConnections(lando, app) {
     project: app.project
   });
   for (const service of allServices) {
-    var _containerScan$Networ;
-    const displayConfiguration = extraServiceDisplayConfiguration.find(conf => conf.name === service.service) || {};
-    if (displayConfiguration.skip) {
+    const displayConfiguration = extraServiceDisplayConfiguration.find(conf => conf.name === service.service);
+    if (!displayConfiguration || displayConfiguration.skip) {
       continue;
     }
 
     // eslint-disable-next-line no-await-in-loop
-    const containerScan = service !== null && service !== void 0 && service.id ? await lando.engine.docker.scan(service === null || service === void 0 ? void 0 : service.id) : null;
-    if (containerScan !== null && containerScan !== void 0 && (_containerScan$Networ = containerScan.NetworkSettings) !== null && _containerScan$Networ !== void 0 && _containerScan$Networ.Ports) {
+    const containerScan = service.id ? await lando.engine.docker.scan(service.id) : null;
+    if (containerScan !== null && containerScan !== void 0 && containerScan.NetworkSettings.Ports) {
       const mappings = Object.keys(containerScan.NetworkSettings.Ports).map(internalPort => containerScan.NetworkSettings.Ports[internalPort]).filter(externalMapping => externalMapping === null || externalMapping === void 0 ? void 0 : externalMapping.length);
-      if (mappings !== null && mappings !== void 0 && mappings.length) {
+      if (mappings.length) {
         const {
           HostIp: host,
           HostPort: port
         } = mappings[0][0];
-        const label = displayConfiguration.label || service.service;
+        const label = displayConfiguration.label ?? service.service;
         const value = (displayConfiguration.protocol ? `${displayConfiguration.protocol}://` : '') + `${host}:${port}`;
         extraServices[label] = value;
       }
@@ -388,9 +398,17 @@ async function checkEnvHealth(lando, instancePath) {
       urls[url] = service.service;
     });
   });
-  const scanResults = await app.scanUrls(Object.keys(urls), {
-    max: 1
-  });
+  const urlsToScan = Object.keys(urls);
+  let scanResults = [];
+  if (Array.isArray(app.urls)) {
+    scanResults = app.urls;
+    app.urls.forEach(entry => urlsToScan.splice(urlsToScan.indexOf(entry.url), 1));
+  }
+  if (urlsToScan.length) {
+    scanResults = scanResults.concat(await app.scanUrls(urlsToScan, {
+      max: 1
+    }));
+  }
   const result = {};
   scanResults.forEach(scanResult => {
     result[urls[scanResult.url]] = scanResult.status;
@@ -403,7 +421,7 @@ async function isEnvUp(lando, instancePath) {
   const now = new Date();
   const app = await getLandoApplication(lando, instancePath);
   const reachableServices = app.info.filter(service => service.urls.length);
-  const webUrls = reachableServices.map(service => service.urls).flat().filter(url => !url.match(/^https?:\/\/(localhost|127\.0\.0\.1):/));
+  const webUrls = reachableServices.map(service => service.urls).flat().filter(url => !/^https?:\/\/(localhost|127\.0\.0\.1):/.exec(url));
   const scanResult = await app.scanUrls(webUrls, {
     max: 1
   });
@@ -411,7 +429,7 @@ async function isEnvUp(lando, instancePath) {
   debug('isEnvUp took %d ms', duration);
 
   // If all the URLs are reachable then the app is considered 'up'
-  return scanResult.length && scanResult.filter(result => result.status).length === scanResult.length;
+  return scanResult.length > 0 && scanResult.filter(result => result.status).length === scanResult.length;
 }
 async function landoExec(lando, instancePath, toolName, args, options) {
   const app = await getLandoApplication(lando, instancePath);
@@ -451,12 +469,12 @@ async function landoShell(lando, instancePath, service, user, command) {
     command = ['/bin/sh', '-c', `if [ -x /bin/bash ]; then /bin/bash ${interactive}; else /bin/sh ${interactive}; fi; exit 0`];
   }
   debug('Running command "%o" in service "%s" as user "%s"', command, service, user);
-  await shellTask.run({
+  await (shellTask === null || shellTask === void 0 ? void 0 : shellTask.run({
     command,
     service,
     user,
     _app: app
-  });
+  }));
 }
 
 /**
@@ -470,7 +488,7 @@ async function landoShell(lando, instancePath, service, user, command) {
 async function removeDevToolsVolumes(lando, app) {
   debug('Attempting to removing dev-tools volumes');
   const scanResult = await lando.engine.docker.listVolumes();
-  const devToolsVolumeNames = ((scanResult === null || scanResult === void 0 ? void 0 : scanResult.Volumes) || []).map(volume => volume.Name)
+  const devToolsVolumeNames = scanResult.Volumes.map(volume => volume.Name)
   // eslint-disable-next-line security/detect-non-literal-regexp
   .filter(volumeName => new RegExp(`${app.project}.*devtools`).test(volumeName));
   debug('Will remove', devToolsVolumeNames);
@@ -480,17 +498,10 @@ async function removeDevToolsVolumes(lando, app) {
 
 /**
  * Remove volume
- *
- * @param {Lando}  lando
- * @param {string} volumeName
  */
 async function removeVolume(lando, volumeName) {
   debug(`Removing devtools volume ${volumeName}`);
-  const devToolsVolume = await lando.engine.docker.getVolume(volumeName);
-  if (!devToolsVolume) {
-    debug(`Volume ${volumeName} not found`);
-    return;
-  }
+  const devToolsVolume = lando.engine.docker.getVolume(volumeName);
   try {
     await devToolsVolume.remove();
     debug(`${volumeName} volume removed`);
@@ -505,12 +516,9 @@ async function removeVolume(lando, volumeName) {
  * to start due to missing network.
  *
  * This function tries to detect such scenario and remove the orphant. So that regular flow
- * can safelly add a network and a new proxy container.
- *
- * @param {Object} lando Bootstrapped Lando object
+ * can safely add a network and a new proxy container.
  */
 async function ensureNoOrphantProxyContainer(lando) {
-  var _status$State;
   const proxyContainerName = lando.config.proxyContainer;
   const docker = lando.engine.docker;
   const containers = await docker.listContainers({
@@ -520,20 +528,20 @@ async function ensureNoOrphantProxyContainer(lando) {
   if (!proxyContainerExists) {
     return;
   }
-  const proxyContainer = await docker.getContainer(proxyContainerName);
+  const proxyContainer = docker.getContainer(proxyContainerName);
   const status = await proxyContainer.inspect();
-  if (status !== null && status !== void 0 && (_status$State = status.State) !== null && _status$State !== void 0 && _status$State.Running) {
+  if (status.State.Running) {
     return;
   }
   await proxyContainer.remove();
 }
-async function validateDockerInstalled(lando) {
+function validateDockerInstalled(lando) {
   lando.log.verbose('docker-engine exists: %s', lando.engine.dockerInstalled);
-  if (lando.engine.dockerInstalled === false) {
-    throw Error('docker could not be located! Please follow the following instructions to install it - https://docs.docker.com/engine/install/');
+  if (!lando.engine.dockerInstalled) {
+    throw new _userError.default('docker could not be located! Please follow the following instructions to install it - https://docs.docker.com/engine/install/');
   }
   lando.log.verbose('docker-compose exists: %s', lando.engine.composeInstalled);
-  if (lando.engine.composeInstalled === false) {
+  if (!lando.engine.composeInstalled) {
     throw Error('docker-compose could not be located! Please follow the following instructions to install it - https://docs.docker.com/compose/install/');
   }
 }
@@ -543,6 +551,6 @@ async function validateDockerAccess(lando) {
   try {
     await docker.info();
   } catch (error) {
-    throw Error('Failed to connect to Docker. Please verify that Docker engine (service) is running and follow the troubleshooting instructions for your platform.');
+    throw new _userError.default('Failed to connect to Docker. Please verify that Docker engine (service) is running and follow the troubleshooting instructions for your platform.');
   }
 }

package/dist/lib/dev-environment/docker-utils.js

@@ -9,12 +9,12 @@ exports.splitca = splitca;
 var _nodeFs = require("node:fs");
 var _promises = require("node:fs/promises");
 var _nodeOs = require("node:os");
-var _nodePath = _interopRequireDefault(require("node:path"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _nodePath = require("node:path");
 /* eslint-disable no-await-in-loop */
 /**
  * External dependencies
  */
+
 /**
  * Reads a Certificate Authority file and returns it as an array of certificates
  *
@@ -24,7 +24,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 async function splitca(filepath) {
   const ca = [];
   const data = await (0, _promises.readFile)(filepath, 'utf-8');
-  if (data.indexOf('-END CERTIFICATE-') < 0 || data.indexOf('-BEGIN CERTIFICATE-') < 0) {
+  if (!data.includes('-END CERTIFICATE-') || !data.includes('-BEGIN CERTIFICATE-')) {
     throw new Error("File does not contain 'BEGIN CERTIFICATE' or 'END CERTIFICATE'");
   }
   const chain = data.split('\n');
@@ -32,7 +32,7 @@ async function splitca(filepath) {
   for (const line of chain) {
     if (line) {
       cert.push(line);
-      if (line.match(/-END CERTIFICATE-/)) {
+      if (/-END CERTIFICATE-/.exec(line)) {
         ca.push(cert.join('\n'));
         cert = [];
       }
@@ -51,10 +51,9 @@ async function canReadWrite(what) {
 }
 async function getDockerSocket() {
   if ((0, _nodeOs.platform)() !== 'win32') {
-    var _process$env$DOCKER_H;
-    const possibleSocket = (_process$env$DOCKER_H = process.env.DOCKER_HOST) !== null && _process$env$DOCKER_H !== void 0 ? _process$env$DOCKER_H : '';
+    const possibleSocket = process.env.DOCKER_HOST ?? '';
     // If `DOCKER_HOST` is set and not empty, and if it does not point to a unix socket, return - not much that we can do here.
-    if (possibleSocket && !/^unix:\/\//.test(possibleSocket)) {
+    if (possibleSocket && !possibleSocket.startsWith('unix://')) {
       return possibleSocket;
     }
     const paths = [];
@@ -67,7 +66,7 @@ async function getDockerSocket() {
     // Try the default location
     paths.push('/var/run/docker.sock');
     // Try an alternative location
-    paths.push(_nodePath.default.join((0, _nodeOs.homedir)(), '.docker', 'run', 'docker.sock'));
+    paths.push((0, _nodePath.join)((0, _nodeOs.homedir)(), '.docker', 'run', 'docker.sock'));
     for (const socketPath of paths) {
       try {
         const stats = await (0, _promises.stat)(socketPath);
@@ -102,7 +101,7 @@ async function getEngineConfig(dockerHost) {
   }
   const certPath = process.env.DOCKER_CERT_PATH;
   if (certPath) {
-    const [ca, cert, key] = await Promise.all([splitca(_nodePath.default.join(certPath, 'ca.pem')), (0, _promises.readFile)(_nodePath.default.join(certPath, 'cert.pem'), 'utf-8'), (0, _promises.readFile)(_nodePath.default.join(certPath, 'key.pem'), 'utf-8')]);
+    const [ca, cert, key] = await Promise.all([splitca((0, _nodePath.join)(certPath, 'ca.pem')), (0, _promises.readFile)((0, _nodePath.join)(certPath, 'cert.pem'), 'utf-8'), (0, _promises.readFile)((0, _nodePath.join)(certPath, 'key.pem'), 'utf-8')]);
     opts.ca = ca;
     opts.cert = cert;
     opts.key = key;

package/dist/lib/envvar/api-get-all.js

@@ -33,7 +33,7 @@ const query = (0, _graphqlTag.default)`
 	}
 `;
 async function getEnvVars(appId, envId) {
-  var _ref, _data$app, _data$app$environment, _data$app$environment2, _data$app$environment3;
+  var _data$app;
   const api = await (0, _api.default)();
   const variables = {
     appId,
@@ -45,5 +45,5 @@ async function getEnvVars(appId, envId) {
     query,
     variables
   });
-  return (_ref = (_data$app = data.app) === null || _data$app === void 0 ? void 0 : (_data$app$environment = _data$app.environments) === null || _data$app$environment === void 0 ? void 0 : (_data$app$environment2 = _data$app$environment[0]) === null || _data$app$environment2 === void 0 ? void 0 : (_data$app$environment3 = _data$app$environment2.environmentVariables) === null || _data$app$environment3 === void 0 ? void 0 : _data$app$environment3.nodes) !== null && _ref !== void 0 ? _ref : null;
+  return ((_data$app = data.app) === null || _data$app === void 0 || (_data$app = _data$app.environments) === null || _data$app === void 0 || (_data$app = _data$app[0]) === null || _data$app === void 0 || (_data$app = _data$app.environmentVariables) === null || _data$app === void 0 ? void 0 : _data$app.nodes) ?? null;
 }

package/dist/lib/envvar/api-list.js

@@ -34,7 +34,7 @@ const query = (0, _graphqlTag.default)`
 
 // List the names (but not values) of environment variables.
 async function listEnvVars(appId, envId) {
-  var _data$app$environment, _data$app, _data$app$environment2, _data$app$environment3, _data$app$environment4;
+  var _data$app;
   const api = await (0, _api.default)();
   const variables = {
     appId,
@@ -46,9 +46,6 @@ async function listEnvVars(appId, envId) {
     query,
     variables
   });
-  const nodes = (_data$app$environment = (_data$app = data.app) === null || _data$app === void 0 ? void 0 : (_data$app$environment2 = _data$app.environments) === null || _data$app$environment2 === void 0 ? void 0 : (_data$app$environment3 = _data$app$environment2[0]) === null || _data$app$environment3 === void 0 ? void 0 : (_data$app$environment4 = _data$app$environment3.environmentVariables) === null || _data$app$environment4 === void 0 ? void 0 : _data$app$environment4.nodes) !== null && _data$app$environment !== void 0 ? _data$app$environment : [];
-  return nodes.map(entry => {
-    var _entry$name;
-    return (_entry$name = entry === null || entry === void 0 ? void 0 : entry.name) !== null && _entry$name !== void 0 ? _entry$name : '';
-  });
+  const nodes = ((_data$app = data.app) === null || _data$app === void 0 || (_data$app = _data$app.environments) === null || _data$app === void 0 || (_data$app = _data$app[0]) === null || _data$app === void 0 || (_data$app = _data$app.environmentVariables) === null || _data$app === void 0 ? void 0 : _data$app.nodes) ?? [];
+  return nodes.map(entry => (entry === null || entry === void 0 ? void 0 : entry.name) ?? '');
 }

package/dist/lib/envvar/input.js

@@ -29,7 +29,6 @@ function confirm(message) {
   }).run().catch(() => false);
 }
 async function promptForValue(message, mustMatch) {
-  var _str$trim;
   const {
     str
   } = await (0, _enquirer.prompt)({
@@ -43,5 +42,5 @@ async function promptForValue(message, mustMatch) {
       return true;
     }
   });
-  return (_str$trim = str === null || str === void 0 ? void 0 : str.trim()) !== null && _str$trim !== void 0 ? _str$trim : '';
+  return (str === null || str === void 0 ? void 0 : str.trim()) ?? '';
 }