Merge branch 'trunk' into update/docs-pt-vip-export

README.md

@@ -14,7 +14,7 @@ VIP-CLI is a tool for interacting with and managing your [WordPress VIP applicat
 
 ## Further information
 
-- In the [WordPress VIP Lobby](https://lobby.vip.wordpress.com/) find announcements related to the [CLI](https://lobby.vip.wordpress.com/?s=vip-cli) and [API](https://lobby.vip.wordpress.com/?s=vip%20go%20api).
-- The [WordPress VIP Documentation](https://docs.wpvip.com/) has instructions related to the [CLI](https://docs.wpvip.com/technical-references/vip-cli/).
+- In the [WordPress VIP Lobby](https://lobby.vip.wordpress.com/) find announcements related to [VIP-CLI](https://lobby.vip.wordpress.com/?s=vip-cli) and [API](https://lobby.vip.wordpress.com/?s=vip%20go%20api).
+- Find instructions for using [VIP-CLI](https://docs.wpvip.com/vip-cli/) in [WordPress VIP's Documentation](https://docs.wpvip.com/).
 - [Changelog](https://github.com/Automattic/vip-cli/blob/trunk/docs/CHANGELOG.md) file for VIP-CLI is available.
-- [VIP Cloud Changelog](https://wpvipchangelog.wordpress.com/) logs changes to the [CLI](https://wpvipchangelog.wordpress.com/?s=cli) and other aspects of the platform.
+- [VIP Cloud Changelog](https://wpvipchangelog.wordpress.com/) logs changes to the [VIP-CLI](https://wpvipchangelog.wordpress.com/?s=cli) and other aspects of the platform.

docs/ARCHITECTURE.md

@@ -2,7 +2,7 @@
 
 ## Basic functionality
 
-This is a CLI for interacting with and managing your [WordPress VIP applications](https://docs.wpvip.com/technical-references/vip-cli/). Data is inputted and outputted via terminal to the [API offered by WordPress VIP](#communicating-with-wpvip-api) and to/from local filesystem.
+This is a CLI for interacting with and managing your [WordPress VIP applications](https://docs.wpvip.com/vip-cli/). Data is inputted and outputted via terminal to the [API offered by WordPress VIP](#communicating-with-wpvip-api) and to/from local filesystem.
 
 For configuration, a few [environmental variables](SETUP.md#environmental-variables) are used and some [configuration files](SETUP.md#configuration-files) as well. No [database](#database) is required.
 

docs/SETUP.md

@@ -25,7 +25,7 @@ Then, launch the command and follow the prompts:
 vip
 ```
 
-If you need more information, check out our [VIP-CLI documentation](https://docs.wpvip.com/technical-references/vip-cli/).
+If you need more information, check out our [VIP-CLI documentation](https://docs.wpvip.com/vip-cli/).
 
 ### Installation for developers
 
@@ -73,7 +73,7 @@ To start the software locally, run:
 vip
 ```
 
-If you need more information, check out our [VIP-CLI documentation](https://docs.wpvip.com/technical-references/vip-cli/).
+If you need more information, check out our [VIP-CLI documentation](https://docs.wpvip.com/vip-cli/).
 
 ### Analytics
 

package.json

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

src/bin/vip-import-sql.js

@@ -231,13 +231,21 @@ const examples = [
 	},
 ];
 
-export const promptToContinue = async ( { launched, formattedEnvironment, track, domain } ) => {
+export const promptToContinue = async ( {
+	launched,
+	formattedEnvironment,
+	track,
+	domain,
+	tableNames,
+} ) => {
 	console.log();
 	const promptToMatch = domain.toUpperCase();
 	const promptResponse = await prompt( {
 		type: 'input',
 		name: 'confirmedDomain',
-		message: `You are about to import the above tables into a ${
+		message: `You are about to import ${
+			tableNames && Array.isArray( tableNames ) && tableNames.length ? 'above tables' : ''
+		} into a ${
 			launched ? 'launched' : 'un-launched'
 		} ${ formattedEnvironment } site ${ chalk.yellow( domain ) }.\nType '${ chalk.yellow(
 			promptToMatch
@@ -459,6 +467,7 @@ void command( {
 			formattedEnvironment,
 			track,
 			domain,
+			tableNames,
 		} );
 
 		/**

src/bin/vip-validate-preflight.js

@@ -121,9 +121,7 @@ async function getBuildConfiguration( application, environment ) {
 						application.name
 					) } application.\n\n` +
 					'You can read more about organization and application roles on our documentation:\n' +
-					chalk.underline(
-						'https://docs.wpvip.com/technical-references/enterprise-authentication/'
-					)
+					chalk.underline( 'https://docs.wpvip.com/manage-user-access/vip-dashboard/' )
 			);
 
 			await trackEvent( 'validate_preflight_command_error', {

src/commands/backup-db.ts

@@ -183,7 +183,7 @@ If you would like to run the same command, you can retry in ${ formatDuration(
 Alternatively, you can export the latest existing database backup by running: ${ chalk.green(
 						'vip @app.env export sql'
 					) }, right away.
-Learn more about limitations around generating database backups: https://docs.wpvip.com/technical-references/vip-dashboard/backups/#0-limitations
+Learn more about limitations around generating database backups: https://docs.wpvip.com/databases/backups/limitations/
 					`;
 					exit.withError( errMessage );
 				}

src/commands/export-sql.js

@@ -311,7 +311,7 @@ export class ExportSQLCommand {
 		noticeMessage +=
 			'If a recent database backup does not exist, a new one will be generated for this environment. ';
 		noticeMessage +=
-			'Learn more about this: https://docs.wpvip.com/technical-references/vip-dashboard/backups/#2-download-a-full-database-backup \n';
+			'Learn more about this: https://docs.wpvip.com/databases/backups/download-a-full-database-backup/ \n';
 		this.log( noticeMessage );
 
 		await cmd.run( false );

src/lib/dev-environment/dev-environment-cli.ts

@@ -533,7 +533,7 @@ function validateLocalPath( component: string, providedPath: string ) {
 			// eslint-disable-next-line max-len
 			const message = `Provided path "${ providedPath }" is missing following files/folders: ${ missingFiles.join(
 				', '
-			) }. Learn more: https://docs.wpvip.com/technical-references/vip-codebase/#1-wordpress`;
+			) }. Learn more: https://docs.wpvip.com/wordpress-skeleton/`;
 			return {
 				result: false,
 				message,

src/lib/dev-environment/dev-environment-lando.ts

@@ -413,8 +413,7 @@ export async function landoInfo(
 		}
 
 		// Add documentation link
-		appInfo.Documentation =
-			'https://docs.wpvip.com/technical-references/vip-local-development-environment/';
+		appInfo.Documentation = 'https://docs.wpvip.com/vip-local-development-environment/';
 
 		return appInfo as LandoInfoResult;
 	} finally {