From 19668b9b48eb08645f500dd8453b8cb2f7abc400 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 18 Jun 2018 16:46:54 +0200
Subject: remove remove_tags script

---
 packages/monorepo-scripts/README.md    | 2 --
 packages/monorepo-scripts/package.json | 2 --
 2 files changed, 4 deletions(-)

diff --git a/packages/monorepo-scripts/README.md b/packages/monorepo-scripts/README.md
index 22b449870..d979e27dc 100644
--- a/packages/monorepo-scripts/README.md
+++ b/packages/monorepo-scripts/README.md
@@ -8,8 +8,6 @@ This repository contains a few helpful scripts for working with this mono repo.
 
 **`yarn find_unused_deps`**: Sometimes we accidentally leave dependencies listed in `package.json` that are no longer being used. This script finds potential dependencies that might no longer be in use. Please verify that it is no longer in use before removing, the `depcheck` package we use under-the-hood doesn't handle some TS quirks perfectly.
 
-**`yarn remove_tags`**: Our publishing script calls `lerna publish` under-the-hood. If this command fails, it might have created new versioned git tags for each package. Removing these manually is tedious, so you can also run this command instead. Before doing so, check to see if `lerna` already created the publish commit. If so, first revert that with `git reset --hard HEAD~1`, then run this command.
-
 **`yarn test:publish`**: Execute a test-run of the publish script. This dry run won't actually publish, nor will it commit/push anything to Github.
 
 ## Usage
diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json
index 5a6d7b25a..9a466ffd0 100644
--- a/packages/monorepo-scripts/package.json
+++ b/packages/monorepo-scripts/package.json
@@ -14,12 +14,10 @@
         "clean": "shx rm -rf lib",
         "test:publish": "run-s build script:publish",
         "find_unused_deps": "run-s build script:find_unused_deps",
-        "remove_tags": "run-s build script:remove_tags",
         "script:deps_versions": "node ./lib/deps_versions.js",
         "script:prepublish_checks": "node ./lib/prepublish_checks.js",
         "script:publish": "IS_DRY_RUN=true node ./lib/publish.js",
         "script:find_unused_deps": "node ./lib/find_unused_dependencies.js",
-        "script:remove_tags": "node ./lib/remove_tags.js"
     },
     "repository": {
         "type": "git",
-- 
cgit 


From 8633fa702436cceeafa52ec39a7fabb5b2650c38 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 18 Jun 2018 16:55:59 +0200
Subject: Add more prepublish checks

---
 packages/monorepo-scripts/package.json             |  1 +
 packages/monorepo-scripts/src/prepublish_checks.ts | 96 ++++++++++++++++++++-
 packages/monorepo-scripts/src/publish.ts           | 24 ++----
 packages/monorepo-scripts/src/types.ts             | 13 +++
 .../monorepo-scripts/src/utils/changelog_utils.ts  | 55 +++++++++++-
 packages/monorepo-scripts/src/utils/npm_utils.ts   | 28 +++++++
 .../monorepo-scripts/src/utils/semver_utils.ts     | 56 +++++++++++++
 packages/monorepo-scripts/src/utils/utils.ts       | 98 +++++++++++++++++-----
 8 files changed, 332 insertions(+), 39 deletions(-)
 create mode 100644 packages/monorepo-scripts/src/utils/npm_utils.ts
 create mode 100644 packages/monorepo-scripts/src/utils/semver_utils.ts

diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json
index 9a466ffd0..fe9194b2f 100644
--- a/packages/monorepo-scripts/package.json
+++ b/packages/monorepo-scripts/package.json
@@ -48,6 +48,7 @@
         "es6-promisify": "^5.0.0",
         "glob": "^7.1.2",
         "lodash": "^4.17.4",
+        "isomorphic-fetch": "2.2.1",
         "moment": "2.21.0",
         "opn": "^5.3.0",
         "promisify-child-process": "^1.0.5",
diff --git a/packages/monorepo-scripts/src/prepublish_checks.ts b/packages/monorepo-scripts/src/prepublish_checks.ts
index 2c096d8f6..64de56ece 100644
--- a/packages/monorepo-scripts/src/prepublish_checks.ts
+++ b/packages/monorepo-scripts/src/prepublish_checks.ts
@@ -1,9 +1,103 @@
+import * as fs from 'fs';
 import * as _ from 'lodash';
+import * as path from 'path';
 import { exec as execAsync } from 'promisify-child-process';
 
 import { constants } from './constants';
+import { Changelog, PackageRegistryJson } from './types';
+import { changelogUtils } from './utils/changelog_utils';
+import { npmUtils } from './utils/npm_utils';
+import { semverUtils } from './utils/semver_utils';
 import { utils } from './utils/utils';
 
+async function prepublishChecksAsync(): Promise<void> {
+    const shouldIncludePrivate = false;
+    const updatedPublicLernaPackages = await utils.getUpdatedLernaPackagesAsync(shouldIncludePrivate);
+
+    await checkCurrentVersionMatchesLatestPublishedNPMPackageAsync(updatedPublicLernaPackages);
+    await checkChangelogFormatAsync(updatedPublicLernaPackages);
+    await checkGitTagsForNextVersionAndDeleteIfExistAsync(updatedPublicLernaPackages);
+    await checkPublishRequiredSetupAsync();
+}
+
+async function checkGitTagsForNextVersionAndDeleteIfExistAsync(
+    updatedPublicLernaPackages: LernaPackage[],
+): Promise<void> {
+    const packageNames = _.map(updatedPublicLernaPackages, lernaPackage => lernaPackage.package.name);
+    const localGitTags = await utils.getLocalGitTagsAsync();
+    const localTagVersionsByPackageName = await utils.getGitTagsByPackageNameAsync(packageNames, localGitTags);
+
+    const remoteGitTags = await utils.getRemoteGitTagsAsync();
+    const remoteTagVersionsByPackageName = await utils.getGitTagsByPackageNameAsync(packageNames, remoteGitTags);
+
+    for (const lernaPackage of updatedPublicLernaPackages) {
+        const currentVersion = lernaPackage.package.version;
+        const packageName = lernaPackage.package.name;
+        const packageLocation = lernaPackage.location;
+        const nextVersion = await utils.getNextPackageVersionAsync(currentVersion, packageName, packageLocation);
+
+        const localTagVersions = localTagVersionsByPackageName[packageName];
+        if (_.includes(localTagVersions, nextVersion)) {
+            const tagName = `${packageName}@${nextVersion}`;
+            await utils.removeLocalTagAsync(tagName);
+        }
+
+        const remoteTagVersions = remoteTagVersionsByPackageName[packageName];
+        if (_.includes(remoteTagVersions, nextVersion)) {
+            const tagName = `:refs/tags/${packageName}@${nextVersion}`;
+            await utils.removeRemoteTagAsync(tagName);
+        }
+    }
+}
+
+async function checkCurrentVersionMatchesLatestPublishedNPMPackageAsync(
+    updatedPublicLernaPackages: LernaPackage[],
+): Promise<void> {
+    for (const lernaPackage of updatedPublicLernaPackages) {
+        const packageName = lernaPackage.package.name;
+        const packageVersion = lernaPackage.package.version;
+        const packageRegistryJsonIfExists = await npmUtils.getPackageRegistryJsonIfExistsAsync(packageName);
+        if (_.isUndefined(packageRegistryJsonIfExists)) {
+            continue; // noop for packages not yet published to NPM
+        }
+        const allVersionsIncludingUnpublished = npmUtils.getPreviouslyPublishedVersions(packageRegistryJsonIfExists);
+        const latestNPMVersion = semverUtils.getLatestVersion(allVersionsIncludingUnpublished);
+        if (packageVersion !== latestNPMVersion) {
+            throw new Error(
+                `Found verson ${packageVersion} in package.json but version ${latestNPMVersion}
+                on NPM (could be unpublished version) for ${packageName}. These versions must match. If you update
+                the package.json version, make sure to also update the internal dependency versions too.`,
+            );
+        }
+    }
+}
+
+async function checkChangelogFormatAsync(updatedPublicLernaPackages: LernaPackage[]): Promise<void> {
+    for (const lernaPackage of updatedPublicLernaPackages) {
+        const packageName = lernaPackage.package.name;
+        const changelog = changelogUtils.getChangelogOrCreateIfMissing(packageName, lernaPackage.location);
+
+        const currentVersion = lernaPackage.package.version;
+        if (!_.isEmpty(changelog)) {
+            const lastEntry = changelog[0];
+            const doesLastEntryHaveTimestamp = !_.isUndefined(lastEntry.timestamp);
+            if (semverUtils.lessThan(lastEntry.version, currentVersion)) {
+                throw new Error(
+                    `CHANGELOG version cannot be below current package version.
+                     Update ${packageName}'s CHANGELOG. It's current version is ${currentVersion}
+                     but the latest CHANGELOG entry is: ${lastEntry.version}`,
+                );
+            } else if (semverUtils.greaterThan(lastEntry.version, currentVersion) && doesLastEntryHaveTimestamp) {
+                // Remove incorrectly added timestamp
+                delete changelog[0].timestamp;
+                // Save updated CHANGELOG.json
+                await changelogUtils.writeChangelogJsonFileAsync(lernaPackage.location, changelog);
+                utils.log(`${packageName}: Removed timestamp from latest CHANGELOG.json entry.`);
+            }
+        }
+    }
+}
+
 async function checkPublishRequiredSetupAsync(): Promise<void> {
     // check to see if logged into npm before publishing
     try {
@@ -65,7 +159,7 @@ async function checkPublishRequiredSetupAsync(): Promise<void> {
     }
 }
 
-checkPublishRequiredSetupAsync().catch(err => {
+prepublishChecksAsync().catch(err => {
     utils.log(err.message);
     process.exit(1);
 });
diff --git a/packages/monorepo-scripts/src/publish.ts b/packages/monorepo-scripts/src/publish.ts
index 2efbc8bf2..637512a5a 100644
--- a/packages/monorepo-scripts/src/publish.ts
+++ b/packages/monorepo-scripts/src/publish.ts
@@ -119,19 +119,14 @@ async function updateChangeLogsAsync(updatedPublicLernaPackages: LernaPackage[])
     const packageToVersionChange: PackageToVersionChange = {};
     for (const lernaPackage of updatedPublicLernaPackages) {
         const packageName = lernaPackage.package.name;
-        const changelogJSONPath = path.join(lernaPackage.location, 'CHANGELOG.json');
-        const changelogJSON = utils.getChangelogJSONOrCreateIfMissing(changelogJSONPath);
-        let changelog: Changelog;
-        try {
-            changelog = JSON.parse(changelogJSON);
-        } catch (err) {
-            throw new Error(
-                `${lernaPackage.package.name}'s CHANGELOG.json contains invalid JSON. Please fix and try again.`,
-            );
-        }
+        let changelog = changelogUtils.getChangelogOrCreateIfMissing(packageName, lernaPackage.location);
 
         const currentVersion = lernaPackage.package.version;
-        const shouldAddNewEntry = changelogUtils.shouldAddNewChangelogEntry(currentVersion, changelog);
+        const shouldAddNewEntry = changelogUtils.shouldAddNewChangelogEntry(
+            lernaPackage.package.name,
+            currentVersion,
+            changelog,
+        );
         if (shouldAddNewEntry) {
             // Create a new entry for a patch version with generic changelog entry.
             const nextPatchVersion = utils.getNextPatchVersion(currentVersion);
@@ -160,14 +155,11 @@ async function updateChangeLogsAsync(updatedPublicLernaPackages: LernaPackage[])
         }
 
         // Save updated CHANGELOG.json
-        fs.writeFileSync(changelogJSONPath, JSON.stringify(changelog, null, '\t'));
-        await utils.prettifyAsync(changelogJSONPath, constants.monorepoRootPath);
+        await changelogUtils.writeChangelogJsonFileAsync(lernaPackage.location, changelog);
         utils.log(`${packageName}: Updated CHANGELOG.json`);
         // Generate updated CHANGELOG.md
         const changelogMd = changelogUtils.generateChangelogMd(changelog);
-        const changelogMdPath = path.join(lernaPackage.location, 'CHANGELOG.md');
-        fs.writeFileSync(changelogMdPath, changelogMd);
-        await utils.prettifyAsync(changelogMdPath, constants.monorepoRootPath);
+        await changelogUtils.writeChangelogMdFileAsync(lernaPackage.location, changelog);
         utils.log(`${packageName}: Updated CHANGELOG.md`);
     }
 
diff --git a/packages/monorepo-scripts/src/types.ts b/packages/monorepo-scripts/src/types.ts
index 36fb923b3..61bd75732 100644
--- a/packages/monorepo-scripts/src/types.ts
+++ b/packages/monorepo-scripts/src/types.ts
@@ -27,3 +27,16 @@ export enum SemVerIndex {
 export interface PackageToVersionChange {
     [name: string]: string;
 }
+
+export interface PackageRegistryJson {
+    versions: {
+        [version: string]: any;
+    };
+    time: {
+        [version: string]: string;
+    };
+}
+
+export interface GitTagsByPackageName {
+    [packageName: string]: string[];
+}
diff --git a/packages/monorepo-scripts/src/utils/changelog_utils.ts b/packages/monorepo-scripts/src/utils/changelog_utils.ts
index edfe65a80..4e09fc842 100644
--- a/packages/monorepo-scripts/src/utils/changelog_utils.ts
+++ b/packages/monorepo-scripts/src/utils/changelog_utils.ts
@@ -1,8 +1,15 @@
+import * as fs from 'fs';
 import * as _ from 'lodash';
 import * as moment from 'moment';
+import * as path from 'path';
+import { exec as execAsync } from 'promisify-child-process';
+import semverSort = require('semver-sort');
 
+import { constants } from '../constants';
 import { Change, Changelog, VersionChangelog } from '../types';
 
+import { semverUtils } from './semver_utils';
+
 const CHANGELOG_MD_HEADER = `
 <!--
 This file is auto-generated using the monorepo-scripts package. Don't edit directly.
@@ -44,12 +51,58 @@ export const changelogUtils = {
 
         return changelogMd;
     },
-    shouldAddNewChangelogEntry(currentVersion: string, changelog: Changelog): boolean {
+    shouldAddNewChangelogEntry(packageName: string, currentVersion: string, changelog: Changelog): boolean {
         if (_.isEmpty(changelog)) {
             return true;
         }
         const lastEntry = changelog[0];
+        if (semverUtils.lessThan(lastEntry.version, currentVersion)) {
+            throw new Error(
+                `Found CHANGELOG version lower then current package version. ${packageName} current: ${currentVersion}, Changelog: ${
+                    lastEntry.version
+                }`,
+            );
+        }
         const isLastEntryCurrentVersion = lastEntry.version === currentVersion;
         return isLastEntryCurrentVersion;
     },
+    getChangelogJSONIfExists(changelogPath: string): string | undefined {
+        try {
+            const changelogJSON = fs.readFileSync(changelogPath, 'utf-8');
+            return changelogJSON;
+        } catch (err) {
+            return undefined;
+        }
+    },
+    getChangelogOrCreateIfMissing(packageName: string, packageLocation: string): Changelog {
+        const changelogJSONPath = path.join(packageLocation, 'CHANGELOG.json');
+        let changelogJsonIfExists = this.getChangelogJSONIfExists(changelogJSONPath);
+        if (_.isUndefined(changelogJsonIfExists)) {
+            // If none exists, create new, empty one.
+            changelogJsonIfExists = '[]';
+            fs.writeFileSync(changelogJSONPath, changelogJsonIfExists);
+        }
+        let changelog: Changelog;
+        try {
+            changelog = JSON.parse(changelogJsonIfExists);
+        } catch (err) {
+            throw new Error(`${packageName}'s CHANGELOG.json contains invalid JSON. Please fix and try again.`);
+        }
+        return changelog;
+    },
+    async writeChangelogJsonFileAsync(packageLocation: string, changelog: Changelog): Promise<void> {
+        const changelogJSONPath = path.join(packageLocation, 'CHANGELOG.json');
+        fs.writeFileSync(changelogJSONPath, JSON.stringify(changelog, null, '\t'));
+        await this.prettifyAsync(changelogJSONPath, constants.monorepoRootPath);
+    },
+    async writeChangelogMdFileAsync(packageLocation: string, changelog: Changelog): Promise<void> {
+        const changelogMarkdownPath = path.join(packageLocation, 'CHANGELOG.md');
+        fs.writeFileSync(changelogMarkdownPath, JSON.stringify(changelog, null, '\t'));
+        await this.prettifyAsync(changelogMarkdownPath, constants.monorepoRootPath);
+    },
+    async prettifyAsync(filePath: string, cwd: string): Promise<void> {
+        await execAsync(`prettier --write ${filePath} --config .prettierrc`, {
+            cwd,
+        });
+    },
 };
diff --git a/packages/monorepo-scripts/src/utils/npm_utils.ts b/packages/monorepo-scripts/src/utils/npm_utils.ts
new file mode 100644
index 000000000..cc1e046e7
--- /dev/null
+++ b/packages/monorepo-scripts/src/utils/npm_utils.ts
@@ -0,0 +1,28 @@
+import 'isomorphic-fetch';
+import * as _ from 'lodash';
+
+import { PackageRegistryJson } from '../types';
+
+const NPM_REGISTRY_BASE_URL = 'https://registry.npmjs.org';
+const SUCCESS_STATUS = 200;
+const NOT_FOUND_STATUS = 404;
+
+export const npmUtils = {
+    async getPackageRegistryJsonIfExistsAsync(packageName: string): Promise<PackageRegistryJson | undefined> {
+        const url = `${NPM_REGISTRY_BASE_URL}/${packageName}`;
+        const response = await fetch(url);
+
+        if (response.status === NOT_FOUND_STATUS) {
+            return undefined;
+        } else if (response.status !== SUCCESS_STATUS) {
+            throw new Error(`Request to ${url} failed. Check your internet connection and that npmjs.org is up.`);
+        }
+        const packageRegistryJson = await response.json();
+        return packageRegistryJson;
+    },
+    getPreviouslyPublishedVersions(packageRegistryJson: PackageRegistryJson): string[] {
+        const timeWithOnlyVersions = _.omit(packageRegistryJson.time, ['modified', 'created']);
+        const versions = _.keys(timeWithOnlyVersions);
+        return versions;
+    },
+};
diff --git a/packages/monorepo-scripts/src/utils/semver_utils.ts b/packages/monorepo-scripts/src/utils/semver_utils.ts
new file mode 100644
index 000000000..d5c6b2d17
--- /dev/null
+++ b/packages/monorepo-scripts/src/utils/semver_utils.ts
@@ -0,0 +1,56 @@
+import * as _ from 'lodash';
+import semverSort = require('semver-sort');
+
+// Regex that matches semantic versions only including digits and dots.
+const SEM_VER_REGEX = /^(\d+\.){1}(\d+\.){1}(\d+){1}$/gm;
+
+export const semverUtils = {
+    /**
+     * Checks whether version a is lessThan version b. Supplied versions must be
+     * Semantic Versions containing only numbers and dots (e.g 1.4.0).
+     * @param a version of interest
+     * @param b version to compare a against
+     * @return Whether version a is lessThan version b
+     */
+    lessThan(a: string, b: string): boolean {
+        this.assertValidSemVer('a', a);
+        this.assertValidSemVer('b', b);
+        if (a === b) {
+            return false;
+        }
+        const sortedVersions = semverSort.desc([a, b]);
+        const isALessThanB = sortedVersions[0] === b;
+        return isALessThanB;
+    },
+    /**
+     * Checks whether version a is greaterThan version b. Supplied versions must be
+     * Semantic Versions containing only numbers and dots (e.g 1.4.0).
+     * @param a version of interest
+     * @param b version to compare a against
+     * @return Whether version a is greaterThan version b
+     */
+    greaterThan(a: string, b: string): boolean {
+        this.assertValidSemVer('a', a);
+        this.assertValidSemVer('b', b);
+        if (a === b) {
+            return false;
+        }
+        const sortedVersions = semverSort.desc([a, b]);
+        const isAGreaterThanB = sortedVersions[0] === a;
+        return isAGreaterThanB;
+    },
+    assertValidSemVer(variableName: string, version: string): void {
+        if (!version.match(SEM_VER_REGEX)) {
+            throw new Error(
+                `SemVer versions should only contain numbers and dots. Encountered: ${variableName} = ${version}`,
+            );
+        }
+    },
+    getLatestVersion(versions: string[]): string {
+        _.each(versions, version => {
+            this.assertValidSemVer('version', version);
+        });
+        const sortedVersions = semverSort.desc(versions);
+        return sortedVersions[0];
+    },
+};
diff --git a/packages/monorepo-scripts/src/utils/utils.ts b/packages/monorepo-scripts/src/utils/utils.ts
index 0b8ac4c0b..93de0d940 100644
--- a/packages/monorepo-scripts/src/utils/utils.ts
+++ b/packages/monorepo-scripts/src/utils/utils.ts
@@ -1,10 +1,11 @@
-import * as fs from 'fs';
 import lernaGetPackages = require('lerna-get-packages');
 import * as _ from 'lodash';
 import { exec as execAsync } from 'promisify-child-process';
 
 import { constants } from '../constants';
-import { UpdatedPackage } from '../types';
+import { GitTagsByPackageName, UpdatedPackage } from '../types';
+
+import { changelogUtils } from './changelog_utils';
 
 export const utils = {
     log(...args: any[]): void {
@@ -17,11 +18,6 @@ export const utils = {
         const newPatchVersion = `${versionSegments[0]}.${versionSegments[1]}.${newPatch}`;
         return newPatchVersion;
     },
-    async prettifyAsync(filePath: string, cwd: string): Promise<void> {
-        await execAsync(`prettier --write ${filePath} --config .prettierrc`, {
-            cwd,
-        });
-    },
     async getUpdatedLernaPackagesAsync(shouldIncludePrivate: boolean): Promise<LernaPackage[]> {
         const updatedPublicPackages = await this.getLernaUpdatedPackagesAsync(shouldIncludePrivate);
         const updatedPackageNames = _.map(updatedPublicPackages, pkg => pkg.name);
@@ -43,22 +39,82 @@ export const utils = {
         }
         return updatedPackages;
     },
-    getChangelogJSONIfExists(changelogPath: string): string | undefined {
-        try {
-            const changelogJSON = fs.readFileSync(changelogPath, 'utf-8');
-            return changelogJSON;
-        } catch (err) {
-            return undefined;
+    async getNextPackageVersionAsync(
+        currentVersion: string,
+        packageName: string,
+        packageLocation: string,
+    ): Promise<string> {
+        let nextVersion;
+        const changelog = changelogUtils.getChangelogOrCreateIfMissing(packageName, packageLocation);
+        if (_.isEmpty(changelog)) {
+            nextVersion = this.getNextPatchVersion(currentVersion);
         }
+        const lastEntry = changelog[0];
+        nextVersion =
+            lastEntry.version === currentVersion ? this.getNextPatchVersion(currentVersion) : lastEntry.version;
+        return nextVersion;
+    },
+    async getRemoteGitTagsAsync(): Promise<string[]> {
+        const result = await execAsync(`git ls-remote --tags`, {
+            cwd: constants.monorepoRootPath,
+        });
+        const tagsString = result.stdout;
+        const tagOutputs: string[] = tagsString.split('\n');
+        const tags = _.compact(
+            _.map(tagOutputs, tagOutput => {
+                const tag = tagOutput.split('refs/tags/')[1];
+                // Tags with `^{}` are duplicateous so we ignore them
+                // Source: https://stackoverflow.com/questions/15472107/when-listing-git-ls-remote-why-theres-after-the-tag-name
+                if (_.endsWith(tag, '^{}')) {
+                    return undefined;
+                }
+                return tag;
+            }),
+        );
+        return tags;
+    },
+    async getLocalGitTagsAsync(): Promise<string[]> {
+        const result = await execAsync(`git tags`, {
+            cwd: constants.monorepoRootPath,
+        });
+        const tagsString = result.stdout;
+        const tags = tagsString.split('\n');
+        return tags;
     },
-    getChangelogJSONOrCreateIfMissing(changelogPath: string): string {
-        const changelogIfExists = this.getChangelogJSONIfExists(changelogPath);
-        if (_.isUndefined(changelogIfExists)) {
-            // If none exists, create new, empty one.
-            const emptyChangelogJSON = JSON.stringify([]);
-            fs.writeFileSync(changelogPath, emptyChangelogJSON);
-            return emptyChangelogJSON;
+    async getGitTagsByPackageNameAsync(packageNames: string[], gitTags: string[]): Promise<GitTagsByPackageName> {
+        const tagVersionByPackageName: GitTagsByPackageName = {};
+        _.each(gitTags, tag => {
+            const packageNameIfExists = _.find(packageNames, name => {
+                return _.includes(tag, `${name}@`);
+            });
+            if (_.isUndefined(packageNameIfExists)) {
+                return; // ignore tags not related to a package we care about.
+            }
+            const splitTag = tag.split(`${packageNameIfExists}@`);
+            if (splitTag.length !== 2) {
+                throw new Error(`Unexpected tag name found: ${tag}`);
+            }
+            const version = splitTag[1];
+            (tagVersionByPackageName[packageNameIfExists] || (tagVersionByPackageName[packageNameIfExists] = [])).push(
+                version,
+            );
+        });
+        return tagVersionByPackageName;
+    },
+    async removeLocalTagAsync(tagName: string): Promise<void> {
+        const result = await execAsync(`git tag -d ${tagName}`, {
+            cwd: constants.monorepoRootPath,
+        });
+        if (!_.isEmpty(result.stderr)) {
+            throw new Error(`Failed to delete local git tag. Got err: ${result.stderr}`);
+        }
+    },
+    async removeRemoteTagAsync(tagName: string): Promise<void> {
+        const result = await execAsync(`git push origin ${tagName}`, {
+            cwd: constants.monorepoRootPath,
+        });
+        if (!_.isEmpty(result.stderr)) {
+            throw new Error(`Failed to delete remote git tag. Got err: ${result.stderr}`);
         }
-        return changelogIfExists;
     },
 };
-- 
cgit 


From 074c42e8b6a04ee8b1333711642c136746e29f4b Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 18 Jun 2018 16:57:22 +0200
Subject: fix package.json

---
 packages/monorepo-scripts/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json
index fe9194b2f..6ce889907 100644
--- a/packages/monorepo-scripts/package.json
+++ b/packages/monorepo-scripts/package.json
@@ -17,7 +17,7 @@
         "script:deps_versions": "node ./lib/deps_versions.js",
         "script:prepublish_checks": "node ./lib/prepublish_checks.js",
         "script:publish": "IS_DRY_RUN=true node ./lib/publish.js",
-        "script:find_unused_deps": "node ./lib/find_unused_dependencies.js",
+        "script:find_unused_deps": "node ./lib/find_unused_dependencies.js"
     },
     "repository": {
         "type": "git",
-- 
cgit 


From 53eae14763b9c2b7ff26a832b5ea9d8b4511969e Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 18 Jun 2018 17:41:03 +0200
Subject: Show all errors of a given kind at once rather then throwing after
 the first instance is encountered

---
 packages/monorepo-scripts/src/prepublish_checks.ts | 46 +++++++++++++++++-----
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/packages/monorepo-scripts/src/prepublish_checks.ts b/packages/monorepo-scripts/src/prepublish_checks.ts
index 64de56ece..17227d13f 100644
--- a/packages/monorepo-scripts/src/prepublish_checks.ts
+++ b/packages/monorepo-scripts/src/prepublish_checks.ts
@@ -18,6 +18,7 @@ async function prepublishChecksAsync(): Promise<void> {
     await checkChangelogFormatAsync(updatedPublicLernaPackages);
     await checkGitTagsForNextVersionAndDeleteIfExistAsync(updatedPublicLernaPackages);
     await checkPublishRequiredSetupAsync();
+    throw new Error('Intentional stop!');
 }
 
 async function checkGitTagsForNextVersionAndDeleteIfExistAsync(
@@ -53,6 +54,8 @@ async function checkGitTagsForNextVersionAndDeleteIfExistAsync(
 async function checkCurrentVersionMatchesLatestPublishedNPMPackageAsync(
     updatedPublicLernaPackages: LernaPackage[],
 ): Promise<void> {
+    utils.log('Check package versions against npmjs.org...');
+    const versionMismatches = [];
     for (const lernaPackage of updatedPublicLernaPackages) {
         const packageName = lernaPackage.package.name;
         const packageVersion = lernaPackage.package.version;
@@ -63,16 +66,28 @@ async function checkCurrentVersionMatchesLatestPublishedNPMPackageAsync(
         const allVersionsIncludingUnpublished = npmUtils.getPreviouslyPublishedVersions(packageRegistryJsonIfExists);
         const latestNPMVersion = semverUtils.getLatestVersion(allVersionsIncludingUnpublished);
         if (packageVersion !== latestNPMVersion) {
-            throw new Error(
-                `Found verson ${packageVersion} in package.json but version ${latestNPMVersion}
-                on NPM (could be unpublished version) for ${packageName}. These versions must match. If you update
-                the package.json version, make sure to also update the internal dependency versions too.`,
-            );
+            versionMismatches.push({
+                packageJsonVersion: packageVersion,
+                npmVersion: latestNPMVersion,
+                packageName,
+            });
         }
     }
+    if (!_.isEmpty(versionMismatches)) {
+        utils.log(`Found version mismatches between package.json and NPM published versions (might be unpublished).`);
+        _.each(versionMismatches, versionMismatch => {
+            utils.log(
+                `${versionMismatch.packageName}: ${versionMismatch.packageJsonVersion} package.json, ${
+                    versionMismatch.npmVersion
+                } on NPM`,
+            );
+        });
+        throw new Error(`Please fix the above package.json/NPM inconsistencies.`);
+    }
 }
 
 async function checkChangelogFormatAsync(updatedPublicLernaPackages: LernaPackage[]): Promise<void> {
+    const changeLogInconsistencies = [];
     for (const lernaPackage of updatedPublicLernaPackages) {
         const packageName = lernaPackage.package.name;
         const changelog = changelogUtils.getChangelogOrCreateIfMissing(packageName, lernaPackage.location);
@@ -82,11 +97,11 @@ async function checkChangelogFormatAsync(updatedPublicLernaPackages: LernaPackag
             const lastEntry = changelog[0];
             const doesLastEntryHaveTimestamp = !_.isUndefined(lastEntry.timestamp);
             if (semverUtils.lessThan(lastEntry.version, currentVersion)) {
-                throw new Error(
-                    `CHANGELOG version cannot be below current package version.
-                     Update ${packageName}'s CHANGELOG. It's current version is ${currentVersion}
-                     but the latest CHANGELOG entry is: ${lastEntry.version}`,
-                );
+                changeLogInconsistencies.push({
+                    packageJsonVersion: currentVersion,
+                    changelogVersion: lastEntry.version,
+                    packageName,
+                });
             } else if (semverUtils.greaterThan(lastEntry.version, currentVersion) && doesLastEntryHaveTimestamp) {
                 // Remove incorrectly added timestamp
                 delete changelog[0].timestamp;
@@ -96,6 +111,17 @@ async function checkChangelogFormatAsync(updatedPublicLernaPackages: LernaPackag
             }
         }
     }
+    if (!_.isEmpty(changeLogInconsistencies)) {
+        utils.log(`CHANGELOG versions cannot below package.json versions:`);
+        _.each(changeLogInconsistencies, inconsistency => {
+            utils.log(
+                `${inconsistency.packageName}: ${inconsistency.packageJsonVersion} package.json, ${
+                    inconsistency.changelogVersion
+                } CHANGELOG.json`,
+            );
+        });
+    }
+    throw new Error('Fix the above inconsistencies to continue.');
 }
 
 async function checkPublishRequiredSetupAsync(): Promise<void> {
-- 
cgit 


From 9a748c8bf1dfd1a090e3d44a4cbebb59bcedd5e6 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 18 Jun 2018 17:58:17 +0200
Subject: small fixes

---
 packages/monorepo-scripts/src/prepublish_checks.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/monorepo-scripts/src/prepublish_checks.ts b/packages/monorepo-scripts/src/prepublish_checks.ts
index 17227d13f..0bd3bb0c1 100644
--- a/packages/monorepo-scripts/src/prepublish_checks.ts
+++ b/packages/monorepo-scripts/src/prepublish_checks.ts
@@ -18,7 +18,6 @@ async function prepublishChecksAsync(): Promise<void> {
     await checkChangelogFormatAsync(updatedPublicLernaPackages);
     await checkGitTagsForNextVersionAndDeleteIfExistAsync(updatedPublicLernaPackages);
     await checkPublishRequiredSetupAsync();
-    throw new Error('Intentional stop!');
 }
 
 async function checkGitTagsForNextVersionAndDeleteIfExistAsync(
@@ -87,6 +86,7 @@ async function checkCurrentVersionMatchesLatestPublishedNPMPackageAsync(
 }
 
 async function checkChangelogFormatAsync(updatedPublicLernaPackages: LernaPackage[]): Promise<void> {
+    utils.log('Check CHANGELOGs for inconsistencies...');
     const changeLogInconsistencies = [];
     for (const lernaPackage of updatedPublicLernaPackages) {
         const packageName = lernaPackage.package.name;
@@ -120,8 +120,8 @@ async function checkChangelogFormatAsync(updatedPublicLernaPackages: LernaPackag
                 } CHANGELOG.json`,
             );
         });
+        throw new Error('Fix the above inconsistencies to continue.');
     }
-    throw new Error('Fix the above inconsistencies to continue.');
 }
 
 async function checkPublishRequiredSetupAsync(): Promise<void> {
-- 
cgit 


From 3e64b3da398a90e6ddfc287ebf28ec780b64b56f Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 18 Jun 2018 19:00:39 +0200
Subject: Use semver library instead of semverUtils

---
 packages/monorepo-scripts/package.json             |  2 +
 packages/monorepo-scripts/src/prepublish_checks.ts | 10 ++--
 packages/monorepo-scripts/src/publish.ts           | 10 ++--
 .../monorepo-scripts/src/utils/changelog_utils.ts  |  5 +-
 .../monorepo-scripts/src/utils/semver_utils.ts     | 56 ----------------------
 packages/monorepo-scripts/src/utils/utils.ts       |  7 ---
 6 files changed, 17 insertions(+), 73 deletions(-)
 delete mode 100644 packages/monorepo-scripts/src/utils/semver_utils.ts

diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json
index 6ce889907..5fbf7dbdf 100644
--- a/packages/monorepo-scripts/package.json
+++ b/packages/monorepo-scripts/package.json
@@ -38,6 +38,7 @@
         "make-promises-safe": "^1.1.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
+        "@types/semver": "5.5.0",
         "tslint": "5.8.0",
         "typescript": "2.7.1"
     },
@@ -56,6 +57,7 @@
         "publish-release": "0xproject/publish-release",
         "rimraf": "^2.6.2",
         "semver-diff": "^2.1.0",
+        "semver": "5.5.0",
         "semver-sort": "0.0.4"
     },
     "publishConfig": {
diff --git a/packages/monorepo-scripts/src/prepublish_checks.ts b/packages/monorepo-scripts/src/prepublish_checks.ts
index 0bd3bb0c1..5848cea8d 100644
--- a/packages/monorepo-scripts/src/prepublish_checks.ts
+++ b/packages/monorepo-scripts/src/prepublish_checks.ts
@@ -2,12 +2,13 @@ import * as fs from 'fs';
 import * as _ from 'lodash';
 import * as path from 'path';
 import { exec as execAsync } from 'promisify-child-process';
+import semver = require('semver');
+import semverSort = require('semver-sort');
 
 import { constants } from './constants';
 import { Changelog, PackageRegistryJson } from './types';
 import { changelogUtils } from './utils/changelog_utils';
 import { npmUtils } from './utils/npm_utils';
-import { semverUtils } from './utils/semver_utils';
 import { utils } from './utils/utils';
 
 async function prepublishChecksAsync(): Promise<void> {
@@ -63,7 +64,8 @@ async function checkCurrentVersionMatchesLatestPublishedNPMPackageAsync(
             continue; // noop for packages not yet published to NPM
         }
         const allVersionsIncludingUnpublished = npmUtils.getPreviouslyPublishedVersions(packageRegistryJsonIfExists);
-        const latestNPMVersion = semverUtils.getLatestVersion(allVersionsIncludingUnpublished);
+        const sortedVersions = semverSort.desc(allVersionsIncludingUnpublished);
+        const latestNPMVersion = sortedVersions[0];
         if (packageVersion !== latestNPMVersion) {
             versionMismatches.push({
                 packageJsonVersion: packageVersion,
@@ -96,13 +98,13 @@ async function checkChangelogFormatAsync(updatedPublicLernaPackages: LernaPackag
         if (!_.isEmpty(changelog)) {
             const lastEntry = changelog[0];
             const doesLastEntryHaveTimestamp = !_.isUndefined(lastEntry.timestamp);
-            if (semverUtils.lessThan(lastEntry.version, currentVersion)) {
+            if (semver.lt(lastEntry.version, currentVersion)) {
                 changeLogInconsistencies.push({
                     packageJsonVersion: currentVersion,
                     changelogVersion: lastEntry.version,
                     packageName,
                 });
-            } else if (semverUtils.greaterThan(lastEntry.version, currentVersion) && doesLastEntryHaveTimestamp) {
+            } else if (semver.gt(lastEntry.version, currentVersion) && doesLastEntryHaveTimestamp) {
                 // Remove incorrectly added timestamp
                 delete changelog[0].timestamp;
                 // Save updated CHANGELOG.json
diff --git a/packages/monorepo-scripts/src/publish.ts b/packages/monorepo-scripts/src/publish.ts
index 637512a5a..cdd250ec3 100644
--- a/packages/monorepo-scripts/src/publish.ts
+++ b/packages/monorepo-scripts/src/publish.ts
@@ -8,6 +8,7 @@ import opn = require('opn');
 import * as path from 'path';
 import { exec as execAsync, spawn } from 'promisify-child-process';
 import * as prompt from 'prompt';
+import semver = require('semver');
 import semverDiff = require('semver-diff');
 import semverSort = require('semver-sort');
 
@@ -129,10 +130,13 @@ async function updateChangeLogsAsync(updatedPublicLernaPackages: LernaPackage[])
         );
         if (shouldAddNewEntry) {
             // Create a new entry for a patch version with generic changelog entry.
-            const nextPatchVersion = utils.getNextPatchVersion(currentVersion);
+            const nextPatchVersionIfValid = semver.inc(currentVersion, 'patch');
+            if (_.isNull(nextPatchVersionIfValid)) {
+                throw new Error(`Encountered invalid semver version: ${currentVersion} for package: ${packageName}`);
+            }
             const newChangelogEntry: VersionChangelog = {
                 timestamp: TODAYS_TIMESTAMP,
-                version: nextPatchVersion,
+                version: nextPatchVersionIfValid,
                 changes: [
                     {
                         note: 'Dependencies updated',
@@ -140,7 +144,7 @@ async function updateChangeLogsAsync(updatedPublicLernaPackages: LernaPackage[])
                 ],
             };
             changelog = [newChangelogEntry, ...changelog];
-            packageToVersionChange[packageName] = semverDiff(currentVersion, nextPatchVersion);
+            packageToVersionChange[packageName] = semverDiff(currentVersion, nextPatchVersionIfValid);
         } else {
             // Update existing entry with timestamp
             const lastEntry = changelog[0];
diff --git a/packages/monorepo-scripts/src/utils/changelog_utils.ts b/packages/monorepo-scripts/src/utils/changelog_utils.ts
index 4e09fc842..a589fe985 100644
--- a/packages/monorepo-scripts/src/utils/changelog_utils.ts
+++ b/packages/monorepo-scripts/src/utils/changelog_utils.ts
@@ -3,13 +3,12 @@ import * as _ from 'lodash';
 import * as moment from 'moment';
 import * as path from 'path';
 import { exec as execAsync } from 'promisify-child-process';
+import semver = require('semver');
 import semverSort = require('semver-sort');
 
 import { constants } from '../constants';
 import { Change, Changelog, VersionChangelog } from '../types';
 
-import { semverUtils } from './semver_utils';
-
 const CHANGELOG_MD_HEADER = `
 <!--
 This file is auto-generated using the monorepo-scripts package. Don't edit directly.
@@ -56,7 +55,7 @@ export const changelogUtils = {
             return true;
         }
         const lastEntry = changelog[0];
-        if (semverUtils.lessThan(lastEntry.version, currentVersion)) {
+        if (semver.lt(lastEntry.version, currentVersion)) {
             throw new Error(
                 `Found CHANGELOG version lower then current package version. ${packageName} current: ${currentVersion}, Changelog: ${
                     lastEntry.version
diff --git a/packages/monorepo-scripts/src/utils/semver_utils.ts b/packages/monorepo-scripts/src/utils/semver_utils.ts
deleted file mode 100644
index d5c6b2d17..000000000
--- a/packages/monorepo-scripts/src/utils/semver_utils.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import * as _ from 'lodash';
-import semverSort = require('semver-sort');
-
-// Regex that matches semantic versions only including digits and dots.
-const SEM_VER_REGEX = /^(\d+\.){1}(\d+\.){1}(\d+){1}$/gm;
-
-export const semverUtils = {
-    /**
-     * Checks whether version a is lessThan version b. Supplied versions must be
-     * Semantic Versions containing only numbers and dots (e.g 1.4.0).
-     * @param a version of interest
-     * @param b version to compare a against
-     * @return Whether version a is lessThan version b
-     */
-    lessThan(a: string, b: string): boolean {
-        this.assertValidSemVer('a', a);
-        this.assertValidSemVer('b', b);
-        if (a === b) {
-            return false;
-        }
-        const sortedVersions = semverSort.desc([a, b]);
-        const isALessThanB = sortedVersions[0] === b;
-        return isALessThanB;
-    },
-    /**
-     * Checks whether version a is greaterThan version b. Supplied versions must be
-     * Semantic Versions containing only numbers and dots (e.g 1.4.0).
-     * @param a version of interest
-     * @param b version to compare a against
-     * @return Whether version a is greaterThan version b
-     */
-    greaterThan(a: string, b: string): boolean {
-        this.assertValidSemVer('a', a);
-        this.assertValidSemVer('b', b);
-        if (a === b) {
-            return false;
-        }
-        const sortedVersions = semverSort.desc([a, b]);
-        const isAGreaterThanB = sortedVersions[0] === a;
-        return isAGreaterThanB;
-    },
-    assertValidSemVer(variableName: string, version: string): void {
-        if (!version.match(SEM_VER_REGEX)) {
-            throw new Error(
-                `SemVer versions should only contain numbers and dots. Encountered: ${variableName} = ${version}`,
-            );
-        }
-    },
-    getLatestVersion(versions: string[]): string {
-        _.each(versions, version => {
-            this.assertValidSemVer('version', version);
-        });
-        const sortedVersions = semverSort.desc(versions);
-        return sortedVersions[0];
-    },
-};
diff --git a/packages/monorepo-scripts/src/utils/utils.ts b/packages/monorepo-scripts/src/utils/utils.ts
index 93de0d940..16a84b869 100644
--- a/packages/monorepo-scripts/src/utils/utils.ts
+++ b/packages/monorepo-scripts/src/utils/utils.ts
@@ -11,13 +11,6 @@ export const utils = {
     log(...args: any[]): void {
         console.log(...args); // tslint:disable-line:no-console
     },
-    getNextPatchVersion(currentVersion: string): string {
-        const versionSegments = currentVersion.split('.');
-        const patch = _.parseInt(_.last(versionSegments) as string);
-        const newPatch = patch + 1;
-        const newPatchVersion = `${versionSegments[0]}.${versionSegments[1]}.${newPatch}`;
-        return newPatchVersion;
-    },
     async getUpdatedLernaPackagesAsync(shouldIncludePrivate: boolean): Promise<LernaPackage[]> {
         const updatedPublicPackages = await this.getLernaUpdatedPackagesAsync(shouldIncludePrivate);
         const updatedPackageNames = _.map(updatedPublicPackages, pkg => pkg.name);
-- 
cgit 


From dcd53c3c5bc251af242166cf758146649eb4185b Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 18 Jun 2018 19:22:31 +0200
Subject: Use semver package instead of getNextPatchVersion

---
 packages/monorepo-scripts/src/publish.ts     |  8 ++++++--
 packages/monorepo-scripts/src/utils/utils.ts | 15 ++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/packages/monorepo-scripts/src/publish.ts b/packages/monorepo-scripts/src/publish.ts
index cdd250ec3..5f4c67e04 100644
--- a/packages/monorepo-scripts/src/publish.ts
+++ b/packages/monorepo-scripts/src/publish.ts
@@ -213,12 +213,16 @@ async function lernaPublishAsync(packageToVersionChange: { [name: string]: strin
 }
 
 function updateVersionNumberIfNeeded(currentVersion: string, proposedNextVersion: string): string {
+    const updatedVersionIfValid = semver.inc(currentVersion, 'patch');
+    if (_.isNull(updatedVersionIfValid)) {
+        throw new Error(`Encountered invalid semver: ${currentVersion}`);
+    }
     if (proposedNextVersion === currentVersion) {
-        return utils.getNextPatchVersion(currentVersion);
+        return updatedVersionIfValid;
     }
     const sortedVersions = semverSort.desc([proposedNextVersion, currentVersion]);
     if (sortedVersions[0] !== proposedNextVersion) {
-        return utils.getNextPatchVersion(currentVersion);
+        return updatedVersionIfValid;
     }
     return proposedNextVersion;
 }
diff --git a/packages/monorepo-scripts/src/utils/utils.ts b/packages/monorepo-scripts/src/utils/utils.ts
index 16a84b869..20bc57bae 100644
--- a/packages/monorepo-scripts/src/utils/utils.ts
+++ b/packages/monorepo-scripts/src/utils/utils.ts
@@ -1,6 +1,7 @@
 import lernaGetPackages = require('lerna-get-packages');
 import * as _ from 'lodash';
 import { exec as execAsync } from 'promisify-child-process';
+import semver = require('semver');
 
 import { constants } from '../constants';
 import { GitTagsByPackageName, UpdatedPackage } from '../types';
@@ -37,15 +38,19 @@ export const utils = {
         packageName: string,
         packageLocation: string,
     ): Promise<string> {
-        let nextVersion;
+        let nextVersionIfValid;
         const changelog = changelogUtils.getChangelogOrCreateIfMissing(packageName, packageLocation);
         if (_.isEmpty(changelog)) {
-            nextVersion = this.getNextPatchVersion(currentVersion);
+            nextVersionIfValid = semver.inc(currentVersion, 'patch');
         }
         const lastEntry = changelog[0];
-        nextVersion =
-            lastEntry.version === currentVersion ? this.getNextPatchVersion(currentVersion) : lastEntry.version;
-        return nextVersion;
+        nextVersionIfValid = semver.eq(lastEntry.version, currentVersion)
+            ? semver.inc(currentVersion, 'patch')
+            : lastEntry.version;
+        if (_.isNull(nextVersionIfValid)) {
+            throw new Error(`Encountered invalid semver: ${currentVersion} associated with ${packageName}`);
+        }
+        return nextVersionIfValid;
     },
     async getRemoteGitTagsAsync(): Promise<string[]> {
         const result = await execAsync(`git ls-remote --tags`, {
-- 
cgit 


From 880cbd88c2416c9a3281542c68affb862bd90575 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 18 Jun 2018 23:15:52 +0200
Subject: Small fixes

---
 packages/monorepo-scripts/src/prepublish_checks.ts     | 3 ---
 packages/monorepo-scripts/src/publish.ts               | 6 ++----
 packages/monorepo-scripts/src/utils/changelog_utils.ts | 5 ++---
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/packages/monorepo-scripts/src/prepublish_checks.ts b/packages/monorepo-scripts/src/prepublish_checks.ts
index 5848cea8d..1c4ee1fc6 100644
--- a/packages/monorepo-scripts/src/prepublish_checks.ts
+++ b/packages/monorepo-scripts/src/prepublish_checks.ts
@@ -1,12 +1,9 @@
-import * as fs from 'fs';
 import * as _ from 'lodash';
-import * as path from 'path';
 import { exec as execAsync } from 'promisify-child-process';
 import semver = require('semver');
 import semverSort = require('semver-sort');
 
 import { constants } from './constants';
-import { Changelog, PackageRegistryJson } from './types';
 import { changelogUtils } from './utils/changelog_utils';
 import { npmUtils } from './utils/npm_utils';
 import { utils } from './utils/utils';
diff --git a/packages/monorepo-scripts/src/publish.ts b/packages/monorepo-scripts/src/publish.ts
index 5f4c67e04..72c6c0a71 100644
--- a/packages/monorepo-scripts/src/publish.ts
+++ b/packages/monorepo-scripts/src/publish.ts
@@ -1,11 +1,9 @@
 #!/usr/bin/env node
 
 import * as promisify from 'es6-promisify';
-import * as fs from 'fs';
 import * as _ from 'lodash';
 import * as moment from 'moment';
 import opn = require('opn');
-import * as path from 'path';
 import { exec as execAsync, spawn } from 'promisify-child-process';
 import * as prompt from 'prompt';
 import semver = require('semver');
@@ -13,7 +11,7 @@ import semverDiff = require('semver-diff');
 import semverSort = require('semver-sort');
 
 import { constants } from './constants';
-import { Changelog, PackageToVersionChange, SemVerIndex, VersionChangelog } from './types';
+import { PackageToVersionChange, SemVerIndex, VersionChangelog } from './types';
 import { changelogUtils } from './utils/changelog_utils';
 import { utils } from './utils/utils';
 
@@ -163,7 +161,7 @@ async function updateChangeLogsAsync(updatedPublicLernaPackages: LernaPackage[])
         utils.log(`${packageName}: Updated CHANGELOG.json`);
         // Generate updated CHANGELOG.md
         const changelogMd = changelogUtils.generateChangelogMd(changelog);
-        await changelogUtils.writeChangelogMdFileAsync(lernaPackage.location, changelog);
+        await changelogUtils.writeChangelogMdFileAsync(lernaPackage.location, changelogMd);
         utils.log(`${packageName}: Updated CHANGELOG.md`);
     }
 
diff --git a/packages/monorepo-scripts/src/utils/changelog_utils.ts b/packages/monorepo-scripts/src/utils/changelog_utils.ts
index a589fe985..dbafb6f16 100644
--- a/packages/monorepo-scripts/src/utils/changelog_utils.ts
+++ b/packages/monorepo-scripts/src/utils/changelog_utils.ts
@@ -4,7 +4,6 @@ import * as moment from 'moment';
 import * as path from 'path';
 import { exec as execAsync } from 'promisify-child-process';
 import semver = require('semver');
-import semverSort = require('semver-sort');
 
 import { constants } from '../constants';
 import { Change, Changelog, VersionChangelog } from '../types';
@@ -94,9 +93,9 @@ export const changelogUtils = {
         fs.writeFileSync(changelogJSONPath, JSON.stringify(changelog, null, '\t'));
         await this.prettifyAsync(changelogJSONPath, constants.monorepoRootPath);
     },
-    async writeChangelogMdFileAsync(packageLocation: string, changelog: Changelog): Promise<void> {
+    async writeChangelogMdFileAsync(packageLocation: string, changelogMdString: string): Promise<void> {
         const changelogMarkdownPath = path.join(packageLocation, 'CHANGELOG.md');
-        fs.writeFileSync(changelogMarkdownPath, JSON.stringify(changelog, null, '\t'));
+        fs.writeFileSync(changelogMarkdownPath, changelogMdString);
         await this.prettifyAsync(changelogMarkdownPath, constants.monorepoRootPath);
     },
     async prettifyAsync(filePath: string, cwd: string): Promise<void> {
-- 
cgit 


From 25b6d1a232835b76decbb1c66878da1285afe404 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 18 Jun 2018 23:20:07 +0200
Subject: Remove remove_tags script

---
 packages/monorepo-scripts/src/remove_tags.ts | 57 ----------------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 packages/monorepo-scripts/src/remove_tags.ts

diff --git a/packages/monorepo-scripts/src/remove_tags.ts b/packages/monorepo-scripts/src/remove_tags.ts
deleted file mode 100644
index 50e413495..000000000
--- a/packages/monorepo-scripts/src/remove_tags.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env node
-
-import * as _ from 'lodash';
-import * as path from 'path';
-import { exec as execAsync } from 'promisify-child-process';
-import semverSort = require('semver-sort');
-
-import { constants } from './constants';
-import { Changelog } from './types';
-import { utils } from './utils/utils';
-
-(async () => {
-    const shouldIncludePrivate = true;
-    const updatedPublicLernaPackages = await utils.getUpdatedLernaPackagesAsync(shouldIncludePrivate);
-
-    for (const lernaPackage of updatedPublicLernaPackages) {
-        const packageName = lernaPackage.package.name;
-        const currentVersion = lernaPackage.package.version;
-        const changelogJSONPath = path.join(lernaPackage.location, 'CHANGELOG.json');
-        // Private packages don't have changelogs, and their versions are always incremented
-        // by a patch version.
-        const changelogJSONIfExists = utils.getChangelogJSONIfExists(changelogJSONPath);
-
-        let latestChangelogVersion: string;
-        if (!_.isUndefined(changelogJSONIfExists)) {
-            let changelogs: Changelog;
-            try {
-                changelogs = JSON.parse(changelogJSONIfExists);
-            } catch (err) {
-                throw new Error(
-                    `${lernaPackage.package.name}'s CHANGELOG.json contains invalid JSON. Please fix and try again.`,
-                );
-            }
-            latestChangelogVersion = changelogs[0].version;
-        } else {
-            latestChangelogVersion = utils.getNextPatchVersion(currentVersion);
-        }
-
-        const sortedVersions = semverSort.desc([latestChangelogVersion, currentVersion]);
-        if (sortedVersions[0] === latestChangelogVersion && latestChangelogVersion !== currentVersion) {
-            const tagName = `${packageName}@${latestChangelogVersion}`;
-            try {
-                await execAsync(`git tag -d ${tagName}`, { cwd: constants.monorepoRootPath });
-                utils.log(`removed tag: ${tagName}`);
-            } catch (err) {
-                if (_.includes(err.message, 'not found')) {
-                    utils.log(`Could not find tag: ${tagName}`);
-                } else {
-                    throw err;
-                }
-            }
-        }
-    }
-})().catch(err => {
-    utils.log(err);
-    process.exit(1);
-});
-- 
cgit