@automattic/vip 3.22.5 → 3.23.0

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

@@ -138,6 +138,8 @@ services:
 <% if ( phpmyadmin ) { %>
   phpmyadmin:
     type: compose
+    ssl: true
+    sslExpose: false
     services:
       image: phpmyadmin:5
       command: /docker-entrypoint.sh apache2-foreground
@@ -248,6 +250,8 @@ services:
 
 <% if ( mailpit ) { %>
   mailpit:
+    ssl: true
+    sslExpose: false
     type: compose
     services:
       image: axllent/mailpit:latest

package/dist/bin/vip-import-media-abort.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 "use strict";
 
+var _core = require("@apollo/client/core");
 var _chalk = _interopRequireDefault(require("chalk"));
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _api = _interopRequireDefault(require("../lib/api"));
@@ -12,8 +13,6 @@ var _status = require("../lib/media-import/status");
 var _tracker = require("../lib/tracker");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-// eslint-disable-next-line no-duplicate-imports
-
 const usage = 'vip import media abort';
 const appQuery = `
 	id,
@@ -98,8 +97,8 @@ Aborting this media import.
       progressTracker
     });
   } catch (error) {
-    if (error.graphQLErrors) {
-      for (const err of error.graphQLErrors) {
+    if (_core.CombinedGraphQLErrors.is(error)) {
+      for (const err of error.errors) {
         console.log(_chalk.default.red('Error:'), err.message);
       }
       return;

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

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 "use strict";
 
+var _core = require("@apollo/client/core");
 var _chalk = _interopRequireDefault(require("chalk"));
 var _debug = _interopRequireDefault(require("debug"));
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
@@ -13,8 +14,6 @@ var _status = require("../lib/media-import/status");
 var _utils = require("../lib/media-import/utils");
 var _tracker = require("../lib/tracker");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-// eslint-disable-next-line no-duplicate-imports
-
 const API_VERSION = 'v2';
 const appQuery = `
 	id,
@@ -197,8 +196,8 @@ Importing Media into your App...
       saveErrorLog
     });
   } catch (error) {
-    if (error.graphQLErrors) {
-      for (const err of error.graphQLErrors) {
+    if (_core.CombinedGraphQLErrors.is(error)) {
+      for (const err of error.errors) {
         console.log(_chalk.default.red('Error:'), err.message);
       }
       return;

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

@@ -2,6 +2,7 @@
 "use strict";
 
 exports.__esModule = true;
+exports.confirmSkipBackup = void 0;
 exports.gates = gates;
 exports.parseHeaders = parseHeaders;
 exports.promptToContinue = void 0;
@@ -309,9 +310,69 @@ const promptToContinue = async ({
 };
 
 /**
- * @returns {Promise<string[]>}
+ * Show a huge warning and prompt the user to confirm twice when skipping backup
+ *
+ * @param {Function} track - Tracking function
+ * @returns {Promise<boolean>} True if user confirmed both times, false otherwise
  */
 exports.promptToContinue = promptToContinue;
+const confirmSkipBackup = async track => {
+  console.log(_chalk.default.bold.red('⚠️ WARNING ⚠️'));
+  console.log(_chalk.default.red(_chalk.default.bold.red('YOU ARE ABOUT TO SKIP CREATING A BACKUP BEFORE IMPORTING SQL!\n')));
+  console.log(_chalk.default.bold.yellow('This action is EXTREMELY DANGEROUS and can result in:'));
+  console.log(_chalk.default.bold.yellow('• Permanent data loss'));
+  console.log(_chalk.default.bold.yellow('• Inability to automatically restore your database'));
+  console.log(_chalk.default.bold.yellow('• Complete site failure'));
+  console.log(_chalk.default.bold.red('There is NO way to undo this action once the import begins!\n'));
+  const importAbortedMsg = _chalk.default.red('✗ Import aborted.');
+  try {
+    // First confirmation: y/n prompt
+    const firstConfirm = await (0, _enquirer.prompt)({
+      type: 'confirm',
+      name: 'firstConfirm',
+      message: 'Are you absolutely certain you want to skip the backup?'
+    }).catch(() => {
+      return {
+        firstConfirm: false
+      };
+    });
+    if (!firstConfirm.firstConfirm) {
+      await track('import_sql_skip_backup_cancelled');
+      console.log(importAbortedMsg);
+      return false;
+    }
+
+    // Second confirmation: requires typing "yes"
+    const secondConfirm = await (0, _enquirer.prompt)({
+      type: 'input',
+      name: 'secondConfirm',
+      message: `Type '${_chalk.default.yellow('yes')}' (without quotes) to proceed WITHOUT creating a backup (this cannot be undone):\n`
+    }).catch(() => {
+      return {
+        secondConfirm: ''
+      };
+    });
+    if (secondConfirm.secondConfirm?.toLowerCase() !== 'yes') {
+      await track('import_sql_skip_backup_cancelled');
+      console.error('Failed to confirm!');
+      console.log(importAbortedMsg);
+      return false;
+    }
+  } catch (error) {
+    await track('import_sql_skip_backup_cancelled');
+    console.log(importAbortedMsg);
+    console.error(error);
+    return false;
+  }
+  await track('import_sql_skip_backup_confirmed');
+  console.log(_chalk.default.red('⚠️ Backup will be skipped. Proceeding with import...'));
+  return true;
+};
+
+/**
+ * @returns {Promise<string[]>}
+ */
+exports.confirmSkipBackup = confirmSkipBackup;
 async function validateAndGetTableNames({
   skipValidate,
   appId,
@@ -359,7 +420,6 @@ const displayPlaybook = ({
   }
   let siteArray = [];
   if (isMultiSite) {
-    // eslint-disable-next-line no-multi-spaces
     console.log(`  multisite: ${isMultiSite.toString()}`);
     const selectedEnvironmentObj = app?.environments?.find(env => unformattedEnvironment === env.type);
     siteArray = selectedEnvironmentObj?.wpSitesSDS?.nodes;
@@ -414,7 +474,7 @@ const displayPlaybook = ({
   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 a local or remote SQL database file and replace it with a new string. Separate the values by a comma only; no spaces (e.g. --search-replace="from,to"). Can be passed more than once.').option('in-place', 'Overwrite a local SQL database file with the results of a search and replace operation prior to import.').option('output', 'Save the results of a --search-replace operation that is run against a local SQL database file to a copy of that file. Accepts a local file path. Ignored when used with the --in-place option.').option('skip-maintenance-mode', 'Prevent an unlaunched environment from going into maintenance mode during the import of a local or remote SQL database file. Skipping maintenance mode can cause site instability during import.').option('md5', 'Verify the integrity of a remote SQL database file. Accepts an MD5 hash value.').option('header', 'Pass a header name and value (Formatted as "Name: Value") in a request for a remote SQL database file. Can be passed more than once for multiple headers and values.').examples(examples)
+}).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 a local or remote SQL database file and replace it with a new string. Separate the values by a comma only; no spaces (e.g. --search-replace="from,to"). Can be passed more than once.').option('in-place', 'Overwrite a local SQL database file with the results of a search and replace operation prior to import.').option('output', 'Save the results of a --search-replace operation that is run against a local SQL database file to a copy of that file. Accepts a local file path. Ignored when used with the --in-place option.').option('skip-maintenance-mode', 'Prevent an unlaunched environment from going into maintenance mode during the import of a local or remote SQL database file. Skipping maintenance mode can cause site instability during import.').option('md5', 'Verify the integrity of a remote SQL database file. Accepts an MD5 hash value.').option('header', 'Pass a header name and value (Formatted as "Name: Value") in a request for a remote SQL database file. Can be passed more than once for multiple headers and values.').option(['B', 'skip-backup'], 'Skip creating a backup before importing the SQL file. WARNING: This is extremely dangerous and can result in permanent data loss.').examples(examples)
 // eslint-disable-next-line complexity
 .argv(process.argv, async (arg, opts) => {
   const {
@@ -426,7 +486,8 @@ const displayPlaybook = ({
     searchReplace,
     skipMaintenanceMode,
     md5,
-    header
+    header,
+    skipBackup
   } = opts;
   const {
     id: envId,
@@ -499,6 +560,12 @@ const displayPlaybook = ({
     isMultiSite,
     tableNames
   });
+  if (skipBackup) {
+    const confirmed = await confirmSkipBackup(track);
+    if (!confirmed) {
+      process.exit(0);
+    }
+  }
   if (!isUrl && 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) {
@@ -565,7 +632,10 @@ Processing the SQL import for your environment...
     input: {
       id: app.id,
       environmentId: env.id,
-      skipMaintenanceMode
+      skipMaintenanceMode,
+      ...(skipBackup && {
+        skipBackup: true
+      })
     }
   };
   if (isUrl) {

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

@@ -131,7 +131,6 @@ async function vipImportValidateFilesCmd(arg = []) {
 
   // Tracks events to track activity
   // Props (object keys) need to be in Snake case vs. camelCase
-  /* eslint-disable camelcase */
   const allErrors = {
     folder_errors_length: folderValidation.length,
     int_images_errors_length: intermediateImagesTotal,
@@ -140,8 +139,6 @@ async function vipImportValidateFilesCmd(arg = []) {
     total_files: files.length,
     total_folders: nestedDirectories.length
   };
-  /* eslint-enable camelcase */
-
   await (0, _tracker.trackEvent)('import_validate_files_command_success', allErrors);
 }
 const usage = 'vip import validate-files';

package/dist/bin/vip-logs.js

@@ -67,8 +67,6 @@ async function followLogs(opt) {
 
   // Set an initial default delay
   let delay = DEFAULT_POLLING_DELAY_IN_SECONDS;
-
-  // eslint-disable-next-line no-constant-condition
   while (true) {
     const limit = isFirstRequest ? opt.limit : LIMIT_MAX;
     requestNumber++;

package/dist/bin/vip-slowlogs.js

@@ -58,8 +58,6 @@ async function followLogs(opt) {
 
   // Set an initial default delay
   let delay = DEFAULT_POLLING_DELAY_IN_SECONDS;
-
-  // eslint-disable-next-line no-constant-condition, @typescript-eslint/no-unnecessary-condition
   while (true) {
     const limit = isFirstRequest ? opt.limit : LIMIT_MAX;
     requestNumber++;

package/dist/bin/vip-sync.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 "use strict";
 
+var _core = require("@apollo/client/core");
 var _singleLineLog = require("@wwa/single-line-log");
 var _chalk = _interopRequireDefault(require("chalk"));
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
@@ -44,9 +45,9 @@ const appQuery = `id,name,environments{
       }
     });
   } catch (error) {
-    if (error.graphQLErrors) {
+    if (_core.CombinedGraphQLErrors.is(error)) {
       let bail = false;
-      for (const err of error.graphQLErrors) {
+      for (const err of error.errors) {
         if (err.message !== 'Site is already syncing') {
           bail = true;
           console.log(_chalk.default.red('Error:'), err.message);

package/dist/bin/vip-wp.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 "use strict";
 
+var _core = require("@apollo/client/core");
 var _chalk = _interopRequireDefault(require("chalk"));
 var _debug = _interopRequireDefault(require("debug"));
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
@@ -331,8 +332,6 @@ const examples = [{
   if ((0, _app.isAppNodejs)(appTypeId)) {
     exit.withError('WP-CLI commands are not supported on Node.js environments.');
   }
-
-  /* eslint-disable camelcase */
   const commonTrackingParams = {
     command: commandForAnalytics,
     app_id: appId,
@@ -340,8 +339,6 @@ const examples = [{
     org_id: orgId,
     method: isSubShell ? 'subshell' : 'shell'
   };
-  /* eslint-enable camelcase */
-
   (0, _tracker.trackEvent)('wpcli_command_execute', commonTrackingParams).catch(() => {});
   if (isSubShell) {
     // Reset the cursor (can get messed up with enquirer)
@@ -441,10 +438,10 @@ const examples = [{
       result = await getTokenForCommand(appId, envId, wpCliCmd);
     } catch (error) {
       // If this was a GraphQL error, print that to the message to the line
-      if (error.graphQLErrors) {
-        error.graphQLErrors.forEach(err => {
+      if (_core.CombinedGraphQLErrors.is(error)) {
+        for (const err of error.errors) {
           console.log(_chalk.default.red('Error:'), err.message);
-        });
+        }
       } else {
         // Else, other type of error, just dump it
         console.log(error);

package/dist/commands/backup-db.js

@@ -53,12 +53,7 @@ async function getBackupJob(appId, envId) {
     },
     fetchPolicy: 'network-only'
   });
-  const {
-    data: {
-      app
-    }
-  } = response;
-  return app?.environments?.[0]?.jobs?.[0];
+  return response.data?.app?.environments?.[0]?.jobs?.[0] ?? undefined;
 }
 async function createBackupJob(appId, envId) {
   // Disable global error handling so that we can handle errors ourselves

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

@@ -214,7 +214,7 @@ class DevEnvSyncSQLCommand {
     do {
       // eslint-disable-next-line no-await-in-loop
       const res = await this.fetchSitesPage(api, appId, environmentId, after);
-      if (res.data.app?.environments?.[0]?.wpSitesSDS?.nodes) {
+      if (res.data?.app?.environments?.[0]?.wpSitesSDS?.nodes) {
         const wpSitesSDS = res.data.app.environments[0].wpSitesSDS;
         allSites.push(...res.data.app.environments[0].wpSitesSDS.nodes.filter(node => Boolean(node)));
         after = wpSitesSDS.nextCursor;

package/dist/commands/export-sql.js

@@ -97,10 +97,11 @@ async function fetchLatestBackupAndJobStatusBase(appId, envId) {
     },
     fetchPolicy: 'network-only'
   });
-  const environments = response.data.app?.environments;
-  const envSqlDumpTool = environments?.[0]?.backupsSqlDumpTool;
-  const latestBackup = environments?.[0]?.latestBackup;
-  const jobs = environments?.[0]?.jobs || [];
+  const environments = response.data?.app?.environments;
+  const firstEnvironment = environments?.[0];
+  const envSqlDumpTool = firstEnvironment?.backupsSqlDumpTool;
+  const latestBackup = firstEnvironment?.latestBackup ?? undefined;
+  const jobs = firstEnvironment?.jobs || [];
   return {
     latestBackup,
     jobs,
@@ -141,7 +142,7 @@ async function generateDownloadLink(appId, envId, backupId) {
       }
     }
   });
-  return response.data?.generateDBBackupCopyUrl?.url;
+  return response.data?.generateDBBackupCopyUrl?.url ?? '';
 }
 
 /**

package/dist/commands/phpmyadmin.js

@@ -48,7 +48,6 @@ async function generatePhpMyAdminAccess(envId) {
   // Disable global error handling so that we can handle errors ourselves
   (0, _api.disableGlobalGraphQLErrorHandling)();
   const api = (0, _api.default)();
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const resp = await api.mutate({
     mutation: GENERATE_PHP_MY_ADMIN_URL_MUTATION,
     variables: {
@@ -60,16 +59,13 @@ async function generatePhpMyAdminAccess(envId) {
 
   // Re-enable global error handling
   (0, _api.enableGlobalGraphQLErrorHandling)();
-
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-  return resp?.data?.generatePHPMyAdminAccess?.url;
+  return resp.data?.generatePHPMyAdminAccess?.url ?? '';
 }
 async function enablePhpMyAdmin(envId) {
   // Disable global error handling so that we can handle errors ourselves
   (0, _api.disableGlobalGraphQLErrorHandling)();
   const api = (0, _api.default)();
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const resp = await api.mutate({
+  await api.mutate({
     mutation: ENABLE_PHP_MY_ADMIN_MUTATION,
     variables: {
       input: {
@@ -80,16 +76,11 @@ async function enablePhpMyAdmin(envId) {
 
   // Re-enable global error handling
   (0, _api.enableGlobalGraphQLErrorHandling)();
-
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-  return resp?.data?.generatePHPMyAdminAccess?.url;
 }
 async function getPhpMyAdminStatus(appId, envId) {
   // Disable global error handling so that we can handle errors ourselves
   (0, _api.disableGlobalGraphQLErrorHandling)();
   const api = (0, _api.default)();
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const resp = await api.query({
     query: GET_PHP_MY_ADMIN_STATUS_QUERY,
     variables: {
@@ -101,9 +92,7 @@ async function getPhpMyAdminStatus(appId, envId) {
 
   // Re-enable global error handling
   (0, _api.enableGlobalGraphQLErrorHandling)();
-
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-  return resp?.data?.app?.environments?.[0]?.phpMyAdminStatus?.status;
+  return resp.data?.app?.environments?.[0]?.phpMyAdminStatus?.status ?? '';
 }
 class PhpMyAdminCommand {
   silent;

package/dist/commands/wp-ssh.js

@@ -209,10 +209,8 @@ class WPCliCommandOverSSH {
         }
       });
     } catch (error) {
-      if (error instanceof _core.ApolloError) {
-        const message = error.graphQLErrors.map(err => {
-          return err.message;
-        }).join('; ');
+      if (_core.CombinedGraphQLErrors.is(error)) {
+        const message = error.errors.map(err => err.message).join('; ');
         throw new APIError(message);
       }
       const message = error instanceof Error ? error.message : String(error);

package/dist/lib/api/app.js

@@ -23,10 +23,7 @@ async function _default(app, fields = 'id,name', fragments = '') {
         name: app
       }
     });
-    if (!res.data.apps?.edges?.length) {
-      return {};
-    }
-    return res.data.apps.edges[0];
+    return res.data?.apps?.edges?.[0] ?? {};
   }
   if (typeof app === 'string') {
     app = parseInt(app, 10);
@@ -51,8 +48,5 @@ async function _default(app, fields = 'id,name', fragments = '') {
     };
   }
   const res = await api.query(appQuery);
-  if (!res.data.app) {
-    return {};
-  }
-  return res.data.app;
+  return res.data?.app ?? {};
 }

package/dist/lib/api/feature-flags.js

@@ -15,8 +15,8 @@ const isVipQuery = (0, _graphqlTag.default)`
 		}
 	}
 `;
-async function get() {
-  return await api.query({
+function get() {
+  return api.query({
     query: isVipQuery,
     fetchPolicy: 'cache-first'
   });

package/dist/lib/api/http.js

@@ -31,17 +31,24 @@ var _default = async (path, options = {}) => {
   const authToken = await _token.default.get();
   const proxyAgent = (0, _proxyAgent.createProxyAgent)(url);
   debug('running fetch', url);
-  return (0, _nodeFetch.default)(url, {
+  const headers = new Headers({
+    ...options.headers
+  });
+  if (!headers.has('Authorization')) {
+    headers.set('Authorization', `Bearer ${authToken.raw}`);
+  }
+  if (!headers.has('User-Agent')) {
+    headers.set('User-Agent', _env.default.userAgent);
+  }
+  if (!headers.has('Content-Type') && options.method !== 'GET') {
+    headers.set('Content-Type', 'application/json');
+  }
+  const opts = {
     ...options,
     agent: proxyAgent ?? undefined,
-    headers: {
-      Authorization: `Bearer ${authToken.raw}`,
-      'User-Agent': _env.default.userAgent,
-      'Content-Type': 'application/json',
-      ...(options.headers ?? {})
-    },
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    headers,
     body: typeof options.body === 'object' ? JSON.stringify(options.body) : options.body
-  });
+  };
+  return (0, _nodeFetch.default)(url, opts);
 };
 exports.default = _default;

package/dist/lib/api/user.js

@@ -28,9 +28,7 @@ async function getCurrentUserInfo(silenceAuthErrors = false) {
   const response = await api.query({
     query: QUERY_CURRENT_USER
   });
-  const {
-    me
-  } = response.data;
+  const me = response.data?.me;
   if (!me) {
     throw new Error('The API did not return any information about the user.');
   }

package/dist/lib/api.js

@@ -7,21 +7,16 @@ exports.disableGlobalGraphQLErrorHandling = disableGlobalGraphQLErrorHandling;
 exports.enableGlobalGraphQLErrorHandling = enableGlobalGraphQLErrorHandling;
 exports.shouldRetryRequest = shouldRetryRequest;
 var _core = require("@apollo/client/core");
-var _context = require("@apollo/client/link/context");
-var _core2 = require("@apollo/client/link/core");
 var _error = require("@apollo/client/link/error");
 var _retry = require("@apollo/client/link/retry");
 var _chalk = _interopRequireDefault(require("chalk"));
 var _debug = _interopRequireDefault(require("debug"));
+var _graphql = require("graphql");
 var _nodeFetch = require("node-fetch");
 var _http = _interopRequireDefault(require("./api/http"));
-var _env = _interopRequireDefault(require("./env"));
-var _token = _interopRequireDefault(require("./token"));
-var _proxyAgent = require("../lib/http/proxy-agent");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // Config
 const PRODUCTION_API_HOST = exports.PRODUCTION_API_HOST = 'https://api.wpvip.com';
-// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
 const API_HOST = exports.API_HOST = process.env.API_HOST || PRODUCTION_API_HOST; // NOSONAR
 const API_URL = exports.API_URL = `${API_HOST}/graphql`;
 let globalGraphQLErrorHandlingEnabled = true;
@@ -38,7 +33,7 @@ function enableGlobalGraphQLErrorHandling() {
 }
 function shouldRetryRequest(attempt, operation, error) {
   const debugSuffix = `Operation: ${operation.operationName}. Attempt: ${attempt}.`;
-  if (!error || operation.query.definitions.some(def => def.kind === 'OperationDefinition' && def.operation !== 'query')) {
+  if (!error || operation.query.definitions.some(def => def.kind === _graphql.Kind.OPERATION_DEFINITION && def.operation !== _graphql.OperationTypeNode.QUERY)) {
     debug(`Request failed. ${debugSuffix}`);
     return false;
   }
@@ -58,71 +53,50 @@ function shouldRetryRequest(attempt, operation, error) {
   debug(`Request failed. Retrying request due to server error. ${debugSuffix}`, error);
   return true;
 }
-function isServerError(networkError) {
-  if (!networkError) {
-    return false;
-  }
-  return 'result' in networkError;
-}
 function API({
   exitOnError = true,
   silenceAuthErrors = false,
   customRetryLink
 } = {}) {
-  const errorLink = (0, _error.onError)(({
-    networkError,
-    graphQLErrors
+  const errorLink = new _error.ErrorLink(({
+    error
   }) => {
-    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.';
+    if (!silenceAuthErrors && error instanceof _core.ServerError && error.statusCode === 401) {
+      let message;
+      try {
+        const result = JSON.parse(error.bodyText);
+        if (typeof result === 'object' && result !== null && 'code' in result && result?.code === 'token-disabled-inactivity') {
+          message = 'Your token has expired due to inactivity';
+        }
+      } catch {
+        // If we can't parse the body, use the default message
+        message = 'You are not authorized to perform this request';
       }
+      message += '; please log out with `vip logout`, then try again.';
       console.error(_chalk.default.red('Unauthorized:'), message);
       process.exit(1);
     }
-    if (graphQLErrors?.length && globalGraphQLErrorHandlingEnabled) {
-      graphQLErrors.forEach(error => {
-        console.error(_chalk.default.red('Error:'), error.message);
-      });
+    if (_core.CombinedGraphQLErrors.is(error) && globalGraphQLErrorHandlingEnabled) {
+      for (const err of error.errors) {
+        console.error(_chalk.default.red('Error:'), err.message);
+      }
       if (exitOnError) {
         process.exit(1);
       }
     }
   });
-  const withToken = (0, _context.setContext)(async () => {
-    const token = (await _token.default.get()).raw;
-    return {
-      token
-    };
-  });
-  const authLink = new _core2.ApolloLink((operation, forward) => {
-    const ctx = operation.getContext();
-    const headers = {
-      'User-Agent': _env.default.userAgent,
-      Authorization: `Bearer ${ctx.token}`,
-      ...ctx.headers
-    };
-    operation.setContext({
-      headers
-    });
-    return forward(operation);
-  });
-  const proxyAgent = (0, _proxyAgent.createProxyAgent)(API_URL);
   const httpLink = new _core.HttpLink({
     uri: operation => {
       // to make it easier to write tests, we'll skip adding x_query for tests
       if (process.env.NODE_ENV === 'test') {
         return API_URL;
       }
-      return `${API_URL}?x_query=${decodeURIComponent(operation.operationName)}`;
+      const operationName = operation.operationName ?? '';
+      return `${API_URL}?x_query=${encodeURIComponent(operationName)}`;
     },
-    fetch: _http.default,
-    fetchOptions: {
-      agent: proxyAgent
-    }
+    fetch: _http.default
   });
-  const retryLink = new _retry.RetryLink({
+  const retryLink = customRetryLink ?? new _retry.RetryLink({
     delay: {
       initial: RETRY_LINK_INITIAL_DELAY_MS,
       max: RETRY_LINK_MAX_DELAY_MS
@@ -130,7 +104,7 @@ function API({
     attempts: shouldRetryRequest
   });
   return new _core.ApolloClient({
-    link: _core2.ApolloLink.from([withToken, errorLink, customRetryLink ? customRetryLink : retryLink, authLink, httpLink]),
+    link: _core.ApolloLink.from([errorLink, retryLink, httpLink]),
     cache: new _core.InMemoryCache({
       typePolicies: {
         WPSite: {

package/dist/lib/app-logs/app-logs.js

@@ -44,7 +44,7 @@ async function getRecentLogs(appId, envId, type, limit, after) {
       after
     }
   });
-  const logs = response.data.app?.environments?.[0]?.logs;
+  const logs = response.data?.app?.environments?.[0]?.logs;
   if (!logs?.nodes) {
     throw new Error('Unable to query logs');
   }

package/dist/lib/app-slowlogs/app-slowlogs.js

@@ -41,7 +41,7 @@ async function getRecentSlowlogs(appId, envId, limit, after) {
       after
     }
   });
-  const slowlogs = response.data.app?.environments?.[0]?.slowlogs;
+  const slowlogs = response.data?.app?.environments?.[0]?.slowlogs;
   if (!slowlogs?.nodes) {
     throw new Error('Unable to query slowlogs');
   }