@automattic/vip 2.25.0 → 2.26.0

package/dist/lib/cli/command.js

@@ -12,11 +12,11 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _updateNotifier = _interopRequireDefault(require("update-notifier"));
 var _prompt = require("./prompt");
-var _api = _interopRequireDefault(require("../api"));
-var _app = _interopRequireDefault(require("../api/app"));
+var _api = _interopRequireDefault(require("../../lib/api"));
+var _app = _interopRequireDefault(require("../../lib/api/app"));
 var _format = require("./format");
 var _package = _interopRequireDefault(require("../../../package.json"));
-var _tracker = require("../tracker");
+var _tracker = require("../../lib/tracker");
 var _envAlias = require("./envAlias");
 var _rollbar = require("../rollbar");
 var exit = _interopRequireWildcard(require("./exit"));
@@ -28,7 +28,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * External dependencies
  */
-/* eslint-enable no-duplicate-imports */
+/**
+ * Internal dependencies
+ */
 function uncaughtError(err) {
   // Error raised when trying to write to an already closed stream
   if (err.code === 'EPIPE') {
@@ -45,6 +47,8 @@ process.on('uncaughtException', uncaughtError);
 process.on('unhandledRejection', uncaughtError);
 let _opts = {};
 let alreadyConfirmedDebugAttachment = false;
+
+// eslint-disable-next-line complexity
 _args.default.argv = async function (argv, cb) {
   if (process.execArgv.includes('--inspect') && !alreadyConfirmedDebugAttachment) {
     await (0, _enquirer.prompt)({
@@ -321,106 +325,112 @@ _args.default.argv = async function (argv, cb) {
     }
     switch (_opts.module) {
       case 'import-sql':
-        const site = options.env;
-        if (site && site.primaryDomain) {
-          const primaryDomainName = site.primaryDomain.name;
-          info.push({
-            key: 'Primary Domain Name',
-            value: primaryDomainName
-          });
-        }
+        {
+          const site = options.env;
+          if (site && site.primaryDomain) {
+            const primaryDomainName = site.primaryDomain.name;
+            info.push({
+              key: 'Primary Domain Name',
+              value: primaryDomainName
+            });
+          }
 
-        // Site launched details
-        const haveLaunchedField = site.hasOwnProperty('launched');
-        if (haveLaunchedField) {
-          const launched = site.launched ? '✅ Yes' : `${_chalk.default.red('x')} No`;
-          info.push({
-            key: 'Launched?',
-            value: `${_chalk.default.cyan(launched)}`
-          });
-        }
-        this.sub && info.push({
-          key: 'SQL File',
-          value: `${_chalk.default.blueBright(this.sub)}`
-        });
-        options.skipValidate = options.hasOwnProperty('skipValidate') && !!options.skipValidate && !['false', 'no'].includes(options.skipValidate);
-        if (options.skipValidate) {
-          info.push({
-            key: 'Pre-Upload Validations',
-            value: _chalk.default.red('SKIPPED!')
-          });
-        }
+          // Site launched details
+          const haveLaunchedField = Object.prototype.hasOwnProperty.call(site, 'launched');
+          if (haveLaunchedField) {
+            const launched = site.launched ? '✅ Yes' : `${_chalk.default.red('x')} No`;
+            info.push({
+              key: 'Launched?',
+              value: `${_chalk.default.cyan(launched)}`
+            });
+          }
+          if (this.sub) {
+            info.push({
+              key: 'SQL File',
+              value: `${_chalk.default.blueBright(this.sub)}`
+            });
+          }
+          options.skipValidate = Object.prototype.hasOwnProperty.call(options, 'skipValidate') && !!options.skipValidate && !['false', 'no'].includes(options.skipValidate);
+          if (options.skipValidate) {
+            info.push({
+              key: 'Pre-Upload Validations',
+              value: _chalk.default.red('SKIPPED!')
+            });
+          }
 
-        // Show S-R params if the `search-replace` flag is set
-        const searchReplace = options.searchReplace;
-        const assignSRValues = (from, to) => {
-          const pairs = {
-            From: `${from}`,
-            To: `${to}`
+          // Show S-R params if the `search-replace` flag is set
+          const searchReplace = options.searchReplace;
+          const assignSRValues = (from, to) => {
+            const pairs = {
+              From: `${from}`,
+              To: `${to}`
+            };
+            return pairs;
           };
-          return pairs;
-        };
-        if (searchReplace) {
-          const searchReplaceValues = (0, _format.formatSearchReplaceValues)(searchReplace, assignSRValues);
+          if (searchReplace) {
+            const searchReplaceValues = (0, _format.formatSearchReplaceValues)(searchReplace, assignSRValues);
 
-          // Format data into a user-friendly table
-          info.push({
-            key: 'Replacements',
-            value: '\n' + (0, _format.formatData)(searchReplaceValues, 'table')
-          });
+            // Format data into a user-friendly table
+            info.push({
+              key: 'Replacements',
+              value: '\n' + (0, _format.formatData)(searchReplaceValues, 'table')
+            });
+          }
+          break;
         }
-        break;
       case 'sync':
-        const {
-          backup,
-          canSync,
-          errors
-        } = options.env.syncPreview;
-        if (!canSync) {
-          // User can not sync due to some error(s)
-          // Shows the first error in the array
-          exit.withError(`Could not sync to this environment: ${errors[0].message}`);
-        }
-
-        // remove __typename from replacements.
-        // can not be deleted afterwards if deconstructed
-        const replacements = options.env.syncPreview.replacements.map(rep => {
+        {
           const {
-            from,
-            to
-          } = rep;
-          return {
-            from,
-            to
-          };
-        });
-        if (backup) {
+            backup,
+            canSync,
+            errors
+          } = options.env.syncPreview;
+          if (!canSync) {
+            // User can not sync due to some error(s)
+            // Shows the first error in the array
+            exit.withError(`Could not sync to this environment: ${errors[0].message}`);
+          }
+
+          // remove __typename from replacements.
+          // can not be deleted afterwards if deconstructed
+          const replacements = options.env.syncPreview.replacements.map(rep => {
+            const {
+              from,
+              to
+            } = rep;
+            return {
+              from,
+              to
+            };
+          });
+          if (backup) {
+            info.push({
+              key: 'From backup',
+              value: new Date(backup.createdAt).toUTCString()
+            });
+          }
           info.push({
-            key: 'From backup',
-            value: new Date(backup.createdAt).toUTCString()
+            key: 'Replacements',
+            value: '\n' + (0, _format.formatData)(replacements, 'table')
           });
+          break;
         }
-        info.push({
-          key: 'Replacements',
-          value: '\n' + (0, _format.formatData)(replacements, 'table')
-        });
-        break;
       case 'import-media':
         info.push({
           key: 'Archive URL',
           value: _chalk.default.blue.underline(this.sub)
         });
-        options.overwriteExistingFiles = options.hasOwnProperty('overwriteExistingFiles') && !!options.overwriteExistingFiles && !['false', 'no'].includes(options.overwriteExistingFiles);
+        options.overwriteExistingFiles = Object.prototype.hasOwnProperty.call(options, 'overwriteExistingFiles') && !!options.overwriteExistingFiles && !['false', 'no'].includes(options.overwriteExistingFiles);
         info.push({
           key: 'Overwrite any existing files',
           value: options.overwriteExistingFiles ? '✅ Yes' : `${_chalk.default.red('x')} No`
         });
-        options.importIntermediateImages = options.hasOwnProperty('importIntermediateImages') && !!options.importIntermediateImages && !['false', 'no'].includes(options.importIntermediateImages);
+        options.importIntermediateImages = Object.prototype.hasOwnProperty.call(options, 'importIntermediateImages') && !!options.importIntermediateImages && !['false', 'no'].includes(options.importIntermediateImages);
         info.push({
           key: 'Import intermediate image files',
           value: options.importIntermediateImages ? '✅ Yes' : `${_chalk.default.red('x')} No`
         });
-        options.exportFileErrorsToJson = options.hasOwnProperty('exportFileErrorsToJson') && !!options.exportFileErrorsToJson && !['false', 'no'].includes(options.exportFileErrorsToJson);
+        options.exportFileErrorsToJson = Object.prototype.hasOwnProperty.call(options, 'exportFileErrorsToJson') && !!options.exportFileErrorsToJson && !['false', 'no'].includes(options.exportFileErrorsToJson);
         info.push({
           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`

package/dist/lib/cli/envAlias.js

@@ -3,11 +3,11 @@
 /**
  * External dependencies
  */
-exports.isAlias = function (alias) {
-  return /^@[A-Za-z0-9\.\-]+$/.test(alias);
-};
-exports.parseEnvAlias = function (alias) {
-  if (!exports.isAlias(alias)) {
+function isAlias(alias) {
+  return /^@[A-Za-z0-9.-]+$/.test(alias);
+}
+function parseEnvAlias(alias) {
+  if (!isAlias(alias)) {
     throw new Error('Invalid environment alias. Aliases are in the format of @app-name or @app-name.environment-name');
   }
 
@@ -17,7 +17,7 @@ exports.parseEnvAlias = function (alias) {
   // in JS, .split() with a limit discards the extra ones, so can't use it
   // Also convert to lowercase because mixed case environment names would cause problems
   const [app, ...rest] = stripped.split('.');
-  let env = undefined;
+  let env;
 
   // Rejoin the env on '.' (if present), to handle instance names (env.instance-01)
   if (rest && rest.length) {
@@ -27,8 +27,8 @@ exports.parseEnvAlias = function (alias) {
     app,
     env
   };
-};
-exports.parseEnvAliasFromArgv = function (processArgv) {
+}
+function parseEnvAliasFromArgv(processArgv) {
   // Clone to not affect original arvg
   const argv = processArgv.slice(0);
 
@@ -39,7 +39,7 @@ exports.parseEnvAliasFromArgv = function (processArgv) {
   if (dashDashIndex > -1) {
     argsBeforeDashDash = argv.slice(0, dashDashIndex);
   }
-  const alias = argsBeforeDashDash.find(arg => exports.isAlias(arg));
+  const alias = argsBeforeDashDash.find(arg => isAlias(arg));
   if (!alias) {
     return {
       argv
@@ -47,7 +47,7 @@ exports.parseEnvAliasFromArgv = function (processArgv) {
   }
 
   // If we did have an alias, split it up into app/env
-  const parsedAlias = exports.parseEnvAlias(alias);
+  const parsedAlias = module.exports.parseEnvAlias(alias);
 
   // Splice out the alias
   argv.splice(argv.indexOf(alias), 1);
@@ -55,4 +55,9 @@ exports.parseEnvAliasFromArgv = function (processArgv) {
     argv,
     ...parsedAlias
   };
+}
+module.exports = {
+  isAlias,
+  parseEnvAlias,
+  parseEnvAliasFromArgv
 };

package/dist/lib/cli/exit.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.withError = withError;
 var _chalk = _interopRequireDefault(require("chalk"));
-var _env = _interopRequireDefault(require("../env"));
+var _env = _interopRequireDefault(require("../../lib/env"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * 

package/dist/lib/cli/format.js

@@ -9,6 +9,8 @@ exports.formatData = formatData;
 exports.formatEnvironment = formatEnvironment;
 exports.formatSearchReplaceValues = void 0;
 exports.getGlyphForStatus = getGlyphForStatus;
+exports.isJson = isJson;
+exports.isJsonObject = isJsonObject;
 exports.keyValue = keyValue;
 exports.requoteArgs = requoteArgs;
 exports.table = table;
@@ -18,22 +20,22 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * External dependencies
  */
-function formatData(data, format, opts) {
+function formatData(data, format) {
   if (!data || !data.length) {
     return '';
   }
   switch (format) {
     case 'ids':
-      return ids(data, opts);
+      return ids(data);
     case 'json':
       return JSON.stringify(data, null, '\t');
     case 'csv':
-      return csv(data, opts);
+      return csv(data);
     case 'keyValue':
-      return keyValue(data, opts);
+      return keyValue(data);
     case 'table':
     default:
-      return table(data, opts);
+      return table(data);
   }
 }
 function formatEnvironment(environment) {
@@ -85,7 +87,9 @@ function formatFields(fields) {
 function keyValue(values) {
   const lines = [];
   const pairs = values.length > 0;
-  pairs ? lines.push('===================================') : '';
+  if (pairs) {
+    lines.push('===================================');
+  }
   for (const {
     key,
     value
@@ -106,12 +110,23 @@ function requoteArgs(args) {
     if (arg.includes('--') && arg.includes('=') && arg.includes(' ')) {
       return arg.replace(/^--(.*)=(.*)$/, '--$1="$2"');
     }
-    if (arg.includes(' ')) {
+    if (arg.includes(' ') && !isJsonObject(arg)) {
       return `"${arg}"`;
     }
     return arg;
   });
 }
+function isJsonObject(str) {
+  return typeof str === 'string' && str.trim().startsWith('{') && isJson(str);
+}
+function isJson(str) {
+  try {
+    JSON.parse(str);
+  } catch (error) {
+    return false;
+  }
+  return true;
+}
 function capitalize(str) {
   if (typeof str !== 'string' || !str.length) {
     return '';

package/dist/lib/cli/progress.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ProgressTracker = void 0;
 var _singleLineLog = require("single-line-log");
-var _format = require("./format");
+var _format = require("../../lib/cli/format");
 /** @format */
 /**
  * External dependencies
@@ -105,7 +105,6 @@ class ProgressTracker {
     const nextStep = this.getNextStep();
     if (nextStep) {
       this.stepRunning(nextStep.id);
-      return;
     }
   }
   allStepsSucceeded() {

package/dist/lib/cli/prompt.js

@@ -12,15 +12,13 @@ var _format = require("./format");
 /**
  * Internal dependencies
  */
-/* eslint-disable no-duplicate-imports */
-/* eslint-enable no-duplicate-imports */
 async function confirm(values, message, skipPrompt = false) {
   console.log((0, _format.keyValue)(values));
   if (!skipPrompt) {
     const answer = await (0, _enquirer.prompt)({
       type: 'confirm',
       name: 'confirm',
-      message: message,
+      message,
       default: false
     });
     return answer.confirm;

package/dist/lib/cli/repo.js

@@ -35,7 +35,6 @@ async function getRepoFromGitConfig() {
     repo = repo.replace('git@github.com:', '');
     return repo;
   }
-  return;
 }
 async function find(dir) {
   dir = dir || process.cwd();

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

@@ -30,8 +30,8 @@ var _crypto = require("crypto");
 var _stream = require("stream");
 var _xml2js = require("xml2js");
 var _debug = _interopRequireDefault(require("debug"));
-var _http = _interopRequireDefault(require("./api/http"));
-var _fileSize = require("./constants/file-size");
+var _http = _interopRequireDefault(require("../lib/api/http"));
+var _fileSize = require("../lib/constants/file-size");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -79,22 +79,20 @@ exports.getFileMD5Hash = getFileMD5Hash;
 const gzipFile = async (uncompressedFileName, compressedFileName) => new Promise((resolve, reject) => _fs.default.createReadStream(uncompressedFileName).pipe((0, _zlib.createGzip)()).pipe(_fs.default.createWriteStream(compressedFileName)).on('finish', resolve).on('error', error => reject(`could not compress file: ${error}`)));
 exports.gzipFile = gzipFile;
 async function getFileMeta(fileName) {
-  return new Promise(async resolve => {
-    const fileSize = await getFileSize(fileName);
-    const basename = _path.default.basename(fileName);
-    // TODO Validate File basename...  encodeURIComponent, maybe...?
+  const fileSize = await getFileSize(fileName);
+  const basename = _path.default.basename(fileName);
+  // TODO Validate File basename...  encodeURIComponent, maybe...?
 
-    const mimeType = await detectCompressedMimeType(fileName);
-    // TODO Only allow a subset of Mime Types...?
+  const mimeType = await detectCompressedMimeType(fileName);
+  // TODO Only allow a subset of Mime Types...?
 
-    const isCompressed = ['application/zip', 'application/gzip'].includes(mimeType);
-    resolve({
-      basename,
-      fileName,
-      fileSize,
-      isCompressed
-    });
-  });
+  const isCompressed = ['application/zip', 'application/gzip'].includes(mimeType);
+  return {
+    basename,
+    fileName,
+    fileSize,
+    isCompressed
+  };
 }
 async function uploadImportSqlFileToS3({
   app,

package/dist/lib/config/software.js

@@ -14,11 +14,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * External dependencies
  */
-
 /**
  * Internal dependencies
  */
-
 const UPDATE_PROGRESS_POLL_INTERVAL = 5;
 const debug = (0, _debug.default)('@automattic/vip:bin:config-software');
 const appQuery = `

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

@@ -30,7 +30,7 @@ var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
 var _os = _interopRequireDefault(require("os"));
 var _dns = _interopRequireDefault(require("dns"));
-var _progress = require("../cli/progress");
+var _progress = require("../../lib/cli/progress");
 var _tracker = require("../tracker");
 var _devEnvironment = require("../constants/dev-environment");
 var _devEnvironmentCore = require("./dev-environment-core");
@@ -222,7 +222,7 @@ function processComponentOptionInput(passedParam, allowLocal) {
   // cast to string
   const param = passedParam + '';
   // This is a bit of a naive check
-  if (allowLocal && /[\\\/]/.test(param)) {
+  if (allowLocal && /[\\/]/.test(param)) {
     return {
       mode: 'local',
       dir: param
@@ -246,11 +246,13 @@ function getOptionsFromAppInfo(appInfo) {
 
 /**
  * Prompt for arguments
+ *
  * @param {InstanceOptions} preselectedOptions - options to be used without prompt
- * @param {InstanceOptions} defaultOptions - options to be used as default values for prompt
- * @param {boolean} suppressPrompts - supress prompts and use default values where needed
- * @returns {any} instance data
+ * @param {InstanceOptions} defaultOptions     - options to be used as default values for prompt
+ * @param {boolean}         suppressPrompts    - supress prompts and use default values where needed
+ * @return {any} instance data
  */
+// eslint-disable-next-line complexity
 async function promptForArguments(preselectedOptions, defaultOptions, suppressPrompts = false) {
   debug('Provided preselected', preselectedOptions, 'and default', defaultOptions);
   if (suppressPrompts) {
@@ -307,6 +309,8 @@ async function promptForArguments(preselectedOptions, defaultOptions, suppressPr
     var _preselectedOptions$c, _defaultOptions$compo;
     const option = ((_preselectedOptions$c = preselectedOptions[component]) !== null && _preselectedOptions$c !== void 0 ? _preselectedOptions$c : '').toString();
     const defaultValue = ((_defaultOptions$compo = defaultOptions[component]) !== null && _defaultOptions$compo !== void 0 ? _defaultOptions$compo : '').toString();
+
+    // eslint-disable-next-line no-await-in-loop
     const result = await processComponent(component, option, defaultValue);
     if (null === result) {
       throw new Error('processComponent() returned null');
@@ -324,6 +328,7 @@ async function promptForArguments(preselectedOptions, defaultOptions, suppressPr
       if (service in preselectedOptions) {
         instanceData[service] = preselectedOptions[service];
       } else {
+        // eslint-disable-next-line no-await-in-loop
         instanceData[service] = await promptForBoolean(`Enable ${promptLabels[service] || service}`, defaultOptions[service]);
       }
     }
@@ -355,6 +360,7 @@ async function processComponent(component, preselectedValue, defaultValue) {
       break;
     } else if (isStdinTTY) {
       console.log(_chalk.default.yellow('Warning:'), message);
+      // eslint-disable-next-line no-await-in-loop
       result = await promptForComponent(component, allowLocal, defaultObject);
     } else {
       throw new Error(message);