@automattic/vip 2.33.0 → 2.35.0

package/dist/lib/site-import/status.js

@@ -9,18 +9,13 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _debug = _interopRequireDefault(require("debug"));
 var _api = _interopRequireDefault(require("../../lib/api"));
-var _dbFileImport = require("../../lib/site-import/db-file-import");
-var _progress = require("../../lib/cli/progress");
 var exit = _interopRequireWildcard(require("../../lib/cli/exit"));
 var _format = require("../../lib/cli/format");
+var _dbFileImport = require("./db-file-import");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * 
- * @format
- */
-
+/* eslint-disable complexity */
 /**
  * External dependencies
  */
@@ -72,6 +67,7 @@ const IMPORT_SQL_PROGRESS_QUERY = (0, _graphqlTag.default)`
 	}
 `;
 async function getStatus(api, appId, envId) {
+  var _response$data$app;
   const response = await api.query({
     query: IMPORT_SQL_PROGRESS_QUERY,
     variables: {
@@ -80,17 +76,11 @@ async function getStatus(api, appId, envId) {
     },
     fetchPolicy: 'network-only'
   });
-  const {
-    data: {
-      app: {
-        environments
-      }
-    }
-  } = response;
-  if (!(environments !== null && environments !== void 0 && environments.length)) {
+  const environments = ((_response$data$app = response.data.app) === null || _response$data$app === void 0 ? void 0 : _response$data$app.environments) ?? [];
+  if (!environments.length) {
     throw new Error('Unable to determine import status from environment');
   }
-  const [environment] = environments;
+  const environment = environments[0] ?? {};
   const {
     importStatus,
     jobs,
@@ -99,7 +89,7 @@ async function getStatus(api, appId, envId) {
   if (!environment.isK8sResident && !(jobs !== null && jobs !== void 0 && jobs.length)) {
     return {};
   }
-  const [importJob] = jobs;
+  const [importJob] = jobs ?? [];
   return {
     importStatus,
     importJob,
@@ -178,6 +168,7 @@ async function importSqlCheckStatus({
   let completedAt;
   let overallStatus = 'Checking...';
   const setProgressTrackerSuffix = () => {
+    var _env$primaryDomain;
     const sprite = (0, _format.getGlyphForStatus)(overallStatus, progressTracker.runningSprite);
     const formattedCreatedAt = createdAt ? `${new Date(createdAt).toLocaleString()} (${createdAt})` : 'TBD';
     const formattedCompletedAt = createdAt && completedAt ? `${new Date(completedAt).toLocaleString()} (${completedAt})` : 'TBD';
@@ -185,7 +176,7 @@ async function importSqlCheckStatus({
     let statusMessage;
     switch (overallStatus) {
       case 'success':
-        statusMessage = `Success ${sprite} imported data should be visible on your site ${env.primaryDomain.name}.`;
+        statusMessage = `Success ${sprite} imported data should be visible on your site ${((_env$primaryDomain = env.primaryDomain) === null || _env$primaryDomain === void 0 ? void 0 : _env$primaryDomain.name) ?? 'N/A'}.`;
         break;
       case 'running':
         if (progressTracker.allStepsSucceeded()) {
@@ -205,7 +196,7 @@ SQL Import Completed: ${formattedCompletedAt}`;
     const suffix = `
 =============================================================
 Status: ${statusMessage}
-Site: ${app.name} (${(0, _format.formatEnvironment)(env.type)})${maybeTimestamps}
+Site: ${app.name ?? 'N/A'} (${(0, _format.formatEnvironment)(env.type ?? 'N/A')})${maybeTimestamps}
 =============================================================
 ${maybeExitPrompt}
 `;
@@ -221,7 +212,7 @@ ${maybeExitPrompt}
       var _importJob$progress, _importJob$progress2;
       let status;
       try {
-        status = await getStatus(api, app.id, env.id);
+        status = await getStatus(api, app.id ?? -1, env.id ?? -1);
       } catch (error) {
         return reject({
           error
@@ -246,13 +237,15 @@ ${maybeExitPrompt}
 
           // if the progress meta isn't filled out yet, wait until it is.
           if (!statusSteps) {
-            return setTimeout(checkStatus, IMPORT_SQL_PROGRESS_POLL_INTERVAL); // NOSONAR
+            return setTimeout(() => {
+              void checkStatus();
+            }, IMPORT_SQL_PROGRESS_POLL_INTERVAL);
           }
-
           jobSteps = statusSteps.map(step => {
+            var _step$name;
             return {
               id: step.name,
-              name: (0, _format.capitalize)(step.name.replace(/_/g, ' ')),
+              name: (0, _format.capitalize)((_step$name = step.name) === null || _step$name === void 0 ? void 0 : _step$name.replace(/_/g, ' ')),
               status: step.result
             };
           });
@@ -267,7 +260,8 @@ ${maybeExitPrompt}
             result
           }) => result === 'success')) {
             jobStatus = 'success';
-            importJob.completedAt = new Date(Math.max(...statusSteps.map(step => step.finished_at), 0) * 1000).toUTCString();
+            const timestamps = statusSteps.map(step => step.finished_at).filter(Boolean);
+            importJob.completedAt = new Date(Math.max(...timestamps, 0) * 1000).toUTCString();
           }
           if (importStatus !== null && importStatus !== void 0 && (_importStatus$progres2 = importStatus.progress) !== null && _importStatus$progres2 !== void 0 && _importStatus$progres2.started_at) {
             importJob.createdAt = new Date(importStatus.progress.started_at * 1000).toUTCString();
@@ -288,7 +282,7 @@ ${maybeExitPrompt}
         dbOperationInProgress,
         importInProgress,
         progress: importStepProgress
-      } = importStatus;
+      } = importStatus ?? {};
       debug({
         jobStatus,
         completedAt,
@@ -299,14 +293,15 @@ ${maybeExitPrompt}
       });
       let jobCreationTime;
       try {
-        jobCreationTime = new Date(createdAt).getTime();
+        jobCreationTime = new Date(createdAt ?? '').getTime();
       } catch (err) {
         debug('Unable to parse createdAt to a Date');
       }
       let failedImportStep;
-      if (jobCreationTime && (importStepProgress === null || importStepProgress === void 0 ? void 0 : importStepProgress.started_at) * 1000 >= jobCreationTime) {
+      if (jobCreationTime && ((importStepProgress === null || importStepProgress === void 0 ? void 0 : importStepProgress.started_at) ?? 0) * 1000 >= jobCreationTime) {
+        var _importStepProgress$s;
         // The contents of the `import_progress` meta are pertinent to the most recent import job
-        failedImportStep = importStepProgress.steps.find(step => (step === null || step === void 0 ? void 0 : step.result) === 'failed' && 1000 * (step === null || step === void 0 ? void 0 : step.started_at) > new Date(createdAt).getTime());
+        failedImportStep = importStepProgress === null || importStepProgress === void 0 || (_importStepProgress$s = importStepProgress.steps) === null || _importStepProgress$s === void 0 ? void 0 : _importStepProgress$s.find(step => (step === null || step === void 0 ? void 0 : step.result) === 'failed' && 1000 * (step.started_at ?? 0) > new Date(createdAt ?? '').getTime());
       }
       if (!jobSteps.length) {
         return reject({
@@ -317,9 +312,7 @@ ${maybeExitPrompt}
       if (failedImportStep) {
         // The server marks the step as a success as per the host action, demote it to 'failed'
         const _jobSteps = [...jobSteps];
-        const failedJobStepIndex = _jobSteps.findIndex(({
-          id
-        }) => id === 'import');
+        const failedJobStepIndex = _jobSteps.findIndex(step => (step === null || step === void 0 ? void 0 : step.id) === 'import');
         _jobSteps[failedJobStepIndex] = {
           ..._jobSteps[failedJobStepIndex],
           status: 'failed'
@@ -332,7 +325,6 @@ ${maybeExitPrompt}
           commandOutput: failedImportStep.output,
           error: 'Import step failed',
           stepName: failedImportStep.name,
-          errorText: failedImportStep.error,
           launched
         });
       }
@@ -349,7 +341,9 @@ ${maybeExitPrompt}
         return resolve(importJob);
       }
       overallStatus = 'running';
-      setTimeout(checkStatus, IMPORT_SQL_PROGRESS_POLL_INTERVAL); // NOSONAR
+      setTimeout(() => {
+        void checkStatus();
+      }, IMPORT_SQL_PROGRESS_POLL_INTERVAL);
     };
 
     // Kick off the check
@@ -361,7 +355,7 @@ ${maybeExitPrompt}
       overallStatus = results;
     } else {
       var _results$progress;
-      overallStatus = (results === null || results === void 0 || (_results$progress = results.progress) === null || _results$progress === void 0 ? void 0 : _results$progress.status) || 'unknown';
+      overallStatus = ((_results$progress = results.progress) === null || _results$progress === void 0 ? void 0 : _results$progress.status) ?? 'unknown';
       // This shouldn't be 'unknown'...what should we do here?
     }
 

package/dist/lib/utils.js

@@ -56,11 +56,16 @@ function makeTempDir(prefix = 'vip-cli') {
   const tempDir = _fs.default.mkdtempSync(_path.default.join(_os.default.tmpdir(), `${prefix}-`));
   debug(`Created a directory to hold temporary files: ${tempDir}`);
   process.on('exit', () => {
-    _fs.default.rmSync(tempDir, {
-      recursive: true,
-      force: true
-    });
-    debug(`Removed temporary directory: ${tempDir}`);
+    try {
+      _fs.default.rmSync(tempDir, {
+        recursive: true,
+        force: true,
+        maxRetries: 10
+      });
+      debug(`Removed temporary directory: ${tempDir}`);
+    } catch (err) {
+      console.warn(`Failed to remove temporary directory ${tempDir} (${err.message})`);
+    }
   });
   return tempDir;
 }

package/dist/lib/validations/is-multi-site.js

@@ -69,7 +69,7 @@ async function isMultiSiteInSiteMeta(appId, envId) {
   }
   if (Array.isArray((_res$data$app = res.data.app) === null || _res$data$app === void 0 ? void 0 : _res$data$app.environments)) {
     const environments = res.data.app.environments;
-    if (!environments.length) {
+    if (!(environments !== null && environments !== void 0 && environments.length)) {
       isMultiSite.set(args, false);
       return false;
     }

package/dist/lib/validations/is-multisite-domain-mapped.js

@@ -119,7 +119,7 @@ async function isMultisitePrimaryDomainMapped(appId, envId, primaryDomain) {
     return false;
   }
   const environments = res.data.app.environments;
-  if (!environments.length) {
+  if (!(environments !== null && environments !== void 0 && environments.length)) {
     return false;
   }
   const mappedDomains = ((_environments$ = environments[0]) === null || _environments$ === void 0 || (_environments$ = _environments$.domains) === null || _environments$ === void 0 || (_environments$ = _environments$.nodes) === null || _environments$ === void 0 ? void 0 : _environments$.map(domain => domain === null || domain === void 0 ? void 0 : domain.name)) ?? [];

package/helpers/prepublishOnly.js

@@ -1,5 +1,4 @@
-const util = require( 'node:util' );
-const check = util.promisify( require( 'check-node-version' ) );
+const { minVersion, satisfies, valid } = require( 'semver' );
 const { exec } = require( 'node:child_process' );
 const { EOL } = require( 'node:os' );
 const packageJSON = require( '../package.json' );
@@ -34,11 +33,15 @@ const releaseTag = process.env.npm_config_tag ?? 'latest';
 		}
 
 		if ( config.nodeEnforceVersion ) {
-			const { isSatisfied, versions } = await check( { node: config.nodeEnforceVersion } );
+			const supported = packageJSON.engines.node;
+			const current = process.versions.node ?? process.version;
+			const isSatisfied = satisfies( current, supported );
 
 			if ( ! isSatisfied ) {
 				return bail(
-					`Node version ${ versions.node.version } is not supported. Please use Node version ${ config.nodeEnforceVersion } or higher.`
+					`Node version ${ valid( current ) } is not supported. Please use Node version ${ valid(
+						minVersion( supported )
+					) } or higher.`
 				);
 			}
 		}