@hubspot/cli 7.10.0 → 7.11.0-beta.0

package/lib/projects/__tests__/components.test.js

@@ -13,20 +13,6 @@ vi.mock('@hubspot/project-parsing-lib', () => ({
 vi.mock('@hubspot/project-parsing-lib/src/lib/constants.js', () => ({
     AppKey: 'app',
 }));
-vi.mock('../../../lang/en.js', () => ({
-    lib: {
-        projects: {
-            updateHsMetaFilesWithAutoGeneratedFields: {
-                header: 'Updating component metadata files...',
-                applicationLog: (type, uid, name) => `Updated ${type} component with uid: ${uid} and name: ${name}`,
-                componentLog: (type, uid) => `Updated ${type} component with uid: ${uid}`,
-            },
-            generateSafeFilenameDifferentiator: {
-                failedToCheckFiles: 'Failed to check files for filename differentiator. Falling back to timestamp.',
-            },
-        },
-    },
-}));
 const mockedFs = vi.mocked(fs);
 const mockCoerceToValidUid = vi.mocked(coerceToValidUid);
 const mockedFileExists = vi.mocked(fileExists);
@@ -247,7 +233,6 @@ describe('lib/projects/components', () => {
         });
     });
     describe('updateHsMetaFilesWithAutoGeneratedFields()', () => {
-        const mockUiLogger = vi.mocked(uiLogger);
         beforeEach(() => {
             vi.resetAllMocks();
             mockCoerceToValidUid.mockImplementation((input) => input);
@@ -282,6 +267,8 @@ describe('lib/projects/components', () => {
             updateHsMetaFilesWithAutoGeneratedFields(projectName, hsMetaFilePaths);
             expect(mockCoerceToValidUid).toHaveBeenCalledWith('my-project_card');
             expect(mockCoerceToValidUid).toHaveBeenCalledWith('my-project_function');
+            expect(mockCoerceToValidUid).toHaveBeenCalledWith('my-project_card');
+            expect(mockCoerceToValidUid).toHaveBeenCalledWith('my-project_function');
             expect(mockedFs.writeFileSync).toHaveBeenCalledWith('/path/to/component1.meta.json', JSON.stringify({
                 type: 'card',
                 uid: 'card_my_project',
@@ -293,9 +280,6 @@ describe('lib/projects/components', () => {
                 type: 'function',
                 uid: 'function_my_project',
             }, null, 2));
-            expect(mockUiLogger.log).toHaveBeenCalledWith('Updating component metadata files...');
-            expect(mockUiLogger.log).toHaveBeenCalledWith('Updated card component with uid: card_my_project');
-            expect(mockUiLogger.log).toHaveBeenCalledWith('Updated function component with uid: function_my_project');
         });
         it('handles app components by updating both uid and config.name', () => {
             const projectName = 'test-app';
@@ -321,7 +305,6 @@ describe('lib/projects/components', () => {
                     other: 'property',
                 },
             }, null, 2));
-            expect(mockUiLogger.log).toHaveBeenCalledWith('Updated app component with uid: app_test_app and name: test-app-Application');
         });
         it('handles UID collisions by using differentiators', () => {
             const projectName = 'collision-project';
@@ -366,8 +349,6 @@ describe('lib/projects/components', () => {
             updateHsMetaFilesWithAutoGeneratedFields(projectName, hsMetaFilePaths);
             expect(mockedFs.readFileSync).not.toHaveBeenCalled();
             expect(mockedFs.writeFileSync).not.toHaveBeenCalled();
-            expect(mockUiLogger.log).toHaveBeenCalledWith('Updating component metadata files...');
-            expect(mockUiLogger.log).toHaveBeenCalledWith('');
         });
         it('handles components without config property for app type', () => {
             const projectName = 'no-config-project';
@@ -386,7 +367,6 @@ describe('lib/projects/components', () => {
                 type: 'app',
                 uid: 'app_no_config_project',
             }, null, 2));
-            expect(mockUiLogger.log).toHaveBeenCalledWith('Updated app component with uid: app_no_config_project');
         });
         it('replaces hyphens with underscores in coerced UIDs', () => {
             const projectName = 'my-project';

package/lib/projects/__tests__/deploy.test.js

@@ -3,14 +3,16 @@ import { validateBuildIdForDeploy, logDeployErrors, handleProjectDeploy, } from
 import { uiLogger } from '../../ui/logger.js';
 import { commands } from '../../../lang/en.js';
 import { PROJECT_ERROR_TYPES } from '../../constants.js';
-import { deployProject } from '@hubspot/local-dev-lib/api/projects';
+import { deployProjectV1, deployProjectV2, } from '@hubspot/local-dev-lib/api/projects';
 import { pollDeployStatus } from '../pollProjectBuildAndDeploy.js';
 // Mock external dependencies
 vi.mock('../../ui/logger.js');
 vi.mock('@hubspot/local-dev-lib/api/projects');
+vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../pollProjectBuildAndDeploy.js');
 const mockUiLogger = vi.mocked(uiLogger);
-const mockDeployProject = vi.mocked(deployProject);
+const mockDeployProjectV1 = vi.mocked(deployProjectV1);
+const mockDeployProjectV2 = vi.mocked(deployProjectV2);
 const mockPollDeployStatus = vi.mocked(pollDeployStatus);
 describe('lib/projects/deploy', () => {
     beforeEach(() => {
@@ -122,12 +124,12 @@ describe('lib/projects/deploy', () => {
                 source: 'HUBSPOT_USER',
                 subdeployStatuses: [],
             };
-            mockDeployProject.mockResolvedValue({
+            mockDeployProjectV2.mockResolvedValue({
                 data: mockDeployResponseData,
             });
             mockPollDeployStatus.mockResolvedValue(mockDeployResult);
             const deploy = await handleProjectDeploy(targetAccountId, projectName, buildId, useV2Api, force);
-            expect(mockDeployProject).toHaveBeenCalledWith(targetAccountId, projectName, buildId, useV2Api, force);
+            expect(mockDeployProjectV2).toHaveBeenCalledWith(targetAccountId, projectName, buildId, force);
             expect(deploy).toEqual(mockDeployResult);
         });
         it('handles blocked deploy with warnings', async () => {
@@ -147,7 +149,7 @@ describe('lib/projects/deploy', () => {
                     },
                 ],
             };
-            mockDeployProject.mockResolvedValue({
+            mockDeployProjectV2.mockResolvedValue({
                 data: mockBlockedResponse,
             });
             await handleProjectDeploy(targetAccountId, projectName, buildId, useV2Api, force);
@@ -170,7 +172,7 @@ describe('lib/projects/deploy', () => {
                     },
                 ],
             };
-            mockDeployProject.mockResolvedValue({
+            mockDeployProjectV2.mockResolvedValue({
                 data: mockBlockedResponse,
             });
             await handleProjectDeploy(targetAccountId, projectName, buildId, useV2Api, force);
@@ -189,7 +191,7 @@ describe('lib/projects/deploy', () => {
                     },
                 ],
             };
-            mockDeployProject.mockResolvedValue({
+            mockDeployProjectV2.mockResolvedValue({
                 data: mockBlockedResponse,
             });
             await handleProjectDeploy(targetAccountId, projectName, buildId, useV2Api, force);
@@ -197,18 +199,18 @@ describe('lib/projects/deploy', () => {
             expect(mockUiLogger.log).toHaveBeenCalledWith(commands.project.deploy.errors.deployIssueComponentGeneric('component-1', 'module'));
         });
         it('handles general deploy failure', async () => {
-            mockDeployProject.mockResolvedValue({ data: null });
+            mockDeployProjectV2.mockResolvedValue({ data: null });
             const deploy = await handleProjectDeploy(targetAccountId, projectName, buildId, useV2Api, force);
             expect(mockUiLogger.error).toHaveBeenCalledWith(commands.project.deploy.errors.deploy);
             expect(deploy).toBeUndefined();
         });
         it('handles undefined deploy response', async () => {
-            mockDeployProject.mockResolvedValue({ data: undefined });
+            mockDeployProjectV2.mockResolvedValue({ data: undefined });
             const deploy = await handleProjectDeploy(targetAccountId, projectName, buildId, useV2Api, force);
             expect(mockUiLogger.error).toHaveBeenCalledWith(commands.project.deploy.errors.deploy);
             expect(deploy).toBeUndefined();
         });
-        it('passes correct parameters to deployProject', async () => {
+        it('passes correct parameters to deployProjectV1', async () => {
             const mockDeployResponseData = {
                 id: 'deploy-123',
                 buildResultType: 'DEPLOY_QUEUED',
@@ -216,14 +218,15 @@ describe('lib/projects/deploy', () => {
                     status: 'http://status-url',
                 },
             };
-            mockDeployProject.mockResolvedValue({
+            mockDeployProjectV1.mockResolvedValue({
                 data: mockDeployResponseData,
             });
             mockPollDeployStatus.mockResolvedValue({});
-            await handleProjectDeploy(targetAccountId, projectName, buildId, false, true);
-            expect(mockDeployProject).toHaveBeenCalledWith(targetAccountId, projectName, buildId, false, // useV2Api
+            await handleProjectDeploy(targetAccountId, projectName, buildId, false, // isV2Project
             true // force
             );
+            expect(mockDeployProjectV1).toHaveBeenCalledWith(targetAccountId, projectName, buildId, true // force
+            );
         });
     });
 });