Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into feature/web3-wrapper/unexport-marshaller

4 files changed, 31 insertions, 10 deletions

diff --git a/packages/abi-gen/CHANGELOG.json b/packages/abi-gen/CHANGELOG.json
index 0207266a2..5ffe84bbf 100644
--- a/packages/abi-gen/CHANGELOG.json
+++ b/packages/abi-gen/CHANGELOG.json
@@ -1,5 +1,16 @@
 [
     {
+        "version": "1.0.1",
+        "changes": [
+            {
+                "note": "Fix the abi-gen entry point in package.json",
+                "pr": 901
+            }
+        ],
+        "timestamp": 1532357734
+    },
+    {
+        "timestamp": 1532043000,
         "version": "1.0.0",
         "changes": [
             {
diff --git a/packages/abi-gen/CHANGELOG.md b/packages/abi-gen/CHANGELOG.md
index d7de561c8..4ab5c09ec 100644
--- a/packages/abi-gen/CHANGELOG.md
+++ b/packages/abi-gen/CHANGELOG.md
@@ -1,10 +1,20 @@
 <!--
-This file is auto-generated using the monorepo-scripts package. Don't edit directly.
+changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
 Edit the package's CHANGELOG.json file only.
 -->
 
 CHANGELOG
 
+## v1.0.1 - _July 23, 2018_
+
+    * Fix the abi-gen entry point in package.json (#901)
+
+## v1.0.0 - _July 20, 2018_
+
+    * Convert e_r_c to erc in generated file names (#822)
+    * Remove the output directory before writing to it (#822)
+    * skip generation of wrappers that are already up to date (#788)
+
 ## v0.3.4 - _July 18, 2018_
 
     * Dependencies updated
diff --git a/packages/abi-gen/bin/abi-gen.js b/packages/abi-gen/bin/abi-gen.js
index 8d6bdccf8..73ffe76ed 100755
--- a/packages/abi-gen/bin/abi-gen.js
+++ b/packages/abi-gen/bin/abi-gen.js
@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('../lib/src/index.js')
+require('../lib/src/index.js');
diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json
index 41561268c..f7e179d4f 100644
--- a/packages/abi-gen/package.json
+++ b/packages/abi-gen/package.json
@@ -1,12 +1,12 @@
 {
     "name": "@0xproject/abi-gen",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "engines": {
         "node": ">=6.12"
     },
     "description": "Generate contract wrappers from ABI and handlebars templates",
-    "main": "lib/index.js",
-    "types": "lib/index.d.ts",
+    "main": "lib/src/index.js",
+    "types": "lib/src/index.d.ts",
     "scripts": {
         "watch_without_deps": "tsc -w",
         "lint": "tslint --project .",
@@ -32,10 +32,10 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",
     "dependencies": {
-        "@0xproject/typescript-typings": "^1.0.0",
-        "@0xproject/utils": "^1.0.0",
+        "@0xproject/typescript-typings": "^1.0.1",
+        "@0xproject/utils": "^1.0.1",
         "chalk": "^2.3.0",
-        "ethereum-types": "^1.0.0",
+        "ethereum-types": "^1.0.1",
         "glob": "^7.1.2",
         "handlebars": "^4.0.11",
         "lodash": "^4.17.4",
@@ -46,8 +46,8 @@
         "yargs": "^10.0.3"
     },
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^1.0.0",
-        "@0xproject/tslint-config": "^1.0.0",
+        "@0xproject/monorepo-scripts": "^1.0.1",
+        "@0xproject/tslint-config": "^1.0.1",
         "@types/glob": "5.0.35",
         "@types/handlebars": "^4.0.36",
         "@types/mkdirp": "^0.5.1",