@automattic/vip 3.8.5 → 3.8.7

package/dist/bin/vip-validate-preflight.js

@@ -19,7 +19,7 @@ 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 ALLOWED_NODEJS_VERSIONS = ['14', '16', '18'];
+const ALLOWED_NODEJS_VERSIONS = ['18', '20', '22'];
 const appQuery = exports.appQuery = `
 	id
 	name
@@ -42,7 +42,7 @@ const appQuery = exports.appQuery = `
 	}
 `;
 let suppressOutput = false;
-let outputJson = false;
+let outputFormat = 'table';
 let harmoniaArgs = [];
 
 /**
@@ -321,7 +321,7 @@ async function handleResults(harmonia, results) {
   });
 
   // If the output is JSON, reenable the logToConsole output and print-out the json format.
-  if (outputJson) {
+  if (outputFormat === 'json') {
     suppressOutput = false;
     logToConsole(harmonia.resultsJSON());
     process.exit(0);
@@ -383,9 +383,9 @@ async function validateArgs(opt) {
   }
 
   // If the JSON option is enabled, all the stdout should be suppressed to prevent polluting the output.
-  if (opt.json) {
+  if (opt.format === 'json') {
     suppressOutput = true;
-    outputJson = true;
+    outputFormat = 'json';
   }
   if (opt.app) {
     // Get build information from API and store it in the env object
@@ -459,10 +459,10 @@ if (parsedAlias.app) {
 } else {
   logToConsole(_chalk.default.bold.yellow('Warning: ') + 'The preflight tests are running without a provided application and/or environment.\n' + 'Some app-dependent configurations, such as environment variables, might not defined.');
 }
-(0, _command.default)(commandOpts).option('verbose', 'Increase logging level to include app build and server boot up messages', false).option('node-version', 'Select a specific target Node.JS version in semver format (MAJOR.MINOR.PATCH) or a MAJOR').option('wait', 'Configure the time to wait in ms for the app to boot up. Do not change unless you have issues', 3000).option(['p', 'port'], 'Configure the port to use for the app (defaults to a random port between 3001 and 3999)').option('json', 'Output the results as JSON', false).option(['P', 'path'], 'Path to the app to be tested', process.cwd()).examples([{
+(0, _command.default)(commandOpts).option('verbose', 'Increase logging level to include app build and server boot up messages', false).option('node-version', `Select a specific target Node.JS version in semver format (MAJOR.MINOR.PATCH) or a MAJOR (${ALLOWED_NODEJS_VERSIONS.join(', ')})`).option('wait', 'Configure the time to wait in ms for the app to boot up. Do not change unless you have issues', 3000).option(['p', 'port'], 'Configure the port to use for the app (defaults to a random port between 3001 and 3999)').option('format', 'Output the log lines in CSV or JSON format', 'table').option(['P', 'path'], 'Path to the app to be tested', process.cwd()).examples([{
   usage: 'vip @mysite.production validate preflight',
   description: 'Runs the preflight tests to validate if your application is ready to be deployed to VIP Go'
 }, {
-  usage: 'vip @mysite.production validate preflight --json > results.json',
+  usage: 'vip @mysite.production validate preflight --format json > results.json',
   description: 'Runs the preflight tests, but output the results in JSON format, and redirect the output to a file'
 }]).argv(process.argv, vipValidatePreflightCommand);

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

@@ -213,6 +213,20 @@ class DevEnvSyncSQLCommand {
     if (!networkSites) {
       return;
     }
+    const prologue = `
+DROP PROCEDURE IF EXISTS vip_sync_update_blog_domains;
+DELIMITER $$
+CREATE PROCEDURE vip_sync_update_blog_domains()
+BEGIN
+    IF EXISTS (SELECT * FROM information_schema.tables WHERE table_schema = 'wordpress' AND table_name = 'wp_blogs') THEN
+`;
+    const epilogue = `
+    END IF;
+END$$
+DELIMITER ;
+CALL vip_sync_update_blog_domains();
+DROP PROCEDURE vip_sync_update_blog_domains;
+`;
     const queries = [];
     for (const site of networkSites) {
       if (!site?.blogId || !site?.homeUrl) {
@@ -220,10 +234,11 @@ class DevEnvSyncSQLCommand {
       }
       const oldDomain = new URL(site.homeUrl).hostname;
       const newDomain = site.blogId !== 1 ? `${this.slugifyDomain(oldDomain)}.${this.landoDomain}` : this.landoDomain;
-      queries.push(`UPDATE wp_blogs SET domain = '${newDomain}' WHERE blog_id = ${Number(site.blogId)};`);
+      queries.push(`        UPDATE wp_blogs SET domain = '${newDomain}' WHERE blog_id = ${Number(site.blogId)};`);
     }
     if (queries.length) {
-      await _fs.default.promises.appendFile(this.sqlFile, queries.join('\n'));
+      const sql = `${prologue}\n${queries.join('\n')}\n${epilogue}`;
+      await _fs.default.promises.appendFile(this.sqlFile, sql);
     }
   }
 

package/dist/lib/config/software.js

@@ -140,17 +140,20 @@ const _optionsForVersion = softwareSettings => {
     if (option.deprecated) {
       versionChoices.deprecated.push({
         message: `${option.version} (deprecated)`,
-        value: option.version
+        value: option.version,
+        deprecated: option.deprecated
       });
     } else if (option.unstable) {
       versionChoices.test.push({
         message: `${option.version} (test)`,
-        value: option.version
+        value: option.version,
+        deprecated: option.deprecated
       });
     } else {
       versionChoices.supported.push({
         message: option.version,
-        value: option.version
+        value: option.version,
+        deprecated: option.deprecated
       });
     }
   }
@@ -309,9 +312,9 @@ const formatSoftwareSettings = (softwareSetting, includes, format) => {
     version
   };
   if (includes.includes('available_versions')) {
-    result.available_versions = _optionsForVersion(softwareSetting).map(option => option.value);
+    result.available_versions = _optionsForVersion(softwareSetting).filter(option => !option.deprecated).map(option => option.value);
     if (format !== 'json') {
-      result.available_versions = result.available_versions.join(',');
+      result.available_versions = result.available_versions.sort().join(',');
     }
   }
   return result;

package/docs/CHANGELOG.md

@@ -1,8 +1,19 @@
 ## Changelog
 
+## 3.8.7
+
+* fix(dev-env): SQL sync for single sites
+
+**Full Changelog**: https://github.com/Automattic/vip-cli/compare/3.8.6...3.8.7
+
+## 3.8.6
+
+* Updating Node.js versions and standardize the format
+
+**Full Changelog**: https://github.com/Automattic/vip-cli/compare/3.8.5...3.8.6
+
 ## 3.8.5
 
-## What's Changed
 * build(deps-dev): bump the babel group with 4 updates
 * build(deps-dev): bump typescript from 5.6.2 to 5.6.3
 * Update the sync command to follow the VIP-CLI style guide

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@automattic/vip",
-  "version": "3.8.5",
+  "version": "3.8.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@automattic/vip",
-      "version": "3.8.5",
+      "version": "3.8.7",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package/package.json

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