Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/instant/discharge

5 files changed, 34 insertions, 11 deletions

diff --git a/packages/contract-artifacts/CHANGELOG.json b/packages/contract-artifacts/CHANGELOG.json
index d91ad0b36..c2b44ede8 100644
--- a/packages/contract-artifacts/CHANGELOG.json
+++ b/packages/contract-artifacts/CHANGELOG.json
@@ -1,11 +1,20 @@
 [
     {
-        "version": "1.0.0",
+        "version": "1.0.1",
         "changes": [
             {
                 "pr": 1105,
                 "note": "Initial release"
             }
+        ],
+        "timestamp": 1539871071
+    },
+    {
+        "version": "1.0.0",
+        "changes": [
+            {
+                "note": "Unpublished Package"
+            }
         ]
     }
 ]
diff --git a/packages/contract-artifacts/CHANGELOG.md b/packages/contract-artifacts/CHANGELOG.md
new file mode 100644
index 000000000..82c22f2e4
--- /dev/null
+++ b/packages/contract-artifacts/CHANGELOG.md
@@ -0,0 +1,14 @@
+<!--
+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 - _October 18, 2018_
+
+    * Initial release (#1105)
+
+## v1.0.0 - _Invalid date_
+
+    * Unpublished Package
diff --git a/packages/contract-artifacts/README.md b/packages/contract-artifacts/README.md
index f8901266d..5a382c308 100644
--- a/packages/contract-artifacts/README.md
+++ b/packages/contract-artifacts/README.md
@@ -1,23 +1,23 @@
-## @0xproject/contract-artifacts
+## @0x/contract-artifacts
 
 Smart contract compilation artifacts for the latest version of the 0x Protocol.
 
 ## Installation
 
 ```bash
-yarn add @0xproject/contract-artifacts
+yarn add @0x/contract-artifacts
 ```
 
 **Import**
 
 ```typescript
-import * as artifacts from '@0xproject/contract-artifacts';
+import * as artifacts from '@0x/contract-artifacts';
 ```
 
 or
 
 ```javascript
-var artifacts = require('@0xproject/contract-artifacts');
+var artifacts = require('@0x/contract-artifacts');
 ```
 
 ## Contributing
@@ -45,7 +45,7 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
 
 ```bash
-PKG=@0xproject/contract-artifacts yarn build
+PKG=@0x/contract-artifacts yarn build
 ```
 
 ### Clean
diff --git a/packages/contract-artifacts/package.json b/packages/contract-artifacts/package.json
index 3e1696695..53f5d3c47 100644
--- a/packages/contract-artifacts/package.json
+++ b/packages/contract-artifacts/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/contract-artifacts",
-    "version": "1.0.0",
+    "name": "@0x/contract-artifacts",
+    "version": "1.0.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -24,8 +24,8 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/contract-artifacts/README.md",
     "devDependencies": {
-        "typescript": "3.0.1",
-        "shx": "^0.2.2"
+        "shx": "^0.2.2",
+        "typescript": "3.0.1"
     },
     "publishConfig": {
         "access": "public"
diff --git a/packages/contract-artifacts/tslint.json b/packages/contract-artifacts/tslint.json
index ffaefe83a..dd9053357 100644
--- a/packages/contract-artifacts/tslint.json
+++ b/packages/contract-artifacts/tslint.json
@@ -1,3 +1,3 @@
 {
-    "extends": ["@0xproject/tslint-config"]
+    "extends": ["@0x/tslint-config"]
 }