@automattic/vip 2.36.0-dev.0 → 2.36.1

package/dist/bin/vip-dev-env-list.js

@@ -1,20 +1,12 @@
 #!/usr/bin/env node
-
-/**
- * External dependencies
- */
-
-/**
- * Internal dependencies
- */
 "use strict";
 
-var _tracker = require("../lib/tracker");
 var _command = _interopRequireDefault(require("../lib/cli/command"));
-var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
-var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 var _devEnvironment = require("../lib/constants/dev-environment");
+var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
+var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
 var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
+var _tracker = require("../lib/tracker");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} list`,

package/dist/bin/vip-dev-env-logs.js

@@ -1,21 +1,14 @@
 #!/usr/bin/env node
-
-/**
- * External dependencies
- */
 "use strict";
 
 var _debug = _interopRequireDefault(require("debug"));
-var _tracker = require("../lib/tracker");
 var _command = _interopRequireDefault(require("../lib/cli/command"));
-var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
-var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 var _devEnvironment = require("../lib/constants/dev-environment");
+var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
+var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
 var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
+var _tracker = require("../lib/tracker");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * Internal dependencies
- */
 const debug = (0, _debug.default)('@automattic/vip:bin:dev-environment');
 const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} logs --slug=my_site`,

package/dist/bin/vip-dev-env-shell.js

@@ -1,21 +1,14 @@
 #!/usr/bin/env node
-
-/**
- * External dependencies
- */
 "use strict";
 
 var _debug = _interopRequireDefault(require("debug"));
-var _tracker = require("../lib/tracker");
 var _command = _interopRequireDefault(require("../lib/cli/command"));
-var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
 var _devEnvironment = require("../lib/constants/dev-environment");
 var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
+var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
 var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
+var _tracker = require("../lib/tracker");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * Internal dependencies
- */
 const debug = (0, _debug.default)('@automattic/vip:bin:dev-environment');
 const userMap = {
   nginx: 'www-data',
@@ -68,7 +61,7 @@ function getCommand(args) {
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_shell_command_execute', trackingInfo);
   debug('Args: ', args, 'Options: ', opt);
-  const isRoot = !!opt.root;
+  const isRoot = Boolean(opt.root);
   const service = opt.service || 'php';
   const user = isRoot ? 'root' : userMap[service] || 'www-data';
   const cmd = getCommand(args);

package/dist/bin/vip-dev-env-start.js

@@ -1,21 +1,14 @@
 #!/usr/bin/env node
-
-/**
- * External dependencies
- */
 "use strict";
 
 var _debug = _interopRequireDefault(require("debug"));
-var _tracker = require("../lib/tracker");
 var _command = _interopRequireDefault(require("../lib/cli/command"));
-var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
 var _devEnvironment = require("../lib/constants/dev-environment");
 var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
+var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
 var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
+var _tracker = require("../lib/tracker");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * Internal dependencies
- */
 const debug = (0, _debug.default)('@automattic/vip:bin:dev-environment');
 const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} start`,
@@ -30,12 +23,12 @@ const examples = [{
   await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
   const startProcessing = new Date();
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
-  trackingInfo.vscode = !!opt.vscode;
+  trackingInfo.vscode = Boolean(opt.vscode);
   await (0, _tracker.trackEvent)('dev_env_start_command_execute', trackingInfo);
   debug('Args: ', arg, 'Options: ', opt);
   const options = {
-    skipRebuild: !!opt.skipRebuild,
-    skipWpVersionsCheck: !!opt.skipWpVersionsCheck
+    skipRebuild: Boolean(opt.skipRebuild),
+    skipWpVersionsCheck: Boolean(opt.skipWpVersionsCheck)
   };
   try {
     await (0, _devEnvironmentCore.startEnvironment)(lando, slug, options);
@@ -50,6 +43,6 @@ const examples = [{
     process.exitCode = 1;
   }
   (0, _devEnvironmentCli.postStart)(slug, {
-    openVSCode: !!opt.vscode
+    openVSCode: Boolean(opt.vscode)
   });
 });

package/dist/bin/vip-dev-env-stop.js

@@ -1,22 +1,15 @@
 #!/usr/bin/env node
-
-/**
- * External dependencies
- */
 "use strict";
 
-var _debug = _interopRequireDefault(require("debug"));
 var _chalk = _interopRequireDefault(require("chalk"));
-var _tracker = require("../lib/tracker");
+var _debug = _interopRequireDefault(require("debug"));
 var _command = _interopRequireDefault(require("../lib/cli/command"));
-var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
-var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 var _devEnvironment = require("../lib/constants/dev-environment");
+var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
+var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
 var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
+var _tracker = require("../lib/tracker");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * Internal dependencies
- */
 const debug = (0, _debug.default)('@automattic/vip:bin:dev-environment');
 const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} stop`,

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

@@ -1,22 +1,14 @@
 #!/usr/bin/env node
-
-/**
- * External dependencies
- */
-
-/**
- * Internal dependencies
- */
 "use strict";
 
+var _devEnvSyncSql = require("../commands/dev-env-sync-sql");
 var _command = _interopRequireDefault(require("../lib/cli/command"));
+var _devEnvironment = require("../lib/constants/dev-environment");
+var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
 var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
-var _userError = _interopRequireDefault(require("../lib/user-error"));
-var _devEnvSyncSql = require("../commands/dev-env-sync-sql");
-var _devEnvironment = require("../lib/constants/dev-environment");
 var _tracker = require("../lib/tracker");
-var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
+var _userError = _interopRequireDefault(require("../lib/user-error"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} sync sql @my-test.develop --slug=my_site`,

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

@@ -1,12 +1,4 @@
 #!/usr/bin/env node
-
-/**
- * External dependencies
- */
-
-/**
- * Internal dependencies
- */
 "use strict";
 
 var _command = _interopRequireDefault(require("../lib/cli/command"));

package/dist/bin/vip-dev-env-update.js

@@ -1,23 +1,16 @@
 #!/usr/bin/env node
-
-/**
- * External dependencies
- */
 "use strict";
 
-var _debug = _interopRequireDefault(require("debug"));
 var _chalk = _interopRequireDefault(require("chalk"));
-var _tracker = require("../lib/tracker");
+var _debug = _interopRequireDefault(require("debug"));
 var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _devEnvironment = require("../lib/constants/dev-environment");
 var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
+var _devEnvironmentConfigurationFile = require("../lib/dev-environment/dev-environment-configuration-file");
 var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
 var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
-var _devEnvironmentConfigurationFile = require("../lib/dev-environment/dev-environment-configuration-file");
+var _tracker = require("../lib/tracker");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * Internal dependencies
- */
 const debug = (0, _debug.default)('@automattic/vip:bin:dev-environment');
 const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} update`,
@@ -57,7 +50,7 @@ cmd.argv(process.argv, async (arg, opt) => {
       muPlugins: currentInstanceData.muPlugins.dir || currentInstanceData.muPlugins.tag || 'latest',
       wordpress: currentInstanceData.wordpress.tag || 'trunk',
       elasticsearch: currentInstanceData.elasticsearch,
-      php: currentInstanceData.php || _devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS.default,
+      php: currentInstanceData.php || _devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS[Object.keys(_devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS)[0]].image,
       mariadb: currentInstanceData.mariadb,
       phpmyadmin: currentInstanceData.phpmyadmin,
       xdebug: currentInstanceData.xdebug,
@@ -74,7 +67,7 @@ cmd.argv(process.argv, async (arg, opt) => {
     const instanceData = await (0, _devEnvironmentCli.promptForArguments)(finalPreselectedOptions, defaultOptions, suppressPrompts);
     instanceData.siteSlug = slug;
     await (0, _devEnvironmentCore.updateEnvironment)(instanceData);
-    const message = '\n' + _chalk.default.green('✓') + ' environment updated. Restart environment for changes to take an affect.';
+    const message = '\n' + _chalk.default.green('✓') + ' environment updated. Please start environment again for changes to take effect: ' + _chalk.default.bold(`vip dev env --slug ${slug} start`);
     console.log(message);
     await (0, _tracker.trackEvent)('dev_env_update_command_success', trackingInfo);
   } catch (error) {

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

@@ -1,12 +1,4 @@
 #!/usr/bin/env node
-
-/**
- * External dependencies
- */
-
-/**
- * Internal dependencies
- */
 "use strict";
 
 var _command = _interopRequireDefault(require("../lib/cli/command"));

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

@@ -1,16 +1,8 @@
 #!/usr/bin/env node
-
-/**
- * External dependencies
- */
-
-/**
- * Internal dependencies
- */
 "use strict";
 
-var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _exportSql = require("../commands/export-sql");
+var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _tracker = require("../lib/tracker");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const examples = [{

package/dist/bin/vip-export.js

@@ -1,12 +1,4 @@
 #!/usr/bin/env node
-
-/**
- * External dependencies
- */
-
-/**
- * Internal dependencies
- */
 "use strict";
 
 var _command = _interopRequireDefault(require("../lib/cli/command"));

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

@@ -1,26 +1,20 @@
 #!/usr/bin/env node
-
-/**
- * External dependencies
- */
 "use strict";
 
-var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _chalk = _interopRequireDefault(require("chalk"));
-var _mediaFileImport = require("../lib/media-import/media-file-import");
-var _command = _interopRequireDefault(require("../lib/cli/command"));
+var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _api = _interopRequireDefault(require("../lib/api"));
+var _command = _interopRequireDefault(require("../lib/cli/command"));
 var exit = _interopRequireWildcard(require("../lib/cli/exit"));
-var _tracker = require("../lib/tracker");
+var _mediaFileImport = require("../lib/media-import/media-file-import");
 var _progress = require("../lib/media-import/progress");
 var _status = require("../lib/media-import/status");
-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; }
+var _tracker = require("../lib/tracker");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * Internal dependencies
- */
 // eslint-disable-next-line no-duplicate-imports
+
 const appQuery = `
 	id,
 	name,

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

@@ -1,22 +1,15 @@
 #!/usr/bin/env node
-
-/**
- * External dependencies
- */
 "use strict";
 
-var _tracker = require("../lib/tracker");
+var _command = _interopRequireDefault(require("../lib/cli/command"));
 var exit = _interopRequireWildcard(require("../lib/cli/exit"));
 var _mediaFileImport = require("../lib/media-import/media-file-import");
-var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _progress = require("../lib/media-import/progress");
 var _status = require("../lib/media-import/status");
+var _tracker = require("../lib/tracker");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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; }
-/**
- * Internal dependencies
- */
 const appQuery = `
 	id,
 	name,

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

@@ -1,24 +1,18 @@
 #!/usr/bin/env node
-
-/**
- * External dependencies
- */
 "use strict";
 
-var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
-var _debug = _interopRequireDefault(require("debug"));
 var _chalk = _interopRequireDefault(require("chalk"));
-var _command = _interopRequireDefault(require("../lib/cli/command"));
+var _debug = _interopRequireDefault(require("debug"));
+var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _api = _interopRequireDefault(require("../lib/api"));
-var _tracker = require("../lib/tracker");
+var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _format = require("../lib/cli/format");
 var _progress = require("../lib/media-import/progress");
 var _status = require("../lib/media-import/status");
+var _tracker = require("../lib/tracker");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * Internal dependencies
- */
 // eslint-disable-next-line no-duplicate-imports
+
 const appQuery = `
 	id,
 	name,

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

@@ -1,22 +1,15 @@
 #!/usr/bin/env node
-
-/**
- * External dependencies
- */
 "use strict";
 
-var _tracker = require("../lib/tracker");
+var _command = _interopRequireDefault(require("../lib/cli/command"));
 var exit = _interopRequireWildcard(require("../lib/cli/exit"));
+var _progress = require("../lib/cli/progress");
 var _dbFileImport = require("../lib/site-import/db-file-import");
 var _status = require("../lib/site-import/status");
-var _command = _interopRequireDefault(require("../lib/cli/command"));
-var _progress = require("../lib/cli/progress");
+var _tracker = require("../lib/tracker");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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; }
-/**
- * Internal dependencies
- */
 const appQuery = `
 id,
 name,

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

@@ -1,40 +1,31 @@
 #!/usr/bin/env node
-
-/**
- * External dependencies
- */
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+exports.__esModule = true;
 exports.gates = gates;
 exports.validateAndGetTableNames = validateAndGetTableNames;
-var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
-var _cliColumns = _interopRequireDefault(require("cli-columns"));
 var _chalk = _interopRequireDefault(require("chalk"));
+var _cliColumns = _interopRequireDefault(require("cli-columns"));
 var _debug = _interopRequireDefault(require("debug"));
 var _enquirer = require("enquirer");
-var _command = _interopRequireDefault(require("../lib/cli/command"));
-var _dbFileImport = require("../lib/site-import/db-file-import");
-var _status = require("../lib/site-import/status");
-var _clientFileUploader = require("../lib/client-file-uploader");
-var _tracker = require("../lib/tracker");
-var _sql = require("../lib/validations/sql");
-var _siteType = require("../lib/validations/site-type");
-var _searchAndReplace = require("../lib/search-and-replace");
+var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _api = _interopRequireDefault(require("../lib/api"));
+var _command = _interopRequireDefault(require("../lib/cli/command"));
 var exit = _interopRequireWildcard(require("../lib/cli/exit"));
-var _lineByLine = require("../lib/validations/line-by-line");
 var _format = require("../lib/cli/format");
 var _progress = require("../lib/cli/progress");
+var _clientFileUploader = require("../lib/client-file-uploader");
+var _searchAndReplace = require("../lib/search-and-replace");
+var _dbFileImport = require("../lib/site-import/db-file-import");
+var _status = require("../lib/site-import/status");
+var _tracker = require("../lib/tracker");
 var _isMultiSite = require("../lib/validations/is-multi-site");
-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; }
+var _lineByLine = require("../lib/validations/line-by-line");
+var _siteType = require("../lib/validations/site-type");
+var _sql = require("../lib/validations/sql");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * Internal dependencies
- */
 const appQuery = `
 	id,
 	name,
@@ -89,14 +80,35 @@ const SQL_IMPORT_PREFLIGHT_PROGRESS_STEPS = [{
 /**
  * @param {AppForImport} app
  * @param {EnvForImport} env
- * @param {string} fileName
+ * @param {FileMeta} fileMeta
  */
-async function gates(app, env, fileName) {
+async function gates(app, env, fileMeta) {
   const {
     id: envId,
     appId
   } = env;
   const track = _tracker.trackEventWithEnv.bind(null, appId, envId);
+  const {
+    fileName,
+    basename
+  } = fileMeta;
+  try {
+    // Extract base file name and exit if it contains unsafe character
+    (0, _sql.validateFilename)(basename);
+  } catch (error) {
+    await track('import_sql_command_error', {
+      error_type: 'invalid-filename'
+    });
+    exit.withError(error);
+  }
+  try {
+    (0, _sql.validateImportFileExtension)(fileName);
+  } catch (error) {
+    await track('import_sql_command_error', {
+      error_type: 'invalid-extension'
+    });
+    exit.withError(error);
+  }
   if (!(0, _dbFileImport.currentUserCanImportForApp)(app)) {
     await track('import_sql_command_error', {
       error_type: 'unauthorized'
@@ -130,16 +142,16 @@ async function gates(app, env, fileName) {
     });
     exit.withError(`File '${fileName}' is empty.`);
   }
-  const maxFileSize = env !== null && env !== void 0 && env.launched ? _dbFileImport.SQL_IMPORT_FILE_SIZE_LIMIT_LAUNCHED : _dbFileImport.SQL_IMPORT_FILE_SIZE_LIMIT;
+  const maxFileSize = env?.launched ? _dbFileImport.SQL_IMPORT_FILE_SIZE_LIMIT_LAUNCHED : _dbFileImport.SQL_IMPORT_FILE_SIZE_LIMIT;
   if (fileSize > maxFileSize) {
     await track('import_sql_command_error', {
       error_type: 'sqlfile-toobig',
       file_size: fileSize,
-      launched: !!(env !== null && env !== void 0 && env.launched)
+      launched: Boolean(env?.launched)
     });
     exit.withError(`The sql import file size (${fileSize} bytes) exceeds the limit (${maxFileSize} bytes).` + (env.launched ? ' Note: This limit is lower for launched environments to maintain site stability.' : '') + '\n\nPlease split it into multiple files or contact support for assistance.');
   }
-  if (!(env !== null && env !== void 0 && env.importStatus)) {
+  if (!env?.importStatus) {
     await track('import_sql_command_error', {
       error_type: 'empty-import-status'
     });
@@ -242,14 +254,6 @@ If you are confident the file does not contain unsupported statements, you can r
   // this can only be called after static validation of the SQL file
   return (0, _sql.getTableNames)();
 }
-function validateFilename(filename) {
-  const re = /^[a-z0-9\-_.]+$/i;
-
-  // Exits if filename contains anything outside a-z A-Z - _ .
-  if (!re.test(filename)) {
-    exit.withError('Error: The characters used in the name of a file for import are limited to [0-9,a-z,A-Z,-,_,.]');
-  }
-}
 const displayPlaybook = ({
   launched,
   tableNames,
@@ -265,7 +269,7 @@ const displayPlaybook = ({
   console.log(`  importing: ${_chalk.default.blueBright(fileName)}`);
   console.log(`         to: ${_chalk.default.cyan(domain)}`);
   console.log(`       site: ${app.name} (${formattedEnvironment})`);
-  if (searchReplace !== null && searchReplace !== void 0 && searchReplace.length) {
+  if (searchReplace?.length) {
     const output = (from, to) => {
       const message = `        s-r: ${_chalk.default.blue(from)} -> ${_chalk.default.blue(to)}`;
       console.log(message);
@@ -274,11 +278,10 @@ const displayPlaybook = ({
   }
   let siteArray = [];
   if (isMultiSite) {
-    var _app$environments, _selectedEnvironmentO;
     // eslint-disable-next-line no-multi-spaces
     console.log(`  multisite: ${isMultiSite.toString()}`);
-    const selectedEnvironmentObj = app === null || app === void 0 || (_app$environments = app.environments) === null || _app$environments === void 0 ? void 0 : _app$environments.find(env => unformattedEnvironment === env.type);
-    siteArray = selectedEnvironmentObj === null || selectedEnvironmentObj === void 0 || (_selectedEnvironmentO = selectedEnvironmentObj.wpSites) === null || _selectedEnvironmentO === void 0 ? void 0 : _selectedEnvironmentO.nodes;
+    const selectedEnvironmentObj = app?.environments?.find(env => unformattedEnvironment === env.type);
+    siteArray = selectedEnvironmentObj?.wpSites?.nodes;
   }
   if (!tableNames.length) {
     debug('Validation was skipped, no playbook information will be displayed');
@@ -289,12 +292,11 @@ const displayPlaybook = ({
       console.log('Below are a list of Tables that will be imported by this process:');
       console.log((0, _cliColumns.default)(tableNames));
     } else {
-      var _siteArray;
       // we have siteArray from the API, use it and the table names together
       if (siteArray === 'undefined' || !siteArray) {
         console.log(_chalk.default.yellowBright('Unable to determine the subsites affected by this import, please proceed only if you are confident on the contents in the import file.'));
         return;
-      } else if (!((_siteArray = siteArray) !== null && _siteArray !== void 0 && _siteArray.length)) {
+      } else if (!siteArray?.length) {
         throw new Error('There were no sites in your multisite installation');
       }
       const multiSiteBreakdown = siteArray.map(wpSite => {
@@ -331,7 +333,6 @@ void (0, _command.default)({
   requiredArgs: 1,
   module: 'import-sql'
 }).command('status', 'Check the status of the current running import').option('skip-validate', 'Do not perform pre-upload file validation. If unsupported entries are present, the import is likely to fail').option('search-replace', 'Search for a given URL in the SQL file and replace it with another. The format for the value is `<from-url>,<to-url>` (e.g. --search-replace="https://from.com,https://to.com"').option('in-place', 'Search and Replace explicitly on the given input file').option('output', 'Specify the replacement output file for Search and Replace', 'process.stdout').examples(examples).argv(process.argv, async (arg, opts) => {
-  var _env$primaryDomain;
   const {
     app,
     env
@@ -358,15 +359,12 @@ void (0, _command.default)({
   await track('import_sql_command_execute');
 
   // // halt operation of the import based on some rules
-  await gates(app, env, fileName);
+  await gates(app, env, fileMeta);
 
   // Log summary of import details
-  const domain = env !== null && env !== void 0 && (_env$primaryDomain = env.primaryDomain) !== null && _env$primaryDomain !== void 0 && _env$primaryDomain.name ? env.primaryDomain.name : `#${env.id}`;
+  const domain = env?.primaryDomain?.name ? env.primaryDomain.name : `#${env.id}`;
   const formattedEnvironment = (0, _format.formatEnvironment)(opts.env.type);
   const launched = opts.env.launched;
-
-  // Extract base file name and exit if it contains unsafe character
-  validateFilename(fileMeta.basename);
   let fileNameToUpload = fileName;
 
   // SQL file validations

package/dist/bin/vip-import-validate-files.js

@@ -1,21 +1,14 @@
 #!/usr/bin/env node
-
-/**
- * External dependencies
- */
 "use strict";
 
-var _url = _interopRequireDefault(require("url"));
-var _path = _interopRequireDefault(require("path"));
 var _chalk = _interopRequireDefault(require("chalk"));
 var _fs = _interopRequireDefault(require("fs"));
+var _path = _interopRequireDefault(require("path"));
+var _url = _interopRequireDefault(require("url"));
 var _command = _interopRequireDefault(require("../lib/cli/command"));
-var _vipImportValidateFiles = require("../lib/vip-import-validate-files");
 var _tracker = require("../lib/tracker");
+var _vipImportValidateFiles = require("../lib/vip-import-validate-files");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * Internal dependencies
- */
 (0, _command.default)({
   requiredArgs: 1,
   format: true