From bbc603ee27d538f718d07784638d03fa4e84bc14 Mon Sep 17 00:00:00 2001 From: Joe Yeager Date: Wed, 30 Apr 2025 14:46:16 -0700 Subject: [PATCH 1/4] build: Downgrade project-parsing-lib to experimental version for app functions --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 93be1a2f6..3d4413cd2 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "repository": "https://github.com/HubSpot/hubspot-cli", "dependencies": { "@hubspot/local-dev-lib": "3.5.4", - "@hubspot/project-parsing-lib": "0.1.7", + "@hubspot/project-parsing-lib": "0.0.15-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", From 8951ccb754e527fad18e41937f96b85ad4dccddb Mon Sep 17 00:00:00 2001 From: Joe Yeager Date: Thu, 8 May 2025 09:30:35 -0700 Subject: [PATCH 2/4] bump dep --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1e43aa1f0..e1f380c35 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "repository": "https://github.com/HubSpot/hubspot-cli", "dependencies": { "@hubspot/local-dev-lib": "3.5.5", - "@hubspot/project-parsing-lib": "0.0.15-experimental.0", + "@hubspot/project-parsing-lib": "0.0.20-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", From 5a8a3236819458abef69beaaebfe60616c7b4479 Mon Sep 17 00:00:00 2001 From: Joe Yeager Date: Thu, 8 May 2025 11:47:05 -0700 Subject: [PATCH 3/4] Filter out the SERVERLESS_PACKAGE functions until they are set as visible false --- lib/projects/buildAndDeploy.ts | 42 ++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/lib/projects/buildAndDeploy.ts b/lib/projects/buildAndDeploy.ts index cb6a332a4..dabb6f2e2 100644 --- a/lib/projects/buildAndDeploy.ts +++ b/lib/projects/buildAndDeploy.ts @@ -39,6 +39,8 @@ import { import { EXIT_CODES } from '../enums/exitCodes'; import { lib } from '../../lang/en'; import { uiLogger } from '../ui/logger'; +import { AppFunctionsPackageKey } from '@hubspot/project-parsing-lib/src/lib/constants'; +import { mapToInternalType } from '@hubspot/project-parsing-lib'; const SPINNER_STATUS = { SPINNING: 'spinning', @@ -169,25 +171,37 @@ function makePollTaskStatusFunc({ const subtasks = getSubtasks(initialTaskStatus); - const tasksById = subtasks.reduce( - (acc: { [key: string]: ProjectSubtask }, subtask) => { + const hiddenComponentBuildIds: string[] = []; + + const tasksById = subtasks + .filter(subtask => { + // TODO: Remove this filtering logic when visible=false for SERVERLESS_PACKAGE + const shouldBeVisible = + getSubtaskType(subtask) !== mapToInternalType(AppFunctionsPackageKey); + if (!shouldBeVisible) { + hiddenComponentBuildIds.push(subtask.id); + } + return shouldBeVisible; + }) + .reduce((acc: { [key: string]: ProjectSubtask }, subtask) => { const { id, visible } = subtask; if (visible) { acc[id] = subtask; } return acc; - }, - {} - ); - - const structuredTasks = Object.keys(taskStructure).map(key => { - return { - ...tasksById[key], - subtasks: taskStructure[key] - .filter(taskId => Boolean(tasksById[taskId])) - .map(taskId => tasksById[taskId]), - }; - }); + }, {}); + + const structuredTasks = Object.keys(taskStructure) + // TODO: Remove this filtering logic when visible=false for SERVERLESS_PACKAGE + .filter(buildId => !hiddenComponentBuildIds.includes(buildId)) + .map(key => { + return { + ...tasksById[key], + subtasks: taskStructure[key] + .filter(taskId => Boolean(tasksById[taskId])) + .map(taskId => tasksById[taskId]), + }; + }); const numComponents = structuredTasks.length; const componentCountText = silenceLogs From 0f9ae36f469c22edf2151e13c3195df02be23e87 Mon Sep 17 00:00:00 2001 From: Joe Yeager Date: Mon, 12 May 2025 09:48:57 -0700 Subject: [PATCH 4/4] chore: bump ppl --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 56ccf5969..fea1495de 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "repository": "https://github.com/HubSpot/hubspot-cli", "dependencies": { "@hubspot/local-dev-lib": "3.5.6", - "@hubspot/project-parsing-lib": "0.0.20-experimental.0", + "@hubspot/project-parsing-lib": "0.1.11", "@hubspot/serverless-dev-runtime": "7.0.2", "@hubspot/theme-preview-dev-server": "0.0.10", "@hubspot/ui-extensions-dev-server": "0.8.52",