Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `README.md`
- `package.json`
This commit is contained in:
Thibaut Girka
2019-12-28 17:48:40 +01:00
8 changed files with 253 additions and 261 deletions

View File

@ -12,7 +12,7 @@
"start": "node ./streaming/index.js",
"test": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:jest",
"test:lint": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:lint:sass",
"test:lint:js": "eslint --ext=js .",
"test:lint:js": "eslint --ext=js . --cache",
"test:lint:sass": "sass-lint -v",
"test:jest": "cross-env NODE_ENV=test jest --coverage"
},
@ -65,12 +65,12 @@
"@babel/plugin-proposal-decorators": "^7.7.4",
"@babel/plugin-transform-react-inline-elements": "^7.7.4",
"@babel/plugin-transform-runtime": "^7.7.6",
"@babel/preset-env": "^7.7.6",
"@babel/preset-env": "^7.7.7",
"@babel/preset-react": "^7.7.4",
"@babel/runtime": "^7.7.6",
"@babel/runtime": "^7.7.7",
"@gamestdio/websocket": "^0.3.2",
"@clusterws/cws": "^0.16.0",
"array-includes": "^3.1.0",
"array-includes": "^3.1.1",
"atrament": "^0.2.3",
"arrow-key-navigation": "^1.1.0",
"autoprefixer": "^9.7.3",
@ -86,7 +86,7 @@
"compression-webpack-plugin": "^3.0.1",
"copy-webpack-plugin": "^5.1.1",
"cross-env": "^6.0.3",
"css-loader": "^3.3.2",
"css-loader": "^3.4.0",
"cssnano": "^4.1.10",
"detect-passive-events": "^1.0.2",
"dotenv": "^8.2.0",
@ -112,12 +112,12 @@
"lodash": "^4.17.14",
"mark-loader": "^0.1.6",
"marky": "^1.2.1",
"mini-css-extract-plugin": "^0.8.0",
"mini-css-extract-plugin": "^0.9.0",
"mkdirp": "^0.5.1",
"npmlog": "^4.1.2",
"object-assign": "^4.1.1",
"object-fit-images": "^3.2.3",
"object.values": "^1.1.0",
"object.values": "^1.1.1",
"offline-plugin": "^5.0.7",
"path-complete-extname": "^1.0.0",
"pg": "^6.4.0",
@ -153,7 +153,7 @@
"requestidlecallback": "^0.3.0",
"reselect": "^4.0.0",
"rimraf": "^3.0.0",
"sass": "^1.23.3",
"sass": "^1.24.0",
"sass-loader": "^8.0.0",
"stringz": "^2.0.0",
"substring-trie": "^1.0.2",
@ -173,7 +173,7 @@
"devDependencies": {
"babel-eslint": "^10.0.3",
"babel-jest": "^24.9.0",
"enzyme": "^3.10.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.1",
"eslint": "^6.7.2",
"eslint-plugin-import": "~2.19.1",