@automattic/vip 3.10.0 → 3.11.0

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

@@ -340,14 +340,15 @@ void (0, _command.default)({
   requiredArgs: 1,
   module: 'import-sql',
   usage
-}).command('status', 'Check the status of a SQL database import currently in progress.').option('skip-validate', 'Do not perform file validation prior to import. If the file contains unsupported entries, the import is likely to fail.').option('search-replace', 'Search for a string in the SQL file and replace it with a new string. Separate the values by a comma only; no spaces (e.g. --search-replace=“from,to”).').option('in-place', 'Overwrite the local input file with the results of the search and replace operation prior to import.').option('output', 'The local file path to save a copy of the results from the search and replace operation when the --search-replace option is passed. Ignored when used with the --in-place option.').examples(examples).argv(process.argv, async (arg, opts) => {
+}).command('status', 'Check the status of a SQL database import currently in progress.').option('skip-validate', 'Do not perform file validation prior to import. If the file contains unsupported entries, the import is likely to fail.').option('search-replace', 'Search for a string in the SQL file and replace it with a new string. Separate the values by a comma only; no spaces (e.g. --search-replace=“from,to”).').option('in-place', 'Overwrite the local input file with the results of the search and replace operation prior to import.').option('output', 'The local file path to save a copy of the results from the search and replace operation when the --search-replace option is passed. Ignored when used with the --in-place option.').option('skip-maintenance-mode', 'Imports data without putting the environment in maintenance mode. Available only for unlaunched environments. Caution: This may cause site instability during import.').examples(examples).argv(process.argv, async (arg, opts) => {
   const {
     app,
     env
   } = opts;
   let {
     skipValidate,
-    searchReplace
+    searchReplace,
+    skipMaintenanceMode
   } = opts;
   const {
     id: envId,
@@ -495,7 +496,8 @@ Processing the SQL import for your environment...
       environmentId: env.id,
       basename,
       md5,
-      searchReplace: []
+      searchReplace: [],
+      skipMaintenanceMode
     };
     if (searchReplace) {
       let pairs = searchReplace;

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

@@ -92,6 +92,9 @@ class DevEnvImportSQLCommand {
     if (searchReplace?.length && !inPlace) {
       _fs.default.unlinkSync(resolvedPath);
     }
+    if (this.options.postImportSQL) {
+      await (0, _devEnvironmentDatabase.executeQuery)(lando, this.slug, this.options.postImportSQL);
+    }
     await (0, _devEnvironmentDatabase.flushCache)(lando, this.slug, this.options.quiet);
     if (undefined === this.options.skipReindex || !(0, _devEnvironmentCli.processBooleanOption)(this.options.skipReindex)) {
       try {

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

@@ -205,15 +205,16 @@ class DevEnvSyncSQLCommand {
     const importOptions = {
       inPlace: true,
       skipValidate: true,
-      quiet: true
+      quiet: true,
+      postImportSQL: this.fixBlogsTableQuery()
     };
     const importCommand = new _devEnvImportSql.DevEnvImportSQLCommand(this.sqlFile, importOptions, this.slug);
     await importCommand.run();
   }
-  async fixBlogsTable() {
+  fixBlogsTableQuery() {
     const networkSites = this.env.wpSitesSDS?.nodes;
     if (!networkSites) {
-      return;
+      return '';
     }
     const prologue = `
 DROP PROCEDURE IF EXISTS vip_sync_update_blog_domains;
@@ -240,10 +241,10 @@ DROP PROCEDURE vip_sync_update_blog_domains;
       const newDomain = primaryDomain !== oldDomain ? `${this.slugifyDomain(oldDomain)}.${this.landoDomain}` : this.landoDomain;
       queries.push(`        UPDATE wp_blogs SET domain = '${newDomain}' WHERE blog_id = ${Number(site.blogId)};`);
     }
-    if (queries.length) {
-      const sql = `${prologue}\n${queries.join('\n')}\n${epilogue}`;
-      await _fs.default.promises.appendFile(this.sqlFile, sql);
+    if (queries.length === 0) {
+      return '';
     }
+    return `${prologue}\n${queries.join('\n')}\n${epilogue}`;
   }
 
   /**
@@ -301,7 +302,6 @@ DROP PROCEDURE vip_sync_update_blog_domains;
         console.log(`  ${domain} -> ${landoDomain}`);
       }
       await this.runSearchReplace();
-      await this.fixBlogsTable();
       console.log(`${_chalk.default.green('✓')} Search-replace operation is complete`);
     } catch (err) {
       const error = err;

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

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.reIndexSearch = exports.flushCache = exports.dataCleanup = exports.addAdminUser = void 0;
+exports.reIndexSearch = exports.flushCache = exports.executeQuery = 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'] : []);
@@ -29,4 +29,8 @@ 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;
+exports.flushCache = flushCache;
+const executeQuery = async (lando, slug, query) => {
+  await (0, _devEnvironmentCore.exec)(lando, slug, ['wp', 'db', 'query', query]);
+};
+exports.executeQuery = executeQuery;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@automattic/vip",
-  "version": "3.10.0",
+  "version": "3.11.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@automattic/vip",
-      "version": "3.10.0",
+      "version": "3.11.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package/package.json

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