@hubspot/cli 7.0.7-experimental.0 → 7.0.8-experimental.0

package/commands/project/deploy.js

@@ -83,7 +83,7 @@ exports.handler = async (options) => {
             logger.error(i18n(`${i18nKey}.errors.noBuildId`));
             return process.exit(EXIT_CODES.ERROR);
         }
-        const { data: deployResp } = await deployProject(derivedAccountId, projectName, buildIdToDeploy);
+        const { data: deployResp } = await deployProject(derivedAccountId, projectName, buildIdToDeploy, options.useV3);
         if (!deployResp || deployResp.error) {
             logger.error(i18n(`${i18nKey}.errors.deploy`, {
                 details: deployResp.error.message,
@@ -123,6 +123,11 @@ exports.builder = yargs => {
             describe: i18n(`${i18nKey}.options.build.describe`),
             type: 'number',
         },
+        'use-v3': {
+            hidden: true,
+            type: 'boolean',
+            default: false,
+        },
     });
     yargs.example([
         ['$0 project deploy', i18n(`${i18nKey}.examples.default`)],

package/commands/project/upload.js

@@ -22,15 +22,15 @@ exports.handler = async (options) => {
     const { forceCreate, message, derivedAccountId } = options;
     const accountConfig = getAccountConfig(derivedAccountId);
     const accountType = accountConfig && accountConfig.accountType;
-    trackCommandUsage('project-upload', { type: accountType }, derivedAccountId);
     const { projectConfig, projectDir } = await getProjectConfig();
+    trackCommandUsage('project-upload', { type: accountType }, derivedAccountId);
     validateProjectConfig(projectConfig, projectDir);
     await ensureProjectExists(derivedAccountId, projectConfig.name, {
         forceCreate,
         uploadCommand: true,
     });
     try {
-        const { result, uploadError } = await handleProjectUpload(derivedAccountId, projectConfig, projectDir, pollProjectBuildAndDeploy, message);
+        const { result, uploadError } = await handleProjectUpload(derivedAccountId, projectConfig, projectDir, pollProjectBuildAndDeploy, message, options.translate);
         if (uploadError) {
             if (isSpecifiedError(uploadError, {
                 subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
@@ -80,6 +80,11 @@ exports.builder = yargs => {
             type: 'string',
             default: '',
         },
+        translate: {
+            hidden: true,
+            type: 'boolean',
+            default: false,
+        },
     });
     yargs.example([['$0 project upload', i18n(`${i18nKey}.examples.default`)]]);
     addConfigOptions(yargs);

package/lib/projects/upload.d.ts

@@ -5,5 +5,5 @@ type ProjectUploadResult<T> = {
     result?: T;
     uploadError?: unknown;
 };
-export declare function handleProjectUpload<T>(accountId: number, projectConfig: ProjectConfig, projectDir: string, callbackFunc: ProjectUploadCallbackFunction<T>, uploadMessage: string): Promise<ProjectUploadResult<T>>;
+export declare function handleProjectUpload<T>(accountId: number, projectConfig: ProjectConfig, projectDir: string, callbackFunc: ProjectUploadCallbackFunction<T>, uploadMessage: string, sendIR?: boolean): Promise<ProjectUploadResult<T>>;
 export {};

package/lib/projects/upload.js

@@ -15,8 +15,11 @@ const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
 const ui_1 = require("../ui");
 const lang_1 = require("../lang");
 const exitCodes_1 = require("../enums/exitCodes");
+const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
+const errorHandlers_1 = require("../errorHandlers");
+const node_util_1 = __importDefault(require("node:util"));
 const i18nKey = 'lib.projectUpload';
-async function uploadProjectFiles(accountId, projectName, filePath, uploadMessage, platformVersion) {
+async function uploadProjectFiles(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation) {
     SpinniesManager_1.default.init({});
     const accountIdentifier = (0, ui_1.uiAccountDescription)(accountId);
     SpinniesManager_1.default.add('upload', {
@@ -29,7 +32,7 @@ async function uploadProjectFiles(accountId, projectName, filePath, uploadMessag
     let buildId;
     let error;
     try {
-        const { data: upload } = await (0, projects_1.uploadProject)(accountId, projectName, filePath, uploadMessage, platformVersion);
+        const { data: upload } = await (0, projects_1.uploadProject)(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation);
         buildId = upload.buildId;
         SpinniesManager_1.default.succeed('upload', {
             text: (0, lang_1.i18n)(`${i18nKey}.uploadProjectFiles.succeed`, {
@@ -55,7 +58,7 @@ async function uploadProjectFiles(accountId, projectName, filePath, uploadMessag
     }
     return { buildId, error };
 }
-async function handleProjectUpload(accountId, projectConfig, projectDir, callbackFunc, uploadMessage) {
+async function handleProjectUpload(accountId, projectConfig, projectDir, callbackFunc, uploadMessage, sendIR = false) {
     const srcDir = path_1.default.resolve(projectDir, projectConfig.srcDir);
     const filenames = fs_extra_1.default.readdirSync(srcDir);
     if (!filenames || filenames.length === 0) {
@@ -74,7 +77,27 @@ async function handleProjectUpload(accountId, projectConfig, projectDir, callbac
         logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.handleProjectUpload.compressed`, {
             byteCount: archive.pointer(),
         }));
-        const { buildId, error } = await uploadProjectFiles(accountId, projectConfig.name, tempFile.name, uploadMessage, projectConfig.platformVersion);
+        let intermediateRepresentation;
+        if (sendIR) {
+            try {
+                intermediateRepresentation = await (0, project_parsing_lib_1.translate)({
+                    projectSourceDir: path_1.default.join(projectDir, projectConfig.srcDir),
+                    platformVersion: projectConfig.platformVersion,
+                    accountId,
+                });
+                logger_1.logger.debug(node_util_1.default.inspect(intermediateRepresentation, false, null, true));
+            }
+            catch (e) {
+                if ((0, project_parsing_lib_1.isTranslationError)(e)) {
+                    logger_1.logger.error(e.toString());
+                }
+                else {
+                    (0, errorHandlers_1.logError)(e);
+                }
+                return process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            }
+        }
+        const { buildId, error } = await uploadProjectFiles(accountId, projectConfig.name, tempFile.name, uploadMessage, projectConfig.platformVersion, intermediateRepresentation);
         if (error) {
             resolve({ uploadError: error });
         }

package/package.json

@@ -1,14 +1,15 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.0.7-experimental.0",
+    "version": "7.0.8-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.1.3",
+        "@hubspot/local-dev-lib": "0.1.1-experimental.0",
+        "@hubspot/project-parsing-lib": "0.0.3-experimental.0",
         "@hubspot/serverless-dev-runtime": "7.0.1",
         "@hubspot/theme-preview-dev-server": "0.0.10",
-        "@hubspot/ui-extensions-dev-server": "0.8.42",
+        "@hubspot/ui-extensions-dev-server": "0.8.40",
         "archiver": "^7.0.1",
         "chalk": "^4.1.2",
         "chokidar": "^3.0.1",