@automattic/vip 2.34.0 → 2.35.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## Changelog
 
+### 2.35.0
+
+- #1506 Allow imports for all sites with databases by @chriszarate in https://github.com/Automattic/vip-cli/pull/1507
+- #1497 fix: remove import bypass for TypeScript by @sjinks in https://github.com/Automattic/vip-cli/pull/1497
+- #1496 fix(dev-env): update certificate Common Name by @sjinks in https://github.com/Automattic/vip-cli/pull/1496
+- #1513 refactor: use `semver` instead of `check-node-version` by @sjinks in https://github.com/Automattic/vip-cli/pull/1513
+- #1514 chore(dev-deps): update TypeScript type definitions by @sjinks in https://github.com/Automattic/vip-cli/pull/1514
+- #1508 chore(dev-deps): update jest-related packages to 29.7.0 by @sjinks in https://github.com/Automattic/vip-cli/pull/1508
+- #1509 chore(dev-deps): update eslint from 8.47.0 to 8.49.0 by @sjinks in https://github.com/Automattic/vip-cli/pull/1509
+- #1510 chore(deps): update uuid from 9.0.0 to 9.0.1 by @sjinks in https://github.com/Automattic/vip-cli/pull/1510
+- #1512 chore(deps): update node-fetch from 2.6.12 to 2.7.0 by @sjinks in https://github.com/Automattic/vip-cli/pull/1512
+- #1511 chore(deps): update graphql-tag from 2.12.5 to 2.12.6 by @sjinks in https://github.com/Automattic/vip-cli/pull/1511
+- #1517 chore(dev-deps): update rimraf from 5.0.1 to 5.0.5 by @sjinks in https://github.com/Automattic/vip-cli/pull/1517
+- #1516 chore(dev-deps): update eslint from 8.49.0 to 8.50.0 by @sjinks in https://github.com/Automattic/vip-cli/pull/1516
+- #1499 chore(dev-deps): update @automattic/eslint-plugin-wpvip to 0.6.0 by @sjinks in https://github.com/Automattic/vip-cli/pull/1499
+
 ### 2.34.0
 
 - #1503 chore(dev-deps): update nock to 13.3.3

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

@@ -1,10 +1,5 @@
 #!/usr/bin/env node
 
-/**
- * 
- * @format
- */
-
 /**
  * External dependencies
  */

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

@@ -44,6 +44,7 @@ const appQuery = `
 	id,
 	name,
 	type,
+	typeId
 	organization { id, name },
 	environments{
 		id

package/dist/lib/cli/config.js

@@ -14,10 +14,12 @@ const debug = (0, _debug.default)('@automattic/vip:lib:cli:config');
 let configFromFile;
 try {
   // Get `local` config first; this will only exist in dev as it's npmignore-d.
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
   configFromFile = require("../../../config/config.local.json");
   debug('Loaded config data from config.local.json');
 } catch {
   // Fall back to `publish` config file.
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
   configFromFile = require("../../../config/config.publish.json");
   debug('Loaded config data from config.publish.json');
 }

package/dist/lib/cli/progress.js

@@ -4,12 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.StepStatus = exports.ProgressTracker = void 0;
+var _nodeOs = require("node:os");
 var _singleLineLog = require("single-line-log");
 var _format = require("../../lib/cli/format");
-var _os = _interopRequireDefault(require("os"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-// @format
-
 /**
  * External dependencies
  */
@@ -68,7 +65,7 @@ class ProgressTracker {
       map.set(id, {
         id,
         name,
-        status: status || StepStatus.PENDING
+        status: status ?? StepStatus.PENDING
       });
       return map;
     }, new Map());
@@ -104,10 +101,10 @@ class ProgressTracker {
     }));
     if (!steps.some(({
       status
-    }) => status === 'running')) {
+    }) => status === StepStatus.RUNNING)) {
       const firstPendingStepIndex = steps.findIndex(({
         status
-      }) => status === 'pending');
+      }) => status === StepStatus.PENDING);
       if (firstPendingStepIndex !== -1) {
         // "Promote" the first "pending" to "running"
         formattedSteps[firstPendingStepIndex].status = StepStatus.RUNNING;
@@ -122,7 +119,7 @@ class ProgressTracker {
     const steps = [...this.getSteps().values()];
     return steps.find(({
       status
-    }) => status === 'pending');
+    }) => status === StepStatus.PENDING);
   }
   getCurrentStep() {
     if (this.allStepsSucceeded()) {
@@ -131,7 +128,7 @@ class ProgressTracker {
     const steps = [...this.getSteps().values()];
     return steps.find(({
       status
-    }) => status === 'running');
+    }) => status === StepStatus.RUNNING);
   }
   stepRunning(stepId) {
     this.setStatusForStepId(stepId, StepStatus.RUNNING);
@@ -153,7 +150,7 @@ class ProgressTracker {
   allStepsSucceeded() {
     return [...this.getSteps().values()].every(({
       status
-    }) => status === 'success');
+    }) => status === StepStatus.SUCCESS);
   }
   setStatusForStepId(stepId, status) {
     const step = this.stepsFromCaller.get(stepId);
@@ -164,7 +161,7 @@ class ProgressTracker {
     if (COMPLETED_STEP_SLUGS.includes(step.status)) {
       throw new Error(`Step name ${stepId} is already completed.`);
     }
-    if (status === 'failed') {
+    if (status === StepStatus.FAILED) {
       this.hasFailure = true;
     }
     this.stepsFromCaller.set(stepId, {
@@ -199,7 +196,7 @@ class ProgressTracker {
         // without this, any prompt, or any text in between will get overwritten by the progress tracker
         let linesToSkip = '';
         for (let iteration = 0; iteration < this.stepsFromCaller.size; iteration++) {
-          linesToSkip += _os.default.EOL;
+          linesToSkip += _nodeOs.EOL;
         }
         process.stdout.write(linesToSkip);
         hasPrintedOnce = true;
@@ -230,7 +227,7 @@ class ProgressTracker {
       const statusIcon = (0, _format.getGlyphForStatus)(status, this.runningSprite);
       let suffix = '';
       if (id === 'upload') {
-        if (status === 'running' && percentage) {
+        if (status === StepStatus.RUNNING && percentage) {
           suffix = percentage;
         }
       } else if (progress) {

package/dist/lib/client-file-uploader.js

@@ -42,11 +42,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // Need to use CommonJS imports here as the `fetch-retry` typedefs are messed up and throwing TypeJS errors when using `import`
 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 const fetchWithRetry =
-// eslint-disable-next-line @typescript-eslint/no-unsafe-call
+// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-var-requires
 require('fetch-retry')(_nodeFetch.default, {
   // Set default retry options
   retries: 3,
-  retryDelay: (attempt, error, response) => {
+  retryDelay: attempt => {
     return Math.pow(2, attempt) * 1000; // 1000, 2000, 4000
   }
 });
@@ -213,7 +213,7 @@ async function uploadUsingPutObject({
   });
   const response = await fetchWithRetry(presignedRequest.url, {
     ...fetchOptions,
-    body: fileContent ? fileContent : (0, _fs.createReadStream)(fileName).pipe(progressPassThrough)
+    body: fileContent ?? (0, _fs.createReadStream)(fileName).pipe(progressPassThrough)
   });
   if (response.status === 200) {
     return 'ok';

package/dist/lib/config/software.js

@@ -239,8 +239,9 @@ const promptForUpdate = async (appTypeId, opts, softwareSettings) => {
   const version = await _processComponentVersion(softwareSettings, component, opts.version);
   const confirm =
   // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-  opts.force || (await new _enquirer.Confirm({
-    // NOSONAR
+  opts.force || (
+  // NOSONAR
+  await new _enquirer.Confirm({
     message: `Are you sure you want to upgrade ${COMPONENT_NAMES[component]} to ${version}?`
   }).run().catch(() => {
     throw new _userError.default('Command cancelled by user.');

package/dist/lib/constants/vipgo.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WORDPRESS_SITE_TYPE_IDS = exports.WORDPRESS_NON_PROD_APPLICATION_TYPE_ID = exports.WORDPRESS_APPLICATION_TYPE_ID = exports.NODEJS_SITE_TYPE_IDS = exports.NODEJS_REDIS_APPLICATION_TYPE_ID = exports.NODEJS_MYSQL_REDIS_APPLICATION_TYPE_ID = exports.NODEJS_MYSQL_APPLICATION_TYPE_ID = exports.NODEJS_APPLICATION_TYPE_ID = void 0;
+exports.WORDPRESS_SITE_TYPE_IDS = exports.WORDPRESS_NON_PROD_APPLICATION_TYPE_ID = exports.WORDPRESS_APPLICATION_TYPE_ID = exports.NODEJS_SITE_TYPE_IDS = exports.NODEJS_REDIS_APPLICATION_TYPE_ID = exports.NODEJS_MYSQL_REDIS_APPLICATION_TYPE_ID = exports.NODEJS_MYSQL_APPLICATION_TYPE_ID = exports.NODEJS_APPLICATION_TYPE_ID = exports.DATABASE_APPLICATION_TYPE_IDS = void 0;
 const WORDPRESS_APPLICATION_TYPE_ID = 2;
 exports.WORDPRESS_APPLICATION_TYPE_ID = WORDPRESS_APPLICATION_TYPE_ID;
 const WORDPRESS_NON_PROD_APPLICATION_TYPE_ID = 6;
@@ -19,4 +19,6 @@ exports.NODEJS_REDIS_APPLICATION_TYPE_ID = NODEJS_REDIS_APPLICATION_TYPE_ID;
 const NODEJS_MYSQL_REDIS_APPLICATION_TYPE_ID = 8;
 exports.NODEJS_MYSQL_REDIS_APPLICATION_TYPE_ID = NODEJS_MYSQL_REDIS_APPLICATION_TYPE_ID;
 const NODEJS_SITE_TYPE_IDS = [NODEJS_APPLICATION_TYPE_ID, NODEJS_MYSQL_APPLICATION_TYPE_ID, NODEJS_REDIS_APPLICATION_TYPE_ID, NODEJS_MYSQL_REDIS_APPLICATION_TYPE_ID];
-exports.NODEJS_SITE_TYPE_IDS = NODEJS_SITE_TYPE_IDS;
+exports.NODEJS_SITE_TYPE_IDS = NODEJS_SITE_TYPE_IDS;
+const DATABASE_APPLICATION_TYPE_IDS = [WORDPRESS_APPLICATION_TYPE_ID, WORDPRESS_NON_PROD_APPLICATION_TYPE_ID, NODEJS_MYSQL_APPLICATION_TYPE_ID, NODEJS_MYSQL_REDIS_APPLICATION_TYPE_ID];
+exports.DATABASE_APPLICATION_TYPE_IDS = DATABASE_APPLICATION_TYPE_IDS;

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

@@ -91,7 +91,7 @@ async function getLandoConfig() {
     proxyName: 'vip-dev-env-proxy',
     userConfRoot: landoDir,
     home: fakeHomeDir,
-    domain: 'lndo.site',
+    domain: 'vipdev.lndo.site',
     version: 'unknown'
   };
   return (0, _bootstrap.buildConfig)(config);
@@ -101,8 +101,9 @@ async function initLandoApplication(lando, instancePath) {
   const app = lando.getApp(instancePath);
   app.events.on('post-init', 1, () => {
     const initOnly = [];
-    Object.keys(app.config.services).forEach(serviceName => {
-      if (app.config.services[serviceName].initOnly) {
+    const services = app.config.services;
+    Object.keys(services).forEach(serviceName => {
+      if (services[serviceName].initOnly) {
         initOnly.push(serviceName);
         app.config.services[serviceName].scanner = false;
       }

package/dist/lib/envvar/logging.js

@@ -8,11 +8,6 @@ exports.getEnvContext = getEnvContext;
 var _debug = _interopRequireDefault(require("debug"));
 var _command = require("../../lib/cli/command");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * 
- * @format
- */
-
 /**
  * External dependencies
  */
@@ -23,6 +18,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 // Shared debugger.
 const debug = (0, _debug.default)('@automattic/vip:bin:config:envvar');
+
+// FIXME: Replace with a proper type
 exports.debug = debug;
 function getEnvContext(app, env) {
   return `@${app.id}.${(0, _command.getEnvIdentifier)(env)}`;

package/dist/lib/keychain.js

@@ -19,6 +19,7 @@ let exportValue;
 const debug = (0, _debug.default)('@automattic/vip:keychain');
 try {
   // Try using Secure keychain ("keytar") first
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
   const Secure = require("./keychain/secure");
   exportValue = new Secure();
 } catch (error) {

package/dist/lib/site-import/db-file-import.js

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SYNC_STATUS_NOT_SYNCING = exports.SUPPORTED_DB_FILE_IMPORT_SITE_TYPES = exports.SQL_IMPORT_FILE_SIZE_LIMIT_LAUNCHED = exports.SQL_IMPORT_FILE_SIZE_LIMIT = void 0;
+exports.SYNC_STATUS_NOT_SYNCING = exports.SQL_IMPORT_FILE_SIZE_LIMIT_LAUNCHED = exports.SQL_IMPORT_FILE_SIZE_LIMIT = void 0;
 exports.currentUserCanImportForApp = currentUserCanImportForApp;
 exports.isSupportedApp = exports.isImportingBlockedBySync = void 0;
 var _fileSize = require("../../lib/constants/file-size");
+var _vipgo = require("../../lib/constants/vipgo");
 /**
  * Internal dependencies
  */
@@ -19,11 +20,9 @@ function currentUserCanImportForApp(app) {
   // TODO: implement
   return !!app;
 }
-const SUPPORTED_DB_FILE_IMPORT_SITE_TYPES = ['WordPress'];
-exports.SUPPORTED_DB_FILE_IMPORT_SITE_TYPES = SUPPORTED_DB_FILE_IMPORT_SITE_TYPES;
 const isSupportedApp = ({
-  type
-}) => SUPPORTED_DB_FILE_IMPORT_SITE_TYPES.includes(type);
+  typeId
+}) => _vipgo.DATABASE_APPLICATION_TYPE_IDS.includes(typeId);
 exports.isSupportedApp = isSupportedApp;
 const SYNC_STATUS_NOT_SYNCING = 'not_syncing';
 exports.SYNC_STATUS_NOT_SYNCING = SYNC_STATUS_NOT_SYNCING;

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

@@ -9,9 +9,9 @@ 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 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 }; }

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.`
 				);
 			}
 		}