@automattic/vip 2.9.1 → 2.9.2

package/README.md

@@ -26,6 +26,13 @@ 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.2 (9 March 2022)
+- #980  [dev-env] Fix/tag formatting on stapled images
+- #986  Clean the build folder prior to rebuilding it
+- #985  Adding webP to the list of accepted extensions for files
+- #972  Run tests in Windows Env
+
+https://github.com/Automattic/vip/releases/tag/v2.9.2
 
 ### 2.9.1 (2 March 2022)
 - #982  Remove unused dependencies - Fixes Error: Cannot find module 'core-js'

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DEV_ENVIRONMENT_WORDPRESS_VERSION_FILE = 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_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}`;
@@ -26,6 +26,4 @@ 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_VERSION_FILE = 'wordpress/wp-includes/version.php';
-exports.DEV_ENVIRONMENT_WORDPRESS_VERSION_FILE = DEV_ENVIRONMENT_WORDPRESS_VERSION_FILE;
+exports.DEV_ENVIRONMENT_WORDPRESS_CACHE_KEY = DEV_ENVIRONMENT_WORDPRESS_CACHE_KEY;

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

@@ -338,16 +338,21 @@ async function promptForComponent(component, allowLocal, defaultObject) {
 
   if (component === 'wordpress') {
     const message = `${messagePrefix}Which version would you like`;
-    const tagChoices = await getTagChoices(); // First tag not: "Pre-Release"
+    const tagChoices = await getTagChoices(); // Tag strings come back from the api with excess whitespace
+    // This strips the whitespace for matching to the defaultObject.tag
 
-    const firstNonPreRelease = tagChoices.find(tag => {
-      return !tag.match(/Pre\-Release/g);
+    const formatted = tagChoices.map(elm => {
+      return elm.trim();
+    }); // First tag not: "Pre-Release"
+
+    const firstNonPreRelease = formatted.find(img => {
+      return !img.match(/Pre\-Release/g);
     }); // Set initialTagIndex as the first non Pre-Release
 
-    let initialTagIndex = tagChoices.indexOf(firstNonPreRelease);
+    let initialTagIndex = formatted.indexOf(firstNonPreRelease);
 
     if (defaultObject !== null && defaultObject !== void 0 && defaultObject.tag) {
-      const defaultTagIndex = tagChoices.indexOf(defaultObject.tag);
+      const defaultTagIndex = formatted.indexOf(defaultObject.tag);
 
       if (defaultTagIndex !== -1) {
         initialTagIndex = defaultTagIndex;
@@ -356,10 +361,21 @@ async function promptForComponent(component, allowLocal, defaultObject) {
 
     const selectTag = new _enquirer.Select({
       message,
-      choices: tagChoices,
+      choices: formatted,
       initial: initialTagIndex
     });
-    const tag = await selectTag.run();
+    const option = await selectTag.run(); // Validate the input
+    // Some of the options are like: '5.7   →  5.7.5'
+    // Extract first occurrence of something that looks like a tag
+
+    const tagRgx = new RegExp(/(\d+\.\d+(?:\.\d+)?)/);
+    const match = tagRgx.exec(option);
+
+    if (!Array.isArray(match) || match.length < 2) {
+      throw new Error(`Invalid WordPress selection: ${option}`);
+    }
+
+    const tag = match[1];
     return {
       mode: modeResult,
       tag

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

@@ -88,9 +88,9 @@ async function startEnvironment(slug, options) {
     throw new Error(_devEnvironment.DEV_ENVIRONMENT_NOT_FOUND);
   }
 
-  await updateWordPressImage(instancePath, options);
+  const updated = await updateWordPressImage(slug);
 
-  if (options.skipRebuild) {
+  if (options.skipRebuild && !updated) {
     await (0, _devEnvironmentLando.landoStart)(instancePath);
   } else {
     await (0, _devEnvironmentLando.landoRebuild)(instancePath);
@@ -466,20 +466,29 @@ async function importMediaPath(slug, filePath) {
  *   - If there is a newer version of the WordPress version currently used
  *   - A choice to use a different image
  *
- * @param  {Object=} instancePath Path to local profile
- * @param  {Object=} options options
+ * @param  {Object=} slug slug
+ * @return {boolean} boolean
  */
 
 
-async function updateWordPressImage(instancePath, options) {
+async function updateWordPressImage(slug) {
   const versions = await getVersionList();
   const refRgx = new RegExp(/\d+\.\d+(?:\.\d+)?/);
-  const vsnRgx = new RegExp(/\$wp_version \= \'(.*)\'\;/);
-  const landoFile = `${instancePath}/.lando.yml`;
-  const versionFile = `${instancePath}/${_devEnvironment.DEV_ENVIRONMENT_WORDPRESS_VERSION_FILE}`; // If versionFile doesn't exist it means that the environment has not been initiated.
+  let message, envData, currentWordPressTag; // Get the current environment configuration
 
-  if (!_fs.default.existsSync(versionFile)) {
-    return;
+  try {
+    envData = readEnvironmentData(slug);
+    currentWordPressTag = envData.wordpress.tag;
+  } catch (error) {
+    // This can throw an exception if the env is build with older vip version
+    if ('ENOENT' === error.code) {
+      message = 'Environment was created before update was supported.\n\n';
+      message += 'To update environment please destroy it and create a new one.';
+    } else {
+      message = `An error prevented reading the configuration of: ${slug}\n\n ${error}`;
+    }
+
+    (0, _devEnvironmentCli.handleCLIException)(new Error(message));
   } // filter
 
 
@@ -490,32 +499,20 @@ async function updateWordPressImage(instancePath, options) {
   filteredVersions.sort((before, after) => before.tag < after.tag ? 1 : -1); // Newest WordPress Image
 
   const newestWordPressImage = filteredVersions[0];
-  console.log('The most recent WordPress version available is: ' + _chalk.default.green(newestWordPressImage.tag)); // Currently Used WordPress Version
-
-  const code = _fs.default.readFileSync(versionFile).toString();
-
-  const versionCode = vsnRgx.exec(code);
-  let currentWordPressVersion = null;
-
-  if (null === versionCode) {
-    console.log('Cannot determine the currently installed WordPress version.');
-  } else {
-    currentWordPressVersion = versionCode[1];
-  } // If the currently used version is the most up to date: exit.
-
+  console.log('The most recent WordPress version available is: ' + _chalk.default.green(newestWordPressImage.tag)); // If the currently used version is the most up to date: exit.
 
-  if (currentWordPressVersion === newestWordPressImage.ref) {
-    console.log('Environment WordPress version is: ' + _chalk.default.green(currentWordPressVersion) + '  ... 😎 nice! ');
-    return;
+  if (currentWordPressTag === newestWordPressImage.ref) {
+    console.log('Environment WordPress version is: ' + _chalk.default.green(currentWordPressTag) + '  ... 😎 nice! ');
+    return false;
   } // Determine if there is an image available for the current WordPress version
 
 
   const match = filteredVersions.find(({
     ref
-  }) => ref === currentWordPressVersion); // If there is no available image for the currently installed version, give user a path to change
+  }) => ref === currentWordPressTag); // If there is no available image for the currently installed version, give user a path to change
 
   if (typeof match === 'undefined') {
-    console.log(`Installed WordPress: ${currentWordPressVersion} has no available container image in repository. `);
+    console.log(`Installed WordPress: ${currentWordPressTag} has no available container image in repository. `);
     console.log('You must select a new WordPress image to continue... ');
   } else {
     console.log('Environment WordPress version is: ' + _chalk.default.yellow(match.ref));
@@ -529,28 +526,19 @@ async function updateWordPressImage(instancePath, options) {
   }); // If the user takes the new WP version path
 
   if (confirm.upgrade) {
-    console.log('Upgrading from: ' + _chalk.default.yellow(match.ref) + ' to:'); // Select a new image
+    console.log('Upgrading from: ' + _chalk.default.yellow(currentWordPressTag) + ' to:'); // Select a new image
 
     const choice = await (0, _devEnvironmentCli.promptForComponent)('wordpress');
     const version = filteredVersions.find(({
       tag
-    }) => tag.trim() === choice.tag.trim());
-    const selectedImage = `ghcr.io/automattic/vip-container-images/wordpress:${version.tag}`; // Change the lando file and rebuild.
-
-    const data = _fs.default.readFileSync(landoFile, {
-      encoding: 'utf8',
-      flag: 'r'
-    });
-
-    const edit = data.replace(/ghcr\.io\/.*wordpress\:.*\d+\.\d+(?:\.\d+)?/g, selectedImage);
-
-    _fs.default.writeFileSync(landoFile, edit); // Stage for rebuild
-
+    }) => tag.trim() === choice.tag.trim()); // Write new data and stage for rebuild
 
-    options.skipRebuild = false;
+    envData.wordpress.tag = version.tag;
+    await updateEnvironment(envData);
+    return true;
   }
 
-  return;
+  return false;
 }
 /**
  * Makes a web call to raw.githubusercontent.com

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

@@ -17,7 +17,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * External dependencies
  */
 // Accepted media file extensions
-const acceptedExtensions = ['jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'svg', 'tiff', 'tif', 'ico', 'asf', 'asx', 'wmv', 'wmx', 'wm', 'avi', 'divx', 'mov', 'qt', 'mpeg', 'mpg', 'mpe', 'mp4', 'm4v', 'ogv', 'webm', 'mkv', '3gp', '3gpp', '3g2', '3gp2', 'txt', 'asc', 'c', 'cc', 'h', 'srt', 'csv', 'tsv', 'ics', 'rtx', 'css', 'vtt', 'dfxp', 'mp3', 'm4a', 'm4b', 'ra', 'ram', 'wav', 'ogg', 'oga', 'mid', 'midi', 'wma', 'wax', 'mka', 'rtf', 'js', 'pdf', 'class', 'psd', 'xcf', 'doc', 'pot', 'pps', 'ppt', 'wri', 'xla', 'xls', 'xlt', 'xlw', 'mdb', 'mpp', 'docx', 'docm', 'dotx', 'dotm', 'xlsx', 'xlsm', 'xlsb', 'xltx', 'xltm', 'xlam', 'pptx', 'pptm', 'ppsx', 'ppsm', 'potx', 'potm', 'ppam', 'sldx', 'sldm', 'onetoc', ' onetoc2', 'onetmp', 'onepkg', 'oxps', 'xps', 'odt', 'odp', 'ods', 'odg', 'odc', 'odb', 'odf', 'wp', 'wpd', 'key', 'numbers', 'pages'];
+const acceptedExtensions = ['jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'svg', 'tiff', 'tif', 'ico', 'asf', 'asx', 'wmv', 'wmx', 'wm', 'avi', 'divx', 'mov', 'qt', 'mpeg', 'mpg', 'mpe', 'mp4', 'm4v', 'ogv', 'webm', 'mkv', '3gp', '3gpp', '3g2', '3gp2', 'txt', 'asc', 'c', 'cc', 'h', 'srt', 'csv', 'tsv', 'ics', 'rtx', 'css', 'vtt', 'dfxp', 'mp3', 'm4a', 'm4b', 'ra', 'ram', 'wav', 'ogg', 'oga', 'mid', 'midi', 'wma', 'wax', 'mka', 'rtf', 'js', 'pdf', 'class', 'psd', 'xcf', 'doc', 'pot', 'pps', 'ppt', 'wri', 'xla', 'xls', 'xlt', 'xlw', 'mdb', 'mpp', 'docx', 'docm', 'dotx', 'dotm', 'xlsx', 'xlsm', 'xlsb', 'xltx', 'xltm', 'xlam', 'pptx', 'pptm', 'ppsx', 'ppsm', 'potx', 'potm', 'ppam', 'sldx', 'sldm', 'onetoc', ' onetoc2', 'onetmp', 'onepkg', 'oxps', 'xps', 'odt', 'odp', 'ods', 'odg', 'odc', 'odb', 'odf', 'webp', 'wp', 'wpd', 'key', 'numbers', 'pages'];
 /**
 	* Character validation global variables
  *

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "2.9.1",
+  "version": "2.9.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -5392,8 +5392,8 @@
       }
     },
     "cli-table": {
-      "version": "github:automattic/cli-table#7b14232ba779929e1859b267bf753c150d90a618",
-      "from": "github:automattic/cli-table#7b14232",
+      "version": "git+ssh://git@github.com/automattic/cli-table.git#7b14232ba779929e1859b267bf753c150d90a618",
+      "from": "cli-table@github:automattic/cli-table#7b14232",
       "requires": {
         "chalk": "^2.4.1",
         "wcwidth": "^1.0.1"
@@ -6602,8 +6602,8 @@
       "dev": true
     },
     "eslint-config-wpvip": {
-      "version": "github:automattic/eslint-config-wpvip#c6605d1c3a545d43ac2149cd464ec3c38ebc58d5",
-      "from": "github:automattic/eslint-config-wpvip#c6605d1",
+      "version": "git+ssh://git@github.com/automattic/eslint-config-wpvip.git#c6605d1c3a545d43ac2149cd464ec3c38ebc58d5",
+      "from": "eslint-config-wpvip@github:automattic/eslint-config-wpvip#c6605d1",
       "dev": true,
       "requires": {
         "eslint-config-wpcalypso": "^4.0.0"
@@ -10021,8 +10021,8 @@
       "dev": true
     },
     "lando": {
-      "version": "git+https://github.com/Automattic/lando-cli.git#57d2cd8a23e73b3e5165c3e2862b42aa0881ef2f",
-      "from": "git+https://github.com/Automattic/lando-cli.git#v3.5.1-patch2021_12_06",
+      "version": "git+ssh://git@github.com/Automattic/lando-cli.git#57d2cd8a23e73b3e5165c3e2862b42aa0881ef2f",
+      "from": "lando@git+https://github.com/Automattic/lando-cli.git#v3.5.1-patch2021_12_06",
       "requires": {
         "@lando/platformsh": "^0.6.0",
         "axios": "0.21.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "2.9.1",
+  "version": "2.9.2",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {
@@ -42,7 +42,8 @@
   },
   "scripts": {
     "test": "npm run lint && npm run flow && jest --coverage",
-    "prepare": "npm run build",
+    "clean": "rimraf dist",
+    "prepare": "npm run clean && npm run build",
     "prepack": "npm run prepareConfig:publish",
     "postinstall": "node ./helpers/check-version.js",
     "build": "npm run prepareConfig:local && babel src -d dist",
@@ -100,7 +101,8 @@
     "jest": "27.2.1",
     "nock": "13.0.11",
     "prettier": "npm:wp-prettier@2.0.5",
-    "publish-please": "5.5.2"
+    "publish-please": "5.5.2",
+    "rimraf": "3.0.2"
   },
   "dependencies": {
     "@apollo/client": "^3.3.6",