@automattic/vip 3.3.0 → 3.3.1

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

@@ -87,8 +87,8 @@ async function appDeployCmd(arg = [], opts = {}) {
   .replace(/[\-T:\.Z]/g, '').slice(0, 14);
   fileMeta.basename = `${datePrefix}-${fileMeta.basename}`;
   const deployMessage = opts.message ?? '';
-  const forceDeploy = opts.force;
-  if (!forceDeploy) {
+  const skipConfirm = opts.force || opts.skipConfirmation;
+  if (!skipConfirm) {
     const promptParams = {
       launched: Boolean(validatedArgs.launched),
       formattedEnvironment: (0, _format.formatEnvironment)(validatedArgs.envType),
@@ -227,9 +227,9 @@ const examples = [
   usage: 'vip app @mysite.develop deploy file.zip --message "This is a deploy message"',
   description: 'Deploy the given compressed file to your site'
 }, {
-  usage: 'vip app @mysite.develop deploy file.zip --force',
+  usage: 'vip app @mysite.develop deploy file.zip --skip-confirmation',
   description: 'Deploy the given compressed file to your site without prompting'
 }];
 void (0, _command.default)({
   requiredArgs: 1
-}).examples(examples).option('message', 'Custom message for deploy').option('force', 'Skip prompt').option('app', 'The application name or ID').option('env', 'The environment name or ID').argv(process.argv, appDeployCmd);
+}).examples(examples).option('message', 'Custom message for deploy').option('skip-confirmation', 'Skip confirmation prompt').option('force', 'Skip confirmation prompt (deprecated)').option('app', 'The application name or ID').option('env', 'The environment name or ID').argv(process.argv, appDeployCmd);

package/dist/bin/vip-app.js

@@ -15,7 +15,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
   await (0, _tracker.trackEvent)('app_command_execute');
   let res;
   try {
-    res = await (0, _app.default)(arg[0], 'id,repo,name,environments{id,appId,name,type,branch,currentCommit,primaryDomain{name},launched}');
+    res = await (0, _app.default)(arg[0], 'id,repo,name,environments{id,appId,name,type,branch,currentCommit,primaryDomain{name},launched,deploymentStrategy}');
   } catch (err) {
     await (0, _tracker.trackEvent)('app_command_fetch_error', {
       error: `App ${arg[0]} does not exist`
@@ -53,6 +53,14 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 
     // Flatten object
     clonedEnv.primaryDomain = clonedEnv.primaryDomain.name;
+
+    // Set branch to empty for custom deployments
+    if (clonedEnv.deploymentStrategy === 'custom-deploy') {
+      clonedEnv.branch = '-';
+    }
+
+    // Hide "deployment strategy" column
+    delete clonedEnv.deploymentStrategy;
     return clonedEnv;
   });
   return {

package/dist/bin/vip-dev-env-sync-sql.js

@@ -65,7 +65,7 @@ const appQuery = `
     });
     throw new _userError.default('Environment needs to be started first');
   }
-  const cmd = new _devEnvSyncSql.DevEnvSyncSQLCommand(app, env, slug, trackerFn);
+  const cmd = new _devEnvSyncSql.DevEnvSyncSQLCommand(app, env, slug, lando, trackerFn);
   // TODO: There's a function called handleCLIException for dev-env that handles exceptions but DevEnvSyncSQLCommand has its own implementation.
   // We should probably use handleCLIException instead?
   const didCommandRun = await cmd.run();

package/dist/commands/dev-env-import-sql.js

@@ -56,7 +56,7 @@ class DevEnvImportSQLCommand {
       if (!(await (0, _devEnvironmentLando.isEnvUp)(lando, (0, _devEnvironmentCore.getEnvironmentPath)(this.slug)))) {
         throw new _userError.default('Environment needs to be started first');
       }
-      const expectedDomain = `${this.slug}.vipdev.lndo.site`;
+      const expectedDomain = `${this.slug}.${lando.config.domain}`;
       await (0, _sql.validate)(resolvedPath, {
         isImport: false,
         skipChecks: [],
@@ -89,7 +89,7 @@ class DevEnvImportSQLCommand {
     if (searchReplace?.length && !inPlace) {
       _fs.default.unlinkSync(resolvedPath);
     }
-    const cacheArg = ['wp', 'cache', 'flush'].concat(this.options.quiet ? '--quiet' : []);
+    const cacheArg = ['wp', 'cache', 'flush', '--skip-plugins', '--skip-themes'].concat(this.options.quiet ? '--quiet' : []);
     await (0, _devEnvironmentCore.exec)(lando, this.slug, cacheArg);
     if (undefined === this.options.skipReindex || !(0, _devEnvironmentCli.processBooleanOption)(this.options.skipReindex)) {
       try {
@@ -99,7 +99,7 @@ class DevEnvImportSQLCommand {
         // Exception means they don't have vip-search enabled.
       }
     }
-    const addUserArg = ['wp', 'dev-env-add-admin', '--username=vipgo', '--password=password'].concat(this.options.quiet ? '--quiet' : []);
+    const addUserArg = ['wp', 'dev-env-add-admin', '--username=vipgo', '--password=password', '--skip-plugins', '--skip-themes'].concat(this.options.quiet ? '--quiet' : []);
     await (0, _devEnvironmentCore.exec)(lando, this.slug, addUserArg);
   }
 }

package/dist/commands/dev-env-sync-sql.js

@@ -57,6 +57,7 @@ class DevEnvSyncSQLCommand {
   app;
   env;
   slug;
+  lando;
   tmpDir;
   siteUrls;
   searchReplaceMap;
@@ -68,17 +69,19 @@ class DevEnvSyncSQLCommand {
    * @param {string}   app       The app object
    * @param {string}   env       The environment object
    * @param {string}   slug      The site slug
+   * @param {Object}   lando     The lando object
    * @param {Function} trackerFn Function to call for tracking
    */
-  constructor(app, env, slug, trackerFn = () => {}) {
+  constructor(app, env, slug, lando, trackerFn = () => {}) {
     this.app = app;
     this.env = env;
     this.slug = slug;
+    this.lando = lando;
     this.track = trackerFn;
     this.tmpDir = (0, _utils.makeTempDir)();
   }
   get landoDomain() {
-    return `${this.slug}.vipdev.lndo.site`;
+    return `${this.slug}.${this.lando.config.domain}`;
   }
   get sqlFile() {
     return `${this.tmpDir}/sql-export.sql`;

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

@@ -98,9 +98,9 @@ async function handleCLIException(exception, trackKey, trackBaseInfo = {}) {
     debug(exception);
   }
 }
-const verifyDNSResolution = async slug => {
+const verifyDNSResolution = async (slug, domain) => {
   const expectedIP = '127.0.0.1';
-  const testDomain = `${slug}.vipdev.lndo.site`;
+  const testDomain = `${slug}.${domain}`;
   const advice = `Please add following line to hosts file on your system:\n\n${expectedIP} ${testDomain}\n\nLearn more: https://docs.wpvip.com/vip-local-development-environment/troubleshooting-dev-env/#h-resolve-networking-configuration-issues\n`;
   debug(`Verifying DNS resolution for ${testDomain}`);
   try {
@@ -128,7 +128,7 @@ const validateDependencies = async (lando, slug) => {
   const now = new Date();
   (0, _devEnvironmentLando.validateDockerInstalled)(lando);
   if (slug) {
-    await verifyDNSResolution(slug);
+    await verifyDNSResolution(slug, lando.config.domain ?? 'vipdev.lndo.site');
   }
   const duration = new Date().getTime() - now.getTime();
   debug('Validation checks completed in %d ms', duration);

package/docs/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## Changelog
 
+### 3.3.1
+
+* build(deps): bump step-security/harden-runner from 2.8.0 to 2.8.1
+* build(deps): bump uuid from 9.0.1 to 10.0.0
+* fix: CVE-2024-4068 in `braces`
+* [dev-env] Update calls to WP-CLI to include --skip-plugins and --skip-themes
+* fix(dev-env): use correct domain for environments
+* vip app deploy: Deprecate force and add skip-confirmation
+* Hide branch for vip app if Custom Deployment
+
+**Full Changelog**: https://github.com/Automattic/vip-cli/compare/3.3.0...3.3.1
+
 ### 3.3.0
 
 * fix(dev-env): make sure wildcard subdomains work with SSL/TLS