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

This commit is contained in:
Thibaut Girka
2020-01-07 16:28:59 +01:00
7 changed files with 113 additions and 95 deletions
+7 -7
View File
@@ -69,7 +69,7 @@
"@babel/preset-react": "^7.7.4",
"@babel/runtime": "^7.7.7",
"@gamestdio/websocket": "^0.3.2",
"@clusterws/cws": "^0.16.1",
"@clusterws/cws": "^0.17.3",
"array-includes": "^3.1.1",
"atrament": "^0.2.3",
"arrow-key-navigation": "^1.1.0",
@@ -86,7 +86,7 @@
"compression-webpack-plugin": "^3.0.1",
"copy-webpack-plugin": "^5.1.1",
"cross-env": "^6.0.3",
"css-loader": "^3.4.0",
"css-loader": "^3.4.1",
"cssnano": "^4.1.10",
"detect-passive-events": "^1.0.2",
"dotenv": "^8.2.0",
@@ -153,7 +153,7 @@
"requestidlecallback": "^0.3.0",
"reselect": "^4.0.0",
"rimraf": "^3.0.0",
"sass": "^1.24.0",
"sass": "^1.24.2",
"sass-loader": "^8.0.0",
"stringz": "^2.0.0",
"substring-trie": "^1.0.2",
@@ -162,7 +162,7 @@
"throng": "^4.0.0",
"tiny-queue": "^0.2.1",
"uuid": "^3.3.3",
"wavesurfer.js": "^3.2.0",
"wavesurfer.js": "^3.3.0",
"webpack": "^4.41.5",
"webpack-assets-manifest": "^3.1.1",
"webpack-bundle-analyzer": "^3.6.0",
@@ -174,7 +174,7 @@
"babel-eslint": "^10.0.3",
"babel-jest": "^24.9.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.1",
"enzyme-adapter-react-16": "^1.15.2",
"eslint": "^6.8.0",
"eslint-plugin-import": "~2.19.1",
"eslint-plugin-jsx-a11y": "~6.2.3",
@@ -185,7 +185,7 @@
"react-intl-translations-manager": "^5.0.3",
"react-test-renderer": "^16.12.0",
"sass-lint": "^1.13.1",
"webpack-dev-server": "^3.9.0",
"yargs": "^15.0.2"
"webpack-dev-server": "^3.10.1",
"yargs": "^15.1.0"
}
}