Merge development

5 files changed, 7 insertions, 22 deletions

diff --git a/packages/monorepo-scripts/src/doc_gen_configs.ts b/packages/monorepo-scripts/src/doc_gen_configs.ts
index 7a14f8664..dfbe98028 100644
--- a/packages/monorepo-scripts/src/doc_gen_configs.ts
+++ b/packages/monorepo-scripts/src/doc_gen_configs.ts
@@ -37,6 +37,7 @@ export const docGenConfigs: DocGenConfigs = {
     // and getting confused. Any class name in this list will not have it's constructor rendered in our docs.
     CLASSES_WITH_HIDDEN_CONSTRUCTORS: [
         'AssetBuyer',
+        'DutchAuctionWrapper',
         'ERC20ProxyWrapper',
         'ERC20TokenWrapper',
         'ERC721ProxyWrapper',
diff --git a/packages/monorepo-scripts/src/prepublish_checks.ts b/packages/monorepo-scripts/src/prepublish_checks.ts
index fc550cf3a..36e61714b 100644
--- a/packages/monorepo-scripts/src/prepublish_checks.ts
+++ b/packages/monorepo-scripts/src/prepublish_checks.ts
@@ -17,7 +17,6 @@ async function prepublishChecksAsync(): Promise<void> {
     await checkChangelogFormatAsync(updatedPublicPackages);
     await checkGitTagsForNextVersionAndDeleteIfExistAsync(updatedPublicPackages);
     await checkPublishRequiredSetupAsync();
-    checkRequiredEnvVariables();
 }
 
 async function checkGitTagsForNextVersionAndDeleteIfExistAsync(updatedPublicPackages: Package[]): Promise<void> {
@@ -184,17 +183,7 @@ 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/test_installation.ts b/packages/monorepo-scripts/src/test_installation.ts
index 96875d0f9..5ae13b198 100644
--- a/packages/monorepo-scripts/src/test_installation.ts
+++ b/packages/monorepo-scripts/src/test_installation.ts
@@ -98,7 +98,7 @@ async function testInstallPackageAsync(
     const lastChangelogVersion = JSON.parse(fs.readFileSync(changelogPath).toString())[0].version;
     const packageName = installablePackage.packageJson.name;
     utils.log(`Testing ${packageName}@${lastChangelogVersion}`);
-    const packageDirName = path.join(...(packageName + '-test').split('/'));
+    const packageDirName = path.join(...`${packageName}-test`.split('/'));
     // NOTE(fabio): The `testDirectory` needs to be somewhere **outside** the monorepo root directory.
     // Otherwise, it will have access to the hoisted `node_modules` directory and the Typescript missing
     // type errors will not be caught.
diff --git a/packages/monorepo-scripts/src/utils/github_release_utils.ts b/packages/monorepo-scripts/src/utils/github_release_utils.ts
index 7434d397e..e63244b46 100644
--- a/packages/monorepo-scripts/src/utils/github_release_utils.ts
+++ b/packages/monorepo-scripts/src/utils/github_release_utils.ts
@@ -41,7 +41,7 @@ export async function publishReleaseNotesAsync(packagesToPublish: Package[], isD
     let assets: string[] = [];
     let aggregateNotes = '';
     _.each(packagesToPublish, pkg => {
-        aggregateNotes += getReleaseNotesForPackage(pkg.packageJson.name);
+        aggregateNotes += getReleaseNotesForPackage(pkg.location, pkg.packageJson.name);
 
         const packageAssets = _.get(pkg.packageJson, 'config.postpublish.assets');
         if (!_.isUndefined(packageAssets)) {
@@ -88,14 +88,8 @@ function adjustAssetPaths(assets: string[]): string[] {
     return finalAssets;
 }
 
-function getReleaseNotesForPackage(packageName: string): string {
-    const packageNameWithoutNamespace = packageName.replace('@0x/', '');
-    const changelogJSONPath = path.join(
-        constants.monorepoRootPath,
-        'packages',
-        packageNameWithoutNamespace,
-        'CHANGELOG.json',
-    );
+function getReleaseNotesForPackage(packageLocation: string, packageName: string): string {
+    const changelogJSONPath = path.join(packageLocation, 'CHANGELOG.json');
     const changelogJSON = readFileSync(changelogJSONPath, 'utf-8');
     const changelogs = JSON.parse(changelogJSON);
     const latestLog = changelogs[0];
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)) {