@hubspot/cli 8.1.2-experimental.1 → 8.1.2-experimental.3

package/commands/cms/module/create.js

@@ -73,11 +73,6 @@ function moduleCreateBuilder(yargs) {
         type: 'boolean',
         default: false,
     });
-    yargs.option('available-for-new-content', {
-        describe: commands.cms.subcommands.module.subcommands.create.options
-            .availableForNewContent,
-        type: 'boolean',
-    });
     return yargs;
 }
 const builder = makeYargsBuilder(moduleCreateBuilder, command, describe, {

package/commands/project/appInstallStatus.d.ts

@@ -1,4 +1,4 @@
-import { AccountArgs, CommonArgs, ConfigArgs, JSONOutputArgs, YargsCommandModule } from '../../types/Yargs.js';
-type ProjectInstallStatusArgs = CommonArgs & ConfigArgs & AccountArgs & JSONOutputArgs;
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, JSONOutputArgs, YargsCommandModule } from '../../types/Yargs.js';
+type ProjectInstallStatusArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs;
 declare const projectInstallStatusCommand: YargsCommandModule<unknown, ProjectInstallStatusArgs>;
 export default projectInstallStatusCommand;

package/commands/project/appInstallStatus.js

@@ -121,6 +121,7 @@ const builder = makeYargsBuilder(projectInstallStatusBuilder, command, describe,
     useGlobalOptions: true,
     useConfigOptions: true,
     useAccountOptions: true,
+    useEnvironmentOptions: true,
     useJSONOutputOptions: true,
 });
 const projectInstallStatusCommand = {

package/commands/project/info.d.ts

@@ -1,4 +1,4 @@
-import { AccountArgs, CommonArgs, ConfigArgs, JSONOutputArgs, YargsCommandModule } from '../../types/Yargs.js';
-type ProjectInfoArgs = CommonArgs & ConfigArgs & AccountArgs & JSONOutputArgs;
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, JSONOutputArgs, YargsCommandModule } from '../../types/Yargs.js';
+type ProjectInfoArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs;
 declare const projectInfoCommand: YargsCommandModule<unknown, ProjectInfoArgs>;
 export default projectInfoCommand;

package/commands/project/info.js

@@ -56,6 +56,7 @@ const builder = makeYargsBuilder(projectInfoBuilder, command, verboseDescribe, {
     useGlobalOptions: true,
     useConfigOptions: true,
     useAccountOptions: true,
+    useEnvironmentOptions: true,
     useJSONOutputOptions: true,
 });
 const projectInfoCommand = {

package/lang/en.d.ts

@@ -3406,6 +3406,9 @@ export declare const lib: {
             updatingPackageJsonWorkspaces: (packageJsonPath: string) => string;
             updatedWorkspaces: (workspaces: string) => string;
             updatedFileDependency: (packageName: string, relativePath: string) => string;
+            lintPackagesNotConfigured: (packageRoot: string) => string;
+            lintConfigNotFound: (packageRoot: string) => string;
+            lintHubSpotRulesNotActive: (packageRoot: string) => string;
             npmAuditClean: (packageRoot: string) => string;
             npmAuditIssues: (packageRoot: string, details: string) => string;
             npmAuditNpmUnavailable: (packageRoot: string) => string;

package/lang/en.js

@@ -3432,6 +3432,9 @@ export const lib = {
             updatingPackageJsonWorkspaces: (packageJsonPath) => `Updating package.json workspaces in archive: ${packageJsonPath}`,
             updatedWorkspaces: (workspaces) => `  Updated workspaces: ${workspaces}`,
             updatedFileDependency: (packageName, relativePath) => `  Updated dependencies.${packageName}: file:${relativePath}`,
+            lintPackagesNotConfigured: (packageRoot) => `Project lint: lint packages not installed for ${chalk.bold(packageRoot)}. Run ${uiCommandReference('hs project lint')} to install them.`,
+            lintConfigNotFound: (packageRoot) => `Project lint: ESLint configuration not found for ${chalk.bold(packageRoot)}. Run ${uiCommandReference('hs project lint')} to create an ESLint config.`,
+            lintHubSpotRulesNotActive: (packageRoot) => `Project lint: HubSpot ESLint rules not active for ${chalk.bold(packageRoot)}. Configure ${chalk.bold('@hubspot/eslint-config-ui-extensions')} — see ${uiLink('setup instructions', 'https://www.npmjs.com/package/@hubspot/eslint-config-ui-extensions')}.`,
             npmAuditClean: (packageRoot) => `npm audit: No npm dependency issues found for ${chalk.bold(packageRoot)}`,
             npmAuditIssues: (packageRoot, details) => `npm audit: security issues found for ${chalk.bold(packageRoot)}: ${details}`,
             npmAuditNpmUnavailable: (packageRoot) => `npm audit: skipped for ${chalk.bold(packageRoot)} (npm not available in PATH)`,

package/lib/projects/uieLinting.d.ts

@@ -23,6 +23,8 @@ export declare function hasEslintConfig(directory: string): boolean;
 export declare function hasDeprecatedEslintConfig(directory: string): boolean;
 export declare function getDeprecatedEslintConfigFiles(directory: string): string[];
 export declare function createEslintConfig(directory: string, platformVersion?: string | null): Promise<string>;
+export declare const HUBSPOT_UI_EXTENSIONS_RULE_PREFIX = "@hubspot/ui-extensions/";
+export declare function isHubSpotEslintConfigActive(directory: string): Promise<boolean>;
 export declare function lintPackagesInDirectory(directory: string, projectDir?: string): Promise<{
     success: boolean;
     output: string;

package/lib/projects/uieLinting.js

@@ -163,6 +163,21 @@ export async function createEslintConfig(directory, platformVersion) {
         throw error;
     }
 }
+export const HUBSPOT_UI_EXTENSIONS_RULE_PREFIX = '@hubspot/ui-extensions/';
+export async function isHubSpotEslintConfigActive(directory) {
+    const exec = util.promisify(execAsync);
+    try {
+        const { stdout } = await exec('npx eslint --print-config ./Component.tsx', {
+            cwd: directory,
+        });
+        const config = JSON.parse(stdout);
+        const rules = config.rules ?? {};
+        return Object.keys(rules).some(rule => rule.startsWith(HUBSPOT_UI_EXTENSIONS_RULE_PREFIX));
+    }
+    catch {
+        return false;
+    }
+}
 export async function lintPackagesInDirectory(directory, projectDir) {
     const displayPath = projectDir
         ? path.relative(projectDir, directory)

package/lib/projects/upload.js

@@ -18,6 +18,7 @@ import { walk } from '@hubspot/local-dev-lib/fs';
 import { LEGACY_CONFIG_FILES } from '../constants.js';
 import { archiveWorkspacesAndDependencies, getPackageJsonPathsToUpdate, getLockfilePathsToUpdate, } from './workspaces.js';
 import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
+import { validateLintConfigOnUpload } from './validateLintConfigOnUpload.js';
 import { runNpmAuditsBeforeProjectUpload } from './npmAuditOnUpload.js';
 async function uploadProjectFiles(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation) {
     const accountIdentifier = uiAccountDescription(accountId) || `${accountId}`;
@@ -61,6 +62,14 @@ export async function handleProjectUpload({ accountId, projectConfig, projectDir
         workspaceMappings = await collectWorkspaceDirectories(parsedPackageJsons);
         fileDependencyMappings = await collectFileDependencies(parsedPackageJsons);
     }
+    if (isUploadCommand && !skipValidation) {
+        await validateLintConfigOnUpload({
+            srcDir,
+            projectDir,
+            parsedPackageJsons,
+            isLegacyPlatform: isLegacyProject(projectConfig.platformVersion),
+        });
+    }
     if (isUploadCommand && !skipNpmAudit) {
         await runNpmAuditsBeforeProjectUpload({
             srcDir,

package/lib/projects/validateLintConfigOnUpload.d.ts

@@ -0,0 +1,9 @@
+import type { ParsedPackageJson } from '@hubspot/project-parsing-lib/workspaces';
+type ValidateLintConfigOnUploadArgs = {
+    srcDir: string;
+    projectDir: string;
+    parsedPackageJsons: ParsedPackageJson[];
+    isLegacyPlatform: boolean;
+};
+export declare function validateLintConfigOnUpload({ srcDir, projectDir, parsedPackageJsons, isLegacyPlatform, }: ValidateLintConfigOnUploadArgs): Promise<void>;
+export {};

package/lib/projects/validateLintConfigOnUpload.js

@@ -0,0 +1,45 @@
+import path from 'path';
+import { lib } from '../../lang/en.js';
+import { uiLogger } from '../ui/logger.js';
+import { areAllLintPackagesInstalled, hasEslintConfig, isHubSpotEslintConfigActive, } from './uieLinting.js';
+export async function validateLintConfigOnUpload({ srcDir, projectDir, parsedPackageJsons, isLegacyPlatform, }) {
+    const lintRoots = new Set();
+    if (isLegacyPlatform) {
+        lintRoots.add(srcDir);
+    }
+    else {
+        for (const { dir } of parsedPackageJsons) {
+            lintRoots.add(dir);
+        }
+        if (lintRoots.size === 0) {
+            lintRoots.add(srcDir);
+        }
+    }
+    let hasAnyOutput = false;
+    for (const lintRoot of lintRoots) {
+        const relativeRoot = path.relative(projectDir, lintRoot) || '.';
+        let warnMessage;
+        if (!areAllLintPackagesInstalled(lintRoot)) {
+            warnMessage =
+                lib.projectUpload.handleProjectUpload.lintPackagesNotConfigured(relativeRoot);
+        }
+        else if (!hasEslintConfig(lintRoot)) {
+            warnMessage =
+                lib.projectUpload.handleProjectUpload.lintConfigNotFound(relativeRoot);
+        }
+        else if (!(await isHubSpotEslintConfigActive(lintRoot))) {
+            warnMessage =
+                lib.projectUpload.handleProjectUpload.lintHubSpotRulesNotActive(relativeRoot);
+        }
+        if (warnMessage) {
+            if (!hasAnyOutput) {
+                uiLogger.log('');
+                hasAnyOutput = true;
+            }
+            uiLogger.warn(warnMessage);
+        }
+    }
+    if (hasAnyOutput) {
+        uiLogger.log('');
+    }
+}

package/mcp-server/tools/cms/HsCreateFunctionTool.js

@@ -59,7 +59,7 @@ export class HsCreateFunctionTool extends Tool {
             };
         }
         // Build the command
-        let command = 'hs cms function create';
+        let command = 'hs create function';
         if (dest) {
             command += ` "${dest}"`;
         }
@@ -94,7 +94,7 @@ export class HsCreateFunctionTool extends Tool {
     register() {
         return this.mcpServer.registerTool(toolName, {
             title: 'Create HubSpot CMS Serverless Function',
-            description: `Creates a new HubSpot CMS serverless function using the hs cms function create command. Functions can be created non-interactively by specifying functionsFolder, filename, and endpointPath. Supports all HTTP methods (${HTTP_METHODS.join(', ')}).`,
+            description: `Creates a new HubSpot CMS serverless function using the hs create function command. Functions can be created non-interactively by specifying functionsFolder, filename, and endpointPath. Supports all HTTP methods (${HTTP_METHODS.join(', ')}).`,
             inputSchema,
             annotations: {
                 readOnlyHint: false,

package/mcp-server/tools/cms/HsCreateModuleTool.js

@@ -1,8 +1,9 @@
 import { Tool } from '../../Tool.js';
 import { z } from 'zod';
 import { absoluteCurrentWorkingDirectory } from '../project/constants.js';
-import { addFlag, runCommandInDir } from '../../utils/command.js';
-import { formatTextContent, formatTextContents } from '../../utils/content.js';
+import { runCommandInDir } from '../../utils/command.js';
+import { formatTextContents, formatTextContent } from '../../utils/content.js';
+import { addFlag } from '../../utils/command.js';
 import { CONTENT_TYPES } from '../../../types/Cms.js';
 import { setupHubSpotConfig } from '../../utils/config.js';
 import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
@@ -74,7 +75,7 @@ export class HsCreateModuleTool extends Tool {
             };
         }
         // Build the command
-        let command = 'hs cms module create';
+        let command = 'hs create module';
         if (userSuppliedName) {
             command += ` "${userSuppliedName}"`;
         }
@@ -100,9 +101,6 @@ export class HsCreateModuleTool extends Tool {
         if (availableForNewContent !== undefined) {
             command = addFlag(command, 'available-for-new-content', availableForNewContent);
         }
-        else {
-            command = addFlag(command, 'available-for-new-content', true);
-        }
         try {
             const { stdout, stderr } = await runCommandInDir(absoluteCurrentWorkingDirectory, command);
             return formatTextContents(stdout, stderr);
@@ -118,7 +116,7 @@ export class HsCreateModuleTool extends Tool {
     register() {
         return this.mcpServer.registerTool(toolName, {
             title: 'Create HubSpot CMS Module',
-            description: 'Creates a new HubSpot CMS module using the hs cms module create command. Modules can be created non-interactively by specifying moduleLabel and other module options. You can create either HubL or React modules by setting the reactType parameter.',
+            description: 'Creates a new HubSpot CMS module using the hs create module command. Modules can be created non-interactively by specifying moduleLabel and other module options. You can create either HubL or React modules by setting the reactType parameter.',
             inputSchema,
             annotations: {
                 readOnlyHint: false,

package/mcp-server/tools/cms/HsCreateTemplateTool.js

@@ -47,7 +47,7 @@ export class HsCreateTemplateTool extends Tool {
             };
         }
         // Build the command
-        let command = 'hs cms template create';
+        let command = 'hs create template';
         if (userSuppliedName) {
             command += ` "${userSuppliedName}"`;
         }
@@ -73,7 +73,7 @@ export class HsCreateTemplateTool extends Tool {
     register() {
         return this.mcpServer.registerTool(toolName, {
             title: 'Create HubSpot CMS Template',
-            description: `Creates a new HubSpot CMS template using the hs cms template create command. Templates can be created non-interactively by specifying templateType. Supports all template types including: ${TEMPLATE_TYPES.join(', ')}.`,
+            description: `Creates a new HubSpot CMS template using the hs create template command. Templates can be created non-interactively by specifying templateType. Supports all template types including: ${TEMPLATE_TYPES.join(', ')}.`,
             inputSchema,
             annotations: {
                 readOnlyHint: false,

package/mcp-server/tools/cms/HsFunctionLogsTool.js

@@ -1,7 +1,8 @@
 import { Tool } from '../../Tool.js';
 import { z } from 'zod';
-import { addFlag, runCommandInDir } from '../../utils/command.js';
+import { addFlag } from '../../utils/command.js';
 import { absoluteCurrentWorkingDirectory } from '../project/constants.js';
+import { runCommandInDir } from '../../utils/command.js';
 import { formatTextContents } from '../../utils/content.js';
 import { setupHubSpotConfig } from '../../utils/config.js';
 import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
@@ -37,7 +38,7 @@ export class HsFunctionLogsTool extends Tool {
         const normalizedEndpoint = endpoint.startsWith('/')
             ? endpoint.slice(1)
             : endpoint;
-        let command = `hs cms function logs ${normalizedEndpoint}`;
+        let command = `hs logs ${normalizedEndpoint}`;
         if (latest) {
             command = addFlag(command, 'latest', latest);
         }

package/mcp-server/tools/cms/HsListFunctionsTool.js

@@ -1,7 +1,8 @@
 import { Tool } from '../../Tool.js';
 import { z } from 'zod';
-import { addFlag, runCommandInDir } from '../../utils/command.js';
+import { addFlag } from '../../utils/command.js';
 import { absoluteCurrentWorkingDirectory } from '../project/constants.js';
+import { runCommandInDir } from '../../utils/command.js';
 import { formatTextContents } from '../../utils/content.js';
 import { setupHubSpotConfig } from '../../utils/config.js';
 import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
@@ -25,7 +26,7 @@ export class HsListFunctionsTool extends Tool {
     }
     async handler({ account, json, absoluteCurrentWorkingDirectory, }) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        let command = 'hs cms function list';
+        let command = 'hs function list';
         if (json) {
             command += ' --json';
         }

package/mcp-server/tools/cms/HsListTool.js

@@ -26,7 +26,7 @@ export class HsListTool extends Tool {
     }
     async handler({ path, account, absoluteCurrentWorkingDirectory, }) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        let command = 'hs cms list';
+        let command = 'hs list';
         if (path) {
             command += ` ${path}`;
         }
@@ -46,7 +46,7 @@ export class HsListTool extends Tool {
                 content: [
                     {
                         type: 'text',
-                        text: `Error executing hs cms list command: ${getErrorMessage(error)}`,
+                        text: `Error executing hs list command: ${getErrorMessage(error)}`,
                     },
                 ],
             };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "8.1.2-experimental.1",
+    "version": "8.1.2-experimental.3",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",