Merge branch 'update-20191111'

.travis.yml

@@ -3,7 +3,7 @@ language: node_js
 services:
   - docker
 node_js:
-  - "10.16.3"
+  - "12.13.0"
 cache:
   directories:
     - node_modules

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:10.16.3
+FROM node:12.13.0
 
 ARG http_proxy
 ARG https_proxy

README.md

@@ -25,7 +25,7 @@ Cattaz is a realtime collaborative tool which can run custom applications in a W
 
 ### Local
 
-Install [Node 10](https://nodejs.org/en/download/) and [yarn](https://yarnpkg.com/en/docs/install).
+Install [Node 12](https://nodejs.org/en/download/) and [yarn](https://yarnpkg.com/en/docs/install).
 
 ```bash
 yarn install

package.json

@@ -6,30 +6,30 @@
   "dependencies": {
     "actual": "^0.4.0",
     "body-parser": "^1.19.0",
-    "codemirror": "^5.48.4",
+    "codemirror": "^5.49.2",
     "color-convert": "^2.0.1",
-    "core-js": "^3.2.1",
+    "core-js": "^3.4.0",
     "diff": "^4.0.1",
     "express": "^4.17.1",
     "github-markdown-css": "^3.0.1",
-    "hast-to-hyperscript": "^7.0.2",
-    "history": "^4.9.0",
+    "hast-to-hyperscript": "^7.0.3",
+    "history": "^4.10.1",
     "js-yaml": "^3.13.1",
     "lodash": "^4.17.15",
-    "mdast-util-to-hast": "^6.0.1",
+    "mdast-util-to-hast": "^7.0.0",
     "prop-types": "^15.7.2",
-    "react": "^16.9.0",
+    "react": "^16.11.0",
     "react-codemirror2": "^6.0.0",
-    "react-dnd": "^9.3.4",
-    "react-dnd-html5-backend": "^9.3.4",
-    "react-dom": "^16.9.0",
-    "react-hot-loader": "^4.12.11",
-    "react-modal": "^3.10.1",
-    "react-router-dom": "^5.0.1",
+    "react-dnd": "^9.4.0",
+    "react-dnd-html5-backend": "^9.4.0",
+    "react-dom": "^16.11.0",
+    "react-hot-loader": "^4.12.16",
+    "react-modal": "^3.11.1",
+    "react-router-dom": "^5.1.2",
     "react-split-pane": "^0.1.87",
     "react-timeago": "^4.4.0",
     "regenerator-runtime": "^0.13.3",
-    "remark": "^11.0.1",
+    "remark": "^11.0.2",
     "socket.io": "1.3.7",
     "socket.io-client": "1.3.7",
     "whatwg-fetch": "^3.0.0",
@@ -41,50 +41,50 @@
     "yjs": "^12.3.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.5.5",
-    "@babel/node": "^7.5.5",
-    "@babel/preset-env": "^7.5.5",
-    "@babel/preset-react": "^7.0.0",
-    "@babel/register": "^7.5.5",
-    "@storybook/addon-links": "^5.1.11",
-    "@storybook/react": "^5.1.11",
-    "ava": "^2.3.0",
+    "@babel/core": "^7.7.2",
+    "@babel/node": "^7.7.0",
+    "@babel/preset-env": "^7.7.1",
+    "@babel/preset-react": "^7.7.0",
+    "@babel/register": "^7.7.0",
+    "@storybook/addon-links": "^5.2.6",
+    "@storybook/react": "^5.2.6",
+    "ava": "^2.4.0",
     "babel-loader": "^8.0.6",
     "babel-plugin-istanbul": "^5.2.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-    "codecov": "^3.5.0",
-    "copy-webpack-plugin": "^5.0.4",
-    "coveralls": "^3.0.6",
-    "cross-env": "^5.2.0",
+    "codecov": "^3.6.1",
+    "copy-webpack-plugin": "^5.0.5",
+    "coveralls": "^3.0.7",
+    "cross-env": "^6.0.3",
     "enzyme": "^3.10.0",
-    "enzyme-adapter-react-16": "^1.14.0",
+    "enzyme-adapter-react-16": "^1.15.1",
     "esdoc": "^1.1.0",
     "esdoc-jsx-plugin": "^1.0.0",
     "esdoc-standard-plugin": "^1.0.0",
-    "eslint": "^6.2.1",
+    "eslint": "^6.6.0",
     "eslint-config-airbnb": "^18.0.1",
-    "eslint-loader": "^2.2.1",
-    "eslint-plugin-ava": "^8.0.0",
+    "eslint-loader": "^3.0.2",
+    "eslint-plugin-ava": "^9.0.0",
     "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-react": "^7.14.3",
-    "eslint-plugin-react-hooks": "^2.0.1",
+    "eslint-plugin-react": "^7.16.0",
+    "eslint-plugin-react-hooks": "^2.2.0",
     "esm": "^3.2.25",
     "file-loader": "^4.2.0",
     "json-loader": "^0.5.7",
-    "markdownlint-cli": "^0.18.0",
-    "nodemon": "^1.19.1",
+    "markdownlint-cli": "^0.19.0",
+    "nodemon": "^1.19.4",
     "npm-run-all": "^4.1.5",
     "nyc": "^14.1.1",
-    "postcss": "^7.0.17",
+    "postcss": "^7.0.21",
     "postcss-loader": "^3.0.0",
-    "react-test-renderer": "^16.9.0",
+    "react-test-renderer": "^16.11.0",
     "rimraf": "^3.0.0",
-    "sinon": "^7.4.1",
-    "source-map-explorer": "^2.0.1",
-    "webpack": "^4.39.2",
-    "webpack-cli": "^3.3.7",
-    "webpack-dev-middleware": "^3.7.0",
+    "sinon": "^7.5.0",
+    "source-map-explorer": "^2.1.0",
+    "webpack": "^4.41.2",
+    "webpack-cli": "^3.3.10",
+    "webpack-dev-middleware": "^3.7.2",
     "webpack-hot-middleware": "^2.25.0"
   },
   "scripts": {

src/apps/VoteApplication.jsx

@@ -92,10 +92,7 @@ export default class VoteApplication extends React.Component {
         <ul>
           {Object.keys(model.candidates).map((s) => (
             <li key={s}>
-              {s}
-              {': '}
-              {model.candidates[s]}
-              {' '}
+              {`${s}: ${model.candidates[s]} `}
               <input data-index={s} type="button" value="Vote" onClick={this.handleAddVote} />
             </li>
           ))}

src/apps/VoteCryptoApplication.jsx

@@ -116,10 +116,7 @@ export default class VoteCryptoApplication extends React.Component {
     if (model.opened) {
       votingResult = Object.keys(model.candidates).map((s) => (
         <li key={s}>
-          {s}
-          {': '}
-          {model.candidates[s]}
-          {' '}
+          {`${s}: ${model.candidates[s]} `}
           <input data-index={s} type="button" value="Vote" onClick={this.handleAddVote} />
         </li>
       ));