@automattic/vip 2.40.0-dev.0 → 2.40.0-dev.2

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

@@ -18,12 +18,19 @@ const examples = [{
   description: 'Return information about a local dev environment named "my_site"'
 }];
 (0, _command.default)().option('slug', 'Custom name of the dev environment', undefined, _devEnvironmentCli.processSlug).option('all', 'Show Info for all local dev environments').option('extended', 'Show extended information about the dev environment').examples(examples).argv(process.argv, async (arg, opt) => {
-  const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  let trackingInfo;
+  let slug;
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
+  if (opt.all) {
+    trackingInfo = {
+      all: true
+    };
+    slug = '';
+  } else {
+    slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
+    trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
+  }
   await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
-  const trackingInfo = opt.all ? {
-    all: true
-  } : (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_info_command_execute', trackingInfo);
   debug('Args: ', arg, 'Options: ', opt);
   try {

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

@@ -433,7 +433,8 @@ function promptForBoolean(message, initial) {
   if (isStdinTTY) {
     const confirm = new _enquirer.Confirm({
       message,
-      initial: initial.toString()
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment
+      initial: initial // TS definition is wrong, so we need to bypass it to show the correct hint.
     });
     return confirm.run();
   }

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

@@ -223,7 +223,7 @@ ${maybeExitPrompt}
     const errorsFile = `media-import-${app.name ?? ''}-${Date.now()}${exportFileErrorsToJson ? '.json' : '.txt'}`;
     try {
       await (0, _promises.writeFile)(errorsFile, formattedData);
-      progressTracker.suffix += `${_chalk.default.yellow(`⚠️  All errors have been exported to ${_chalk.default.bold((0, _nodePath.resolve)(errorsFile))}`)}`;
+      progressTracker.suffix += `${_chalk.default.yellow(`⚠️  All errors have been exported to ${_chalk.default.bold((0, _nodePath.resolve)(errorsFile))}\n`)}`;
     } catch (writeFileErr) {
       progressTracker.suffix += `${_chalk.default.red(`Could not export errors to file\n${writeFileErr.message}`)}`;
     }
@@ -242,16 +242,18 @@ Downloading errors details from ${fileErrorsUrl}...
     }
   }
   async function promptFailureDetailsDownload(fileErrorsUrl) {
-    progressTracker.suffix += `${_chalk.default.yellow(`⚠️  Error details can be found on ${_chalk.default.bold(fileErrorsUrl)}\n${_chalk.default.italic.yellow('(This link will be valid for the next 15 minutes. The report is retained for 7 days from the completion of the import.)')}. `)}\n`;
-    progressTracker.print({
-      clearAfter: true
-    });
     const failureDetails = await (0, _enquirer.prompt)({
       type: 'confirm',
       name: 'download',
-      message: 'Download file import errors report now?'
+      message: 'Download file import errors report now? (Report will be downloadable for up to 7 days from the completion of the import)'
     });
     if (!failureDetails.download) {
+      progressTracker.suffix += `${_chalk.default.yellow(`⚠️  Click on the following link to download the file import errors report`)}`;
+      progressTracker.suffix += `\n${_chalk.default.italic.yellow('(The link will be valid for the next 15 minutes & the report will be downloadable for up to 7 days from the completion of the import)')} `;
+      progressTracker.suffix += `\n\n${_chalk.default.bold.yellow(fileErrorsUrl)}\n`;
+      progressTracker.print({
+        clearAfter: true
+      });
       return;
     }
     const failureDetailsErrors = await fetchFailureDetails(fileErrorsUrl);
@@ -284,9 +286,10 @@ Downloading errors details from ${fileErrorsUrl}...
         // Errors were observed and are present in the dto
         // Fall back to exporting errors to local file
         await printFailureDetails(fileErrors, results);
-      } else {
+      } else if ('ABORTED' !== overallStatus) {
         // Errors are not present in the dto
         // And file error details report link is not available
+        // do not print this message if the import was aborted
         printFileErrorsReportLinkExpiredError(results);
       }
     }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@automattic/vip",
-  "version": "2.40.0-dev.0",
+  "version": "2.40.0-dev.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@automattic/vip",
-      "version": "2.40.0-dev.0",
+      "version": "2.40.0-dev.2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "2.40.0-dev.0",
+  "version": "2.40.0-dev.2",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {