@automattic/vip 3.8.0 → 3.8.2

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

@@ -30,10 +30,11 @@ const appQuery = `
   appQuery,
   envContext: true,
   requiredArgs: 0
-}).option('exportFileErrorsToJson', 'Export any file errors encountered to a JSON file instead of a plain text file', false).argv(process.argv, async (arg, {
+}).option('exportFileErrorsToJson', 'Export any file errors encountered to a JSON file instead of a plain text file', false).option('saveErrorLog', 'Download file-error logs without prompting', 'prompt').argv(process.argv, async (arg, {
   app,
   env,
-  exportFileErrorsToJson
+  exportFileErrorsToJson,
+  saveErrorLog
 }) => {
   const {
     id: envId,
@@ -56,6 +57,7 @@ Checking the Media import status for your environment...
     app,
     env,
     progressTracker,
-    exportFileErrorsToJson
+    exportFileErrorsToJson,
+    saveErrorLog
   });
 });

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

@@ -79,18 +79,19 @@ ${_chalk.default.red.bold('If no `uploads/` directory is found, all files will b
 
 Are you sure you want to import the contents of the url?
 `
-}).command('status', 'Check the status of the latest Media Import').command('abort', 'Abort the Media Import running for your App').option('exportFileErrorsToJson', 'Export any file errors encountered to a JSON file instead of a plain text file', false).option('overwriteExistingFiles', 'Overwrite any existing files', false).option('importIntermediateImages', 'Import intermediate image files', false).examples(examples).argv(process.argv, async (args, opts) => {
+}).command('status', 'Check the status of the latest Media Import').command('abort', 'Abort the Media Import running for your App').option('exportFileErrorsToJson', 'Export any file errors encountered to a JSON file instead of a plain text file', false).option('saveErrorLog', 'Download file-error logs without prompting').option('overwriteExistingFiles', 'Overwrite any existing files', false).option('importIntermediateImages', 'Import intermediate image files', false).examples(examples).argv(process.argv, async (args, opts) => {
   const {
     app,
     env,
     exportFileErrorsToJson,
+    saveErrorLog,
     overwriteExistingFiles,
     importIntermediateImages
   } = opts;
   const [url] = args;
   if (!isSupportedUrl(url)) {
     console.log(_chalk.default.red(`
-Error: 
+Error:
 	Invalid URL provided: ${url}
 	Please make sure that it is a publicly accessible web URL containing an archive of the media files to import`));
     return;
@@ -126,7 +127,8 @@ Importing Media into your App...
       app,
       env,
       progressTracker,
-      exportFileErrorsToJson
+      exportFileErrorsToJson,
+      saveErrorLog
     });
   } catch (error) {
     if (error.graphQLErrors) {

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

@@ -101,6 +101,7 @@ class DevEnvImportSQLCommand {
       }
     }
     await (0, _devEnvironmentDatabase.addAdminUser)(lando, this.slug);
+    await (0, _devEnvironmentDatabase.dataCleanup)(lando, this.slug, this.options.quiet);
   }
   getImportArgs(dumpDetails) {
     let importArg = ['db', '--disable-auto-rehash'].concat(this.options.quiet ? '--silent' : []);

package/dist/lib/cli/command.js

@@ -296,6 +296,19 @@ _args.default.argv = async function (argv, cb) {
     }
   }
 
+  // Negotiate flag values
+  switch (_opts.module) {
+    case 'import-media':
+      if ([true, 'true', 'yes'].includes(options.saveErrorLog)) {
+        options.saveErrorLog = 'true';
+      } else if ([false, 'false', 'no'].includes(options.saveErrorLog)) {
+        options.saveErrorLog = 'false';
+      } else {
+        options.saveErrorLog = 'prompt';
+      }
+      break;
+  }
+
   // Prompt for confirmation if necessary
   if (_opts.requireConfirm && !options.force) {
     /** @type {Tuple[]} */
@@ -429,6 +442,10 @@ _args.default.argv = async function (argv, cb) {
           key: 'Export any file errors encountered to a JSON file instead of a plain text file.',
           value: options.exportFileErrorsToJson ? '✅ Yes' : `${_chalk.default.red('x')} No`
         });
+        info.push({
+          key: 'Download file-error logs?',
+          value: options.saveErrorLog
+        });
         break;
       default:
     }

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

@@ -1,13 +1,25 @@
 "use strict";
 
 exports.__esModule = true;
-exports.reIndexSearch = exports.flushCache = exports.addAdminUser = void 0;
+exports.reIndexSearch = exports.flushCache = exports.dataCleanup = exports.addAdminUser = void 0;
 var _devEnvironmentCore = require("./dev-environment-core");
 const addAdminUser = async (lando, slug, quiet) => {
   const addUserArg = ['wp', 'dev-env-add-admin', '--username=vipgo', '--password=password', '--skip-plugins', '--skip-themes'].concat(quiet ? ['--quiet'] : []);
   await (0, _devEnvironmentCore.exec)(lando, slug, addUserArg);
 };
 exports.addAdminUser = addAdminUser;
+const dataCleanup = async (lando, slug, quiet) => {
+  const cleanupArg = ['wp', 'vip', 'data-cleanup', 'sql-import'].concat(quiet ? ['--quiet'] : []);
+  try {
+    await (0, _devEnvironmentCore.exec)(lando, slug, cleanupArg, {
+      stdio: 'inherit'
+    });
+  } catch (error) {
+    // This must not be a fatal error
+    console.log('WARNING: data cleanup failed.');
+  }
+};
+exports.dataCleanup = dataCleanup;
 const reIndexSearch = async (lando, slug) => {
   await (0, _devEnvironmentCore.exec)(lando, slug, ['wp', 'cli', 'has-command', 'vip-search']);
   await (0, _devEnvironmentCore.exec)(lando, slug, ['wp', 'vip-search', 'index', '--setup', '--network-wide', '--skip-confirm']);

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

@@ -80,7 +80,7 @@ async function getLandoConfig() {
       subdir: '.',
       namespace: '@lando'
     }],
-    disablePlugins: ['@lando/argv', '@lando/mailhog', '@lando/phpmyadmin'],
+    disablePlugins: [],
     proxyName: 'vip-dev-env-proxy',
     userConfRoot: landoDir,
     home: fakeHomeDir,

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

@@ -59,7 +59,7 @@ class MediaImportProgressTracker {
     }
     const statusIcon = (0, _status.getGlyphForStatus)(this.status.status ?? '', this.runningSprite);
     let logs;
-    if (this.status.filesProcessed && this.status.filesTotal) {
+    if (typeof this.status.filesProcessed === 'number' && this.status.filesTotal) {
       const progressPercentage = Math.floor(this.status.filesProcessed / this.status.filesTotal * 100);
       logs = `Imported Files: ${this.status.filesProcessed}/${this.status.filesTotal} - ${progressPercentage}% ${statusIcon}`;
     }

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

@@ -121,7 +121,8 @@ async function mediaImportCheckStatus({
   app,
   env,
   progressTracker,
-  exportFileErrorsToJson
+  exportFileErrorsToJson,
+  saveErrorLog
 }) {
   // Stop printing so we can pass our callback
   progressTracker.stopPrinting();
@@ -241,11 +242,13 @@ Downloading errors details from ${fileErrorsUrl}
     }
   }
   async function promptFailureDetailsDownload(fileErrorsUrl) {
-    const failureDetails = await (0, _enquirer.prompt)({
+    const failureDetails = 'prompt' === saveErrorLog ? 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)'
-    });
+    }) : {
+      download: ['true', 'yes'].includes(saveErrorLog)
+    };
     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.`)} `;
@@ -260,7 +263,7 @@ Downloading errors details from ${fileErrorsUrl}
     await exportFailureDetails(failureDetailsErrors);
   }
   function printFileErrorsReportLinkExpiredError(results) {
-    if (results.filesTotal && results.filesProcessed && results.filesTotal !== results.filesProcessed) {
+    if (results.filesTotal && typeof results.filesProcessed === 'number' && 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.`)}`;
     }

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

@@ -76,9 +76,6 @@ async function getStatus(api, appId, envId) {
     jobs,
     launched
   } = environment;
-  if (!environment.isK8sResident && !jobs?.length) {
-    return {};
-  }
   const [importJob] = jobs ?? [];
   return {
     importStatus,
@@ -218,7 +215,7 @@ ${maybeExitPrompt}
       } = status;
       let jobStatus;
       let jobSteps = [];
-      if (env.isK8sResident && !isMissingImportJobAndShouldReturnFast) {
+      if (!isMissingImportJobAndShouldReturnFast) {
         // in the future the API may provide this in k8s jobs so account for that.
         // Until then we need to create the importJob from the status object.
         if (!importJob) {

package/dist/lib/validations/is-multi-site-sql-dump.js

@@ -2,7 +2,7 @@
 
 exports.__esModule = true;
 exports.sqlDumpLineIsMultiSite = sqlDumpLineIsMultiSite;
-const SQL_CREATE_TABLE_IS_MULTISITE_REGEX = /^CREATE TABLE `?(wp_\d+_[a-z0-9_]*|wp_blogs)/i;
+const SQL_CREATE_TABLE_IS_MULTISITE_REGEX = /^CREATE TABLE(?: IF NOT EXISTS)? `?(wp_\d+_[a-z0-9_]*|wp_blogs)/i;
 const SQL_CONTAINS_MULTISITE_WP_USERS_REGEX = /`spam` tinyint\(2\)|`deleted` tinyint\(2\)/i;
 function sqlDumpLineIsMultiSite(line) {
   // determine if we're on a CREATE TABLE statement line what has eg. wp_\d_options OR wp_blogs

package/dist/lib/validations/site-type.js

@@ -40,7 +40,7 @@ const siteTypeValidations = exports.siteTypeValidations = {
       await track('import_sql_command_error', {
         error_type: 'subsite-import-without-subsite-sql-dump'
       });
-      throw new Error('You have requested a subsite SQL import but have not provided a subsite compatiable SQL dump.');
+      throw new Error('You have requested a subsite SQL import but have not provided a subsite compatible SQL dump.');
     }
 
     // Get Primary Domain

package/docs/CHANGELOG.md

@@ -1,34 +1,52 @@
 ## Changelog
 
+## 3.8.1
+
+* fix(dev-env): clean up data after `vip dev-env sync sql`
+* security: fix high severity CVE-2024-39338 in `axios`
+
+**Full Changelog**: https://github.com/Automattic/vip-cli/compare/3.8.0...3.8.1
+
+## 3.8.0
+
+* build(deps-dev): bump @babel/preset-env from 7.24.8 to 7.25.0 in the babel group
+* build(deps): bump debug from 4.3.5 to 4.3.6
+* SQL Import: Switch to wpSitesSDS query
+* Extract many import-sql functionality to a separate file
+* build(deps-dev): bump the babel group across 1 directory with 2 updates
+* build(deps): bump adm-zip from 0.5.14 to 0.5.15
+* build(deps): bump step-security/harden-runner from 2.9.0 to 2.9.1
+* BB8-11630: Add confirmation for production env vars setting/deleting
+* Remove querying `fileErrors` in Graphql API while fetching Media import status
+* Mydumper integration
+
+**Full Changelog**: https://github.com/Automattic/vip-cli/compare/3.7.1...3.8.0
+
 ## 3.7.1
 
-* New develop release: 3.7.1-dev.0 by @github-actions in #1944
-* build(deps): bump step-security/harden-runner from 2.8.1 to 2.9.0 by @dependabot in #1950
-* build(deps): bump semver from 7.6.2 to 7.6.3 by @dependabot in #1946
-* build(deps-dev): bump @types/node from 18.19.39 to 18.19.41 by @dependabot in #1951
-* refactor(dev-env): do not load SSH keys by @sjinks in #1934
-* build(deps): bump tar from 7.4.0 to 7.4.1 by @dependabot in #1952
-* build(deps-dev): bump typescript from 5.5.3 to 5.5.4 by @dependabot in #1954
-* build(deps-dev): bump @types/node from 18.19.41 to 18.19.42 by @dependabot in #1956
-* Refactor dev-env sync, dev-env import and export-sql to TypeScript by @abdullah-kasim in #1955
-* build(deps): bump tar from 7.4.1 to 7.4.3 by @dependabot in #1963
-* build(deps-dev): bump @types/dockerode from 3.3.30 to 3.3.31 by @dependabot in #1960
-* Gracefully fail when directory is not detected by @ariskataoka in #1947
-* New package release: v3.7.1 by @github-actions in #1966
+* build(deps): bump step-security/harden-runner from 2.8.1 to 2.9.0
+* build(deps): bump semver from 7.6.2 to 7.6.3
+* build(deps-dev): bump @types/node from 18.19.39 to 18.19.41
+* refactor(dev-env): do not load SSH keys
+* build(deps): bump tar from 7.4.0 to 7.4.1
+* build(deps-dev): bump typescript from 5.5.3 to 5.5.4
+* build(deps-dev): bump @types/node from 18.19.41 to 18.19.42
+* Refactor dev-env sync, dev-env import and export-sql to TypeScript
+* build(deps): bump tar from 7.4.1 to 7.4.3
+* build(deps-dev): bump @types/dockerode from 3.3.30 to 3.3.31
+* Gracefully fail when directory is not detected
 
 **Full Changelog**: https://github.com/Automattic/vip-cli/compare/3.7.0...3.7.1
 
 ## 3.7.0
 
-* New develop release: 3.6.1-dev.0 by @github-actions in #1931
-* build(deps-dev): bump @automattic/eslint-plugin-wpvip from 0.12.0 to 0.13.0 by @dependabot in #1932
-* build(deps-dev): bump the babel group with 3 updates by @dependabot in #1936
-* build(deps): bump update-notifier from 7.0.0 to 7.1.0 by @dependabot in #1937
-* build(deps): bump actions/dependency-review-action from 4.3.3 to 4.3.4 by @dependabot in #1938
-* build(deps-dev): bump @babel/core from 7.24.8 to 7.24.9 in the babel group by @dependabot in #1939
-* build(deps-dev): bump @types/dockerode from 3.3.29 to 3.3.30 by @dependabot in #1941
-* update: media import validate-files by @ariskataoka in #1919
-* New package release: v3.7.0 by @github-actions in #1943
+* build(deps-dev): bump @automattic/eslint-plugin-wpvip from 0.12.0 to 0.13.0
+* build(deps-dev): bump the babel group with 3 updates
+* build(deps): bump update-notifier from 7.0.0 to 7.1.0
+* build(deps): bump actions/dependency-review-action from 4.3.3 to 4.3.4
+* build(deps-dev): bump @babel/core from 7.24.8 to 7.24.9 in the babel group
+* build(deps-dev): bump @types/dockerode from 3.3.29 to 3.3.30
+* update: media import validate-files
   
 **Full Changelog**: https://github.com/Automattic/vip-cli/compare/3.6.0...3.7.0