@hubspot/cli 7.4.8-experimental.0 → 7.5.0-experimental.0

package/lib/middleware/utils.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isTargetedCommand = isTargetedCommand;
+function isTargetedCommand(commandParts, targetCommandMap) {
+    const currentCommand = commandParts[0];
+    if (!targetCommandMap[currentCommand]) {
+        return false;
+    }
+    if (targetCommandMap[currentCommand].target) {
+        return true;
+    }
+    const subCommands = targetCommandMap[currentCommand].subCommands || {};
+    if (commandParts.length > 1) {
+        return isTargetedCommand(commandParts.slice(1), subCommands);
+    }
+    return false;
+}

package/lib/middleware/yargsChecksMiddleware.d.ts

@@ -0,0 +1,4 @@
+import { Arguments } from 'yargs';
+export declare function performChecks(argv: Arguments<{
+    src?: string;
+}>): boolean;

package/lib/middleware/yargsChecksMiddleware.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.performChecks = performChecks;
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const exitCodes_1 = require("../enums/exitCodes");
+const lang_1 = require("../lang");
+const projects_1 = require("../projects");
+const utils_1 = require("./utils");
+const UPLOAD_AND_WATCH_COMMANDS = {
+    upload: { target: true },
+    watch: { target: true },
+};
+function performChecks(argv) {
+    // Require "project" command when running upload/watch inside of a project
+    if ((0, utils_1.isTargetedCommand)(argv._, UPLOAD_AND_WATCH_COMMANDS) &&
+        (0, projects_1.getIsInProject)(argv.src)) {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.generalErrors.srcIsProject`, {
+            src: argv.src || './',
+            command: argv._.join(' '),
+        }));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    return true;
+}

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, sendIR?: boolean, skipValidation?: boolean): Promise<ProjectUploadResult<T>>;
+export declare function handleProjectUpload<T>(accountId: number, projectConfig: ProjectConfig, projectDir: string, callbackFunc: ProjectUploadCallbackFunction<T>, uploadMessage: string, sendIR?: boolean, skipValidation?: boolean, projectEnv?: string): Promise<ProjectUploadResult<T>>;
 export {};

package/lib/projects/upload.js

@@ -19,7 +19,7 @@ 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, intermediateRepresentation) {
+async function uploadProjectFiles(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation, projectEnv) {
     SpinniesManager_1.default.init({});
     const accountIdentifier = (0, ui_1.uiAccountDescription)(accountId);
     SpinniesManager_1.default.add('upload', {
@@ -58,7 +58,7 @@ async function uploadProjectFiles(accountId, projectName, filePath, uploadMessag
     }
     return { buildId, error };
 }
-async function handleProjectUpload(accountId, projectConfig, projectDir, callbackFunc, uploadMessage, sendIR = false, skipValidation = false) {
+async function handleProjectUpload(accountId, projectConfig, projectDir, callbackFunc, uploadMessage, sendIR = false, skipValidation = false, projectEnv) {
     const srcDir = path_1.default.resolve(projectDir, projectConfig.srcDir);
     const filenames = fs_extra_1.default.readdirSync(srcDir);
     if (!filenames || filenames.length === 0) {
@@ -84,7 +84,7 @@ async function handleProjectUpload(accountId, projectConfig, projectDir, callbac
                     projectSourceDir: path_1.default.join(projectDir, projectConfig.srcDir),
                     platformVersion: projectConfig.platformVersion,
                     accountId,
-                }, { skipValidation });
+                }, { skipValidation, projectEnv });
                 logger_1.logger.debug(node_util_1.default.inspect(intermediateRepresentation, false, null, true));
             }
             catch (e) {

package/lib/ui/SpinniesManager.d.ts

@@ -22,7 +22,7 @@ declare class SpinniesManager {
     succeed(name: string, options?: Partial<SpinnerState>): SpinnerState;
     fail(name: string, options?: Partial<SpinnerState>): SpinnerState;
     remove(name: string): SpinnerState;
-    stopAll(newStatus?: typeof VALID_STATUSES[number]): {
+    stopAll(newStatus?: (typeof VALID_STATUSES)[number]): {
         [key: string]: SpinnerState;
     };
     private hasAnySpinners;

package/lib/ui/spinniesUtils.d.ts

@@ -6,14 +6,14 @@ export type Spinner = {
 };
 export type SpinnerOptions = {
     text?: string;
-    status?: typeof VALID_STATUSES[number];
+    status?: (typeof VALID_STATUSES)[number];
     indent?: number;
     spinner?: Partial<Spinner>;
     disableSpins?: boolean;
-    color?: typeof VALID_COLORS[number];
-    spinnerColor?: typeof VALID_COLORS[number];
-    succeedColor?: typeof VALID_COLORS[number];
-    failColor?: typeof VALID_COLORS[number];
+    color?: (typeof VALID_COLORS)[number];
+    spinnerColor?: (typeof VALID_COLORS)[number];
+    succeedColor?: (typeof VALID_COLORS)[number];
+    failColor?: (typeof VALID_COLORS)[number];
     succeedPrefix?: string;
     failPrefix?: string;
 };

package/package.json

@@ -1,12 +1,12 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.4.8-experimental.0",
+    "version": "7.5.0-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.5.1",
-        "@hubspot/project-parsing-lib": "0.1.5",
+        "@hubspot/project-parsing-lib": "0.0.14-experimental.0",
         "@hubspot/serverless-dev-runtime": "7.0.2",
         "@hubspot/theme-preview-dev-server": "0.0.10",
         "@hubspot/ui-extensions-dev-server": "0.8.52",
@@ -62,9 +62,9 @@
     },
     "scripts": {
         "build": "ts-node ./scripts/build.ts",
-        "lint": "eslint . && prettier --list-different ./**/*.{js,json}",
+        "lint": "eslint . && prettier --list-different './**/*.{ts,js,json}'",
         "list-all-commands": "yarn ts-node ./scripts/get-all-commands.ts",
-        "prettier:write": "prettier --write ./**/*.{ts,js,json}",
+        "prettier:write": "prettier --write './**/*.{ts,js,json}'",
         "test": "yarn node --experimental-vm-modules $(yarn bin jest)",
         "test-cli": "yarn build && yarn --cwd 'acceptance-tests' test-ci",
         "test-cli-debug": "yarn build && yarn --cwd 'acceptance-tests' test-debug",