@automattic/vip 2.38.0-dev.2 → 2.38.1

package/dist/bin/vip-app-deploy.js

@@ -50,8 +50,8 @@ const appQuery = `
 	}
 `;
 const START_DEPLOY_MUTATION = (0, _graphqlTag.default)`
-	mutation StartDeploy($input: AppEnvironmentDeployInput) {
-		startDeploy(input: $input) {
+	mutation StartCustomDeploy($input: AppEnvironmentCustomDeployInput) {
+		startCustomDeploy(input: $input) {
 			app {
 				id
 				name

package/dist/bin/vip-db-phpmyadmin.js

@@ -19,15 +19,10 @@ const examples = [{
 }];
 const appQuery = `
 	id,
-	name,
-	type,
-	organization { id, name },
 	environments{
 		id
 		appId
 		type
-		name
-		primaryDomain { name }
 		uniqueLabel
 	}
 `;

package/dist/commands/export-sql.js

@@ -393,9 +393,13 @@ class ExportSQLCommand {
     this.progressTracker.stepSuccess(this.steps.PREPARE);
     await (0, _utils.pollUntil)(this.getExportJob.bind(this), EXPORT_SQL_PROGRESS_POLL_INTERVAL, this.isCreated.bind(this));
     this.progressTracker.stepSuccess(this.steps.CREATE);
-    const storageConfirmed = await this.progressTracker.handleContinuePrompt(async () => {
-      return await this.confirmEnoughStorage(await this.getExportJob());
-    }, 3);
+    const storageConfirmed = await this.progressTracker.handleContinuePrompt(async setPromptShown => {
+      const status = await this.confirmEnoughStorage(await this.getExportJob());
+      if (status.isPromptShown) {
+        setPromptShown();
+      }
+      return status.continue;
+    });
     if (storageConfirmed) {
       this.progressTracker.stepSuccess(this.steps.CONFIRM_ENOUGH_STORAGE);
     } else {

package/dist/commands/phpmyadmin.js

@@ -183,6 +183,9 @@ class PhpMyAdminCommand {
         stack: error.stack
       });
       this.stopProgressTracker();
+      if (error.graphQLErrors?.find(e => e.message === 'Unauthorized')) {
+        exit.withError('You do not have sufficient permission to access phpMyAdmin for this environment.');
+      }
       exit.withError('Failed to enable PhpMyAdmin. Please try again. If the problem persists, please contact support.');
     }
     let url;

package/dist/lib/backup-storage-availability/backup-storage-availability.js

@@ -77,14 +77,23 @@ class BackupStorageAvailability {
       const confirmPrompt = new _enquirer.Confirm({
         message: `We recommend that you have at least ${this.bytesToHuman(storageRequired)} of free space in your machine to download this database backup. Do you still want to continue with downloading the database backup?`
       });
-      return await confirmPrompt.run();
+      return {
+        continue: await confirmPrompt.run(),
+        isPromptShown: true
+      };
     }
-    return true;
+    return {
+      continue: true,
+      isPromptShown: false
+    };
   }
 
   // eslint-disable-next-line id-length
   async validateAndPromptDiskSpaceWarningForDevEnvBackupImport() {
     let storageAvailableInMainMachinePrompted = false;
+
+    // there's two prompts, so as long as one prompt is shown, we need to set isPromptShown
+    let isPromptShown = false;
     if (!(await this.isStorageAvailableInMainMachine())) {
       const storageRequired = this.getStorageRequiredInMainMachine();
       const storageAvailableInVipPath = this.bytesToHuman(await this.getStorageAvailableInVipPath());
@@ -93,9 +102,13 @@ class BackupStorageAvailability {
 Do you still want to continue with importing the database backup?
 `
       });
+      isPromptShown = true;
       storageAvailableInMainMachinePrompted = await confirmPrompt.run();
       if (!storageAvailableInMainMachinePrompted) {
-        return false;
+        return {
+          continue: false,
+          isPromptShown
+        };
       }
     }
     try {
@@ -106,16 +119,26 @@ Do you still want to continue with importing the database backup?
           message: `We recommend that you have at least ${this.bytesToHuman(storageRequired)} of free space in your Docker machine to import this database backup. We estimate that you currently have ${storageAvailableInDockerMachine} of space in your machine.
 Do you still want to continue with importing the database backup?`
         });
-        return await confirmPrompt.run();
+        isPromptShown = true;
+        return {
+          continue: await confirmPrompt.run(),
+          isPromptShown
+        };
       }
     } catch (error) {
       if (error instanceof _dockerMachineNotFoundError.DockerMachineNotFoundError) {
         // skip storage available check
-        return true;
+        return {
+          continue: true,
+          isPromptShown
+        };
       }
       throw error;
     }
-    return true;
+    return {
+      continue: true,
+      isPromptShown
+    };
   }
 }
 exports.BackupStorageAvailability = BackupStorageAvailability;

package/dist/lib/cli/progress.js

@@ -181,8 +181,14 @@ class ProgressTracker {
   async handleContinuePrompt(prompt) {
     this.print();
     this.stopPrinting();
-    const returnValue = await prompt();
-    this.displayFromStep = [...this.getSteps().values()].findIndex(step => step.status === StepStatus.RUNNING);
+    let isPromptShown = false;
+    const setPromptShown = () => {
+      isPromptShown = true;
+    };
+    const returnValue = await prompt(setPromptShown);
+    if (isPromptShown) {
+      this.displayFromStep = [...this.getSteps().values()].findIndex(step => step.status === StepStatus.RUNNING);
+    }
     let hasPrintedOnce = false;
     const printingStartedPromise = new Promise(resolve => {
       this.startPrinting(() => {
@@ -196,7 +202,9 @@ class ProgressTracker {
         for (let iteration = 0; iteration < this.stepsFromCaller.size; iteration++) {
           linesToSkip += _nodeOs.EOL;
         }
-        process.stdout.write(linesToSkip);
+        if (isPromptShown) {
+          process.stdout.write(linesToSkip);
+        }
         hasPrintedOnce = true;
         resolve();
       });

package/dist/lib/dev-environment/docker-utils.js

@@ -60,8 +60,9 @@ async function getDockerSocket() {
 
     // Try the default location
     paths.push('/var/run/docker.sock');
-    // Try an alternative location
+    // Try alternative locations
     paths.push((0, _nodePath.join)((0, _nodeOs.homedir)(), '.docker', 'run', 'docker.sock'));
+    paths.push((0, _nodePath.join)((0, _nodeOs.homedir)(), '.orbstack', 'run', 'docker.sock'));
     for (const socketPath of paths) {
       try {
         const stats = await (0, _promises.stat)(socketPath);