Merge branch 'master' into multiple-connections

bugthesystem · Mar 19, 2017 · 725c6f8 · 725c6f8
2 parents 44638f8 + 4662b05
commit 725c6f8
Show file tree

Hide file tree

Showing 6 changed files with 676 additions and 700 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,61 @@
-index.rendered.html
-node_modules/
+# Logs
+logs
 *.log
-coverage/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Typescript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+
+# Visual Studio Code
+.vscode
diff --git a/.npmignore b/.npmignore
@@ -1,4 +1,10 @@
-docs/
-examples/
-.vscode/
-__tests__/
+/__tests__
+/coverage
+/docs
+/examples
+/.vscode
+/.eslintignore
+/.eslintrc.yml
+/.gitignore
+/.npmignore
+/.travis.yml
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/package.json b/package.json
@@ -28,21 +28,21 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "pidusage": "^1.1.0",
-    "socket.io": "^1.7.2"
+    "pidusage": "^1.1.1",
+    "socket.io": "^1.7.3"
   },
   "devDependencies": {
-    "coveralls": "^2.11.15",
-    "eslint": "^3.13.0",
-    "eslint-config-airbnb-base": "^11.0.0",
+    "coveralls": "^2.12.0",
+    "eslint": "^3.18.0",
+    "eslint-config-airbnb-base": "^11.1.1",
     "eslint-formatter-pretty": "^1.1.0",
     "eslint-plugin-import": "^2.2.0",
-    "husky": "^0.12.0",
-    "jest": "^18.1.0"
+    "husky": "^0.13.2",
+    "jest": "^19.0.2"
   },
   "jest": {
     "bail": true,
-    "collectCoverage": "true",
+    "collectCoverage": true,
     "coverageDirectory": "coverage",
     "testEnvironment": "node"
   }

diff --git a/src/public/index.html b/src/public/index.html
@@ -3,7 +3,7 @@
 <head>
   <title>{{title}}</title>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.4.0/Chart.bundle.min.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.7.2/socket.io.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.7.3/socket.io.min.js"></script>
   <style>
     {{style}}
   </style>