Merge branch 'development' into v2-prototype

3 files changed, 45 insertions, 19 deletions

diff --git a/packages/connect/CHANGELOG.json b/packages/connect/CHANGELOG.json
index 2f9a1d9d4..dd172e975 100644
--- a/packages/connect/CHANGELOG.json
+++ b/packages/connect/CHANGELOG.json
@@ -1,5 +1,23 @@
 [
     {
+        "timestamp": 1525477860,
+        "version": "0.6.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1525428773,
+        "version": "0.6.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "timestamp": 1524044013,
         "version": "0.6.10",
         "changes": [
diff --git a/packages/connect/CHANGELOG.md b/packages/connect/CHANGELOG.md
index 86b66f60c..4e118de38 100644
--- a/packages/connect/CHANGELOG.md
+++ b/packages/connect/CHANGELOG.md
@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.6.12 - _May 5, 2018_
+
+    * Dependencies updated
+
+## v0.6.11 - _May 4, 2018_
+
+    * Dependencies updated
+
 ## v0.6.10 - _April 18, 2018_
 
     * Dependencies updated
 
-## v0.6.9 - _April 12, 2018_
+## v0.6.9 - _April 11, 2018_
 
     * Dependencies updated
 
@@ -21,44 +29,44 @@ CHANGELOG
 
     * Dependencies updated
 
-## v0.6.4 - _March 18, 2018_
+## v0.6.4 - _March 17, 2018_
 
     * Consolidate `Order`, `SignedOrder`, and `ECSignature` into the `@0xproject/types` package (#456)
 
-## v0.6.2 - _February 16, 2018_
+## v0.6.2 - _February 15, 2018_
 
     * Fix JSON parse empty response (#407)
 
-## v0.6.0 - _February 16, 2018_
+## v0.6.0 - _February 15, 2018_
 
     * Add pagination options to HttpClient methods (#393)
     * Add heartbeat configuration to WebSocketOrderbookChannel constructor (#406)
 
-## v0.5.7 - _February 9, 2018_
+## v0.5.7 - _February 8, 2018_
 
     * Fix publishing issue where .npmignore was not properly excluding undesired content (#389)
 
-## v0.5.0 - _January 17, 2018_
+## v0.5.0 - _January 16, 2018_
 
     * Sanitize api endpoint url and remove trailing slashes (#318)
     * Improve error message text in HttpClient (#318)
     * Stop appending '/v0' to api endpoint url in HttpClient (#318)
 
-## v0.4.0 - _January 11, 2018_
+## v0.4.0 - _January 10, 2018_
 
     * Prevent getFeesAsync method on HttpClient from mutating input (#296)
 
-## v0.3.0 - _December 8, 2017_
+## v0.3.0 - _December 7, 2017_
 
     * Expose WebSocketOrderbookChannel and associated types to public interface (#251)
     * Remove tokenA and tokenB fields from OrdersRequest (#256)
 
-## v0.2.0 - _November 29, 2017_
+## v0.2.0 - _November 28, 2017_
 
     * Add SignedOrder and TokenTradeInfo to the public interface
     * Add ECSignature and Order to the public interface
     * Remove dependency on 0x.js
 
-## v0.1.0 - _November 22, 2017_
+## v0.1.0 - _November 21, 2017_
 
     * Provide a HttpClient class for interacting with standard relayer api compliant HTTP urls
diff --git a/packages/connect/package.json b/packages/connect/package.json
index 16e33efef..2930de98e 100644
--- a/packages/connect/package.json
+++ b/packages/connect/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/connect",
-    "version": "0.6.10",
+    "version": "0.6.12",
     "description": "A javascript library for interacting with the standard relayer api",
     "keywords": [
         "connect",
@@ -16,7 +16,7 @@
         "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
         "clean": "shx rm -rf lib test_temp scripts",
         "copy_test_fixtures": "copyfiles -u 2 './test/fixtures/**/*.json' ./lib/test/fixtures",
-        "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'",
+        "lint": "tslint --project .",
         "run_mocha": "mocha lib/test/**/*_test.js --exit",
         "test": "run-s clean build copy_test_fixtures run_mocha",
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
@@ -50,19 +50,19 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md",
     "dependencies": {
-        "@0xproject/assert": "^0.2.7",
-        "@0xproject/json-schemas": "^0.7.21",
-        "@0xproject/types": "^0.6.1",
-        "@0xproject/typescript-typings": "^0.2.0",
-        "@0xproject/utils": "^0.5.2",
+        "@0xproject/assert": "^0.2.9",
+        "@0xproject/json-schemas": "^0.7.23",
+        "@0xproject/types": "^0.6.3",
+        "@0xproject/typescript-typings": "^0.3.1",
+        "@0xproject/utils": "^0.6.1",
         "isomorphic-fetch": "^2.2.1",
         "lodash": "^4.17.4",
         "query-string": "^5.0.1",
         "websocket": "^1.0.25"
     },
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.18",
-        "@0xproject/tslint-config": "^0.4.16",
+        "@0xproject/monorepo-scripts": "^0.1.19",
+        "@0xproject/tslint-config": "^0.4.17",
         "@types/fetch-mock": "^5.12.1",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",