diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ab57725142..0a2b36c9fb 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -16,32 +16,43 @@ updates: # This version needs to match Rails major version, so stick to 6.x only - dependency-name: '@rails/ujs' versions: - - '7.x' - # TODO: This version got stuck in https://github.com/mastodon/mastodon/pull/14004 and this should be deleted to fix - - dependency-name: 'pg' - versions: - - '8.x' + - '>= 7' # TODO: This was ignored in https://github.com/mastodon/mastodon/pull/19120 - dependency-name: 'uuid' versions: - - '9.x' - # TODO: This version got stuck in https://github.com/mastodon/mastodon/pull/14073 and this should be deleted to fix - - dependency-name: 'history' - versions: - - '5.x' + - '>= 9' # TODO: This requires code changes for migration - dependency-name: 'tesseract.js' versions: - - '3.x' - - '4.x' + - '>= 3' # TODO: This version needs manual updates for breaking changes - dependency-name: 'react-hotkeys' versions: - - '2.x' - # TODO: This version got stuck in https://github.com/mastodon/mastodon/pull/15206 and this should be deleted to fix - - dependency-name: 'terser' + - '>= 2' + # TODO: This version has breaking changes + - dependency-name: 'intl-messageformat' versions: - - '5.x' + - '>= 3' + # TODO: This version has breaking changes + - dependency-name: 'react-intl' + versions: + - '>= 3' + # TODO: This version has breaking changes + - dependency-name: 'babel-plugin-react-intl' + versions: + - '>= 7' + # TODO: This version requires code changes + - dependency-name: 'webpack-dev-server' + versions: + - '>= 4' + # TODO: This version requires code changes https://github.com/reduxjs/react-redux/releases/tag/v8.0.0 + - dependency-name: 'react-redux' + versions: + - '>= 4' + # TODO: This version was ignored in https://github.com/mastodon/mastodon/pull/15238 + - dependency-name: 'webpack-cli' + versions: + - '>= 4' - package-ecosystem: bundler directory: '/' @@ -54,11 +65,31 @@ updates: # This version needs to match Rails major version, so stick to 6.x only - dependency-name: 'rails-i18n' versions: - - '7.x' + - '>= 7.0.0' # This version needs manual updates https://github.com/rails/sprockets/blob/master/UPGRADING.md#guide-to-upgrading-from-sprockets-3x-to-4x - dependency-name: 'sprockets' versions: - - '4.x' + - '>= 4.0.0' + # This version needs manual updates https://github.com/rails/sprockets/blob/master/UPGRADING.md#guide-to-upgrading-from-sprockets-3x-to-4x + - dependency-name: 'strong_migrations' + versions: + - '>= 1.0.0' + # This version needs updates and to sync with sidekiq-unique-jobs + - dependency-name: 'sidekiq' + versions: + - '>= 7.0.0' + # This version needs updates and to sync with sidekiq + - dependency-name: 'sidekiq-unique-jobs' + versions: + - '>= 8.0.0' + # This version needs updates and to sync with sidekiq and sidekiq-unique-jobs + - dependency-name: 'redis' + versions: + - '>= 5.0.0' + # TODO: was ignored in https://github.com/mastodon/mastodon/pull/13964 + - dependency-name: 'fog-openstack' + versions: + - '>= 1.0.0' - package-ecosystem: github-actions directory: '/' diff --git a/lib/mastodon/accounts_cli.rb b/lib/mastodon/accounts_cli.rb index 1ffcb76c3d..ebfb609791 100644 --- a/lib/mastodon/accounts_cli.rb +++ b/lib/mastodon/accounts_cli.rb @@ -102,7 +102,7 @@ module Mastodon say('Use --force to reattach it anyway and delete the other user') return elsif account.user.present? - DeleteAccountService.new.call(account, reserve_email: false) + DeleteAccountService.new.call(account, reserve_email: false, reserve_username: false) account = Account.new(username: username) end end diff --git a/package.json b/package.json index 1e997e1161..3b52664bb9 100644 --- a/package.json +++ b/package.json @@ -121,7 +121,7 @@ "stringz": "^2.1.0", "substring-trie": "^1.0.2", "terser-webpack-plugin": "^4.2.3", - "tesseract.js": "^2.1.1", + "tesseract.js": "^2.1.5", "tiny-queue": "^0.2.1", "twitter-text": "3.1.0", "uuid": "^8.3.1", diff --git a/yarn.lock b/yarn.lock index 3828b76e38..5b367f3d20 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3406,6 +3406,11 @@ bindings@^1.5.0: dependencies: file-uri-to-path "1.0.0" +blueimp-load-image@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/blueimp-load-image/-/blueimp-load-image-3.0.0.tgz#d71c39440a7d2f1a83e3e86a625e329116a51705" + integrity sha512-Q9rFbd4ZUNvzSFmRXx9MoG0RwWwJeMjjEUbG7WIOJgUg22Jgkow0wL5b35B6qwiBscxACW9OHdrP5s2vQ3x8DQ== + blurhash@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-2.0.5.tgz#efde729fc14a2f03571a6aa91b49cba80d1abe4b" @@ -3981,6 +3986,11 @@ colorette@^2.0.19: resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== +colors@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" + integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== + combined-stream@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -7333,6 +7343,22 @@ jest@^29.5.0: import-local "^3.0.2" jest-cli "^29.5.0" +jpeg-autorotate@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/jpeg-autorotate/-/jpeg-autorotate-7.1.1.tgz#c57905c6afd3b54373a6a1d0249ed6e07f7b043b" + integrity sha512-ewTZTG/QWOM0D5h/yKcQ3QgyrnQYsr3qmcS+bqoAwgQAY1KBa31aJ+q+FlElaxo/rSYqfF1ixf+8EIgluBkgTg== + dependencies: + colors "^1.4.0" + glob "^7.1.6" + jpeg-js "^0.4.2" + piexifjs "^1.0.6" + yargs-parser "^20.2.1" + +jpeg-js@^0.4.2: + version "0.4.4" + resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.4.tgz#a9f1c6f1f9f0fa80cdb3484ed9635054d28936aa" + integrity sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg== + js-sdsl@^4.1.4: version "4.3.0" resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz#aeefe32a451f7af88425b11fdb5f58c90ae1d711" @@ -8841,6 +8867,11 @@ pidtree@^0.6.0: resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c" integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g== +piexifjs@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/piexifjs/-/piexifjs-1.0.6.tgz#883811d73f447218d0d06e9ed7866d04533e59e0" + integrity sha512-0wVyH0cKohzBQ5Gi2V1BuxYpxWfxF3cSqfFXfPIpl5tl9XLS5z4ogqhUCD20AbHi0h9aJkqXNJnkVev6gwh2ag== + pify@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" @@ -11130,16 +11161,18 @@ tesseract.js-core@^2.2.0: resolved "https://registry.yarnpkg.com/tesseract.js-core/-/tesseract.js-core-2.2.0.tgz#6ef78051272a381969fac3e45a226e85022cffef" integrity sha512-a8L+OJTbUipBsEDsJhDPlnLB0TY1MkTZqw5dqUwmiDSjUzwvU7HWLg/2+WDRulKUi4LE+7PnHlaBlW0k+V0U0w== -tesseract.js@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/tesseract.js/-/tesseract.js-2.1.1.tgz#5c50fc95542ce8d834cb952bfb75a8fc85f1441d" - integrity sha512-utg0A8UzT1KwBvZf+UMGmM8LU6izeol6yIem0Z44+7Qqd/YWgRVQ99XOG18ApTOXX48lGE++PDwlcZYkv0ygRQ== +tesseract.js@^2.1.5: + version "2.1.5" + resolved "https://registry.yarnpkg.com/tesseract.js/-/tesseract.js-2.1.5.tgz#2f757ff059f249721096fe9f94029c349650902c" + integrity sha512-7CIS3SWr7TXpeaH9+HS7iUtVbCfPFYOO3p6rkRAkdtsOtrbz6496x59na6SCbFAIaZulQxy8BjwSu3qL3AoDRg== dependencies: + blueimp-load-image "^3.0.0" bmp-js "^0.1.0" file-type "^12.4.1" idb-keyval "^3.2.0" is-electron "^2.2.0" is-url "^1.2.4" + jpeg-autorotate "^7.1.1" node-fetch "^2.6.0" opencollective-postinstall "^2.0.2" regenerator-runtime "^0.13.3" @@ -12319,7 +12352,7 @@ yargs-parser@^13.1.2: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^20.2.3: +yargs-parser@^20.2.1, yargs-parser@^20.2.3: version "20.2.9" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==