@automattic/vip 2.26.0 → 2.26.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 ## Changelog
 
+### 2.26.2
+
+- #1278	Prepare v2.26.2
+- #1277	Fix the PassThrough class import
+- #1276	[dev-env] Add ability to override default options for lando with a global Lando config.yml
+
+### 2.26.1
+
+- #1275 Prepare v2.26.1
+- #1271 refactor(dev-env): Switch to mysql:8
+- #1273 Add library for the dev-env-sync-sql command
+- #1274 Run validation on filename & not on full filepath
+- #1272 fix(dev-env): Suppress health warnings for new environments
+- #1234 fix(dev-env): Force IPv4 for services bound to localhost
+
 ### 2.26.0
 
 - #1237 Skip requoting if the arg is a valid JSON Object

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

@@ -59,18 +59,28 @@ services:
           volume:
             nocopy: true
 <% wpVolumes() %>
+    run_as_root:
+      - chown www-data:www-data /wp/wp-content/mu-plugins /wp/config /wp/log /wp/wp-content/uploads /wp
     run:
       - sh /dev-tools/setup.sh database root "http://<%= siteSlug %>.vipdev.lndo.site/" "<%= wpTitle %>" <% if ( multisite ) { %> <%= siteSlug %>.vipdev.lndo.site <% } %>
 
   database:
     type: compose
     services:
+<% if ( mariadb ) { %>
       image: mariadb:<%= mariadb %>
       command: docker-entrypoint.sh mysqld --sql-mode=ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION --max_allowed_packet=67M
+<% } else { %>
+      image: mysql:8
+      command: docker-entrypoint.sh mysqld --sql-mode=ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION --max_allowed_packet=67M --default-authentication-plugin=mysql_native_password
+<% } %>
       ports:
         - ":3306"
       environment:
-        MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: 'true'
+        MYSQL_ALLOW_EMPTY_PASSWORD: 'true'
+        MYSQL_USER: wordpress
+        MYSQL_PASSWORD: wordpress
+        MYSQL_DATABASE: wordpress
       volumes:
         - database_data:/var/lib/mysql
     volumes:

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

@@ -87,7 +87,8 @@ cmd.argv(process.argv, async (arg, opt) => {
   try {
     await (0, _devEnvironmentCore.createEnvironment)(instanceData);
     await (0, _devEnvironmentCore.printEnvironmentInfo)(lando, slug, {
-      extended: false
+      extended: false,
+      suppressWarnings: true
     });
     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

@@ -8,22 +8,18 @@
 /**
  * External dependencies
  */
+
+/**
+ * Internal dependencies
+ */
 "use strict";
 
-var _fs = _interopRequireDefault(require("fs"));
-var _chalk = _interopRequireDefault(require("chalk"));
 var _tracker = require("../lib/tracker");
 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 _sql = require("../lib/validations/sql");
-var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
-var _userError = _interopRequireDefault(require("../lib/user-error"));
+var _devEnvImportSql = require("../commands/dev-env-import-sql");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * Internal dependencies
- */
 const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} import sql some-wp-db-file.sql`,
   description: 'Import the contents of a WordPress database from an SQL file'
@@ -41,65 +37,10 @@ const examples = [{
   requiredArgs: 1
 }).option('slug', 'Custom name of the dev environment').option(['r', 'search-replace'], 'Perform Search and Replace on the specified SQL file').option('in-place', 'Search and Replace explicitly on the given input file').option('skip-validate', 'Do not perform file validation.').examples(examples).argv(process.argv, async (unmatchedArgs, opt) => {
   const [fileName] = unmatchedArgs;
-  const {
-    searchReplace,
-    inPlace
-  } = opt;
-  const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
-  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);
+  const cmd = new _devEnvImportSql.DevEnvImportSQLCommand(fileName, opt);
+  const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(cmd.slug);
   try {
-    const resolvedPath = await (0, _devEnvironmentCore.resolveImportPath)(slug, fileName, searchReplace, inPlace);
-    if (!opt.skipValidate) {
-      if (!(0, _devEnvironmentLando.isEnvUp)(lando, (0, _devEnvironmentCore.getEnvironmentPath)(slug))) {
-        throw new _userError.default('Environment needs to be started first');
-      }
-      const expectedDomain = `${slug}.vipdev.lndo.site`;
-      await (0, _sql.validate)(resolvedPath, {
-        isImport: false,
-        skipChecks: [],
-        extraCheckParams: {
-          siteHomeUrlLando: expectedDomain
-        }
-      });
-    }
-    const fd = await _fs.default.promises.open(resolvedPath, 'r');
-    const importArg = ['db', '--disable-auto-rehash'];
-    const origIsTTY = process.stdin.isTTY;
-    try {
-      /**
-       * When stdin is a TTY, Lando passes the `--tty` flag to Docker.
-       * This breaks our code when we pass the stream as stdin to Docker.
-       * exec() then fails with "the input device is not a TTY".
-       *
-       * Therefore, for the things to work, we have to pretend that stdin is not a TTY :-)
-       */
-      process.stdin.isTTY = false;
-      await (0, _devEnvironmentCore.exec)(lando, slug, importArg, {
-        stdio: [fd, 'pipe', 'pipe']
-      });
-      console.log(`${_chalk.default.green.bold('Success:')} Database imported.`);
-    } finally {
-      process.stdin.isTTY = origIsTTY;
-    }
-    if (searchReplace && searchReplace.length && !inPlace) {
-      _fs.default.unlinkSync(resolvedPath);
-    }
-    const cacheArg = ['wp', 'cache', 'flush'];
-    await (0, _devEnvironmentCore.exec)(lando, slug, cacheArg);
-    try {
-      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)(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)(lando, slug, addUserArg);
+    await cmd.run();
     await (0, _tracker.trackEvent)('dev_env_import_sql_command_success', trackingInfo);
   } catch (error) {
     await (0, _devEnvironmentCli.handleCLIException)(error, 'dev_env_import_sql_command_error', trackingInfo);

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

@@ -40,7 +40,8 @@ const examples = [{
   debug('Args: ', arg, 'Options: ', opt);
   try {
     const options = {
-      extended: !!opt.extended
+      extended: !!opt.extended,
+      suppressWarnings: true
     };
     if (opt.all) {
       await (0, _devEnvironmentCore.printAllEnvironmentsInfo)(lando, options);

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

@@ -52,7 +52,7 @@ cmd.argv(process.argv, async (arg, opt) => {
     const defaultOptions = {
       appCode: currentInstanceData.appCode.dir || currentInstanceData.appCode.tag || 'latest',
       muPlugins: currentInstanceData.muPlugins.dir || currentInstanceData.muPlugins.tag || 'latest',
-      wordpress: currentInstanceData.wordpress.tag,
+      wordpress: currentInstanceData.wordpress.tag || 'trunk',
       elasticsearch: currentInstanceData.elasticsearch,
       php: currentInstanceData.php || _devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS.default,
       mariadb: currentInstanceData.mariadb,
@@ -66,8 +66,8 @@ cmd.argv(process.argv, async (arg, opt) => {
     const providedOptions = Object.keys(opt).filter(option => option.length > 1) // Filter out single letter aliases
     .filter(option => !['debug', 'help', 'slug'].includes(option)); // Filter out options that are not related to instance configuration
 
-    const supressPrompts = providedOptions.length > 0;
-    const instanceData = await (0, _devEnvironmentCli.promptForArguments)(preselectedOptions, defaultOptions, supressPrompts);
+    const suppressPrompts = providedOptions.length > 0;
+    const instanceData = await (0, _devEnvironmentCli.promptForArguments)(preselectedOptions, defaultOptions, suppressPrompts);
     instanceData.siteSlug = slug;
     await (0, _devEnvironmentCore.updateEnvironment)(instanceData);
     const message = '\n' + _chalk.default.green('✓') + ' environment updated. Restart environment for changes to take an affect.';

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

@@ -353,10 +353,10 @@ const displayPlaybook = ({
   const domain = env !== null && env !== void 0 && (_env$primaryDomain = env.primaryDomain) !== null && _env$primaryDomain !== void 0 && _env$primaryDomain.name ? env.primaryDomain.name : `#${env.id}`;
   const formattedEnvironment = (0, _format.formatEnvironment)(opts.env.type);
   const launched = opts.env.launched;
-  let fileNameToUpload = fileName;
 
-  // Exit if filename contains unsafe character
-  validateFilename(fileNameToUpload);
+  // Extract base file name and exit if it contains unsafe character
+  validateFilename(fileMeta.basename);
+  let fileNameToUpload = fileName;
 
   // SQL file validations
   const tableNames = await validateAndGetTableNames({

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

@@ -0,0 +1,94 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DevEnvImportSQLCommand = void 0;
+var _fs = _interopRequireDefault(require("fs"));
+var _chalk = _interopRequireDefault(require("chalk"));
+var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
+var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
+var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
+var _userError = _interopRequireDefault(require("../lib/user-error"));
+var _sql = require("../lib/validations/sql");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * 
+ * @format
+ */
+
+/**
+ * External dependencies
+ */
+
+/**
+ * Internal dependencies
+ */
+
+class DevEnvImportSQLCommand {
+  constructor(fileName, options) {
+    this.fileName = fileName;
+    this.options = options;
+    this.slug = (0, _devEnvironmentCli.getEnvironmentName)(options);
+  }
+  async run(silent = false) {
+    const lando = await (0, _devEnvironmentLando.bootstrapLando)();
+    await (0, _devEnvironmentCli.validateDependencies)(lando, this.slug, silent);
+    const {
+      searchReplace,
+      inPlace
+    } = this.options;
+    const resolvedPath = await (0, _devEnvironmentCore.resolveImportPath)(this.slug, this.fileName, searchReplace, inPlace);
+    if (!this.options.skipValidate) {
+      if (!(await (0, _devEnvironmentLando.isEnvUp)(lando, (0, _devEnvironmentCore.getEnvironmentPath)(this.slug)))) {
+        throw new _userError.default('Environment needs to be started first');
+      }
+      const expectedDomain = `${this.slug}.vipdev.lndo.site`;
+      await (0, _sql.validate)(resolvedPath, {
+        isImport: false,
+        skipChecks: [],
+        extraCheckParams: {
+          siteHomeUrlLando: expectedDomain
+        }
+      });
+    }
+    const fd = await _fs.default.promises.open(resolvedPath, 'r');
+    const importArg = ['db', '--disable-auto-rehash'];
+    const origIsTTY = process.stdin.isTTY;
+    try {
+      /**
+       * When stdin is a TTY, Lando passes the `--tty` flag to Docker.
+       * This breaks our code when we pass the stream as stdin to Docker.
+       * exec() then fails with "the input device is not a TTY".
+       *
+       * Therefore, for the things to work, we have to pretend that stdin is not a TTY :-)
+       */
+      process.stdin.isTTY = false;
+      await (0, _devEnvironmentCore.exec)(lando, this.slug, importArg, {
+        stdio: [fd, 'pipe', 'pipe']
+      });
+      if (!silent) {
+        console.log(`${_chalk.default.green.bold('Success:')} Database imported.`);
+      }
+    } finally {
+      process.stdin.isTTY = origIsTTY;
+    }
+    if (searchReplace && searchReplace.length && !inPlace) {
+      _fs.default.unlinkSync(resolvedPath);
+    }
+    const cacheArg = ['wp', 'cache', 'flush'];
+    await (0, _devEnvironmentCore.exec)(lando, this.slug, cacheArg);
+    try {
+      await (0, _devEnvironmentCore.exec)(lando, this.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)(lando, this.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)(lando, this.slug, addUserArg);
+  }
+}
+exports.DevEnvImportSQLCommand = DevEnvImportSQLCommand;

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

@@ -0,0 +1,184 @@
+#!/usr/bin/env node
+
+/**
+ * 
+ * @format
+ */
+
+/**
+ * External dependencies
+ */
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DevEnvSyncSQLCommand = void 0;
+var _fs = _interopRequireDefault(require("fs"));
+var _chalk = _interopRequireDefault(require("chalk"));
+var _vipSearchReplace = require("@automattic/vip-search-replace");
+var _clientFileUploader = require("../lib/client-file-uploader");
+var _exportSql = require("./export-sql");
+var _utils = require("../lib/utils");
+var _lineByLine = require("../lib/validations/line-by-line");
+var exit = _interopRequireWildcard(require("../lib/cli/exit"));
+var _devEnvImportSql = require("./dev-env-import-sql");
+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 }; }
+/**
+ * Internal dependencies
+ */
+/**
+ * Finds the site home url from the SQL line
+ *
+ * @param {string} sql A line in a SQL file
+ * @return {string} Site home url. null if not found
+ */
+function findSiteHomeUrl(sql) {
+  const regex = "'(siteurl|home)',\\s?'(.*?)'";
+  const results = sql.match(regex);
+  if (results) {
+    const domain = results[2].replace(/https?:\/\//, '');
+    return domain;
+  }
+  return null;
+}
+
+/**
+ * Extracts a list of site urls from the SQL file
+ *
+ * @param {string} sqlFile Path to the SQL file
+ * @return {Promise<string[]>} List of site urls
+ * @throws {Error} If there is an error reading the file
+ */
+async function extractSiteUrls(sqlFile) {
+  const readInterface = await (0, _lineByLine.getReadInterface)(sqlFile);
+  return new Promise((resolve, reject) => {
+    const domains = [];
+    readInterface.on('line', line => {
+      const domain = findSiteHomeUrl(line);
+      if (domain) {
+        domains.push(domain);
+      }
+    });
+    readInterface.on('close', () => {
+      resolve(domains);
+    });
+    readInterface.on('error', reject);
+  });
+}
+class DevEnvSyncSQLCommand {
+  /**
+   * Creates a new instance of the command
+   *
+   * @param {string} app  The app object
+   * @param {string} env  The environment object
+   * @param {string} slug The site slug
+   */
+  constructor(app, env, slug) {
+    this.app = app;
+    this.env = env;
+    this.slug = slug;
+    this.tmpDir = (0, _utils.makeTempDir)();
+  }
+  get landoDomain() {
+    return `${this.slug}.vipdev.lndo.site`;
+  }
+  get sqlFile() {
+    return `${this.tmpDir}/sql-export.sql`;
+  }
+  get gzFile() {
+    return `${this.tmpDir}/sql-export.sql.gz`;
+  }
+
+  /**
+   * Runs the SQL export command to generate the SQL export from
+   * the latest backup
+   *
+   * @return {Promise<void>} Promise that resolves when the export is complete
+   */
+  async generateExport() {
+    const exportCommand = new _exportSql.ExportSQLCommand(this.app, this.env, this.gzFile);
+    await exportCommand.run();
+  }
+
+  /**
+   * Runs the search-replace operation on the SQL file
+   * to replace the site urls with the lando domain
+   *
+   * @return {Promise<void>} Promise that resolves when the search-replace is complete
+   * @throws {Error} If there is an error reading the file
+   */
+  async runSearchReplace() {
+    const replacements = this.siteUrls.reduce((acc, url) => [...acc, url, this.landoDomain], []);
+    const readStream = _fs.default.createReadStream(this.sqlFile);
+    const replacedStream = await (0, _vipSearchReplace.replace)(readStream, replacements);
+    replacedStream.pipe(_fs.default.createWriteStream(this.sqlFile));
+    return new Promise((resolve, reject) => {
+      replacedStream.on('finish', resolve);
+      replacedStream.on('error', reject);
+    });
+  }
+
+  /**
+   * Runs the SQL import command to import the SQL file
+   *
+   * @return {Promise<void>} Promise that resolves when the import is complete
+   * @throws {Error} If there is an error importing the file
+   */
+  async runImport() {
+    const importOptions = {
+      slug: this.slug,
+      inPlace: true,
+      skipValidate: true
+    };
+    const importCommand = new _devEnvImportSql.DevEnvImportSQLCommand(this.sqlFile, importOptions);
+    await importCommand.run(true);
+  }
+
+  /**
+   * Sequentially runs the commands to export, search-replace, and import the SQL file
+   * to the local environment
+   *
+   * @return {Promise<void>} Promise that resolves when the commands are complete
+   */
+  async run() {
+    try {
+      await this.generateExport();
+    } catch (err) {
+      exit.withError(`Error exporting SQL backup: ${err === null || err === void 0 ? void 0 : err.message}`);
+    }
+    try {
+      console.log(`Extracting the exported file ${this.gzFile}...`);
+      await (0, _clientFileUploader.unzipFile)(this.gzFile, this.sqlFile);
+      console.log(`${_chalk.default.green('✓')} Extracted to ${this.sqlFile}`);
+    } catch (err) {
+      exit.withError(`Error extracting the SQL export: ${err === null || err === void 0 ? void 0 : err.message}`);
+    }
+    try {
+      console.log('Extracting site urls from the SQL file...');
+      this.siteUrls = await extractSiteUrls(this.sqlFile);
+    } catch (err) {
+      exit.withError(`Error extracting site URLs: ${err === null || err === void 0 ? void 0 : err.message}`);
+    }
+    try {
+      console.log('Running the following search-replace operations on the SQL file:');
+      this.siteUrls.forEach(domain => {
+        console.log(`  ${domain} -> ${this.landoDomain}`);
+      });
+      await this.runSearchReplace();
+      console.log(`${_chalk.default.green('✓')} Search-replace operation is complete`);
+    } catch (err) {
+      exit.withError(`Error replacing domains: ${err === null || err === void 0 ? void 0 : err.message}`);
+    }
+    try {
+      console.log('Importing the SQL file...');
+      await this.runImport();
+      console.log(`${_chalk.default.green('✓')} SQL file imported`);
+    } catch (err) {
+      exit.withError(`Error importing SQL file: ${err === null || err === void 0 ? void 0 : err.message}`);
+    }
+  }
+}
+exports.DevEnvSyncSQLCommand = DevEnvSyncSQLCommand;

package/dist/{lib/sql-export.js → commands/export-sql.js}

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SQLExportCommand = exports.GENERATE_DOWNLOAD_LINK_MUTATION = exports.CREATE_EXPORT_JOB_MUTATION = void 0;
+exports.GENERATE_DOWNLOAD_LINK_MUTATION = exports.ExportSQLCommand = exports.CREATE_EXPORT_JOB_MUTATION = void 0;
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _fs = _interopRequireDefault(require("fs"));
 var _https = _interopRequireDefault(require("https"));
@@ -188,7 +188,7 @@ async function createExportJob(appId, envId, backupId) {
 /**
  * Class representing an export command workflow
  */
-class SQLExportCommand {
+class ExportSQLCommand {
   steps = {
     PREPARE: 'prepare',
     CREATE: 'create',
@@ -313,7 +313,7 @@ class SQLExportCommand {
    *
    * @return {Promise} A promise which resolves to void
    */
-  async runSequence() {
+  async run() {
     console.log(`Fetching the latest backup for ${this.app.name}`);
     const {
       latestBackup
@@ -357,4 +357,4 @@ class SQLExportCommand {
     }
   }
 }
-exports.SQLExportCommand = SQLExportCommand;
+exports.ExportSQLCommand = ExportSQLCommand;

package/dist/lib/client-file-uploader.js

@@ -15,6 +15,7 @@ exports.getPartBoundaries = getPartBoundaries;
 exports.getSignedUploadRequestData = getSignedUploadRequestData;
 exports.gzipFile = exports.getWorkingTempDir = void 0;
 exports.isFile = isFile;
+exports.unzipFile = void 0;
 exports.uploadImportSqlFileToS3 = uploadImportSqlFileToS3;
 exports.uploadPart = uploadPart;
 exports.uploadParts = uploadParts;
@@ -27,6 +28,7 @@ var _nodeFetch = _interopRequireDefault(require("node-fetch"));
 var _chalk = _interopRequireDefault(require("chalk"));
 var _zlib = require("zlib");
 var _crypto = require("crypto");
+var _promises = require("node:stream/promises");
 var _stream = require("stream");
 var _xml2js = require("xml2js");
 var _debug = _interopRequireDefault(require("debug"));
@@ -77,7 +79,21 @@ const getFileMD5Hash = async fileName => new Promise((resolve, reject) => _fs.de
 }).on('error', error => reject(`could not generate file hash: ${error}`)));
 exports.getFileMD5Hash = getFileMD5Hash;
 const gzipFile = async (uncompressedFileName, compressedFileName) => new Promise((resolve, reject) => _fs.default.createReadStream(uncompressedFileName).pipe((0, _zlib.createGzip)()).pipe(_fs.default.createWriteStream(compressedFileName)).on('finish', resolve).on('error', error => reject(`could not compress file: ${error}`)));
+
+/**
+ * Extract a .gz file and save it to a specified location
+ *
+ * @param {string} inputFilename  The file to unzip
+ * @param {string} outputFilename The file where the unzipped data will be written
+ * @return {Promise} A promise that resolves when the file is unzipped
+ */
 exports.gzipFile = gzipFile;
+const unzipFile = async (inputFilename, outputFilename) => {
+  const source = _fs.default.createReadStream(inputFilename);
+  const destination = _fs.default.createWriteStream(outputFilename);
+  await (0, _promises.pipeline)(source, (0, _zlib.createGunzip)(), destination);
+};
+exports.unzipFile = unzipFile;
 async function getFileMeta(fileName) {
   const fileSize = await getFileSize(fileName);
   const basename = _path.default.basename(fileName);

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

@@ -11,7 +11,6 @@ exports.DEV_ENVIRONMENT_FULL_COMMAND = DEV_ENVIRONMENT_FULL_COMMAND;
 const DEV_ENVIRONMENT_DEFAULTS = {
   title: 'VIP Dev',
   multisite: false,
-  mariadbVersion: '10.3',
   phpVersion: '8.0'
 };
 exports.DEV_ENVIRONMENT_DEFAULTS = DEV_ENVIRONMENT_DEFAULTS;

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

@@ -14,6 +14,7 @@ exports.handleCLIException = handleCLIException;
 exports.printTable = printTable;
 exports.processBooleanOption = processBooleanOption;
 exports.processComponentOptionInput = processComponentOptionInput;
+exports.processVersionOption = processVersionOption;
 exports.promptForArguments = promptForArguments;
 exports.promptForBoolean = promptForBoolean;
 exports.promptForComponent = promptForComponent;
@@ -274,7 +275,7 @@ async function promptForArguments(preselectedOptions, defaultOptions, suppressPr
     multisite: 'multisite' in preselectedOptions ? preselectedOptions.multisite : await promptForBoolean(multisiteText, !!multisiteDefault),
     elasticsearch: false,
     php: preselectedOptions.php ? resolvePhpVersion(preselectedOptions.php) : await promptForPhpVersion(resolvePhpVersion(defaultOptions.php || _devEnvironment.DEV_ENVIRONMENT_DEFAULTS.phpVersion)),
-    mariadb: preselectedOptions.mariadb || defaultOptions.mariadb || _devEnvironment.DEV_ENVIRONMENT_DEFAULTS.mariadbVersion,
+    mariadb: preselectedOptions.mariadb || defaultOptions.mariadb,
     mediaRedirectDomain: preselectedOptions.mediaRedirectDomain || '',
     wordpress: {
       mode: 'image',
@@ -343,7 +344,9 @@ async function processComponent(component, preselectedValue, defaultValue) {
   const defaultObject = defaultValue ? processComponentOptionInput(defaultValue, allowLocal) : null;
   if (preselectedValue) {
     result = processComponentOptionInput(preselectedValue, allowLocal);
-    console.log(`${_chalk.default.green('✓')} Path to your local ${componentDisplayNames[component]}: ${preselectedValue}`);
+    if (allowLocal) {
+      console.log(`${_chalk.default.green('✓')} Path to your local ${componentDisplayNames[component]}: ${preselectedValue}`);
+    }
   } else {
     result = await promptForComponent(component, allowLocal, defaultObject);
   }
@@ -449,9 +452,7 @@ function resolvePhpVersion(version) {
   }
   const versions = Object.keys(_devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS);
   const images = Object.values(_devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS);
-
-  // eslint-disable-next-line eqeqeq -- use loose comparison because commander resolves '8.0' to '8'
-  const index = versions.findIndex(value => value == version);
+  const index = versions.findIndex(value => value === version);
   if (index === -1) {
     const image = images.find(value => value === version);
     return image !== null && image !== void 0 ? image : images[0];
@@ -551,8 +552,16 @@ function processBooleanOption(value) {
   }
   return !FALSE_OPTIONS.includes((_value$toLowerCase = value.toLowerCase) === null || _value$toLowerCase === void 0 ? void 0 : _value$toLowerCase.call(value));
 }
+function processVersionOption(value) {
+  if (!isNaN(value) && value % 1 === 0) {
+    // If it's an Integer passed in, let's ensure that it has a decimal in it to match the version tags e.g. 6 => 6.0
+    return parseFloat(value).toFixed(1);
+  }
+  return value;
+}
 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('app-code', 'Use the application code from a local directory or use "demo" for VIP skeleton code').option('phpmyadmin', 'Enable PHPMyAdmin component. By default it is disabled', undefined, processBooleanOption).option('xdebug', 'Enable XDebug. By default it is disabled', undefined, processBooleanOption).option('xdebug_config', 'Extra configuration to pass to xdebug via XDEBUG_CONFIG environment variable').option('elasticsearch', 'Enable Elasticsearch (needed by Enterprise Search)', undefined, processBooleanOption).option('mariadb', 'Explicitly choose MariaDB version to use').option(['r', '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.').option('php', 'Explicitly choose PHP version to use').option(['A', 'mailhog'], 'Enable MailHog. By default it is disabled', undefined, processBooleanOption);
+  // We leave the third parameter to undefined on some because the defaults are handled in preProcessInstanceData()
+  return command.option('wordpress', 'Use a specific WordPress version', undefined, processVersionOption).option(['u', 'mu-plugins'], 'Use a specific mu-plugins changeset or local directory').option('app-code', 'Use the application code from a local directory or use "demo" for VIP skeleton code').option('phpmyadmin', 'Enable PHPMyAdmin component. By default it is disabled', undefined, processBooleanOption).option('xdebug', 'Enable XDebug. By default it is disabled', undefined, processBooleanOption).option('xdebug_config', 'Extra configuration to pass to xdebug via XDEBUG_CONFIG environment variable').option('elasticsearch', 'Enable Elasticsearch (needed by Enterprise Search)', undefined, processBooleanOption).option(['r', '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.').option('php', 'Explicitly choose PHP version to use', undefined, processVersionOption).option(['A', 'mailhog'], 'Enable MailHog. By default it is disabled', undefined, processBooleanOption);
 }
 
 /**
@@ -562,20 +571,20 @@ async function getTagChoices() {
   let versions = await (0, _devEnvironmentCore.getVersionList)();
   if (versions.length < 1) {
     versions = [{
-      ref: '5.9.5',
-      tag: '5.9',
+      ref: '6.1.1',
+      tag: '6.1',
       cacheable: true,
       locked: true,
       prerelease: false
     }, {
-      ref: '5.8.6',
-      tag: '5.8',
+      ref: '6.0.3',
+      tag: '6.0',
       cacheable: true,
       locked: true,
       prerelease: false
     }, {
-      ref: '5.7.8',
-      tag: '5.7',
+      ref: '5.9.5',
+      tag: '5.9',
       cacheable: true,
       locked: true,
       prerelease: false