@automattic/vip 3.4.0 → 3.4.1

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

@@ -39,6 +39,8 @@ services:
       command: nginx -g "daemon off;"
       environment:
         LANDO_NEEDS_EXEC: 1
+        LANDO_WEBROOT_USER: nginx
+        LANDO_WEBROOT_GROUP: nginx
       volumes:
         - ./nginx/extra.conf:/etc/nginx/conf.extra/extra.conf
 <% wpVolumes() %>

package/dist/bin/vip-cache-purge-url.js

@@ -11,12 +11,14 @@ var _tracker = require("../lib/tracker");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const usage = 'vip cache purge-url';
+const exampleUsage = 'vip @example-app.develop cache purge-url';
 const examples = [{
-  usage: 'vip cache purge-url <URL>',
-  description: 'Purge a URL from page cache'
+  usage: `${exampleUsage} https://example-app-develop.go-vip.co/sample-page/` + '\n    - Purged URL: https://example-app.develop.go-vip.co/sample-page/',
+  description: 'Purge the page cache for a single URL.'
 }, {
-  usage: 'vip cache purge-url --from-file=/dev/vip/urls.txt',
-  description: 'Purge multiple URLs from page cache'
+  usage: `${exampleUsage} --from-file=./urls.txt`,
+  description: 'Purge the page cache for multiple URLs, each listed on a single line in a local file.'
 }];
 async function cachePurgeCommand(urls = [], opt = {}) {
   const trackingParams = {
@@ -59,5 +61,5 @@ async function cachePurgeCommand(urls = [], opt = {}) {
   appQuery: _cachePurge.appQuery,
   envContext: true,
   wildcardCommand: true,
-  usage: 'vip cache purge-url <URL>'
-}).option('from-file', 'Read URLs from file (useful to purge multiple URLs)').examples(examples).argv(process.argv, cachePurgeCommand);
+  usage
+}).option('from-file', 'Read one or more URLs from a file, each listed on a single line.').examples(examples).argv(process.argv, cachePurgeCommand);

package/dist/bin/vip-cache.js

@@ -3,6 +3,16 @@
 
 var _command = _interopRequireDefault(require("../lib/cli/command"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const usage = 'vip cache';
+const exampleUsage = 'vip @example-app.develop cache';
+const examples = [{
+  usage: `${exampleUsage} purge-url https://example-app-develop.go-vip.co/sample-page/` + '\n    - Purged URL: https://example-app.develop.go-vip.co/sample-page/',
+  description: 'Purge the page cache for a single URL.'
+}, {
+  usage: `${exampleUsage} purge-url --from-file=./urls.txt`,
+  description: 'Purge the page cache for multiple URLs, each listed on a single line in a local file.'
+}];
 (0, _command.default)({
-  requiredArgs: 1
-}).command('purge-url', 'Purge page cache').argv(process.argv);
+  requiredArgs: 1,
+  usage
+}).command('purge-url', 'Purge page cache for one or more URLs.').examples(examples).argv(process.argv);

package/dist/bin/vip.js

@@ -22,7 +22,7 @@ const tokenURL = 'https://dashboard.wpvip.com/me/cli/token';
 const customDeployToken = process.env.WPVIP_DEPLOY_TOKEN;
 const runCmd = async function () {
   const cmd = (0, _command.default)();
-  cmd.command('logout', 'Log out the current authenticated VIP-CLI user.').command('app', 'List and modify your VIP applications').command('backup', 'Generate a backup of an environment.').command('cache', 'Manage page cache for your VIP applications').command('config', 'Manage environment configurations.').command('dev-env', 'Create and manage VIP Local Development Environments.').command('export', 'Export a copy of data associated with an environment.').command('import', 'Import media or SQL files into your VIP applications').command('logs', 'Get logs from your VIP applications').command('search-replace', 'Perform search and replace tasks on files').command('slowlogs', 'Retrieve MySQL slow query logs from an environment.').command('db', "Access an environment's database.").command('sync', 'Sync production to a development environment').command('whoami', 'Retrieve details about the current authenticated VIP-CLI user.').command('validate', 'Validate your VIP application and environment').command('wp', 'Run WP CLI commands against an environment');
+  cmd.command('logout', 'Log out the current authenticated VIP-CLI user.').command('app', 'List and modify your VIP applications').command('backup', 'Generate a backup of an environment.').command('cache', 'Manage page cache for an environment.').command('config', 'Manage environment configurations.').command('dev-env', 'Create and manage VIP Local Development Environments.').command('export', 'Export a copy of data associated with an environment.').command('import', 'Import media or SQL files into your VIP applications').command('logs', 'Get logs from your VIP applications').command('search-replace', 'Perform search and replace tasks on files').command('slowlogs', 'Retrieve MySQL slow query logs from an environment.').command('db', "Access an environment's database.").command('sync', 'Sync production to a development environment').command('whoami', 'Retrieve details about the current authenticated VIP-CLI user.').command('validate', 'Validate your VIP application and environment').command('wp', 'Run WP CLI commands against an environment');
   cmd.argv(process.argv);
 };
 

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

@@ -512,7 +512,10 @@ async function promptForWordPress(defaultObject) {
 
   // image with selection
   const tagChoices = await getTagChoices();
-  let option = defaultObject?.tag ?? tagChoices[0].value;
+  if (typeof defaultObject === 'string' && !tagChoices.find(choice => choice.value === defaultObject)) {
+    throw new Error(`Unknown or unsupported WordPress version: ${defaultObject}.`);
+  }
+  let option = typeof defaultObject === 'string' ? defaultObject : defaultObject?.tag ?? tagChoices[0].value;
   if (isStdinTTY) {
     const message = `${messagePrefix}Which version would you like`;
     const selectTag = new _enquirer.Select({

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

@@ -577,7 +577,7 @@ async function maybeUpdateWordPressImage(lando, slug) {
     type: 'select',
     name: 'upgrade',
     message: 'Would you like to upgrade WordPress? ',
-    choices: ['no', 'yes', "no (don't ask anymore)"]
+    choices: ['yes', 'no', "no (don't ask anymore)"]
   });
 
   // If the user takes the new WP version path
@@ -585,7 +585,7 @@ async function maybeUpdateWordPressImage(lando, slug) {
     console.log('Upgrading from: ' + _chalk.default.yellow(currentWordPressTag) + ' to:');
 
     // Select a new image
-    const choice = await (0, _devEnvironmentCli.promptForWordPress)(null);
+    const choice = await (0, _devEnvironmentCli.promptForWordPress)(newestWordPressImage?.tag ?? null);
     const version = versions.find(({
       tag
     }) => tag.trim() === choice.tag.trim());

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

@@ -404,7 +404,8 @@ async function checkEnvHealth(lando, instancePath) {
   }
   if (urlsToScan.length) {
     scanResults = scanResults.concat(await app.scanUrls(urlsToScan, {
-      max: 1
+      max: 1,
+      waitCodes: [502, 504]
     }));
   }
   const result = {};

package/docs/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## Changelog
 
+### 3.4.1
+
+* Updating vip cache commands descriptions and examples to follow the VIP-CLI style guide
+* Dev-env: Upgrade WordPress upgrade prompt to "yes" and pre-select latest version not trunk
+* build(deps-dev): bump @types/node from 18.19.36 to 18.19.37
+* fix(dev-env): retry healthcheck only on 502 and 504 status codes
+* fix(dev-env): set the user/group for `nginx` container to `nginx:nginx`
+
+**Full Changelog**: https://github.com/Automattic/vip-cli/compare/3.4.0...3.4.1
+
 ### 3.4.0
 
 * Updating command option descriptions to follow the VIP-CLI style guide

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@automattic/vip",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@automattic/vip",
-      "version": "3.4.0",
+      "version": "3.4.1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -3884,9 +3884,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "18.19.36",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.36.tgz",
-      "integrity": "sha512-tX1BNmYSWEvViftB26VLNxT6mEr37M7+ldUtq7rlKnv4/2fKYsJIOmqJAjT6h1DNuwQjIKgw3VJ/Dtw3yiTIQw==",
+      "version": "18.19.37",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.37.tgz",
+      "integrity": "sha512-Pi53fdVMk7Ig5IfAMltQQMgtY7xLzHaEous8IQasYsdQbYK3v90FkxI3XYQCe/Qme58pqp14lXJIsFmGP8VoZQ==",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -16306,9 +16306,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "18.19.36",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.36.tgz",
-      "integrity": "sha512-tX1BNmYSWEvViftB26VLNxT6mEr37M7+ldUtq7rlKnv4/2fKYsJIOmqJAjT6h1DNuwQjIKgw3VJ/Dtw3yiTIQw==",
+      "version": "18.19.37",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.37.tgz",
+      "integrity": "sha512-Pi53fdVMk7Ig5IfAMltQQMgtY7xLzHaEous8IQasYsdQbYK3v90FkxI3XYQCe/Qme58pqp14lXJIsFmGP8VoZQ==",
       "requires": {
         "undici-types": "~5.26.4"
       }

package/package.json

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