@automattic/vip 2.3.0 → 2.6.0

package/CONTRIBUTING.md

@@ -94,12 +94,15 @@ gh pr list --search "is:merged sort:updated-desc closed:>$LAST_RELEASE_DATE" | s
 
 Then, let's publish:
 
+1. Make sure master branch is up to date `git pull`
 1. Set the version (via `npm version minor` or `npm version major` or `npm version patch`)
 1. For most regular releases, this will be `npm version minor`.
 1. Push the tag to GitHub (`git push --tags`)
+1. Push the master branch `git push`
 1. Make sure you're part of the Automattic organization in npm
 1. Publish the release to npm (`npm run publish-please --access public`)
 1. Edit [the release on GitHub](https://github.com/Automattic/vip/releases) to include a description of the changes and publish (this can just copy the details from the changelog).
+1. Push `master` changes (mostly the version bump) to `develop` (`git checkout develop && git merge master` )
 
 Once released, it's worth running `npm i -g @automattic/vip` to install / upgrade the released version to make sure everything looks good.
 

package/README.md

@@ -27,6 +27,36 @@ By default, we record information about the usage of this tool using an in-house
 
 ## Changelog
 
+### 2.6.0 (23 November 2021)
+- #921  [dev-env] Introuces update to change existing environment
+- #928  [dev-env] Switch lando to use our fork
+- #927  [dev-env] Handles user already exists during sql import
+- #925  [dev-env] Fix the issue with dev-env update
+- #924  FORNO-985 Increase SQL Import limit for unlaunched sites to 100GB
+- #923  FORNO-943 Fixes a bug which prevents displaying SQL Import error messages
+- #922  Update eslint-config-wpvip commit hash to c6605d1
+- #873  Pin dependencies
+
+### 2.5.0 (9 November 2021)
+- #919  [dev-env] Expose lando core logs
+- #916  [dev-env] Save instance data state
+- #914  [dev-env] update help wording for dev env
+- #915  Add warning message when an envvar is set/deleted
+
+### 2.4.0 (5 November 2021)
+- #913  [dev-env] No login required for dev-env
+- #911  Adds more release instructions
+
+### 2.3.1 (2 November 2021)
+- Fixes an issue with the 2.3.0 where the intended changes didn't get published correctly.
+
+### 2.3.0 (2 November 2021)
+- #908  [dev-env] Custom user permissions setup
+- #897  [dev-env] Primary domain prompt for primary domain redirect
+- #902  [dev-env] Delete file permissions
+- #900  Clarify CONTRIBUTING guidelines
+- #905  Update contribution steps
+
 ### 2.2.0 (27 October 2021)
 
 New: Environment variables command

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

@@ -16,8 +16,10 @@ services:
       command: sleep infinity
       volumes:
         - devtools:/dev-tools
+        - scripts:/scripts
     volumes:
       devtools: {}
+      scripts:
 
   nginx:
     type: compose
@@ -40,12 +42,20 @@ services:
         XDEBUG: <%= xdebug ? 'enable' : 'disable' %>
         STATSD: <%= statsd ? 'enable' : 'disable' %>
 
+        LANDO_NO_USER_PERMS: 'enable'
+
+
       volumes:
         - type: volume
           source: devtools
           target: /dev-tools
           volume:
             nocopy: true
+        - type: volume
+          source: scripts
+          target: /scripts
+          volume:
+            nocopy: true
 <% wpVolumes() %>
     run:
       - sh /dev-tools/setup.sh database root "http://<%= siteSlug %>.vipdev.lndo.site/" "<%= wpTitle %>" <% if ( multisite ) { %> <%= siteSlug %>.vipdev.lndo.site <% } %>
@@ -117,6 +127,11 @@ services:
       command: sh -c "rsync -a /wp/ /shared/; chown www-data -R /shared; sleep infinity"
       volumes:
         - ./wordpress:/shared
+        - type: volume
+          source: scripts
+          target: /scripts
+          volume:
+            nocopy: true
 
 <% if ( muPlugins.mode == 'image' ) { %>
   mu-plugins:
@@ -126,6 +141,11 @@ services:
       command: sh /run.sh
       volumes:
         - mu-plugins:/shared
+        - type: volume
+          source: scripts
+          target: /scripts
+          volume:
+            nocopy: true
     volumes:
       mu-plugins: {}
 <% } %>

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

@@ -82,6 +82,10 @@ async function deleteEnvVarCommand(arg, opt) {
   });
   await (0, _tracker.trackEvent)('envvar_delete_command_success', trackingParams);
   console.log(_chalk.default.green(`Successfully deleted environment variable ${JSON.stringify(name)}`));
+
+  if (!opt.skipConfirmation) {
+    console.log(_chalk.default.bgYellow(_chalk.default.bold('Important:')), 'Updates to environment variables will not be available until the application’s next deploy.');
+  }
 }
 
 (0, _command.default)({

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

@@ -101,6 +101,10 @@ async function setEnvVarCommand(arg, opt) {
   });
   await (0, _tracker.trackEvent)('envvar_set_command_success', trackingParams);
   console.log(_chalk.default.green(`Successfully set environment variable ${JSON.stringify(name)}`));
+
+  if (!opt.skipConfirmation) {
+    console.log(_chalk.default.bgYellow(_chalk.default.bold('Important:')), 'Updates to environment variables will not be available until the application’s next deploy.');
+  }
 }
 
 (0, _command.default)({

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

@@ -50,23 +50,14 @@ const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} create --multisite --wordpress "5.8" --client-code "~/git/my_code"`,
   description: 'Creates a local multisite dev environment using WP 5.8 and client code is expected to be in "~/git/my_code"'
 }];
-(0, _command.default)().option('slug', 'Custom name of the dev environment').option('title', 'Title for the WordPress site (default: "VIP Dev")').option('multisite', 'Enable multisite install', undefined, value => {
+const cmd = (0, _command.default)().option('slug', 'Custom name of the dev environment').option('title', 'Title for the WordPress site').option('multisite', 'Enable multisite install', undefined, value => {
   var _value$toLowerCase;
 
   return 'false' !== (value === null || value === void 0 ? void 0 : (_value$toLowerCase = value.toLowerCase) === null || _value$toLowerCase === void 0 ? void 0 : _value$toLowerCase.call(value));
-}).option('wordpress', 'Use a specific WordPress version or local directory (default: last stable)').option(['u', 'mu-plugins'], 'Use a specific mu-plugins changeset or local directory (default: "auto": last commit in master)').option('client-code', 'Use the client code from a local directory or VIP skeleton (default: use the VIP skeleton)').option('statsd', 'Enable statsd component. By default it is disabled', undefined, value => {
-  var _value$toLowerCase2;
-
-  return 'false' !== (value === null || value === void 0 ? void 0 : (_value$toLowerCase2 = value.toLowerCase) === null || _value$toLowerCase2 === void 0 ? void 0 : _value$toLowerCase2.call(value));
-}).option('phpmyadmin', 'Enable PHPMyAdmin component. By default it is disabled', undefined, value => {
-  var _value$toLowerCase3;
-
-  return 'false' !== (value === null || value === void 0 ? void 0 : (_value$toLowerCase3 = value.toLowerCase) === null || _value$toLowerCase3 === void 0 ? void 0 : _value$toLowerCase3.call(value));
-}).option('xdebug', 'Enable XDebug. By default it is disabled', undefined, value => {
-  var _value$toLowerCase4;
-
-  return 'false' !== (value === null || value === void 0 ? void 0 : (_value$toLowerCase4 = value.toLowerCase) === null || _value$toLowerCase4 === void 0 ? void 0 : _value$toLowerCase4.call(value));
-}).option('elasticsearch', 'Explicitly choose Elasticsearch version to use').option('mariadb', 'Explicitly choose MariaDB version to use').option('media-redirect-domain', 'Domain to redirect for missing media files. This can be used to still have images without the need to import them locally.').examples(examples).argv(process.argv, async (arg, opt) => {
+});
+(0, _devEnvironmentCli.addDevEnvConfigurationOptions)(cmd);
+cmd.examples(examples);
+cmd.argv(process.argv, async (arg, opt) => {
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
   debug('Args: ', arg, 'Options: ', opt);
 
@@ -79,11 +70,12 @@ const examples = [{
     exit.withError(messageToShow);
   }
 
-  let appInfo = {};
+  let defaultOptions = {};
 
   try {
     if (opt.app) {
-      appInfo = await (0, _devEnvironmentCore.getApplicationInformation)(opt.app, opt.env);
+      const appInfo = await (0, _devEnvironmentCore.getApplicationInformation)(opt.app, opt.env);
+      defaultOptions = (0, _devEnvironmentCli.getOptionsFromAppInfo)(appInfo);
     }
   } catch (error) {
     const message = `failed to fetch application "${opt.app}" information`;
@@ -91,17 +83,11 @@ const examples = [{
     console.log(_chalk.default.yellow('Warning:'), message);
   }
 
-  const instanceData = await (0, _devEnvironmentCli.promptForArguments)(opt, appInfo);
-  const instanceDataWithSlug = { ...instanceData,
-    siteSlug: slug,
-    statsd: opt.statsd || false,
-    phpmyadmin: opt.phpmyadmin || false,
-    xdebug: opt.xdebug || false,
-    mediaRedirectDomain: opt.mediaRedirectDomain || ''
-  };
+  const instanceData = await (0, _devEnvironmentCli.promptForArguments)(opt, defaultOptions);
+  instanceData.siteSlug = slug;
 
   try {
-    await (0, _devEnvironmentCore.createEnvironment)(instanceDataWithSlug);
+    await (0, _devEnvironmentCore.createEnvironment)(instanceData);
     await (0, _devEnvironmentCore.printEnvironmentInfo)(slug);
     const message = '\n' + _chalk.default.green('✓') + ` environment created.\n\nTo start it please run:\n\n${startCommand}\n`;
     console.log(message);

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

@@ -12,6 +12,8 @@
 
 var _fs = _interopRequireDefault(require("fs"));
 
+var _chalk = _interopRequireDefault(require("chalk"));
+
 var _command = _interopRequireDefault(require("../lib/cli/command"));
 
 var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
@@ -62,8 +64,17 @@ const examples = [{
 
     const cacheArg = ['wp', 'cache', 'flush'];
     await (0, _devEnvironmentCore.exec)(slug, cacheArg);
-    const addUserArg = ['wp', 'user', 'create', 'vipgo', 'vipgo@go-vip.net', '--user_pass=password', '--role=administrator'];
-    await (0, _devEnvironmentCore.exec)(slug, addUserArg);
+
+    try {
+      const addUserArg = ['wp', 'user', 'create', 'vipgo', 'vipgo@go-vip.net', '--user_pass=password', '--role=administrator'];
+      await (0, _devEnvironmentCore.exec)(slug, addUserArg);
+    } catch (exception) {
+      if ((exception.message || '').includes('is already registered')) {
+        console.log(_chalk.default.bold(_chalk.default.green('Success: ')) + 'Skipping user vipgo provisioning');
+      } else {
+        throw exception;
+      }
+    }
   } catch (error) {
     (0, _devEnvironmentCli.handleCLIException)(error);
   }

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

@@ -0,0 +1,80 @@
+#!/usr/bin/env node
+
+/**
+ * 
+ * @format
+ */
+
+/**
+ * External dependencies
+ */
+"use strict";
+
+var _debug = _interopRequireDefault(require("debug"));
+
+var _chalk = _interopRequireDefault(require("chalk"));
+
+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");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * Internal dependencies
+ */
+const debug = (0, _debug.default)('@automattic/vip:bin:dev-environment');
+const examples = [{
+  usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} update`,
+  description: 'Retriggers setup wizard in order to change environment configuration'
+}];
+const cmd = (0, _command.default)().option('slug', 'Custom name of the dev environment');
+(0, _devEnvironmentCli.addDevEnvConfigurationOptions)(cmd);
+cmd.examples(examples);
+cmd.argv(process.argv, async (arg, opt) => {
+  const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
+
+  try {
+    const environmentAlreadyExists = (0, _devEnvironmentCore.doesEnvironmentExist)(slug);
+
+    if (!environmentAlreadyExists) {
+      throw new Error(_devEnvironment.DEV_ENVIRONMENT_NOT_FOUND);
+    }
+
+    const currentInstanceData = (0, _devEnvironmentCore.readEnvironmentData)(slug);
+    debug('Read instance data', currentInstanceData);
+    const preselectedOptions = {
+      // Title and multisite can't be changed during update
+      title: currentInstanceData.wpTitle,
+      multisite: currentInstanceData.multisite,
+      ...opt
+    };
+    const defaultOptions = {
+      clientCode: currentInstanceData.clientCode.dir || currentInstanceData.clientCode.tag || 'latest',
+      muPlugins: currentInstanceData.muPlugins.dir || currentInstanceData.muPlugins.tag || 'latest',
+      wordpress: currentInstanceData.wordpress.tag,
+      elasticsearch: currentInstanceData.elasticsearch,
+      mariadb: currentInstanceData.mariadb,
+      statsd: currentInstanceData.statsd,
+      phpmyadmin: currentInstanceData.phpmyadmin,
+      xdebug: currentInstanceData.xdebug,
+      mediaRedirectDomain: currentInstanceData.mediaRedirectDomain
+    };
+    const instanceData = await (0, _devEnvironmentCli.promptForArguments)(preselectedOptions, defaultOptions);
+    instanceData.siteSlug = slug;
+    await (0, _devEnvironmentCore.updateEnvironment)(instanceData);
+    const message = '\n' + _chalk.default.green('✓') + ' environment updated. Restart environment for changes to take an affect.';
+    console.log(message);
+  } catch (error) {
+    if ('ENOENT' === error.code) {
+      const message = 'Environment was created before update was supported.\n\nTo update environment please destroy it and create a new one.';
+      (0, _devEnvironmentCli.handleCLIException)(new Error(message));
+    } else {
+      (0, _devEnvironmentCli.handleCLIException)(error);
+    }
+  }
+});

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

@@ -20,4 +20,4 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 (0, _command.default)({
   requiredArgs: 1
-}).command('create', 'Create a new local dev environment').command('start', 'Start a local dev environment').command('stop', 'Stop a local dev environment').command('destroy', 'Remove containers, networks, volumes and configuration files of a local dev environment').command('info', 'Provides basic info about one or multiple local dev environments').command('exec', 'Execute an operation on a dev environment').command('import', 'Import data into a local WordPress environment').argv(process.argv);
+}).command('create', 'Create a new local dev environment').command('update', 'Update an already created local dev environment').command('start', 'Start a local dev environment').command('stop', 'Stop a local dev environment').command('destroy', 'Remove containers, networks, volumes and configuration files of a local dev environment').command('info', 'Provides basic info about one or multiple local dev environments').command('exec', 'Execute an operation on a dev environment').command('import', 'Import data into a local WordPress environment').argv(process.argv);

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

@@ -495,7 +495,8 @@ Processing the SQL import for your environment...
       id: app.id,
       environmentId: env.id,
       basename: basename,
-      md5: md5
+      md5: md5,
+      searchReplace: []
     };
 
     if (searchReplace) {

package/dist/bin/vip.js

@@ -15,7 +15,7 @@ var _debug = _interopRequireDefault(require("debug"));
 
 var _config = _interopRequireDefault(require("../../config/config.json"));
 
-var _command = _interopRequireDefault(require("../lib/cli/command"));
+var _command = _interopRequireWildcard(require("../lib/cli/command"));
 
 var _token = _interopRequireDefault(require("../lib/token"));
 
@@ -23,6 +23,10 @@ var _tracker = require("../lib/tracker");
 
 var _rollbar = require("../lib/rollbar");
 
+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 }; }
 
 /**
@@ -52,9 +56,10 @@ 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 isDevEnvCommandWithoutEnv = process.argv.some(arg => arg === 'dev-env') && !(0, _command.containsAppEnvArgument)(process.argv);
   debug('Argv:', process.argv);
 
-  if (isLogoutCommand || isHelpCommand || token && token.valid()) {
+  if (isLogoutCommand || isHelpCommand || isDevEnvCommandWithoutEnv || token && token.valid()) {
     runCmd();
   } else {
     console.log();

package/dist/lib/cli/command.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = _default;
 exports.getEnvIdentifier = getEnvIdentifier;
+exports.containsAppEnvArgument = containsAppEnvArgument;
 
 var _args = _interopRequireDefault(require("args"));
 
@@ -587,4 +588,9 @@ function getEnvIdentifier(env) {
   }
 
   return identifier;
+}
+
+function containsAppEnvArgument(argv) {
+  const parsedAlias = (0, _envAlias.parseEnvAliasFromArgv)(argv);
+  return !!(parsedAlias.app || parsedAlias.env || argv.includes('--app') || argv.includes('--env'));
 }

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DEV_ENVIRONMENT_COMPONENTS = exports.DEV_ENVIRONMENT_PROMPT_INTRO = exports.DEV_ENVIRONMENT_DEFAULTS = exports.DEV_ENVIRONMENT_FULL_COMMAND = exports.DEV_ENVIRONMENT_SUBCOMMAND = void 0;
+exports.DEV_ENVIRONMENT_COMPONENTS = exports.DEV_ENVIRONMENT_NOT_FOUND = exports.DEV_ENVIRONMENT_PROMPT_INTRO = exports.DEV_ENVIRONMENT_DEFAULTS = exports.DEV_ENVIRONMENT_FULL_COMMAND = exports.DEV_ENVIRONMENT_SUBCOMMAND = void 0;
 const DEV_ENVIRONMENT_SUBCOMMAND = 'dev-env';
 exports.DEV_ENVIRONMENT_SUBCOMMAND = DEV_ENVIRONMENT_SUBCOMMAND;
 const DEV_ENVIRONMENT_FULL_COMMAND = `vip ${DEV_ENVIRONMENT_SUBCOMMAND}`;
@@ -17,5 +17,7 @@ const DEV_ENVIRONMENT_DEFAULTS = {
 exports.DEV_ENVIRONMENT_DEFAULTS = DEV_ENVIRONMENT_DEFAULTS;
 const DEV_ENVIRONMENT_PROMPT_INTRO = 'This is a wizard to help you set up your local dev environment.\n\n' + 'Sensible default values were pre-selected for convenience. ' + 'You may also choose to create multiple environments with different settings using the --slug option.\n\n';
 exports.DEV_ENVIRONMENT_PROMPT_INTRO = DEV_ENVIRONMENT_PROMPT_INTRO;
+const DEV_ENVIRONMENT_NOT_FOUND = 'Environment not found.';
+exports.DEV_ENVIRONMENT_NOT_FOUND = DEV_ENVIRONMENT_NOT_FOUND;
 const DEV_ENVIRONMENT_COMPONENTS = ['wordpress', 'muPlugins', 'clientCode'];
 exports.DEV_ENVIRONMENT_COMPONENTS = DEV_ENVIRONMENT_COMPONENTS;

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

@@ -8,11 +8,13 @@ exports.getEnvironmentName = getEnvironmentName;
 exports.getEnvironmentStartCommand = getEnvironmentStartCommand;
 exports.printTable = printTable;
 exports.processComponentOptionInput = processComponentOptionInput;
+exports.getOptionsFromAppInfo = getOptionsFromAppInfo;
 exports.promptForArguments = promptForArguments;
 exports.resolvePath = resolvePath;
 exports.promptForText = promptForText;
 exports.promptForBoolean = promptForBoolean;
 exports.promptForComponent = promptForComponent;
+exports.addDevEnvConfigurationOptions = addDevEnvConfigurationOptions;
 
 var _chalk = _interopRequireDefault(require("chalk"));
 
@@ -30,6 +32,8 @@ var _os = _interopRequireDefault(require("os"));
 
 var _devEnvironment = require("../constants/dev-environment");
 
+var _types = require("./types");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**
@@ -50,7 +54,7 @@ const DEFAULT_SLUG = 'vip-local';
 function handleCLIException(exception) {
   const errorPrefix = _chalk.default.red('Error:');
 
-  if ('Environment not found.' === exception.message) {
+  if (_devEnvironment.DEV_ENVIRONMENT_NOT_FOUND === exception.message) {
     const createCommand = _chalk.default.bold(_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND + ' create');
 
     const message = `Environment doesn't exist.\n\n\nTo create a new environment run:\n\n${createCommand}\n`;
@@ -121,49 +125,89 @@ function processComponentOptionInput(passedParam, allowLocal) {
   };
 }
 
-async function promptForArguments(providedOptions, appInfo) {
-  var _appInfo$environment;
+function getOptionsFromAppInfo(appInfo) {
+  var _appInfo$environment, _appInfo$environment2, _appInfo$environment3;
+
+  if (!appInfo) {
+    return {};
+  }
+
+  return {
+    title: ((_appInfo$environment = appInfo.environment) === null || _appInfo$environment === void 0 ? void 0 : _appInfo$environment.name) || appInfo.name,
+    multisite: !!(appInfo !== null && appInfo !== void 0 && (_appInfo$environment2 = appInfo.environment) !== null && _appInfo$environment2 !== void 0 && _appInfo$environment2.isMultisite),
+    mediaRedirectDomain: (_appInfo$environment3 = appInfo.environment) === null || _appInfo$environment3 === void 0 ? void 0 : _appInfo$environment3.primaryDomain
+  };
+}
+/**
+ * Prompt for arguments
+ * @param {InstanceOptions} preselectedOptions - options to be used without prompt
+ * @param {InstanceOptions} defaultOptions - options to be used as default values for prompt
+ * @returns {any} instance data
+ */
+
 
-  debug('Provided options', providedOptions);
+async function promptForArguments(preselectedOptions, defaultOptions) {
+  debug('Provided preselected', preselectedOptions, 'and default', defaultOptions);
   console.log(_devEnvironment.DEV_ENVIRONMENT_PROMPT_INTRO);
-  const name = (appInfo === null || appInfo === void 0 ? void 0 : (_appInfo$environment = appInfo.environment) === null || _appInfo$environment === void 0 ? void 0 : _appInfo$environment.name) || (appInfo === null || appInfo === void 0 ? void 0 : appInfo.name);
   let multisiteText = 'Multisite';
   let multisiteDefault = _devEnvironment.DEV_ENVIRONMENT_DEFAULTS.multisite;
 
-  if (appInfo !== null && appInfo !== void 0 && appInfo.environment) {
-    var _appInfo$environment2;
-
-    const isEnvMultisite = !!(appInfo !== null && appInfo !== void 0 && (_appInfo$environment2 = appInfo.environment) !== null && _appInfo$environment2 !== void 0 && _appInfo$environment2.isMultisite);
-    multisiteText += ` (${name} ${isEnvMultisite ? 'IS' : 'is NOT'} multisite)`;
-    multisiteDefault = isEnvMultisite;
+  if (defaultOptions.title) {
+    multisiteText += ` (${defaultOptions.title} ${defaultOptions.multisite ? 'IS' : 'is NOT'} multisite)`;
+    multisiteDefault = defaultOptions.multisite;
   }
 
   const instanceData = {
-    wpTitle: providedOptions.title || (await promptForText('WordPress site title', name || _devEnvironment.DEV_ENVIRONMENT_DEFAULTS.title)),
-    multisite: 'multisite' in providedOptions ? providedOptions.multisite : await promptForBoolean(multisiteText, multisiteDefault),
-    elasticsearch: providedOptions.elasticsearch || _devEnvironment.DEV_ENVIRONMENT_DEFAULTS.elasticsearchVersion,
-    mariadb: providedOptions.mariadb || _devEnvironment.DEV_ENVIRONMENT_DEFAULTS.mariadbVersion,
+    wpTitle: preselectedOptions.title || (await promptForText('WordPress site title', defaultOptions.title || _devEnvironment.DEV_ENVIRONMENT_DEFAULTS.title)),
+    multisite: 'multisite' in preselectedOptions ? preselectedOptions.multisite : await promptForBoolean(multisiteText, !!multisiteDefault),
+    elasticsearch: preselectedOptions.elasticsearch || defaultOptions.elasticsearch || _devEnvironment.DEV_ENVIRONMENT_DEFAULTS.elasticsearchVersion,
+    mariadb: preselectedOptions.mariadb || defaultOptions.mariadb || _devEnvironment.DEV_ENVIRONMENT_DEFAULTS.mariadbVersion,
+    mediaRedirectDomain: preselectedOptions.mediaRedirectDomain || '',
     wordpress: {},
     muPlugins: {},
-    clientCode: {}
+    clientCode: {},
+    statsd: false,
+    phpmyadmin: false,
+    xdebug: false
   };
 
+  if (!instanceData.mediaRedirectDomain && defaultOptions.mediaRedirectDomain) {
+    const mediaRedirectPromptText = `Would you like to redirect to ${defaultOptions.mediaRedirectDomain} for missing media files?`;
+    const setMediaRedirectDomain = await promptForBoolean(mediaRedirectPromptText, true);
+
+    if (setMediaRedirectDomain) {
+      instanceData.mediaRedirectDomain = defaultOptions.mediaRedirectDomain;
+    }
+  }
+
   for (const component of _devEnvironment.DEV_ENVIRONMENT_COMPONENTS) {
-    const option = providedOptions[component];
-    instanceData[component] = await processComponent(component, option);
+    const option = preselectedOptions[component];
+    const defaultValue = defaultOptions[component];
+    instanceData[component] = await processComponent(component, option, defaultValue);
   }
 
+  for (const service of ['statsd', 'phpmyadmin', 'xdebug']) {
+    if (service in preselectedOptions) {
+      instanceData[service] = preselectedOptions[service];
+    } else if (service in defaultOptions) {
+      instanceData[service] = defaultOptions[service];
+    }
+  }
+
+  debug('Instance data after prompts', instanceData);
   return instanceData;
 }
 
-async function processComponent(component, option) {
+async function processComponent(component, preselectedValue, defaultValue) {
+  debug(`processing a component '${component}', with preselected/deafault - ${preselectedValue}/${defaultValue}`);
   let result = null;
   const allowLocal = component !== 'wordpress';
+  const defaultObject = defaultValue ? processComponentOptionInput(defaultValue, allowLocal) : null;
 
-  if (option) {
-    result = processComponentOptionInput(option, allowLocal);
+  if (preselectedValue) {
+    result = processComponentOptionInput(preselectedValue, allowLocal);
   } else {
-    result = await promptForComponent(component, allowLocal);
+    result = await promptForComponent(component, allowLocal, defaultObject);
   }
 
   while ('local' === ((_result = result) === null || _result === void 0 ? void 0 : _result.mode)) {
@@ -181,7 +225,7 @@ async function processComponent(component, option) {
     } else {
       const message = `Provided path "${resolvedPath}" does not point to a valid or existing directory.`;
       console.log(_chalk.default.yellow('Warning:'), message);
-      result = await promptForComponent(component, allowLocal);
+      result = await promptForComponent(component, allowLocal, defaultObject);
     }
   }
 
@@ -211,7 +255,7 @@ async function promptForText(message, initial) {
     initial,
     validate: nonEmptyValidator
   });
-  return result.input.trim();
+  return ((result === null || result === void 0 ? void 0 : result.input) || '').trim();
 }
 
 async function promptForBoolean(message, initial) {
@@ -228,19 +272,19 @@ const componentDisplayNames = {
   clientCode: 'site-code'
 };
 
-async function promptForComponent(component, allowLocal) {
-  debug(`Prompting for ${component}`);
+async function promptForComponent(component, allowLocal, defaultObject) {
+  debug(`Prompting for ${component} with default:`, defaultObject);
   const componentDisplayName = componentDisplayNames[component] || component;
-  const choices = [];
+  const modChoices = [];
 
   if (allowLocal) {
-    choices.push({
+    modChoices.push({
       message: `local folder - where you already have ${componentDisplayName} code`,
       value: 'local'
     });
   }
 
-  choices.push({
+  modChoices.push({
     message: 'image - that gets automatically fetched',
     value: 'image'
   });
@@ -250,14 +294,18 @@ async function promptForComponent(component, allowLocal) {
     initialMode = 'local';
   }
 
+  if (defaultObject !== null && defaultObject !== void 0 && defaultObject.mode) {
+    initialMode = defaultObject.mode;
+  }
+
   let modeResult = initialMode;
-  const selectMode = choices.length > 1;
+  const selectMode = modChoices.length > 1;
 
   if (selectMode) {
-    const initialModeIndex = choices.findIndex(choice => choice.value === initialMode);
+    const initialModeIndex = modChoices.findIndex(choice => choice.value === initialMode);
     const select = new _enquirer.Select({
       message: `How would you like to source ${componentDisplayName}`,
-      choices,
+      choices: modChoices,
       initial: initialModeIndex
     });
     modeResult = await select.run();
@@ -266,38 +314,61 @@ async function promptForComponent(component, allowLocal) {
   const messagePrefix = selectMode ? '\t' : `${componentDisplayName} - `;
 
   if ('local' === modeResult) {
-    const directoryPath = await promptForText(`${messagePrefix}What is a path to your local ${componentDisplayName}`, '');
+    const directoryPath = await promptForText(`${messagePrefix}What is a path to your local ${componentDisplayName}`, (defaultObject === null || defaultObject === void 0 ? void 0 : defaultObject.dir) || '');
     return {
       mode: modeResult,
       dir: directoryPath
     };
-  }
-
-  if ('inherit' === modeResult) {
-    return {
-      mode: modeResult
-    };
-  } // image
+  } // image with selection
 
 
   if (component === 'wordpress') {
     const message = `${messagePrefix}Which version would you like`;
+    const tagChoices = getWordpressImageTags();
+    let initialTagIndex = 0;
+
+    if (defaultObject !== null && defaultObject !== void 0 && defaultObject.tag) {
+      const defaultTagIndex = tagChoices.indexOf(defaultObject.tag);
+
+      if (defaultTagIndex !== -1) {
+        initialTagIndex = defaultTagIndex;
+      }
+    }
+
     const selectTag = new _enquirer.Select({
       message,
-      choices: getWordpressImageTags()
+      choices: tagChoices,
+      initial: initialTagIndex
     });
     const tag = await selectTag.run();
     return {
       mode: modeResult,
       tag
     };
-  }
+  } // image
+
 
   return {
     mode: modeResult
   };
 }
 
+function addDevEnvConfigurationOptions(command) {
+  return command.option('wordpress', 'Use a specific WordPress version').option(['u', 'mu-plugins'], 'Use a specific mu-plugins changeset or local directory').option('client-code', 'Use the client code from a local directory or VIP skeleton').option('statsd', 'Enable statsd component. By default it is disabled', undefined, value => {
+    var _value$toLowerCase;
+
+    return 'false' !== (value === null || value === void 0 ? void 0 : (_value$toLowerCase = value.toLowerCase) === null || _value$toLowerCase === void 0 ? void 0 : _value$toLowerCase.call(value));
+  }).option('phpmyadmin', 'Enable PHPMyAdmin component. By default it is disabled', undefined, value => {
+    var _value$toLowerCase2;
+
+    return 'false' !== (value === null || value === void 0 ? void 0 : (_value$toLowerCase2 = value.toLowerCase) === null || _value$toLowerCase2 === void 0 ? void 0 : _value$toLowerCase2.call(value));
+  }).option('xdebug', 'Enable XDebug. By default it is disabled', undefined, value => {
+    var _value$toLowerCase3;
+
+    return 'false' !== (value === null || value === void 0 ? void 0 : (_value$toLowerCase3 = value.toLowerCase) === null || _value$toLowerCase3 === void 0 ? void 0 : _value$toLowerCase3.call(value));
+  }).option('elasticsearch', 'Explicitly choose Elasticsearch version to use').option('mariadb', 'Explicitly choose MariaDB version to use').option('media-redirect-domain', 'Domain to redirect for missing media files. This can be used to still have images without the need to import them locally.');
+}
+
 function getWordpressImageTags() {
   return ['5.8.1', '5.8', '5.7.3', '5.7.2'];
 }

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

@@ -6,11 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.startEnvironment = startEnvironment;
 exports.stopEnvironment = stopEnvironment;
 exports.createEnvironment = createEnvironment;
+exports.updateEnvironment = updateEnvironment;
 exports.destroyEnvironment = destroyEnvironment;
 exports.printAllEnvironmentsInfo = printAllEnvironmentsInfo;
 exports.printEnvironmentInfo = printEnvironmentInfo;
 exports.exec = exec;
 exports.doesEnvironmentExist = doesEnvironmentExist;
+exports.readEnvironmentData = readEnvironmentData;
 exports.getEnvironmentPath = getEnvironmentPath;
 exports.getApplicationInformation = getApplicationInformation;
 exports.resolveImportPath = resolveImportPath;
@@ -42,6 +44,8 @@ var _devEnvironmentCli = require("./dev-environment-cli");
 
 var _app = _interopRequireDefault(require("../api/app"));
 
+var _devEnvironment = require("../constants/dev-environment");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**
@@ -64,6 +68,7 @@ const nginxFileTemplatePath = _path.default.join(__dirname, '..', '..', '..', 'a
 
 const landoFileName = '.lando.yml';
 const nginxFileName = 'extra.conf';
+const instanceDataFileName = 'instance_data.json';
 const homeDirPathInsideContainers = '/user';
 const uploadPathString = 'uploads';
 const nginxPathString = 'nginx';
@@ -76,7 +81,7 @@ async function startEnvironment(slug, options) {
   const environmentExists = _fs.default.existsSync(instancePath);
 
   if (!environmentExists) {
-    throw new Error('Environment not found.');
+    throw new Error(_devEnvironment.DEV_ENVIRONMENT_NOT_FOUND);
   }
 
   if (options.skipRebuild) {
@@ -96,7 +101,7 @@ async function stopEnvironment(slug) {
   const environmentExists = _fs.default.existsSync(instancePath);
 
   if (!environmentExists) {
-    throw new Error('Environment not found.');
+    throw new Error(_devEnvironment.DEV_ENVIRONMENT_NOT_FOUND);
   }
 
   await (0, _devEnvironmentLando.landoStop)(instancePath);
@@ -104,7 +109,7 @@ async function stopEnvironment(slug) {
 
 async function createEnvironment(instanceData) {
   const slug = instanceData.siteSlug;
-  debug('Will start an environment', slug, 'with instanceData: ', instanceData);
+  debug('Will create an environment', slug, 'with instanceData: ', instanceData);
   const instancePath = getEnvironmentPath(slug);
   debug('Instance path for', slug, 'is:', instancePath);
 
@@ -114,12 +119,36 @@ async function createEnvironment(instanceData) {
     throw new Error('Environment already exists.');
   }
 
+  const preProcessedInstanceData = preProcessInstanceData(instanceData);
+  await prepareLandoEnv(preProcessedInstanceData, instancePath);
+}
+
+async function updateEnvironment(instanceData) {
+  const slug = instanceData.siteSlug;
+  debug('Will update an environment', slug, 'with instanceData: ', instanceData);
+  const instancePath = getEnvironmentPath(slug);
+  debug('Instance path for', slug, 'is:', instancePath);
+
+  const alreadyExists = _fs.default.existsSync(instancePath);
+
+  if (!alreadyExists) {
+    throw new Error('Environment doesn\'t exist.');
+  }
+
+  const preProcessedInstanceData = preProcessInstanceData(instanceData);
+  await prepareLandoEnv(preProcessedInstanceData, instancePath);
+}
+
+function preProcessInstanceData(instanceData) {
+  const newInstanceData = { ...instanceData
+  };
+
   if (instanceData.mediaRedirectDomain && !instanceData.mediaRedirectDomain.match(/^http/)) {
     // We need to make sure the redirect is an absolute path
-    instanceData.mediaRedirectDomain = `https://${instanceData.mediaRedirectDomain}`;
+    newInstanceData.mediaRedirectDomain = `https://${instanceData.mediaRedirectDomain}`;
   }
 
-  await prepareLandoEnv(instanceData, instancePath);
+  return newInstanceData;
 }
 
 async function destroyEnvironment(slug, removeFiles) {
@@ -130,7 +159,7 @@ async function destroyEnvironment(slug, removeFiles) {
   const environmentExists = _fs.default.existsSync(instancePath);
 
   if (!environmentExists) {
-    throw new Error('Environment not found.');
+    throw new Error(_devEnvironment.DEV_ENVIRONMENT_NOT_FOUND);
   }
 
   const landoFilePath = _path.default.join(instancePath, landoFileName);
@@ -169,7 +198,7 @@ async function printEnvironmentInfo(slug) {
   const environmentExists = _fs.default.existsSync(instancePath);
 
   if (!environmentExists) {
-    throw new Error('Environment not found.');
+    throw new Error(_devEnvironment.DEV_ENVIRONMENT_NOT_FOUND);
   }
 
   const appInfo = await (0, _devEnvironmentLando.landoInfo)(instancePath);
@@ -184,7 +213,7 @@ async function exec(slug, args) {
   const environmentExists = _fs.default.existsSync(instancePath);
 
   if (!environmentExists) {
-    throw new Error('Environment not found.');
+    throw new Error(_devEnvironment.DEV_ENVIRONMENT_NOT_FOUND);
   }
 
   const command = args.shift();
@@ -204,9 +233,21 @@ function doesEnvironmentExist(slug) {
   return _fs.default.existsSync(instancePath);
 }
 
+function readEnvironmentData(slug) {
+  debug('Will try to get instance data for environment', slug);
+  const instancePath = getEnvironmentPath(slug);
+
+  const instanceDataTargetPath = _path.default.join(instancePath, instanceDataFileName);
+
+  const instanceDataString = _fs.default.readFileSync(instanceDataTargetPath, 'utf8');
+
+  return JSON.parse(instanceDataString);
+}
+
 async function prepareLandoEnv(instanceData, instancePath) {
   const landoFile = await _ejs.default.renderFile(landoFileTemplatePath, instanceData);
   const nginxFile = await _ejs.default.renderFile(nginxFileTemplatePath, instanceData);
+  const instanceDataFile = JSON.stringify(instanceData);
 
   const landoFileTargetPath = _path.default.join(instancePath, landoFileName);
 
@@ -214,6 +255,8 @@ async function prepareLandoEnv(instanceData, instancePath) {
 
   const nginxFileTargetPath = _path.default.join(nginxFolderPath, nginxFileName);
 
+  const instanceDataTargetPath = _path.default.join(instancePath, instanceDataFileName);
+
   _fs.default.mkdirSync(instancePath, {
     recursive: true
   });
@@ -226,8 +269,11 @@ async function prepareLandoEnv(instanceData, instancePath) {
 
   _fs.default.writeFileSync(nginxFileTargetPath, nginxFile);
 
+  _fs.default.writeFileSync(instanceDataTargetPath, instanceDataFile);
+
   debug(`Lando file created in ${landoFileTargetPath}`);
   debug(`Nginx file created in ${nginxFileTargetPath}`);
+  debug(`Instance data file created in ${instanceDataTargetPath}`);
 }
 
 function getAllEnvironmentNames() {
@@ -276,7 +322,10 @@ async function getApplicationInformation(appId, envType) {
 			name,
 			type,
 			branch,
-			isMultisite
+			isMultisite,
+			primaryDomain {
+				name
+			}
 		}`;
   const queryResult = await (0, _app.default)(appId, fieldsQuery);
   const appData = {};
@@ -297,11 +346,14 @@ async function getApplicationInformation(appId, envType) {
     }
 
     if (envData) {
+      var _envData$primaryDomai;
+
       appData.environment = {
         name: envData.name,
         branch: envData.branch,
         type: envData.type,
-        isMultisite: envData.isMultisite
+        isMultisite: envData.isMultisite,
+        primaryDomain: ((_envData$primaryDomai = envData.primaryDomain) === null || _envData$primaryDomai === void 0 ? void 0 : _envData$primaryDomai.name) || ''
       };
     }
   }

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

@@ -42,14 +42,16 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * This file will hold all the interactions with lando library
  */
-const debug = (0, _debug.default)('@automattic/vip:bin:dev-environment-lando');
+const DEBUG_KEY = '@automattic/vip:bin:dev-environment-lando';
+const debug = (0, _debug.default)(DEBUG_KEY);
 
 function getLandoConfig() {
   const landoPath = _path.default.join(__dirname, '..', '..', '..', 'node_modules', 'lando');
 
   debug(`Getting lando config, using path '${landoPath}' for plugins`);
+  const logLevelConsole = (process.env.DEBUG || '').includes(DEBUG_KEY) ? 'debug' : 'warn';
   return {
-    logLevelConsole: 'warn',
+    logLevelConsole,
     landoFile: '.lando.yml',
     preLandoFiles: ['.lando.base.yml', '.lando.dist.yml', '.lando.upstream.yml'],
     postLandoFiles: ['.lando.local.yml'],

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

@@ -0,0 +1 @@
+"use strict";

package/dist/lib/site-import/db-file-import.js

@@ -16,7 +16,7 @@ var _fileSize = require("../constants/file-size");
 /**
  * Internal dependencies
  */
-const SQL_IMPORT_FILE_SIZE_LIMIT = 10 * _fileSize.GB_IN_BYTES;
+const SQL_IMPORT_FILE_SIZE_LIMIT = 100 * _fileSize.GB_IN_BYTES;
 exports.SQL_IMPORT_FILE_SIZE_LIMIT = SQL_IMPORT_FILE_SIZE_LIMIT;
 const SQL_IMPORT_FILE_SIZE_LIMIT_LAUNCHED = 350 * _fileSize.MB_IN_BYTES;
 exports.SQL_IMPORT_FILE_SIZE_LIMIT_LAUNCHED = SQL_IMPORT_FILE_SIZE_LIMIT_LAUNCHED;

package/dist/lib/site-import/status.js

@@ -345,7 +345,7 @@ ${maybeExitPrompt}
 
       let failedImportStep;
 
-      if (jobCreationTime && (importStepProgress === null || importStepProgress === void 0 ? void 0 : importStepProgress.started_at) * 1000 > jobCreationTime) {
+      if (jobCreationTime && (importStepProgress === null || importStepProgress === void 0 ? void 0 : importStepProgress.started_at) * 1000 >= jobCreationTime) {
         // The contents of the `import_progress` meta are pertinent to the most recent import job
         failedImportStep = importStepProgress.steps.find(step => (step === null || step === void 0 ? void 0 : step.result) === 'failed' && 1000 * (step === null || step === void 0 ? void 0 : step.started_at) > new Date(createdAt).getTime());
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "2.3.0",
+  "version": "2.6.0",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {
@@ -16,6 +16,7 @@
     "vip-config-envvar-set": "dist/bin/vip-config-envvar-set.js",
     "vip-dev-env": "dist/bin/vip-dev-env.js",
     "vip-dev-env-create": "dist/bin/vip-dev-env-create.js",
+    "vip-dev-env-update": "dist/bin/vip-dev-env-update.js",
     "vip-dev-env-destroy": "dist/bin/vip-dev-env-destroy.js",
     "vip-dev-env-exec": "dist/bin/vip-dev-env-exec.js",
     "vip-dev-env-import": "dist/bin/vip-dev-env-import.js",
@@ -75,7 +76,7 @@
   "devDependencies": {
     "@babel/cli": "7.15.7",
     "@babel/core": "7.14.0",
-    "@babel/eslint-parser": "^7.13.14",
+    "@babel/eslint-parser": "7.13.14",
     "@babel/plugin-transform-modules-commonjs": "7.14.0",
     "@babel/preset-env": "7.14.1",
     "@babel/preset-flow": "7.13.13",
@@ -84,14 +85,14 @@
     "babel-plugin-module-resolver": "4.1.0",
     "core-js": "3.12.0",
     "eslint": "7.32.0",
-    "eslint-config-wpvip": "github:automattic/eslint-config-wpvip#d0aa883",
+    "eslint-config-wpvip": "github:automattic/eslint-config-wpvip#c6605d1",
     "eslint-plugin-flowtype": "5.7.2",
     "eslint-plugin-import": "2.22.1",
     "eslint-plugin-jest": "24.3.6",
     "eslint-plugin-json": "3.0.0",
     "eslint-plugin-jsx-a11y": "6.4.1",
     "eslint-plugin-no-async-foreach": "0.1.1",
-    "eslint-plugin-react": "^7.26.0",
+    "eslint-plugin-react": "7.26.0",
     "eslint-plugin-wpcalypso": "5.0.0",
     "flow-bin": "0.150.0",
     "jest": "27.2.1",
@@ -115,7 +116,7 @@
     "ini": "2.0.0",
     "json2csv": "5.0.6",
     "jwt-decode": "2.2.0",
-    "lando": "git+https://github.com/lando/cli.git#v3.4.3",
+    "lando": "git+https://github.com/Automattic/lando-cli.git#v3.5.1-patch2021_11_22",
     "node-fetch": "^2.6.1",
     "opn": "5.5.0",
     "rollbar": "2.22.0",