@hubspot/cli 7.1.1 → 7.2.0-beta.0

package/commands/theme.js

@@ -1,20 +1,54 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const marketplaceValidate = require('./theme/marketplace-validate');
-const generateSelectors = require('./theme/generate-selectors');
-const previewCommand = require('./theme/preview');
-const { addGlobalOptions } = require('../lib/commonOpts');
-const { i18n } = require('../lib/lang');
+exports.describe = exports.command = void 0;
+exports.builder = builder;
+const marketplaceValidate = __importStar(require("./theme/marketplace-validate"));
+const generateSelectors = __importStar(require("./theme/generate-selectors"));
+const previewCommand = __importStar(require("./theme/preview"));
+const commonOpts_1 = require("../lib/commonOpts");
+const lang_1 = require("../lib/lang");
 const i18nKey = 'commands.theme';
 exports.command = ['theme', 'themes'];
-exports.describe = i18n(`${i18nKey}.describe`);
-exports.builder = yargs => {
-    addGlobalOptions(yargs);
+exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+function builder(yargs) {
+    (0, commonOpts_1.addGlobalOptions)(yargs);
     yargs
         .command(previewCommand)
         .command(marketplaceValidate)
         .command(generateSelectors)
         .demandCommand(1, '');
     return yargs;
-};
+}

package/lang/en.lyaml

@@ -207,6 +207,7 @@ en:
         create:
           describe: "Create custom object instances."
           errors:
+            invalidObjectDefinition: "The object definition is invalid. Please check the schema and try again."
             creationFailed: "Object creation from {{ definition }} failed"
           options:
             path:
@@ -224,6 +225,7 @@ en:
             create:
               describe: "Create a custom object schema."
               errors:
+                invalidSchema: "The schema definition is invalid. Please check the schema and try again."
                 creationFailed: "Schema creation from {{ definition }} failed"
               options:
                 definition:
@@ -285,6 +287,7 @@ en:
             update:
               describe: "Update an existing custom object schema."
               errors:
+                invalidSchema: "The schema definition is invalid. Please check the schema and try again."
                 update: "Schema update from {{ definition }} failed"
               options:
                 path:
@@ -522,13 +525,21 @@ en:
             learnMoreLocalDevServer: "Learn more about the projects local dev server"
           errors:
             noProjectConfig: "No project detected. Please run this command again from a project directory."
+            noAccount: "An error occurred while reading account {{ accountId }} from your config. Run {{ authCommand }} to re-auth this account."
+            noAccountsInConfig: "No accounts found in your config. Run {{ authCommand }} to configure a HubSpot account with the CLI."
             invalidProjectComponents: "Projects cannot contain both private and public apps. Move your apps to separate projects before attempting local development."
             noRunnableComponents: "No supported components were found in this project. Run {{ command }} to see a list of available components and add one to your project."
+            invalidUnifiedAppsAccount: "Local development of Unified Apps is currently only supported in standard and developer accounts. Target a standard or developer account with {{ authCommand }} and try again."
           examples:
             default: "Start local dev for the current project"
         create:
           describe: "Create a new project."
+          errors:
+            failedToDownloadProject: "Failed to download project. Please try again later."
+            failedToFetchProjectList: "Failed to fetch the list of available project templates. Please try again later."
+            cannotNestProjects: "A project already exists at {{ projectDir }}. Projects cannot be nested within other projects. Please choose a different destination and try again."
           logs:
+            success: "Project {{#bold}}{{ projectName }}{{/bold}} was successfully created in {{ projectDest }}"
             welcomeMessage: "Welcome to HubSpot Developer Projects!"
           examples:
             default: "Create a new project"
@@ -601,12 +612,13 @@ en:
               describe: "The name for your newly created component"
             type:
               describe: "The path to the component type's location within the hubspot-project-components Github repo: https://github.com/HubSpot/hubspot-project-components"
-          creatingComponent:
-            message: "Adding a new component to your project"
-          success:
-            message: "{{ componentName }} was added to your project"
+          creatingComponent: "Adding a new component to {{#bold}}{{ projectName }}{{/bold}}"
+          success: "{{ componentName }} was successfully added to your project."
           error:
-            locationInProject: "The component location must be within a project folder"
+            failedToDownloadComponent: "Failed to download project component. Please try again later."
+            locationInProject: "This command must be run from within a project directory."
+            failedToFetchComponentList: "Failed to fetch the list of available components. Please try again later."
+            projectContainsPublicApp: "This project contains a public app. This command is currently only compatible with projects that contain private apps."
           examples:
             default: "Create a component within your project"
             withFlags: "Use --name and --type flags to bypass the prompt."
@@ -813,6 +825,8 @@ en:
             invalidAccountType: "Sandboxes must be created from a production account. Your current default account {{#bold}}{{ accountName }}{{/bold}} is a {{ accountType }}.
               \n- Run {{#bold}}hs accounts use{{/bold}} to switch to your default account to your production account.
               \n- Run {{#bold}}hs auth{{/bold}} to connect a production account to the HubSpot CLI.\n"
+            noAccountConfig: "There is no account associated with {{ accountId }} in the config file. Please choose another account and try again, or authenticate {{ accountId }} using {{ authCommand }}."
+            noSandboxAccountConfig: "There is no sandbox account associated with {{ accountId }} in the config file. Please try to re-authenticate your sandbox account using {{ authCommand}}."
         delete:
           describe: "Delete a sandbox account."
           debug:
@@ -829,11 +843,12 @@ en:
           failure:
             invalidUser: "Couldn't delete {{ accountName }} because your account has been removed from {{ parentAccountName }} or your permission set doesn't allow you to delete the sandbox. To update your permissions, contact a super admin in {{ parentAccountName }}."
             noAccount: "No account specified. Specify an account by using the --account flag."
-            noSandboxAccounts: "There are no sandboxes connected to the CLI. To add a sandbox, run {{#bold}}hs auth{{/bold}}."
-            noParentAccount: "This sandbox can't be deleted from the CLI because you haven't given the CLI access to its parent account. To do this, run {{#bold}}hs auth{{/bold}} and add the parent account."
+            noSandboxAccounts: "There are no sandboxes connected to the CLI. To add a sandbox, run {{ authCommand }}."
+            noSandboxAccountId: "This sandbox can't be deleted from the CLI because we could not find the associated sandbox account."
+            noParentAccount: "This sandbox can't be deleted from the CLI because you haven't given the CLI access to its parent account. To do this, run {{ authCommand }} and add the parent account."
             objectNotFound: "Sandbox {{#bold}}{{ account }}{{/bold}} may have been deleted through the UI. The account has been removed from the config."
-            noParentPortalAvailable: "This sandbox can't be deleted from the CLI because you haven't given the CLI access to its parent account. To do this, run {{#bold}}{{ command }}{{/bold}}. You can also delete the sandbox from the HubSpot management tool: {{#bold}}{{ url }}{{/bold}}."
-            invalidKey: "Your personal access key for account {{#bold}}{{ account }}{{/bold}} is inactive. To re-authenticate, please run {{#bold}}hs auth personalaccesskey{{/bold}}."
+            noParentPortalAvailable: "This sandbox can't be deleted from the CLI because you haven't given the CLI access to its parent account. To do this, run {{ command }}. You can also delete the sandbox from the HubSpot management tool: {{#bold}}{{ url }}{{/bold}}."
+            invalidKey: "Your personal access key for account {{#bold}}{{ account }}{{/bold}} is inactive. To re-authenticate, please run {{ authCommand }}."
           options:
             force:
               describe: "Skips all confirmation prompts when deleting a sandbox account."
@@ -1101,6 +1116,11 @@ en:
       checkIfParentAccountIsAuthed:
         notAuthedError: "To develop this project locally, run {{ authCommand }} to authenticate the App Developer Account {{ accountId }} associated with {{ accountIdentifier }}."
     projects:
+      create:
+        errors:
+          noProjectsInConfig: "Unable to find any projects in the target repository's config.json file. Please ensure that there is a \"projects\" array in the config file."
+          missingConfigFileTemplateSource: "Failed to fetch the config.json file from the target repository. Please ensure that there is a valid config.json file at the root of the repository and try again."
+          missingPropertiesInConfig: "Found misconfigured projects in the target repository's config.json file. Please ensure that each project in the target repository's config.json file contains the following properties: [\"name\", \"label\", \"path\", \"insertPath\"]."
       validateProjectConfig:
         configNotFound: "Unable to locate a project configuration file. Try running again from a project directory, or run {{ createCommand }} to create a new project."
         configMissingFields: "The project configuruation file is missing required fields."
@@ -1308,12 +1328,9 @@ en:
         errors:
           nameRequired: "A project name is required"
           destRequired: "A project dest is required"
-          invalidDest: "The selected destination already exists. Please provide a new path for this project."
+          invalidDest: "There is an existing project at this destination. Please provide a new path for this project."
           invalidCharacters: "The selected destination contains invalid characters. Please provide a new path and try again."
-          invalidTemplate: "[--template] Could not find template {{ template }}. Please choose an available template."
-          noProjectsInConfig: "Please ensure that there is a config.json file that contains a \"projects\" field."
-          missingConfigFileTemplateSource: "Please ensure that there is a config.json file in the repository used as the --template-source"
-          missingPropertiesInConfig: "Please ensure that each of the projects in your config.json file contain the following properties: [\"name\", \"label\", \"path\", \"insertPath\"]."
+          invalidTemplate: "[--template] Could not find template \"{{ template }}\". Please choose an available template:"
       selectPublicAppPrompt:
         selectAppIdMigrate: "[--appId] Choose an app under {{ accountName }} to migrate:"
         selectAppIdClone: "[--appId] Choose an app under {{ accountName }} to clone:"
@@ -1331,11 +1348,11 @@ en:
           projectNotFound: "Your project {{ projectName }} could not be found in {{ accountId }}. Please select a valid project:"
           accountIdRequired: "An account ID is required to download a project."
       projectAddPrompt:
-        selectType: "[--type] Select your component type:"
+        selectType: "[--type] Select a component to add: "
         enterName: "[--name] Give your component a name: "
         errors:
           nameRequired: "A component name is required"
-          invalidType: "[--type] Could not find type {{ type }}. Please choose an available type."
+          invalidType: "[--type] Could not find type \"{{ type }}\". Please choose an available type:"
       secretPrompt:
         enterValue: "Enter a value for your secret: "
         enterName: "Enter a name for your secret: "
@@ -1559,6 +1576,9 @@ en:
           defaultAccountSubHeader: "Default Account: {{accountDetails}}"
           noConfigFile: "CLI configuration not found"
           noConfigFileSecondary: "Run {{command}} and follow the prompts to create your CLI configuration file and connect it to your HubSpot account"
+          settings:
+            httpUseLocalhost: "The setting {{#bold}}httpUseLocalhost{{/bold}} is enabled"
+            httpUseLocalhostSecondary: "This setting causes all CLI requests to route to localhost"
         projectConfig:
           header: "Project configuration"
           projectDirSubHeader: "Project dir: {{#bold}}{{ projectDir }}{{/bold}}"

package/lib/DevServerManagerV2.d.ts

@@ -0,0 +1,34 @@
+import { ProjectConfig } from '../types/Projects';
+import { IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/src/lib/types';
+type DevServerInterface = {
+    setup?: Function;
+    start?: (options: object) => Promise<void>;
+    fileChange?: (filePath: string, event: string) => Promise<void>;
+    cleanup?: () => Promise<void>;
+};
+declare class DevServerManagerV2 {
+    private initialized;
+    private started;
+    private devServers;
+    constructor();
+    iterateDevServers(callback: (serverInterface: DevServerInterface) => Promise<void>): Promise<void>;
+    setup({ projectNodes, onUploadRequired, accountId, setActiveApp, }: {
+        projectNodes: {
+            [key: string]: IntermediateRepresentationNodeLocalDev;
+        };
+        onUploadRequired: () => void;
+        accountId: number;
+        setActiveApp: (appUid: string | undefined) => Promise<void>;
+    }): Promise<void>;
+    start({ accountId, projectConfig, }: {
+        accountId: number;
+        projectConfig: ProjectConfig;
+    }): Promise<void>;
+    fileChange({ filePath, event, }: {
+        filePath: string;
+        event: string;
+    }): Promise<void>;
+    cleanup(): Promise<void>;
+}
+declare const Manager: DevServerManagerV2;
+export default Manager;

package/lib/DevServerManagerV2.js

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const lang_1 = require("./lang");
+const promptUtils_1 = require("./prompts/promptUtils");
+const ui_extensions_dev_server_1 = require("@hubspot/ui-extensions-dev-server");
+const portManager_1 = require("@hubspot/local-dev-lib/portManager");
+const urls_1 = require("@hubspot/local-dev-lib/urls");
+const config_1 = require("@hubspot/local-dev-lib/config");
+const i18nKey = 'lib.DevServerManager';
+class DevServerManagerV2 {
+    initialized;
+    started;
+    devServers;
+    constructor() {
+        this.initialized = false;
+        this.started = false;
+        this.devServers = [ui_extensions_dev_server_1.DevModeUnifiedInterface];
+    }
+    async iterateDevServers(callback) {
+        await Promise.all(this.devServers.map(devServer => callback(devServer)));
+    }
+    async setup({ projectNodes, onUploadRequired, accountId, setActiveApp, }) {
+        let env;
+        const accountConfig = (0, config_1.getAccountConfig)(accountId);
+        if (accountConfig) {
+            env = accountConfig.env;
+        }
+        await (0, portManager_1.startPortManagerServer)();
+        await this.iterateDevServers(async (serverInterface) => {
+            if (serverInterface.setup) {
+                await serverInterface.setup({
+                    components: projectNodes,
+                    onUploadRequired,
+                    promptUser: promptUtils_1.promptUser,
+                    logger: logger_1.logger,
+                    urls: {
+                        api: (0, urls_1.getHubSpotApiOrigin)(env),
+                        web: (0, urls_1.getHubSpotWebsiteOrigin)(env),
+                    },
+                    setActiveApp,
+                });
+            }
+        });
+        this.initialized = true;
+    }
+    async start({ accountId, projectConfig, }) {
+        if (this.initialized) {
+            await this.iterateDevServers(async (serverInterface) => {
+                if (serverInterface.start) {
+                    await serverInterface.start({
+                        accountId,
+                        projectConfig,
+                        requestPorts: portManager_1.requestPorts,
+                    });
+                }
+            });
+        }
+        else {
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.notInitialized`));
+        }
+        this.started = true;
+    }
+    async fileChange({ filePath, event, }) {
+        if (this.started) {
+            this.iterateDevServers(async (serverInterface) => {
+                if (serverInterface.fileChange) {
+                    await serverInterface.fileChange(filePath, event);
+                }
+            });
+        }
+    }
+    async cleanup() {
+        if (this.started) {
+            await this.iterateDevServers(async (serverInterface) => {
+                if (serverInterface.cleanup) {
+                    await serverInterface.cleanup();
+                }
+            });
+            await (0, portManager_1.stopPortManagerServer)();
+        }
+    }
+}
+const Manager = new DevServerManagerV2();
+exports.default = Manager;

package/lib/LocalDevManager.d.ts

@@ -10,7 +10,7 @@ type LocalDevManagerConstructorOptions = {
     projectDir: string;
     projectId: number;
     debug?: boolean;
-    deployedBuild: Build;
+    deployedBuild?: Build;
     isGithubLinked: boolean;
     runnableComponents: Component[];
     env: Environment;
@@ -22,7 +22,7 @@ declare class LocalDevManager {
     projectDir: string;
     projectId: number;
     debug: boolean;
-    deployedBuild: Build;
+    deployedBuild?: Build;
     isGithubLinked: boolean;
     watcher: FSWatcher | null;
     uploadWarnings: {

package/lib/LocalDevManagerV2.d.ts

@@ -0,0 +1,64 @@
+import { FSWatcher } from 'chokidar';
+import { Build } from '@hubspot/local-dev-lib/types/Build';
+import { PublicApp } from '@hubspot/local-dev-lib/types/Apps';
+import { Environment } from '@hubspot/local-dev-lib/types/Config';
+import { ProjectConfig } from '../types/Projects';
+import { IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/src/lib/types';
+import { AppIRNode } from '../types/ProjectComponents';
+type LocalDevManagerConstructorOptions = {
+    targetProjectAccountId: number;
+    targetTestingAccountId: number;
+    projectConfig: ProjectConfig;
+    projectDir: string;
+    projectId: number;
+    debug?: boolean;
+    deployedBuild?: Build;
+    isGithubLinked: boolean;
+    projectNodes: {
+        [key: string]: IntermediateRepresentationNodeLocalDev;
+    };
+    env: Environment;
+};
+declare class LocalDevManagerV2 {
+    targetProjectAccountId: number;
+    targetTestingAccountId: number;
+    projectConfig: ProjectConfig;
+    projectDir: string;
+    projectId: number;
+    debug: boolean;
+    deployedBuild?: Build;
+    isGithubLinked: boolean;
+    watcher: FSWatcher | null;
+    uploadWarnings: {
+        [key: string]: boolean;
+    };
+    projectNodes: {
+        [key: string]: IntermediateRepresentationNodeLocalDev;
+    };
+    activeApp: AppIRNode | null;
+    activePublicAppData: PublicApp | null;
+    env: Environment;
+    publicAppActiveInstalls: number | null;
+    projectSourceDir: string;
+    mostRecentUploadWarning: string | null;
+    constructor(options: LocalDevManagerConstructorOptions);
+    setActiveApp(appUid?: string): Promise<void>;
+    setActivePublicAppData(): Promise<void>;
+    checkActivePublicAppInstalls(): Promise<void>;
+    start(): Promise<void>;
+    stop(showProgress?: boolean): Promise<void>;
+    checkPublicAppInstallation(): Promise<void>;
+    updateKeypressListeners(): void;
+    getUploadCommand(): string;
+    logUploadWarning(reason?: string): void;
+    monitorConsoleOutput(): void;
+    compareLocalProjectToDeployed(): void;
+    startWatching(): void;
+    stopWatching(): Promise<void>;
+    handleWatchEvent(filePath: string, event: string, configPaths: string[]): void;
+    devServerSetup(): Promise<boolean>;
+    devServerStart(): Promise<void>;
+    devServerFileChange(filePath: string, event: string): void;
+    devServerCleanup(): Promise<boolean>;
+}
+export default LocalDevManagerV2;