2 files changed, 13 insertions, 1 deletions
diff --git a/packages/monorepo-scripts/src/prepublish_checks.ts b/packages/monorepo-scripts/src/prepublish_checks.ts
index 5f603ebc7..60cdccf1d 100644
--- a/packages/monorepo-scripts/src/prepublish_checks.ts
+++ b/packages/monorepo-scripts/src/prepublish_checks.ts
@@ -17,6 +17,7 @@ async function prepublishChecksAsync(): Promise<void> {
     await checkChangelogFormatAsync(updatedPublicPackages);
     await checkGitTagsForNextVersionAndDeleteIfExistAsync(updatedPublicPackages);
     await checkPublishRequiredSetupAsync();
+    checkRequiredEnvVariables();
 }
 
 async function checkGitTagsForNextVersionAndDeleteIfExistAsync(updatedPublicPackages: Package[]): Promise<void> {
@@ -183,7 +184,17 @@ async function checkPublishRequiredSetupAsync(): Promise<void> {
     }
 }
 
+const checkRequiredEnvVariables = () => {
+    utils.log('Checking required environment variables...');
+    const requiredEnvVars = ['INSTANT_HEAP_ANALYTICS_ID_PRODUCTION'];
+    requiredEnvVars.forEach(requiredEnvVarName => {
+        if (_.isUndefined(process.env[requiredEnvVarName])) {
+            throw new Error(`Must have ${requiredEnvVarName} set`);
+        }
+    });
+};
+
 prepublishChecksAsync().catch(err => {
-    utils.log(err.message);
+    utils.log(err);
     process.exit(1);
 });
diff --git a/packages/monorepo-scripts/src/utils/utils.ts b/packages/monorepo-scripts/src/utils/utils.ts
index 44ff971e8..95b187cc2 100644
--- a/packages/monorepo-scripts/src/utils/utils.ts
+++ b/packages/monorepo-scripts/src/utils/utils.ts
@@ -91,6 +91,7 @@ export const utils = {
         const changelog = changelogUtils.getChangelogOrCreateIfMissing(packageName, packageLocation);
         if (_.isEmpty(changelog)) {
             nextVersionIfValid = semver.inc(currentVersion, 'patch');
+            return nextVersionIfValid as string;
         }
         const lastEntry = changelog[0];
         if (semver.gt(currentVersion, lastEntry.version)) {