@automattic/vip 3.9.6 → 3.11.0

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

@@ -15,19 +15,6 @@ proxy:
 keys: false
 
 services:
-  devtools:
-    type: compose
-    services:
-      image: ghcr.io/automattic/vip-container-images/dev-tools:0.9
-      volumes:
-        - devtools:/dev-tools
-        - scripts:/scripts
-    volumes:
-      devtools: {}
-      scripts:
-    initOnly: true
-    entrypoint: sh -c 'test -d /dev-tools-orig && /usr/bin/rsync -a --delete /dev-tools-orig/ /dev-tools/ || true'
-
   nginx:
     type: compose
     ssl: true
@@ -70,8 +57,6 @@ services:
         elasticsearch:
           condition: service_started
 <% } %>
-        devtools:
-          condition: service_completed_successfully
         wordpress:
           condition: service_completed_successfully
 <% if ( muPlugins.mode == 'image' ) { %>
@@ -96,6 +81,9 @@ services:
 <% wpVolumes() %>
     run_as_root:
       - chown www-data:www-data /wp/wp-content/mu-plugins /wp/config /wp/log /wp/wp-content/uploads /wp
+<% if ( appCode.mode == 'image' ) { %>
+      - chown www-data:www-data /wp/wp-content/plugins
+<% } %>
     run:
       - >
         sh /dev-tools/setup.sh
@@ -193,13 +181,13 @@ services:
       image: ghcr.io/automattic/vip-container-images/wordpress:<%= wordpress.tag %>
       volumes:
         - ./wordpress:/shared
-        - type: volume
-          source: scripts
-          target: /scripts
-          volume:
-            nocopy: true
+        - devtools:/dev-tools
+        - scripts:/scripts
     initOnly: true
-    entrypoint: /usr/bin/rsync -a --chown=${LANDO_HOST_USER_ID}:${LANDO_HOST_GROUP_ID} /wp/ /shared/
+    entrypoint: sh -c '/usr/bin/rsync -a --delete --chown=${LANDO_HOST_USER_ID}:${LANDO_HOST_GROUP_ID} /wp/ /shared/; /usr/bin/rsync -a --chown=${LANDO_HOST_USER_ID}:${LANDO_HOST_GROUP_ID} --delete /dev-tools-orig/ /dev-tools/'
+    volumes:
+      devtools:
+      scripts:
 
 <% if ( muPlugins.mode == 'image' ) { %>
   vip-mu-plugins:
@@ -301,6 +289,7 @@ tooling:
         - ./log:/wp/log
         - ./uploads:/wp/wp-content/uploads
         - ./wordpress:/wp
+        - ./integrations-config:/wp/config/integrations-config
 <% if ( muPlugins.mode == 'image' ) { %>
         - type: volume
           source: mu-plugins

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

@@ -65,11 +65,14 @@ cmd.argv(process.argv, async (arg, opt) => {
     exit.withError(messageToShow);
   }
 
-  /** @type {InstanceOptions} */
+  /** @type {import('../lib/dev-environment/types').InstanceOptions} */
   let defaultOptions = {};
+  /** @type {Record<string,import('../lib/dev-environment/types').IntegrationConfig>} */
+  let integrationsConfig = {};
   try {
     if (opt.app) {
       const appInfo = await (0, _devEnvironmentCore.getApplicationInformation)(opt.app, opt.env);
+      integrationsConfig = appInfo.environment?.integrations ?? {};
       defaultOptions = (0, _devEnvironmentCli.getOptionsFromAppInfo)(appInfo);
     }
   } catch (error) {
@@ -87,7 +90,7 @@ cmd.argv(process.argv, async (arg, opt) => {
   const instanceData = await (0, _devEnvironmentCli.promptForArguments)(preselectedOptions, defaultOptions, suppressPrompts, true);
   instanceData.siteSlug = slug;
   try {
-    await (0, _devEnvironmentCore.createEnvironment)(lando, instanceData);
+    await (0, _devEnvironmentCore.createEnvironment)(lando, instanceData, integrationsConfig);
     await (0, _devEnvironmentCore.printEnvironmentInfo)(lando, slug, {
       extended: false,
       suppressWarnings: true

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

@@ -15,6 +15,7 @@ var _command = _interopRequireDefault(require("../lib/cli/command"));
 var exit = _interopRequireWildcard(require("../lib/cli/exit"));
 var _format = require("../lib/cli/format");
 var _progress = require("../lib/cli/progress");
+var _prompt = require("../lib/cli/prompt");
 var _clientFileUploader = require("../lib/client-file-uploader");
 var _searchAndReplace = require("../lib/search-and-replace");
 var _dbFileImport = require("../lib/site-import/db-file-import");
@@ -339,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,
@@ -405,6 +407,16 @@ void (0, _command.default)({
     isMultiSite,
     tableNames
   });
+  if (opts.inPlace) {
+    const approved = await (0, _prompt.confirm)([], 'Are you sure you want to run search and replace on your input file? This operation is not reversible.');
+    if (!approved) {
+      await (0, _tracker.trackEventWithEnv)('search_replace_in_place_cancelled', {
+        is_import: true,
+        in_place: opts.inPlace
+      });
+      process.exit();
+    }
+  }
 
   /**
    * =========== WARNING =============
@@ -443,7 +455,9 @@ Processing the SQL import for your environment...
     } = await (0, _searchAndReplace.searchAndReplace)(fileName, searchReplace, {
       isImport: true,
       inPlace: opts.inPlace,
-      output: opts.output ?? true // "true" creates a temp output file instead of printing to stdout, as we need to upload the output to S3.
+      output: opts.output ?? true,
+      // "true" creates a temp output file instead of printing to stdout, as we need to upload the output to S3.
+      batchMode: true
     });
     if (typeof outputFileName !== 'string') {
       progressTracker.stepFailed('replace');
@@ -482,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/bin/vip-wp.js

@@ -367,7 +367,7 @@ const examples = [{
       subShellRl.close();
       process.exit();
     }
-    const startsWithWp = line.startsWith('wp ');
+    const startsWithWp = line.trim().startsWith('wp ');
     const empty = 0 === line.length;
     const userCmdCancelled = line === cancelCommandChar;
     if ((empty || !startsWithWp) && !userCmdCancelled) {

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/api/feature-flags.js

@@ -5,7 +5,9 @@ exports.get = get;
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _api = _interopRequireDefault(require("../../lib/api"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const api = (0, _api.default)();
+const api = (0, _api.default)({
+  silenceAuthErrors: true
+});
 const isVipQuery = (0, _graphqlTag.default)`
 	query isVIP {
 		me {

package/dist/lib/api/user.js

@@ -20,8 +20,10 @@ const QUERY_CURRENT_USER = (0, _graphqlTag.default)`
 		}
 	}
 `;
-async function getCurrentUserInfo() {
-  const api = (0, _api.default)();
+async function getCurrentUserInfo(silenceAuthErrors = false) {
+  const api = (0, _api.default)({
+    silenceAuthErrors
+  });
   const response = await api.query({
     query: QUERY_CURRENT_USER
   });

package/dist/lib/api.js

@@ -34,13 +34,14 @@ function isServerError(networkError) {
   return 'result' in networkError;
 }
 function API({
-  exitOnError = true
+  exitOnError = true,
+  silenceAuthErrors = false
 } = {}) {
   const errorLink = (0, _error.onError)(({
     networkError,
     graphQLErrors
   }) => {
-    if (networkError && 'statusCode' in networkError && networkError.statusCode === 401) {
+    if (!silenceAuthErrors && networkError && 'statusCode' in networkError && networkError.statusCode === 401) {
       let message = 'You are not authorized to perform this request; please logout with `vip logout`, then try again.';
       if (isServerError(networkError) && networkError.result?.code === 'token-disabled-inactivity') {
         message = 'Your token has expired due to inactivity; please log out with `vip logout`, then try again.';

package/dist/lib/client-file-uploader.js

@@ -236,10 +236,17 @@ async function uploadUsingPutObject({
       cause: err
     });
   }
-  const {
-    Code,
-    Message
-  } = parsedResponse.Error;
+  let Code;
+  let Message;
+  if (parsedResponse?.Error) {
+    ({
+      Code,
+      Message
+    } = parsedResponse.Error);
+  } else {
+    Code = `HTTP Error ${response.status}`;
+    Message = response.statusText;
+  }
   throw new Error(`Unable to upload to cloud storage. ${JSON.stringify({
     Code,
     Message

package/dist/lib/config/software.js

@@ -39,27 +39,28 @@ const appQuery = exports.appQuery = `
 			}
 		}
 	}`;
-const appQueryFragments = exports.appQueryFragments = `fragment Software on AppEnvironmentSoftwareSettingsSoftware {
+const appQueryFragments = exports.appQueryFragments = (0, _graphqlTag.default)`
+	fragment Software on AppEnvironmentSoftwareSettingsSoftware {
 		name
 		slug
 		pinned
 		current {
-		  version
-		  default
-		  deprecated
-		  unstable
-		  compatible
-		  latestRelease
-		  private
+			version
+			default
+			deprecated
+			unstable
+			compatible
+			latestRelease
+			private
 		}
 		options {
-		  version
-		  default
-		  deprecated
-		  unstable
-		  compatible
-		  latestRelease
-		  private
+			version
+			default
+			deprecated
+			unstable
+			compatible
+			latestRelease
+			private
 		}
 	}
 `;

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

@@ -6,7 +6,7 @@ const DEV_ENVIRONMENT_SUBCOMMAND = exports.DEV_ENVIRONMENT_SUBCOMMAND = 'dev-env
 const DEV_ENVIRONMENT_FULL_COMMAND = exports.DEV_ENVIRONMENT_FULL_COMMAND = `vip ${DEV_ENVIRONMENT_SUBCOMMAND}`;
 const DEV_ENVIRONMENT_PROMPT_INTRO = exports.DEV_ENVIRONMENT_PROMPT_INTRO = 'This is a wizard to help you set up your local dev environment.\n\n' + 'Sensible default values were pre-selected for convenience. ' + 'You may also choose to create multiple environments with different settings using the --slug option.\n\n';
 const DEV_ENVIRONMENT_NOT_FOUND = exports.DEV_ENVIRONMENT_NOT_FOUND = 'Environment not found.';
-const DEV_ENVIRONMENT_COMPONENTS = exports.DEV_ENVIRONMENT_COMPONENTS = ['muPlugins', 'appCode'];
+const DEV_ENVIRONMENT_COMPONENTS = exports.DEV_ENVIRONMENT_COMPONENTS = ['appCode', 'muPlugins'];
 const DEV_ENVIRONMENT_COMPONENTS_WITH_WP = exports.DEV_ENVIRONMENT_COMPONENTS_WITH_WP = ['wordpress', ...DEV_ENVIRONMENT_COMPONENTS];
 const DEV_ENVIRONMENT_RAW_GITHUB_HOST = exports.DEV_ENVIRONMENT_RAW_GITHUB_HOST = 'raw.githubusercontent.com';
 const DEV_ENVIRONMENT_WORDPRESS_VERSIONS_URI = exports.DEV_ENVIRONMENT_WORDPRESS_VERSIONS_URI = '/Automattic/vip-container-images/master/wordpress/versions.json';
@@ -36,4 +36,4 @@ const DEV_ENVIRONMENT_DEFAULTS = exports.DEV_ENVIRONMENT_DEFAULTS = {
   multisite: false,
   phpVersion: Object.keys(DEV_ENVIRONMENT_PHP_VERSIONS)[0]
 };
-const DEV_ENVIRONMENT_VERSION = exports.DEV_ENVIRONMENT_VERSION = '2.1.3';
+const DEV_ENVIRONMENT_VERSION = exports.DEV_ENVIRONMENT_VERSION = '2.2.2';

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

@@ -40,6 +40,7 @@ var _shelljs = require("shelljs");
 var _devEnvironmentConfigurationFile = require("./dev-environment-configuration-file");
 var _devEnvironmentCore = require("./dev-environment-core");
 var _devEnvironmentLando = require("./dev-environment-lando");
+var _user = require("../api/user");
 var _devEnvironment = require("../constants/dev-environment");
 var _tracker = require("../tracker");
 var _userError = _interopRequireDefault(require("../user-error"));
@@ -59,7 +60,7 @@ function setIsTTY(val) {
 }
 const componentDisplayNames = {
   wordpress: 'WordPress',
-  muPlugins: 'vip-go-mu-plugins',
+  muPlugins: 'VIP MU Plugins',
   appCode: 'application code'
 };
 const componentDemoNames = {
@@ -164,6 +165,8 @@ function processComponentOptionInput(passedParam, allowLocal) {
   };
 }
 function getOptionsFromAppInfo(appInfo) {
+  const integrationsConfig = appInfo.environment?.integrations ?? {};
+  const hasES = integrationsConfig['enterprise-search']?.env?.status === 'enabled';
   return {
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     title: appInfo.environment?.name || appInfo.name || '',
@@ -171,7 +174,8 @@ function getOptionsFromAppInfo(appInfo) {
     multisite: Boolean(appInfo.environment?.isMultisite),
     mediaRedirectDomain: appInfo.environment?.primaryDomain,
     php: appInfo.environment?.php ?? '',
-    wordpress: appInfo.environment?.wordpress ?? ''
+    wordpress: appInfo.environment?.wordpress ?? '',
+    elasticsearch: hasES
   };
 }
 
@@ -293,7 +297,15 @@ async function processWordPress(preselectedValue, defaultValue) {
 async function processComponent(component, preselectedValue, defaultValue, suppressPrompts = false) {
   debug(`processing a component '${component}', with preselected/default - ${preselectedValue}/${defaultValue}`);
   let result;
-  const allowLocal = true;
+  let allowLocal = true;
+  if (component === 'muPlugins') {
+    try {
+      const currentUser = await (0, _user.getCurrentUserInfo)(true);
+      allowLocal = currentUser?.isVIP ?? false;
+    } catch (err) {
+      allowLocal = false;
+    }
+  }
   const defaultObject = defaultValue ? processComponentOptionInput(defaultValue, allowLocal) : null;
   if (preselectedValue) {
     result = processComponentOptionInput(preselectedValue, allowLocal);
@@ -538,7 +550,7 @@ async function promptForComponent(component, allowLocal, defaultObject) {
   debug(modeResult);
   const messagePrefix = selectMode ? '\t' : `${componentDisplayName} - `;
   if ('local' === modeResult) {
-    const directoryPath = await promptForText(`${messagePrefix}What is a path to your local ${componentDisplayName}`, defaultObject?.dir ?? '');
+    const directoryPath = await promptForText(`${messagePrefix}What is a path to your local ${componentDisplayName}?`, defaultObject?.dir ?? '');
     return {
       mode: modeResult,
       dir: directoryPath

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

@@ -27,6 +27,8 @@ var _copyDir = _interopRequireDefault(require("copy-dir"));
 var _debug = _interopRequireDefault(require("debug"));
 var _ejs = _interopRequireDefault(require("ejs"));
 var _enquirer = require("enquirer");
+var _graphql = require("graphql");
+var _utils = require("lando/lib/utils");
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
 var _nodeFs = _interopRequireDefault(require("node:fs"));
 var _nodePath = _interopRequireDefault(require("node:path"));
@@ -49,8 +51,11 @@ const landoFileName = '.lando.yml';
 const landoBackupFileName = '.lando.backup.yml';
 const nginxFileName = 'extra.conf';
 const instanceDataFileName = 'instance_data.json';
+const integrationsConfigFileName = 'integrations.json';
+const integrationsConfigBackupFileName = 'integrations.json.bak';
 const uploadPathString = 'uploads';
 const nginxPathString = 'nginx';
+const integrationsConfigPathString = 'integrations-config';
 function xdgDataDirectory() {
   if (_xdgBasedir.default.data) {
     return _xdgBasedir.default.data;
@@ -92,8 +97,9 @@ async function stopEnvironment(lando, slug) {
   }
   await (0, _devEnvironmentLando.landoStop)(lando, instancePath);
 }
-async function createEnvironment(lando, instanceData) {
+async function createEnvironment(lando, instanceData, integrationsConfig) {
   const slug = instanceData.siteSlug;
+  integrationsConfig ??= {};
   debug('Will process an environment', slug, 'with instanceData for creation: ', instanceData);
   const instancePath = getEnvironmentPath(slug);
   debug('Instance path for', slug, 'is:', instancePath);
@@ -103,7 +109,7 @@ async function createEnvironment(lando, instanceData) {
   }
   const preProcessedInstanceData = preProcessInstanceData(instanceData);
   debug('Will create an environment', slug, 'with instanceData: ', preProcessedInstanceData);
-  await prepareLandoEnv(lando, preProcessedInstanceData, instancePath);
+  await prepareLandoEnv(lando, preProcessedInstanceData, instancePath, integrationsConfig);
 }
 async function updateEnvironment(lando, instanceData) {
   const slug = instanceData.siteSlug;
@@ -116,7 +122,7 @@ async function updateEnvironment(lando, instanceData) {
   }
   const preProcessedInstanceData = preProcessInstanceData(instanceData);
   debug('Will create an environment', slug, 'with instanceData: ', preProcessedInstanceData);
-  await prepareLandoEnv(lando, preProcessedInstanceData, instancePath);
+  await prepareLandoEnv(lando, preProcessedInstanceData, instancePath, undefined);
 }
 function preProcessInstanceData(instanceData) {
   const newInstanceData = {
@@ -180,6 +186,10 @@ async function destroyEnvironment(lando, slug, removeFiles) {
   } else {
     debug("Lando file doesn't exist, skipping lando destroy.");
   }
+  await _nodeFs.default.promises.rm(_nodePath.default.join(xdgDataDirectory(), 'vip', 'lando', 'compose', (0, _utils.dockerComposify)(slug)), {
+    force: true,
+    recursive: true
+  });
   if (removeFiles) {
     await _nodeFs.default.promises.rm(instancePath, {
       recursive: true
@@ -333,7 +343,28 @@ function writeEnvironmentData(slug, data) {
   const instanceDataTargetPath = _nodePath.default.join(instancePath, instanceDataFileName);
   return _nodeFs.default.promises.writeFile(instanceDataTargetPath, JSON.stringify(data, null, 2));
 }
-async function prepareLandoEnv(lando, instanceData, instancePath) {
+async function writeIntegrationsConfig(instancePath, integrationsConfig) {
+  const integrationsConfigPath = _nodePath.default.join(instancePath, integrationsConfigPathString);
+  const integrationsConfigTargetPath = _nodePath.default.join(integrationsConfigPath, integrationsConfigFileName);
+  await _nodeFs.default.promises.mkdir(integrationsConfigPath, {
+    recursive: true
+  });
+  if (integrationsConfig !== undefined) {
+    const integrationsConfigBackupTargetPath = _nodePath.default.join(integrationsConfigPath, integrationsConfigBackupFileName);
+    try {
+      await _nodeFs.default.promises.rename(integrationsConfigTargetPath, integrationsConfigBackupTargetPath);
+      console.log(`Backup of ${integrationsConfigFileName} was created in ${integrationsConfigBackupTargetPath}`);
+    } catch (err) {
+      if ('ENOENT' !== err.code) {
+        throw err;
+      }
+    }
+    const configJson = JSON.stringify(integrationsConfig, null, 4);
+    await _nodeFs.default.promises.writeFile(integrationsConfigTargetPath, configJson);
+    debug(`Integrations configuration file created in ${integrationsConfigTargetPath}`);
+  }
+}
+async function prepareLandoEnv(lando, instanceData, instancePath, integrationsConfig) {
   const templateData = {
     ...instanceData,
     domain: lando.config.domain
@@ -365,6 +396,7 @@ async function prepareLandoEnv(lando, instanceData, instancePath) {
   debug(`Lando file created in ${landoFileTargetPath}`);
   debug(`Nginx file created in ${nginxFileTargetPath}`);
   debug(`Instance data file created in ${instanceDataTargetPath}`);
+  await writeIntegrationsConfig(instancePath, integrationsConfig);
 }
 function getAllEnvironmentNames() {
   const mainEnvironmentPath = xdgDataDirectory();
@@ -402,6 +434,9 @@ async function getApplicationInformation(appId, envType) {
 			type,
 			branch,
 			isMultisite,
+			getIntegrationsDevEnvConfig {
+				data
+			}
 			primaryDomain {
 				name
 			},
@@ -414,7 +449,7 @@ async function getApplicationInformation(appId, envType) {
 				}
 			}
 		}`;
-  const queryResult = await (0, _app.default)(appId, fieldsQuery, _software.appQueryFragments);
+  const queryResult = await (0, _app.default)(appId, fieldsQuery, (0, _graphql.print)(_software.appQueryFragments));
   const appData = {};
   if (queryResult.id) {
     appData.id = queryResult.id;
@@ -448,7 +483,8 @@ async function getApplicationInformation(appId, envType) {
         isMultisite: envData.isMultisite,
         primaryDomain: envData.primaryDomain?.name ?? '',
         php: envData.softwareSettings?.php?.current.version ?? '',
-        wordpress: envData.softwareSettings?.wordpress?.current.version ?? ''
+        wordpress: envData.softwareSettings?.wordpress?.current.version ?? '',
+        integrations: envData.getIntegrationsDevEnvConfig?.data ?? {}
       };
     }
   }

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/dist/lib/dev-environment/dev-environment-lando.js

@@ -499,7 +499,6 @@ async function landoExec(lando, instancePath, toolName, args, options) {
     process.argv = ['0', '1', '3'].concat(args);
     tool.app = app;
     tool.name = toolName;
-    tool.dir = '/';
     if (options.stdio) {
       tool.stdio = options.stdio;
     }

package/dist/lib/dev-environment/docker-utils.js

@@ -61,7 +61,9 @@ async function getDockerSocket() {
     // Try the default location
     paths.push('/var/run/docker.sock');
     // Try alternative locations
+    paths.push('/run/docker.sock');
     paths.push((0, _nodePath.join)((0, _nodeOs.homedir)(), '.docker', 'run', 'docker.sock'));
+    paths.push((0, _nodePath.join)((0, _nodeOs.homedir)(), '.colima', 'default', 'docker.sock'));
     paths.push((0, _nodePath.join)((0, _nodeOs.homedir)(), '.orbstack', 'run', 'docker.sock'));
     for (const socketPath of paths) {
       try {

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

@@ -6,7 +6,7 @@ var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _api = _interopRequireDefault(require("../api"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const IMPORT_MEDIA_CONFIG_QUERY = (0, _graphqlTag.default)`
-	{
+	query MediaImportConfig {
 		mediaImportConfig {
 			fileNameCharCount
 			fileSizeLimitInBytes

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

@@ -75,7 +75,8 @@ function getReadAndWriteStreams({
 const searchAndReplace = async (fileName, pairs, {
   isImport = true,
   inPlace = false,
-  output = process.stdout
+  output = process.stdout,
+  batchMode = false
 }, binary = null) => {
   const dumpDetails = await (0, _database.getSqlDumpDetails)(fileName);
   const isMyDumper = dumpDetails.type === _database.SqlDumpType.MYDUMPER;
@@ -100,7 +101,7 @@ const searchAndReplace = async (fileName, pairs, {
   // determine all the replacements required
   const replacements = pairs.flatMap(pair => pair.split(',').map(str => str.trim()));
   debug('Pairs: ', pairs, 'Replacements: ', replacements);
-  if (inPlace) {
+  if (inPlace && !batchMode) {
     const approved = await (0, _prompt.confirm)([], 'Are you sure you want to run search and replace on your input file? This operation is not reversible.');
 
     // Bail if user does not wish to proceed

package/docs/CHANGELOG.md

@@ -1,5 +1,34 @@
 ## Changelog
 
+### 3.10.0
+
+* VIP-CLI interactive console: Trim leading and ending spaces in command passed in
+* fix(dev-env): remove `lando/compose/env` directory when environment is destroyed
+* chore: update GraphQL types
+* feat: query integrations and their configuration
+* build(deps-dev): bump dockerode from 4.0.2 to 4.0.4
+* build(deps-dev): bump @types/dockerode from 3.3.32 to 3.3.33
+* feat(dev-env): write integrations config when creating an environment
+* build(deps-dev): bump @types/dockerode from 3.3.33 to 3.3.34
+* refactor(dev-env): merge `dev-tools` into `wordpress`
+* feat(dev-env): Improvements to configuration wizard
+* fix: ignore auth failures when querying feature flags
+* feat(dev-env): automatically enable Elasticsearch when Enterprise Search integration is enabled
+* fix(import-sql): progress tracker is incompatible with interactivity
+* fix(dev-env): add support for colima socket
+* build(deps): bump step-security/harden-runner from 2.10.2 to 2.10.4
+* build(deps-dev): bump typescript from 5.7.2 to 5.7.3
+* build(deps-dev): bump the babel group across 1 directory with 3 updates
+* fix(dev-env): make `wp plugin scaffold` work
+
+**Full Changelog**: https://github.com/Automattic/vip-cli/compare/3.9.6...3.10.0
+
+### 3.9.6
+
+* Adds check for AUTO_INCREMENT attribute in SQL import
+
+**Full Changelog**: https://github.com/Automattic/vip-cli/compare/3.9.5...3.9.6
+
 ### 3.9.5
 
 * fix: improve error handling and output