@automattic/vip 3.23.1 → 3.23.3

package/dist/bin/vip-config-envvar-delete.js

@@ -63,7 +63,11 @@ async function deleteEnvVarCommand(arg, opt) {
       (0, _input.cancel)();
     }
   }
-  await (0, _api.deleteEnvVar)(opt.app.id, opt.env.id, name).catch(async err => {
+  let reloadManifest = false;
+  if (!opt.skipConfirmation) {
+    reloadManifest = await (0, _input.promptForReloadManifest)(opt.app.typeId);
+  }
+  await (0, _api.deleteEnvVar)(opt.app.id, opt.env.id, name, reloadManifest).catch(async err => {
     await (0, _tracker.trackEvent)('envvar_delete_mutation_error', {
       ...trackingParams,
       error: err.message
@@ -72,8 +76,8 @@ async function deleteEnvVarCommand(arg, opt) {
   });
   await (0, _tracker.trackEvent)('envvar_delete_command_success', trackingParams);
   console.log(_chalk.default.green(`Successfully deleted environment variable ${JSON.stringify(name)}`));
-  if (!opt.skipConfirmation) {
-    console.log(_chalk.default.bgYellow(_chalk.default.bold('Important:')), 'Updates to environment variables will not be available until the application’s next deploy.');
+  if (!opt.skipConfirmation && !reloadManifest) {
+    (0, _input.showDeployWarning)();
   }
 }
 (0, _command.default)({

package/dist/bin/vip-config-envvar-set.js

@@ -82,7 +82,11 @@ async function setEnvVarCommand(arg, opt) {
       (0, _input.cancel)();
     }
   }
-  await (0, _api.setEnvVar)(opt.app.id, opt.env.id, name, value).catch(async err => {
+  let reloadManifest = false;
+  if (!opt.skipConfirmation) {
+    reloadManifest = await (0, _input.promptForReloadManifest)(opt.app.typeId);
+  }
+  await (0, _api.setEnvVar)(opt.app.id, opt.env.id, name, value, reloadManifest).catch(async err => {
     await (0, _tracker.trackEvent)('envvar_set_mutation_error', {
       ...trackingParams,
       error: err.message
@@ -91,8 +95,10 @@ async function setEnvVarCommand(arg, opt) {
   });
   await (0, _tracker.trackEvent)('envvar_set_command_success', trackingParams);
   console.log(_chalk.default.green(`Successfully set environment variable ${JSON.stringify(name)}`));
-  if (!opt.skipConfirmation) {
-    console.log(_chalk.default.bgYellow(_chalk.default.bold('Important:')), 'Updates to environment variables will not be available until the application’s next deploy.');
+  if (reloadManifest) {
+    console.log(_chalk.default.yellow('Environment variable is active and available.'));
+  } else if (!opt.skipConfirmation) {
+    (0, _input.showDeployWarning)();
   }
 }
 (0, _command.default)({

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

@@ -131,6 +131,7 @@ Are you sure you want to import the contents of the URL?
     sourceIsLocal = true;
     const fileMeta = await (0, _clientFileUploader.getFileMeta)(fileNameOrURL);
     fileMeta.fileName = fileNameOrURL;
+    let lastProgress = '';
     const {
       fileMeta: {
         basename
@@ -141,8 +142,15 @@ Are you sure you want to import the contents of the URL?
       app,
       env,
       fileMeta,
-      progressCallback: percentage => console.log(`Upload progress: ${percentage}%`)
+      progressCallback: percentage => {
+        if (percentage === lastProgress) {
+          return;
+        }
+        lastProgress = percentage;
+        process.stdout.write(`\rUpload progress: ${percentage}   `);
+      }
     });
+    process.stdout.write('\n');
 
     // small debug info to keep variables used
     debug('Uploaded file basename:', basename);

package/dist/lib/cli/command.js

@@ -440,30 +440,39 @@ _args.default.argv = async function (argv, cb) {
           break;
         }
       case 'import-media':
-        info.push({
-          key: 'Archive URL',
-          value: _chalk.default.blue.underline(this.sub)
-        });
-        options.overwriteExistingFiles = Object.hasOwn(options, 'overwriteExistingFiles') && Boolean(options.overwriteExistingFiles) && !['false', 'no'].includes(options.overwriteExistingFiles);
-        info.push({
-          key: 'Overwrite any existing files',
-          value: options.overwriteExistingFiles ? '✅ Yes' : `${_chalk.default.red('x')} No`
-        });
-        options.importIntermediateImages = Object.hasOwn(options, 'importIntermediateImages') && Boolean(options.importIntermediateImages) && !['false', 'no'].includes(options.importIntermediateImages);
-        info.push({
-          key: 'Import intermediate image files',
-          value: options.importIntermediateImages ? '✅ Yes' : `${_chalk.default.red('x')} No`
-        });
-        options.exportFileErrorsToJson = Object.hasOwn(options, 'exportFileErrorsToJson') && Boolean(options.exportFileErrorsToJson) && !['false', 'no'].includes(options.exportFileErrorsToJson);
-        info.push({
-          key: 'Export any file errors encountered to a JSON file instead of a plain text file.',
-          value: options.exportFileErrorsToJson ? '✅ Yes' : `${_chalk.default.red('x')} No`
-        });
-        info.push({
-          key: 'Download file-error logs?',
-          value: options.saveErrorLog
-        });
-        break;
+        {
+          const isUrl = this.sub && (String(this.sub).startsWith('http://') || String(this.sub).startsWith('https://'));
+          const archiveLabel = isUrl ? 'Archive URL' : 'Archive Path';
+          info.push({
+            key: archiveLabel,
+            value: _chalk.default.blue.underline(this.sub)
+          });
+
+          // Update confirmation message if it's a local path
+          if (!isUrl && 'string' === typeof _opts.requireConfirm) {
+            message = message.replaceAll('the URL', 'the path');
+          }
+          options.overwriteExistingFiles = Object.hasOwn(options, 'overwriteExistingFiles') && Boolean(options.overwriteExistingFiles) && !['false', 'no'].includes(options.overwriteExistingFiles);
+          info.push({
+            key: 'Overwrite any existing files',
+            value: options.overwriteExistingFiles ? '✅ Yes' : `${_chalk.default.red('x')} No`
+          });
+          options.importIntermediateImages = Object.hasOwn(options, 'importIntermediateImages') && Boolean(options.importIntermediateImages) && !['false', 'no'].includes(options.importIntermediateImages);
+          info.push({
+            key: 'Import intermediate image files',
+            value: options.importIntermediateImages ? '✅ Yes' : `${_chalk.default.red('x')} No`
+          });
+          options.exportFileErrorsToJson = Object.hasOwn(options, 'exportFileErrorsToJson') && Boolean(options.exportFileErrorsToJson) && !['false', 'no'].includes(options.exportFileErrorsToJson);
+          info.push({
+            key: 'Export any file errors encountered to a JSON file instead of a plain text file.',
+            value: options.exportFileErrorsToJson ? '✅ Yes' : `${_chalk.default.red('x')} No`
+          });
+          info.push({
+            key: 'Download file-error logs?',
+            value: options.saveErrorLog
+          });
+          break;
+        }
       default:
     }
     const skipPrompt = _opts.skipConfirmPrompt || false;

package/dist/lib/constants/dev-environment.js

@@ -18,10 +18,6 @@ const DEV_ENVIRONMENT_PHP_VERSIONS = exports.DEV_ENVIRONMENT_PHP_VERSIONS = {
     image: 'ghcr.io/automattic/vip-container-images/php-fpm:8.2',
     label: '8.2 (recommended)'
   },
-  8.1: {
-    image: 'ghcr.io/automattic/vip-container-images/php-fpm:8.1',
-    label: '8.1'
-  },
   8.3: {
     image: 'ghcr.io/automattic/vip-container-images/php-fpm:8.3',
     label: '8.3'

package/dist/lib/envvar/api-delete.js

@@ -6,9 +6,20 @@ var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _api = _interopRequireDefault(require("../../lib/api"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const mutation = (0, _graphqlTag.default)`
-	mutation DeleteEnvironmentVariable($appId: Int!, $envId: Int!, $name: String!) {
+	mutation DeleteEnvironmentVariable(
+		$appId: Int!
+		$envId: Int!
+		$name: String!
+		$reloadManifest: Boolean!
+	) {
 		deleteEnvironmentVariable(
-			input: { applicationId: $appId, environmentId: $envId, name: $name, value: "" }
+			input: {
+				applicationId: $appId
+				environmentId: $envId
+				name: $name
+				value: ""
+				reloadManifest: $reloadManifest
+			}
 		) {
 			environmentVariables {
 				total
@@ -19,12 +30,13 @@ const mutation = (0, _graphqlTag.default)`
 		}
 	}
 `;
-async function deleteEnvVar(appId, envId, name) {
+async function deleteEnvVar(appId, envId, name, reloadManifest = false) {
   const api = (0, _api.default)();
   const variables = {
     appId,
     envId,
-    name
+    name,
+    reloadManifest
   };
   return api.mutate({
     mutation,

package/dist/lib/envvar/api-set.js

@@ -6,9 +6,21 @@ var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _api = _interopRequireDefault(require("../../lib/api"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const mutation = (0, _graphqlTag.default)`
-	mutation AddEnvironmentVariable($appId: Int!, $envId: Int!, $name: String!, $value: String!) {
+	mutation AddEnvironmentVariable(
+		$appId: Int!
+		$envId: Int!
+		$name: String!
+		$value: String!
+		$reloadManifest: Boolean!
+	) {
 		addEnvironmentVariable(
-			input: { applicationId: $appId, environmentId: $envId, name: $name, value: $value }
+			input: {
+				applicationId: $appId
+				environmentId: $envId
+				name: $name
+				value: $value
+				reloadManifest: $reloadManifest
+			}
 		) {
 			environmentVariables {
 				total
@@ -19,13 +31,14 @@ const mutation = (0, _graphqlTag.default)`
 		}
 	}
 `;
-async function setEnvVar(appId, envId, name, value) {
+async function setEnvVar(appId, envId, name, value, reloadManifest = false) {
   const api = (0, _api.default)();
   const variables = {
     appId,
     envId,
     name,
-    value
+    value,
+    reloadManifest
   };
   return api.mutate({
     mutation,

package/dist/lib/envvar/api.js

@@ -23,6 +23,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const appQuery = exports.appQuery = `
 	id
 	name
+	typeId
 	environments {
 		id
 		appId

package/dist/lib/envvar/input.js

@@ -3,9 +3,12 @@
 exports.__esModule = true;
 exports.cancel = cancel;
 exports.confirm = confirm;
+exports.promptForReloadManifest = promptForReloadManifest;
 exports.promptForValue = promptForValue;
+exports.showDeployWarning = showDeployWarning;
 var _chalk = _interopRequireDefault(require("chalk"));
 var _enquirer = require("enquirer");
+var _app = require("../app");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function cancel() {
   console.log(_chalk.default.yellow('Command cancelled by user.'));
@@ -31,4 +34,24 @@ async function promptForValue(message, mustMatch) {
     }
   });
   return str?.trim() ?? '';
+}
+
+/**
+ * Prompts the user to confirm whether to apply the environment variable update now.
+ *
+ * @param {number} appTypeId - The application type ID
+ * @return {Promise<boolean>} Whether to reload the manifest
+ */
+async function promptForReloadManifest(appTypeId) {
+  if ((0, _app.isAppNodejs)(appTypeId)) {
+    console.log(_chalk.default.yellow(`⚠️ Note: ${_chalk.default.bold('Only applies to runtime variable changes.')} Build-time environment variable changes won't take effect until your next deploy.`));
+  }
+  return await confirm('Apply this environment variable update now?');
+}
+
+/**
+ * Shows a warning message that the environment variable update won't be available until the next deploy.
+ */
+function showDeployWarning() {
+  console.log(_chalk.default.bgYellow(_chalk.default.bold('Important:')), 'This environment variable update will not be available until the next code deploy is made to this environment.');
 }