@automattic/vip 3.5.0 → 3.6.0

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

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

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

@@ -24,7 +24,7 @@ const examples = [{
 }).option('slug', 'A unique name for a local environment. Default is "vip-local".', undefined, _devEnvironmentCli.processSlug).option('soft', 'Preserve an environment’s configuration files; allows an environment to be regenerated with the start command.').examples(examples).argv(process.argv, async (arg, opt) => {
   const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
-  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
+  (0, _devEnvironmentCli.validateDependencies)(lando);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_destroy_command_execute', trackingInfo);
   debug('Args: ', arg, 'Options: ', opt);

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

@@ -26,7 +26,7 @@ const examples = [{
 }).option('slug', 'A unique name for a local environment. Default is "vip-local".', undefined, _devEnvironmentCli.processSlug).option('force', 'Skip validation for a local environment to be in a running state.', undefined, _devEnvironmentCli.processBooleanOption).option('quiet', 'Suppress informational messages.', undefined, _devEnvironmentCli.processBooleanOption).examples(examples).argv(process.argv, async (unmatchedArgs, opt) => {
   const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
-  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
+  (0, _devEnvironmentCli.validateDependencies)(lando);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_exec_command_execute', trackingInfo);
   try {

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

@@ -36,7 +36,7 @@ const examples = [{
     slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
     trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   }
-  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
+  (0, _devEnvironmentCli.validateDependencies)(lando);
   await (0, _tracker.trackEvent)('dev_env_info_command_execute', trackingInfo);
   debug('Args: ', arg, 'Options: ', opt);
   try {

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

@@ -18,7 +18,7 @@ const examples = [{
 }).examples(examples).argv(process.argv, async () => {
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
   lando.events.constructor.prototype.setMaxListeners(1024);
-  await (0, _devEnvironmentCli.validateDependencies)(lando, '');
+  (0, _devEnvironmentCli.validateDependencies)(lando);
   const trackingInfo = {
     all: true
   };

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

@@ -26,7 +26,7 @@ const examples = [{
 }).option('slug', 'A unique name for a local environment. Default is "vip-local".', undefined, _devEnvironmentCli.processSlug).option(['f', 'follow'], 'Continually output logs as they are generated.').option('service', 'Restrict to a single service.').examples(examples).argv(process.argv, async (arg, opt) => {
   const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
-  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
+  (0, _devEnvironmentCli.validateDependencies)(lando);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_logs_command_execute', trackingInfo);
   debug('Args: ', arg, 'Options: ', opt);

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

@@ -49,7 +49,7 @@ const examples = [{
     all: true
   };
   await (0, _tracker.trackEvent)('dev_env_purge_command_execute', trackingInfo);
-  await (0, _devEnvironmentCli.validateDependencies)(lando, '');
+  (0, _devEnvironmentCli.validateDependencies)(lando);
   const removeFiles = !(opt.soft || false);
   try {
     for (const slug of allEnvNames) {

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

@@ -58,7 +58,7 @@ function getCommand(args) {
 }).option('slug', 'A unique name for a local environment. Default is "vip-local".', undefined, _devEnvironmentCli.processSlug).option('root', 'Create with root privileges.').option('service', 'Restrict to a single service.').examples(examples).argv(process.argv, async (args, opt) => {
   const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
-  await (0, _devEnvironmentCli.validateDependencies)(lando, '');
+  (0, _devEnvironmentCli.validateDependencies)(lando);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_shell_command_execute', trackingInfo);
   debug('Args: ', args, 'Options: ', opt);

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

@@ -29,7 +29,7 @@ const examples = [{
 }).option('slug', 'A unique name for a local environment. Default is "vip-local".', undefined, _devEnvironmentCli.processSlug).option('skip-rebuild', 'Only start services that are not in a running state.').option(['w', 'skip-wp-versions-check'], 'Skip the prompt to update WordPress; occurs if the last major release version is not configured.').option('vscode', 'Generate a Visual Studio Code Workspace file.').examples(examples).argv(process.argv, async (arg, opt) => {
   const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
-  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
+  (0, _devEnvironmentCli.validateDependencies)(lando);
   const startProcessing = new Date();
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   trackingInfo.vscode = Boolean(opt.vscode);

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

@@ -23,7 +23,7 @@ const examples = [{
   usage
 }).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, '');
+  (0, _devEnvironmentCli.validateDependencies)(lando);
   debug('Args: ', arg, 'Options: ', opt);
 
   /** @type {Record< string, unknown >} */

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

@@ -32,7 +32,7 @@ cmd.examples(examples);
 cmd.argv(process.argv, async (arg, opt) => {
   const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
-  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
+  (0, _devEnvironmentCli.validateDependencies)(lando);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_update_command_execute', trackingInfo);
   try {

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

@@ -26,7 +26,7 @@ class DevEnvImportSQLCommand {
   }
   async run() {
     const lando = await (0, _devEnvironmentLando.bootstrapLando)();
-    await (0, _devEnvironmentCli.validateDependencies)(lando, this.slug);
+    (0, _devEnvironmentCli.validateDependencies)(lando);
     (0, _sql.validateImportFileExtension)(this.fileName);
 
     // Check if file is compressed and if so, extract the

package/dist/lib/cli/command.js

@@ -250,7 +250,7 @@ _args.default.argv = async function (argv, cb) {
         });
         exit.withError('Environment production is not allowed for this command');
       }
-      const env = options.app.environments.find(cur => getEnvIdentifier(cur) === options.env);
+      const env = options.app.environments.find(cur => getEnvIdentifier(cur).toLowerCase() === options.env.toLowerCase());
       if (!env) {
         await (0, _tracker.trackEvent)('command_childcontext_param_error', {
           error: `Invalid child environment (${options.env}) specified`

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

@@ -33,7 +33,6 @@ var _child_process = require("child_process");
 var _debug = _interopRequireDefault(require("debug"));
 var _enquirer = require("enquirer");
 var _formatters = _interopRequireDefault(require("lando/lib/formatters"));
-var _promises = require("node:dns/promises");
 var _nodeFs = require("node:fs");
 var _nodeOs = require("node:os");
 var _path = _interopRequireDefault(require("path"));
@@ -98,38 +97,9 @@ async function handleCLIException(exception, trackKey, trackBaseInfo = {}) {
     debug(exception);
   }
 }
-const verifyDNSResolution = async (slug, domain) => {
-  const expectedIP = '127.0.0.1';
-  const testDomain = `${slug}.${domain}`;
-  const advice = `Please add following line to hosts file on your system:\n\n${expectedIP} ${testDomain}\n\nLearn more: https://docs.wpvip.com/vip-local-development-environment/troubleshooting-dev-env/#h-resolve-networking-configuration-issues\n`;
-  debug(`Verifying DNS resolution for ${testDomain}`);
-  try {
-    let address;
-    try {
-      address = await (0, _promises.lookup)(testDomain, 4);
-      debug(`Got DNS response ${address.address}`);
-    } catch (error) {
-      throw new _userError.default(`DNS resolution for ${testDomain} failed.`, {
-        cause: error
-      });
-    }
-    if (address.address !== expectedIP) {
-      throw new _userError.default(`DNS resolution for ${testDomain} returned unexpected IP ${address.address}. Expected value is ${expectedIP}.`);
-    }
-  } catch (error) {
-    if (error instanceof _userError.default) {
-      console.warn(_chalk.default.yellow.bold('Warning:'), `${error.message}\n\n${advice}`);
-    } else {
-      throw error;
-    }
-  }
-};
-const validateDependencies = async (lando, slug) => {
+const validateDependencies = lando => {
   const now = new Date();
   (0, _devEnvironmentLando.validateDockerInstalled)(lando);
-  if (slug) {
-    await verifyDNSResolution(slug, lando.config.domain ?? 'vipdev.lndo.site');
-  }
   const duration = new Date().getTime() - now.getTime();
   debug('Validation checks completed in %d ms', duration);
 };

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

@@ -250,6 +250,7 @@ async function printEnvironmentInfo(lando, slug, options) {
       xdebug += ' (with additional configuration)';
     }
     appInfo.xdebug = xdebug;
+    appInfo.cron = environmentData.cron ? 'enabled' : 'disabled';
     appInfo.wordpress = parseComponentForInfo(environmentData.wordpress);
     appInfo['Mu plugins'] = parseComponentForInfo(environmentData.muPlugins);
     appInfo['App Code'] = parseComponentForInfo(environmentData.appCode);

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

@@ -390,6 +390,36 @@ async function getExtraServicesConnections(lando, app) {
   }
   return extraServices;
 }
+async function tryResolveDomains(urls) {
+  const domains = [...new Set(urls.filter(url => url.toLowerCase().startsWith('http')).map(url => {
+    try {
+      return new URL(url).hostname;
+    } catch (err) {
+      return undefined;
+    }
+  }).filter(domain => domain !== undefined))];
+  const domainsToFix = [];
+  for (const domain of domains) {
+    try {
+      // eslint-disable-next-line no-await-in-loop
+      const address = await (0, _promises.lookup)(domain, 4);
+      debug('%s resolves to %s', domain, address.address);
+      if (address.address !== '127.0.0.1') {
+        domainsToFix.push(domain);
+        console.warn(_chalk.default.yellow.bold('WARNING:'), `${domain} resolves to ${address.address} instead of 127.0.0.1. Things may not work as expected.`);
+      }
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : 'Unknown error';
+      domainsToFix.push(domain);
+      console.warn(_chalk.default.yellow.bold('WARNING:'), `Failed to resolve ${domain}: ${msg}`);
+    }
+  }
+  if (domainsToFix.length) {
+    console.warn(_chalk.default.yellow('Please add the following lines to the hosts file on your system:\n'));
+    console.warn(domainsToFix.map(domain => `127.0.0.1 ${domain}`).join('\n'));
+    console.warn(_chalk.default.yellow('\nLearn more: https://docs.wpvip.com/vip-local-development-environment/troubleshooting-dev-env/#h-resolve-networking-configuration-issues\n'));
+  }
+}
 async function checkEnvHealth(lando, instancePath) {
   const urls = {};
   const now = new Date();
@@ -400,10 +430,17 @@ async function checkEnvHealth(lando, instancePath) {
     });
   });
   const urlsToScan = Object.keys(urls).filter(url => !url.includes('*'));
+  await tryResolveDomains(urlsToScan);
   let scanResults = [];
   if (Array.isArray(app.urls)) {
     scanResults = app.urls;
-    app.urls.forEach(entry => urlsToScan.splice(urlsToScan.indexOf(entry.url), 1));
+    app.urls.forEach(entry => {
+      // We use different status codes to see if the service is up.
+      // We may consider the service is up when Lando considers it is down.
+      if (entry.color !== 'red') {
+        urlsToScan.splice(urlsToScan.indexOf(entry.url), 1);
+      }
+    });
   }
   if (urlsToScan.length) {
     scanResults = scanResults.concat(await app.scanUrls(urlsToScan, {
@@ -424,8 +461,10 @@ async function isEnvUp(lando, instancePath) {
   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 => !/^https?:\/\/(localhost|127\.0\.0\.1):/.exec(url));
+  await tryResolveDomains(webUrls);
   const scanResult = await app.scanUrls(webUrls, {
-    max: 1
+    max: 1,
+    waitCodes: [502, 504]
   });
   const duration = new Date().getTime() - now.getTime();
   debug('isEnvUp took %d ms', duration);

package/docs/CHANGELOG.md

@@ -1,5 +1,20 @@
 ## Changelog
 
+## 3.6.0
+
+* build(deps-dev): bump rimraf from 5.0.7 to 5.0.8
+* feat(dev-env): add DNS check to health check to ensure domains resolve correctly
+
+**Full Changelog**: https://github.com/Automattic/vip-cli/compare/3.5.1...3.6.0
+
+## 3.5.1
+
+* fix(dev-env): display cron status in `vip dev-env info --extended`
+* build(deps-dev): bump typescript from 5.5.2 to 5.5.3
+* fix: case mismatch in environment identifier matcher
+
+**Full Changelog**: https://github.com/Automattic/vip-cli/compare/3.5.0...3.5.1
+
 ### 3.5.0
 
 * feat(dev-env): add support for cron

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@automattic/vip",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@automattic/vip",
-      "version": "3.5.0",
+      "version": "3.6.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -139,7 +139,7 @@
         "jest": "^29.7.0",
         "nock": "13.5.4",
         "prettier": "npm:wp-prettier@2.8.5",
-        "rimraf": "5.0.7",
+        "rimraf": "5.0.8",
         "typescript": "^5.2.2"
       },
       "engines": {
@@ -11518,9 +11518,9 @@
       }
     },
     "node_modules/rimraf": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.7.tgz",
-      "integrity": "sha512-nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg==",
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.8.tgz",
+      "integrity": "sha512-XSh0V2/yNhDEi8HwdIefD8MLgs4LQXPag/nEJWs3YUc3Upn+UHa1GyIkEg9xSSNt7HnkO5FjTvmcRzgf+8UZuw==",
       "dependencies": {
         "glob": "^10.3.7"
       },
@@ -11528,7 +11528,7 @@
         "rimraf": "dist/esm/bin.mjs"
       },
       "engines": {
-        "node": ">=14.18"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -12643,9 +12643,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz",
-      "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==",
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz",
+      "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -21846,9 +21846,9 @@
       "dev": true
     },
     "rimraf": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.7.tgz",
-      "integrity": "sha512-nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg==",
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.8.tgz",
+      "integrity": "sha512-XSh0V2/yNhDEi8HwdIefD8MLgs4LQXPag/nEJWs3YUc3Upn+UHa1GyIkEg9xSSNt7HnkO5FjTvmcRzgf+8UZuw==",
       "requires": {
         "glob": "^10.3.7"
       },
@@ -22653,9 +22653,9 @@
       }
     },
     "typescript": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz",
-      "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==",
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz",
+      "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==",
       "dev": true
     },
     "typical": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {
@@ -138,7 +138,7 @@
     "jest": "^29.7.0",
     "nock": "13.5.4",
     "prettier": "npm:wp-prettier@2.8.5",
-    "rimraf": "5.0.7",
+    "rimraf": "5.0.8",
     "typescript": "^5.2.2"
   },
   "dependencies": {