Bump oj from 3.7.8 to 3.7.9 (#10082)

[mastodon.git] / package.json

diff --git a/package.json b/package.json
index 7e7d097f6b66e6ba5aed9fc35e028051d00df6cd..5fa6fa8b7641700ae299f0b2ace36c3f4352dfad 100644 (file)
--- a/package.json
+++ b/package.json
@@ -10,8 +10,8 @@
     "build:production": "cross-env RAILS_ENV=production NODE_ENV=production ./bin/webpack",
     "manage:translations": "node ./config/webpack/translationRunner.js",
     "start": "node ./streaming/index.js",
-    "test": "npm run test:lint && npm run test:jest",
-    "test:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ streaming/",
+    "test": "${npm_execpath} run test:lint && ${npm_execpath} run test:jest",
+    "test:lint": "eslint --ext=js .",
     "test:jest": "cross-env NODE_ENV=test jest --coverage"
   },
   "repository": {
@@ -21,7 +21,8 @@
   "browserslist": [
     "last 2 versions",
     "IE >= 11",
-    "iOS >= 9"
+    "iOS >= 9",
+    "not dead"
   ],
   "private": true,
   "dependencies": {
@@ -97,11 +98,12 @@
     "react-immutable-proptypes": "^2.1.0",
     "react-immutable-pure-component": "^1.1.1",
     "react-intl": "^2.7.2",
+    "react-masonry-infinite": "^1.2.2",
     "react-motion": "^0.5.2",
     "react-notification": "^6.8.4",
     "react-overlays": "^0.8.3",
     "react-redux": "^6.0.0",
-    "react-redux-loading-bar": "^4.1.0",
+    "react-redux-loading-bar": "^4.0.8",
     "react-router-dom": "^4.1.1",
     "react-router-scroll-4": "^1.0.0-beta.1",
     "react-select": "^2.2.0",
@@ -139,11 +141,11 @@
     "babel-jest": "^23.6.0",
     "enzyme": "^3.8.0",
     "enzyme-adapter-react-16": "^1.7.1",
-    "eslint": "^4.19.1",
-    "eslint-plugin-import": "~2.8.0",
+    "eslint": "^5.11.1",
+    "eslint-plugin-import": "~2.14.0",
     "eslint-plugin-jsx-a11y": "~6.1.2",
-    "eslint-plugin-promise": "~3.8.0",
-    "eslint-plugin-react": "~7.8.2",
+    "eslint-plugin-promise": "~4.0.1",
+    "eslint-plugin-react": "~7.12.1",
     "jest": "^23.6.0",
     "raf": "^3.4.1",
     "react-intl-translations-manager": "^5.0.3",