@hubspot/cli 7.3.0-experimental.2 → 7.4.0-experimental.0

package/lib/dependencyManagement.js

@@ -3,28 +3,47 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isGloballyInstalled = isGloballyInstalled;
+exports.getLatestCliVersion = getLatestCliVersion;
 exports.installPackages = installPackages;
 exports.getProjectPackageJsonLocations = getProjectPackageJsonLocations;
 exports.hasMissingPackages = hasMissingPackages;
-const fs_1 = __importDefault(require("fs"));
-const util_1 = __importDefault(require("util"));
-const path_1 = __importDefault(require("path"));
-const child_process_1 = require("child_process");
-const fs_2 = require("@hubspot/local-dev-lib/fs");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
 const projects_1 = require("./projects");
+const child_process_1 = require("child_process");
+const fs_1 = require("@hubspot/local-dev-lib/fs");
+const path_1 = __importDefault(require("path"));
 const ui_1 = require("./ui");
+const util_1 = __importDefault(require("util"));
 const lang_1 = require("./lang");
 const SpinniesManager_1 = __importDefault(require("./ui/SpinniesManager"));
-const npm_1 = require("./npm");
-const i18nKey = `commands.project.subcommands.installDeps`;
+const fs_2 = __importDefault(require("fs"));
+const package_json_1 = __importDefault(require("../package.json"));
+const DEFAULT_PACKAGE_MANAGER = 'npm';
 class NoPackageJsonFilesError extends Error {
     constructor(projectName) {
-        super((0, lang_1.i18n)(`${i18nKey}.noPackageJsonInProject`, {
+        super((0, lang_1.i18n)(`commands.project.subcommands.installDeps.noPackageJsonInProject`, {
             projectName,
             link: (0, ui_1.uiLink)('Learn how to create a project from scratch.', 'https://developers.hubspot.com/beta-docs/guides/crm/intro/create-a-project'),
         }));
     }
 }
+async function isGloballyInstalled(command) {
+    const exec = util_1.default.promisify(child_process_1.exec);
+    try {
+        await exec(`${command} --version`);
+        return true;
+    }
+    catch (e) {
+        return false;
+    }
+}
+async function getLatestCliVersion() {
+    const exec = util_1.default.promisify(child_process_1.exec);
+    const { stdout } = await exec(`npm info ${package_json_1.default.name} dist-tags --json`);
+    const { latest, next } = JSON.parse(stdout);
+    return { latest, next };
+}
 async function installPackages({ packages, installLocations, }) {
     const installDirs = installLocations || (await getProjectPackageJsonLocations());
     await Promise.all(installDirs.map(async (dir) => {
@@ -37,29 +56,35 @@ async function installPackagesInDirectory(directory, packages) {
     SpinniesManager_1.default.init();
     SpinniesManager_1.default.add(spinner, {
         text: packages && packages.length
-            ? (0, lang_1.i18n)(`${i18nKey}.addingDependenciesToLocation`, {
+            ? (0, lang_1.i18n)(`commands.project.subcommands.installDeps.addingDependenciesToLocation`, {
                 dependencies: `[${packages.join(', ')}]`,
                 directory: relativeDir,
             })
-            : (0, lang_1.i18n)(`${i18nKey}.installingDependencies`, {
+            : (0, lang_1.i18n)(`commands.project.subcommands.installDeps.installingDependencies`, {
                 directory: relativeDir,
             }),
     });
+    let installCommand = `${DEFAULT_PACKAGE_MANAGER} install`;
+    if (packages) {
+        installCommand = `${installCommand} ${packages.join(' ')}`;
+    }
+    logger_1.logger.debug(`Running ${installCommand}`);
     try {
-        await (0, npm_1.executeInstall)(packages, null, { cwd: directory });
+        const exec = util_1.default.promisify(child_process_1.exec);
+        await exec(installCommand, { cwd: directory });
         SpinniesManager_1.default.succeed(spinner, {
-            text: (0, lang_1.i18n)(`${i18nKey}.installationSuccessful`, {
+            text: (0, lang_1.i18n)(`commands.project.subcommands.installDeps.installationSuccessful`, {
                 directory: relativeDir,
             }),
         });
     }
     catch (e) {
         SpinniesManager_1.default.fail(spinner, {
-            text: (0, lang_1.i18n)(`${i18nKey}.installingDependenciesFailed`, {
+            text: (0, lang_1.i18n)(`commands.project.subcommands.installDeps.installingDependenciesFailed`, {
                 directory: relativeDir,
             }),
         });
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.installingDependenciesFailed`, {
+        throw new Error((0, lang_1.i18n)(`commands.project.subcommands.installDeps.installingDependenciesFailed`, {
             directory: relativeDir,
         }), {
             cause: e,
@@ -71,20 +96,20 @@ async function getProjectPackageJsonLocations() {
     if (!projectConfig ||
         !projectConfig.projectDir ||
         !projectConfig.projectConfig) {
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.noProjectConfig`));
+        throw new Error((0, lang_1.i18n)(`commands.project.subcommands.installDeps.noProjectConfig`));
     }
     const { projectDir, projectConfig: { srcDir, name }, } = projectConfig;
-    if (!(await (0, npm_1.isGloballyInstalled)())) {
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.packageManagerNotInstalled`, {
-            packageManager: npm_1.DEFAULT_PACKAGE_MANAGER,
-            link: (0, ui_1.uiLink)(npm_1.DEFAULT_PACKAGE_MANAGER, 'https://docs.npmjs.com/downloading-and-installing-node-js-and-npm'),
+    if (!(await isGloballyInstalled(DEFAULT_PACKAGE_MANAGER))) {
+        throw new Error((0, lang_1.i18n)(`commands.project.subcommands.installDeps.packageManagerNotInstalled`, {
+            packageManager: DEFAULT_PACKAGE_MANAGER,
+            link: (0, ui_1.uiLink)(DEFAULT_PACKAGE_MANAGER, 'https://docs.npmjs.com/downloading-and-installing-node-js-and-npm'),
         }));
     }
-    if (!fs_1.default.existsSync(projectConfig.projectDir) ||
-        !fs_1.default.existsSync(path_1.default.join(projectDir, srcDir))) {
+    if (!fs_2.default.existsSync(projectConfig.projectDir) ||
+        !fs_2.default.existsSync(path_1.default.join(projectDir, srcDir))) {
         throw new NoPackageJsonFilesError(name);
     }
-    const packageJsonFiles = (await (0, fs_2.walk)(path_1.default.join(projectDir, srcDir))).filter(file => file.includes('package.json') &&
+    const packageJsonFiles = (await (0, fs_1.walk)(path_1.default.join(projectDir, srcDir))).filter(file => file.includes('package.json') &&
         !file.includes('node_modules') &&
         !file.includes('.vite'));
     if (packageJsonFiles.length === 0) {

package/lib/doctor/Doctor.js

@@ -8,7 +8,6 @@ const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
 const dependencyManagement_1 = require("../dependencyManagement");
-const npm_1 = require("../npm");
 const util_1 = __importDefault(require("util"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -216,7 +215,7 @@ class Doctor {
         let latestCLIVersion;
         let nextCliVersion;
         try {
-            const { latest, next } = await (0, npm_1.getLatestCliVersion)();
+            const { latest, next } = await (0, dependencyManagement_1.getLatestCliVersion)();
             latestCLIVersion = latest;
             nextCliVersion = next;
         }

package/lib/polling.d.ts

@@ -6,6 +6,10 @@ export declare const DEFAULT_POLLING_STATES: {
     readonly REVERTED: "REVERTED";
     readonly FAILURE: "FAILURE";
 };
+export declare const DEFAULT_POLLING_STATUS_LOOKUP: {
+    successStates: "SUCCESS"[];
+    errorStates: ("FAILURE" | "ERROR" | "REVERTED")[];
+};
 type GenericPollingResponse = {
     status: string;
 };

package/lib/polling.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_POLLING_STATES = void 0;
+exports.DEFAULT_POLLING_STATUS_LOOKUP = exports.DEFAULT_POLLING_STATES = void 0;
 exports.poll = poll;
 const constants_1 = require("./constants");
 exports.DEFAULT_POLLING_STATES = {
@@ -10,7 +10,7 @@ exports.DEFAULT_POLLING_STATES = {
     REVERTED: 'REVERTED',
     FAILURE: 'FAILURE',
 };
-const DEFAULT_POLLING_STATUS_LOOKUP = {
+exports.DEFAULT_POLLING_STATUS_LOOKUP = {
     successStates: [exports.DEFAULT_POLLING_STATES.SUCCESS],
     errorStates: [
         exports.DEFAULT_POLLING_STATES.ERROR,
@@ -18,7 +18,7 @@ const DEFAULT_POLLING_STATUS_LOOKUP = {
         exports.DEFAULT_POLLING_STATES.FAILURE,
     ],
 };
-function poll(callback, statusLookup = DEFAULT_POLLING_STATUS_LOOKUP) {
+function poll(callback, statusLookup = exports.DEFAULT_POLLING_STATUS_LOOKUP) {
     return new Promise((resolve, reject) => {
         const pollInterval = setInterval(async () => {
             try {

package/lib/prompts/promptUtils.d.ts

@@ -4,10 +4,12 @@ export declare function confirmPrompt(message: string, options?: {
     defaultAnswer?: boolean;
     when?: PromptWhen;
 }): Promise<boolean>;
-export declare function listPrompt(message: string, { choices, when, }: {
-    choices: PromptChoices;
+export declare function listPrompt<T = string>(message: string, { choices, when, }: {
+    choices: PromptChoices<T>;
     when?: PromptWhen;
-}): Promise<string>;
-export declare function inputPrompt(message: string, { when, }?: {
+}): Promise<T>;
+export declare function inputPrompt(message: string, { when, validate, defaultAnswer, }?: {
     when?: boolean | (() => boolean);
+    validate?: (input: string) => boolean | string;
+    defaultAnswer?: string;
 }): Promise<string>;

package/lib/prompts/promptUtils.js

@@ -34,13 +34,15 @@ async function listPrompt(message, { choices, when, }) {
     ]);
     return choice;
 }
-async function inputPrompt(message, { when, } = {}) {
+async function inputPrompt(message, { when, validate, defaultAnswer, } = {}) {
     const { input } = await promptUser([
         {
             name: 'input',
             type: 'input',
+            default: defaultAnswer,
             message,
             when,
+            validate,
         },
     ]);
     return input;

package/lib/ui/index.d.ts

@@ -11,7 +11,7 @@ export declare function uiCommandReference(command: string, withQuotes?: boolean
 export declare function uiFeatureHighlight(features: string[], title?: string): void;
 export declare function uiBetaTag(message: string, log?: true): undefined;
 export declare function uiBetaTag(message: string, log: false): string;
-export declare function uiDeprecatedTag(message: string): void;
+export declare function uiDeprecatedTag(message: string, log?: boolean): string | undefined;
 export declare function uiCommandDisabledBanner(command: string, url?: string, message?: string): void;
-export declare function uiDeprecatedDescription(message: string, command: string, url?: string): void;
+export declare function uiDeprecatedDescription(message: string, command: string, url?: string): string | undefined;
 export declare function uiDeprecatedMessage(command: string, url?: string, message?: string): void;

package/lib/ui/index.js

@@ -102,16 +102,17 @@ function uiBetaTag(message, log = true) {
         logger_1.logger.log(result);
         return;
     }
-    else {
-        return result;
-    }
+    return result;
 }
-function uiDeprecatedTag(message) {
+function uiDeprecatedTag(message, log = true) {
     const i18nKey = 'lib.ui';
     const terminalUISupport = getTerminalUISupport();
     const tag = (0, lang_1.i18n)(`${i18nKey}.deprecatedTag`);
     const result = `${terminalUISupport.color ? chalk_1.default.yellow(tag) : tag} ${message}`;
-    logger_1.logger.log(result);
+    if (log) {
+        logger_1.logger.log(result);
+    }
+    return result;
 }
 function uiCommandDisabledBanner(command, url, message) {
     const i18nKey = 'lib.ui';

package/package.json

@@ -1,15 +1,15 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.3.0-experimental.2",
+    "version": "7.4.0-experimental.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
     "dependencies": {
-        "@hubspot/local-dev-lib": "3.4.1",
+        "@hubspot/local-dev-lib": "0.3.0-experimental.0",
         "@hubspot/project-parsing-lib": "0.1.4",
         "@hubspot/serverless-dev-runtime": "7.0.2",
         "@hubspot/theme-preview-dev-server": "0.0.10",
-        "@hubspot/ui-extensions-dev-server": "0.8.50",
+        "@hubspot/ui-extensions-dev-server": "0.8.52",
         "archiver": "7.0.1",
         "chalk": "4.1.2",
         "chokidar": "3.6.0",

package/types/Prompts.d.ts

@@ -3,9 +3,9 @@ export type GenericPromptResponse = {
     [key: string]: any;
 };
 type PromptType = 'confirm' | 'list' | 'checkbox' | 'input' | 'password' | 'number' | 'rawlist';
-export type PromptChoices = Array<string | {
+export type PromptChoices<T = any> = Array<string | {
     name: string;
-    value?: any;
+    value?: T;
     disabled?: string | boolean;
 }>;
 export type PromptWhen = boolean | (() => boolean);

package/types/Yargs.d.ts

@@ -27,3 +27,13 @@ export type ProjectDevArgs = CommonArgs & ConfigArgs & EnvironmentArgs;
 export type TestingArgs = {
     qa?: boolean;
 };
+export type MigrateAppOptions = CommonArgs & AccountArgs & EnvironmentArgs & ConfigArgs & {
+    name: string;
+    dest: string;
+    appId: number;
+    platformVersion: string;
+};
+export type CloneAppArgs = ConfigArgs & EnvironmentArgs & AccountArgs & CommonArgs & {
+    dest: string;
+    appId: number;
+};

package/lib/npm.d.ts

@@ -1,9 +0,0 @@
-export declare const DEFAULT_PACKAGE_MANAGER = "npm";
-export declare function isGloballyInstalled(): Promise<boolean>;
-export declare function getLatestCliVersion(): Promise<{
-    latest: string;
-    next: string;
-}>;
-export declare function executeInstall(packages?: string[], flags?: string | null, options?: {
-    cwd?: string;
-}): Promise<void>;

package/lib/npm.js

@@ -1,36 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_PACKAGE_MANAGER = void 0;
-exports.isGloballyInstalled = isGloballyInstalled;
-exports.getLatestCliVersion = getLatestCliVersion;
-exports.executeInstall = executeInstall;
-const child_process_1 = require("child_process");
-const util_1 = __importDefault(require("util"));
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const package_json_1 = __importDefault(require("../package.json"));
-exports.DEFAULT_PACKAGE_MANAGER = 'npm';
-async function isGloballyInstalled() {
-    const exec = util_1.default.promisify(child_process_1.exec);
-    try {
-        await exec(`${exports.DEFAULT_PACKAGE_MANAGER} --version`);
-        return true;
-    }
-    catch (e) {
-        return false;
-    }
-}
-async function getLatestCliVersion() {
-    const exec = util_1.default.promisify(child_process_1.exec);
-    const { stdout } = await exec(`npm info ${package_json_1.default.name} dist-tags --json`);
-    const { latest, next } = JSON.parse(stdout);
-    return { latest, next };
-}
-async function executeInstall(packages = [], flags, options) {
-    const installCommand = `${exports.DEFAULT_PACKAGE_MANAGER} install${flags ? ` ${flags}` : ''} ${packages.join(' ')}`;
-    logger_1.logger.debug('Running ', installCommand);
-    const exec = util_1.default.promisify(child_process_1.exec);
-    await exec(installCommand, options);
-}