@automattic/vip 2.31.1-dev4 → 2.32.0

package/CHANGELOG.md

@@ -1,14 +1,40 @@
 ## Changelog
 
+### 2.32.0
+
+- #1411 feature(export): Add ability to generate a new backup when exporting SQL
+- #1427 Remove unnecessary comment
+- #1426 chore: fix CVE-2023-26115 by updating word-wrap to 1.2.6
+- #1424 feat(dev-env): Update wording around dev-env start --vscode
+- #1419 [PIE-3548] Updates CONTRIBUTING.md with the new flow without publish-please
+- #1423 chore(deps): update socket.io-client from 4.6.2 to 4.7.0
+- #1422 chore(dev-deps): update flow-bin from 0.209.0 to 0.210.0
+- #1417 chore(dev-deps): Update eslint from 8.42.0 to 8.43.0
+- #1418 chore(deps): Update semver from 7.5.2 to 7.5.3
+- #1415 [PIE-3548] Removes `publish-please` and replaces it with simple custom script
+- #1416 [dev-env] Reword dev-env VS Code integration messages
+- #1413 [dev-env] Command options text fixes
+- #1412 Update eslint-plugin-wpvip to 0.5.8, Prettier updates
+- #1396 Migrate dev-environment-core to TypeScript
+- #1410 chore(dev-deps): Update flow-bin to 0.209.0
+- #1409 chore(deps): Update semver to 7.5.2
+- #1408 chore(dev-deps): Update rimraf to 5.0.1
+- #1407 chore(dev-deps): Update flow-bin from 0.206.0 to 0.208.0
+- #1406 chore(deps): Replace keytar with @postman/node-keytar
+- #1405 chore(deps): Update socket.io-client from 4.6.1 to 4.6.2
+- #1404 chore(dev-deps): Update TypeScript-related packages
+- #1403 chore(dev-deps): Update ESLint-related packages update/eslint
+- #1402 chore(dev-deps): Update Babel-related packages to 7.22.5
+
 ### 2.31.0
 
-- #1397	feature(dev-env): Add ability to sync multisites
-- #1399	chore(dev-deps): Remove stub type definitions
-- #1394	FORNO-1609: Combine all error events into one error event
-- #1345	feat(dev-env): Add Photon
-- #1398	Fix coverage generation
-- #1395	Add types for the other ways of using enquirer
-- #1388	Typescript: refactor `vip-whoami`
+- #1397 feature(dev-env): Add ability to sync multisites
+- #1399 chore(dev-deps): Remove stub type definitions
+- #1394 FORNO-1609: Combine all error events into one error event
+- #1345 feat(dev-env): Add Photon
+- #1398 Fix coverage generation
+- #1395 Add types for the other ways of using enquirer
+- #1388 Typescript: refactor `vip-whoami`
 - #1393	refactor: Convert `lib/{app-logs,envvar}` to TypeScript
 - #1392	refactor: Convert `lib/config` to TypeScript
 - #1391	refactor: Convert lib to TypeScript

package/CONTRIBUTING.md

@@ -147,8 +147,6 @@ In order to do that, please follow this:
 
 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.
 
-_PS: The above steps will only change your local `trunk`. The remote `trunk` will remain unaffected, and you can reset your local trunk afterwards with `git reset --hard origin/trunk`._
-
 ### Patching Old Releases
 
 There may be times when we need to push out a critical fix to the most recent release (or several past releases) such as for patching security issues or major bugs. This can be complicated by the fact that we may have some larger changes already merged into the `trunk` branch.

package/dist/commands/backup-db.js

@@ -80,7 +80,7 @@ async function getBackupJob(appId, envId) {
     }
   } = response;
   const job = environments[0].jobs[0];
-  return job;
+  return job || null;
 }
 async function createBackupJob(appId, envId) {
   // Disable global error handling so that we can handle errors ourselves
@@ -138,11 +138,11 @@ class BackupDBCommand {
     this.progressTracker.stopPrinting();
   }
   async loadBackupJob() {
-    var _this$job$metadata$fi, _this$job$metadata$fi2, _this$job$progress;
+    var _this$job, _this$job$metadata$fi, _this$job2, _this$job2$progress, _this$job3;
     this.job = await getBackupJob(this.app.id, this.env.id);
-    this.backupName = (_this$job$metadata$fi = (_this$job$metadata$fi2 = this.job.metadata.find(meta => meta.name === 'backupName')) === null || _this$job$metadata$fi2 === void 0 ? void 0 : _this$job$metadata$fi2.value) !== null && _this$job$metadata$fi !== void 0 ? _this$job$metadata$fi : 'Unknown';
-    this.jobStatus = (_this$job$progress = this.job.progress) === null || _this$job$progress === void 0 ? void 0 : _this$job$progress.status;
-    if (this.job.completedAt) {
+    this.backupName = ((_this$job = this.job) === null || _this$job === void 0 ? void 0 : (_this$job$metadata$fi = _this$job.metadata.find(meta => meta.name === 'backupName')) === null || _this$job$metadata$fi === void 0 ? void 0 : _this$job$metadata$fi.value) || 'Unknown';
+    this.jobStatus = (_this$job2 = this.job) === null || _this$job2 === void 0 ? void 0 : (_this$job2$progress = _this$job2.progress) === null || _this$job2$progress === void 0 ? void 0 : _this$job2$progress.status;
+    if ((_this$job3 = this.job) !== null && _this$job3 !== void 0 && _this$job3.completedAt) {
       this.jobAge = (new Date().getTime() - new Date(this.job.completedAt).getTime()) / 1000 / 60;
     } else {
       this.jobAge = undefined;
@@ -150,14 +150,14 @@ class BackupDBCommand {
     return this.job;
   }
   async run(silent = false) {
-    var _this$job;
+    var _this$job4;
     this.silent = silent;
     let noticeMessage = `\n${_chalk.default.yellow('NOTICE: ')}`;
     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';
     this.log(noticeMessage);
     await this.loadBackupJob();
-    if ((_this$job = this.job) !== null && _this$job !== void 0 && _this$job.inProgressLock) {
+    if ((_this$job4 = this.job) !== null && _this$job4 !== void 0 && _this$job4.inProgressLock) {
       this.log('Database backup already in progress...');
     } else {
       try {
@@ -165,15 +165,16 @@ class BackupDBCommand {
         this.progressTracker.stepRunning(this.steps.PREPARE);
         this.progressTracker.startPrinting();
         await createBackupJob(this.app.id, this.env.id);
-      } catch (stepErr) {
-        const err = stepErr;
+      } catch (e) {
+        var _err$message;
+        const err = e;
         this.progressTracker.stepFailed(this.steps.PREPARE);
         this.stopProgressTracker();
-        if (err.message.includes('Database backups limit reached')) {
+        if ((_err$message = err.message) !== null && _err$message !== void 0 && _err$message.includes('Database backups limit reached')) {
           await this.track('error', {
             error_type: 'rate_limit_exceeded',
-            error_message: `Couldn't create a new database backup job: ${err.message}`,
-            stack: err.stack
+            error_message: `Couldn't create a new database backup job: ${err === null || err === void 0 ? void 0 : err.message}`,
+            stack: err === null || err === void 0 ? void 0 : err.stack
           });
           let errMessage = err.message.replace('Database backups limit reached', 'A new database backup was not generated because a recently generated backup already exists.');
           errMessage = errMessage.replace('Retry after', '\nIf you would like to run the same command, you can retry on or after:');
@@ -183,26 +184,26 @@ class BackupDBCommand {
         }
         await this.track('error', {
           error_type: 'db_backup_job_creation_failed',
-          error_message: `Database Backup job creation failed: ${err.message}`,
-          stack: err.stack
+          error_message: `Database Backup job creation failed: ${err === null || err === void 0 ? void 0 : err.message}`,
+          stack: err === null || err === void 0 ? void 0 : err.stack
         });
-        exit.withError(`Couldn't create a new database backup job: ${err.message}`);
+        exit.withError(`Couldn't create a new database backup job: ${err === null || err === void 0 ? void 0 : err.message}`);
       }
     }
     this.progressTracker.stepSuccess(this.steps.PREPARE);
     this.progressTracker.stepRunning(this.steps.GENERATE);
     try {
       await (0, _utils.pollUntil)(this.loadBackupJob.bind(this), DB_BACKUP_PROGRESS_POLL_INTERVAL, this.isDone.bind(this));
-    } catch (pollErr) {
-      const err = pollErr;
+    } catch (e) {
+      const err = e;
       this.progressTracker.stepFailed(this.steps.GENERATE);
       this.stopProgressTracker();
       await this.track('error', {
         error_type: 'db_backup_job_failed',
-        error_message: `Database Backup job failed: ${err.message}`,
-        stack: err.stack
+        error_message: `Database Backup job failed: ${err === null || err === void 0 ? void 0 : err.message}`,
+        stack: err === null || err === void 0 ? void 0 : err.stack
       });
-      exit.withError(`Failed to create new database backup: ${err.message}`);
+      exit.withError(`Failed to create new database backup: ${err === null || err === void 0 ? void 0 : err.message}`);
     }
     this.progressTracker.stepSuccess(this.steps.GENERATE);
     this.stopProgressTracker();

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@automattic/vip",
-  "version": "2.31.1-dev4",
+  "version": "2.32.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@automattic/vip",
-      "version": "2.31.1-dev4",
+      "version": "2.32.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "2.31.1-dev4",
+  "version": "2.32.0",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {