@hubspot/cli 5.0.2 → 5.0.3-beta.1

package/commands/accounts/clean.js

@@ -2,7 +2,6 @@ const { logger } = require('@hubspot/cli-lib/logger');
 const {
   accessTokenForPersonalAccessKey,
 } = require('@hubspot/cli-lib/personalAccessKey');
-const { getConfig } = require('@hubspot/cli-lib');
 
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
@@ -18,7 +17,7 @@ const { getAccountName } = require('../../lib/sandboxes');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { getTableContents } = require('@hubspot/cli-lib/lib/table');
 const SpinniesManager = require('../../lib/SpinniesManager');
-const { deleteAccount } = require('@hubspot/cli-lib/lib/config');
+const { getConfig, deleteAccount } = require('@hubspot/local-dev-lib/config');
 const {
   isSpecifiedHubSpotAuthError,
 } = require('../../lib/errorHandlers/apiErrors');

package/commands/accounts/info.js

@@ -1,5 +1,5 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const { getAccountConfig } = require('@hubspot/cli-lib/lib/config');
+const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { getAccessToken } = require('@hubspot/cli-lib/personalAccessKey.js');
 const {
   getAccountId,

package/commands/accounts/list.js

@@ -1,5 +1,5 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const { getConfig, getConfigPath } = require('@hubspot/cli-lib/lib/config');
+const { getConfig, getConfigPath } = require('@hubspot/local-dev-lib/config');
 const {
   getTableContents,
   getTableHeader,

package/commands/accounts/remove.js

@@ -6,7 +6,7 @@ const {
   getConfigDefaultAccount,
   getAccountId: getAccountIdFromConfig,
   updateDefaultAccount,
-} = require('@hubspot/cli-lib/lib/config');
+} = require('@hubspot/local-dev-lib/config');
 
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');

package/commands/accounts/rename.js

@@ -1,5 +1,5 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const { renameAccount } = require('@hubspot/cli-lib/lib/config');
+const { renameAccount } = require('@hubspot/local-dev-lib/config');
 
 const {
   addConfigOptions,

package/commands/auth.js

@@ -1,4 +1,4 @@
-const { loadConfig, checkAndWarnGitInclusion } = require('@hubspot/cli-lib');
+const { checkAndWarnGitInclusion } = require('@hubspot/cli-lib');
 const { logger } = require('@hubspot/cli-lib/logger');
 const {
   OAUTH_AUTH_METHOD,
@@ -15,7 +15,8 @@ const {
   writeConfig,
   getConfig,
   getConfigPath,
-} = require('@hubspot/cli-lib/lib/config');
+  loadConfig,
+} = require('@hubspot/local-dev-lib/config');
 const { commaSeparatedValues } = require('@hubspot/local-dev-lib/text');
 const { promptUser } = require('../lib/prompts/promptUtils');
 const {

package/commands/cms/convertFields.js

@@ -1,6 +1,6 @@
 const path = require('path');
 const fs = require('fs');
-const { createIgnoreFilter } = require('@hubspot/cli-lib/ignoreRules');
+const { createIgnoreFilter } = require('@hubspot/local-dev-lib/ignoreRules');
 const { isAllowedExtension, getCwd } = require('@hubspot/cli-lib/path');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { walk } = require('@hubspot/cli-lib/lib/walk');

package/commands/config/set/allowUsageTracking.js

@@ -1,5 +1,5 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const { updateAllowUsageTracking } = require('@hubspot/cli-lib/lib/config');
+const { updateAllowUsageTracking } = require('@hubspot/local-dev-lib/config');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { promptUser } = require('../../../lib/prompts/promptUtils');
 const { i18n } = require('../../../lib/lang');

package/commands/config/set/defaultMode.js

@@ -1,5 +1,5 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const { updateDefaultMode } = require('@hubspot/cli-lib/lib/config');
+const { updateDefaultMode } = require('@hubspot/local-dev-lib/config');
 const { Mode } = require('@hubspot/cli-lib');
 const { commaSeparatedValues } = require('@hubspot/local-dev-lib/text');
 const { trackCommandUsage } = require('../../../lib/usageTracking');

package/commands/config/set/httpTimeout.js

@@ -1,5 +1,5 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const { updateHttpTimeout } = require('@hubspot/cli-lib/lib/config');
+const { updateHttpTimeout } = require('@hubspot/local-dev-lib/config');
 const { promptUser } = require('../../../lib/prompts/promptUtils');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { i18n } = require('../../../lib/lang');

package/commands/customObject/schema/create.js

@@ -9,7 +9,10 @@ const {
 } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { addTestingOptions, getAccountId } = require('../../../lib/commonOpts');
-const { getEnv, isConfigFlagEnabled } = require('@hubspot/cli-lib/');
+const {
+  getEnv,
+  isConfigFlagEnabled,
+} = require('@hubspot/local-dev-lib/config');
 const { ENVIRONMENTS, ConfigFlags } = require('@hubspot/cli-lib/lib/constants');
 const { createSchema } = require('@hubspot/cli-lib/api/schema');
 const {

package/commands/customObject/schema/fetch.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const { isConfigFlagEnabled } = require('@hubspot/cli-lib');
+const { isConfigFlagEnabled } = require('@hubspot/local-dev-lib/config');
 const { logger } = require('@hubspot/cli-lib/logger');
 const {
   logErrorInstance,

package/commands/customObject/schema/update.js

@@ -10,7 +10,10 @@ const {
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { addTestingOptions, getAccountId } = require('../../../lib/commonOpts');
 const { ENVIRONMENTS, ConfigFlags } = require('@hubspot/cli-lib/lib/constants');
-const { getEnv, isConfigFlagEnabled } = require('@hubspot/cli-lib');
+const {
+  getEnv,
+  isConfigFlagEnabled,
+} = require('@hubspot/local-dev-lib/config');
 const { updateSchema } = require('@hubspot/cli-lib/api/schema');
 const {
   updateSchema: updateSchemaFromHubFile,

package/commands/filemanager/upload.js

@@ -11,7 +11,7 @@ const {
 } = require('../../lib/errorHandlers/apiErrors');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
 const { validateSrcAndDestPaths } = require('@hubspot/cli-lib/modules');
-const { shouldIgnoreFile } = require('@hubspot/cli-lib/ignoreRules');
+const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
 
 const {
   addConfigOptions,

package/commands/init.js

@@ -5,7 +5,7 @@ const {
   createEmptyConfigFile,
   deleteEmptyConfigFile,
   updateDefaultAccount,
-} = require('@hubspot/cli-lib/lib/config');
+} = require('@hubspot/local-dev-lib/config');
 const { addConfigOptions } = require('../lib/commonOpts');
 const { handleExit } = require('../lib/process');
 const { checkAndUpdateGitignore } = require('@hubspot/cli-lib/lib/git');

package/commands/lint.js

@@ -1,4 +1,4 @@
-const { lint } = require('@hubspot/cli-lib/validate');
+const { lint } = require('@hubspot/local-dev-lib/validate');
 const { printHublValidationResult } = require('../lib/hublValidate');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { logErrorInstance } = require('../lib/errorHandlers/standardErrors');

package/commands/project/add.js

@@ -1,5 +1,5 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const { getAccountId } = require('@hubspot/cli-lib/lib/config');
+const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
 const { fetchReleaseData } = require('@hubspot/cli-lib/github');
 

package/commands/project/deploy.js

@@ -18,7 +18,7 @@ const { projectNamePrompt } = require('../../lib/prompts/projectNamePrompt');
 const { buildIdPrompt } = require('../../lib/prompts/buildIdPrompt');
 const { i18n } = require('../../lib/lang');
 const { uiBetaTag } = require('../../lib/ui');
-const { getAccountConfig } = require('@hubspot/cli-lib');
+const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 
 const i18nKey = 'cli.commands.project.subcommands.deploy';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');

package/commands/project/dev.js

@@ -13,7 +13,11 @@ const { loadAndValidateOptions } = require('../../lib/validation');
 const { handleExit } = require('../../lib/process');
 const { i18n } = require('../../lib/lang');
 const { logger } = require('@hubspot/cli-lib/logger');
-const { getConfigAccounts } = require('@hubspot/cli-lib/lib/config');
+const {
+  getConfigAccounts,
+  getAccountConfig,
+  getEnv,
+} = require('@hubspot/local-dev-lib/config');
 const { createProject, fetchProject } = require('@hubspot/cli-lib/api/dfs');
 const {
   getProjectConfig,
@@ -21,6 +25,7 @@ const {
   handleProjectUpload,
   pollProjectBuildAndDeploy,
   showPlatformVersionWarning,
+  validateProjectConfig,
 } = require('../../lib/projects');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const {
@@ -37,14 +42,13 @@ const {
 const SpinniesManager = require('../../lib/SpinniesManager');
 const LocalDevManager = require('../../lib/LocalDevManager');
 const { isSandbox } = require('../../lib/sandboxes');
-const { getAccountConfig, getEnv } = require('@hubspot/cli-lib');
 const { sandboxNamePrompt } = require('../../lib/prompts/sandboxesPrompt');
 const {
   validateSandboxUsageLimits,
   DEVELOPER_SANDBOX,
   getAvailableSyncTypes,
 } = require('../../lib/sandboxes');
-const { getValidEnv } = require('@hubspot/cli-lib/lib/environment');
+const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
 const {
   PROJECT_BUILD_TEXT,
   PROJECT_DEPLOY_TEXT,
@@ -84,6 +88,8 @@ exports.handler = async options => {
     process.exit(EXIT_CODES.ERROR);
   }
 
+  validateProjectConfig(projectConfig, projectDir);
+
   const accounts = getConfigAccounts();
   let targetAccountId = options.account ? accountId : null;
   let createNewSandbox = false;
@@ -335,7 +341,7 @@ exports.handler = async options => {
 
   await LocalDev.start();
 
-  handleExit(LocalDev.stop);
+  handleExit(({ isSIGHUP }) => LocalDev.stop(!isSIGHUP));
 };
 
 exports.builder = yargs => {

package/commands/project/logs.js

@@ -1,4 +1,4 @@
-const { getEnv } = require('@hubspot/cli-lib/lib/config');
+const { getEnv } = require('@hubspot/local-dev-lib/config');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const { ENVIRONMENTS } = require('@hubspot/cli-lib/lib/constants');
 const {

package/commands/project/upload.js

@@ -19,7 +19,7 @@ const {
   showPlatformVersionWarning,
 } = require('../../lib/projects');
 const { i18n } = require('../../lib/lang');
-const { getAccountConfig } = require('@hubspot/cli-lib');
+const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { ERROR_TYPES } = require('@hubspot/cli-lib/lib/constants');
 const {
   logApiErrorInstance,

package/commands/sandbox/create.js

@@ -8,7 +8,7 @@ const {
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const { getAccountConfig, getEnv } = require('@hubspot/cli-lib');
+const { getAccountConfig, getEnv } = require('@hubspot/local-dev-lib/config');
 const { buildSandbox } = require('../../lib/sandbox-create');
 const { uiFeatureHighlight } = require('../../lib/ui');
 const {
@@ -20,7 +20,7 @@ const {
   syncTypes,
   validateSandboxUsageLimits,
 } = require('../../lib/sandboxes');
-const { getValidEnv } = require('@hubspot/cli-lib/lib/environment');
+const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
 const { logger } = require('@hubspot/cli-lib/logger');
 const {
   trackCommandUsage,

package/commands/sandbox/delete.js

@@ -18,12 +18,14 @@ const {
 } = require('../../lib/errorHandlers/apiErrors');
 const { deleteSandbox } = require('@hubspot/cli-lib/sandboxes');
 const { i18n } = require('../../lib/lang');
-const { getConfig, getEnv, getAccountConfig } = require('@hubspot/cli-lib');
 const { deleteSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt');
 const {
+  getConfig,
+  getEnv,
+  getAccountConfig,
   removeSandboxAccountFromConfig,
   updateDefaultAccount,
-} = require('@hubspot/cli-lib/lib/config');
+} = require('@hubspot/local-dev-lib/config');
 const {
   selectAndSetAsDefaultAccountPrompt,
 } = require('../../lib/prompts/accountsPrompt');
@@ -32,7 +34,7 @@ const { promptUser } = require('../../lib/prompts/promptUtils');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 
 const { getAccountName } = require('../../lib/sandboxes');
-const { getValidEnv } = require('@hubspot/cli-lib/lib/environment');
+const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
 
 const i18nKey = 'cli.commands.sandbox.subcommands.delete';
 

package/commands/sandbox/sync.js

@@ -10,7 +10,7 @@ const { logger } = require('@hubspot/cli-lib/logger');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const { getAccountConfig, getEnv } = require('@hubspot/cli-lib');
+const { getAccountConfig, getEnv } = require('@hubspot/local-dev-lib/config');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { uiLine } = require('../../lib/ui');
@@ -23,7 +23,7 @@ const {
   getSyncTypesWithContactRecordsPrompt,
 } = require('../../lib/sandboxes');
 const { syncSandbox } = require('../../lib/sandbox-sync');
-const { getValidEnv } = require('@hubspot/cli-lib/lib/environment');
+const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
 const { isSpecifiedError } = require('../../lib/errorHandlers/apiErrors');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
 

package/commands/upload.js

@@ -15,7 +15,7 @@ const {
 } = require('../lib/errorHandlers/apiErrors');
 const { logErrorInstance } = require('../lib/errorHandlers/standardErrors');
 const { validateSrcAndDestPaths } = require('@hubspot/cli-lib/modules');
-const { shouldIgnoreFile } = require('@hubspot/cli-lib/ignoreRules');
+const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
 
 const {
   addConfigOptions,

package/lang/en.lyaml

@@ -885,6 +885,8 @@ en:
           options:
             describe: "Options to pass to javascript fields files"
     lib:
+      process:
+        exitDebug: "Attempting to gracefully exit. Triggered by {{ signal }}"
       DevServerManager:
         portConflict: "The port {{ port }} is already in use."
         notInitialized: "The Dev Server Manager must be initialized before it is started."
@@ -917,6 +919,8 @@ en:
           startError: "Failed to start local dev server: {{ message }}"
           fileChangeError: "Failed to notify local dev server of file change: {{ message }}"
       projects:
+        config:
+          srcOutsideProjectDir: "Invalid value for 'srcDir' in {{ projectConfig }}: {{#bold}}srcDir: \"{{ srcDir }}\"{{/bold}}\n\t'srcDir' must be a relative path to a folder under the project root, such as \".\" or \"./src\""
         uploadProjectFiles:
           add: "Uploading {{#bold}}{{ projectName }}{{/bold}} project files to {{ accountIdentifier }}"
           fail: "Failed to upload {{#bold}}{{ projectName }}{{/bold}} project files to {{ accountIdentifier }}"

package/lib/DevServerManager.js

@@ -4,6 +4,12 @@ const { COMPONENT_TYPES } = require('./projectStructure');
 const { i18n } = require('./lang');
 const { promptUser } = require('./prompts/promptUtils');
 const { DevModeInterface } = require('@hubspot/ui-extensions-dev-server');
+const {
+  startPortManagerServer,
+  portManagerHasActiveServers,
+  stopPortManagerServer,
+  requestPorts,
+} = require('@hubspot/local-dev-lib/portManager');
 
 const i18nKey = 'cli.lib.DevServerManager';
 
@@ -61,6 +67,7 @@ class DevServerManager {
     this.debug = debug;
     this.componentsByType = this.arrangeComponentsByType(components);
 
+    await startPortManagerServer();
     await this.iterateDevServers(
       async (serverInterface, compatibleComponents) => {
         if (serverInterface.setup) {
@@ -86,6 +93,7 @@ class DevServerManager {
             debug: this.debug,
             httpClient,
             projectConfig,
+            requestPorts,
           });
         }
       });
@@ -113,6 +121,12 @@ class DevServerManager {
           await serverInterface.cleanup();
         }
       });
+
+      const hasActiveServers = await portManagerHasActiveServers();
+
+      if (!hasActiveServers) {
+        await stopPortManagerServer();
+      }
     }
   }
 }

package/lib/LocalDevManager.js

@@ -7,7 +7,7 @@ const { logger } = require('@hubspot/cli-lib/logger');
 const {
   getAccountId,
   getConfigDefaultAccount,
-} = require('@hubspot/cli-lib/lib/config');
+} = require('@hubspot/local-dev-lib/config');
 const { PROJECT_CONFIG_FILE } = require('@hubspot/cli-lib/lib/constants');
 const SpinniesManager = require('./SpinniesManager');
 const DevServerManager = require('./DevServerManager');
@@ -141,25 +141,30 @@ class LocalDevManager {
     this.compareLocalProjectToDeployed(runnableComponents);
   }
 
-  async stop() {
-    SpinniesManager.add('cleanupMessage', {
-      text: i18n(`${i18nKey}.exitingStart`),
-    });
-
+  async stop(showProgress = true) {
+    if (showProgress) {
+      SpinniesManager.add('cleanupMessage', {
+        text: i18n(`${i18nKey}.exitingStart`),
+      });
+    }
     await this.stopWatching();
 
     const cleanupSucceeded = await this.devServerCleanup();
 
     if (!cleanupSucceeded) {
-      SpinniesManager.fail('cleanupMessage', {
-        text: i18n(`${i18nKey}.exitingFail`),
-      });
+      if (showProgress) {
+        SpinniesManager.fail('cleanupMessage', {
+          text: i18n(`${i18nKey}.exitingFail`),
+        });
+      }
       process.exit(EXIT_CODES.ERROR);
     }
 
-    SpinniesManager.succeed('cleanupMessage', {
-      text: i18n(`${i18nKey}.exitingSucceed`),
-    });
+    if (showProgress) {
+      SpinniesManager.succeed('cleanupMessage', {
+        text: i18n(`${i18nKey}.exitingSucceed`),
+      });
+    }
     process.exit(EXIT_CODES.SUCCESS);
   }
 

package/lib/__tests__/commonOpts.js

@@ -1,14 +1,14 @@
+const { Mode, DEFAULT_MODE } = require('@hubspot/cli-lib');
 const {
-  Mode,
-  DEFAULT_MODE,
   getAndLoadConfigIfNeeded,
   getAccountId,
   getAccountConfig,
   loadConfigFromEnvironment,
-} = require('@hubspot/cli-lib');
+} = require('@hubspot/local-dev-lib/config');
 const { getMode } = require('../commonOpts');
 
 jest.mock('@hubspot/cli-lib');
+jest.mock('@hubspot/local-dev-lib/config');
 
 describe('@hubspot/cli/lib/commonOpts', () => {
   describe('getMode()', () => {

package/lib/__tests__/projects.test.js

@@ -0,0 +1,144 @@
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+const { EXIT_CODES } = require('../enums/exitCodes');
+const projects = require('../projects');
+
+describe('@hubspot/cli/lib/projects', () => {
+  describe('validateProjectConfig()', () => {
+    let realProcess;
+    let projectDir;
+    let exitMock;
+    let errorSpy;
+
+    beforeAll(() => {
+      projectDir = fs.mkdtempSync(path.join(os.tmpdir(), 'projects-'));
+      fs.mkdirSync(path.join(projectDir, 'src'));
+
+      realProcess = process;
+      errorSpy = jest.spyOn(console, 'error');
+    });
+
+    beforeEach(() => {
+      exitMock = jest.fn();
+      global.process = { ...realProcess, exit: exitMock };
+    });
+
+    afterEach(() => {
+      errorSpy.mockClear();
+    });
+
+    afterAll(() => {
+      global.process = realProcess;
+      errorSpy.mockRestore();
+    });
+
+    it('rejects undefined configuration', () => {
+      projects.validateProjectConfig(null, projectDir);
+
+      expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
+      expect(errorSpy).toHaveBeenCalledWith(
+        expect.stringMatching(/.*config not found.*/)
+      );
+    });
+
+    it('rejects configuration with missing name', () => {
+      projects.validateProjectConfig({ srcDir: '.' }, projectDir);
+
+      expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
+      expect(errorSpy).toHaveBeenCalledWith(
+        expect.stringMatching(/.*missing required fields*/)
+      );
+    });
+
+    it('rejects configuration with missing srcDir', () => {
+      projects.validateProjectConfig({ name: 'hello' }, projectDir);
+
+      expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
+      expect(errorSpy).toHaveBeenCalledWith(
+        expect.stringMatching(/.*missing required fields.*/)
+      );
+    });
+
+    describe('rejects configuration with srcDir outside project directory', () => {
+      it('for parent directory', () => {
+        projects.validateProjectConfig(
+          { name: 'hello', srcDir: '..' },
+          projectDir
+        );
+
+        expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
+        expect(errorSpy).toHaveBeenCalledWith(
+          expect.stringContaining('srcDir: ".."')
+        );
+      });
+
+      it('for root directory', () => {
+        projects.validateProjectConfig(
+          { name: 'hello', srcDir: '/' },
+          projectDir
+        );
+
+        expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
+        expect(errorSpy).toHaveBeenCalledWith(
+          expect.stringContaining('srcDir: "/"')
+        );
+      });
+
+      it('for complicated directory', () => {
+        const srcDir = './src/././../src/../../src';
+
+        projects.validateProjectConfig({ name: 'hello', srcDir }, projectDir);
+
+        expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
+        expect(errorSpy).toHaveBeenCalledWith(
+          expect.stringContaining(`srcDir: "${srcDir}"`)
+        );
+      });
+    });
+
+    it('rejects configuration with srcDir that does not exist', () => {
+      projects.validateProjectConfig(
+        { name: 'hello', srcDir: 'foo' },
+        projectDir
+      );
+
+      expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
+      expect(errorSpy).toHaveBeenCalledWith(
+        expect.stringMatching(/.*could not be found in.*/)
+      );
+    });
+
+    describe('accepts configuration with valid srcDir', () => {
+      it('for current directory', () => {
+        projects.validateProjectConfig(
+          { name: 'hello', srcDir: '.' },
+          projectDir
+        );
+
+        expect(exitMock).not.toHaveBeenCalled();
+        expect(errorSpy).not.toHaveBeenCalled();
+      });
+
+      it('for relative directory', () => {
+        projects.validateProjectConfig(
+          { name: 'hello', srcDir: './src' },
+          projectDir
+        );
+
+        expect(exitMock).not.toHaveBeenCalled();
+        expect(errorSpy).not.toHaveBeenCalled();
+      });
+
+      it('for implied relative directory', () => {
+        projects.validateProjectConfig(
+          { name: 'hello', srcDir: 'src' },
+          projectDir
+        );
+
+        expect(exitMock).not.toHaveBeenCalled();
+        expect(errorSpy).not.toHaveBeenCalled();
+      });
+    });
+  });
+});

package/lib/__tests__/validation.js

@@ -1,4 +1,4 @@
-const { getAccountConfig } = require('@hubspot/cli-lib');
+const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { getOauthManager } = require('@hubspot/cli-lib/oauth');
 const {
   accessTokenForPersonalAccessKey,
@@ -8,6 +8,7 @@ const { getAccountId } = require('../commonOpts');
 const { validateAccount } = require('../validation');
 
 jest.mock('@hubspot/cli-lib');
+jest.mock('@hubspot/local-dev-lib/config');
 jest.mock('@hubspot/cli-lib/logger');
 jest.mock('@hubspot/cli-lib/oauth');
 jest.mock('@hubspot/cli-lib/personalAccessKey');

package/lib/commonOpts.js

@@ -1,11 +1,10 @@
 const Logger = require('@hubspot/cli-lib/logger');
+const { DEFAULT_MODE, Mode } = require('@hubspot/cli-lib');
 const {
   getAccountId: getAccountIdFromConfig,
   getAccountConfig,
   getAndLoadConfigIfNeeded,
-  DEFAULT_MODE,
-  Mode,
-} = require('@hubspot/cli-lib');
+} = require('@hubspot/local-dev-lib/config');
 const { i18n } = require('./lang');
 
 const i18nKey = 'cli.lib.commonOpts';

package/lib/errorHandlers/apiErrors.js

@@ -1,5 +1,5 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const { getAccountConfig } = require('@hubspot/cli-lib/lib/config');
+const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const {
   SCOPE_GROUPS,
   PERSONAL_ACCESS_KEY_AUTH_METHOD,

package/lib/links.js

@@ -1,4 +1,4 @@
-const { getEnv } = require('@hubspot/cli-lib/lib/config');
+const { getEnv } = require('@hubspot/local-dev-lib/config');
 const { ENVIRONMENTS } = require('@hubspot/cli-lib/lib/constants');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const { logger } = require('@hubspot/cli-lib/logger');

package/lib/oauth.js

@@ -1,7 +1,7 @@
 const express = require('express');
 const open = require('open');
 const OAuth2Manager = require('@hubspot/cli-lib/lib/models/OAuth2Manager');
-const { getAccountConfig } = require('@hubspot/cli-lib/lib/config');
+const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { addOauthToAccountConfig } = require('@hubspot/cli-lib/oauth');
 const { handleExit } = require('./process');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');

package/lib/process.js

@@ -1,20 +1,38 @@
 const readline = require('readline');
+const { logger, setLogLevel, LOG_LEVEL } = require('@hubspot/cli-lib/logger');
+const { i18n } = require('./lang');
+
+const i18nKey = 'cli.lib.process';
 
 const handleExit = callback => {
   const terminationSignals = [
     'beforeExit',
-    'SIGINT',
-    'SIGUSR1',
-    'SIGUSR2',
+    'SIGINT', // Terminal trying to interrupt (Ctrl + C)
+    'SIGUSR1', // Start Debugger User-defined signal 1
+    'SIGUSR2', // User-defined signal 2
     'uncaughtException',
-    'SIGTERM',
-    'SIGHUP',
+    'SIGTERM', // Represents a graceful termination
+    'SIGHUP', // Parent terminal has been closed
   ];
+  let exitInProgress = false;
+
   terminationSignals.forEach(signal => {
     process.removeAllListeners(signal);
 
     process.on(signal, async () => {
-      await callback();
+      // Prevent duplicate exit handling
+      if (!exitInProgress) {
+        exitInProgress = true;
+        const isSIGHUP = signal === 'SIGHUP';
+
+        // Prevent logs when terminal closes
+        if (isSIGHUP) {
+          setLogLevel(LOG_LEVEL.NONE);
+        }
+
+        logger.debug(i18n(`${i18nKey}.exitDebug`, { signal }));
+        await callback({ isSIGHUP });
+      }
     });
   });
 };

package/lib/projects.js

@@ -5,7 +5,7 @@ const tmp = require('tmp');
 const chalk = require('chalk');
 const findup = require('findup-sync');
 const { logger } = require('@hubspot/cli-lib/logger');
-const { getEnv } = require('@hubspot/cli-lib/lib/config');
+const { getEnv } = require('@hubspot/local-dev-lib/config');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const {
   ENVIRONMENTS,
@@ -29,7 +29,7 @@ const {
   fetchProject,
   uploadProject,
 } = require('@hubspot/cli-lib/api/dfs');
-const { shouldIgnoreFile } = require('@hubspot/cli-lib/ignoreRules');
+const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
 const { getCwd, getAbsoluteFilePath } = require('@hubspot/cli-lib/path');
 const { downloadGitHubRepoContents } = require('@hubspot/cli-lib/github');
 const { promptUser } = require('./prompts/promptUtils');
@@ -159,21 +159,36 @@ const validateProjectConfig = (projectConfig, projectDir) => {
     logger.error(
       `Project config not found. Try running 'hs project create' first.`
     );
-    process.exit(EXIT_CODES.ERROR);
+    return process.exit(EXIT_CODES.ERROR);
   }
 
   if (!projectConfig.name || !projectConfig.srcDir) {
     logger.error(
       'Project config is missing required fields. Try running `hs project create`.'
     );
-    process.exit(EXIT_CODES.ERROR);
+    return process.exit(EXIT_CODES.ERROR);
+  }
+
+  const resolvedPath = path.resolve(projectDir, projectConfig.srcDir);
+  if (!resolvedPath.startsWith(projectDir)) {
+    const projectConfigFile = path.relative(
+      '.',
+      path.join(projectDir, PROJECT_CONFIG_FILE)
+    );
+    logger.error(
+      i18n(`${i18nKey}.config.srcOutsideProjectDir`, {
+        srcDir: projectConfig.srcDir,
+        projectConfig: projectConfigFile,
+      })
+    );
+    return process.exit(EXIT_CODES.ERROR);
   }
 
-  if (!fs.existsSync(path.resolve(projectDir, projectConfig.srcDir))) {
+  if (!fs.existsSync(resolvedPath)) {
     logger.error(
       `Project source directory '${projectConfig.srcDir}' could not be found in ${projectDir}.`
     );
-    process.exit(EXIT_CODES.ERROR);
+    return process.exit(EXIT_CODES.ERROR);
   }
 };
 

package/lib/projectsWatch.js

@@ -9,7 +9,7 @@ const {
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { isAllowedExtension } = require('@hubspot/cli-lib/path');
-const { shouldIgnoreFile } = require('@hubspot/cli-lib/ignoreRules');
+const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
 const {
   cancelStagedBuild,
   provisionBuild,

package/lib/prompts/accountsPrompt.js

@@ -1,4 +1,4 @@
-const { updateDefaultAccount } = require('@hubspot/cli-lib/lib/config');
+const { updateDefaultAccount } = require('@hubspot/local-dev-lib/config');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 const { getAccountName } = require('../sandboxes');

package/lib/prompts/downloadProjectPrompt.js

@@ -1,5 +1,5 @@
 const { promptUser } = require('./promptUtils');
-const { getAccountId } = require('@hubspot/cli-lib/lib/config');
+const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { fetchProjects } = require('@hubspot/cli-lib/api/dfs');
 const {
   logApiErrorInstance,

package/lib/prompts/enterAccountNamePrompt.js

@@ -1,4 +1,4 @@
-const { accountNameExistsInConfig } = require('@hubspot/cli-lib/lib/config');
+const { accountNameExistsInConfig } = require('@hubspot/local-dev-lib/config');
 const { STRING_WITH_NO_SPACES_REGEX } = require('../regex');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');

package/lib/prompts/personalAccessKeyPrompt.js

@@ -3,7 +3,7 @@ const {
   OAUTH_SCOPES,
   DEFAULT_OAUTH_SCOPES,
 } = require('@hubspot/cli-lib/lib/constants');
-const { deleteEmptyConfigFile } = require('@hubspot/cli-lib/lib/config');
+const { deleteEmptyConfigFile } = require('@hubspot/local-dev-lib/config');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { promptUser } = require('./promptUtils');

package/lib/prompts/projectDevTargetAccountPrompt.js

@@ -2,7 +2,7 @@ const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 const { uiAccountDescription, uiCommandReference } = require('../ui');
 const { isSandbox, getAccountName } = require('../sandboxes');
-const { getAccountId } = require('@hubspot/cli-lib');
+const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { getSandboxUsageLimits } = require('@hubspot/cli-lib/sandboxes');
 const { logger } = require('@hubspot/cli-lib/logger');
 

package/lib/prompts/sandboxesPrompt.js

@@ -5,7 +5,7 @@ const {
   STANDARD_SANDBOX,
   DEVELOPER_SANDBOX,
 } = require('../sandboxes');
-const { accountNameExistsInConfig } = require('@hubspot/cli-lib/lib/config');
+const { accountNameExistsInConfig } = require('@hubspot/local-dev-lib/config');
 
 const i18nKey = 'cli.lib.prompts.sandboxesPrompt';
 

package/lib/prompts/setAsDefaultAccountPrompt.js

@@ -1,7 +1,7 @@
 const {
   getConfig,
   updateDefaultAccount,
-} = require('@hubspot/cli-lib/lib/config');
+} = require('@hubspot/local-dev-lib/config');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 

package/lib/sandbox-create.js

@@ -18,9 +18,9 @@ const {
   isSpecifiedError,
 } = require('./errorHandlers/apiErrors');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
-const { getEnv, getAccountId } = require('@hubspot/cli-lib');
+const { getEnv, getAccountId } = require('@hubspot/local-dev-lib/config');
 const { createSandbox } = require('@hubspot/cli-lib/sandboxes');
-const { getValidEnv } = require('@hubspot/cli-lib/lib/environment');
+const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
 
 const i18nKey = 'cli.lib.sandbox.create';
 

package/lib/sandbox-sync.js

@@ -20,7 +20,7 @@ const {
   isMissingScopeError,
 } = require('./errorHandlers/apiErrors');
 const { getSandboxTypeAsString } = require('./sandboxes');
-const { getAccountId } = require('@hubspot/cli-lib');
+const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { uiAccountDescription } = require('./ui');
 
 const i18nKey = 'cli.lib.sandbox.sync';

package/lib/sandboxes.js

@@ -1,9 +1,3 @@
-const {
-  getConfig,
-  writeConfig,
-  updateAccountConfig,
-  getAccountId,
-} = require('@hubspot/cli-lib');
 const chalk = require('chalk');
 const { i18n } = require('./lang');
 const { handleExit, handleKeypress } = require('./process');
@@ -18,7 +12,13 @@ const {
   fetchTypes,
   getSandboxUsageLimits,
 } = require('@hubspot/cli-lib/sandboxes');
-const { accountNameExistsInConfig } = require('@hubspot/cli-lib/lib/config');
+const {
+  accountNameExistsInConfig,
+  getConfig,
+  writeConfig,
+  updateAccountConfig,
+  getAccountId,
+} = require('@hubspot/local-dev-lib/config');
 const CliProgressMultibarManager = require('./CliProgressMultibarManager');
 const { promptUser } = require('./prompts/promptUtils');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');

package/lib/ui.js

@@ -1,7 +1,7 @@
 const chalk = require('chalk');
 const supportsHyperlinks = require('../lib/supportHyperlinks');
 const supportsColor = require('../lib/supportsColor');
-const { getAccountConfig } = require('@hubspot/cli-lib/lib/config');
+const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { i18n } = require('./lang');
 const { logger } = require('@hubspot/cli-lib/logger');
 

package/lib/upload.js

@@ -1,6 +1,6 @@
 const path = require('path');
 const { walk } = require('@hubspot/cli-lib/lib/walk');
-const { createIgnoreFilter } = require('@hubspot/cli-lib/ignoreRules');
+const { createIgnoreFilter } = require('@hubspot/local-dev-lib/ignoreRules');
 const { fieldsJsPrompt } = require('../lib/prompts/cmsFieldPrompt');
 const { isAllowedExtension } = require('@hubspot/cli-lib/path');
 const { isConvertableFieldJs } = require('@hubspot/cli-lib/lib/handleFieldsJs');

package/lib/usageTracking.js

@@ -1,6 +1,8 @@
 const { trackUsage } = require('@hubspot/cli-lib/api/fileMapper');
-const { getAccountConfig } = require('@hubspot/cli-lib');
-const { isTrackingAllowed } = require('@hubspot/cli-lib/lib/config');
+const {
+  isTrackingAllowed,
+  getAccountConfig,
+} = require('@hubspot/local-dev-lib/config');
 const { API_KEY_AUTH_METHOD } = require('@hubspot/cli-lib/lib/constants');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { version } = require('../package.json');

package/lib/validation.js

@@ -1,19 +1,18 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const {
-  getAccountConfig,
-  loadConfigFromEnvironment,
-  Mode,
-  loadConfig,
-  getConfigPath,
-  validateConfig,
-  checkAndWarnGitInclusion,
-} = require('@hubspot/cli-lib');
+const { Mode, checkAndWarnGitInclusion } = require('@hubspot/cli-lib');
 const {
   API_KEY_AUTH_METHOD,
   OAUTH_AUTH_METHOD,
   PERSONAL_ACCESS_KEY_AUTH_METHOD,
 } = require('@hubspot/cli-lib/lib/constants');
 const { commaSeparatedValues } = require('@hubspot/local-dev-lib/text');
+const {
+  loadConfig,
+  getConfigPath,
+  validateConfig,
+  getAccountConfig,
+  loadConfigFromEnvironment,
+} = require('@hubspot/local-dev-lib/config');
 const { getAbsoluteFilePath } = require('@hubspot/cli-lib/path');
 const { getOauthManager } = require('@hubspot/cli-lib/oauth');
 const {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "5.0.2",
+  "version": "5.0.3-beta.1",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,9 +8,9 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "^5.0.1",
-    "@hubspot/local-dev-lib": "^0.0.7",
-    "@hubspot/serverless-dev-runtime": "5.0.2",
+    "@hubspot/cli-lib": "^7.0.0",
+    "@hubspot/local-dev-lib": "^0.0.9",
+    "@hubspot/serverless-dev-runtime": "5.0.3-beta.1",
     "@hubspot/ui-extensions-dev-server": "^0.8.0",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "44cbdf6dae130e268015d3e9afb612729b539915"
+  "gitHead": "2e093e81e1889cfc7274de18d2e3c79987d62bfc"
 }