mastodon: 3.3.0 -> 3.4.0

./update.sh --ver v3.4.0 --patches ./resolutions.patch

pkgs/servers/mastodon/package.json

@@ -1,9 +1,9 @@
 {
-  "version": "3.3.0",
+  "version": "3.4.0",
   "name": "@tootsuite/mastodon",
   "license": "AGPL-3.0-or-later",
   "engines": {
-    "node": ">=10.13"
+    "node": ">=12"
   },
   "scripts": {
     "postversion": "git push --tags",
@@ -23,7 +23,7 @@
   },
   "browserslist": [
     "last 2 versions",
-    "IE >= 11",
+    "not IE 11",
     "iOS >= 9",
     "not dead"
   ],
@@ -60,37 +60,35 @@
   },
   "private": true,
   "dependencies": {
-    "@babel/core": "^7.12.7",
+    "@babel/core": "^7.14.0",
-    "@babel/plugin-proposal-class-properties": "^7.8.3",
+    "@babel/plugin-proposal-decorators": "^7.13.15",
-    "@babel/plugin-proposal-decorators": "^7.12.1",
+    "@babel/plugin-transform-react-inline-elements": "^7.12.13",
-    "@babel/plugin-transform-react-inline-elements": "^7.12.1",
+    "@babel/plugin-transform-runtime": "^7.13.15",
-    "@babel/plugin-transform-runtime": "^7.12.1",
+    "@babel/preset-env": "^7.14.1",
-    "@babel/preset-env": "^7.12.7",
+    "@babel/preset-react": "^7.13.13",
-    "@babel/preset-react": "^7.12.7",
+    "@babel/runtime": "^7.14.0",
-    "@babel/runtime": "^7.12.5",
-    "@clusterws/cws": "^3.0.0",
     "@gamestdio/websocket": "^0.3.2",
     "@github/webauthn-json": "^0.5.7",
-    "@rails/ujs": "^6.0.3",
+    "@rails/ujs": "^6.1.3",
-    "array-includes": "^3.1.1",
+    "array-includes": "^3.1.3",
     "arrow-key-navigation": "^1.2.0",
     "autoprefixer": "^9.8.6",
-    "axios": "^0.21.0",
+    "axios": "^0.21.1",
-    "babel-loader": "^8.2.1",
+    "babel-loader": "^8.2.2",
     "babel-plugin-lodash": "^3.3.4",
     "babel-plugin-preval": "^5.0.0",
     "babel-plugin-react-intl": "^6.2.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "babel-runtime": "^6.26.0",
     "blurhash": "^1.1.3",
-    "classnames": "^2.2.5",
+    "classnames": "^2.3.1",
-    "color-blend": "^3.0.0",
+    "color-blend": "^3.0.1",
     "compression-webpack-plugin": "^6.1.1",
-    "cross-env": "^7.0.2",
+    "cross-env": "^7.0.3",
-    "css-loader": "^5.0.1",
+    "css-loader": "^5.2.4",
-    "cssnano": "^4.1.10",
+    "cssnano": "^4.1.11",
-    "detect-passive-events": "^2.0.1",
+    "detect-passive-events": "^2.0.3",
-    "dotenv": "^8.2.0",
+    "dotenv": "^9.0.1",
     "emoji-mart": "Gargron/emoji-mart#build",
     "es6-symbol": "^3.1.3",
     "escape-html": "^1.0.3",
@@ -98,29 +96,29 @@
     "express": "^4.17.1",
     "file-loader": "^6.2.0",
     "font-awesome": "^4.7.0",
-    "glob": "^7.1.6",
+    "glob": "^7.1.7",
     "history": "^4.10.1",
     "http-link-header": "^1.0.3",
     "immutable": "^3.8.2",
     "imports-loader": "^1.2.0",
-    "intersection-observer": "^0.11.0",
+    "intersection-observer": "^0.12.0",
     "intl": "^1.2.5",
     "intl-messageformat": "^2.2.0",
     "intl-relativeformat": "^6.4.3",
-    "is-nan": "^1.3.0",
+    "is-nan": "^1.3.2",
-    "js-yaml": "^3.13.1",
+    "js-yaml": "^4.1.0",
-    "lodash": "^4.17.19",
+    "lodash": "^4.17.21",
     "mark-loader": "^0.1.6",
-    "marky": "^1.2.1",
+    "marky": "^1.2.2",
-    "mini-css-extract-plugin": "^1.3.1",
+    "mini-css-extract-plugin": "^1.6.0",
     "mkdirp": "^1.0.4",
     "npmlog": "^4.1.2",
     "object-assign": "^4.1.1",
     "object-fit-images": "^3.2.3",
-    "object.values": "^1.1.1",
+    "object.values": "^1.1.3",
     "offline-plugin": "^5.0.7",
     "path-complete-extname": "^1.0.0",
-    "pg": "^6.4.0",
+    "pg": "^8.5.0",
     "postcss-loader": "^3.0.0",
     "postcss-object-fit-images": "^1.1.2",
     "promise.prototype.finally": "^3.1.2",
@@ -135,18 +133,18 @@
     "react-masonry-infinite": "^1.2.2",
     "react-motion": "^0.5.2",
     "react-notification": "^6.8.5",
-    "react-overlays": "^0.9.2",
+    "react-overlays": "^0.9.3",
-    "react-redux": "^7.2.2",
+    "react-redux": "^7.2.4",
     "react-redux-loading-bar": "^4.0.8",
     "react-router-dom": "^4.1.1",
     "react-router-scroll-4": "^1.0.0-beta.1",
-    "react-select": "^3.1.0",
+    "react-select": "^4.3.0",
     "react-sparklines": "^1.7.0",
     "react-swipeable-views": "^0.13.9",
-    "react-textarea-autosize": "^8.3.0",
+    "react-textarea-autosize": "^8.3.2",
-    "react-toggle": "^4.1.1",
+    "react-toggle": "^4.1.2",
-    "redis": "^3.0.2",
+    "redis": "^3.1.2",
-    "redux": "^4.0.5",
+    "redux": "^4.1.0",
     "redux-immutable": "^4.0.0",
     "redux-thunk": "^2.2.0",
     "regenerator-runtime": "^0.13.7",
@@ -154,8 +152,8 @@
     "requestidlecallback": "^0.3.0",
     "reselect": "^4.0.0",
     "rimraf": "^3.0.2",
-    "sass": "^1.29.0",
+    "sass": "^1.32.12",
-    "sass-loader": "^10.1.0",
+    "sass-loader": "^10.1.1",
     "stacktrace-js": "^2.0.2",
     "stringz": "^2.1.0",
     "substring-trie": "^1.0.2",
@@ -163,31 +161,37 @@
     "tesseract.js": "^2.1.1",
     "throng": "^4.0.0",
     "tiny-queue": "^0.2.1",
+    "twitter-text": "3.1.0",
     "uuid": "^8.3.1",
-    "webpack": "^4.44.2",
+    "webpack": "^4.46.0",
-    "webpack-assets-manifest": "^3.1.1",
+    "webpack-assets-manifest": "^4.0.6",
-    "webpack-bundle-analyzer": "^4.1.0",
+    "webpack-bundle-analyzer": "^4.4.1",
     "webpack-cli": "^3.3.12",
-    "webpack-merge": "^5.4.0",
+    "webpack-merge": "^5.7.3",
-    "wicg-inert": "^3.1.0",
+    "wicg-inert": "^3.1.1",
+    "ws": "^7.4.5",
     "kind-of": "^6.0.3"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.11.6",
+    "@testing-library/jest-dom": "^5.12.0",
-    "@testing-library/react": "^11.2.2",
+    "@testing-library/react": "^11.2.6",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^26.6.3",
-    "eslint": "^7.14.0",
+    "eslint": "^7.26.0",
     "eslint-plugin-import": "~2.22.1",
     "eslint-plugin-jsx-a11y": "~6.4.1",
-    "eslint-plugin-promise": "~4.2.1",
+    "eslint-plugin-promise": "~5.1.0",
-    "eslint-plugin-react": "~7.21.5",
+    "eslint-plugin-react": "~7.23.2",
     "jest": "^26.6.3",
     "raf": "^3.4.1",
     "react-intl-translations-manager": "^5.0.3",
     "react-test-renderer": "^16.14.0",
     "sass-lint": "^1.13.1",
-    "webpack-dev-server": "^3.11.0",
+    "webpack-dev-server": "^3.11.2",
-    "yargs": "^16.1.1"
+    "yargs": "^17.0.1"
+  },
+  "optionalDependencies": {
+    "bufferutil": "^4.0.3",
+    "utf-8-validate": "^5.0.5"
   }
 }

pkgs/servers/mastodon/resolutions.patch

@@ -1,31 +1,32 @@
 diff --git a/package.json b/package.json
-index 7b8f49dd8..24cdd3498 100644
+index 5bc1f6bf3..8cc22a403 100644
 --- a/package.json
 +++ b/package.json
 @@ -168,7 +168,8 @@
-     "webpack-bundle-analyzer": "^4.1.0",
      "webpack-cli": "^3.3.12",
-     "webpack-merge": "^5.4.0",
+     "webpack-merge": "^5.7.3",
--    "wicg-inert": "^3.1.0"
+     "wicg-inert": "^3.1.1",
-+    "wicg-inert": "^3.1.0",
+-    "ws": "^7.4.5"
++    "ws": "^7.4.5",
 +    "kind-of": "^6.0.3"
    },
    "devDependencies": {
-     "@testing-library/jest-dom": "^5.11.6",
+     "@testing-library/jest-dom": "^5.12.0",
-@@ -187,8 +188,5 @@
+@@ -188,9 +189,6 @@
-     "sass-lint": "^1.13.1",
+     "webpack-dev-server": "^3.11.2",
-     "webpack-dev-server": "^3.11.0",
+     "yargs": "^17.0.1"
-     "yargs": "^16.1.1"
+   },
--  },
 -  "resolutions": {
 -    "kind-of": "^6.0.3"
-   }
+-  },
- }
+   "optionalDependencies": {
+     "bufferutil": "^4.0.3",
+     "utf-8-validate": "^5.0.5"
 diff --git a/yarn.lock b/yarn.lock
-index 4aa8f6380..68d2fd8b5 100644
+index 6c8bcf549..bda3adbe8 100644
 --- a/yarn.lock
 +++ b/yarn.lock
-@@ -5689,6 +5689,11 @@ is-binary-path@~2.1.0:
+@@ -5833,6 +5833,11 @@ is-binary-path@~2.1.0:
    dependencies:
      binary-extensions "^2.0.0"
  
@@ -37,7 +38,7 @@ index 4aa8f6380..68d2fd8b5 100644
  is-callable@^1.1.4, is-callable@^1.2.2:
    version "1.2.2"
    resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
-@@ -6639,7 +6644,26 @@ killable@^1.0.1:
+@@ -6769,7 +6774,26 @@ killable@^1.0.1:
    resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
    integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
  

pkgs/servers/mastodon/source.nix

@@ -2,8 +2,8 @@
 { fetchgit, applyPatches }: let
   src = fetchgit {
     url = "https://github.com/tootsuite/mastodon.git";
-    rev = "v3.3.0";
+    rev = "v3.4.0";
-    sha256 = "17wvggvy5mmyf3f1i5v1hgvh6wjdhg9hb3wiyfaydx0slsg03qba";
+    sha256 = "0wa1j4iin6nlb1p5lxzgldzgr0vhrmm835gj2zqadw37vpsxdis3";
   };
 in applyPatches {
   inherit src;

pkgs/servers/mastodon/version.nix

@@ -1 +1 @@
-"3.3.0"
+"3.4.0"

pkgs/servers/mastodon/version.patch

@@ -3,7 +3,7 @@ diff -Naur --label a/package.json --label b/package.json a/package.json b/packag
 +++ b/package.json
 @@ -1,4 +1,5 @@
  {
-+  "version": "3.3.0",
++  "version": "3.4.0",
    "name": "@tootsuite/mastodon",
    "license": "AGPL-3.0-or-later",
    "engines": {