@automattic/vip 2.9.2 → 2.9.3

package/CONTRIBUTING.md

@@ -131,3 +131,9 @@ For these cases:
 1. Follow the release steps outlined above (as a `patch` release).
 
 Then, repeat for any additional versions that we need to patch.
+
+### go-search-replace binaries
+
+Some unit tests require some go-search-replace executable binary files to run. Binaries files for several OS architectures can be downloaded from https://github.com/Automattic/go-search-replace/releases/
+
+If, for some reason, you need to compile these binaries yourself, please follow instructions at https://github.com/Automattic/go-search-replace

package/README.md

@@ -26,6 +26,17 @@ For help with contributing to this project, including instructions for local dev
 By default, we record information about the usage of this tool using an in-house analytics sytem. If you would prefer to opt-out of this data collection, you can do so via the `DO_NOT_TRACK` environment variable. You may either export it in your shell configuration or specify it on the command line (e.g. `DO_NOT_TRACK=1 vip app list`).
 
 ## Changelog
+
+### 2.9.3 (29 March 2022)
+- #995 Add debug call to dev-envs handleCLIException
+- #992 Add --debug flag to all commands
+- #993 [dev-env] Fix in caching version list.
+- #994 Fix typo in error message
+- #990 [dev-env] Add check for wp folder map add/php_healthcheck
+- #991 Adds optional channing since `progress` can be null as per GraphQL schema
+- #989 Fixes unit test error `bsdthread_register error`
+- #987 Add support for M1 Macs in the search-replace tests
+
 ### 2.9.2 (9 March 2022)
 - #980  [dev-env] Fix/tag formatting on stapled images
 - #986  Clean the build folder prior to rebuilding it

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

@@ -40,6 +40,8 @@ services:
       image: ghcr.io/automattic/vip-container-images/php-fpm:7.4
       command: run.sh
       working_dir: /wp
+      healthcheck:
+        test: 'cat /wp/wp-includes/pomo/mo.php'
       environment:
         XDEBUG: <%= xdebug ? 'enable' : 'disable' %>
         STATSD: <%= statsd ? 'enable' : 'disable' %>

package/dist/lib/cli/command.js

@@ -37,6 +37,8 @@ var _rollbar = require("../rollbar");
 
 var exit = _interopRequireWildcard(require("./exit"));
 
+var _debug = _interopRequireDefault(require("debug"));
+
 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; }
@@ -80,7 +82,8 @@ _args.default.argv = async function (argv, cb) {
   const options = this.parse(parsedAlias.argv, {
     help: false,
     name,
-    version: false
+    version: false,
+    debug: false
   });
 
   if (options.h || options.help) {
@@ -89,6 +92,10 @@ _args.default.argv = async function (argv, cb) {
 
   if (options.v || options.version) {
     this.showVersion();
+  }
+
+  if (options.debug || options.d) {
+    _debug.default.enable(options.debug === true ? '*' : options.debug);
   } // If we have both an --app/--env and an alias, we need to give a warning
 
 
@@ -128,6 +135,7 @@ _args.default.argv = async function (argv, cb) {
     switch (command.usage) {
       case 'help':
       case 'version':
+      case 'debug':
         return false;
 
       default:
@@ -576,6 +584,8 @@ function _default(opts) {
 
   _args.default.option('version', 'Output the version number');
 
+  _args.default.option('debug', 'Activate debug output');
+
   return _args.default;
 }
 

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DEV_ENVIRONMENT_WORDPRESS_CACHE_KEY = exports.DEV_ENVIRONMENT_WORDPRESS_VERSIONS_URI = exports.DEV_ENVIRONMENT_RAW_GITHUB_HOST = exports.DEV_ENVIRONMENT_COMPONENTS = exports.DEV_ENVIRONMENT_NOT_FOUND = exports.DEV_ENVIRONMENT_PROMPT_INTRO = exports.DEV_ENVIRONMENT_DEFAULTS = exports.DEV_ENVIRONMENT_FULL_COMMAND = exports.DEV_ENVIRONMENT_SUBCOMMAND = void 0;
+exports.DEV_ENVIRONMENT_WORDPRESS_VERSION_TTL = exports.DEV_ENVIRONMENT_WORDPRESS_CACHE_KEY = exports.DEV_ENVIRONMENT_WORDPRESS_VERSIONS_URI = exports.DEV_ENVIRONMENT_RAW_GITHUB_HOST = exports.DEV_ENVIRONMENT_COMPONENTS = exports.DEV_ENVIRONMENT_NOT_FOUND = exports.DEV_ENVIRONMENT_PROMPT_INTRO = exports.DEV_ENVIRONMENT_DEFAULTS = exports.DEV_ENVIRONMENT_FULL_COMMAND = exports.DEV_ENVIRONMENT_SUBCOMMAND = void 0;
 const DEV_ENVIRONMENT_SUBCOMMAND = 'dev-env';
 exports.DEV_ENVIRONMENT_SUBCOMMAND = DEV_ENVIRONMENT_SUBCOMMAND;
 const DEV_ENVIRONMENT_FULL_COMMAND = `vip ${DEV_ENVIRONMENT_SUBCOMMAND}`;
@@ -25,5 +25,8 @@ const DEV_ENVIRONMENT_RAW_GITHUB_HOST = 'raw.githubusercontent.com';
 exports.DEV_ENVIRONMENT_RAW_GITHUB_HOST = DEV_ENVIRONMENT_RAW_GITHUB_HOST;
 const DEV_ENVIRONMENT_WORDPRESS_VERSIONS_URI = '/Automattic/vip-container-images/master/wordpress/versions.json';
 exports.DEV_ENVIRONMENT_WORDPRESS_VERSIONS_URI = DEV_ENVIRONMENT_WORDPRESS_VERSIONS_URI;
-const DEV_ENVIRONMENT_WORDPRESS_CACHE_KEY = 'worpress-versions.json';
-exports.DEV_ENVIRONMENT_WORDPRESS_CACHE_KEY = DEV_ENVIRONMENT_WORDPRESS_CACHE_KEY;
+const DEV_ENVIRONMENT_WORDPRESS_CACHE_KEY = 'wordpress-versions.json';
+exports.DEV_ENVIRONMENT_WORDPRESS_CACHE_KEY = DEV_ENVIRONMENT_WORDPRESS_CACHE_KEY;
+const DEV_ENVIRONMENT_WORDPRESS_VERSION_TTL = 86400; // once per day
+
+exports.DEV_ENVIRONMENT_WORDPRESS_VERSION_TTL = DEV_ENVIRONMENT_WORDPRESS_VERSION_TTL;

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

@@ -65,6 +65,14 @@ function handleCLIException(exception) {
 
     message = message.replace('ERROR: ', '');
     console.log(errorPrefix, message);
+
+    if (!process.env.DEBUG) {
+      console.log(`Please re-run the command with "${_chalk.default.bold('DEBUG=@automattic/vip:bin:dev-environment')}" prepended to it and provide the stack trace on the support ticket.`);
+      console.log(_chalk.default.bold('\nExample:\n'));
+      console.log('DEBUG=@automattic/vip:bin:dev-environment vip dev-env create\n');
+    }
+
+    debug(exception);
   }
 }
 

package/dist/lib/media-import/status.js

@@ -146,7 +146,7 @@ function buildErrorMessage(importFailed) {
   }
 
   message += _chalk.default.red(importFailed.error ? importFailed.error : importFailed);
-  message += '\n\nPlease check the status of your Import using `vip import status @appId.production`';
+  message += '\n\nPlease check the status of your Import using `vip import media status @mysite.production`';
   message += '\n\nIf this error persists and you are not sure on how to fix, please contact support\n';
   return message;
 }

package/dist/lib/site-import/status.js

@@ -254,6 +254,8 @@ ${maybeExitPrompt}
 
   const getResults = () => new Promise((resolve, reject) => {
     const checkStatus = async () => {
+      var _importJob$progress$s, _importJob$progress, _importJob$progress$s2, _importJob$progress2;
+
       let status;
 
       try {
@@ -322,8 +324,8 @@ ${maybeExitPrompt}
         return resolve('No import job found');
       }
 
-      jobStatus = importJob.progress.status;
-      jobSteps = importJob.progress.steps;
+      jobStatus = (_importJob$progress$s = (_importJob$progress = importJob.progress) === null || _importJob$progress === void 0 ? void 0 : _importJob$progress.status) !== null && _importJob$progress$s !== void 0 ? _importJob$progress$s : 'unknown';
+      jobSteps = (_importJob$progress$s2 = (_importJob$progress2 = importJob.progress) === null || _importJob$progress2 === void 0 ? void 0 : _importJob$progress2.steps) !== null && _importJob$progress$s2 !== void 0 ? _importJob$progress$s2 : [];
       createdAt = importJob.createdAt;
       completedAt = importJob.completedAt;
       const {

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "2.9.2",
+  "version": "2.9.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

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