@automattic/vip 3.7.1 → 3.8.0

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

@@ -271,6 +271,13 @@ tooling:
     cmd:
       - wp
 
+  db-myloader:
+    service: php
+    description: "Run mydumper's myloader to import database dumps generated by mydumper"
+    user: root
+    cmd:
+      - myloader -h database -u wordpress -p wordpress --database wordpress
+
   db:
     service: php
     description: "Connect to the DB using mysql client (e.g. allow to run imports)"

package/dist/bin/vip-config-envvar-delete.js

@@ -5,6 +5,7 @@ exports.__esModule = true;
 exports.deleteEnvVarCommand = deleteEnvVarCommand;
 var _chalk = _interopRequireDefault(require("chalk"));
 var _command = _interopRequireDefault(require("../lib/cli/command"));
+var _format = require("../lib/cli/format");
 var _api = require("../lib/envvar/api");
 var _input = require("../lib/envvar/input");
 var _logging = require("../lib/envvar/logging");
@@ -35,6 +36,16 @@ async function deleteEnvVarCommand(arg, opt) {
     skip_confirm: Boolean(opt.skipConfirmation),
     variable_name: name
   };
+  const envName = opt.env.type;
+  const appName = opt.app.name;
+  if (!opt.skipConfirmation && envName === 'production') {
+    const yes = await (0, _input.confirm)(`Are you sure you want to delete the environment variable ${name} on ${(0, _format.formatEnvironment)(envName)} for site ${appName}?`);
+    if (!yes) {
+      (0, _tracker.trackEvent)('wpcli_confirm_cancel', trackingParams).catch(() => {});
+      console.log('Command cancelled');
+      process.exit();
+    }
+  }
   (0, _logging.debug)(`Request: Delete environment variable ${JSON.stringify(name)} for ${(0, _logging.getEnvContext)(opt.app, opt.env)}`);
   await (0, _tracker.trackEvent)('envvar_delete_command_execute', trackingParams);
   if (!(0, _api.validateNameWithMessage)(name)) {

package/dist/bin/vip-config-envvar-set.js

@@ -5,6 +5,7 @@ exports.__esModule = true;
 exports.setEnvVarCommand = setEnvVarCommand;
 var _chalk = _interopRequireDefault(require("chalk"));
 var _command = _interopRequireDefault(require("../lib/cli/command"));
+var _format = require("../lib/cli/format");
 var _api = require("../lib/envvar/api");
 var _input = require("../lib/envvar/input");
 var _logging = require("../lib/envvar/logging");
@@ -35,6 +36,16 @@ async function setEnvVarCommand(arg, opt) {
     skip_confirm: Boolean(opt.skipConfirmation),
     variable_name: name
   };
+  const envName = opt.env.type;
+  const appName = opt.app.name;
+  if (!opt.skipConfirmation && envName === 'production') {
+    const yes = await (0, _input.confirm)(`Are you sure you want to set the environment variable ${name} on ${(0, _format.formatEnvironment)(envName)} for site ${appName}?`);
+    if (!yes) {
+      (0, _tracker.trackEvent)('wpcli_confirm_cancel', trackingParams).catch(() => {});
+      console.log('Command cancelled');
+      process.exit();
+    }
+  }
   (0, _logging.debug)(`Request: Set environment variable ${JSON.stringify(name)} for ${(0, _logging.getEnvContext)(opt.app, opt.env)}`);
   await (0, _tracker.trackEvent)('envvar_set_command_execute', trackingParams);
   if (!(0, _api.validateNameWithMessage)(name)) {

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

@@ -3,6 +3,7 @@
 
 var _devEnvImportSql = require("../commands/dev-env-import-sql");
 var _command = _interopRequireDefault(require("../lib/cli/command"));
+var _database = require("../lib/database");
 var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 var _tracker = require("../lib/tracker");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -30,9 +31,16 @@ const examples = [{
 }).option('slug', 'A unique name for a local environment. Default is "vip-local".', undefined, _devEnvironmentCli.processSlug).option(['r', 'search-replace'], 'Search for a string in the SQL file and replace it with a new string.').option('in-place', 'Perform a search and replace operation on the local SQL file and save the results.').option('skip-validate', 'Skip file validation.').option(['k', 'skip-reindex'], 'Skip Elasticsearch reindex after import.').option('quiet', 'Skip confirmation and suppress informational messages.').examples(examples).argv(process.argv, async (unmatchedArgs, opt) => {
   const [fileName] = unmatchedArgs;
   const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  if (opt.searchReplace && !Array.isArray(opt.searchReplace)) {
+    opt.searchReplace = [opt.searchReplace];
+  }
   const cmd = new _devEnvImportSql.DevEnvImportSQLCommand(fileName, opt, slug);
+  const dumpDetails = await (0, _database.getSqlDumpDetails)(fileName);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(cmd.slug);
-  const trackerFn = (0, _tracker.makeCommandTracker)('dev_env_import_sql', trackingInfo);
+  const trackerFn = (0, _tracker.makeCommandTracker)('dev_env_import_sql', {
+    ...trackingInfo,
+    sqldump_type: dumpDetails.type
+  });
   await trackerFn('execute');
   try {
     await cmd.run();

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

@@ -46,7 +46,7 @@ const appQuery = `
 			dbOperationInProgress
 			importInProgress
 		}
-		wpSites {
+		wpSitesSDS {
 			nodes {
 				homeUrl
 				id
@@ -286,7 +286,7 @@ const displayPlaybook = ({
     // eslint-disable-next-line no-multi-spaces
     console.log(`  multisite: ${isMultiSite.toString()}`);
     const selectedEnvironmentObj = app?.environments?.find(env => unformattedEnvironment === env.type);
-    siteArray = selectedEnvironmentObj?.wpSites?.nodes;
+    siteArray = selectedEnvironmentObj?.wpSitesSDS?.nodes;
   }
   if (!tableNames.length) {
     debug('Validation was skipped, no playbook information will be displayed');

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

@@ -4,10 +4,13 @@ exports.__esModule = true;
 exports.DevEnvImportSQLCommand = void 0;
 var _chalk = _interopRequireDefault(require("chalk"));
 var _fs = _interopRequireDefault(require("fs"));
+var _os = _interopRequireDefault(require("os"));
 var exit = _interopRequireWildcard(require("../lib/cli/exit"));
 var _clientFileUploader = require("../lib/client-file-uploader");
+var _database = require("../lib/database");
 var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
+var _devEnvironmentDatabase = require("../lib/dev-environment/dev-environment-database");
 var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
 var _userError = _interopRequireDefault(require("../lib/user-error"));
 var _utils = require("../lib/utils");
@@ -25,6 +28,8 @@ class DevEnvImportSQLCommand {
     const lando = await (0, _devEnvironmentLando.bootstrapLando)();
     (0, _devEnvironmentCli.validateDependencies)(lando);
     (0, _sql.validateImportFileExtension)(this.fileName);
+    const dumpDetails = await (0, _database.getSqlDumpDetails)(this.fileName);
+    const isMyDumper = dumpDetails.type === _database.SqlDumpType.MYDUMPER;
 
     // Check if file is compressed and if so, extract the
     const fileMeta = await (0, _clientFileUploader.getFileMeta)(this.fileName);
@@ -57,14 +62,14 @@ class DevEnvImportSQLCommand {
       const expectedDomain = `${this.slug}.${lando.config.domain}`;
       await (0, _sql.validate)(resolvedPath, {
         isImport: false,
-        skipChecks: [],
+        skipChecks: isMyDumper ? ['dropTable', 'dropDB'] : [],
         extraCheckParams: {
           siteHomeUrlLando: expectedDomain
         }
       });
     }
     const fd = await _fs.default.promises.open(resolvedPath, 'r');
-    const importArg = ['db', '--disable-auto-rehash'].concat(this.options.quiet ? '--silent' : []);
+    const importArg = this.getImportArgs(dumpDetails);
     const origIsTTY = process.stdin.isTTY;
     try {
       /**
@@ -87,18 +92,23 @@ class DevEnvImportSQLCommand {
     if (searchReplace?.length && !inPlace) {
       _fs.default.unlinkSync(resolvedPath);
     }
-    const cacheArg = ['wp', 'cache', 'flush', '--skip-plugins', '--skip-themes'].concat(this.options.quiet ? '--quiet' : []);
-    await (0, _devEnvironmentCore.exec)(lando, this.slug, cacheArg);
+    await (0, _devEnvironmentDatabase.flushCache)(lando, this.slug, this.options.quiet);
     if (undefined === this.options.skipReindex || !(0, _devEnvironmentCli.processBooleanOption)(this.options.skipReindex)) {
       try {
-        await (0, _devEnvironmentCore.exec)(lando, this.slug, ['wp', 'cli', 'has-command', 'vip-search']);
-        await (0, _devEnvironmentCore.exec)(lando, this.slug, ['wp', 'vip-search', 'index', '--setup', '--network-wide', '--skip-confirm']);
+        await (0, _devEnvironmentDatabase.reIndexSearch)(lando, this.slug);
       } catch {
         // Exception means they don't have vip-search enabled.
       }
     }
-    const addUserArg = ['wp', 'dev-env-add-admin', '--username=vipgo', '--password=password', '--skip-plugins', '--skip-themes'].concat(this.options.quiet ? '--quiet' : []);
-    await (0, _devEnvironmentCore.exec)(lando, this.slug, addUserArg);
+    await (0, _devEnvironmentDatabase.addAdminUser)(lando, this.slug);
+  }
+  getImportArgs(dumpDetails) {
+    let importArg = ['db', '--disable-auto-rehash'].concat(this.options.quiet ? '--silent' : []);
+    const threadCount = Math.max(_os.default.cpus().length - 2, 1);
+    if (dumpDetails.type === _database.SqlDumpType.MYDUMPER) {
+      importArg = ['db-myloader', '--overwrite-tables', `--source-db=${dumpDetails.sourceDb}`, `--threads=${threadCount}`, '--max-threads-for-schema-creation=10', '--max-threads-for-index-creation=10', '--skip-triggers', '--skip-post', '--innodb-optimize-keys', '--checksum=SKIP', '--metadata-refresh-interval=2000000', '--stream'].concat(this.options.quiet ? ['--verbose=0'] : ['--verbose=3']);
+    }
+    return importArg;
   }
 }
 exports.DevEnvImportSQLCommand = DevEnvImportSQLCommand;

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

@@ -6,12 +6,14 @@ exports.DevEnvSyncSQLCommand = void 0;
 var _vipSearchReplace = require("@automattic/vip-search-replace");
 var _chalk = _interopRequireDefault(require("chalk"));
 var _fs = _interopRequireDefault(require("fs"));
+var _promises = require("node:stream/promises");
 var _url = _interopRequireDefault(require("url"));
 var _devEnvImportSql = require("./dev-env-import-sql");
 var _exportSql = require("./export-sql");
 var _backupStorageAvailability = require("../lib/backup-storage-availability/backup-storage-availability");
 var exit = _interopRequireWildcard(require("../lib/cli/exit"));
 var _clientFileUploader = require("../lib/client-file-uploader");
+var _database = require("../lib/database");
 var _utils = require("../lib/utils");
 var _lineByLine = require("../lib/validations/line-by-line");
 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); }
@@ -24,7 +26,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
  * @return Site home url. null if not found
  */
 function findSiteHomeUrl(sql) {
-  const regex = "'(siteurl|home)',\\s?'(.*?)'";
+  const regex = `['"](siteurl|home)['"],\\s?['"](.*?)['"]`;
   const url = sql.match(regex)?.[2] || '';
   return _url.default.parse(url).hostname || null;
 }
@@ -57,7 +59,8 @@ class DevEnvSyncSQLCommand {
   tmpDir;
   siteUrls = [];
   searchReplaceMap = {};
-  track;
+  _track;
+  _sqlDumpType;
 
   /**
    * Creates a new instance of the command
@@ -73,9 +76,15 @@ class DevEnvSyncSQLCommand {
     this.env = env;
     this.slug = slug;
     this.lando = lando;
-    this.track = trackerFn;
+    this._track = trackerFn;
     this.tmpDir = (0, _utils.makeTempDir)();
   }
+  track(name, eventProps) {
+    return this._track(name, {
+      ...eventProps,
+      sqldump_type: this._sqlDumpType
+    });
+  }
   get landoDomain() {
     return `${this.slug}.${this.lando.config.domain}`;
   }
@@ -85,6 +94,16 @@ class DevEnvSyncSQLCommand {
   get gzFile() {
     return `${this.tmpDir}/sql-export.sql.gz`;
   }
+  getSqlDumpType() {
+    if (!this._sqlDumpType) {
+      throw new Error('SQL Dump type not initialized');
+    }
+    return this._sqlDumpType;
+  }
+  async initSqlDumpType() {
+    const dumpDetails = await (0, _database.getSqlDumpDetails)(this.sqlFile);
+    this._sqlDumpType = dumpDetails.type;
+  }
   async confirmEnoughStorage(job) {
     const storageAvailability = _backupStorageAvailability.BackupStorageAvailability.createFromDbCopyJob(job);
     return await storageAvailability.validateAndPromptDiskSpaceWarningForDevEnvBackupImport();
@@ -98,7 +117,7 @@ class DevEnvSyncSQLCommand {
     const exportCommand = new _exportSql.ExportSQLCommand(this.app, this.env, {
       outputFile: this.gzFile,
       confirmEnoughStorageHook: this.confirmEnoughStorage.bind(this)
-    }, this.track);
+    }, this.track.bind(this));
     await exportCommand.run();
   }
 
@@ -114,14 +133,13 @@ class DevEnvSyncSQLCommand {
     const readStream = _fs.default.createReadStream(this.sqlFile);
     const replacedStream = await (0, _vipSearchReplace.replace)(readStream, replacements);
     const outputFile = `${this.tmpDir}/sql-export-sr.sql`;
-    replacedStream.pipe(_fs.default.createWriteStream(outputFile));
-    return new Promise((resolve, reject) => {
-      replacedStream.on('finish', () => {
-        _fs.default.renameSync(outputFile, this.sqlFile);
-        resolve();
-      });
-      replacedStream.on('error', reject);
-    });
+    const streams = [replacedStream];
+    if (this.getSqlDumpType() === _database.SqlDumpType.MYDUMPER) {
+      streams.push((0, _database.fixMyDumperTransform)());
+    }
+    streams.push(_fs.default.createWriteStream(outputFile));
+    await (0, _promises.pipeline)(streams);
+    _fs.default.renameSync(outputFile, this.sqlFile);
   }
   generateSearchReplaceMap() {
     this.searchReplaceMap = {};
@@ -187,6 +205,7 @@ class DevEnvSyncSQLCommand {
     try {
       console.log(`Extracting the exported file ${this.gzFile}...`);
       await (0, _clientFileUploader.unzipFile)(this.gzFile, this.sqlFile);
+      await this.initSqlDumpType();
       console.log(`${_chalk.default.green('✓')} Extracted to ${this.sqlFile}`);
     } catch (err) {
       const error = err;
@@ -231,7 +250,6 @@ class DevEnvSyncSQLCommand {
       console.log('Importing the SQL file...');
       await this.runImport();
       console.log(`${_chalk.default.green('✓')} SQL file imported`);
-      return true;
     } catch (err) {
       const error = err;
       await this.track('error', {
@@ -241,6 +259,7 @@ class DevEnvSyncSQLCommand {
       });
       exit.withError(`Error importing SQL file: ${error.message}`);
     }
+    return true;
   }
 }
 exports.DevEnvSyncSQLCommand = DevEnvSyncSQLCommand;

package/dist/lib/database.js

@@ -0,0 +1,107 @@
+"use strict";
+
+exports.__esModule = true;
+exports.getSqlDumpDetails = exports.fixMyDumperTransform = exports.SqlDumpType = void 0;
+var _nodeFs = _interopRequireDefault(require("node:fs"));
+var _nodeReadline = _interopRequireDefault(require("node:readline"));
+var _nodeStream = require("node:stream");
+var _nodeZlib = _interopRequireDefault(require("node:zlib"));
+var _promise = require("./promise");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+let SqlDumpType = exports.SqlDumpType = /*#__PURE__*/function (SqlDumpType) {
+  SqlDumpType["MYDUMPER"] = "MYDUMPER";
+  SqlDumpType["MYSQLDUMP"] = "MYSQLDUMP";
+  return SqlDumpType;
+}({});
+const getSqlDumpDetails = async filePath => {
+  const isCompressed = filePath.endsWith('.gz');
+  let fileStream;
+  // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
+  const fileStreamExternalPromise = (0, _promise.createExternalizedPromise)();
+  if (isCompressed) {
+    fileStream = await getSqlFileStreamFromCompressedFile(filePath);
+  } else {
+    fileStream = _nodeFs.default.createReadStream(filePath);
+  }
+  const readLine = _nodeReadline.default.createInterface({
+    input: fileStream,
+    crlfDelay: Infinity
+  });
+  let isMyDumper = false;
+  let sourceDB = '';
+  let currentLineNumber = 0;
+  for await (const line of readLine) {
+    if (line === '') {
+      continue;
+    }
+    const metadataMatch = line.match(/^-- metadata.header /);
+    const sourceDBMatch = line.match(/^-- (.*)-schema-create.sql/) ?? [];
+    const sourceDBName = sourceDBMatch[1];
+    if (metadataMatch && !isMyDumper) {
+      isMyDumper = true;
+    }
+    if (sourceDBMatch && !sourceDB) {
+      sourceDB = sourceDBName;
+    }
+    if (sourceDB && isMyDumper) {
+      // all fields found? end the search early.
+      break;
+    }
+    if (currentLineNumber > 100) {
+      // we'll assume that this isn't the correct file if we still haven't found `-- metadata.header` even at the 100th line.
+      break;
+    }
+    currentLineNumber++;
+  }
+  if (fileStream instanceof _nodeFs.default.ReadStream) {
+    fileStream.on('close', () => {
+      fileStreamExternalPromise.resolve();
+    });
+  } else {
+    fileStreamExternalPromise.resolve();
+  }
+  readLine.close();
+  fileStream.close();
+  await fileStreamExternalPromise.promise;
+  return {
+    type: isMyDumper ? SqlDumpType.MYDUMPER : SqlDumpType.MYSQLDUMP,
+    sourceDb: sourceDB
+  };
+};
+exports.getSqlDumpDetails = getSqlDumpDetails;
+const verifyFileExists = async filePath => {
+  try {
+    await _nodeFs.default.promises.access(filePath, _nodeFs.default.constants.F_OK);
+  } catch {
+    throw new Error('File not accessible. Does file exist?');
+  }
+};
+const getSqlFileStreamFromGz = async filePath => {
+  await verifyFileExists(filePath);
+  return _nodeFs.default.createReadStream(filePath).pipe(_nodeZlib.default.createGunzip());
+};
+const getSqlFileStreamFromCompressedFile = async filePath => {
+  if (filePath.endsWith('.gz')) {
+    return await getSqlFileStreamFromGz(filePath);
+  }
+  throw new Error('Not a supported compressed file');
+};
+const fixMyDumperTransform = () => {
+  return new _nodeStream.Transform({
+    transform(chunk, _encoding, callback) {
+      const chunkString = chunk.toString();
+      const lineEnding = chunkString.includes('\r\n') ? '\r\n' : '\n';
+      const regex = /^-- ([^ ]+) [0-9]+$/;
+      const lines = chunk.toString().split(lineEnding).map(line => {
+        const match = line.match(regex);
+        if (!match) {
+          return line;
+        }
+        const tablePart = match[1];
+        return `-- ${tablePart} -1`;
+      });
+      callback(null, lines.join(lineEnding));
+    }
+  });
+};
+exports.fixMyDumperTransform = fixMyDumperTransform;

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

@@ -0,0 +1,20 @@
+"use strict";
+
+exports.__esModule = true;
+exports.reIndexSearch = exports.flushCache = 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 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']);
+};
+exports.reIndexSearch = reIndexSearch;
+const flushCache = async (lando, slug, quiet) => {
+  const cacheArg = ['wp', 'cache', 'flush', '--skip-plugins', '--skip-themes'].concat(quiet ? ['--quiet'] : []);
+  await (0, _devEnvironmentCore.exec)(lando, slug, cacheArg);
+};
+exports.flushCache = flushCache;

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

@@ -33,10 +33,6 @@ const IMPORT_MEDIA_PROGRESS_QUERY = (0, _graphqlTag.default)`
 					failureDetails {
 						previousStatus
 						globalErrors
-						fileErrors {
-							fileName
-							errors
-						}
 						fileErrorsUrl
 					}
 				}
@@ -269,13 +265,6 @@ Downloading errors details from ${fileErrorsUrl}
       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';
@@ -284,18 +273,10 @@ Downloading errors details from ${fileErrorsUrl}
     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);
-      }
+    } else if ('ABORTED' !== overallStatus) {
+      // print report link expired if required
+      // do not print this message if the import was aborted
+      printFileErrorsReportLinkExpiredError(results);
     }
 
     // Print one final time

package/dist/lib/promise.js

@@ -0,0 +1,21 @@
+"use strict";
+
+exports.__esModule = true;
+exports.createExternalizedPromise = void 0;
+const createExternalizedPromise = () => {
+  let externalResolve = null;
+  let externalReject = null;
+  const externalizedPromise = new Promise((resolve, reject) => {
+    externalResolve = resolve;
+    externalReject = reject;
+  });
+  if (!externalReject || !externalResolve) {
+    throw new Error("Somehow, externalReject or externalResolve didn't get set.");
+  }
+  return {
+    promise: externalizedPromise,
+    resolve: externalResolve,
+    reject: externalReject
+  };
+};
+exports.createExternalizedPromise = createExternalizedPromise;

package/dist/lib/search-and-replace.js

@@ -9,6 +9,7 @@ var _debug = _interopRequireDefault(require("debug"));
 var _fs = _interopRequireDefault(require("fs"));
 var _promises = require("node:stream/promises");
 var _path = _interopRequireDefault(require("path"));
+var _database = require("./database");
 var _utils = require("./utils");
 var exit = _interopRequireWildcard(require("../lib/cli/exit"));
 var _prompt = require("../lib/cli/prompt");
@@ -76,9 +77,12 @@ const searchAndReplace = async (fileName, pairs, {
   inPlace = false,
   output = process.stdout
 }, binary = null) => {
+  const dumpDetails = await (0, _database.getSqlDumpDetails)(fileName);
+  const isMyDumper = dumpDetails.type === _database.SqlDumpType.MYDUMPER;
   await (0, _tracker.trackEvent)('searchreplace_started', {
     is_import: isImport,
-    in_place: inPlace
+    in_place: inPlace,
+    sqldump_type: dumpDetails.type
   });
   const startTime = process.hrtime();
   const fileSize = (0, _clientFileUploader.getFileSize)(fileName);
@@ -103,7 +107,8 @@ const searchAndReplace = async (fileName, pairs, {
     if (!approved) {
       await (0, _tracker.trackEvent)('search_replace_in_place_cancelled', {
         is_import: isImport,
-        in_place: inPlace
+        in_place: inPlace,
+        sqldump_type: dumpDetails.type
       });
       process.exit();
     }
@@ -125,8 +130,13 @@ const searchAndReplace = async (fileName, pairs, {
     // replace() throws strings... OMG
     exit.withError(replaceError);
   }
+  const streams = [replacedStream];
+  if (isMyDumper) {
+    streams.push((0, _database.fixMyDumperTransform)());
+  }
+  streams.push(writeStream);
   try {
-    await (0, _promises.pipeline)(replacedStream, writeStream);
+    await (0, _promises.pipeline)(streams);
   } catch (error) {
     console.log((0, _chalk.red)("Oh no! We couldn't write to the output file.  Please check your available disk space and file/folder permissions."));
     throw error;
@@ -136,7 +146,8 @@ const searchAndReplace = async (fileName, pairs, {
 
   await (0, _tracker.trackEvent)('searchreplace_completed', {
     time_to_run: end,
-    file_size: fileSize
+    file_size: fileSize,
+    sqldump_type: dumpDetails.type
   });
   return {
     inputFileName: fileName,

package/dist/lib/types.js

@@ -0,0 +1 @@
+"use strict";

package/dist/lib/validations/sql.js

@@ -260,7 +260,7 @@ const checks = {
     recommendation: "Disabling 'UNIQUE_CHECKS' is not allowed. These lines should be removed"
   },
   siteHomeUrl: {
-    matcher: "'(siteurl|home)',\\s?'(.*?)'",
+    matcher: `['"](siteurl|home)['"],\\s?['"](.*?)['"]`,
     matchHandler: (lineNumber, results) => ({
       text: results[1] + ' ' + results[2]
     }),
@@ -271,7 +271,7 @@ const checks = {
     recommendation: ''
   },
   siteHomeUrlLando: {
-    matcher: "'(siteurl|home)',\\s?'([^']+)'",
+    matcher: `['"](siteurl|home)['"],\\s?['"]([^'"]+)['"]`,
     matchHandler: (lineNumber, results, expectedDomain) => {
       let foundDomain = results[2];
       if (!/^https?:\/\//i.test(foundDomain)) {

package/docs/CHANGELOG.md

@@ -1,5 +1,23 @@
 ## Changelog
 
+## 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
+
+**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