@automattic/vip 2.23.0 → 2.24.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 ## Changelog
 
+## 2.24.0 (06 Dec 2022)
+
+- #1139 fix(dev-env): Fall back to copy when rename fails due to EXDEV
+- #1170 [dev-env] Substitute the check for forward slash to with a cross-platform regex when processing component argument value
+- #1174 Override WordPress image cache key in tests
+- #1175 Dev-env: Throw error if more than one environment found when starting
+- #1177 Logged out `vip --version`
+- #1178 chore(deps): Fix some of vulnerable dependencies
+- #1179 feat(dev-env): Do not prompt for missing values if stdin is not a TTY
+- #1180 fix(dev-env): Fix a typo in parameter description
+- #1181 fix(dev-env): Set SQL_MODE to match our production environment
+- #1182 Dev-env: Throw UserError in getEnvironmentName() instead and default to first one if only one env
+- #1184 Validate Preflight: Allow preflight checks to execute without explicit app and/or env
+- #1185 feat(dev-env): Add support for MailHog
+- #1186 feat(dev-env): Do not mount home directory into containers
+- #1188 fix: Make bin files executables
+- #1189 refactor(dev-env): Bootstrap Lando only once
+
 ## 2.23.0 (11 Nov 2022)
 
 - #1169 Preflight Validation: Change return code on error
@@ -9,19 +27,19 @@
 
 ## 2.22.0 (2 Nov 2022)
 
-#1165  Add caching type policy for `WPSite` data                                                           
-#1164  Fix regExp to categorize multisite tables during SQL Imports                                        
-#1163  Pull correct environment's details from API when displaying Multisite SQL Import preflight details  
-#1159  chore(deps): Bump debug from 4.3.3 to 4.3.4                                                         
-#1162  chore(deps): Bump update-notifier from 4.1.3 to 5.1.0                                               
-#1160  chore(deps): Bump json2csv from 5.0.6 to 5.0.7                                                      
-#1158  chore(deps): Bump args from 5.0.1 to 5.0.3                                                          
-#1157  chore(deps): Bump semver from 7.3.5 to 7.3.8                                                        
-#1155  chore(deps): Bump uuid from 8.3.2 to 9.0.0                                                          
-#1154  chore(deps): Update Babel-related packages                                                          
-#1153  chore(deps): Fix security vulnerabilities in dependencies                                           
-#1152  ci: Update workflows                                                                                
-#1151  refactor(dev-env): Modify `verifyDNSResolution()` to use Promises API                               
+#1165  Add caching type policy for `WPSite` data
+#1164  Fix regExp to categorize multisite tables during SQL Imports
+#1163  Pull correct environment's details from API when displaying Multisite SQL Import preflight details
+#1159  chore(deps): Bump debug from 4.3.3 to 4.3.4
+#1162  chore(deps): Bump update-notifier from 4.1.3 to 5.1.0
+#1160  chore(deps): Bump json2csv from 5.0.6 to 5.0.7
+#1158  chore(deps): Bump args from 5.0.1 to 5.0.3
+#1157  chore(deps): Bump semver from 7.3.5 to 7.3.8
+#1155  chore(deps): Bump uuid from 8.3.2 to 9.0.0
+#1154  chore(deps): Update Babel-related packages
+#1153  chore(deps): Fix security vulnerabilities in dependencies
+#1152  ci: Update workflows
+#1151  refactor(dev-env): Modify `verifyDNSResolution()` to use Promises API
 
 ### 2.21.0 (24 Oct 2022)
 

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

@@ -67,7 +67,7 @@ services:
     type: compose
     services:
       image: mariadb:<%= mariadb %>
-      command: docker-entrypoint.sh mysqld
+      command: docker-entrypoint.sh mysqld --sql-mode=ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
       ports:
         - ":3306"
       environment:
@@ -174,6 +174,11 @@ services:
       clientcode_vipconfig: {}
 <% } %>
 
+<% if ( mailhog ) { %>
+  mailhog:
+    type: mailhog
+<% } %>
+
 tooling:
   wp:
     service: php

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

@@ -18,6 +18,7 @@ var exit = _interopRequireWildcard(require("../lib/cli/exit"));
 var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
 var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 var _devEnvironment = require("../lib/constants/dev-environment");
+var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -51,8 +52,12 @@ cmd.argv(process.argv, async (arg, opt) => {
     env: opt.env,
     allowAppEnv: true
   };
-  const slug = (0, _devEnvironmentCli.getEnvironmentName)(environmentNameOptions);
-  await (0, _devEnvironmentCli.validateDependencies)(slug);
+  let slug = _devEnvironmentCli.DEFAULT_SLUG;
+  if (Object.keys(opt).length !== 0) {
+    slug = (0, _devEnvironmentCli.getEnvironmentName)(environmentNameOptions);
+  }
+  const lando = await (0, _devEnvironmentLando.bootstrapLando)();
+  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
   debug('Args: ', arg, 'Options: ', opt);
   const trackingInfo = {
     slug,
@@ -81,7 +86,7 @@ cmd.argv(process.argv, async (arg, opt) => {
   instanceData.siteSlug = slug;
   try {
     await (0, _devEnvironmentCore.createEnvironment)(instanceData);
-    await (0, _devEnvironmentCore.printEnvironmentInfo)(slug, {
+    await (0, _devEnvironmentCore.printEnvironmentInfo)(lando, slug, {
       extended: false
     });
     const message = '\n' + _chalk.default.green('✓') + ` environment created.\n\nTo start it please run:\n\n${startCommand}\n`;

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

@@ -17,6 +17,7 @@ var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
 var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 var _devEnvironment = require("../lib/constants/dev-environment");
+var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Internal dependencies
@@ -31,13 +32,14 @@ const examples = [{
 }];
 (0, _command.default)().option('slug', 'Custom name of the dev environment').option('soft', 'Keep config files needed to start an environment intact').examples(examples).argv(process.argv, async (arg, opt) => {
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
-  await (0, _devEnvironmentCli.validateDependencies)(slug);
+  const lando = await (0, _devEnvironmentLando.bootstrapLando)();
+  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_destroy_command_execute', trackingInfo);
   debug('Args: ', arg, 'Options: ', opt);
   try {
     const removeFiles = !(opt.soft || false);
-    await (0, _devEnvironmentCore.destroyEnvironment)(slug, removeFiles);
+    await (0, _devEnvironmentCore.destroyEnvironment)(lando, slug, removeFiles);
     const message = _chalk.default.green('✓') + ' Environment destroyed.\n';
     console.log(message);
     await (0, _tracker.trackEvent)('dev_env_destroy_command_success', trackingInfo);

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

@@ -19,6 +19,7 @@ var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
 var _devEnvironment = require("../lib/constants/dev-environment");
+var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} exec -- wp post list`,
@@ -37,7 +38,8 @@ const examples = [{
   return 'false' !== (value === null || value === void 0 ? void 0 : (_value$toLowerCase = value.toLowerCase) === null || _value$toLowerCase === void 0 ? void 0 : _value$toLowerCase.call(value));
 }).examples(examples).argv(process.argv, async (unmatchedArgs, opt) => {
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
-  await (0, _devEnvironmentCli.validateDependencies)(slug);
+  const lando = await (0, _devEnvironmentLando.bootstrapLando)();
+  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_exec_command_execute', trackingInfo);
   try {
@@ -54,7 +56,7 @@ const examples = [{
     const options = {
       force: opt.force
     };
-    await (0, _devEnvironmentCore.exec)(slug, arg, options);
+    await (0, _devEnvironmentCore.exec)(lando, slug, arg, options);
     await (0, _tracker.trackEvent)('dev_env_exec_command_success', trackingInfo);
   } catch (error) {
     (0, _devEnvironmentCli.handleCLIException)(error, 'dev_env_exec_command_error', trackingInfo);

package/dist/bin/vip-dev-env-import-media.js

@@ -19,6 +19,7 @@ var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
 var _devEnvironment = require("../lib/constants/dev-environment");
+var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} import media path/to/wp-content/uploads`,
@@ -32,7 +33,8 @@ const examples = [{
 }).examples(examples).option('slug', 'Custom name of the dev environment').argv(process.argv, async (unmatchedArgs, opt) => {
   const [filePath] = unmatchedArgs;
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
-  await (0, _devEnvironmentCli.validateDependencies)(slug);
+  const lando = await (0, _devEnvironmentLando.bootstrapLando)();
+  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_import_media_command_execute', trackingInfo);
   try {

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

@@ -17,6 +17,7 @@ var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
 var _devEnvironment = require("../lib/constants/dev-environment");
 var _sql = require("../lib/validations/sql");
+var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Internal dependencies
@@ -43,7 +44,8 @@ const examples = [{
     inPlace
   } = opt;
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
-  await (0, _devEnvironmentCli.validateDependencies)(slug);
+  const lando = await (0, _devEnvironmentLando.bootstrapLando)();
+  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_import_sql_command_execute', trackingInfo);
   try {
@@ -62,23 +64,23 @@ const examples = [{
       });
     }
     const importArg = ['wp', 'db', 'import', inContainerPath];
-    await (0, _devEnvironmentCore.exec)(slug, importArg);
+    await (0, _devEnvironmentCore.exec)(lando, slug, importArg);
     if (searchReplace && searchReplace.length && !inPlace) {
       _fs.default.unlinkSync(resolvedPath);
     }
     const cacheArg = ['wp', 'cache', 'flush'];
-    await (0, _devEnvironmentCore.exec)(slug, cacheArg);
+    await (0, _devEnvironmentCore.exec)(lando, slug, cacheArg);
     try {
-      await (0, _devEnvironmentCore.exec)(slug, ['wp', 'cli', 'has-command', 'vip-search']);
+      await (0, _devEnvironmentCore.exec)(lando, slug, ['wp', 'cli', 'has-command', 'vip-search']);
       const doIndex = await (0, _devEnvironmentCli.promptForBoolean)('Do you want to index data in ElasticSearch (used by enterprise search)?', true);
       if (doIndex) {
-        await (0, _devEnvironmentCore.exec)(slug, ['wp', 'vip-search', 'index', '--setup', '--network-wide', '--skip-confirm']);
+        await (0, _devEnvironmentCore.exec)(lando, slug, ['wp', 'vip-search', 'index', '--setup', '--network-wide', '--skip-confirm']);
       }
     } catch (err) {
       // Exception means they don't have vip-search enabled.
     }
     const addUserArg = ['wp', 'dev-env-add-admin', '--username=vipgo', '--password=password'];
-    await (0, _devEnvironmentCore.exec)(slug, addUserArg);
+    await (0, _devEnvironmentCore.exec)(lando, slug, addUserArg);
     await (0, _tracker.trackEvent)('dev_env_import_sql_command_success', trackingInfo);
   } catch (error) {
     (0, _devEnvironmentCli.handleCLIException)(error, 'dev_env_import_sql_command_error', trackingInfo);

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

@@ -16,6 +16,7 @@ var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
 var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 var _devEnvironment = require("../lib/constants/dev-environment");
+var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Internal dependencies
@@ -30,7 +31,8 @@ const examples = [{
 }];
 (0, _command.default)().option('slug', 'Custom name of the dev environment').option('all', 'Show Info for all local dev environments').option('extended', 'Show extended information about the dev environment').examples(examples).argv(process.argv, async (arg, opt) => {
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
-  await (0, _devEnvironmentCli.validateDependencies)(slug);
+  const lando = await (0, _devEnvironmentLando.bootstrapLando)();
+  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
   const trackingInfo = opt.all ? {
     all: true
   } : (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
@@ -41,9 +43,9 @@ const examples = [{
       extended: !!opt.extended
     };
     if (opt.all) {
-      await (0, _devEnvironmentCore.printAllEnvironmentsInfo)(options);
+      await (0, _devEnvironmentCore.printAllEnvironmentsInfo)(lando, options);
     } else {
-      await (0, _devEnvironmentCore.printEnvironmentInfo)(slug, options);
+      await (0, _devEnvironmentCore.printEnvironmentInfo)(lando, slug, options);
     }
     await (0, _tracker.trackEvent)('dev_env_info_command_success', trackingInfo);
   } catch (error) {

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

@@ -19,19 +19,21 @@ var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
 var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 var _devEnvironment = require("../lib/constants/dev-environment");
+var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} list`,
   description: 'Return information about all local dev environments'
 }];
 (0, _command.default)().examples(examples).argv(process.argv, async () => {
-  await (0, _devEnvironmentCli.validateDependencies)();
+  const lando = await (0, _devEnvironmentLando.bootstrapLando)();
+  await (0, _devEnvironmentCli.validateDependencies)(lando, '');
   const trackingInfo = {
     all: true
   };
   await (0, _tracker.trackEvent)('dev_env_list_command_execute', trackingInfo);
   try {
-    await (0, _devEnvironmentCore.printAllEnvironmentsInfo)({});
+    await (0, _devEnvironmentCore.printAllEnvironmentsInfo)(lando, {});
     await (0, _tracker.trackEvent)('dev_env_list_command_success', trackingInfo);
   } catch (error) {
     (0, _devEnvironmentCli.handleCLIException)(error, 'dev_env_list_command_error', trackingInfo);

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

@@ -18,6 +18,7 @@ var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
 var _devEnvironment = require("../lib/constants/dev-environment");
 var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
+var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Internal dependencies
@@ -30,9 +31,10 @@ const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} start`,
   description: 'Starts a local dev environment'
 }];
-(0, _command.default)().option('slug', 'Custom name of the dev environment').option('skip-rebuild', 'Only start stopped services').option(['w', 'skip-wp-versions-check'], 'Skip propting for wordpress update if non latest').examples(examples).argv(process.argv, async (arg, opt) => {
+(0, _command.default)().option('slug', 'Custom name of the dev environment').option('skip-rebuild', 'Only start stopped services').option(['w', 'skip-wp-versions-check'], 'Skip prompting for wordpress update if non latest').examples(examples).argv(process.argv, async (arg, opt) => {
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
-  await (0, _devEnvironmentCli.validateDependencies)(slug);
+  const lando = await (0, _devEnvironmentLando.bootstrapLando)();
+  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
   const startProcessing = new Date();
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_start_command_execute', trackingInfo);
@@ -56,7 +58,7 @@ const examples = [{
         }
       });
     }
-    await (0, _devEnvironmentCore.startEnvironment)(slug, options);
+    await (0, _devEnvironmentCore.startEnvironment)(lando, slug, options);
     const processingTime = Math.ceil((new Date() - startProcessing) / 1000); // in seconds
     const successTrackingInfo = {
       ...trackingInfo,

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

@@ -17,6 +17,7 @@ var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
 var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 var _devEnvironment = require("../lib/constants/dev-environment");
+var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Internal dependencies
@@ -28,12 +29,13 @@ const examples = [{
 }];
 (0, _command.default)().option('slug', 'Custom name of the dev environment').examples(examples).argv(process.argv, async (arg, opt) => {
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
-  await (0, _devEnvironmentCli.validateDependencies)(slug);
+  const lando = await (0, _devEnvironmentLando.bootstrapLando)();
+  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
   debug('Args: ', arg, 'Options: ', opt);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_stop_command_execute', trackingInfo);
   try {
-    await (0, _devEnvironmentCore.stopEnvironment)(slug);
+    await (0, _devEnvironmentCore.stopEnvironment)(lando, slug);
     const message = _chalk.default.green('✓') + ' environment stopped.\n';
     console.log(message);
     await (0, _tracker.trackEvent)('dev_env_stop_command_success', trackingInfo);

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

@@ -17,6 +17,7 @@ var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 var _devEnvironment = require("../lib/constants/dev-environment");
 var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
+var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Internal dependencies
@@ -31,7 +32,8 @@ const cmd = (0, _command.default)().option('slug', 'Custom name of the dev envir
 cmd.examples(examples);
 cmd.argv(process.argv, async (arg, opt) => {
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
-  await (0, _devEnvironmentCli.validateDependencies)(slug);
+  const lando = await (0, _devEnvironmentLando.bootstrapLando)();
+  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_update_command_execute', trackingInfo);
   try {
@@ -57,6 +59,7 @@ cmd.argv(process.argv, async (arg, opt) => {
       statsd: currentInstanceData.statsd,
       phpmyadmin: currentInstanceData.phpmyadmin,
       xdebug: currentInstanceData.xdebug,
+      mailhog: currentInstanceData.mailhog,
       mediaRedirectDomain: currentInstanceData.mediaRedirectDomain,
       multisite: false,
       title: ''

package/dist/bin/vip-validate-preflight.js

@@ -16,7 +16,9 @@ var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _fs = require("fs");
 var _ini = _interopRequireDefault(require("ini"));
 var _chalk = _interopRequireDefault(require("chalk"));
+var _enquirer = require("enquirer");
 var _command = _interopRequireDefault(require("../lib/cli/command"));
+var _envAlias = require("../lib/cli/envAlias");
 var exit = _interopRequireWildcard(require("../lib/cli/exit"));
 var _api = _interopRequireWildcard(require("../lib/api"));
 var _tracker = require("../lib/tracker");
@@ -26,6 +28,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * Internal dependencies
  */
+const ALLOWED_NODEJS_VERSIONS = ['14', '16', '18'];
 const appQuery = `
 	id
 	name
@@ -108,11 +111,13 @@ async function getBuildConfiguration(application, environment) {
   }
 }
 async function vipValidatePreflightCommand(arg, opt) {
-  var _opt$env$environmentV;
+  var _opt$env$appId, _opt$env, _opt$env$id, _opt$env2, _opt$app$repo, _opt$app, _opt$env3, _opt$env3$environment;
   harmoniaArgs = await validateArgs(opt);
+  const appId = (_opt$env$appId = (_opt$env = opt.env) === null || _opt$env === void 0 ? void 0 : _opt$env.appId) !== null && _opt$env$appId !== void 0 ? _opt$env$appId : 0;
+  const envId = (_opt$env$id = (_opt$env2 = opt.env) === null || _opt$env2 === void 0 ? void 0 : _opt$env2.id) !== null && _opt$env$id !== void 0 ? _opt$env$id : 0;
   const baseTrackingParams = {
-    env_id: opt.env.id,
-    app_id: opt.env.appId,
+    env_id: envId,
+    app_id: appId,
     command: 'vip validate preflight',
     ...sanitizeArgsForTracking(harmoniaArgs)
   };
@@ -137,9 +142,9 @@ async function vipValidatePreflightCommand(arg, opt) {
 
   // Create the Site Config objects
   const siteOptions = new _vipGoPreflightChecks.SiteConfig({
-    siteID: opt.app.id,
+    siteID: envId,
     nodejsVersion: harmoniaArgs.nodejsVersion,
-    repository: opt.app.repo,
+    repository: (_opt$app$repo = (_opt$app = opt.app) === null || _opt$app === void 0 ? void 0 : _opt$app.repo) !== null && _opt$app$repo !== void 0 ? _opt$app$repo : 'no-repo',
     baseURL: 'http://localhost:' + harmoniaArgs.port,
     dockerBuildEnvs: harmoniaArgs.nodeBuildDockerEnv,
     topRequests: [],
@@ -161,7 +166,7 @@ async function vipValidatePreflightCommand(arg, opt) {
     return exit.withError(`Could not find a 'package.json' in the current folder (${opt.path}).`);
   }
   const customEnvVars = {};
-  if (((_opt$env$environmentV = opt.env.environmentVariables) === null || _opt$env$environmentV === void 0 ? void 0 : _opt$env$environmentV.nodes.length) > 0) {
+  if (((_opt$env3 = opt.env) === null || _opt$env3 === void 0 ? void 0 : (_opt$env3$environment = _opt$env3.environmentVariables) === null || _opt$env3$environment === void 0 ? void 0 : _opt$env3$environment.nodes.length) > 0) {
     opt.env.environmentVariables.nodes.forEach(envVar => {
       customEnvVars[envVar.name] = envVar.value;
     });
@@ -362,7 +367,7 @@ async function handleResults(harmonia, results) {
   process.exit(0);
 }
 async function validateArgs(opt) {
-  var _opt$nodeVersion, _opt$wait, _opt$port;
+  var _opt$wait, _opt$port;
   const args = {};
 
   // Verbose
@@ -380,15 +385,39 @@ async function validateArgs(opt) {
     suppressOutput = true;
     outputJson = true;
   }
+  if (opt.app) {
+    var _opt$nodeVersion;
+    // Get build information from API and store it in the env object
+    const buildConfig = await getBuildConfiguration(opt.app, opt.env);
+    args.app_id = opt.app.id;
+    args.env_id = opt.env.id;
+    args.nodejsVersion = (_opt$nodeVersion = opt.nodeVersion) !== null && _opt$nodeVersion !== void 0 ? _opt$nodeVersion : buildConfig.nodeJSVersion;
+    args.buildType = buildConfig.buildType;
+    args.npmToken = buildConfig.npmToken;
+    args.nodeBuildDockerEnv = buildConfig.nodeBuildDockerEnv;
+  } else {
+    args.app_id = 0;
+    args.env_id = 0;
+    args.buildType = 'nodejs';
 
-  // Get build information from API and store it in the env object
-  const buildConfig = await getBuildConfiguration(opt.app, opt.env);
-  args.app_id = opt.app.id;
-  args.env_id = opt.env.id;
-  args.nodejsVersion = (_opt$nodeVersion = opt.nodeVersion) !== null && _opt$nodeVersion !== void 0 ? _opt$nodeVersion : buildConfig.nodeJSVersion;
-  args.buildType = buildConfig.buildType;
-  args.npmToken = buildConfig.npmToken;
-  args.nodeBuildDockerEnv = buildConfig.nodeBuildDockerEnv;
+    // If no node.js version is specified, prompt the user to select one
+    if (!opt.nodeVersion) {
+      // Ask for a node.js version
+      try {
+        const selection = await (0, _enquirer.prompt)({
+          type: 'select',
+          name: 'nodejsVersion',
+          message: 'Which Node.js version do you want to use?',
+          choices: ALLOWED_NODEJS_VERSIONS
+        });
+        args.nodejsVersion = selection.nodejsVersion;
+      } catch (err) {
+        exit.withError('No Node.js version selected. Aborting.');
+      }
+    } else {
+      args.nodejsVersion = opt.nodeVersion;
+    }
+  }
   args.wait = (_opt$wait = opt.wait) !== null && _opt$wait !== void 0 ? _opt$wait : 3000;
   args.port = (_opt$port = opt.port) !== null && _opt$port !== void 0 ? _opt$port : Math.floor(Math.random() * 1000) + 3001; // Get a PORT from 3001 and 3999
 
@@ -413,12 +442,23 @@ function sanitizeArgsForTracking(args) {
   });
   return sanitizedArgs;
 }
-(0, _command.default)({
-  appContext: true,
-  appQuery,
-  envContext: true,
+let commandOpts = {
   module: 'harmonia'
-}).option('verbose', 'Increase logging level to include app build and server boot up messages', false).option('node-version', 'Select a specific target Node.JS version in semver format (MAJOR.MINOR.PATCH) or a MAJOR').option('wait', 'Configure the time to wait in ms for the app to boot up. Do not change unless you have issues', 3000).option(['p', 'port'], 'Configure the port to use for the app (defaults to a random port between 3001 and 3999)').option('json', 'Output the results as JSON', false).option(['P', 'path'], 'Path to the app to be tested', process.cwd()).examples([{
+};
+
+// The @app.env selector is optional, so we need to check if it was passed
+const parsedAlias = (0, _envAlias.parseEnvAliasFromArgv)(process.argv);
+if (parsedAlias.app) {
+  commandOpts = {
+    ...commandOpts,
+    appQuery,
+    envContext: true,
+    appContext: true
+  };
+} else {
+  logToConsole(_chalk.default.bold.yellow('Warning: ') + 'The preflight tests are running without a provided application and/or environment.\n' + 'Some app-dependent configurations, such as environment variables, might not defined.');
+}
+(0, _command.default)(commandOpts).option('verbose', 'Increase logging level to include app build and server boot up messages', false).option('node-version', 'Select a specific target Node.JS version in semver format (MAJOR.MINOR.PATCH) or a MAJOR').option('wait', 'Configure the time to wait in ms for the app to boot up. Do not change unless you have issues', 3000).option(['p', 'port'], 'Configure the port to use for the app (defaults to a random port between 3001 and 3999)').option('json', 'Output the results as JSON', false).option(['P', 'path'], 'Path to the app to be tested', process.cwd()).examples([{
   usage: 'vip @mysite.production validate preflight',
   description: 'Runs the preflight tests to validate if your application is ready to be deployed to VIP Go'
 }, {

package/dist/bin/vip.js

@@ -37,14 +37,18 @@ const runCmd = async function () {
   }).command('app', 'List and modify your VIP applications').command('cache', 'Manage page cache for your VIP applications').command('config', 'Set configuration for your VIP applications').command('dev-env', 'Use local dev-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('sync', 'Sync production to a development environment').command('whoami', 'Display details about the currently logged-in user').command('validate', 'Validate your VIP application and environment').command('wp', 'Run WP CLI commands against an environment');
   cmd.argv(process.argv);
 };
+function doesArgvHaveAtLeastOneParam(argv, params) {
+  return argv.some(arg => params.includes(arg));
+}
 const rootCmd = async function () {
   let token = await _token.default.get();
-  const isHelpCommand = process.argv.some(arg => arg === 'help' || arg === '-h' || arg === '--help');
-  const isLogoutCommand = process.argv.some(arg => arg === 'logout');
-  const isLoginCommand = process.argv.some(arg => arg === 'login');
-  const isDevEnvCommandWithoutEnv = process.argv.some(arg => arg === 'dev-env') && !(0, _command.containsAppEnvArgument)(process.argv);
+  const isHelpCommand = doesArgvHaveAtLeastOneParam(process.argv, ['help', '-h', '--help']);
+  const isVersionCommand = doesArgvHaveAtLeastOneParam(process.argv, ['-v', '--version']);
+  const isLogoutCommand = doesArgvHaveAtLeastOneParam(process.argv, ['logout']);
+  const isLoginCommand = doesArgvHaveAtLeastOneParam(process.argv, ['login']);
+  const isDevEnvCommandWithoutEnv = doesArgvHaveAtLeastOneParam(process.argv, ['dev-env']) && !(0, _command.containsAppEnvArgument)(process.argv);
   debug('Argv:', process.argv);
-  if (!isLoginCommand && (isLogoutCommand || isHelpCommand || isDevEnvCommandWithoutEnv || token && token.valid())) {
+  if (!isLoginCommand && (isLogoutCommand || isHelpCommand || isVersionCommand || isDevEnvCommandWithoutEnv || token && token.valid())) {
     runCmd();
   } else {
     console.log();