@automattic/vip 3.8.8 → 3.9.0

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

@@ -332,7 +332,7 @@ tooling:
             nocopy: true
         - type: volume
           source: clientcode_vipconfig
-          target: /wp/wp-content/vip-config
+          target: /wp/vip-config
           volume:
             nocopy: true
 <% } else { %>
@@ -342,6 +342,6 @@ tooling:
         - <%= appCode.dir %>/plugins:/wp/wp-content/plugins
         - <%= appCode.dir %>/private:/wp/wp-content/private
         - <%= appCode.dir %>/themes:/wp/wp-content/themes
-        - <%= appCode.dir %>/vip-config:/wp/wp-content/vip-config
+        - <%= appCode.dir %>/vip-config:/wp/vip-config
 <% } %>
 <% } %>

package/dist/bin/vip-logs.js

@@ -21,7 +21,7 @@ const LIMIT_MIN = 1;
 const LIMIT_MAX = 5000;
 const LIMIT_DEFAULT = 500;
 const ALLOWED_TYPES = ['app', 'batch'];
-const ALLOWED_FORMATS = ['csv', 'json', 'table'];
+const ALLOWED_FORMATS = ['csv', 'json', 'table', 'text'];
 const DEFAULT_POLLING_DELAY_IN_SECONDS = 30;
 const MIN_POLLING_DELAY_IN_SECONDS = 5;
 const MAX_POLLING_DELAY_IN_SECONDS = 300;
@@ -143,7 +143,7 @@ function printLogs(logs, format) {
     };
   });
   let output = '';
-  if (format && 'table' === format) {
+  if ('table' === format) {
     const options = {
       wordWrap: true,
       wrapOnWordBoundary: true,
@@ -168,6 +168,15 @@ function printLogs(logs, format) {
       table.push([timestamp, msg]);
     }
     output = table.toString();
+  } else if ('text' === format) {
+    const rows = [];
+    for (const {
+      timestamp,
+      message
+    } of logs) {
+      rows.push(`${timestamp} ${message}`);
+      output = rows.join('\n');
+    }
   } else {
     output = (0, _format.formatData)(logs, format);
   }
@@ -211,7 +220,7 @@ const appQuery = exports.appQuery = `
   module: 'logs'
 }).option('type', 'Specify the type of Runtime Logs to retrieve. Accepts "batch" (only valid for WordPress environments).', 'app')
 // The default limit is set manually in the validateInputs function to address validation issues, avoiding incorrect replacement of the default value.
-.option('limit', `The maximum number of entries to return. Accepts an integer value between 1 and 5000 (defaults to ${LIMIT_DEFAULT}).`).option('follow', 'Output new entries as they are generated.').option('format', 'Render output in a particular format. Accepts “csv”, and “json”.', 'table').examples([{
+.option('limit', `The maximum number of entries to return. Accepts an integer value between 1 and 5000 (defaults to ${LIMIT_DEFAULT}).`).option('follow', 'Output new entries as they are generated.').option('format', 'Render output in a particular format. Accepts “csv”, “json”, and “text”.', 'table').examples([{
   usage: 'vip @example-app.production logs',
   description: 'Retrieve up to 500 of the most recent entries of application Runtime Logs from web containers.'
 }, {

package/dist/lib/api.js

@@ -27,6 +27,12 @@ function disableGlobalGraphQLErrorHandling() {
 function enableGlobalGraphQLErrorHandling() {
   globalGraphQLErrorHandlingEnabled = true;
 }
+function isServerError(networkError) {
+  if (!networkError) {
+    return false;
+  }
+  return 'result' in networkError;
+}
 function API({
   exitOnError = true
 } = {}) {
@@ -35,7 +41,11 @@ function API({
     graphQLErrors
   }) => {
     if (networkError && 'statusCode' in networkError && networkError.statusCode === 401) {
-      console.error(_chalk.default.red('Unauthorized:'), 'You are unauthorized to perform this request, please logout with `vip logout` then try again.');
+      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 been disabled due to inactivity; please log out with `vip logout`, then try again.';
+      }
+      console.error(_chalk.default.red('Unauthorized:'), message);
       process.exit(1);
     }
     if (graphQLErrors?.length && globalGraphQLErrorHandlingEnabled) {

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

@@ -25,6 +25,10 @@ const DEV_ENVIRONMENT_PHP_VERSIONS = exports.DEV_ENVIRONMENT_PHP_VERSIONS = {
   8.3: {
     image: 'ghcr.io/automattic/vip-container-images/php-fpm:8.3',
     label: '8.3'
+  },
+  8.4: {
+    image: 'ghcr.io/automattic/vip-container-images/php-fpm:8.4',
+    label: '8.4 (experimental)'
   }
 };
 const DEV_ENVIRONMENT_DEFAULTS = exports.DEV_ENVIRONMENT_DEFAULTS = {
@@ -32,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.1';
+const DEV_ENVIRONMENT_VERSION = exports.DEV_ENVIRONMENT_VERSION = '2.1.2';

package/docs/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## Changelog
 
+### 3.9.0
+
+* feat(dev-env): add support for PHP 8.4
+* Provide dedicated error message for when a token is marked as disabled due to inactivity
+* Set the mount path for vip-config to ABSPATH/vip-config to match production
+* Add --format="text" option to vip logs
+* build(deps-dev): bump typescript from 5.6.3 to 5.7.2
+* build(deps-dev): bump @types/node from 22.9.1 to 22.10.0
+
+**Full Changelog**: https://github.com/Automattic/vip-cli/compare/3.8.8...3.9.0
+
 ### 3.8.8
 
 * build(deps-dev): bump @types/dockerode from 3.3.31 to 3.3.32
@@ -54,7 +65,7 @@
 * build(deps): bump uuid from 11.0.2 to 11.0.3
 * Update socket error handler
 * Fix --limit arg handling in vip logs command
-* New package release: v3.9.0 by 
+* New package release: v3.9.0 by
 * Revert "New package release: v3.9.0"
 * chore(deps): update Lando to 6ca2668
 * fix: `table` format output
@@ -151,7 +162,7 @@
 * build(deps-dev): bump @babel/core from 7.24.8 to 7.24.9 in the babel group
 * build(deps-dev): bump @types/dockerode from 3.3.29 to 3.3.30
 * update: media import validate-files
-  
+
 **Full Changelog**: https://github.com/Automattic/vip-cli/compare/3.6.0...3.7.0
 
 ### 3.6.0

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@automattic/vip",
-  "version": "3.8.8",
+  "version": "3.9.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@automattic/vip",
-      "version": "3.8.8",
+      "version": "3.9.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -3618,11 +3618,11 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "22.9.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.1.tgz",
-      "integrity": "sha512-p8Yy/8sw1caA8CdRIQBG5tiLHmxtQKObCijiAa9Ez+d4+PRffM4054xbju0msf+cvhJpnFEeNjxmVT/0ipktrg==",
+      "version": "22.10.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
+      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
       "dependencies": {
-        "undici-types": "~6.19.8"
+        "undici-types": "~6.20.0"
       }
     },
     "node_modules/@types/node-fetch": {
@@ -12278,9 +12278,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.6.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
-      "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz",
+      "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -12314,9 +12314,9 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg=="
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.1",
@@ -15878,11 +15878,11 @@
       "dev": true
     },
     "@types/node": {
-      "version": "22.9.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.1.tgz",
-      "integrity": "sha512-p8Yy/8sw1caA8CdRIQBG5tiLHmxtQKObCijiAa9Ez+d4+PRffM4054xbju0msf+cvhJpnFEeNjxmVT/0ipktrg==",
+      "version": "22.10.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz",
+      "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==",
       "requires": {
-        "undici-types": "~6.19.8"
+        "undici-types": "~6.20.0"
       }
     },
     "@types/node-fetch": {
@@ -22169,9 +22169,9 @@
       }
     },
     "typescript": {
-      "version": "5.6.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
-      "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz",
+      "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==",
       "dev": true
     },
     "typical": {
@@ -22192,9 +22192,9 @@
       }
     },
     "undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg=="
     },
     "unicode-canonical-property-names-ecmascript": {
       "version": "2.0.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "3.8.8",
+  "version": "3.9.0",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {