@hubspot/cli 7.4.0-experimental.0 → 7.4.2-experimental.0

package/commands/project/create.js

@@ -87,6 +87,7 @@ exports.handler = async (options) => {
         'projectCommandTip',
         'projectUploadCommand',
         'projectDevCommand',
+        'projectInstallDepsCommand',
         'projectHelpCommand',
         'feedbackCommand',
         'sampleProjects',

package/lang/en.js

@@ -2841,7 +2841,7 @@ export const lib = {
     disabledUrlText: 'See all HubSpot CLI commands here.',
     featureHighlight: {
       defaultTitle: "What's next?",
-      commandKeys: {
+      featureKeys: {
         accountOption: {
           command: '--account',
           message: command =>
@@ -2895,6 +2895,11 @@ export const lib = {
           message: command =>
             `Run ${command} to set up your test environment and start local development`,
         },
+        projectInstallDepsCommand: {
+          command: 'hs project install-deps',
+          message: command =>
+            `Run ${command} to install dependencies for your project components`,
+        },
         sampleProjects: {
           linkText: "HubSpot's sample projects",
           url: 'https://developers.hubspot.com/docs/platform/sample-projects?utm_source=cli&utm_content=project_create_whats_next',

package/lang/en.lyaml

@@ -1109,6 +1109,7 @@ en:
         missingComponents: "Couldn't find the following components in the deployed build for this project: {{#bold}}'{{ missingComponents }}'{{/bold}}. This may cause issues in local development."
         defaultWarning: "{{#bold}}Changing project configuration requires a new project build.{{/bold}}"
         defaultPublicAppWarning: "{{#bold}}Changing project configuration requires a new project build.{{/bold}}\n\nThis will affect your public app's {{#bold}}{{ installCount }} existing {{ installText }}{{/bold}}. If your app has users in production, we strongly recommend creating a copy of this app to test your changes before proceding."
+        defaultMarketplaceAppWarning: "{{#bold}}Changing project configuration requires creating a new project build.{{/bold}}\n\nYour marketplace app is currently installed in {{#bold}}{{ installCount }} {{ accountText }}{{/bold}}. Any uploaded changes will impact your app's users. We strongly recommend creating a copy of this app to test your changes before proceding."
         header: "{{ warning }} To reflect these changes and continue testing:"
         stopDev: "  * Stop {{ command }}"
         runUpload: "  * Run {{ command }}"
@@ -1244,6 +1245,9 @@ en:
           projectDevCommand:
             command: "hs project dev"
             message: "Run {{ command }} to set up your test environment and start local development"
+          projectInstallDepsCommand:
+            command: "hs project install-deps"
+            message: "Run {{ command }} to install dependencies for your project components"
           projectCommandTip:
             message: "Tip: All project commands must be run from within a project directory"
           sampleProjects:

package/lib/DevServerManagerV2.d.ts

@@ -12,11 +12,10 @@ declare class DevServerManagerV2 {
     private devServers;
     constructor();
     iterateDevServers(callback: (serverInterface: DevServerInterface) => Promise<void>): Promise<void>;
-    setup({ projectNodes, onUploadRequired, accountId, setActiveApp, }: {
+    setup({ projectNodes, accountId, setActiveApp, }: {
         projectNodes: {
             [key: string]: IntermediateRepresentationNodeLocalDev;
         };
-        onUploadRequired: () => void;
         accountId: number;
         setActiveApp: (appUid: string | undefined) => Promise<void>;
     }): Promise<void>;

package/lib/DevServerManagerV2.js

@@ -20,7 +20,7 @@ class DevServerManagerV2 {
     async iterateDevServers(callback) {
         await Promise.all(this.devServers.map(devServer => callback(devServer)));
     }
-    async setup({ projectNodes, onUploadRequired, accountId, setActiveApp, }) {
+    async setup({ projectNodes, accountId, setActiveApp, }) {
         let env;
         const accountConfig = (0, config_1.getAccountConfig)(accountId);
         if (accountConfig) {
@@ -31,7 +31,6 @@ class DevServerManagerV2 {
             if (serverInterface.setup) {
                 await serverInterface.setup({
                     components: projectNodes,
-                    onUploadRequired,
                     promptUser: promptUtils_1.promptUser,
                     logger: logger_1.logger,
                     urls: {

package/lib/LocalDevManagerV2.js

@@ -10,6 +10,7 @@ const logger_1 = require("@hubspot/local-dev-lib/logger");
 const localDevAuth_1 = require("@hubspot/local-dev-lib/api/localDevAuth");
 const appsDev_1 = require("@hubspot/local-dev-lib/api/appsDev");
 const config_1 = require("@hubspot/local-dev-lib/config");
+const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
 const constants_1 = require("./constants");
 const SpinniesManager_1 = __importDefault(require("./ui/SpinniesManager"));
 const DevServerManagerV2_1 = __importDefault(require("./DevServerManagerV2"));
@@ -212,16 +213,13 @@ class LocalDevManagerV2 {
             : (0, ui_1.uiCommandReference)('hs project upload');
     }
     logUploadWarning(reason) {
-        let warning;
-        if (reason) {
-            warning = reason;
-        }
-        else {
+        let warning = reason;
+        if (!warning) {
             warning =
                 this.publicAppActiveInstalls && this.publicAppActiveInstalls > 0
-                    ? (0, lang_1.i18n)(`${i18nKey}.uploadWarning.defaultPublicAppWarning`, {
+                    ? (0, lang_1.i18n)(`${i18nKey}.uploadWarning.defaultMarketplaceAppWarning`, {
                         installCount: this.publicAppActiveInstalls,
-                        installText: this.publicAppActiveInstalls === 1 ? 'install' : 'installs',
+                        accountText: this.publicAppActiveInstalls === 1 ? 'account' : 'accounts',
                     })
                     : (0, lang_1.i18n)(`${i18nKey}.uploadWarning.defaultWarning`);
         }
@@ -268,10 +266,10 @@ class LocalDevManagerV2 {
         const deployedComponentNames = this.deployedBuild.subbuildStatuses.map(subbuildStatus => subbuildStatus.buildName);
         const missingProjectNodes = [];
         Object.values(this.projectNodes).forEach(node => {
-            if ((0, structure_1.isAppIRNode)(node) || (0, structure_1.isCardIRNode)(node)) {
-                if (!deployedComponentNames.includes(node.uid)) {
-                    missingProjectNodes.push(`${(0, lang_1.i18n)(`${i18nKey}.uploadWarning.appLabel`)} ${node.uid}`);
-                }
+            if (!deployedComponentNames.includes(node.uid)) {
+                const userFriendlyName = (0, project_parsing_lib_1.mapToUserFriendlyName)(node.componentType);
+                const label = userFriendlyName ? `[${userFriendlyName}] ` : '';
+                missingProjectNodes.push(`${label}${node.uid}`);
             }
         });
         if (missingProjectNodes.length) {
@@ -284,9 +282,7 @@ class LocalDevManagerV2 {
         this.watcher = chokidar_1.default.watch(this.projectDir, {
             ignoreInitial: true,
         });
-        const configPaths = Object.values(this.projectNodes)
-            .filter(structure_1.isAppIRNode)
-            .map(component => component.localDev.componentConfigPath);
+        const configPaths = Object.values(this.projectNodes).map(component => component.localDev.componentConfigPath);
         const projectConfigPath = path_1.default.join(this.projectDir, constants_1.PROJECT_CONFIG_FILE);
         configPaths.push(projectConfigPath);
         this.watcher.on('add', filePath => {
@@ -317,7 +313,6 @@ class LocalDevManagerV2 {
         try {
             await DevServerManagerV2_1.default.setup({
                 projectNodes: this.projectNodes,
-                onUploadRequired: this.logUploadWarning.bind(this),
                 accountId: this.targetTestingAccountId,
                 setActiveApp: this.setActiveApp.bind(this),
             });

package/lib/app/migrate.js

@@ -31,6 +31,7 @@ const chalk_1 = __importDefault(require("chalk"));
 const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
 const projects_3 = require("@hubspot/local-dev-lib/constants/projects");
 const transform_1 = require("@hubspot/project-parsing-lib/src/lib/transform");
+const index_1 = require("@hubspot/local-dev-lib/errors/index");
 function getUnmigratableReason(reasonCode) {
     switch (reasonCode) {
         case projects_3.UNMIGRATABLE_REASONS.UP_TO_DATE:
@@ -273,15 +274,34 @@ async function migrateApp2023_2(derivedAccountId, options, accountConfig) {
     }
     const createProjectPromptResponse = await (0, createProjectPrompt_1.createProjectPrompt)(options);
     const { name: projectName, dest: projectDest } = createProjectPromptResponse;
-    const { projectExists } = await (0, projects_1.ensureProjectExists)(derivedAccountId, projectName, {
-        allowCreate: false,
-        noLogs: true,
-    });
-    if (projectExists) {
+    try {
+        await (0, projects_2.fetchProject)(derivedAccountId, projectName);
         throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.projectAlreadyExists`, {
             projectName,
         }));
     }
+    catch (error) {
+        if (!(0, index_1.isSpecifiedError)(error, { statusCode: 404 })) {
+            (0, errorHandlers_1.logError)(error, new errorHandlers_1.ApiErrorContext({ accountId: derivedAccountId }));
+            return process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        }
+    }
+    // const { projectExists } = await ensureProjectExists(
+    //   derivedAccountId,
+    //   projectName,
+    //   {
+    //     allowCreate: false,
+    //     noLogs: true,
+    //   }
+    // );
+    //
+    // if (projectExists) {
+    //   throw new Error(
+    //     i18n(`${i18nKey}.errors.projectAlreadyExists`, {
+    //       projectName,
+    //     })
+    //   );
+    // }
     await (0, usageTracking_1.trackCommandMetadataUsage)('migrate-app', { step: 'STARTED' }, derivedAccountId);
     logger_1.logger.log('');
     (0, ui_1.uiLine)();

package/lib/projects/structure.d.ts

@@ -1,6 +1,6 @@
 import { ComponentTypes, Component, GenericComponentConfig, PublicAppComponentConfig, PrivateAppComponentConfig, AppCardComponentConfig } from '../../types/Projects';
 import { IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/src/lib/types';
-import { AppIRNode, CardIRNode } from '../../types/ProjectComponents';
+import { AppIRNode } from '../../types/ProjectComponents';
 export declare const CONFIG_FILES: {
     [k in ComponentTypes]: string;
 };
@@ -16,4 +16,3 @@ export declare function getComponentUid(component?: Component | null): string |
 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): component is AppIRNode;
-export declare function isCardIRNode(component: IntermediateRepresentationNodeLocalDev): component is CardIRNode;

package/lib/projects/structure.js

@@ -44,7 +44,6 @@ exports.getComponentUid = getComponentUid;
 exports.componentIsApp = componentIsApp;
 exports.componentIsPublicApp = componentIsPublicApp;
 exports.isAppIRNode = isAppIRNode;
-exports.isCardIRNode = isCardIRNode;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const fs_1 = require("@hubspot/local-dev-lib/fs");
@@ -175,6 +174,3 @@ function componentIsPublicApp(component) {
 function isAppIRNode(component) {
     return component.componentType === constants_1.IR_COMPONENT_TYPES.APPLICATION;
 }
-function isCardIRNode(component) {
-    return component.componentType === constants_1.IR_COMPONENT_TYPES.CARD;
-}

package/package.json

@@ -1,12 +1,12 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.4.0-experimental.0",
+    "version": "7.4.2-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": "0.3.0-experimental.0",
-        "@hubspot/project-parsing-lib": "0.1.4",
+        "@hubspot/project-parsing-lib": "0.1.5",
         "@hubspot/serverless-dev-runtime": "7.0.2",
         "@hubspot/theme-preview-dev-server": "0.0.10",
         "@hubspot/ui-extensions-dev-server": "0.8.52",

package/types/ProjectComponents.d.ts

@@ -16,23 +16,8 @@ type AppConfig = {
         conditionallyRequiredScopes: string[];
     };
 };
-type CardConfig = {
-    name: string;
-    description: string;
-    previewImage: {
-        file: string;
-        altText: string;
-    };
-    entrypoint: string;
-    location: string;
-    objectTypes: string[];
-};
 export interface AppIRNode extends IntermediateRepresentationNodeLocalDev {
     componentType: typeof IR_COMPONENT_TYPES.APPLICATION;
     config: AppConfig;
 }
-export interface CardIRNode extends IntermediateRepresentationNodeLocalDev {
-    componentType: typeof IR_COMPONENT_TYPES.CARD;
-    config: CardConfig;
-}
 export {};