@automattic/vip 3.4.1 → 3.5.0

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

@@ -58,6 +58,9 @@ services:
 <% } %>
 <% if ( autologinKey ) { %>
         VIP_DEV_AUTOLOGIN_KEY: "<%= autologinKey %>"
+<% } %>
+<% if ( cron ) { %>
+        ENABLE_CRON: 1
 <% } %>
         LANDO_NO_USER_PERMS: 'enable'
         LANDO_NEEDS_EXEC: 1
@@ -83,6 +86,7 @@ services:
         --domain "http://<%= siteSlug %>.<%= domain %>/"
         --title "<%= wpTitle %>"
         <% if ( multisite ) { %>--ms-domain "<%= siteSlug %>.<%= domain %>" <% if ( multisite === true || multisite === 'subdomain' ) { %>--subdomain <% } %> <% } %>
+
   database:
     type: compose
     services:
@@ -120,12 +124,25 @@ services:
 
 <% if ( phpmyadmin ) { %>
   phpmyadmin:
-    type: phpmyadmin
-    hosts:
-      - database
-    overrides:
+    type: compose
+    services:
+      image: phpmyadmin:5
+      command: /docker-entrypoint.sh apache2-foreground
       environment:
+        MYSQL_ROOT_PASSWORD: ''
+        PMA_HOSTS: database
+        PMA_PORT: 3306
+        PMA_USER: root
+        PMA_PASSWORD: ''
         UPLOAD_LIMIT: 4G
+        LANDO_NO_USER_PERMS: 1
+        LANDO_NEEDS_EXEC: 1
+      ports:
+        - 127.0.0.1::80
+      volumes:
+        - pma_www:/var/www/html
+    volumes:
+      pma_www:
 <% } %>
 
 <% if ( elasticsearch ) { %>

package/dist/bin/vip-app-deploy-validate.js

@@ -20,6 +20,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
  * Internal dependencies
  */
 const debug = (0, _debug.default)('@automattic/vip:bin:vip-app-deploy-validate');
+const baseUsage = 'vip app deploy validate';
 async function appDeployValidateCmd(arg = [], opts = {}) {
   const app = opts.app;
   const env = opts.env;
@@ -37,14 +38,15 @@ async function appDeployValidateCmd(arg = [], opts = {}) {
   } else {
     await (0, _customDeploy2.validateTarFile)(fileName);
   }
-  console.log(_chalk.default.green('✓ Compressed file has been successfully validated with no errors!'));
+  console.log(_chalk.default.green('✓ Compressed file has been successfully validated with no errors.'));
 }
 
 // Command examples for the `vip app deploy validate` help prompt
 const examples = [{
-  usage: 'vip app @mysite.develop deploy validate <file.zip|file.tar.gz>',
-  description: 'Validate the compressed file to see if it can be deployed to your site'
+  usage: 'vip app deploy validate file.tar.gz',
+  description: 'Validate the directory structure of the local archived file named "file.tar.gz".'
 }];
 void (0, _command.default)({
-  requiredArgs: 1
-}).examples(examples).option('app', 'The application name or ID').option('env', 'The environment name or ID').argv(process.argv, appDeployValidateCmd);
+  requiredArgs: 1,
+  usage: baseUsage
+}).examples(examples).argv(process.argv, appDeployValidateCmd);

package/dist/bin/vip-app-deploy.js

@@ -35,6 +35,7 @@ const START_DEPLOY_MUTATION = (0, _graphqlTag.default)`
 	}
 `;
 const debug = (0, _debug.default)('@automattic/vip:bin:vip-app-deploy');
+const baseUsage = 'vip app deploy';
 const DEPLOY_PREFLIGHT_PROGRESS_STEPS = [{
   id: 'upload',
   name: 'Uploading file'
@@ -221,15 +222,16 @@ Processing the file for deployment to your environment...
 const examples = [
 // `app` subcommand
 {
-  usage: 'vip app @mysite.develop deploy file.zip',
-  description: 'Deploy the given compressed file to your site'
+  usage: 'WPVIP_DEPLOY_TOKEN=1234 vip @example-app.develop app deploy file.zip',
+  description: 'Deploy a local archived file named "file.zip" that contains application code to a VIP Platform environment that has Custom Deployment enabled.'
 }, {
-  usage: 'vip app @mysite.develop deploy file.zip --message "This is a deploy message"',
-  description: 'Deploy the given compressed file to your site'
+  usage: 'WPVIP_DEPLOY_TOKEN=1234 vip @example-app.develop app deploy file.tgz --message="A description for this deploy"',
+  description: 'Add a descriptive message for the Custom Deployment of the archived file named "file.tgz".'
 }, {
-  usage: 'vip app @mysite.develop deploy file.zip --skip-confirmation',
-  description: 'Deploy the given compressed file to your site without prompting'
+  usage: 'WPVIP_DEPLOY_TOKEN=1234 vip @example-app.develop app deploy file.tar.gz --skip-confirmation',
+  description: 'Skip the confirmation prompt for the Custom Deployment of the archived file named "file.tar.gz" to the environment.'
 }];
 void (0, _command.default)({
-  requiredArgs: 1
-}).command('validate', 'Validate a file before deploying in Custom Deployments').examples(examples).option('message', 'Custom message for deploy').option('skip-confirmation', 'Skip confirmation prompt').option('force', 'Skip confirmation prompt (deprecated)').option('app', 'The application name or ID').option('env', 'The environment name or ID').argv(process.argv, appDeployCmd);
+  requiredArgs: 1,
+  usage: baseUsage
+}).command('validate', 'Validate the directory structure of an archived file.').examples(examples).option('message', 'Add a description of a deployment.').option('skip-confirmation', 'Skip the confirmation prompt.').option('force', 'Skip confirmation prompt (deprecated)').option('app', 'Target an application. Accepts a string value for the application name or an integer for the application ID.').option('env', 'Target an environment. Accepts a string value for the environment type.').argv(process.argv, appDeployCmd);

package/dist/bin/vip-app-list.js

@@ -6,27 +6,32 @@ var _api = _interopRequireDefault(require("../lib/api"));
 var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _tracker = require("../lib/tracker");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const baseUsage = 'vip app list';
 (0, _command.default)({
-  format: true
-}).argv(process.argv, async () => {
+  format: true,
+  usage: baseUsage
+}).examples([{
+  usage: baseUsage + '\n' + '    - ┌──────┬─────────────────┬─────────────────────────────────┐\n' + '    - │ id   │ name            │ repo                            │\n' + '    - ┌──────┬─────────────────┬─────────────────────────────────┐\n' + '    - │ 8886 │ example-app     │ wpcomvip/my-org-example-app     │\n' + '    - ┌──────┬─────────────────┬─────────────────────────────────┐\n' + '    - │ 4325 │ mytestmultisite │ wpcomvip/my-org-mytestmultisite │\n' + '    - └──────┴─────────────────┴─────────────────────────────────┘\n',
+  description: 'Retrieve a list of applications that can be accessed by the current authenticated VIP-CLI user.'
+}]).argv(process.argv, async () => {
   const api = (0, _api.default)();
   await (0, _tracker.trackEvent)('app_list_command_execute');
   let response;
   try {
     response = await api.query({
       query: (0, _graphqlTag.default)`
-				query Apps($first: Int, $after: String) {
-					apps(first: $first, after: $after) {
-						total
-						nextCursor
-						edges {
-							id
-							name
-							repo
+					query Apps($first: Int, $after: String) {
+						apps(first: $first, after: $after) {
+							total
+							nextCursor
+							edges {
+								id
+								name
+								repo
+							}
 						}
 					}
-				}
-			`,
+				`,
       variables: {
         first: 100,
         after: null // TODO make dynamic

package/dist/bin/vip-app.js

@@ -11,7 +11,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 (0, _command.default)({
   requiredArgs: 1,
   format: true
-}).example('vip app <app>', 'Pass an app name or ID to get details about that app').example('vip app 123', 'Get details about the app with ID 123').example('vip app vip-test', 'Get details about the app named vip-test').example('vip app @mysite.develop deploy <file.zip>', 'Deploy the given compressed file to your site').command('list', 'List your VIP applications').command('deploy', 'Deploy to your app from a file').argv(process.argv, async arg => {
+}).example('vip app list', 'Retrieve a list of applications that can be accessed by the current authenticated VIP-CLI user.').example('vip app example-app', 'Retrieve information about the application named "example-app" and its environments.').example('WPVIP_DEPLOY_TOKEN=1234 vip @example-app.develop app deploy file.zip', 'Deploy a local archived file named "file.zip" that contains application code to a VIP Platform environment that has Custom Deployment enabled.').command('list', 'Retrieve a list of applications that can be accessed by the current authenticated VIP-CLI user.').command('deploy', 'Deploy an archived file of application code to an environment that has Custom Deployment enabled.').argv(process.argv, async arg => {
   await (0, _tracker.trackEvent)('app_command_execute');
   let res;
   try {

package/dist/bin/vip-config-envvar-delete.js

@@ -46,7 +46,7 @@ async function deleteEnvVarCommand(arg, opt) {
       await (0, _tracker.trackEvent)('envvar_delete_user_cancelled_input', trackingParams);
       (0, _input.cancel)();
     });
-    if (!(await (0, _input.confirm)(`Are you sure? ${_chalk.default.bold.red('Deletion is permanent')} (y/N)`))) {
+    if (!(await (0, _input.confirm)(`Are you sure? ${_chalk.default.bold.red('Deletion is permanent')}`))) {
       await (0, _tracker.trackEvent)('envvar_delete_user_cancelled_confirmation', trackingParams);
       (0, _input.cancel)();
     }

package/dist/bin/vip-config-envvar-set.js

@@ -65,7 +65,7 @@ async function setEnvVarCommand(arg, opt) {
       console.log('===== Received value printed above =====');
       console.log();
     }
-    if (!(await (0, _input.confirm)(`Please ${_chalk.default.bold('confirm')} the input value above (y/N)`))) {
+    if (!(await (0, _input.confirm)(`Please ${_chalk.default.bold('confirm')} the input value above`))) {
       await (0, _tracker.trackEvent)('envvar_set_user_cancelled_confirmation', trackingParams);
       (0, _input.cancel)();
     }

package/dist/bin/vip.js

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

package/dist/commands/export-sql.js

@@ -13,6 +13,7 @@ var _backupStorageAvailability = require("../lib/backup-storage-availability/bac
 var exit = _interopRequireWildcard(require("../lib/cli/exit"));
 var _format = require("../lib/cli/format");
 var _progress = require("../lib/cli/progress");
+var _retry = require("../lib/retry");
 var _utils = require("../lib/utils");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -83,7 +84,7 @@ const CREATE_EXPORT_JOB_MUTATION = exports.CREATE_EXPORT_JOB_MUTATION = (0, _gra
  * @param {number} envId Environment ID
  * @return {Promise} A promise which resolves to the latest backup and job status
  */
-async function fetchLatestBackupAndJobStatus(appId, envId) {
+async function fetchLatestBackupAndJobStatusBase(appId, envId) {
   const api = (0, _api.default)();
   const response = await api.query({
     query: BACKUP_AND_JOB_STATUS_QUERY,
@@ -107,6 +108,13 @@ async function fetchLatestBackupAndJobStatus(appId, envId) {
     jobs
   };
 }
+async function fetchLatestBackupAndJobStatus(appId, envId) {
+  return await (0, _retry.retry)({
+    retryOnlyIf: options => {
+      return (options.error.message || '').indexOf('Unexpected token < in JSON at position 0') !== -1;
+    }
+  }, () => fetchLatestBackupAndJobStatusBase(appId, envId));
+}
 
 /**
  * Generates a download link for a backup

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

@@ -32,4 +32,4 @@ const DEV_ENVIRONMENT_DEFAULTS = exports.DEV_ENVIRONMENT_DEFAULTS = {
   multisite: false,
   phpVersion: Object.keys(DEV_ENVIRONMENT_PHP_VERSIONS)[0]
 };
-const DEV_ENVIRONMENT_VERSION = exports.DEV_ENVIRONMENT_VERSION = '2.0.3';
+const DEV_ENVIRONMENT_VERSION = exports.DEV_ENVIRONMENT_VERSION = '2.1.0';

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

@@ -250,13 +250,15 @@ async function promptForArguments(preselectedOptions, defaultOptions, suppressPr
     xdebugConfig: preselectedOptions.xdebugConfig,
     siteSlug: '',
     mailpit: false,
-    photon: false
+    photon: false,
+    cron: false
   };
   const promptLabels = {
     xdebug: 'XDebug',
     phpmyadmin: 'phpMyAdmin',
     mailpit: 'Mailpit',
-    photon: 'Photon'
+    photon: 'Photon',
+    cron: 'Cron'
   };
   if (create && !instanceData.mediaRedirectDomain && defaultOptions.mediaRedirectDomain) {
     const mediaRedirectPromptText = `Would you like to redirect to ${defaultOptions.mediaRedirectDomain} for missing media files?`;
@@ -280,7 +282,7 @@ async function promptForArguments(preselectedOptions, defaultOptions, suppressPr
   } else {
     instanceData.elasticsearch = await promptForBoolean('Enable Elasticsearch (needed by Enterprise Search)?', Boolean(defaultOptions.elasticsearch));
   }
-  const services = ['phpmyadmin', 'xdebug', 'mailpit', 'photon'];
+  const services = ['phpmyadmin', 'xdebug', 'mailpit', 'photon', 'cron'];
   for (const service of services) {
     if (service in instanceData) {
       const preselected = preselectedOptions[service];
@@ -626,7 +628,7 @@ function processVersionOption(value) {
 const phpVersionsSupported = Object.keys(_devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS).join(', ');
 function addDevEnvConfigurationOptions(command) {
   // We leave the third parameter to undefined on some because the defaults are handled in preProcessInstanceData()
-  return command.option('wordpress', 'Manage the version of WordPress. Accepts a string value for major versions (6.x). Defaults to the most recent version of WordPress.', undefined, processVersionOption).option(['u', 'mu-plugins'], 'Manage the source for VIP MU plugins. Accepts "demo" (default) for a read-only image of the staging branch, or a path to a built copy of VIP MU plugins on the local machine.').option('app-code', 'Manage the source for application code. Accepts "demo" (default) for a read-only image of WordPress VIP skeleton application code, or a path to a VIP formatted application repo on the local machine.').option('phpmyadmin', 'Enable or disable phpMyAdmin, disabled by default. Accepts "y" (default value) to enable or "n" to disable. When enabled, refer to the value of "PHPMYADMIN URLS" in the information output for a local environment for the URL to access phpMyAdmin.', undefined, processBooleanOption).option('xdebug', 'Enable or disable XDebug, disabled by default. Accepts "y" (default value) to enable or "n" to disable.', undefined, processBooleanOption).option('xdebug_config', 'Override some default configuration settings for Xdebug. Accepts a string value that is assigned to the XDEBUG_CONFIG environment variable.').option('elasticsearch', 'Enable or disable Elasticsearch (required by Enterprise Search), disabled by default. Accepts "y" (default value) to enable or "n" to disable.', undefined, processBooleanOption).option(['r', 'media-redirect-domain'], 'Configure media files to be proxied from a VIP Platform environment. Accepts a string value for the primary domain of the VIP Platform environment or "n" to disable the media proxy.', undefined, processMediaRedirectDomainOption).option('php', `Manage the version of PHP. Accepts a string value for minor versions: ${phpVersionsSupported}`, undefined, processVersionOption).option(['A', 'mailpit'], 'Enable or disable Mailpit, disabled by default. Accepts "y" (default value) to enable or "n" to disable.', undefined, processBooleanOption).option(['H', 'photon'], 'Enable or disable Photon, disabled by default. Accepts "y" (default value) to enable or "n" to disable.', undefined, processBooleanOption);
+  return command.option('wordpress', 'Manage the version of WordPress. Accepts a string value for major versions (6.x). Defaults to the most recent version of WordPress.', undefined, processVersionOption).option(['u', 'mu-plugins'], 'Manage the source for VIP MU plugins. Accepts "demo" (default) for a read-only image of the staging branch, or a path to a built copy of VIP MU plugins on the local machine.').option('app-code', 'Manage the source for application code. Accepts "demo" (default) for a read-only image of WordPress VIP skeleton application code, or a path to a VIP formatted application repo on the local machine.').option('phpmyadmin', 'Enable or disable phpMyAdmin, disabled by default. Accepts "y" (default value) to enable or "n" to disable. When enabled, refer to the value of "PHPMYADMIN URLS" in the information output for a local environment for the URL to access phpMyAdmin.', undefined, processBooleanOption).option('xdebug', 'Enable or disable XDebug, disabled by default. Accepts "y" (default value) to enable or "n" to disable.', undefined, processBooleanOption).option('xdebug_config', 'Override some default configuration settings for Xdebug. Accepts a string value that is assigned to the XDEBUG_CONFIG environment variable.').option('elasticsearch', 'Enable or disable Elasticsearch (required by Enterprise Search), disabled by default. Accepts "y" (default value) to enable or "n" to disable.', undefined, processBooleanOption).option(['r', 'media-redirect-domain'], 'Configure media files to be proxied from a VIP Platform environment. Accepts a string value for the primary domain of the VIP Platform environment or "n" to disable the media proxy.', undefined, processMediaRedirectDomainOption).option('php', `Manage the version of PHP. Accepts a string value for minor versions: ${phpVersionsSupported}`, undefined, processVersionOption).option('cron', 'Enable or disable cron, disabled by default. Accepts "y" (default value) to enable or "n" to disable.', undefined, processBooleanOption).option(['A', 'mailpit'], 'Enable or disable Mailpit, disabled by default. Accepts "y" (default value) to enable or "n" to disable.', undefined, processBooleanOption).option(['H', 'photon'], 'Enable or disable Photon, disabled by default. Accepts "y" (default value) to enable or "n" to disable.', undefined, processBooleanOption);
 }
 
 /**

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

@@ -84,6 +84,7 @@ function sanitizeConfiguration(configuration, configurationFilePath) {
     mailpit: stringToBooleanIfDefined(configuration.mailpit),
     'media-redirect-domain': configuration['media-redirect-domain']?.toString(),
     photon: stringToBooleanIfDefined(configuration.photon),
+    cron: stringToBooleanIfDefined(configuration.cron),
     meta: configurationMeta
   };
 
@@ -121,7 +122,8 @@ function mergeConfigurationFileOptions(preselectedOptions, configurationFileOpti
     xdebugConfig: configurationFileOptions['xdebug-config'],
     mailpit: configurationFileOptions.mailpit,
     mediaRedirectDomain: configurationFileOptions['media-redirect-domain'],
-    photon: configurationFileOptions.photon
+    photon: configurationFileOptions.photon,
+    cron: configurationFileOptions.cron
   };
   const mergedOptions = {};
   Object.keys(configurationFileInstanceOptions).forEach(key => {
@@ -179,5 +181,6 @@ elasticsearch: false
 xdebug: false
 mailpit: false
 photon: false
+cron: false
 `;
 }

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

@@ -148,6 +148,9 @@ function preProcessInstanceData(instanceData) {
   if (!newInstanceData.photon) {
     newInstanceData.photon = false;
   }
+  if (!newInstanceData.cron) {
+    newInstanceData.cron = false;
+  }
 
   // Mailpit migration
   newInstanceData.mailpit ??= false;

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

@@ -80,7 +80,7 @@ async function getLandoConfig() {
       subdir: '.',
       namespace: '@lando'
     }],
-    disablePlugins: ['@lando/argv', '@lando/mailhog'],
+    disablePlugins: ['@lando/argv', '@lando/mailhog', '@lando/phpmyadmin'],
     proxyName: 'vip-dev-env-proxy',
     userConfRoot: landoDir,
     home: fakeHomeDir,
@@ -373,16 +373,19 @@ async function getExtraServicesConnections(lando, app) {
     // eslint-disable-next-line no-await-in-loop
     const containerScan = service.id ? await lando.engine.docker.scan(service.id) : null;
     if (containerScan?.NetworkSettings.Ports) {
-      const mappings = Object.keys(containerScan.NetworkSettings.Ports).map(internalPort => containerScan.NetworkSettings.Ports[internalPort]).filter(externalMapping => externalMapping?.length);
-      if (mappings.length) {
-        const {
-          HostIp: host,
-          HostPort: port
-        } = mappings[0][0];
+      const mappings = Object.values(containerScan.NetworkSettings.Ports).filter(externalMapping => externalMapping?.length);
+      mappings[0]?.forEach(({
+        HostIp: host,
+        HostPort: port
+      }) => {
         const label = displayConfiguration.label ?? service.service;
         const value = (displayConfiguration.protocol ? `${displayConfiguration.protocol}://` : '') + `${host}:${port}`;
-        extraServices[label] = value;
-      }
+        if (extraServices[label]) {
+          extraServices[label] += `, ${value}`;
+        } else {
+          extraServices[label] = value;
+        }
+      });
     }
   }
   return extraServices;

package/dist/lib/retry.js

@@ -0,0 +1,153 @@
+"use strict";
+
+exports.__esModule = true;
+exports.EXPONENTIAL_BACKOFF_STARTING_IN_50_MS = exports.EXPONENTIAL_BACKOFF_STARTING_IN_200_MS = exports.EXPONENTIAL_BACKOFF_STARTING_IN_100_MS = void 0;
+exports.exponentialBackoff = exponentialBackoff;
+exports.retry = retry;
+// copied over from our internal lib
+
+const EXPONENTIAL_BACKOFF_STARTING_IN_50_MS = exports.EXPONENTIAL_BACKOFF_STARTING_IN_50_MS = exponentialBackoff(50);
+const EXPONENTIAL_BACKOFF_STARTING_IN_100_MS = exports.EXPONENTIAL_BACKOFF_STARTING_IN_100_MS = exponentialBackoff(100);
+const EXPONENTIAL_BACKOFF_STARTING_IN_200_MS = exports.EXPONENTIAL_BACKOFF_STARTING_IN_200_MS = exponentialBackoff(200);
+const MAX_INTERVAL_BETWEEN_ATTEMPTS = 600000; // 10 minutes
+
+const NOOP = async () => {};
+const DEFAULT_OPTIONS = {
+  maxRetries: 4,
+  interval: EXPONENTIAL_BACKOFF_STARTING_IN_100_MS,
+  retryOnlyIf: () => Promise.resolve(true),
+  onRetry: NOOP,
+  onFailedAttempt: NOOP
+};
+/**
+ * We don't need a strict Error instance, which can help in cases (probably
+ * just tests) where code throws an object instead of an Error instance. We
+ * really just need to check for an object with a message property.
+ */
+function isErrorLike(value) {
+  return value instanceof Error || null !== value && 'object' === typeof value && 'message' in value;
+}
+
+/**
+ * Execute a <task> and retries <options.maxRetries> times while it fails.
+ * @param {Object} [options] - The options.
+ * @param {number} [options.maxRetries] - The max number of retry attempts to be executed.
+ * @param {function|number} [options.interval] - The time to wait between retries in milliseconds.
+ *   It can be either a number or a function.
+ *   Function arguments: retryAttemptNumber.
+ *   Expected return: a number representing the time in milliseconds.
+ * @param {function} [options.retryOnlyIf] - A function used to determine if a retry should be attempted.
+ *   Arguments: Object<{ error, attemptNumber }>.
+ *   Expected return: boolean|Promise<boolean>.
+ * @param {function} [options.onRetry] - A callback function executed right before a retry attempt.
+ *   Arguments: Object<{ retryNumber: attemptNumber }>.
+ *   Expected return: void|Promise<void>.
+ * @param {function} [options.onFailedAttempt] - A callback function executed right after a failed attempt.
+ *   Arguments: Object<{ error, attemptNumber, attemptDuration }>.
+ *   Expected return: void|Promise<void>.
+ * @param {function} task - The task to be executed.
+ * @return {any} - The value returned by the provided <task> function when it is successfully executed
+ */
+
+async function retry(optionsOrTask, task) {
+  let options = optionsOrTask;
+  if (arguments.length < 3 && typeof optionsOrTask === 'function') {
+    task = optionsOrTask;
+    options = {};
+  }
+  const finalOptions = {
+    ...DEFAULT_OPTIONS,
+    ...options
+  };
+  const {
+    maxRetries,
+    interval,
+    retryOnlyIf,
+    onRetry,
+    onFailedAttempt
+  } = finalOptions;
+  validateTask(task);
+  validateOptions(finalOptions);
+  const maxAttempts = maxRetries + 1;
+  for (let attemptNumber = 1; attemptNumber <= maxAttempts; attemptNumber++) {
+    /* eslint-disable no-await-in-loop */
+    const attemptStart = Date.now();
+    try {
+      return await task();
+    } catch (caughtError) {
+      const attemptEnd = Date.now();
+      const attemptDuration = attemptEnd - attemptStart;
+      const attemptStartTime = new Date(attemptStart);
+      const attemptEndTime = new Date(attemptEnd);
+      const error = isErrorLike(caughtError) ? caughtError : new Error(String(caughtError));
+      await onFailedAttempt({
+        error,
+        attemptNumber,
+        attemptDuration,
+        attemptStartTime,
+        attemptEndTime
+      });
+      const shouldRetry = await retryOnlyIf({
+        error,
+        attemptNumber
+      });
+      if (attemptNumber === maxAttempts || shouldRetry !== true) {
+        throw error;
+      }
+      await awaitInterval(interval, attemptNumber);
+      await onRetry({
+        retryNumber: attemptNumber
+      });
+    }
+  }
+  throw new Error('Error, wrong retry options set');
+}
+function isValidInterval(interval) {
+  if ('function' === typeof interval) {
+    return true;
+  }
+  return typeof interval === 'number' && Number.isInteger(interval) && interval >= 0 && interval <= MAX_INTERVAL_BETWEEN_ATTEMPTS;
+}
+async function awaitInterval(interval, attemptNumber) {
+  let newInterval;
+  if (typeof interval === 'function') {
+    newInterval = interval(attemptNumber);
+    if (!isValidInterval(newInterval)) {
+      throw new Error(`Invalid calculated interval for retry attempt ${attemptNumber}: "${newInterval}" (type: ${typeof newInterval})`);
+    }
+  } else {
+    newInterval = interval;
+  }
+  return new Promise(resolve => setTimeout(resolve, newInterval));
+}
+function validateTask(task) {
+  if (typeof task !== 'function') {
+    throw new Error('Invalid task: it should be a function');
+  }
+}
+function validateOptions({
+  maxRetries,
+  interval,
+  onFailedAttempt,
+  retryOnlyIf
+}) {
+  if (!Number.isInteger(maxRetries) || maxRetries < 0) {
+    throw new Error('Invalid option "maxRetries": it should be an integer number >= 0');
+  }
+  if (!isValidInterval(interval)) {
+    const definition = `an integer number between 0 and ${MAX_INTERVAL_BETWEEN_ATTEMPTS}`;
+    throw new Error(`Invalid option "interval": it should be either ${definition}, or a synchronous function which returns ${definition}`);
+  }
+  if (!isValidInterval(interval)) {
+    throw new Error('Invalid option "interval": it should be either an integer number >= 0, or a synchronous function which returns an integer number >= 0');
+  }
+  if (typeof onFailedAttempt !== 'function') {
+    throw new Error('Invalid option "onFailedAttempt": it should be a function');
+  }
+  if (typeof retryOnlyIf !== 'function') {
+    throw new Error('Invalid option "retryOnlyIf": it should be a function');
+  }
+}
+function exponentialBackoff(startMilliseconds) {
+  return retryAttemptNumber => Math.pow(2, retryAttemptNumber - 1) * startMilliseconds;
+}

package/dist/lib/validations/custom-deploy.js

@@ -15,9 +15,9 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const errorMessages = {
-  missingThemes: 'Missing `themes` directory from root folder!',
+  missingThemes: 'Missing `themes` directory from root folder.',
   symlink: 'Symlink detected: ',
-  singleRootDir: 'The compressed file must contain a single root directory!',
+  singleRootDir: 'The compressed file must contain a single root directory.',
   invalidExt: 'Invalid file extension. Please provide a .zip, .tar.gz, or a .tgz file.',
   invalidChars: (filename, invalidChars) => `Filename ${filename} contains disallowed characters: ${invalidChars}`
 };

package/dist/lib/validations/sql.js

@@ -271,9 +271,15 @@ const checks = {
     recommendation: ''
   },
   siteHomeUrlLando: {
-    matcher: "'(siteurl|home)',\\s?'(.*?)'",
+    matcher: "'(siteurl|home)',\\s?'([^']+)'",
     matchHandler: (lineNumber, results, expectedDomain) => {
-      const foundDomain = results[2].replace(/https?:\/\//, '');
+      let foundDomain = results[2];
+      if (!/^https?:\/\//i.test(foundDomain)) {
+        return {
+          falsePositive: true
+        };
+      }
+      foundDomain = foundDomain.replace(/^https?:\/\//, '');
       if (!foundDomain.trim()) {
         return {
           falsePositive: true

package/docs/CHANGELOG.md

@@ -1,5 +1,27 @@
 ## Changelog
 
+### 3.5.0
+
+* feat(dev-env): add support for cron
+* build(deps-dev): bump @automattic/eslint-plugin-wpvip from 0.11.0 to 0.12.0
+* fix(dev-env): display all port mappings
+* refactor(dev-env): migrate from `@lando/phpmyadmin` to `phpmyadmin` Docker image
+
+**Full Changelog**: https://github.com/Automattic/vip-cli/compare/3.4.2...3.5.0
+
+### 3.4.2
+
+* build(deps-dev): bump @types/node from 18.19.37 to 18.19.38
+* build(deps-dev): bump typescript from 5.4.5 to 5.5.2
+* build(deps-dev): bump @types/uuid from 9.0.8 to 10.0.0
+* build(deps-dev): bump @types/node from 18.19.38 to 18.19.39
+* fix(dev-env): ensure that URLs suggested for replacement start with `http(s)://`
+* Remove unnecessary y/N choice for confirmations
+* Update the vip app command to follow the VIP-CLI style guide
+* Add retries to the fetching of jobs data
+
+**Full Changelog**: https://github.com/Automattic/vip-cli/compare/3.4.1...3.4.2
+
 ### 3.4.1
 
 * Updating vip cache commands descriptions and examples to follow the VIP-CLI style guide

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@automattic/vip",
-  "version": "3.4.1",
+  "version": "3.5.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@automattic/vip",
-      "version": "3.4.1",
+      "version": "3.5.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -108,7 +108,7 @@
         "vip-wp": "dist/bin/vip-wp.js"
       },
       "devDependencies": {
-        "@automattic/eslint-plugin-wpvip": "0.11.0",
+        "@automattic/eslint-plugin-wpvip": "0.12.0",
         "@babel/cli": "7.24.7",
         "@babel/core": "7.24.7",
         "@babel/preset-env": "7.24.7",
@@ -132,7 +132,7 @@
         "@types/single-line-log": "1.1.2",
         "@types/tar": "^6.1.13",
         "@types/update-notifier": "^6.0.8",
-        "@types/uuid": "^9.0.7",
+        "@types/uuid": "^10.0.0",
         "@types/xml2js": "^0.4.14",
         "dockerode": "^4.0.0",
         "eslint": "^8.35.0",
@@ -206,9 +206,9 @@
       }
     },
     "node_modules/@automattic/eslint-plugin-wpvip": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@automattic/eslint-plugin-wpvip/-/eslint-plugin-wpvip-0.11.0.tgz",
-      "integrity": "sha512-GfSGo2KbrRSPmmklL5YRiVONCFDQidF6agv7x9xU8UEmEw6jPNgndrD4yO7KCoEXX4OUYRDi9bZx1afky1TYng==",
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@automattic/eslint-plugin-wpvip/-/eslint-plugin-wpvip-0.12.0.tgz",
+      "integrity": "sha512-ARF+Nj0HBHeaTPoWDA+BynaEergBrtHKDoYqIHtLWJEe7xMNRedB3Q4+lo1OuTZGA3ggBwMmOy5OU0izQwPpog==",
       "dev": true,
       "dependencies": {
         "@babel/eslint-parser": "7.24.5",
@@ -3884,9 +3884,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "18.19.37",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.37.tgz",
-      "integrity": "sha512-Pi53fdVMk7Ig5IfAMltQQMgtY7xLzHaEous8IQasYsdQbYK3v90FkxI3XYQCe/Qme58pqp14lXJIsFmGP8VoZQ==",
+      "version": "18.19.39",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.39.tgz",
+      "integrity": "sha512-nPwTRDKUctxw3di5b4TfT3I0sWDiWoPQCZjXhvdkINntwr8lcoVCKsTgnXeRubKIlfnV+eN/HYk6Jb40tbcEAQ==",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -3992,9 +3992,9 @@
       }
     },
     "node_modules/@types/uuid": {
-      "version": "9.0.8",
-      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz",
-      "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==",
       "dev": true
     },
     "node_modules/@types/xml2js": {
@@ -12643,9 +12643,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
-      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz",
+      "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -13585,9 +13585,9 @@
       }
     },
     "@automattic/eslint-plugin-wpvip": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@automattic/eslint-plugin-wpvip/-/eslint-plugin-wpvip-0.11.0.tgz",
-      "integrity": "sha512-GfSGo2KbrRSPmmklL5YRiVONCFDQidF6agv7x9xU8UEmEw6jPNgndrD4yO7KCoEXX4OUYRDi9bZx1afky1TYng==",
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@automattic/eslint-plugin-wpvip/-/eslint-plugin-wpvip-0.12.0.tgz",
+      "integrity": "sha512-ARF+Nj0HBHeaTPoWDA+BynaEergBrtHKDoYqIHtLWJEe7xMNRedB3Q4+lo1OuTZGA3ggBwMmOy5OU0izQwPpog==",
       "dev": true,
       "requires": {
         "@babel/eslint-parser": "7.24.5",
@@ -16306,9 +16306,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "18.19.37",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.37.tgz",
-      "integrity": "sha512-Pi53fdVMk7Ig5IfAMltQQMgtY7xLzHaEous8IQasYsdQbYK3v90FkxI3XYQCe/Qme58pqp14lXJIsFmGP8VoZQ==",
+      "version": "18.19.39",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.39.tgz",
+      "integrity": "sha512-nPwTRDKUctxw3di5b4TfT3I0sWDiWoPQCZjXhvdkINntwr8lcoVCKsTgnXeRubKIlfnV+eN/HYk6Jb40tbcEAQ==",
       "requires": {
         "undici-types": "~5.26.4"
       }
@@ -16415,9 +16415,9 @@
       }
     },
     "@types/uuid": {
-      "version": "9.0.8",
-      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz",
-      "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==",
       "dev": true
     },
     "@types/xml2js": {
@@ -22653,9 +22653,9 @@
       }
     },
     "typescript": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
-      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz",
+      "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==",
       "dev": true
     },
     "typical": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "3.4.1",
+  "version": "3.5.0",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {
@@ -107,7 +107,7 @@
   },
   "homepage": "https://github.com/Automattic/vip#readme",
   "devDependencies": {
-    "@automattic/eslint-plugin-wpvip": "0.11.0",
+    "@automattic/eslint-plugin-wpvip": "0.12.0",
     "@babel/cli": "7.24.7",
     "@babel/core": "7.24.7",
     "@babel/preset-env": "7.24.7",
@@ -131,7 +131,7 @@
     "@types/single-line-log": "1.1.2",
     "@types/tar": "^6.1.13",
     "@types/update-notifier": "^6.0.8",
-    "@types/uuid": "^9.0.7",
+    "@types/uuid": "^10.0.0",
     "@types/xml2js": "^0.4.14",
     "dockerode": "^4.0.0",
     "eslint": "^8.35.0",