From b7aab955196a7cef2705e8546814b5c6c1830da7 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 26 Aug 2016 17:39:19 -0700
Subject: library - basic test server + partial safari fixes

---
 package.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 4c30db1a1..45ddc3dec 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "lint": "gulp lint",
     "dev": "gulp dev",
     "dist": "gulp dist",
-    "test": "npm run fastTest && npm run ci",
+    "test": "npm run fastTest && npm run ci && npm run lint",
     "fastTest": "mocha --require test/helper.js --compilers js:babel-register --recursive \"test/unit/**/*.js\"",
     "watch": "mocha watch --compilers js:babel-register --recursive \"test/unit/**/*.js\"",
     "ui": "node development/genStates.js && beefy ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
@@ -45,6 +45,7 @@
     "eth-store": "^1.1.0",
     "ethereumjs-tx": "^1.0.0",
     "ethereumjs-util": "^4.4.0",
+    "express": "^4.14.0",
     "gulp-eslint": "^2.0.0",
     "hat": "0.0.3",
     "identicon.js": "^1.2.1",
@@ -78,7 +79,7 @@
     "three.js": "^0.73.2",
     "through2": "^2.0.1",
     "vreme": "^3.0.2",
-    "web3": "^0.17.0-alpha",
+    "web3": "ethereum/web3.js#260ac6e78a8ce4b2e13f5bb0fdb65f4088585876",
     "web3-provider-engine": "^8.0.2",
     "web3-stream-provider": "^2.0.6",
     "xtend": "^4.0.1"
-- 
cgit