@automattic/vip 4.0.11 → 4.0.13

package/dist/bin/vip-import-sql.js

@@ -48,12 +48,6 @@ const appQuery = `
 			dbOperationInProgress
 			importInProgress
 		}
-		wpSitesSDS {
-			nodes {
-				homeUrl
-				id
-			}
-		}
 	}
 `;
 const START_IMPORT_MUTATION = (0, _graphqlTag.default)`
@@ -403,7 +397,6 @@ const displayPlaybook = ({
   fileName,
   domain,
   formattedEnvironment,
-  unformattedEnvironment,
   isMultiSite,
   app
 }) => {
@@ -418,53 +411,19 @@ const displayPlaybook = ({
     };
     (0, _format.formatSearchReplaceValues)(searchReplace, output);
   }
-  let siteArray = [];
   if (isMultiSite) {
     console.log(`  multisite: ${isMultiSite.toString()}`);
-    const selectedEnvironmentObj = app?.environments?.find(env => unformattedEnvironment === env.type);
-    siteArray = selectedEnvironmentObj?.wpSitesSDS?.nodes;
   }
   if (!tableNames.length) {
     debug('Validation was skipped. No playbook information will be displayed.');
   } else {
     // output the table names
     console.log();
-    if (!isMultiSite) {
-      console.log('Tables that will be imported by this process:');
-      console.log((0, _cliColumns.default)(tableNames));
-    } else {
-      // we have siteArray from the API, use it and the table names together
-      if (siteArray === 'undefined' || !siteArray) {
-        console.log(_chalk.default.yellowBright('Unable to determine the network sites affected by this import. Please proceed only if you are confident that the contents of the file are valid for import.'));
-        return;
-      } else if (!siteArray?.length) {
-        throw new Error('There were no sites in your multisite installation.');
-      }
-      const multiSiteBreakdown = siteArray.map(wpSite => {
-        let siteRegex;
-        if (wpSite.id === 1) {
-          siteRegex = /^wp_[a-z]+/i;
-        } else {
-          // eslint-disable-next-line security/detect-non-literal-regexp
-          siteRegex = new RegExp(`^wp_${parseInt(wpSite.id, 10)}_[a-z]+`, 'i');
-        }
-        const tableNamesInGroup = tableNames.filter(name => siteRegex.test(name));
-        return {
-          id: wpSite.id,
-          url: wpSite.homeUrl,
-          tables: tableNamesInGroup
-        };
-      });
-      if (launched) {
-        console.log(_chalk.default.yellowBright('You are updating tables in a launched multisite environment. The performance of sites on the network might be impacted by this operation.'));
-      }
-      console.log(_chalk.default.yellow('The following sites will be affected by the import:'));
-      multiSiteBreakdown.forEach(siteObject => {
-        console.log();
-        console.log(_chalk.default.blueBright(`Blog with ID ${siteObject.id} and URL ${siteObject.url} will import the following tables:`));
-        console.log((0, _cliColumns.default)(siteObject.tables));
-      });
+    if (isMultiSite && launched) {
+      console.log(_chalk.default.yellowBright('You are updating tables in a launched multisite environment. The performance of sites on the network might be impacted by this operation.'));
     }
+    console.log('Tables that will be imported by this process:');
+    console.log((0, _cliColumns.default)(tableNames));
   }
 };
 (0, _command.default)({
@@ -546,7 +505,6 @@ const displayPlaybook = ({
     fileName: fileNameOrURL,
     domain,
     formattedEnvironment,
-    unformattedEnvironment: opts.env.type,
     isMultiSite,
     app
   });

package/docs/COMMANDER-MIGRATION.md

@@ -5,7 +5,7 @@ Goal: remove the abandoned `args` package, keep CLI behavior stable, and support
 ## Migration Outcome
 
 - `src/lib/cli/command.js` is the active Commander-backed compatibility wrapper for all bins that call `command()`.
-- `args` has been removed from `package.json` and `npm-shrinkwrap.json`.
+- `args` has been removed from `package.json` and `package-lock.json`.
 - Root command flow (`src/bin/vip.js`) now dispatches via the shared Commander wrapper again, preserving login gating and subcommand chaining.
 - Temporary side-path wrapper work has been removed (`src/lib/cli/command-commander.ts` deleted).
 

package/helpers/generate-docs.js

@@ -65,11 +65,19 @@ const parseOutput = output => {
 		}
 
 		if ( currentSection === SECTION_COMMAND ) {
-			const [ , command, description ] = line.match( COMMAND_REGEXP );
-			result.commands.push( {
-				command,
-				description,
-			} );
+			const match = line.match( COMMAND_REGEXP );
+			if ( match ) {
+				const [ , command, description ] = match;
+				result.commands.push( {
+					command,
+					description,
+				} );
+			} else if ( result.commands.length ) {
+				// Continuation of a wrapped command description.
+				result.commands[ result.commands.length - 1 ].description += ' ' + line;
+			} else {
+				console.error( 'Unknown command line', line );
+			}
 			continue;
 		}
 		if ( currentSection === SECTION_OPTIONS ) {
@@ -79,8 +87,11 @@ const parseOutput = output => {
 					option,
 					description,
 				} );
+			} else if ( result.options.length ) {
+				// Continuation of a wrapped option description.
+				result.options[ result.options.length - 1 ].description += ' ' + line;
 			} else {
-				console.log( 'Unknown option', line );
+				console.error( 'Unknown option', line );
 			}
 			continue;
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "4.0.11",
+  "version": "4.0.13",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {
@@ -160,7 +160,7 @@
     "enquirer": "2.4.1",
     "esbuild": "^0.28.0",
     "fetch-retry": "^6.0.0",
-    "graphql": "17.0.1",
+    "graphql": "17.0.2",
     "graphql-tag": "2.12.7",
     "https-proxy-agent": "^9.0.0",
     "js-yaml": "^5.0.0",