Merge branch 'update-electron' into dev

Close #116

circle.yml

@@ -5,7 +5,7 @@ machine:
     - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 20
     - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 20
   node:
-    version: 5.1.0
+    version: 5.10.0
   services:
     - docker
 
@@ -14,8 +14,6 @@ dependencies:
     - "~/.electron"
     - "src/node_modules"
     - "~/docker_cache"
-  pre:
-    - npm install -g npm@3.3.12
   post:
     - ./docker/circle_docker_build.sh
     - mkdir -p ~/.electron

docker/Dockerfile

@@ -1,7 +1,7 @@
 FROM suchja/wine:latest
 MAINTAINER Yuya Ochiai <yuya0321@gmail.com>
 
-ENV NODE_VERSION=v5.1.0
+ENV NODE_VERSION=v5.10.0
 ENV PATH=$HOME/.nodebrew/current/bin:$PATH
 
 USER root

package.json

@@ -33,7 +33,7 @@
     "electron-builder": "^3.11.0",
     "electron-connect": "^0.3.7",
     "electron-packager": "^5.1.0",
-    "electron-prebuilt": "0.37.3",
+    "electron-prebuilt": "0.37.7",
     "esformatter": "^0.9.3",
     "esformatter-jsx": "^5.0.0",
     "gulp": "^3.9.0",