@hubspot/cli 7.7.16-experimental.8 → 7.7.17-experimental.0

package/commands/app.js

@@ -5,17 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const migrate_1 = __importDefault(require("./app/migrate"));
 const secret_1 = __importDefault(require("./app/secret"));
-const install_1 = __importDefault(require("./app/install"));
 const yargsUtils_1 = require("../lib/yargsUtils");
 const command = ['app', 'apps'];
 // Keep the command hidden for now
 const describe = undefined;
 function appBuilder(yargs) {
-    yargs
-        .command(migrate_1.default)
-        .command(secret_1.default)
-        .command(install_1.default)
-        .demandCommand(1, '');
+    yargs.command(migrate_1.default).command(secret_1.default).demandCommand(1, '');
     return yargs;
 }
 const builder = (0, yargsUtils_1.makeYargsBuilder)(appBuilder, command, describe);

package/commands/getStarted.js

@@ -128,6 +128,7 @@ async function handler(args) {
         logger_1.uiLogger.log(en_1.commands.getStarted.prompts.projectCreated.description);
         logger_1.uiLogger.log(' ');
         // 5. Install dependencies - Ask user if they want to install dependencies
+        const installLocations = await (0, dependencyManagement_1.getProjectPackageJsonLocations)(projectDest);
         const { shouldInstallDependencies } = await (0, promptUtils_1.promptUser)([
             {
                 type: 'confirm',
@@ -138,24 +139,17 @@ async function handler(args) {
         ]);
         if (shouldInstallDependencies) {
             try {
-                // Change to the project directory to install dependencies
-                const originalCwd = process.cwd();
-                process.chdir(projectDest);
-                try {
-                    await (0, dependencyManagement_1.installPackages)({});
-                    logger_1.uiLogger.log(' ');
-                    logger_1.uiLogger.success(en_1.commands.getStarted.logs.dependenciesInstalled);
-                    logger_1.uiLogger.log(' ');
-                }
-                finally {
-                    // Always restore the original working directory
-                    process.chdir(originalCwd);
-                }
+                await (0, dependencyManagement_1.installPackages)({
+                    installLocations: installLocations,
+                });
+                logger_1.uiLogger.log(' ');
+                logger_1.uiLogger.success(en_1.commands.getStarted.logs.dependenciesInstalled);
+                logger_1.uiLogger.log(' ');
             }
             catch (err) {
                 logger_1.uiLogger.log(' ');
                 logger_1.uiLogger.error(en_1.commands.getStarted.errors.installDepsFailed);
-                console.log(err);
+                (0, errorHandlers_1.logError)(err);
                 logger_1.uiLogger.log(' ');
             }
         }

package/commands/testAccount/create.js

@@ -77,13 +77,11 @@ async function handler(args) {
         if (formatOutputAsJson) {
             jsonOutput.accountName = data.accountName;
             jsonOutput.accountId = data.id;
+            jsonOutput.personalAccessKey = data.personalAccessKey;
         }
         testAccountId = data.id;
     }
     catch (err) {
-        SpinniesManager_1.default.fail('createTestAccount', {
-            text: en_1.commands.testAccount.create.polling.createFailure,
-        });
         (0, errorHandlers_1.logError)(err);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
@@ -95,36 +93,16 @@ async function handler(args) {
             successStates: ['SUCCESS'],
             errorStates: [],
         });
+        SpinniesManager_1.default.succeed('createTestAccount', {
+            text: en_1.commands.testAccount.create.polling.success(testAccountConfig.accountName, testAccountId),
+        });
     }
     catch (err) {
         (0, errorHandlers_1.debugError)(err);
         SpinniesManager_1.default.fail('createTestAccount', {
-            text: en_1.commands.testAccount.create.polling.syncFailure,
+            text: en_1.commands.testAccount.create.polling.failure,
         });
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
-    }
-    if (jsonOutput) {
-        // HACK: The status endpoint sometimes returns an early success status.
-        // Sleep for an extra 5 minutes to make sure the sync is actually complete.
-        await new Promise(resolve => setTimeout(resolve, 300000));
-        try {
-            // Attempt to generate a new personal access key for the test account now that gate sync is complete.
-            const { data } = await (0, developerTestAccounts_1.generateDeveloperTestAccountPersonalAccessKey)(derivedAccountId, testAccountId);
-            if (data.personalAccessKey && data.personalAccessKey) {
-                jsonOutput.personalAccessKey = data.personalAccessKey;
-            }
-        }
-        catch (err) {
-            (0, errorHandlers_1.debugError)(err);
-            SpinniesManager_1.default.fail('createTestAccount', {
-                text: en_1.commands.testAccount.create.polling.pakFailure,
-            });
-            process.exit(exitCodes_1.EXIT_CODES.ERROR);
-        }
     }
-    SpinniesManager_1.default.succeed('createTestAccount', {
-        text: en_1.commands.testAccount.create.polling.success(testAccountConfig.accountName, testAccountId),
-    });
     if (formatOutputAsJson) {
         logger_1.uiLogger.json(jsonOutput);
     }

package/lang/en.d.ts

@@ -1502,28 +1502,6 @@ ${string}`;
     readonly app: {
         readonly describe: "Commands for managing apps.";
         readonly subcommands: {
-            readonly install: {
-                readonly describe: "Install an OAuth app into a test account.";
-                readonly options: {
-                    readonly appUid: "The uid of the app to install";
-                    readonly projectName: "The name of the project that contains the app";
-                };
-                readonly positionals: {
-                    readonly testAccountId: "The id of the test account to install the app into";
-                };
-                readonly errors: {
-                    readonly mustSpecifyProjectName: `You must specify a project name. Use the ${string} flag to specify the project name or run this command from within a project directory.`;
-                    readonly noAppUidFound: `No app uid found. Please specify the app uid with the ${string} flag or run this command from within a project that contains an app.`;
-                    readonly appMustBeOauth: "This command only supports installing oauth apps. Please specify an app with oauth auth type.";
-                };
-                readonly polling: {
-                    readonly start: "Installing app...";
-                    readonly success: "App installed successfully";
-                    readonly failure: "App installation failed";
-                    readonly error: "Error installing app";
-                };
-                readonly example: "Install the app with uid my-app-uid from the project named \"my-project\" into the target account with id 1234567890";
-            };
             readonly secret: {
                 readonly describe: "Commands for managing secrets.";
                 readonly subcommands: {
@@ -1833,9 +1811,7 @@ ${string}`;
                 readonly start: (testAccountName: string) => string;
                 readonly syncing: "Test account created! Syncing account data... (may take a few minutes - you can exit and the sync will continue)";
                 readonly success: (testAccountName: string, testAccountId: number) => string;
-                readonly createFailure: "Failed to create test account.";
-                readonly syncFailure: "Failed to sync data into test account. The account may not be ready to use.";
-                readonly pakFailure: "Failed to generate a personal access key for the test account.";
+                readonly failure: "Failed to sync data into test account. The account may not be ready to use.";
             };
             readonly options: {
                 readonly configPath: "The path to the test account config";

package/lang/en.js

@@ -1500,28 +1500,6 @@ exports.commands = {
     app: {
         describe: 'Commands for managing apps.',
         subcommands: {
-            install: {
-                describe: 'Install an OAuth app into a test account.',
-                options: {
-                    appUid: 'The uid of the app to install',
-                    projectName: 'The name of the project that contains the app',
-                },
-                positionals: {
-                    testAccountId: 'The id of the test account to install the app into',
-                },
-                errors: {
-                    mustSpecifyProjectName: `You must specify a project name. Use the ${(0, ui_1.uiCommandReference)('--project-name')} flag to specify the project name or run this command from within a project directory.`,
-                    noAppUidFound: `No app uid found. Please specify the app uid with the ${(0, ui_1.uiCommandReference)('--app-uid')} flag or run this command from within a project that contains an app.`,
-                    appMustBeOauth: 'This command only supports installing oauth apps. Please specify an app with oauth auth type.',
-                },
-                polling: {
-                    start: 'Installing app...',
-                    success: 'App installed successfully',
-                    failure: 'App installation failed',
-                    error: 'Error installing app',
-                },
-                example: 'Install the app with uid my-app-uid from the project named "my-project" into the target account with id 1234567890',
-            },
             secret: {
                 describe: 'Commands for managing secrets.',
                 subcommands: {
@@ -1831,9 +1809,7 @@ exports.commands = {
                 start: (testAccountName) => `Creating test account "${chalk_1.default.bold(testAccountName)}"...`,
                 syncing: 'Test account created! Syncing account data... (may take a few minutes - you can exit and the sync will continue)',
                 success: (testAccountName, testAccountId) => `Test account "${chalk_1.default.bold(testAccountName)}" successfully created with id: ${chalk_1.default.bold(testAccountId)}`,
-                createFailure: 'Failed to create test account.',
-                syncFailure: 'Failed to sync data into test account. The account may not be ready to use.',
-                pakFailure: 'Failed to generate a personal access key for the test account.',
+                failure: 'Failed to sync data into test account. The account may not be ready to use.',
             },
             options: {
                 configPath: 'The path to the test account config',

package/lib/dependencyManagement.d.ts

@@ -2,5 +2,5 @@ export declare function installPackages({ packages, installLocations, }: {
     packages?: string[];
     installLocations?: string[];
 }): Promise<void>;
-export declare function getProjectPackageJsonLocations(): Promise<string[]>;
+export declare function getProjectPackageJsonLocations(dir?: string): Promise<string[]>;
 export declare function hasMissingPackages(directory: string): Promise<boolean>;

package/lib/dependencyManagement.js

@@ -65,8 +65,8 @@ async function installPackagesInDirectory(directory, packages) {
         });
     }
 }
-async function getProjectPackageJsonLocations() {
-    const projectConfig = await (0, config_1.getProjectConfig)();
+async function getProjectPackageJsonLocations(dir) {
+    const projectConfig = await (0, config_1.getProjectConfig)(dir);
     if (!projectConfig ||
         !projectConfig.projectDir ||
         !projectConfig.projectConfig) {

package/lib/projects/structure.d.ts

@@ -1,5 +1,5 @@
 import { ComponentTypes, Component, GenericComponentConfig, PublicAppComponentConfig, PrivateAppComponentConfig, AppCardComponentConfig } from '../../types/Projects';
-import { IntermediateRepresentationNode, IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/src/lib/types';
+import { IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/src/lib/types';
 import { AppIRNode } from '../../types/ProjectComponents';
 export declare const CONFIG_FILES: {
     [k in ComponentTypes]: string;
@@ -15,4 +15,4 @@ export declare function getProjectComponentTypes(components: Array<Component>):
 export declare function getComponentUid(component?: Component | null): string | null;
 export declare function componentIsApp(component?: Component | null): component is Component<PublicAppComponentConfig | PrivateAppComponentConfig>;
 export declare function componentIsPublicApp(component?: Component | null): component is Component<PublicAppComponentConfig>;
-export declare function isAppIRNode(component: IntermediateRepresentationNodeLocalDev | IntermediateRepresentationNode): component is AppIRNode;
+export declare function isAppIRNode(component: IntermediateRepresentationNodeLocalDev): component is AppIRNode;

package/lib/projects/upload.d.ts

@@ -1,5 +1,4 @@
 import { FileResult } from 'tmp';
-import { IntermediateRepresentation } from '@hubspot/project-parsing-lib';
 import { ProjectConfig } from '../../types/Projects';
 type ProjectUploadCallbackFunction<T> = (accountId: number, projectConfig: ProjectConfig, tempFile: FileResult, buildId: number) => Promise<T>;
 type ProjectUploadResult<T> = {
@@ -21,5 +20,5 @@ type HandleProjectUploadArg<T> = {
 export declare function handleProjectUpload<T>({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage, forceCreate, isUploadCommand, sendIR, skipValidation, }: HandleProjectUploadArg<T>): Promise<ProjectUploadResult<T>>;
 export declare function validateSourceDirectory(srcDir: string, projectConfig: ProjectConfig): void;
 export declare function validateNoHSMetaMismatch(srcDir: string, projectConfig: ProjectConfig): Promise<void>;
-export declare function handleTranslate(projectDir: string, projectConfig: ProjectConfig, accountId: number, skipValidation: boolean, profile: string | undefined): Promise<IntermediateRepresentation | undefined>;
+export declare function handleTranslate(projectDir: string, projectConfig: ProjectConfig, accountId: number, skipValidation: boolean, profile: string | undefined): Promise<unknown>;
 export {};

package/lib/projects/upload.js

@@ -149,5 +149,4 @@ async function handleTranslate(projectDir, projectConfig, accountId, skipValidat
             (0, errorHandlers_1.logError)(e);
         }
     }
-    return undefined;
 }

package/lib/testUtils.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mockHubSpotHttpResponse = mockHubSpotHttpResponse;
 exports.mockHubSpotHttpError = mockHubSpotHttpError;
-const axios_1 = require("axios");
 const HubSpotHttpError_1 = require("@hubspot/local-dev-lib/models/HubSpotHttpError");
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function mockHubSpotHttpResponse(data) {
@@ -12,7 +11,7 @@ function mockHubSpotHttpResponse(data) {
         statusText: 'OK',
         headers: {},
         config: {
-            headers: new axios_1.AxiosHeaders(),
+            headers: {},
         },
     });
 }

package/package.json

@@ -1,12 +1,12 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.7.16-experimental.8",
+    "version": "7.7.17-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.13.0",
-        "@hubspot/project-parsing-lib": "0.5.1",
+        "@hubspot/local-dev-lib": "3.12.0",
+        "@hubspot/project-parsing-lib": "0.5.2-beta.0",
         "@hubspot/serverless-dev-runtime": "7.0.6",
         "@hubspot/theme-preview-dev-server": "0.0.10",
         "@hubspot/ui-extensions-dev-server": "0.9.2",

package/commands/app/install.d.ts

@@ -1,8 +0,0 @@
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule, JSONOutputArgs } from '../../types/Yargs';
-type InstallAppArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs & {
-    appUid?: string;
-    projectName?: string;
-    testAccountId: number;
-};
-declare const installAppCommand: YargsCommandModule<unknown, InstallAppArgs>;
-export default installAppCommand;

package/commands/app/install.js

@@ -1,127 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const developerTestAccounts_1 = require("@hubspot/local-dev-lib/api/developerTestAccounts");
-const usageTracking_1 = require("../../lib/usageTracking");
-const en_1 = require("../../lang/en");
-const exitCodes_1 = require("../../lib/enums/exitCodes");
-const yargsUtils_1 = require("../../lib/yargsUtils");
-const constants_1 = require("../../lib/constants");
-const logger_1 = require("../../lib/ui/logger");
-const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
-const errorHandlers_1 = require("../../lib/errorHandlers");
-const polling_1 = require("../../lib/polling");
-const config_1 = require("../../lib/projects/config");
-const upload_1 = require("../../lib/projects/upload");
-const structure_1 = require("../../lib/projects/structure");
-const command = 'install <test-account-id>';
-const describe = undefined; // commands.app.subcommands.install.describe;
-async function handler(args) {
-    const { derivedAccountId, appUid, projectName, testAccountId, formatOutputAsJson, } = args;
-    (0, usageTracking_1.trackCommandUsage)('app-install', {}, derivedAccountId);
-    const jsonOutput = {};
-    let targetProjectName = projectName;
-    let targetAppUid = appUid;
-    const { projectConfig, projectDir } = await (0, config_1.getProjectConfig)();
-    if (!targetProjectName) {
-        (0, config_1.validateProjectConfig)(projectConfig, projectDir);
-        targetProjectName = projectConfig?.name;
-    }
-    if (!targetProjectName) {
-        logger_1.uiLogger.error(en_1.commands.app.subcommands.install.errors.mustSpecifyProjectName);
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
-    }
-    let isAppOauth = true;
-    if (!targetAppUid) {
-        const intermediateRepresentation = await (0, upload_1.handleTranslate)(projectDir, projectConfig, derivedAccountId, true, undefined);
-        if (intermediateRepresentation) {
-            Object.values(intermediateRepresentation.intermediateNodesIndexedByUid).forEach(node => {
-                if ((0, structure_1.isAppIRNode)(node)) {
-                    targetAppUid = node.uid;
-                    isAppOauth = node.config.auth.type === constants_1.APP_AUTH_TYPES.OAUTH;
-                }
-            });
-        }
-    }
-    if (!targetAppUid) {
-        logger_1.uiLogger.error(en_1.commands.app.subcommands.install.errors.noAppUidFound);
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
-    }
-    if (!isAppOauth) {
-        logger_1.uiLogger.error(en_1.commands.app.subcommands.install.errors.appMustBeOauth);
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
-    }
-    try {
-        const { data } = await (0, developerTestAccounts_1.installOauthAppIntoDeveloperTestAccount)(derivedAccountId, testAccountId, targetProjectName, targetAppUid);
-        if (data?.authCodes.length > 0) {
-            jsonOutput.authCode = data.authCodes[0].authCode;
-        }
-    }
-    catch (err) {
-        (0, errorHandlers_1.logError)(err);
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
-    }
-    SpinniesManager_1.default.init({
-        succeedColor: 'white',
-    });
-    SpinniesManager_1.default.add('installApp', {
-        text: en_1.commands.app.subcommands.install.polling.start,
-    });
-    let appInstallSucceeded = false;
-    try {
-        await (0, polling_1.poll)(() => (0, developerTestAccounts_1.fetchDeveloperTestAccountOauthAppInstallStatus)(derivedAccountId, targetProjectName, targetAppUid), {
-            successStates: ['SUCCESS'],
-            errorStates: [],
-        });
-        appInstallSucceeded = true;
-    }
-    catch (err) {
-        SpinniesManager_1.default.fail('installApp');
-        (0, errorHandlers_1.logError)(err);
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
-    }
-    if (!appInstallSucceeded) {
-        SpinniesManager_1.default.fail('installApp');
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
-    }
-    SpinniesManager_1.default.succeed('installApp', {
-        text: en_1.commands.app.subcommands.install.polling.success,
-    });
-    if (formatOutputAsJson) {
-        logger_1.uiLogger.json(jsonOutput);
-    }
-    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
-}
-function installAppBuilder(yargs) {
-    yargs.positional('test-account-id', {
-        describe: en_1.commands.app.subcommands.install.positionals.testAccountId,
-        required: true,
-        type: 'number',
-    });
-    yargs.option('app-uid', {
-        describe: en_1.commands.app.subcommands.install.options.appUid,
-        type: 'string',
-    });
-    yargs.option('project-name', {
-        describe: en_1.commands.app.subcommands.install.options.projectName,
-        type: 'string',
-    });
-    yargs.example('install 1234567890 --app-uid=my-app-uid --project-name=my-project', en_1.commands.app.subcommands.install.example);
-    return yargs;
-}
-const builder = (0, yargsUtils_1.makeYargsBuilder)(installAppBuilder, command, en_1.commands.app.subcommands.install.describe, {
-    useGlobalOptions: true,
-    useAccountOptions: true,
-    useConfigOptions: true,
-    useEnvironmentOptions: true,
-    useJSONOutputOptions: true,
-});
-const installAppCommand = {
-    command,
-    describe,
-    handler,
-    builder,
-};
-exports.default = installAppCommand;