@automattic/vip 3.19.0 → 3.19.1

package/dist/bin/vip-app.js

@@ -43,9 +43,13 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
   await (0, _tracker.trackEvent)('app_command_success');
 
   // Clone the read-only response object so we can modify it
-  const clonedResponse = Object.assign({}, res);
+  const clonedResponse = {
+    ...res
+  };
   clonedResponse.environments = clonedResponse.environments.map(env => {
-    const clonedEnv = Object.assign({}, env);
+    const clonedEnv = {
+      ...env
+    };
     clonedEnv.name = (0, _command.getEnvIdentifier)(env);
 
     // Use the short version of git commit hash

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

@@ -103,8 +103,8 @@ function isValidMd5(md5) {
 }
 
 /**
- * @param {AppForImport} app
- * @param {EnvForImport} env
+ * @param {import('../lib/site-import/db-file-import').AppForImport} app
+ * @param {import('../lib/site-import/db-file-import').EnvForImport} env
  * @param {string} fileNameOrURL
  * @param {boolean} isUrl
  * @param {string|null} md5
@@ -367,7 +367,7 @@ const displayPlaybook = ({
     }
   }
 };
-void (0, _command.default)({
+(0, _command.default)({
   appContext: true,
   appQuery,
   envContext: true,

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

@@ -8,7 +8,6 @@
 exports.__esModule = true;
 exports.vipImportValidateFilesCmd = vipImportValidateFilesCmd;
 var _chalk = _interopRequireDefault(require("chalk"));
-var _url = _interopRequireDefault(require("url"));
 var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _config = require("../lib/media-import/config");
 var _tracker = require("../lib/tracker");
@@ -24,9 +23,7 @@ async function vipImportValidateFilesCmd(arg = []) {
    *
    * Manipulating the file path/name to extract the folder name
    */
-  const folder = arg.join(); // File comes in as an array as part of the args- turn it into a string
-  arg = _url.default.parse(folder); // Then parse the file to its URL parts
-  const filePath = arg.path; // Extract the path of the file
+  const filePath = arg.join(); // File comes in as an array as part of the args- turn it into a string
 
   if (!(await (0, _vipImportValidateFiles.isDirectory)(filePath))) {
     console.error(_chalk.default.red('✕ Error:'), 'The given path is not a directory. Provide a valid directory path.');

package/dist/bin/vip-wp.js

@@ -103,7 +103,6 @@ const bindStreamEvents = ({
     if (!isSubShell) {
       subShellRl.close();
       process.exit();
-      return;
     }
     subShellRl.resume();
     subShellRl.prompt();
@@ -131,6 +130,14 @@ const getTokenForCommand = async (appId, envId, command) => {
     }
   });
 };
+
+/**
+ * Returns the error so it can be caught by the `socket.on('error')`.
+ *
+ * @param {Error} err
+ * @returns {Error}
+ */
+const onSocketError = err => err;
 const launchCommandAndGetStreams = async ({
   socket,
   guid,
@@ -162,10 +169,7 @@ const launchCommandAndGetStreams = async ({
     socket.close();
     exit.withError(`Cancel received from server: ${message}`);
   });
-  (0, _socket2.default)(socket).on('error', err => {
-    // This returns the error so it can be catched by the socket.on('error')
-    return err;
-  });
+  (0, _socket2.default)(socket).off('error', onSocketError).on('error', onSocketError);
   socket.on('error', err => {
     if (err === 'Rate limit exceeded') {
       console.log(_chalk.default.red('\nError:'), 'Rate limit exceeded: Please wait a moment and try again.');
@@ -262,10 +266,17 @@ const bindReconnectEvents = ({
 
     // create a new input stream so that we can still catch things like SIGINT while reconnecting
     if (currentJob.stdinStream) {
-      process.stdin.unpipe(currentJob.stdinStream);
+      unpipeStreamsFromProcess({
+        stdin: currentJob.stdinStream,
+        stdout: currentJob.stdoutStream
+      });
     }
-    process.stdin.pipe(_socket2.default.createStream());
+    currentJob.stdinStream = _socket2.default.createStream();
     currentJob.stdoutStream = _socket2.default.createStream();
+    pipeStreamsToProcess({
+      stdin: currentJob.stdinStream,
+      stdout: currentJob.stdoutStream
+    });
     bindStreamEvents({
       subShellRl,
       isSubShell,

package/dist/commands/phpmyadmin.js

@@ -138,12 +138,12 @@ class PhpMyAdminCommand {
     const {
       default: open
     } = await import('open');
-    void open(url, {
+    return open(url, {
       wait: false
     });
   }
   async getStatus() {
-    return await getPhpMyAdminStatus(this.app.id, this.env.id);
+    return getPhpMyAdminStatus(this.app.id, this.env.id);
   }
   async maybeEnablePhpMyAdmin() {
     const status = await this.getStatus();

package/dist/lib/api/http.js

@@ -29,8 +29,6 @@ var _default = async (path, options = {}) => {
     url = `${_api.API_HOST}${path}`;
   }
   const authToken = await _token.default.get();
-
-  // TODO: remove this cast once the typings are fixed
   const proxyAgent = (0, _proxyAgent.createProxyAgent)(url);
   debug('running fetch', url);
   return (0, _nodeFetch.default)(url, {

package/dist/lib/cli/command.js

@@ -316,21 +316,19 @@ _args.default.argv = async function (argv, cb) {
   }
 
   // Negotiate flag values
-  switch (_opts.module) {
-    case 'import-media':
-      if ([true, 'true', 'yes'].includes(options.saveErrorLog)) {
-        options.saveErrorLog = 'true';
-      } else if ([false, 'false', 'no'].includes(options.saveErrorLog)) {
-        options.saveErrorLog = 'false';
-      } else {
-        options.saveErrorLog = 'prompt';
-      }
-      break;
+  if (_opts.module === 'import-media') {
+    if ([true, 'true', 'yes'].includes(options.saveErrorLog)) {
+      options.saveErrorLog = 'true';
+    } else if ([false, 'false', 'no'].includes(options.saveErrorLog)) {
+      options.saveErrorLog = 'false';
+    } else {
+      options.saveErrorLog = 'prompt';
+    }
   }
 
   // Prompt for confirmation if necessary
   if (_opts.requireConfirm && !options.force) {
-    /** @type {Tuple[]} */
+    /** @type {import('./format').Tuple[]} */
     const info = [];
     if (options.app) {
       info.push({

package/dist/lib/cli/config.js

@@ -2,19 +2,38 @@
 
 exports.__esModule = true;
 exports.default = void 0;
+exports.loadConfigFile = loadConfigFile;
 var _debug = _interopRequireDefault(require("debug"));
+var _nodeFs = require("node:fs");
+var _nodePath = _interopRequireDefault(require("node:path"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// I don't like using synchronous versions, but until we migrate to ESM, we have to.
+
 const debug = (0, _debug.default)('@automattic/vip:lib:cli:config');
-let configFromFile;
-try {
+function loadConfigFile() {
+  const paths = [
   // Get `local` config first; this will only exist in dev as it's npmignore-d.
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  configFromFile = require('../../../config/config.local.json');
-  debug('Loaded config data from config.local.json');
-} catch {
-  // Fall back to `publish` config file.
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  configFromFile = require('../../../config/config.publish.json');
-  debug('Loaded config data from config.publish.json');
+  _nodePath.default.join(__dirname, '../../../config/config.local.json'), _nodePath.default.join(__dirname, '../../../config/config.publish.json')];
+  for (const filePath of paths) {
+    try {
+      const data = (0, _nodeFs.readFileSync)(filePath, 'utf-8');
+      debug(`Found config file at ${filePath}`);
+      return JSON.parse(data);
+    } catch (err) {
+      if (!(err instanceof Error) || !('code' in err) || err.code !== 'ENOENT') {
+        debug(`Error reading config file at ${filePath}:`, err);
+      }
+    }
+  }
+  return null;
+}
+const configFromFile = loadConfigFile();
+if (null === configFromFile) {
+  // This should not happen because `config/config.publish.json` is always present.
+  console.error('FATAL ERROR: Could not find a valid configuration file');
+  process.exit(1);
 }
-var _default = exports.default = configFromFile;
+
+// Without this, TypeScript will export `configFromFile` as `Config | null`
+const exportedConfig = configFromFile;
+var _default = exports.default = exportedConfig;

package/dist/lib/cli/format.js

@@ -91,14 +91,10 @@ function keyValue(values) {
     value
   } of values) {
     let formattedValue;
-    switch (key.toLowerCase() // NOSONAR
-    ) {
-      case 'environment':
-        formattedValue = formatEnvironment(value);
-        break;
-      default:
-        formattedValue = value;
-        break;
+    if (key.toLowerCase() === 'environment') {
+      formattedValue = formatEnvironment(value);
+    } else {
+      formattedValue = value;
     }
     lines.push(`+ ${key}: ${formattedValue}`);
   }

package/dist/lib/config/software.js

@@ -315,7 +315,8 @@ const formatSoftwareSettings = (softwareSetting, includes, format) => {
   if (includes.includes('available_versions')) {
     result.available_versions = _optionsForVersion(softwareSetting).filter(option => !option.deprecated).map(option => option.value);
     if (format !== 'json') {
-      result.available_versions = result.available_versions.sort().join(',');
+      result.available_versions.sort((lhs, rhs) => lhs.localeCompare(rhs));
+      result.available_versions = result.available_versions.join(',');
     }
   }
   return result;

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

@@ -155,8 +155,6 @@ function preProcessInstanceData(instanceData) {
     // We need to make sure the redirect is an absolute path
     newInstanceData.mediaRedirectDomain = `https://${instanceData.mediaRedirectDomain}`;
   }
-
-  // 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';
   }
@@ -692,7 +690,6 @@ async function maybeUpdateVersion(lando, slug) {
  */
 function fetchVersionList() {
   const url = `https://${_devEnvironment.DEV_ENVIRONMENT_RAW_GITHUB_HOST}${_devEnvironment.DEV_ENVIRONMENT_WORDPRESS_VERSIONS_URI}`;
-  // TODO: remove this cast once the typings are fixed
   const proxyAgent = (0, _proxyAgent.createProxyAgent)(url);
   return (0, _nodeFetch.default)(url, {
     agent: proxyAgent ?? undefined

package/dist/lib/keychain.js

@@ -5,17 +5,18 @@ exports.default = void 0;
 var _debug = _interopRequireDefault(require("debug"));
 var _insecure = _interopRequireDefault(require("./keychain/insecure"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-let exportValue;
+let keychain;
 const debug = (0, _debug.default)('@automattic/vip:keychain');
 try {
   // Try using Secure keychain ("keytar") first
   // eslint-disable-next-line @typescript-eslint/no-var-requires
   const Secure = require('./keychain/secure');
-  exportValue = new Secure();
+  keychain = new Secure();
 } catch (error) {
   debug('Cannot use Secure keychain; falling back to Insecure keychain (Details: %o)', error);
 
   // Fallback to Insecure keychain if we can't
-  exportValue = new _insecure.default('vip-go-cli');
+  keychain = new _insecure.default('vip-go-cli');
 }
-var _default = exports.default = exportValue;
+const exportedKeychain = keychain;
+var _default = exports.default = exportedKeychain;

package/dist/lib/validations/line-by-line.js

@@ -44,7 +44,7 @@ async function fileLineValidations(appId, envId, fileName, validations, searchRe
   await new Promise(resolve => readInterface.on('close', resolve));
   readInterface.close();
   return Promise.all(validations.map(validation => {
-    if (Object.prototype.hasOwnProperty.call(validation, 'postLineExecutionProcessing') && typeof validation.postLineExecutionProcessing === 'function') {
+    if (Object.hasOwn(validation, 'postLineExecutionProcessing') && typeof validation.postLineExecutionProcessing === 'function') {
       return validation.postLineExecutionProcessing({
         fileName,
         isImport,