@automattic/vip 2.40.0-dev.3 → 2.40.0-dev.4

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

@@ -24,6 +24,9 @@ const examples = [{
   const startProcessing = new Date();
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   trackingInfo.vscode = Boolean(opt.vscode);
+  trackingInfo.docker = lando.config.versions.engine;
+  trackingInfo.docker_compose = lando.config.versions.compose;
+  trackingInfo.compose_plugin = lando.config.versions.composePlugin;
   await (0, _tracker.trackEvent)('dev_env_start_command_execute', trackingInfo);
   debug('Args: ', arg, 'Options: ', opt);
   const options = {

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

@@ -13,7 +13,6 @@ var _tracker = require("../lib/tracker");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // eslint-disable-next-line no-duplicate-imports
 
-const API_VERSION = 'v2';
 const appQuery = `
 	id,
 	name,
@@ -117,8 +116,7 @@ Importing Media into your App...
           environmentId: env.id,
           archiveUrl: url,
           overwriteExistingFiles,
-          importIntermediateImages,
-          apiVersion: API_VERSION
+          importIntermediateImages
         }
       }
     });

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

@@ -126,7 +126,6 @@ const verifyDNSResolution = async slug => {
 const validateDependencies = async (lando, slug) => {
   const now = new Date();
   (0, _devEnvironmentLando.validateDockerInstalled)(lando);
-  await (0, _devEnvironmentLando.validateDockerAccess)(lando);
   if (slug) {
     await verifyDNSResolution(slug);
   }

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

@@ -12,7 +12,6 @@ exports.landoRebuild = landoRebuild;
 exports.landoShell = landoShell;
 exports.landoStart = landoStart;
 exports.landoStop = landoStop;
-exports.validateDockerAccess = validateDockerAccess;
 exports.validateDockerInstalled = validateDockerInstalled;
 var _chalk = _interopRequireDefault(require("chalk"));
 var _debug = _interopRequireDefault(require("debug"));
@@ -23,12 +22,15 @@ var _build = _interopRequireDefault(require("lando/plugins/lando-tooling/lib/bui
 var _promises = require("node:dns/promises");
 var _promises2 = require("node:fs/promises");
 var _nodeOs = require("node:os");
-var _nodePath = _interopRequireDefault(require("node:path"));
+var _nodePath = _interopRequireWildcard(require("node:path"));
+var _semver = require("semver");
 var _xdgBasedir = _interopRequireDefault(require("xdg-basedir"));
 var _devEnvironmentCore = require("./dev-environment-core");
 var _dockerUtils = require("./docker-utils");
 var _devEnvironment = require("../constants/dev-environment");
 var _userError = _interopRequireDefault(require("../user-error"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * This file will hold all the interactions with lando library
@@ -40,9 +42,10 @@ const debug = (0, _debug.default)(DEBUG_KEY);
  * @return {Promise<LandoConfig>} Lando configuration
  */
 async function getLandoConfig() {
-  const nodeModulesPath = _nodePath.default.join(__dirname, '..', '..', '..', 'node_modules');
-  const landoPath = _nodePath.default.join(nodeModulesPath, 'lando');
-  const atLandoPath = _nodePath.default.join(nodeModulesPath, '@lando');
+  // The path will be smth like `yarn/global/node_modules/lando/lib/lando.js`; we need the path up to `lando` (inclusive)
+  const landoPath = (0, _nodePath.dirname)((0, _nodePath.dirname)(require.resolve('lando')));
+  // The path will be smth like `yarn/global/node_modules/@lando/compose/index.js`; we need the path up to `@lando` (inclusive)
+  const atLandoPath = (0, _nodePath.dirname)((0, _nodePath.dirname)(require.resolve('@lando/compose')));
   debug(`Getting Lando config, using paths '${landoPath}' and '${atLandoPath}' for plugins`);
   const isLandoDebugSelected = _debug.default.enabled(DEBUG_KEY);
   const isAllDebugSelected = _debug.default.enabled('"*"');
@@ -177,11 +180,13 @@ async function bootstrapLando() {
         registryResolvable = false;
       }
       const pull = registryResolvable && (instanceData.pullAfter ?? 0) < Date.now();
+      console.log(pull);
       if (Array.isArray(data.opts.pullable) && Array.isArray(data.opts.local) && data.opts.local.length === 0 && !pull) {
         // Setting `data.opts.pullable` to an empty array prevents Lando from pulling images with `docker pull`.
         // Note that if some of the images are not available, they will still be pulled by `docker-compose`.
         data.opts.local = data.opts.pullable;
         data.opts.pullable = [];
+        console.log(data.opts);
       }
       if (pull || !instanceData.pullAfter) {
         instanceData.pullAfter = Date.now() + 7 * 24 * 60 * 60 * 1000;
@@ -531,21 +536,26 @@ async function ensureNoOrphantProxyContainer(lando) {
   await proxyContainer.remove();
 }
 function validateDockerInstalled(lando) {
-  lando.log.verbose('docker-engine exists: %s', lando.engine.dockerInstalled);
-  if (!lando.engine.dockerInstalled) {
-    throw new _userError.default('docker could not be located! Please follow the following instructions to install it - https://docs.docker.com/engine/install/');
-  }
-  lando.log.verbose('docker-compose exists: %s', lando.engine.composeInstalled);
-  if (!lando.engine.composeInstalled) {
-    throw Error('docker-compose could not be located! Please follow the following instructions to install it - https://docs.docker.com/compose/install/');
-  }
-}
-async function validateDockerAccess(lando) {
-  const docker = lando.engine.docker;
-  lando.log.verbose('Fetching docker info to verify Docker connection');
-  try {
-    await docker.info();
-  } catch (error) {
+  const {
+    engine,
+    composePlugin,
+    compose
+  } = lando.config.versions;
+  lando.log.verbose('docker-engine version: %s', engine);
+  if (!engine) {
+    if (!lando.config.dockerBin) {
+      throw new _userError.default('docker binary could not be located! Please follow the following instructions to install it - https://docs.docker.com/engine/install/');
+    }
     throw new _userError.default('Failed to connect to Docker. Please verify that Docker engine (service) is running and follow the troubleshooting instructions for your platform.');
   }
+  lando.log.verbose('docker-compose version: %s', compose);
+  lando.log.verbose('compose plugin version: %s', composePlugin);
+  if (!composePlugin) {
+    if (!compose) {
+      throw new Error('docker-compose binary could not be located! Please follow the following instructions to install it - https://docs.docker.com/compose/install/');
+    }
+    if (!(0, _semver.satisfies)(compose, '^2.0.0')) {
+      throw new Error(`docker-compose version ${compose} is not supported. Please upgrade to version 2.0.0 or higher - https://docs.docker.com/compose/install/`);
+    }
+  }
 }

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

@@ -5,7 +5,6 @@ exports.default = void 0;
 exports.getGlyphForStatus = getGlyphForStatus;
 exports.mediaImportCheckStatus = mediaImportCheckStatus;
 var _chalk = _interopRequireDefault(require("chalk"));
-var _enquirer = require("enquirer");
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _promises = require("node:fs/promises");
 var _nodePath = require("node:path");
@@ -37,7 +36,6 @@ const IMPORT_MEDIA_PROGRESS_QUERY = (0, _graphqlTag.default)`
 							fileName
 							errors
 						}
-						fileErrorsUrl
 					}
 				}
 			}
@@ -218,83 +216,25 @@ ${maybeExitPrompt}
     // Kick off the check
     void checkStatus(IMPORT_MEDIA_PROGRESS_POLL_INTERVAL);
   });
-  async function exportFailureDetails(fileErrors) {
-    const formattedData = buildFileErrors(fileErrors, exportFileErrorsToJson);
-    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))}\n`)}`;
-    } catch (writeFileErr) {
-      progressTracker.suffix += `${_chalk.default.red(`Could not export errors to file\n${writeFileErr.message}`)}`;
-    }
-  }
-  async function fetchFailureDetails(fileErrorsUrl) {
-    progressTracker.suffix += `
-=============================================================
-Downloading errors details from ${fileErrorsUrl}
-\n`;
-    progressTracker.print({
-      clearAfter: true
-    });
-    try {
-      const response = await fetch(fileErrorsUrl);
-      return await response.json();
-    } catch (err) {
-      progressTracker.suffix += `${_chalk.default.red(`Could not download import errors report\n${err.message}`)}`;
-      throw err;
-    }
-  }
-  async function promptFailureDetailsDownload(fileErrorsUrl) {
-    const failureDetails = await (0, _enquirer.prompt)({
-      type: 'confirm',
-      name: 'download',
-      message: 'Download 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(`⚠️  An error report file has been generated for this media import. Access it within the next 15 minutes by clicking on the URL below.`)}`;
-      progressTracker.suffix += `\n${_chalk.default.yellow(`Or, generate a new URL by running the ${_chalk.default.bgYellow('vip import media status')} command.`)} `;
-      progressTracker.suffix += `\n${_chalk.default.yellow('The report will be downloadable for up to 7 days after the completion of the import or until a new media import is performed.')}`;
-      progressTracker.suffix += `\n\n${_chalk.default.underline(fileErrorsUrl)}\n`;
-      progressTracker.print({
-        clearAfter: true
-      });
-      return;
-    }
-    const failureDetailsErrors = await fetchFailureDetails(fileErrorsUrl);
-    await exportFailureDetails(failureDetailsErrors);
-  }
-  function printFileErrorsReportLinkExpiredError(results) {
-    if (results.filesTotal && results.filesProcessed && results.filesTotal !== results.filesProcessed) {
-      const errorsFound = results.filesTotal - results.filesProcessed;
-      progressTracker.suffix += `${_chalk.default.yellow(`⚠️  ${errorsFound} error(s) were found. File import errors report link expired.`)}`;
-    }
-  }
-  async function printFailureDetails(fileErrors, results) {
-    progressTracker.suffix += `${_chalk.default.yellow(`⚠️  ${fileErrors.length} file import error(s) were found`)}`;
-    if ((results.filesTotal ?? 0) - (results.filesProcessed ?? 0) !== fileErrors.length) {
-      progressTracker.suffix += `. ${_chalk.default.italic.yellow('File import errors report size threshold reached.')}`;
-    }
-    await exportFailureDetails(fileErrors);
-  }
   try {
     const results = await getResults();
     overallStatus = results.status ?? 'unknown';
     progressTracker.stopPrinting();
     setProgressTrackerSuffix();
     progressTracker.print();
-    if (results.failureDetails?.fileErrorsUrl) {
-      await promptFailureDetailsDownload(results.failureDetails.fileErrorsUrl);
-    } else {
-      const fileErrors = results.failureDetails?.fileErrors ?? [];
-      if (fileErrors.length > 0) {
-        // Errors were observed and are present in the dto
-        // Fall back to exporting errors to local file
-        await printFailureDetails(fileErrors, results);
-      } 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);
+    const fileErrors = results.failureDetails?.fileErrors ?? [];
+    if (fileErrors.length > 0) {
+      progressTracker.suffix += `${_chalk.default.yellow(`⚠️  ${fileErrors.length} file error(s) have been extracted`)}`;
+      if ((results.filesTotal ?? 0) - (results.filesProcessed ?? 0) !== fileErrors.length) {
+        progressTracker.suffix += `. ${_chalk.default.italic.yellow('File-errors report size threshold reached.')}`;
+      }
+      const formattedData = buildFileErrors(fileErrors, exportFileErrorsToJson);
+      const errorsFile = `media-import-${app.name ?? ''}-${Date.now()}${exportFileErrorsToJson ? '.json' : '.txt'}`;
+      try {
+        await (0, _promises.writeFile)(errorsFile, formattedData);
+        progressTracker.suffix += `\n\n${_chalk.default.yellow(`All errors have been exported to ${_chalk.default.bold((0, _nodePath.resolve)(errorsFile))}`)}\n\n`;
+      } catch (writeFileErr) {
+        progressTracker.suffix += `\n\n${_chalk.default.red(`Could not export errors to file\n${writeFileErr.message}`)}\n\n`;
       }
     }
 

package/docs/CHANGELOG.md

@@ -1,5 +1,20 @@
 ## Changelog
 
+### 2.39.7
+
+* Fix promptForBoolean to display the default initial value capitalized
+* fix(dev-env): `vip dev-env info --all` should not ask for a slug
+* build(deps-dev): bump rimraf from 5.0.5 to 5.0.7
+* build(deps): bump cli-table3 from 0.6.4 to 0.6.5
+* build(deps): bump semver from 7.6.0 to 7.6.2
+* build(deps-dev): bump @types/node from 18.19.31 to 18.19.33
+* build(deps-dev): bump @automattic/eslint-plugin-wpvip from 0.9.1 to 0.10/1832
+* build(deps-dev): bump @automattic/eslint-plugin-wpvip from 0.10.0 to 0.11l/1835
+* fix(dev-env): plugin loading when using yarn to install VIP CLI
+* feat(dev-env): track versions of `docker` and `docker-compose`
+
+**Full Changelog**: https://github.com/Automattic/vip-cli/compare/2.39.6...2.39.7
+
 ### 2.39.6
 * Custom Deploys: Update deploy validation to run fully off of the custom deploy token. There are breaking changes associated with these updates, so the VIP CLI must be updated to this latest version in order to continue using the custom deploy functionality.
 

package/helpers/prepublishOnly.js

@@ -23,7 +23,7 @@ const releaseTag = process.env.npm_config_tag ?? 'latest';
 			}
 		}
 
-		if ( config.gitEnforceBranch && releaseTag !== 'next' ) {
+		if ( config.gitEnforceBranch && releaseTag === 'latest' ) {
 			const currentBranch = await execAsync( 'git branch --show-current' );
 
 			if ( currentBranch.trim() !== config.gitEnforceBranch ) {