tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
This commit is contained in:
Thibaut Girka
2019-06-03 14:54:30 +02:00
parent 35c4ff07f4 f2f5c1bd6d
commit 76918554a6
18 changed files with 896 additions and 846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
package.json
View File

@@ -73,8 +73,8 @@
"@clusterws/cws": "^0.14.0",
"array-includes": "^3.0.3",
"atrament": "^0.2.3",
"autoprefixer": "^9.4.10",
"axios": "^0.18.0",
"autoprefixer": "^9.5.1",
"axios": "^0.19.0",
"babel-loader": "^8.0.5",
"babel-plugin-lodash": "^3.3.4",
"babel-plugin-preval": "^3.0.1",
@@ -88,18 +88,16 @@
"css-loader": "^2.1.1",
"cssnano": "^4.1.10",
"detect-passive-events": "^1.0.2",
"dotenv": "^6.2.0",
"dotenv": "^8.0.0",
"emoji-mart": "Gargron/emoji-mart#build",
"es6-symbol": "^3.1.1",
"escape-html": "^1.0.3",
"exif-js": "^2.3.0",
"express": "^4.17.1",
"favico.js": "^0.3.10",
"fibers": "^3.1.1",
"file-loader": "^3.0.1",
"font-awesome": "^4.7.0",
"glob": "^7.1.1",
"history": "^4.7.2",
"http-link-header": "^1.0.2",
"immutable": "^3.8.2",
"imports-loader": "^0.8.0",
@@ -117,15 +115,15 @@
"npmlog": "^4.1.2",
"object-assign": "^4.1.1",
"object-fit-images": "^3.2.3",
"object.values": "^1.0.4",
"offline-plugin": "^5.0.6",
"object.values": "^1.1.0",
"offline-plugin": "^5.0.7",
"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",
"rails-ujs": "^5.2.2",
"rails-ujs": "^5.2.3",
"react": "^16.7.0",
"react-dom": "^16.7.0",
"react-hotkeys": "^1.1.4",
@@ -140,7 +138,7 @@
"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-select": "^2.4.4",
"react-sparklines": "^1.7.0",
"react-swipeable-views": "^0.13.0",
"react-textarea-autosize": "^7.1.0",
@@ -153,7 +151,7 @@
"requestidlecallback": "^0.3.0",
"reselect": "^4.0.0",
"rimraf": "^2.6.3",
"sass": "^1.17.2",
"sass": "^1.20.1",
"sass-loader": "^7.0.3",
"stringz": "^1.0.0",
"substring-trie": "^1.0.2",
@@ -164,25 +162,25 @@
"webpack": "^4.29.6",
"webpack-assets-manifest": "^3.1.1",
"webpack-bundle-analyzer": "^3.1.0",
"webpack-cli": "^3.2.3",
"webpack-cli": "^3.3.2",
"webpack-merge": "^4.2.1",
"websocket.js": "^0.1.12"
},
"devDependencies": {
"babel-eslint": "^10.0.1",
"babel-jest": "^24.5.0",
"babel-jest": "^24.8.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-jsx-a11y": "~6.2.1",
"eslint-plugin-promise": "~4.1.1",
"eslint-plugin-react": "~7.12.1",
"jest": "^24.5.0",
"jest": "^24.8.0",
"raf": "^3.4.1",
"react-intl-translations-manager": "^5.0.3",
"react-test-renderer": "^16.7.0",
"webpack-dev-server": "^3.2.1",
"webpack-dev-server": "^3.5.1",
"yargs": "^12.0.5"
}
}