Merge branch 'master' into glitch-soc/merge-upstream
This commit is contained in:
+12
-10
@@ -63,18 +63,18 @@
|
||||
"@babel/core": "^7.8.3",
|
||||
"@babel/plugin-proposal-class-properties": "^7.8.3",
|
||||
"@babel/plugin-proposal-decorators": "^7.8.3",
|
||||
"@babel/plugin-transform-react-inline-elements": "^7.8.0",
|
||||
"@babel/plugin-transform-runtime": "^7.7.6",
|
||||
"@babel/plugin-transform-react-inline-elements": "^7.8.3",
|
||||
"@babel/plugin-transform-runtime": "^7.8.3",
|
||||
"@babel/preset-env": "^7.8.3",
|
||||
"@babel/preset-react": "^7.8.3",
|
||||
"@babel/runtime": "^7.8.3",
|
||||
"@gamestdio/websocket": "^0.3.2",
|
||||
"@clusterws/cws": "^0.17.3",
|
||||
"@gamestdio/websocket": "^0.3.2",
|
||||
"array-includes": "^3.1.1",
|
||||
"atrament": "^0.2.3",
|
||||
"arrow-key-navigation": "^1.1.0",
|
||||
"autoprefixer": "^9.7.4",
|
||||
"axios": "^0.19.1",
|
||||
"axios": "^0.19.2",
|
||||
"babel-loader": "^8.0.6",
|
||||
"babel-plugin-lodash": "^3.3.4",
|
||||
"babel-plugin-preval": "^4.0.0",
|
||||
@@ -123,6 +123,7 @@
|
||||
"pg": "^6.4.0",
|
||||
"postcss-loader": "^3.0.0",
|
||||
"postcss-object-fit-images": "^1.1.2",
|
||||
"promise.prototype.finally": "^3.1.2",
|
||||
"prop-types": "^15.5.10",
|
||||
"punycode": "^2.1.0",
|
||||
"rails-ujs": "^5.2.4",
|
||||
@@ -142,7 +143,7 @@
|
||||
"react-router-scroll-4": "^1.0.0-beta.1",
|
||||
"react-select": "^3.0.8",
|
||||
"react-sparklines": "^1.7.0",
|
||||
"react-swipeable-views": "^0.13.4",
|
||||
"react-swipeable-views": "^0.13.9",
|
||||
"react-textarea-autosize": "^7.1.2",
|
||||
"react-toggle": "^4.1.1",
|
||||
"redis": "^2.7.1",
|
||||
@@ -152,16 +153,17 @@
|
||||
"rellax": "^1.10.0",
|
||||
"requestidlecallback": "^0.3.0",
|
||||
"reselect": "^4.0.0",
|
||||
"rimraf": "^3.0.0",
|
||||
"sass": "^1.24.2",
|
||||
"rimraf": "^3.0.2",
|
||||
"sass": "^1.25.0",
|
||||
"sass-loader": "^8.0.2",
|
||||
"stacktrace-js": "^2.0.2",
|
||||
"stringz": "^2.0.0",
|
||||
"substring-trie": "^1.0.2",
|
||||
"terser-webpack-plugin": "^2.3.2",
|
||||
"terser-webpack-plugin": "^2.3.5",
|
||||
"tesseract.js": "^2.0.0-alpha.16",
|
||||
"throng": "^4.0.0",
|
||||
"tiny-queue": "^0.2.1",
|
||||
"uuid": "^3.3.3",
|
||||
"uuid": "^3.4.0",
|
||||
"wavesurfer.js": "^3.3.1",
|
||||
"webpack": "^4.41.5",
|
||||
"webpack-assets-manifest": "^3.1.1",
|
||||
@@ -176,7 +178,7 @@
|
||||
"enzyme": "^3.11.0",
|
||||
"enzyme-adapter-react-16": "^1.15.2",
|
||||
"eslint": "^6.8.0",
|
||||
"eslint-plugin-import": "~2.20.0",
|
||||
"eslint-plugin-import": "~2.20.1",
|
||||
"eslint-plugin-jsx-a11y": "~6.2.3",
|
||||
"eslint-plugin-promise": "~4.2.1",
|
||||
"eslint-plugin-react": "~7.17.0",
|
||||
|
||||
Reference in New Issue
Block a user