@automattic/vip 2.31.1-dev → 2.31.1-dev3

package/dist/lib/config/software.js

@@ -91,16 +91,16 @@ const updateSoftwareMutation = (0, _graphqlTag.default)`
 			}
 		) {
 			php {
-			...Software
+				...Software
 			}
 			wordpress {
-			...Software
+				...Software
 			}
 			muplugins {
-			...Software
+				...Software
 			}
 			nodejs {
-			...Software
+				...Software
 			}
 		}
 	}
@@ -108,9 +108,9 @@ const updateSoftwareMutation = (0, _graphqlTag.default)`
 `;
 const updateJobQuery = (0, _graphqlTag.default)`
 	query UpdateJob($appId: Int!, $envId: Int!) {
-		app(id: $appId ) {
+		app(id: $appId) {
 			environments(id: $envId) {
-				jobs (types:["upgrade_php", "upgrade_wordpress", "upgrade_muplugins", "upgrade_nodejs"]) {
+				jobs(types: ["upgrade_php", "upgrade_wordpress", "upgrade_muplugins", "upgrade_nodejs"]) {
 					type
 					completedAt
 					createdAt
@@ -126,7 +126,8 @@ const updateJobQuery = (0, _graphqlTag.default)`
 				}
 			}
 		}
-	}`;
+	}
+`;
 const COMPONENT_NAMES = {
   wordpress: 'WordPress',
   php: 'PHP',
@@ -236,9 +237,9 @@ const _processComponentVersion = (softwareSettings, component, userProvidedVersi
 const promptForUpdate = async (appTypeId, opts, softwareSettings) => {
   const component = await _processComponent(appTypeId, opts.component);
   const version = await _processComponentVersion(softwareSettings, component, opts.version);
-
+  const confirm =
   // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-  const confirm = opts.force || (await new _enquirer.Confirm({
+  opts.force || (await new _enquirer.Confirm({
     // NOSONAR
     message: `Are you sure you want to upgrade ${COMPONENT_NAMES[component]} to ${version}?`
   }).run().catch(() => {

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

@@ -30,11 +30,8 @@ const DEV_ENVIRONMENT_WORDPRESS_VERSION_TTL = 86400; // once per day
 exports.DEV_ENVIRONMENT_WORDPRESS_VERSION_TTL = DEV_ENVIRONMENT_WORDPRESS_VERSION_TTL;
 const DEV_ENVIRONMENT_PHP_VERSIONS = {
   '8.0': 'ghcr.io/automattic/vip-container-images/php-fpm:8.0',
-  // eslint-disable-next-line quote-props
-  '8.2': 'ghcr.io/automattic/vip-container-images/php-fpm:8.2',
-  // eslint-disable-next-line quote-props
-  '8.1': 'ghcr.io/automattic/vip-container-images/php-fpm:8.1',
-  // eslint-disable-next-line quote-props -- flow does not support non-string keys
-  '7.4': 'ghcr.io/automattic/vip-container-images/php-fpm:7.4'
+  8.2: 'ghcr.io/automattic/vip-container-images/php-fpm:8.2',
+  8.1: 'ghcr.io/automattic/vip-container-images/php-fpm:8.1',
+  7.4: 'ghcr.io/automattic/vip-container-images/php-fpm:7.4'
 };
 exports.DEV_ENVIRONMENT_PHP_VERSIONS = DEV_ENVIRONMENT_PHP_VERSIONS;

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

@@ -712,10 +712,10 @@ async function postStart(slug, options) {
 const launchVSCode = slug => {
   const workspacePath = (0, _devEnvironmentCore.getVSCodeWorkspacePath)(slug);
   if (_fs.default.existsSync(workspacePath)) {
-    console.log('VSCode workspace already exists, skipping creation.');
+    console.log('VS Code workspace already exists, skipping creation.');
   } else {
     (0, _devEnvironmentCore.generateVSCodeWorkspace)(slug);
-    console.log('VSCode workspace generated');
+    console.log('VS Code workspace generated');
   }
   const vsCodeExecutable = getVSCodeExecutable();
   if (vsCodeExecutable) {
@@ -723,7 +723,7 @@ const launchVSCode = slug => {
       shell: process.platform === 'win32'
     });
   } else {
-    console.log(`VSCode not detected in path, please open ${workspacePath} with VSCode`);
+    console.log(`VS Code was not detected in the expected path. VS Code Workspace file location:\n${workspacePath}`);
   }
 };
 const getVSCodeExecutable = () => {

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

@@ -43,11 +43,6 @@ var _devEnvironment = require("../constants/dev-environment");
 var _software = require("../config/software");
 var _userError = _interopRequireDefault(require("../user-error"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * 
- * @format
- */
-
 /**
  * External dependencies
  */
@@ -64,6 +59,10 @@ const nginxFileName = 'extra.conf';
 const instanceDataFileName = 'instance_data.json';
 const uploadPathString = 'uploads';
 const nginxPathString = 'nginx';
+function xdgDataDirectory() {
+  var _xdgBasedir$data;
+  return (_xdgBasedir$data = _xdgBasedir.default.data) !== null && _xdgBasedir$data !== void 0 && _xdgBasedir$data.length ? _xdgBasedir.default.data : _os.default.tmpdir();
+}
 async function startEnvironment(lando, slug, options) {
   debug('Will start an environment', slug);
   const instancePath = getEnvironmentPath(slug);
@@ -115,7 +114,7 @@ async function updateEnvironment(instanceData) {
   debug('Instance path for', slug, 'is:', instancePath);
   const alreadyExists = _fs.default.existsSync(instancePath);
   if (!alreadyExists) {
-    throw new Error('Environment doesn\'t exist.');
+    throw new Error("Environment doesn't exist.");
   }
   const preProcessedInstanceData = preProcessInstanceData(instanceData);
   debug('Will create an environment', slug, 'with instanceData: ', preProcessedInstanceData);
@@ -125,15 +124,20 @@ function preProcessInstanceData(instanceData) {
   const newInstanceData = {
     ...instanceData
   };
-  if (instanceData.mediaRedirectDomain && !instanceData.mediaRedirectDomain.match(/^http/)) {
+  if (instanceData.mediaRedirectDomain && !/^http/.exec(instanceData.mediaRedirectDomain)) {
     // We need to make sure the redirect is an absolute path
     newInstanceData.mediaRedirectDomain = `https://${instanceData.mediaRedirectDomain}`;
   }
-  newInstanceData.elasticsearch = instanceData.elasticsearch || false;
+
+  // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+  newInstanceData.elasticsearch = instanceData.elasticsearch || false; // NOSONAR
+
   newInstanceData.php = instanceData.php || _devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS[Object.keys(_devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS)[0]];
   if (newInstanceData.php.startsWith('image:')) {
     newInstanceData.php = newInstanceData.php.slice('image:'.length);
   }
+
+  // FIXME: isNaN supports only number in TypeScript, actually, because isNaN('123') returns false despite being a string
   if (isNaN(instanceData.wordpress.tag)) {
     newInstanceData.wordpress.tag = 'trunk';
   }
@@ -206,10 +210,12 @@ async function printAllEnvironmentsInfo(lando, options) {
   }
 }
 function parseComponentForInfo(component) {
+  var _component$tag;
   if (component.mode === 'local') {
-    return component.dir || '';
+    var _component$dir;
+    return (_component$dir = component.dir) !== null && _component$dir !== void 0 ? _component$dir : '';
   }
-  return component.tag || '[demo-image]';
+  return (_component$tag = component.tag) !== null && _component$tag !== void 0 ? _component$tag : '[demo-image]';
 }
 async function showLogs(lando, slug, options = {}) {
   debug('Will display logs command on env', slug, 'with options', options);
@@ -274,12 +280,14 @@ function readEnvironmentData(slug) {
   let instanceData;
   try {
     instanceDataString = _fs.default.readFileSync(instanceDataTargetPath, 'utf8');
-  } catch (err) {
+  } catch (error) {
+    const err = error;
     throw new _userError.default(`There was an error reading file "${instanceDataTargetPath}": ${err.message}.`);
   }
   try {
     instanceData = JSON.parse(instanceDataString);
-  } catch (err) {
+  } catch (error) {
+    const err = error;
     throw new _userError.default(`There was an error parsing file "${instanceDataTargetPath}": ${err.message}. You may need to recreate the environment.`);
   }
 
@@ -312,7 +320,7 @@ function readEnvironmentData(slug) {
  *
  * @param {string}       slug Env slug
  * @param {InstanceData} data instance data
- * @return {Promise} Promise
+ * @return {Promise<void>} Promise
  */
 function writeEnvironmentData(slug, data) {
   debug('Will try to write instance data for environment', slug);
@@ -340,7 +348,7 @@ async function prepareLandoEnv(instanceData, instancePath) {
   debug(`Instance data file created in ${instanceDataTargetPath}`);
 }
 function getAllEnvironmentNames() {
-  const mainEnvironmentPath = _xdgBasedir.default.data || _os.default.tmpdir();
+  const mainEnvironmentPath = xdgDataDirectory();
   const baseDir = _path.default.join(mainEnvironmentPath, 'vip', 'dev-environment');
   const doWeHaveAnyEnvironment = _fs.default.existsSync(baseDir);
   let envNames = [];
@@ -357,7 +365,7 @@ function getEnvironmentPath(name) {
   if (!name) {
     throw new Error('Name was not provided');
   }
-  const mainEnvironmentPath = _xdgBasedir.default.data || _os.default.tmpdir();
+  const mainEnvironmentPath = xdgDataDirectory();
   return _path.default.join(mainEnvironmentPath, 'vip', 'dev-environment', name + '');
 }
 async function getApplicationInformation(appId, envType) {
@@ -389,12 +397,14 @@ async function getApplicationInformation(appId, envType) {
 		}`;
   const queryResult = await (0, _app.default)(appId, fieldsQuery, _software.appQueryFragments);
   const appData = {};
-  if (queryResult) {
-    var _queryResult$reposito;
+  if (queryResult.id) {
+    var _queryResult$reposito, _queryResult$environm;
     appData.id = queryResult.id;
     appData.name = queryResult.name;
     appData.repository = (_queryResult$reposito = queryResult.repository) === null || _queryResult$reposito === void 0 ? void 0 : _queryResult$reposito.htmlUrl;
-    const environments = queryResult.environments || [];
+
+    // FIXME: This is casted as AppEnvironment[] but pedantically, Parker's schema made it so that the array may contain nullable. Code-wise though, that doesn't actually happen.
+    const environments = (_queryResult$environm = queryResult.environments) !== null && _queryResult$environm !== void 0 ? _queryResult$environm : [];
     let envData;
     if (envType) {
       envData = environments.find(candidateEnv => candidateEnv.type === envType);
@@ -413,15 +423,15 @@ async function getApplicationInformation(appId, envType) {
       envData = environments.find(candidateEnv => candidateEnv.type === env);
     }
     if (envData) {
-      var _envData$primaryDomai, _envData$softwareSett, _envData$softwareSett2, _envData$softwareSett3, _envData$softwareSett4, _envData$softwareSett5, _envData$softwareSett6;
+      var _envData$primaryDomai, _envData$primaryDomai2, _envData$softwareSett, _envData$softwareSett2, _envData$softwareSett3, _envData$softwareSett4, _envData$softwareSett5, _envData$softwareSett6;
       appData.environment = {
         name: envData.name,
         branch: envData.branch,
         type: envData.type,
         isMultisite: envData.isMultisite,
-        primaryDomain: ((_envData$primaryDomai = envData.primaryDomain) === null || _envData$primaryDomai === void 0 ? void 0 : _envData$primaryDomai.name) || '',
-        php: ((_envData$softwareSett = envData.softwareSettings) === null || _envData$softwareSett === void 0 ? void 0 : (_envData$softwareSett2 = _envData$softwareSett.php) === null || _envData$softwareSett2 === void 0 ? void 0 : (_envData$softwareSett3 = _envData$softwareSett2.current) === null || _envData$softwareSett3 === void 0 ? void 0 : _envData$softwareSett3.version) || '',
-        wordpress: ((_envData$softwareSett4 = envData.softwareSettings) === null || _envData$softwareSett4 === void 0 ? void 0 : (_envData$softwareSett5 = _envData$softwareSett4.wordpress) === null || _envData$softwareSett5 === void 0 ? void 0 : (_envData$softwareSett6 = _envData$softwareSett5.current) === null || _envData$softwareSett6 === void 0 ? void 0 : _envData$softwareSett6.version) || ''
+        primaryDomain: (_envData$primaryDomai = (_envData$primaryDomai2 = envData.primaryDomain) === null || _envData$primaryDomai2 === void 0 ? void 0 : _envData$primaryDomai2.name) !== null && _envData$primaryDomai !== void 0 ? _envData$primaryDomai : '',
+        php: (_envData$softwareSett = (_envData$softwareSett2 = envData.softwareSettings) === null || _envData$softwareSett2 === void 0 ? void 0 : (_envData$softwareSett3 = _envData$softwareSett2.php) === null || _envData$softwareSett3 === void 0 ? void 0 : _envData$softwareSett3.current.version) !== null && _envData$softwareSett !== void 0 ? _envData$softwareSett : '',
+        wordpress: (_envData$softwareSett4 = (_envData$softwareSett5 = envData.softwareSettings) === null || _envData$softwareSett5 === void 0 ? void 0 : (_envData$softwareSett6 = _envData$softwareSett5.wordpress) === null || _envData$softwareSett6 === void 0 ? void 0 : _envData$softwareSett6.current.version) !== null && _envData$softwareSett4 !== void 0 ? _envData$softwareSett4 : ''
       };
     }
   }
@@ -439,7 +449,7 @@ async function resolveImportPath(slug, fileName, searchReplace, inPlace) {
   }
 
   // Run Search and Replace if the --search-replace flag was provided
-  if (searchReplace && searchReplace.length) {
+  if (searchReplace !== null && searchReplace !== void 0 && searchReplace.length) {
     const {
       outputFileName
     } = await (0, _searchAndReplace.searchAndReplace)(resolvedPath, searchReplace, {
@@ -464,7 +474,7 @@ async function importMediaPath(slug, filePath) {
     throw new Error(_devEnvironment.DEV_ENVIRONMENT_NOT_FOUND);
   }
   const files = _fs.default.readdirSync(resolvedPath);
-  if (files.indexOf(uploadPathString) > -1) {
+  if (files.includes(uploadPathString)) {
     const confirm = await (0, _enquirer.prompt)({
       type: 'confirm',
       name: 'continue',
@@ -506,13 +516,14 @@ async function updateWordPressImage(slug) {
     if (currentWordPressTag === 'trunk') {
       return false;
     }
-  } catch (error) {
+  } catch (err) {
+    const error = err;
     // This can throw an exception if the env is build with older vip version
     if ('ENOENT' === error.code) {
       message = 'Environment was created before update was supported.\n\n';
       message += 'To update environment please destroy it and create a new one.';
     } else {
-      message = `An error prevented reading the configuration of: ${slug}\n\n ${error}`;
+      message = `An error prevented reading the configuration of: ${slug}\n\n ${error.message}`;
     }
     await (0, _devEnvironmentCli.handleCLIException)(new Error(message));
     return false;
@@ -520,15 +531,14 @@ async function updateWordPressImage(slug) {
 
   // sort
   versions.sort((before, after) => before.tag < after.tag ? 1 : -1);
-
   // Newest WordPress Image but that is not trunk
   const newestWordPressImage = versions.find(({
     tag
   }) => tag !== 'trunk');
-  console.log('The most recent WordPress version available is: ' + _chalk.default.green(newestWordPressImage.tag));
+  console.log('The most recent WordPress version available is: ' + _chalk.default.green(newestWordPressImage === null || newestWordPressImage === void 0 ? void 0 : newestWordPressImage.tag));
 
   // If the currently used version is the most up to date: exit.
-  if (currentWordPressTag === newestWordPressImage.tag) {
+  if (currentWordPressTag === (newestWordPressImage === null || newestWordPressImage === void 0 ? void 0 : newestWordPressImage.tag)) {
     console.log('Environment WordPress version is: ' + _chalk.default.green(currentWordPressTag) + '  ... 😎 nice! ');
     return false;
   }
@@ -559,6 +569,7 @@ async function updateWordPressImage(slug) {
 
   // If the user takes the new WP version path
   if (confirm.upgrade === 'yes') {
+    var _version$tag;
     console.log('Upgrading from: ' + _chalk.default.yellow(currentWordPressTag) + ' to:');
 
     // Select a new image
@@ -568,15 +579,17 @@ async function updateWordPressImage(slug) {
     }) => tag.trim() === choice.tag.trim());
 
     // Write new data and stage for rebuild
-    envData.wordpress.tag = version.tag;
-    envData.wordpress.ref = version.ref;
+    // FIXME: version?.tag is possibly null. Should we throw if we can't find a version somehow?
+    envData.wordpress.tag = (_version$tag = version === null || version === void 0 ? void 0 : version.tag) !== null && _version$tag !== void 0 ? _version$tag : '';
+    envData.wordpress.ref = version === null || version === void 0 ? void 0 : version.ref;
     await updateEnvironment(envData);
     return true;
   }
   if (confirm.upgrade === "no (don't ask anymore)") {
+    const updateCommand = `vip dev-env update --slug=${slug}`;
     envData.wordpress.doNotUpgrade = true;
     console.log("We won't ask about upgrading this environment anymore.");
-    console.log('To manually upgrade please run:' + `${_chalk.default.yellow(`vip dev-env update --slug=${slug}`)}`);
+    console.log(`To manually upgrade please run: ${_chalk.default.yellow(updateCommand)}`);
     await updateEnvironment(envData);
   }
   return false;
@@ -603,7 +616,7 @@ async function isVersionListExpired(cacheFile, ttl) {
       mtime: expire
     } = await _fs.default.promises.stat(cacheFile);
     expire.setSeconds(expire.getSeconds() + ttl);
-    return +new Date() > expire;
+    return +new Date() > +expire;
   } catch (err) {
     return true;
   }
@@ -614,7 +627,7 @@ async function isVersionListExpired(cacheFile, ttl) {
  */
 async function getVersionList() {
   let res;
-  const mainEnvironmentPath = _xdgBasedir.default.data || _os.default.tmpdir();
+  const mainEnvironmentPath = xdgDataDirectory();
   const cacheFilePath = _path.default.join(mainEnvironmentPath, 'vip');
   const cacheFile = _path.default.join(cacheFilePath, _devEnvironment.DEV_ENVIRONMENT_WORDPRESS_CACHE_KEY);
   // Handle from cache
@@ -660,8 +673,7 @@ async function getVersionList() {
  * @return {string} Workspace path
  */
 function generateVSCodeWorkspace(slug) {
-  var _instanceData$muPlugi, _instanceData$appCode;
-  debug('Generating VSCode Workspace');
+  debug('Generating VS Code Workspace');
   const location = getEnvironmentPath(slug);
   const workspacePath = getVSCodeWorkspacePath(slug);
   const instanceData = readEnvironmentData(slug);
@@ -669,12 +681,12 @@ function generateVSCodeWorkspace(slug) {
   const folders = [{
     path: location
   }];
-  if ((_instanceData$muPlugi = instanceData.muPlugins) !== null && _instanceData$muPlugi !== void 0 && _instanceData$muPlugi.dir) {
+  if (instanceData.muPlugins.dir) {
     folders.push({
       path: instanceData.muPlugins.dir
     });
   }
-  if ((_instanceData$appCode = instanceData.appCode) !== null && _instanceData$appCode !== void 0 && _instanceData$appCode.dir) {
+  if (instanceData.appCode.dir) {
     folders.push({
       path: instanceData.appCode.dir
     });
@@ -696,12 +708,11 @@ function generateVSCodeWorkspace(slug) {
   return workspacePath;
 }
 const generatePathMappings = (location, instanceData) => {
-  var _instanceData$muPlugi2, _instanceData$appCode2;
   const pathMappings = {};
-  if ((_instanceData$muPlugi2 = instanceData.muPlugins) !== null && _instanceData$muPlugi2 !== void 0 && _instanceData$muPlugi2.dir) {
+  if (instanceData.muPlugins.dir) {
     pathMappings['/wp/wp-content/mu-plugins'] = instanceData.muPlugins.dir;
   }
-  if ((_instanceData$appCode2 = instanceData.appCode) !== null && _instanceData$appCode2 !== void 0 && _instanceData$appCode2.dir) {
+  if (instanceData.appCode.dir) {
     pathMappings['/wp/wp-content/client-mu-plugins'] = _path.default.resolve(instanceData.appCode.dir, 'client-mu-plugins');
     pathMappings['/wp/wp-content/images'] = _path.default.resolve(instanceData.appCode.dir, 'images');
     pathMappings['/wp/wp-content/languages'] = _path.default.resolve(instanceData.appCode.dir, 'languages');

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

@@ -470,7 +470,9 @@ async function landoShell(lando, instancePath, service, user, command) {
 async function removeDevToolsVolumes(lando, app) {
   debug('Attempting to removing dev-tools volumes');
   const scanResult = await lando.engine.docker.listVolumes();
-  const devToolsVolumeNames = ((scanResult === null || scanResult === void 0 ? void 0 : scanResult.Volumes) || []).map(volume => volume.Name).filter(volumeName => new RegExp(`${app.project}.*devtools`).test(volumeName));
+  const devToolsVolumeNames = ((scanResult === null || scanResult === void 0 ? void 0 : scanResult.Volumes) || []).map(volume => volume.Name)
+  // eslint-disable-next-line security/detect-non-literal-regexp
+  .filter(volumeName => new RegExp(`${app.project}.*devtools`).test(volumeName));
   debug('Will remove', devToolsVolumeNames);
   const removalPromises = devToolsVolumeNames.map(volumeName => removeVolume(lando, volumeName));
   await Promise.all(removalPromises);

package/dist/lib/envvar/api-delete.js

@@ -16,18 +16,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 
 const mutation = (0, _graphqlTag.default)`
-	mutation DeleteEnvironmentVariable(
-		$appId: Int!
-		$envId: Int!
-		$name: String!
-	) {
+	mutation DeleteEnvironmentVariable($appId: Int!, $envId: Int!, $name: String!) {
 		deleteEnvironmentVariable(
-			input: {
-				applicationId: $appId
-				environmentId: $envId
-				name: $name
-				value: ""
-			}
+			input: { applicationId: $appId, environmentId: $envId, name: $name, value: "" }
 		) {
 			environmentVariables {
 				total

package/dist/lib/envvar/api-get-all.js

@@ -16,17 +16,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 
 const query = (0, _graphqlTag.default)`
-	query GetEnvironmentVariablesWithValues(
-		$appId: Int!
-		$envId: Int!
-	) {
-		app(
-			id: $appId
-		) {
+	query GetEnvironmentVariablesWithValues($appId: Int!, $envId: Int!) {
+		app(id: $appId) {
 			id
-			environments(
-				id: $envId
-			) {
+			environments(id: $envId) {
 				id
 				environmentVariables {
 					total

package/dist/lib/envvar/api-list.js

@@ -16,17 +16,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 
 const query = (0, _graphqlTag.default)`
-	query GetEnvironmentVariables(
-		$appId: Int!
-		$envId: Int!
-	) {
-		app(
-			id: $appId
-		) {
+	query GetEnvironmentVariables($appId: Int!, $envId: Int!) {
+		app(id: $appId) {
 			id
-			environments(
-				id: $envId
-			) {
+			environments(id: $envId) {
 				id
 				environmentVariables {
 					total

package/dist/lib/envvar/api-set.js

@@ -16,19 +16,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 
 const mutation = (0, _graphqlTag.default)`
-	mutation AddEnvironmentVariable(
-		$appId: Int!
-		$envId: Int!
-		$name: String!
-		$value: String!
-	) {
+	mutation AddEnvironmentVariable($appId: Int!, $envId: Int!, $name: String!, $value: String!) {
 		addEnvironmentVariable(
-			input: {
-				applicationId: $appId
-				environmentId: $envId
-				name: $name
-				value: $value
-			}
+			input: { applicationId: $appId, environmentId: $envId, name: $name, value: $value }
 		) {
 			environmentVariables {
 				total

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

@@ -35,31 +35,31 @@ const IMPORT_MEDIA_PROGRESS_POLL_INTERVAL = 1000;
 const ONE_MINUTE_IN_MILLISECONDS = 1000 * 60;
 const TWO_MINUTES_IN_MILLISECONDS = 2 * ONE_MINUTE_IN_MILLISECONDS;
 const IMPORT_MEDIA_PROGRESS_QUERY = (0, _graphqlTag.default)`
-	query App( $appId: Int, $envId: Int ) {
-		app( id: $appId ) {
-			environments( id: $envId ) {
-			id
-			name
-			type
-			repo
-			mediaImportStatus {
-				importId
-				siteId
-				status
-				filesTotal
-				filesProcessed
-				failureDetails {
-					previousStatus
-					globalErrors
-					fileErrors {
+	query App($appId: Int, $envId: Int) {
+		app(id: $appId) {
+			environments(id: $envId) {
+				id
+				name
+				type
+				repo
+				mediaImportStatus {
+					importId
+					siteId
+					status
+					filesTotal
+					filesProcessed
+					failureDetails {
+						previousStatus
+						globalErrors
+						fileErrors {
 							fileName
 							errors
+						}
 					}
 				}
 			}
 		}
 	}
-}
 `;
 async function getStatus(api, appId, envId) {
   const response = await api.query({

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

@@ -75,7 +75,7 @@ const siteTypeValidations = {
         await track('import_sql_command_error', {
           error_type: 'multisite-import-where-primary-domain-unmapped'
         });
-        throw new Error('This import would set the network\'s main site domain to ' + primaryDomainFromSQL + ', however this domain is not mapped to the target environment. Please replace this domain in your ' + 'import file, or map it to the environment.');
+        throw new Error("This import would set the network's main site domain to " + primaryDomainFromSQL + ', however this domain is not mapped to the target environment. Please replace this domain in your ' + 'import file, or map it to the environment.');
       }
     }
   }

package/dist/lib/validations/sql.js

@@ -161,6 +161,7 @@ const checks = {
   },
   trigger: {
     // Match `CREATE (DEFINER=`root`@`host`) TRIGGER`
+    // eslint-disable-next-line security/detect-unsafe-regex
     matcher: /^CREATE (\(?DEFINER=`?(\w*)(`@`)?(\w*\.*%?)*`?\)?)?(| )TRIGGER/i,
     matchHandler: lineNumber => ({
       lineNumber
@@ -283,7 +284,7 @@ const checks = {
     results: [],
     message: 'Siteurl/home options not pointing to lando domain',
     excerpt: 'Siteurl/home options not pointing to lando domain',
-    recommendation: 'Use search-replace to change environment\'s domain'
+    recommendation: "Use search-replace to change environment's domain"
   },
   engineInnoDB: {
     matcher: / ENGINE=(?!(InnoDB))/i,

package/dist/lib/vip-import-validate-files.js

@@ -419,6 +419,7 @@ const isFileSanitized = file => {
  */
 exports.isFileSanitized = isFileSanitized;
 const identifyIntermediateImage = filename => {
+  // eslint-disable-next-line security/detect-unsafe-regex
   const regex = /([_-])?(\d+x\d+)(@\d+\w)?(\.\w{3,4})$/;
   return filename.match(regex); // NOSONAR
 };

package/helpers/check-version.js

@@ -4,10 +4,12 @@ const { name, engines } = require( '../package.json' );
 const version = engines.node;
 
 if ( ! semver.satisfies( process.version, version ) ) {
-	console.log( [
-		`The current version of Node (${ process.version }) does not meet the minimum requirements;`,
-		`${ name } requires Node version ${ version }.`,
-		'Please follow the installation instructions at https://nodejs.org/en/download/ to upgrade before continuing.`',
-	].join( ' ' ) );
+	console.log(
+		[
+			`The current version of Node (${ process.version }) does not meet the minimum requirements;`,
+			`${ name } requires Node version ${ version }.`,
+			'Please follow the installation instructions at https://nodejs.org/en/download/ to upgrade before continuing.`',
+		].join( ' ' )
+	);
 	process.exit( 1 );
 }