@automattic/vip 3.6.0 → 3.7.1

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

@@ -12,6 +12,8 @@ proxy:
   mailpit:
     - <%= siteSlug %>-mailpit.<%= domain %>:8025
 
+keys: false
+
 services:
   devtools:
     type: compose

package/dist/bin/vip-import-validate-files.js

@@ -1,18 +1,23 @@
 #!/usr/bin/env node
+
+/**
+ * External dependencies
+ */
 "use strict";
 
+exports.__esModule = true;
+exports.vipImportValidateFilesCmd = vipImportValidateFilesCmd;
 var _chalk = _interopRequireDefault(require("chalk"));
-var _fs = _interopRequireDefault(require("fs"));
-var _path = _interopRequireDefault(require("path"));
 var _url = _interopRequireDefault(require("url"));
 var _command = _interopRequireDefault(require("../lib/cli/command"));
+var _config = require("../lib/media-import/config");
 var _tracker = require("../lib/tracker");
 var _vipImportValidateFiles = require("../lib/vip-import-validate-files");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-(0, _command.default)({
-  requiredArgs: 1,
-  format: true
-}).example('vip import validate-files <file>', 'Run the import validation against the file').argv(process.argv, async arg => {
+/**
+ * Internal dependencies
+ */
+async function vipImportValidateFilesCmd(arg = []) {
   await (0, _tracker.trackEvent)('import_validate_files_command_execute');
   /**
    * File manipulation
@@ -23,7 +28,11 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
   arg = _url.default.parse(folder); // Then parse the file to its URL parts
   const filePath = arg.path; // Extract the path of the file
 
-  let folderValidation;
+  if (!(await (0, _vipImportValidateFiles.isDirectory)(filePath))) {
+    console.error(_chalk.default.red('✕ Error:'), 'The given path is not a directory, please provide a valid directory path.');
+    return;
+  }
+  let folderValidation = [];
 
   /**
    * Folder structure validation
@@ -33,6 +42,11 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
    * Recommended structure: `uploads/year/month` (Single sites)
    */
   const nestedFiles = (0, _vipImportValidateFiles.findNestedDirectories)(filePath);
+
+  // Terminates the command here if no nested files found
+  if (!nestedFiles) {
+    return;
+  }
   const {
     files,
     folderStructureObj
@@ -56,90 +70,64 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
   }
 
   /**
-   * Media file extension validation
-   *
-   * Ensure that prohibited media file types are not used
+   * Get Media Import configuration
    */
-
-  // Collect invalid files for error logging
-  let intermediateImagesTotal = 0;
-  const errorFileTypes = [];
-  const errorFileNames = [];
-  const intermediateImages = {};
-
-  // Iterate through each file to isolate the extension name
-  for (const file of files) {
-    // Check if file is a directory
-    // eslint-disable-next-line no-await-in-loop
-    const stats = await _fs.default.promises.stat(file);
-    const isFolder = stats.isDirectory();
-    const extension = _path.default.extname(file); // Extract the extension of the file
-    const ext = extension.substr(1); // We only want the ext name minus the period (e.g- .jpg -> jpg)
-    const extLowerCase = ext.toLowerCase(); // Change any uppercase extensions to lowercase
-
-    // Check for any invalid file extensions
-    // Returns true if ext is valid; false if invalid
-    const validExtensions = _vipImportValidateFiles.acceptedExtensions.includes(extLowerCase);
-
-    // Collect files that have no extension, have invalid extensions,
-    // or are directories for error logging
-    if (!extension || !validExtensions || isFolder) {
-      errorFileTypes.push(file);
-    }
-
-    /**
-     * Filename validation
-     *
-     * Ensure that filenames don't contain prohibited characters
-     */
-
-    // Collect files that have invalid file names for error logging
-    if ((0, _vipImportValidateFiles.isFileSanitized)(file)) {
-      errorFileNames.push(file);
-    }
-
-    /**
-     * Intermediate image validation
-     *
-     * Detect any intermediate images.
-     *
-     * Intermediate images are copies of images that are resized, so you may have multiples of the same image.
-     * You can resize an image directly on VIP so intermediate images are not necessary.
-     */
-    const original = (0, _vipImportValidateFiles.doesImageHaveExistingSource)(file);
-
-    // If an image is an intermediate image, increment the total number and
-    // populate key/value pairs of the original image and intermediate image(s)
-    if (original) {
-      intermediateImagesTotal++;
-      if (intermediateImages[original]) {
-        // Key: original image, value: intermediate image(s)
-        intermediateImages[original] = `${intermediateImages[original]}, ${file}`;
-      } else {
-        intermediateImages[original] = file;
-      }
-    }
+  const mediaImportConfig = await (0, _config.getMediaImportConfig)();
+  if (!mediaImportConfig) {
+    console.error(_chalk.default.red('✕ Error:'), 'Could not retrieve validation metadata. Please contact VIP Support.');
+    return;
   }
 
+  /**
+   * File Validation
+   * Collect all errors from file validation
+   */
+  const {
+    intermediateImagesTotal,
+    errorFileTypes,
+    errorFileNames,
+    errorFileSizes,
+    errorFileNamesCharCount,
+    intermediateImages
+  } = await (0, _vipImportValidateFiles.validateFiles)(files, mediaImportConfig);
+
   /**
    * Error logging
+   * Not sure if the changes made to the error logging better
    */
-  if (errorFileTypes.length > 0) {
-    (0, _vipImportValidateFiles.logErrorsForInvalidFileTypes)(errorFileTypes);
-  }
-  if (errorFileNames.length > 0) {
-    (0, _vipImportValidateFiles.logErrorsForInvalidFilenames)(errorFileNames);
-  }
-  if (Object.keys(intermediateImages).length > 0) {
-    (0, _vipImportValidateFiles.logErrorsForIntermediateImages)(intermediateImages);
-  }
+  (0, _vipImportValidateFiles.logErrors)({
+    errorType: _vipImportValidateFiles.ValidateFilesErrors.INVALID_TYPES,
+    invalidFiles: errorFileTypes,
+    limit: Object.keys(mediaImportConfig.allowedFileTypes)
+  });
+  (0, _vipImportValidateFiles.logErrors)({
+    errorType: _vipImportValidateFiles.ValidateFilesErrors.INVALID_SIZES,
+    invalidFiles: errorFileSizes,
+    limit: mediaImportConfig.fileSizeLimitInBytes
+  });
+  (0, _vipImportValidateFiles.logErrors)({
+    errorType: _vipImportValidateFiles.ValidateFilesErrors.INVALID_NAME_CHARACTER_COUNTS,
+    invalidFiles: errorFileNamesCharCount,
+    limit: mediaImportConfig.fileNameCharCount
+  });
+  (0, _vipImportValidateFiles.logErrors)({
+    errorType: _vipImportValidateFiles.ValidateFilesErrors.INVALID_NAMES,
+    invalidFiles: errorFileNames
+  });
+  (0, _vipImportValidateFiles.logErrors)({
+    errorType: _vipImportValidateFiles.ValidateFilesErrors.INTERMEDIATE_IMAGES,
+    invalidFiles: Object.keys(intermediateImages),
+    invalidFilesObj: intermediateImages
+  });
 
   // Log a summary of all errors
   (0, _vipImportValidateFiles.summaryLogs)({
     folderErrorsLength: folderValidation.length,
     intImagesErrorsLength: intermediateImagesTotal,
     fileTypeErrorsLength: errorFileTypes.length,
+    fileErrorFileSizesLength: errorFileSizes.length,
     filenameErrorsLength: errorFileNames.length,
+    fileNameCharCountErrorsLength: errorFileNamesCharCount.length,
     totalFiles: files.length,
     totalFolders: nestedDirectories.length
   });
@@ -158,4 +146,11 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
   /* eslint-enable camelcase */
 
   await (0, _tracker.trackEvent)('import_validate_files_command_success', allErrors);
-});
+}
+(0, _command.default)({
+  requiredArgs: 1,
+  format: true
+}).examples([{
+  usage: 'vip import validate-files <folder_name>',
+  description: 'Run the import validation against the folder of media files'
+}]).argv(process.argv, vipImportValidateFilesCmd);

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

@@ -16,9 +16,6 @@ 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 }; }
 class DevEnvImportSQLCommand {
-  fileName;
-  options;
-  slug;
   constructor(fileName, options, slug) {
     this.fileName = fileName;
     this.options = options;
@@ -43,7 +40,8 @@ class DevEnvImportSQLCommand {
           console.log(`${_chalk.default.green('✓')} Extracted to ${sqlFile}`);
         }
         this.fileName = sqlFile;
-      } catch (err) {
+      } catch (error) {
+        const err = error;
         exit.withError(`Error extracting the SQL file: ${err.message}`);
       }
     }

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

@@ -20,8 +20,8 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 /**
  * 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
+ * @param sql A line in a SQL file
+ * @return Site home url. null if not found
  */
 function findSiteHomeUrl(sql) {
   const regex = "'(siteurl|home)',\\s?'(.*?)'";
@@ -32,8 +32,8 @@ function findSiteHomeUrl(sql) {
 /**
  * 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
+ * @param sqlFile Path to the SQL file
+ * @return  List of site urls
  * @throws {Error} If there is an error reading the file
  */
 async function extractSiteUrls(sqlFile) {
@@ -54,23 +54,19 @@ async function extractSiteUrls(sqlFile) {
   });
 }
 class DevEnvSyncSQLCommand {
-  app;
-  env;
-  slug;
-  lando;
   tmpDir;
-  siteUrls;
-  searchReplaceMap;
+  siteUrls = [];
+  searchReplaceMap = {};
   track;
 
   /**
    * 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
-   * @param {Object}   lando     The lando object
-   * @param {Function} trackerFn Function to call for tracking
+   * @param app       The app object
+   * @param env       The environment object
+   * @param slug      The site slug
+   * @param lando     The lando object
+   * @param trackerFn Function to call for tracking
    */
   constructor(app, env, slug, lando, trackerFn = () => {}) {
     this.app = app;
@@ -132,12 +128,12 @@ class DevEnvSyncSQLCommand {
     for (const url of this.siteUrls) {
       this.searchReplaceMap[url] = this.landoDomain;
     }
-    const networkSites = this.env.wpSitesSDS.nodes;
+    const networkSites = this.env.wpSitesSDS?.nodes;
     if (!networkSites) return;
     for (const site of networkSites) {
-      if (!site.blogId || site.blogId === 1) continue;
-      const url = site.homeUrl.replace(/https?:\/\//, '');
-      if (!this.searchReplaceMap[url]) continue;
+      if (!site?.blogId || site.blogId === 1) continue;
+      const url = site?.homeUrl?.replace(/https?:\/\//, '');
+      if (!url || !this.searchReplaceMap[url]) continue;
       this.searchReplaceMap[url] = `${this.slugifyDomain(url)}-${site.blogId}.${this.landoDomain}`;
     }
   }
@@ -171,44 +167,47 @@ class DevEnvSyncSQLCommand {
    * Sequentially runs the commands to export, search-replace, and import the SQL file
    * to the local environment
    *
-   * @return {Promise<void>} Promise that resolves to true when the commands are complete. It will return false if the user did not continue during validation prompts.
+   * @return Promise that resolves to true when the commands are complete. It will return false if the user did not continue during validation prompts.
    */
   async run() {
     try {
       await this.generateExport();
     } catch (err) {
+      const error = err;
       // this.generateExport probably catches all exceptions, track the event and runs exit.withError() but if things go really wrong
       // and we have no tracking data, we would at least have it logged here.
       // the following will not get executed if this.generateExport() calls exit.withError() on all exception
       await this.track('error', {
         error_type: 'export_sql_backup',
-        error_message: err?.message,
-        stack: err?.stack
+        error_message: error.message,
+        stack: error.stack
       });
-      exit.withError(`Error exporting SQL backup: ${err?.message}`);
+      exit.withError(`Error exporting SQL backup: ${error.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) {
+      const error = err;
       await this.track('error', {
         error_type: 'archive_extraction',
-        error_message: err?.message,
-        stack: err?.stack
+        error_message: error.message,
+        stack: error.stack
       });
-      exit.withError(`Error extracting the SQL export: ${err.message}`);
+      exit.withError(`Error extracting the SQL export: ${error.message}`);
     }
     try {
       console.log('Extracting site urls from the SQL file...');
       this.siteUrls = await extractSiteUrls(this.sqlFile);
     } catch (err) {
+      const error = err;
       await this.track('error', {
         error_type: 'extract_site_urls',
-        error_message: err?.message,
-        stack: err?.stack
+        error_message: error.message,
+        stack: error.stack
       });
-      exit.withError(`Error extracting site URLs: ${err?.message}`);
+      exit.withError(`Error extracting site URLs: ${error.message}`);
     }
     console.log('Generating search-replace configuration...');
     this.generateSearchReplaceMap();
@@ -220,12 +219,13 @@ class DevEnvSyncSQLCommand {
       await this.runSearchReplace();
       console.log(`${_chalk.default.green('✓')} Search-replace operation is complete`);
     } catch (err) {
+      const error = err;
       await this.track('error', {
         error_type: 'search_replace',
-        error_message: err?.message,
-        stack: err?.stack
+        error_message: error.message,
+        stack: error.stack
       });
-      exit.withError(`Error replacing domains: ${err?.message}`);
+      exit.withError(`Error replacing domains: ${error.message}`);
     }
     try {
       console.log('Importing the SQL file...');
@@ -233,12 +233,13 @@ class DevEnvSyncSQLCommand {
       console.log(`${_chalk.default.green('✓')} SQL file imported`);
       return true;
     } catch (err) {
+      const error = err;
       await this.track('error', {
         error_type: 'import_sql_file',
-        error_message: err?.message,
-        stack: err?.stack
+        error_message: error.message,
+        stack: error.stack
       });
-      exit.withError(`Error importing SQL file: ${err?.message}`);
+      exit.withError(`Error importing SQL file: ${error.message}`);
     }
   }
 }

package/dist/commands/export-sql.js

@@ -94,21 +94,18 @@ async function fetchLatestBackupAndJobStatusBase(appId, envId) {
     },
     fetchPolicy: 'network-only'
   });
-  const {
-    data: {
-      app: {
-        environments
-      }
-    }
-  } = response;
-  const latestBackup = environments[0].latestBackup;
-  const jobs = environments[0].jobs;
+  const environments = response.data.app?.environments;
+  const latestBackup = environments?.[0]?.latestBackup;
+  const jobs = environments?.[0]?.jobs || [];
   return {
     latestBackup,
     jobs
   };
 }
 async function fetchLatestBackupAndJobStatus(appId, envId) {
+  if (!appId || !envId) {
+    throw new Error('App ID and Env ID missing');
+  }
   return await (0, _retry.retry)({
     retryOnlyIf: options => {
       return (options.error.message || '').indexOf('Unexpected token < in JSON at position 0') !== -1;
@@ -125,6 +122,9 @@ async function fetchLatestBackupAndJobStatus(appId, envId) {
  * @return {Promise} A promise which resolves to the download link
  */
 async function generateDownloadLink(appId, envId, backupId) {
+  if (!appId || !envId || !backupId) {
+    throw new Error('generateDownloadLink: A parameter is missing');
+  }
   const api = (0, _api.default)();
   const response = await api.mutate({
     mutation: GENERATE_DOWNLOAD_LINK_MUTATION,
@@ -136,14 +136,7 @@ async function generateDownloadLink(appId, envId, backupId) {
       }
     }
   });
-  const {
-    data: {
-      generateDBBackupCopyUrl: {
-        url
-      }
-    }
-  } = response;
-  return url;
+  return response.data?.generateDBBackupCopyUrl?.url;
 }
 
 /**
@@ -152,10 +145,14 @@ async function generateDownloadLink(appId, envId, backupId) {
  * @param {number} appId    Application ID
  * @param {number} envId    Environment ID
  * @param {number} backupId Backup ID
- * @return {Promise} A promise which resolves to null if job creation succeeds
+ * @return {Promise} A promise which resolves to undefined if job creation succeeds
  * @throws {Error} Throws an error if the job creation fails
  */
 async function createExportJob(appId, envId, backupId) {
+  if (!appId || !envId || !backupId) {
+    throw new Error('createExportJob: Some fields are undefined');
+  }
+
   // Disable global error handling so that we can handle errors ourselves
   (0, _api.disableGlobalGraphQLErrorHandling)();
   const api = (0, _api.default)();
@@ -173,14 +170,10 @@ async function createExportJob(appId, envId, backupId) {
   // Re-enable global error handling
   (0, _api.enableGlobalGraphQLErrorHandling)();
 }
-
 /**
  * Class representing an export command workflow
  */
 class ExportSQLCommand {
-  app;
-  env;
-  downloadLink;
   progressTracker;
   outputFile;
   generateBackup;
@@ -237,10 +230,13 @@ class ExportSQLCommand {
       latestBackup,
       jobs
     } = await fetchLatestBackupAndJobStatus(this.app.id, this.env.id);
+    if (!latestBackup) {
+      return undefined;
+    }
 
     // Find the job that generates the export for the latest backup
     return jobs.find(job => {
-      const metadata = job.metadata.find(md => md.name === 'backupId');
+      const metadata = (job.metadata || []).find(md => md?.name === 'backupId');
       return metadata && parseInt(metadata.value, 10) === latestBackup.id;
     });
   }
@@ -248,12 +244,15 @@ class ExportSQLCommand {
   /**
    * Fetches the S3 filename of the exported backup
    *
-   * @return {Promise} A promise which resolves to the filename
+   * @return A promise which resolves to the filename
    */
   async getExportedFileName() {
     const job = await this.getExportJob();
-    const metadata = job.metadata.find(md => md.name === 'uploadPath');
-    return metadata?.value.split('/')[1];
+    if (!job) {
+      throw new Error('Job not found');
+    }
+    const metadata = job.metadata?.find(md => md?.name === 'uploadPath');
+    return metadata?.value?.split('/')[1];
   }
 
   /**
@@ -276,7 +275,9 @@ class ExportSQLCommand {
           resolve(_path.default.resolve(file.path));
         });
         file.on('error', err => {
-          _fs.default.unlink(filename);
+          // TODO: fs.unlink runs in the background so there's a chance that the app dies before it finishes.
+          //  This needs fixing.
+          _fs.default.unlink(filename, () => null);
           reject(err);
         });
         response.on('data', chunk => {
@@ -290,29 +291,27 @@ class ExportSQLCommand {
   /**
    * Checks if the export job's preflight step is successful
    *
-   * @param {any} job The export job
-   * @return {boolean} True if the preflight step is successful
+   * @param job The export job
+   * @return True if the preflight step is successful
    */
   isPrepared(job) {
-    const step = job?.progress.steps.find(st => st.id === 'preflight');
+    const step = job?.progress?.steps?.find(st => st?.id === 'preflight');
     return step?.status === 'success';
   }
 
   /**
    * Checks if the export job's S3 upload step is successful
    *
-   * @param {any} job The export job
-   * @return {boolean} True if the upload step is successful
+   * @param job The export job
+   * @return True if the upload step is successful
    */
   isCreated(job) {
-    const step = job?.progress.steps.find(st => st.id === 'upload_backup');
+    const step = job?.progress?.steps?.find(st => st?.id === 'upload_backup');
     return step?.status === 'success';
   }
 
   /**
    * Stops the progress tracker
-   *
-   * @return {void}
    */
   stopProgressTracker() {
     this.progressTracker.print();
@@ -327,6 +326,9 @@ class ExportSQLCommand {
     await cmd.run(false);
   }
   async confirmEnoughStorage(job) {
+    if (!job) {
+      throw new Error('confirmEnoughStorage: job is missing');
+    }
     if (this.confirmEnoughStorageHook) {
       return await this.confirmEnoughStorageHook(job);
     }
@@ -343,12 +345,13 @@ class ExportSQLCommand {
       try {
         _fs.default.accessSync(_path.default.parse(this.outputFile).dir, _fs.default.constants.W_OK);
       } catch (err) {
+        const error = err;
         await this.track('error', {
           error_type: 'cannot_write_to_path',
-          error_message: `Cannot write to the specified path: ${err?.message}`,
-          stack: err?.stack
+          error_message: `Cannot write to the specified path: ${error?.message}`,
+          stack: error?.stack
         });
-        exit.withError(`Cannot write to the specified path: ${err?.message}`);
+        exit.withError(`Cannot write to the specified path: ${error?.message}`);
       }
     }
     if (this.generateBackup) {
@@ -357,16 +360,15 @@ class ExportSQLCommand {
     const {
       latestBackup
     } = await fetchLatestBackupAndJobStatus(this.app.id, this.env.id);
+    if (!latestBackup) {
+      await this.track('error', {
+        error_type: 'no_backup_found',
+        error_message: 'No backup found for the site'
+      });
+      exit.withError(`No backup found for site ${this.app.name}`);
+    }
     if (!this.generateBackup) {
-      if (!latestBackup) {
-        await this.track('error', {
-          error_type: 'no_backup_found',
-          error_message: 'No backup found for the site'
-        });
-        exit.withError(`No backup found for site ${this.app.name}`);
-      } else {
-        console.log(`${(0, _format.getGlyphForStatus)('success')} Latest backup found with timestamp ${latestBackup.createdAt}`);
-      }
+      console.log(`${(0, _format.getGlyphForStatus)('success')} Latest backup found with timestamp ${latestBackup.createdAt}`);
     } else {
       console.log(`${(0, _format.getGlyphForStatus)('success')} Backup created with timestamp ${latestBackup.createdAt}`);
     }
@@ -377,22 +379,23 @@ class ExportSQLCommand {
       try {
         await createExportJob(this.app.id, this.env.id, latestBackup.id);
       } catch (err) {
+        const error = err;
         // Todo: match error code instead of message substring
-        if (err?.message.includes('Backup Copy already in progress')) {
+        if (error.message.includes('Backup Copy already in progress')) {
           await this.track('error', {
             error_type: 'job_already_running',
-            error_message: err?.message,
-            stack: err?.stack
+            error_message: error.message,
+            stack: error.stack
           });
           exit.withError('There is an export job already running for this environment: ' + `https://dashboard.wpvip.com/apps/${this.app.id}/${this.env.uniqueLabel}/database/backups\n` + 'Currently, we allow only one export job at a time, per site. Please try again later.');
         } else {
           await this.track('error', {
             error_type: 'create_export_job',
-            error_message: err?.message,
-            stack: err?.stack
+            error_message: error.message,
+            stack: error.stack
           });
         }
-        exit.withError(`Error creating export job: ${err?.message}`);
+        exit.withError(`Error creating export job: ${error.message}`);
       }
     }
     this.progressTracker.stepRunning(this.steps.PREPARE);
@@ -425,14 +428,15 @@ class ExportSQLCommand {
       this.stopProgressTracker();
       console.log(`File saved to ${filepath}`);
     } catch (err) {
+      const error = err;
       this.progressTracker.stepFailed(this.steps.DOWNLOAD);
       this.stopProgressTracker();
       await this.track('error', {
         error_type: 'download_failed',
-        error_message: err?.message,
-        stack: err?.stack
+        error_message: error.message,
+        stack: error.stack
       });
-      exit.withError(`Error downloading exported file: ${err?.message}`);
+      exit.withError(`Error downloading exported file: ${error.message}`);
     }
   }
 }

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.1.0';
+const DEV_ENVIRONMENT_VERSION = exports.DEV_ENVIRONMENT_VERSION = '2.1.1';