@hubspot/cli 7.2.0-experimental.0 → 7.2.2-experimental.0

package/commands/theme/marketplace-validate.js

@@ -1,45 +1,39 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
-const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
-const commonOpts_1 = require("../../lib/commonOpts");
-const usageTracking_1 = require("../../lib/usageTracking");
-const marketplaceValidate_1 = require("../../lib/marketplaceValidate");
-const lang_1 = require("../../lib/lang");
+// @ts-nocheck
+const SpinniesManager = require('../../lib/ui/SpinniesManager');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { trackCommandUsage } = require('../../lib/usageTracking');
+const { kickOffValidation, pollForValidationFinish, fetchValidationResults, processValidationErrors, displayValidationResults, } = require('../../lib/marketplaceValidate');
+const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.theme.subcommands.marketplaceValidate';
 exports.command = 'marketplace-validate <path>';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
-async function handler(args) {
-    const { path, derivedAccountId } = args;
-    (0, usageTracking_1.trackCommandUsage)('validate', {}, derivedAccountId);
-    SpinniesManager_1.default.init();
-    SpinniesManager_1.default.add('marketplaceValidation', {
-        text: (0, lang_1.i18n)(`${i18nKey}.logs.validatingTheme`, {
+exports.describe = i18n(`${i18nKey}.describe`);
+exports.handler = async (options) => {
+    const { path, derivedAccountId } = options;
+    trackCommandUsage('validate', null, derivedAccountId);
+    SpinniesManager.init();
+    SpinniesManager.add('marketplaceValidation', {
+        text: i18n(`${i18nKey}.logs.validatingTheme`, {
             path,
         }),
     });
     const assetType = 'THEME';
-    const validationId = await (0, marketplaceValidate_1.kickOffValidation)(derivedAccountId, assetType, path);
-    await (0, marketplaceValidate_1.pollForValidationFinish)(derivedAccountId, validationId);
-    SpinniesManager_1.default.remove('marketplaceValidation');
-    const validationResults = await (0, marketplaceValidate_1.fetchValidationResults)(derivedAccountId, validationId);
-    (0, marketplaceValidate_1.processValidationErrors)(i18nKey, validationResults);
-    (0, marketplaceValidate_1.displayValidationResults)(i18nKey, validationResults);
+    const validationId = await kickOffValidation(derivedAccountId, assetType, path);
+    await pollForValidationFinish(derivedAccountId, validationId);
+    SpinniesManager.remove('marketplaceValidation');
+    const validationResults = await fetchValidationResults(derivedAccountId, validationId);
+    processValidationErrors(i18nKey, validationResults);
+    displayValidationResults(i18nKey, validationResults);
     process.exit();
-}
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+};
+exports.builder = yargs => {
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    addUseEnvironmentOptions(yargs);
     yargs.positional('path', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.path.describe`),
+        describe: i18n(`${i18nKey}.positionals.path.describe`),
         type: 'string',
-        required: true,
     });
     return yargs;
-}
+};

package/commands/theme/preview.d.ts

@@ -1,17 +1 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs } from '../../types/Yargs';
-export declare const command = "preview [--src] [--dest]";
-export declare const describe: string;
-type CombinedArgs = CommonArgs & ConfigArgs & AccountArgs;
-type ThemePreviewArgs = CombinedArgs & {
-    src: string;
-    dest: string;
-    notify: string;
-    'no-ssl'?: boolean;
-    port?: number;
-    resetSession?: boolean;
-    generateFieldsTypes?: boolean;
-};
-export declare function handler(args: ArgumentsCamelCase<ThemePreviewArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<ThemePreviewArgs>;
 export {};

package/commands/theme/preview.js

@@ -1,42 +1,37 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const cli_progress_1 = __importDefault(require("cli-progress"));
-const lang_1 = require("../../lib/lang");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const path_2 = require("@hubspot/local-dev-lib/path");
-const files_1 = require("@hubspot/local-dev-lib/constants/files");
-const themes_1 = require("@hubspot/local-dev-lib/cms/themes");
-const theme_preview_dev_server_1 = require("@hubspot/theme-preview-dev-server");
-const commonOpts_1 = require("../../lib/commonOpts");
-const upload_1 = require("../../lib/upload");
-const usageTracking_1 = require("../../lib/usageTracking");
-const previewPrompt_1 = require("../../lib/prompts/previewPrompt");
-const exitCodes_1 = require("../../lib/enums/exitCodes");
-const index_1 = require("../../lib/errorHandlers/index");
-const process_1 = require("../../lib/process");
-const projects_1 = require("../../lib/projects");
-const structure_1 = require("../../lib/projects/structure");
-const Projects_1 = require("../../types/Projects");
-const hasFeature_1 = require("../../lib/hasFeature");
+// @ts-nocheck
+const fs = require('fs');
+const path = require('path');
+const { i18n } = require('../../lib/lang');
+const { logger } = require('@hubspot/local-dev-lib/logger');
+const { addAccountOptions, addConfigOptions } = require('../../lib/commonOpts');
+const { getCwd } = require('@hubspot/local-dev-lib/path');
+const { getUploadableFileList } = require('../../lib/upload');
+const { trackCommandUsage } = require('../../lib/usageTracking');
+const { previewPrompt, previewProjectPrompt, } = require('../../lib/prompts/previewPrompt');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+const { FILE_UPLOAD_RESULT_TYPES, } = require('@hubspot/local-dev-lib/constants/files');
+const cliProgress = require('cli-progress');
+const { ApiErrorContext, logError } = require('../../lib/errorHandlers/index');
+const { handleExit, handleKeypress } = require('../../lib/process');
+const { getThemeJSONPath } = require('@hubspot/local-dev-lib/cms/themes');
+const { getProjectConfig } = require('../../lib/projects');
+const { findProjectComponents } = require('../../lib/projects/structure');
+const { ComponentTypes } = require('../../types/Projects');
+const { preview } = require('@hubspot/theme-preview-dev-server');
+const { hasFeature } = require('../../lib/hasFeature');
 const i18nKey = 'commands.theme.subcommands.preview';
 exports.command = 'preview [--src] [--dest]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
-function validateSrcPath(src) {
+exports.describe = i18n(`${i18nKey}.describe`);
+const validateSrcPath = src => {
     const logInvalidPath = () => {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.invalidPath`, {
+        logger.error(i18n(`${i18nKey}.errors.invalidPath`, {
             path: src,
         }));
     };
     try {
-        const stats = fs_1.default.statSync(src);
+        const stats = fs.statSync(src);
         if (!stats.isDirectory()) {
             logInvalidPath();
             return false;
@@ -47,65 +42,65 @@ function validateSrcPath(src) {
         return false;
     }
     return true;
-}
-function handleUserInput() {
+};
+const handleUserInput = () => {
     const onTerminate = () => {
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.processExited`));
-        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+        logger.log(i18n(`${i18nKey}.logs.processExited`));
+        process.exit(EXIT_CODES.SUCCESS);
     };
-    (0, process_1.handleExit)(onTerminate);
-    (0, process_1.handleKeypress)(key => {
+    handleExit(onTerminate);
+    handleKeypress(key => {
         if ((key.ctrl && key.name === 'c') || key.name === 'q') {
             onTerminate();
         }
     });
-}
-async function determineSrcAndDest(args) {
+};
+const determineSrcAndDest = async (options) => {
     let absoluteSrc;
     let dest;
-    const { projectDir, projectConfig } = await (0, projects_1.getProjectConfig)();
+    const { projectDir, projectConfig } = await getProjectConfig();
     if (!(projectDir && projectConfig)) {
         // Not in a project, prompt for src and dest of traditional theme
-        const previewPromptAnswers = await (0, previewPrompt_1.previewPrompt)(args);
-        const src = args.src || previewPromptAnswers.src;
-        dest = args.dest || previewPromptAnswers.dest;
-        absoluteSrc = path_1.default.resolve((0, path_2.getCwd)(), src);
+        const previewPromptAnswers = await previewPrompt(options);
+        const src = options.src || previewPromptAnswers.src;
+        dest = options.dest || previewPromptAnswers.dest;
+        absoluteSrc = path.resolve(getCwd(), src);
         if (!dest || !validateSrcPath(absoluteSrc)) {
-            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            process.exit(EXIT_CODES.ERROR);
         }
     }
     else {
         // In a project
-        let themeJsonPath = (0, themes_1.getThemeJSONPath)((0, path_2.getCwd)());
+        let themeJsonPath = getThemeJSONPath();
         if (!themeJsonPath) {
-            const projectComponents = await (0, structure_1.findProjectComponents)(projectDir);
-            const themeComponents = projectComponents.filter(c => c.type === Projects_1.ComponentTypes.HublTheme);
+            const projectComponents = await findProjectComponents(projectDir);
+            const themeComponents = projectComponents.filter(c => c.type === ComponentTypes.HublTheme);
             if (themeComponents.length === 0) {
-                logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noThemeComponents`));
-                process.exit(exitCodes_1.EXIT_CODES.ERROR);
+                logger.error(i18n(`${i18nKey}.errors.noThemeComponents`));
+                process.exit(EXIT_CODES.ERROR);
             }
-            const answer = await (0, previewPrompt_1.previewProjectPrompt)(themeComponents);
+            const answer = await previewProjectPrompt(themeComponents);
             themeJsonPath = `${answer.themeComponentPath}/theme.json`;
         }
-        const { dir: themeDir } = path_1.default.parse(themeJsonPath);
+        const { dir: themeDir } = path.parse(themeJsonPath);
         absoluteSrc = themeDir;
-        const { base: themeName } = path_1.default.parse(themeDir);
+        const { base: themeName } = path.parse(themeDir);
         dest = `@projects/${projectConfig.name}/${themeName}`;
     }
     return { absoluteSrc, dest };
-}
-async function handler(args) {
-    const { derivedAccountId, notify, noSsl, resetSession, port, generateFieldsTypes, } = args;
-    const { absoluteSrc, dest } = await determineSrcAndDest(args);
-    const filePaths = await (0, upload_1.getUploadableFileList)(absoluteSrc, false);
-    function startProgressBar(numFiles) {
-        const initialUploadProgressBar = new cli_progress_1.default.SingleBar({
+};
+exports.handler = async (options) => {
+    const { derivedAccountId, notify, noSsl, resetSession, port, generateFieldsTypes, } = options;
+    const { absoluteSrc, dest } = await determineSrcAndDest(options);
+    const filePaths = await getUploadableFileList(absoluteSrc, false);
+    const startProgressBar = numFiles => {
+        const initialUploadProgressBar = new cliProgress.SingleBar({
             gracefulExit: true,
             format: '[{bar}] {percentage}% | {value}/{total} | {label}',
             hideCursor: true,
-        }, cli_progress_1.default.Presets.rect);
+        }, cliProgress.Presets.rect);
         initialUploadProgressBar.start(numFiles, 0, {
-            label: (0, lang_1.i18n)(`${i18nKey}.initialUploadProgressBar.start`),
+            label: i18n(`${i18nKey}.initialUploadProgressBar.start`),
         });
         let uploadsHaveStarted = false;
         const uploadOptions = {
@@ -117,7 +112,7 @@ async function handler(args) {
                 if (!uploadsHaveStarted) {
                     uploadsHaveStarted = true;
                     initialUploadProgressBar.update(0, {
-                        label: (0, lang_1.i18n)(`${i18nKey}.initialUploadProgressBar.uploading`),
+                        label: i18n(`${i18nKey}.initialUploadProgressBar.uploading`),
                     });
                 }
             },
@@ -128,15 +123,15 @@ async function handler(args) {
                 /* Intentionally blank */
             },
             onFinalErrorCallback: () => initialUploadProgressBar.increment(),
-            onFinishCallback: (results) => {
+            onFinishCallback: results => {
                 initialUploadProgressBar.update(numFiles, {
-                    label: (0, lang_1.i18n)(`${i18nKey}.initialUploadProgressBar.finish`),
+                    label: i18n(`${i18nKey}.initialUploadProgressBar.finish`),
                 });
                 initialUploadProgressBar.stop();
                 results.forEach(result => {
-                    if (result.resultType == files_1.FILE_UPLOAD_RESULT_TYPES.FAILURE) {
-                        logger_1.logger.error('Uploading file "%s" to "%s" failed', result.file, dest);
-                        (0, index_1.logError)(result.error, new index_1.ApiErrorContext({
+                    if (result.resultType == FILE_UPLOAD_RESULT_TYPES.FAILURE) {
+                        logger.error('Uploading file "%s" to "%s" failed', result.file, dest);
+                        logError(result.error, new ApiErrorContext({
                             accountId: derivedAccountId,
                             request: dest,
                             payload: result.file,
@@ -146,78 +141,76 @@ async function handler(args) {
             },
         };
         return uploadOptions;
-    }
-    (0, usageTracking_1.trackCommandUsage)('preview', {}, derivedAccountId);
+    };
+    trackCommandUsage('preview', derivedAccountId);
     let createUnifiedDevServer;
     try {
-        // @ts-ignore TODO: Remove when we deprecate Node 18
         require.resolve('@hubspot/cms-dev-server');
-        // @ts-ignore TODO: Remove when we deprecate Node 18
         const { createDevServer } = await import('@hubspot/cms-dev-server');
         createUnifiedDevServer = createDevServer;
     }
     catch (e) {
-        logger_1.logger.warn('Unified dev server requires node 20 to run. Defaulting to legacy preview.');
+        logger.warn('Unified dev server requires node 20 to run. Defaulting to legacy preview.');
     }
-    const isUngatedForUnified = await (0, hasFeature_1.hasFeature)(derivedAccountId, 'cms:react:unifiedThemePreview');
+    const isUngatedForUnified = await hasFeature(derivedAccountId, 'cms:react:unifiedThemePreview');
     if (isUngatedForUnified && createUnifiedDevServer) {
         if (port) {
-            process.env['PORT'] = port.toString();
+            process.env['PORT'] = port;
         }
-        createUnifiedDevServer(absoluteSrc, false, '', '', !noSsl, generateFieldsTypes, {
+        createUnifiedDevServer(absoluteSrc, false, false, false, !noSsl, generateFieldsTypes, {
             filePaths,
-            resetSession: resetSession || false,
+            resetSession,
             startProgressBar,
+            handleUserInput,
             dest,
         });
     }
     else {
-        (0, theme_preview_dev_server_1.preview)(derivedAccountId, absoluteSrc, dest, {
+        preview(derivedAccountId, absoluteSrc, dest, {
             notify,
             filePaths,
             noSsl,
             port,
-            resetSession: resetSession || false,
+            resetSession,
             startProgressBar,
             handleUserInput,
         });
     }
-}
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    yargs
-        .option('src', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.src.describe`),
+};
+exports.builder = yargs => {
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    yargs.option('src', {
+        describe: i18n(`${i18nKey}.options.src.describe`),
         type: 'string',
         requiresArg: true,
-    })
-        .option('dest', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.dest.describe`),
+    });
+    yargs.option('dest', {
+        describe: i18n(`${i18nKey}.options.dest.describe`),
         type: 'string',
         requiresArg: true,
-    })
-        .option('notify', {
+    });
+    yargs.option('notify', {
         alias: 'n',
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.notify.describe`),
+        describe: i18n(`${i18nKey}.options.notify.describe`),
         type: 'string',
         requiresArg: true,
-    })
-        .option('no-ssl', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.noSsl.describe`),
+    });
+    yargs.option('no-ssl', {
+        describe: i18n(`${i18nKey}.options.noSsl.describe`),
         type: 'boolean',
-    })
-        .option('port', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.port.describe`),
+    });
+    yargs.option('port', {
+        describe: i18n(`${i18nKey}.options.port.describe`),
         type: 'number',
-    })
-        .option('resetSession', {
-        hidden: true,
+    });
+    yargs.option('resetSession', {
+        describe: false,
         type: 'boolean',
-    })
-        .option('generateFieldsTypes', {
-        hidden: true,
+    });
+    yargs.option('generateFieldsTypes', {
+        describe: false,
         type: 'boolean',
     });
     return yargs;
-}
+};

package/commands/theme.d.ts

@@ -1,4 +1 @@
-import { Argv } from 'yargs';
-export declare const command: string[];
-export declare const describe: string;
-export declare function builder(yargs: Argv): Argv;
+export {};

package/commands/theme.js

@@ -1,54 +1,20 @@
 "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 });
-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");
+// @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');
 const i18nKey = 'commands.theme';
 exports.command = ['theme', 'themes'];
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
-function builder(yargs) {
-    (0, commonOpts_1.addGlobalOptions)(yargs);
+exports.describe = i18n(`${i18nKey}.describe`);
+exports.builder = yargs => {
+    addGlobalOptions(yargs);
     yargs
         .command(previewCommand)
         .command(marketplaceValidate)
         .command(generateSelectors)
         .demandCommand(1, '');
     return yargs;
-}
+};