@automattic/vip 4.0.11 → 4.1.0

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/docs/RELEASING.md

@@ -76,6 +76,12 @@ You can release either using GitHub Actions or locally.
 
 This is the preferred method for pushing out the latest release. The workflow runs a bunch of validations, generates a build, bump versions + tags, pushes out to npm, and bumps to the next dev version.
 
+The repository uses `package-lock.json` for npm 12 development and CI installs. An identical
+`npm-shrinkwrap.json` is published with npm 11 so npm 11 and older consumers retain a locked CLI
+dependency tree. Run `npm run sync:shrinkwrap` after changing `package-lock.json`; CI rejects drift
+between the two files. The publish workflows intentionally use npm 11 because npm 12 excludes
+`npm-shrinkwrap.json` from package tarballs.
+
 Please keep in mind internal guidelines before releasing.
 
 To release, follow these steps:
@@ -119,7 +125,7 @@ To publish locally, follow these steps:
 1. Push the tag to GitHub (`git push --tags`)
 1. Push the trunk branch `git push`
 1. Make sure you're part of the Automattic organization in npm
-1. Publish the release to npm (`npm publish --access public`) the script will do some extra checks (
+1. Use npm 11 and publish the release (`npx --yes --package=npm@11 npm publish --access public`). The script will do some extra checks (
    node version, branch, etc) to ensure everything is correct. If all looks good, the new version
    will be published and you can proceed.
 1. Edit [the release on GitHub](https://github.com/Automattic/vip-cli/releases) to include a description
@@ -137,8 +143,8 @@ In order to do that, please follow this:
 
 <summary><details>
 
-1. Manually change the version in `package.json` and `package-lock.json` to a dev version. Example: `1.4.0-dev1`
-1. Run `npm publish --tag next` (When `--tag` is specified, we bypass the usual branch protection that doesn't allow you to publish form a brunch other than `trunk`).
+1. Set the dev version with npm 11 so both lockfiles remain synchronized. Example: `npx --yes --package=npm@11 npm version --no-git-tag-version 1.4.0-dev1`.
+1. Run `npx --yes --package=npm@11 npm publish --tag next` (When `--tag` is specified, we bypass the usual branch protection that doesn't allow you to publish form a brunch other than `trunk`).
 
 You can repeat this with every new version until you're happy with your version and ready to a public release. We currently don't support multiple branches for multiple versions. When it's the case, this process needs to be done for every version in every branch.
 

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/helpers/sync-shrinkwrap.js

@@ -0,0 +1,32 @@
+const { copyFileSync, readFileSync } = require( 'node:fs' );
+const path = require( 'node:path' );
+
+const PACKAGE_LOCK = 'package-lock.json';
+const NPM_SHRINKWRAP = 'npm-shrinkwrap.json';
+
+function syncShrinkwrap( { cwd = process.cwd(), check = false } = {} ) {
+	const packageLockPath = path.join( cwd, PACKAGE_LOCK );
+	const shrinkwrapPath = path.join( cwd, NPM_SHRINKWRAP );
+
+	if ( check ) {
+		const packageLock = readFileSync( packageLockPath );
+		const shrinkwrap = readFileSync( shrinkwrapPath );
+		if ( ! packageLock.equals( shrinkwrap ) ) {
+			throw new Error( `${ NPM_SHRINKWRAP } is out of sync with ${ PACKAGE_LOCK }` );
+		}
+		return;
+	}
+
+	copyFileSync( packageLockPath, shrinkwrapPath );
+}
+
+if ( require.main === module ) {
+	try {
+		syncShrinkwrap( { check: process.argv.includes( '--check' ) } );
+	} catch ( error ) {
+		console.error( error.message );
+		process.exitCode = 1;
+	}
+}
+
+module.exports = { syncShrinkwrap };

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@automattic/vip",
-  "version": "4.0.11",
+  "version": "4.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@automattic/vip",
-      "version": "4.0.11",
+      "version": "4.1.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -25,7 +25,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",
@@ -8886,9 +8886,9 @@
       "license": "ISC"
     },
     "node_modules/graphql": {
-      "version": "17.0.1",
-      "resolved": "https://registry.npmjs.org/graphql/-/graphql-17.0.1.tgz",
-      "integrity": "sha512-8eWbg5Zcv/8o20nzEjHUGPTj20MLFJjc5kagbIPxbaeGxvFwpitJhemEC/k17n5+UD4M/9ea5rTuce78mELujQ==",
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/graphql/-/graphql-17.0.2.tgz",
+      "integrity": "sha512-FRWbddMxfkjiB7z+aQDWIR+E34xo9I8c9mtK2RPv8PmMzKRvrdsreHL/Ui/TmwHJfhHChEtsFPyMHKI+xuarQQ==",
       "license": "MIT",
       "engines": {
         "node": "^22.0.0 || ^24.0.0 || ^25.0.0 || >=26.0.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "4.0.11",
+  "version": "4.1.0",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {
@@ -88,13 +88,16 @@
     "build:watch": "babel src -d dist --watch --source-maps --extensions=\".js,.ts\"",
     "format": "npm run cmd:format -- --write",
     "format:check": "npm run cmd:format -- --check",
+    "check:shrinkwrap": "node ./helpers/sync-shrinkwrap.js --check",
+    "sync:shrinkwrap": "node ./helpers/sync-shrinkwrap.js",
     "jest": "jest --testPathIgnorePatterns __tests__/devenv-e2e/",
     "jest:debug": "NODE_ENV=test node --inspect-brk=0.0.0.0:9252 ./node_modules/.bin/jest --forceExit --runInBand --testTimeout=100000000",
     "lint": "npm run cmd:lint .",
     "lint:fix": "npm run cmd:lint . -- --fix",
     "publish-please": "publish-please",
     "prepublishOnly": "node ./helpers/prepublishOnly.js",
-    "smoke:release": "node ./helpers/release-smoke-test.js"
+    "smoke:release": "node ./helpers/release-smoke-test.js",
+    "version": "npm run sync:shrinkwrap"
   },
   "repository": {
     "type": "git",
@@ -160,7 +163,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",