Merge branch 'development' into dev-tools-pages

4 files changed, 35 insertions, 10 deletions

diff --git a/packages/tslint-config/CHANGELOG.json b/packages/tslint-config/CHANGELOG.json
index 2a9b22922..9f504216c 100644
--- a/packages/tslint-config/CHANGELOG.json
+++ b/packages/tslint-config/CHANGELOG.json
@@ -1,5 +1,23 @@
 [
     {
+        "version": "1.0.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1541740904
+    },
+    {
+        "timestamp": 1539871071,
+        "version": "1.0.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "timestamp": 1538693146,
         "version": "1.0.8",
         "changes": [
diff --git a/packages/tslint-config/CHANGELOG.md b/packages/tslint-config/CHANGELOG.md
index 0486cb523..f5cacb5d1 100644
--- a/packages/tslint-config/CHANGELOG.md
+++ b/packages/tslint-config/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.10 - _November 9, 2018_
+
+    * Dependencies updated
+
+## v1.0.9 - _October 18, 2018_
+
+    * Dependencies updated
+
 ## v1.0.8 - _October 4, 2018_
 
     * Dependencies updated
@@ -17,7 +25,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.5 - _August 13, 2018_
+## v1.0.5 - _August 14, 2018_
 
     * Dependencies updated
 
diff --git a/packages/tslint-config/README.md b/packages/tslint-config/README.md
index d630ec84d..5614e5e54 100644
--- a/packages/tslint-config/README.md
+++ b/packages/tslint-config/README.md
@@ -1,11 +1,11 @@
-## @0xproject/tslint-config
+## @0x/tslint-config
 
 TSLint configuration and custom linter rules used by 0xProject.
 
 ## Installation
 
 ```bash
-yarn add --dev @0xproject/tslint-config
+yarn add --dev @0x/tslint-config
 ```
 
 ## Usage
@@ -14,7 +14,7 @@ Add the following to your `tslint.json` file
 
 ```json
 {
-    "extends": ["@0xproject/tslint-config"]
+    "extends": ["@0x/tslint-config"]
 }
 ```
 
@@ -43,13 +43,13 @@ 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/tslint-config yarn build
+PKG=@0x/tslint-config yarn build
 ```
 
 Or continuously rebuild on change:
 
 ```bash
-PKG=@0xproject/tslint-config yarn watch
+PKG=@0x/tslint-config yarn watch
 ```
 
 ### Clean
diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json
index 0c85c98ab..2914f31e2 100644
--- a/packages/tslint-config/package.json
+++ b/packages/tslint-config/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/tslint-config",
-    "version": "1.0.8",
+    "name": "@0x/tslint-config",
+    "version": "1.0.10",
     "engines": {
         "node": ">=6.12"
     },
@@ -10,7 +10,7 @@
         "build": "tsc -b",
         "build:ci": "yarn build",
         "clean": "shx rm -rf lib",
-        "lint": "tslint --project ."
+        "lint": "tslint --format stylish --project ."
     },
     "repository": {
         "type": "git",
@@ -34,7 +34,6 @@
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/tslint-config/README.md",
     "devDependencies": {
         "@types/lodash": "4.14.104",
-        "copyfiles": "^2.0.0",
         "make-promises-safe": "^1.1.0",
         "shx": "^0.2.2",
         "typescript": "3.0.1"