Merge branch 'development' into v2-prototype

3 files changed, 23 insertions, 10 deletions

diff --git a/packages/tslint-config/CHANGELOG.json b/packages/tslint-config/CHANGELOG.json
index 2596ec925..ac59f7b19 100644
--- a/packages/tslint-config/CHANGELOG.json
+++ b/packages/tslint-config/CHANGELOG.json
@@ -1,5 +1,14 @@
 [
     {
+        "timestamp": 1525428773,
+        "version": "0.4.17",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "timestamp": 1524044013,
         "version": "0.4.16",
         "changes": [
diff --git a/packages/tslint-config/CHANGELOG.md b/packages/tslint-config/CHANGELOG.md
index 107a96627..6f5042a52 100644
--- a/packages/tslint-config/CHANGELOG.md
+++ b/packages/tslint-config/CHANGELOG.md
@@ -5,11 +5,15 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.4.17 - _May 4, 2018_
+
+    * Dependencies updated
+
 ## v0.4.16 - _April 18, 2018_
 
     * Dependencies updated
 
-## v0.4.15 - _April 12, 2018_
+## v0.4.15 - _April 11, 2018_
 
     * Dependencies updated
 
@@ -21,28 +25,28 @@ CHANGELOG
 
     * Dependencies updated
 
-## v0.4.9 - _February 9, 2018_
+## v0.4.9 - _February 8, 2018_
 
     * Move devDeps to deps to fix missed dependency issue in published package.
 
-## v0.4.8 - _February 9, 2018_
+## v0.4.8 - _February 8, 2018_
 
     * Fix publish issue where custom TSLint rules were not being included (#389)
 
-## v0.4.7 - _February 7, 2018_
+## v0.4.7 - _February 6, 2018_
 
     * Modified custom 'underscore-privates' rule, changing it to 'underscore-private-and-protected' requiring underscores to be prepended to both private and protected variable names (#354)
 
-## v0.4.0 - _December 28, 2017_
+## v0.4.0 - _December 27, 2017_
 
     * Added custom 'underscore-privates' rule, requiring underscores to be prepended to private variable names
     * Because our tools can be used in both a TS and JS environment, we want to make the private methods of any public facing interface show up at the bottom of auto-complete lists. Additionally, we wanted to remain consistent with respect to our usage of underscores in order to enforce this rule with a linter rule, rather then manual code reviews.
 
-## v0.3.0 - _December 20, 2017_
+## v0.3.0 - _December 19, 2017_
 
     * Added rules for unused imports, variables and Async suffixes (#265)
 
-## v0.1.0 - _November 14, 2017_
+## v0.1.0 - _November 13, 2017_
 
     * Re-published TsLintConfig previously published under NPM package `tslint-config-0xproject`
     * Updated to TSLint v5.8.0, requiring several rule additions to keep our conventions aligned.
diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json
index 5cbda8c84..a5b34a35e 100644
--- a/packages/tslint-config/package.json
+++ b/packages/tslint-config/package.json
@@ -1,13 +1,13 @@
 {
     "name": "@0xproject/tslint-config",
-    "version": "0.4.16",
+    "version": "0.4.17",
     "description": "Lint rules related to 0xProject for TSLint",
     "main": "tslint.json",
     "scripts": {
         "build:watch": "tsc -w",
         "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts",
         "clean": "shx rm -rf lib scripts",
-        "lint": "tslint --project . 'rules/**/*.ts'",
+        "lint": "tslint --project .",
         "manual:postpublish": "yarn build; node ./scripts/postpublish.js"
     },
     "repository": {
@@ -31,7 +31,7 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/tslint-config/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.18",
+        "@0xproject/monorepo-scripts": "^0.1.19",
         "@types/lodash": "4.14.104",
         "copyfiles": "^1.2.0",
         "shx": "^0.2.2",