Bump oj from 3.7.8 to 3.7.9 (#10082)

[mastodon.git] / package.json

diff --git a/package.json b/package.json
index ee65dbea1e51eeb00d8a1429eec71180e1fcb028..5fa6fa8b7641700ae299f0b2ace36c3f4352dfad 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,134 +1,157 @@
 {
   "name": "mastodon",
 {
   "name": "mastodon",

-  "license": "AGPL-3.0",
+  "license": "AGPL-3.0-or-later",
+  "engines": {
+    "node": ">=8 <11"
+  },

   "scripts": {
     "postversion": "git push --tags",
   "scripts": {
     "postversion": "git push --tags",

-    "build:development": "NODE_ENV=development yarn webpack -- --config config/webpack/development.js",
-    "build:production": "NODE_ENV=production yarn webpack -- --config config/webpack/production.js",
+    "build:development": "cross-env RAILS_ENV=development NODE_ENV=development ./bin/webpack",
+    "build:production": "cross-env RAILS_ENV=production NODE_ENV=production ./bin/webpack",

     "manage:translations": "node ./config/webpack/translationRunner.js",
     "manage:translations": "node ./config/webpack/translationRunner.js",

-    "start": "rimraf ./tmp/streaming && babel ./streaming/index.js --out-dir ./tmp && node ./tmp/streaming/index.js",
-    "storybook": "NODE_ENV=test start-storybook -p 9001 -c storybook",
-    "test": "npm run test:lint && npm run test:mocha",
-    "test:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ spec/javascript/ storyboard/ streaming/",
-    "test:mocha": "NODE_ENV=test mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/*.test.js",
-    "postinstall": "npm rebuild node-sass"
+    "start": "node ./streaming/index.js",
+    "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": {
     "type": "git",
     "url": "https://github.com/tootsuite/mastodon.git"
   },
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/tootsuite/mastodon.git"
   },

+  "browserslist": [
+    "last 2 versions",
+    "IE >= 11",
+    "iOS >= 9",
+    "not dead"
+  ],

   "private": true,
   "dependencies": {
   "private": true,
   "dependencies": {

+    "@babel/core": "^7.2.2",
+    "@babel/plugin-proposal-class-properties": "^7.2.3",
+    "@babel/plugin-proposal-decorators": "^7.2.3",
+    "@babel/plugin-proposal-object-rest-spread": "^7.2.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
+    "@babel/plugin-transform-react-inline-elements": "^7.2.0",
+    "@babel/plugin-transform-react-jsx-self": "^7.2.0",
+    "@babel/plugin-transform-react-jsx-source": "^7.2.0",
+    "@babel/plugin-transform-runtime": "^7.2.0",
+    "@babel/preset-env": "^7.2.3",
+    "@babel/preset-react": "^7.0.0",
+    "@babel/runtime": "^7.2.0",
+    "@gfx/zopfli": "^1.0.10",

     "array-includes": "^3.0.3",
     "array-includes": "^3.0.3",

-    "autoprefixer": "^7.1.0",
-    "axios": "^0.16.1",
-    "babel-cli": "^6.24.1",
-    "babel-core": "^6.24.1",
-    "babel-loader": "7.x",
-    "babel-plugin-lodash": "^3.2.11",
-    "babel-plugin-react-intl": "^2.3.1",
-    "babel-plugin-react-transform": "^2.0.2",
-    "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
-    "babel-plugin-transform-object-rest-spread": "^6.23.0",
-    "babel-plugin-transform-react-jsx-self": "^6.22.0",
-    "babel-plugin-transform-react-jsx-source": "^6.22.0",
-    "babel-plugin-transform-react-remove-prop-types": "^0.4.5",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-env": "^1.4.0",
-    "babel-preset-react": "^6.24.1",
+    "autoprefixer": "^9.4.3",
+    "axios": "^0.18.0",
+    "babel-core": "^7.0.0-bridge.0",
+    "babel-loader": "^8.0.4",
+    "babel-plugin-lodash": "^3.3.4",
+    "babel-plugin-preval": "^3.0.1",
+    "babel-plugin-react-intl": "^3.0.1",
+    "babel-plugin-transform-react-remove-prop-types": "^0.4.21",
+    "babel-runtime": "^6.26.0",

     "classnames": "^2.2.5",
     "classnames": "^2.2.5",

-    "coffee-loader": "^0.7.3",
-    "coffee-script": "^1.12.6",
-    "compression-webpack-plugin": "^0.4.0",
-    "css-loader": "^0.28.1",
-    "dotenv": "^4.0.0",
-    "emojione": "^2.2.7",
-    "emojione-picker": "^2.2.1",
+    "compression-webpack-plugin": "^2.0.0",
+    "cross-env": "^5.1.4",
+    "css-loader": "^2.1.0",
+    "cssnano": "^4.1.8",
+    "detect-passive-events": "^1.0.2",
+    "dotenv": "^6.2.0",
+    "emoji-mart": "Gargron/emoji-mart#build",

     "es6-symbol": "^3.1.1",
     "escape-html": "^1.0.3",
     "es6-symbol": "^3.1.1",
     "escape-html": "^1.0.3",

-    "express": "^4.15.2",
-    "extract-text-webpack-plugin": "^2.1.0",
-    "file-loader": "^0.11.1",
+    "exif-js": "^2.3.0",
+    "express": "^4.16.4",
+    "fibers": "^3.1.1",
+    "file-loader": "^3.0.1",

     "font-awesome": "^4.7.0",
     "glob": "^7.1.1",
     "font-awesome": "^4.7.0",
     "glob": "^7.1.1",

-    "history": "^3.3.0",
-    "http-link-header": "^0.8.0",
-    "immutable": "^3.8.1",
-    "intersection-observer": "^0.2.1",
+    "history": "^4.7.2",
+    "http-link-header": "^1.0.2",
+    "immutable": "^3.8.2",
+    "imports-loader": "^0.8.0",
+    "intersection-observer": "^0.5.1",

     "intl": "^1.2.5",
     "intl": "^1.2.5",

-    "intl-relativeformat": "^1.3.0",
+    "intl-messageformat": "^2.2.0",
+    "intl-relativeformat": "^2.1.0",

     "is-nan": "^1.2.1",
     "is-nan": "^1.2.1",

-    "js-yaml": "^3.8.4",
-    "lodash": "^4.17.4",
+    "js-yaml": "^3.11.0",
+    "lodash": "^4.7.11",

     "mark-loader": "^0.1.6",
     "mark-loader": "^0.1.6",

-    "marky": "^1.2.0",
+    "marky": "^1.2.1",
+    "mini-css-extract-plugin": "^0.5.0",

     "mkdirp": "^0.5.1",
     "mkdirp": "^0.5.1",

-    "node-sass": "^4.5.2",
-    "npmlog": "^4.1.0",
+    "npmlog": "^4.1.2",

     "object-assign": "^4.1.1",
     "object-assign": "^4.1.1",

-    "path-complete-extname": "^0.1.0",
-    "pg": "^6.1.5",
-    "postcss-loader": "^2.0.5",
-    "postcss-smart-import": "^0.7.0",
-    "precss": "^1.4.0",
+    "object-fit-images": "^3.2.3",
+    "object.values": "^1.0.4",
+    "offline-plugin": "^5.0.6",
+    "path-complete-extname": "^1.0.0",
+    "pg": "^6.4.0",
+    "postcss-loader": "^3.0.0",
+    "postcss-object-fit-images": "^1.1.2",

     "prop-types": "^15.5.10",
     "punycode": "^2.1.0",
     "prop-types": "^15.5.10",
     "punycode": "^2.1.0",

-    "rails-erb-loader": "^5.0.0",
-    "rails-ujs": "^5.1.1",
-    "react": "^15.5.4",
-    "react-addons-perf": "^15.4.2",
-    "react-addons-shallow-compare": "^15.5.2",
-    "react-dom": "^15.5.4",
+    "rails-ujs": "^5.2.2",
+    "react": "^16.7.0",
+    "react-dom": "^16.7.0",
+    "react-hotkeys": "^1.1.4",

     "react-immutable-proptypes": "^2.1.0",
     "react-immutable-proptypes": "^2.1.0",

-    "react-immutable-pure-component": "^0.0.4",
-    "react-intl": "^2.3.0",
-    "react-motion": "^0.5.0",
-    "react-notification": "^6.7.0",
-    "react-redux": "^5.0.4",
-    "react-redux-loading-bar": "^2.9.0",
-    "react-router": "^3.0.5",
-    "react-router-scroll": "^0.4.2",
-    "react-simple-dropdown": "^3.0.0",
-    "react-textarea-autosize": "^5.0.6",
+    "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.0.8",
+    "react-router-dom": "^4.1.1",
+    "react-router-scroll-4": "^1.0.0-beta.1",
+    "react-select": "^2.2.0",
+    "react-sparklines": "^1.7.0",
+    "react-swipeable-views": "^0.13.0",
+    "react-textarea-autosize": "^7.1.0",

     "react-toggle": "^4.0.1",
     "redis": "^2.7.1",
     "react-toggle": "^4.0.1",
     "redis": "^2.7.1",

-    "redux": "^3.6.0",
+    "redux": "^4.0.1",

     "redux-immutable": "^4.0.0",
     "redux-thunk": "^2.2.0",
     "redux-immutable": "^4.0.0",
     "redux-thunk": "^2.2.0",

+    "rellax": "^1.7.1",

     "requestidlecallback": "^0.3.0",
     "requestidlecallback": "^0.3.0",

-    "reselect": "^3.0.1",
+    "reselect": "^4.0.0",

     "rimraf": "^2.6.1",
     "rimraf": "^2.6.1",

-    "sass-loader": "^6.0.5",
-    "stringz": "^0.2.0",
-    "style-loader": "^0.16.1",
+    "sass": "^1.15.2",
+    "sass-loader": "^7.0.3",
+    "stringz": "^1.0.0",
+    "style-loader": "0.23.1",
+    "substring-trie": "^1.0.2",

     "throng": "^4.0.0",
     "tiny-queue": "^0.2.1",
     "throng": "^4.0.0",
     "tiny-queue": "^0.2.1",

-    "uuid": "^3.0.1",
-    "uws": "^0.14.5",
-    "webpack": "^2.5.1",
-    "webpack-bundle-analyzer": "^2.8.2",
-    "webpack-manifest-plugin": "^1.1.0",
-    "webpack-merge": "^4.1.0",
-    "websocket.js": "^0.1.7"
+    "uglifyjs-webpack-plugin": "^2.1.1",
+    "uuid": "^3.1.0",
+    "uws": "10.148.0",
+    "webpack": "^4.28.3",
+    "webpack-assets-manifest": "^3.1.1",
+    "webpack-bundle-analyzer": "^3.0.3",
+    "webpack-cli": "^3.1.2",
+    "webpack-merge": "^4.1.5",
+    "websocket.js": "^0.1.12"

   },
   "devDependencies": {
   },
   "devDependencies": {

-    "@kadira/storybook": "^2.35.3",
-    "babel-eslint": "^7.2.3",
-    "chai": "^4.0.1",
-    "chai-enzyme": "^0.7.1",
-    "enzyme": "^2.8.2",
-    "eslint": "^3.19.0",
-    "eslint-plugin-jsx-a11y": "^4.0.0",
-    "eslint-plugin-react": "^6.10.3",
-    "jsdom": "^10.1.0",
-    "minimist": "^1.2.0",
-    "mocha": "^3.4.1",
-    "react-intl-translations-manager": "^5.0.0",
-    "react-test-renderer": "^15.5.4",
-    "sinon": "^2.3.2",
-    "webpack-dev-server": "^2.4.5"
+    "babel-eslint": "^10.0.1",
+    "babel-jest": "^23.6.0",
+    "enzyme": "^3.8.0",
+    "enzyme-adapter-react-16": "^1.7.1",
+    "eslint": "^5.11.1",
+    "eslint-plugin-import": "~2.14.0",
+    "eslint-plugin-jsx-a11y": "~6.1.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",
+    "react-test-renderer": "^16.7.0",
+    "webpack-dev-server": "^3.1.14",
+    "yargs": "^8.0.2"

   },
   "optionalDependencies": {
     "fsevents": "*"
   },
   "optionalDependencies": {
     "fsevents": "*"