Dedupe yarn.lock with yarn-deduplicate #24119
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nschonni
changed the title
ykzts
approved these changes
Mar 18, 2023
nschonni
added a commit
to nschonni/mastodon
that referenced
this pull request
Mar 18, 2023
This reverts commit 9758112.
rhelmer
added a commit
to MozillaSocial/mastodon
that referenced
this pull request
Mar 20, 2023
* Skip double building on Dependabot branches (mastodon#24025) * Bump pg from 1.4.5 to 1.4.6 (mastodon#24001) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump yargs from 17.7.0 to 17.7.1 (mastodon#24002) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump sidekiq-scheduler from 5.0.1 to 5.0.2 (mastodon#24004) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump rack from 2.2.6.2 to 2.2.6.3 (mastodon#23997) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump axios from 1.3.3 to 1.3.4 (mastodon#23996) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump utf-8-validate from 6.0.2 to 6.0.3 (mastodon#23992) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump omniauth_openid_connect from 0.6.0 to 0.6.1 (mastodon#23991) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump doorkeeper from 5.6.4 to 5.6.5 (mastodon#24009) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump jest from 29.4.3 to 29.5.0 (mastodon#24003) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump jest-environment-jsdom from 29.4.3 to 29.5.0 (mastodon#23998) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump rubocop from 1.45.1 to 1.48.0 (mastodon#23999) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump mkdirp from 2.1.3 to 2.1.5 (mastodon#23994) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump babel-jest from 29.4.3 to 29.5.0 (mastodon#24007) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add refreshing many accounts at once with "tootctl accounts refresh" (mastodon#23304) * Skip rebase-needed job for i10n branch (mastodon#24026) * Unescape HTML entities (mastodon#24019) * Explicitly set github repo in instance presenter spec (mastodon#24036) * Center the text itself in upload area (mastodon#24029) * Sync CI and Docker Compose image versions (mastodon#24053) * Bump puma from 6.1.0 to 6.1.1 (mastodon#24045) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Serializers spec coverage (mastodon#24017) * Coverage improvement round-out following up previous work (mastodon#23987) * Bump pghero from 3.1.0 to 3.2.0 (mastodon#24044) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump eslint from 8.33.0 to 8.35.0 (mastodon#24049) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Enable RSpec/FilePath (mastodon#23965) * Add basic search specs for chewy indexes (mastodon#24065) * Fix sidekiq jobs not triggering Elasticsearch index updates (mastodon#24046) * Enable Rubocop Performance/DeleteSuffix (mastodon#24077) * Prefer the stored location as after_sign_in_path in Omniauth Callback Controller (mastodon#24073) * Bump jsdom from 21.1.0 to 21.1.1 (mastodon#24090) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump pghero from 3.2.0 to 3.3.0 (mastodon#24085) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Support the PROXY protocol through the PROXY_PROTO_V1 env variable (mastodon#24064) * Bump rack from 2.2.6.3 to 2.2.6.4 (mastodon#24097) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump rails from 6.1.7.2 to 6.1.7.3 (mastodon#24096) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump rubocop from 1.48.0 to 1.48.1 (mastodon#24095) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Push Docker images to Github Container Registry as well (mastodon#24101) * Skip Docker CI Login/Push on forks (mastodon#23564) * Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call (mastodon#24034) * Redirect users to SLO at the IdP after logging them out of Mastodon. (mastodon#24020) * Add spec for the CLI `version` task (mastodon#23978) * Update PostCSS dependencies (mastodon#23835) * Fix dashboard crash on ElasticSearch server error (mastodon#23751) * Fix incorrect post links in strikes when the account is remote (mastodon#23611) * Fix misleading error code when receiving invalid WebAuthn credentials (mastodon#23568) * Setup haml-lint CI with todo config (mastodon#23524) * Use Github Container Registry as the official container image source (mastodon#24113) * Skip pushing containers on forks (mastodon#24106) * Fix more haml-lint Rubocop (mastodon#24107) * Autofix Rubocop Style/PreferredHashMethods (mastodon#23851) * Bump rack-test from 2.0.2 to 2.1.0 (mastodon#24112) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Autofix Rubocop Style/RedundantArgument (mastodon#23798) * Bump immutable from 4.2.4 to 4.3.0 (mastodon#24088) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump @babel/eslint-parser from 7.19.1 to 7.21.3 (mastodon#24109) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump eslint from 8.35.0 to 8.36.0 (mastodon#24089) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Remove `bullet` and `active_record_query_trace` gems (mastodon#24121) * Add `SENDFILE_HEADER` environment variable (mastodon#24123) * Bump @babel/core from 7.21.0 to 7.21.3 (mastodon#24111) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add cache headers to static files served through Rails (mastodon#24120) * Bump autoprefixer from 10.4.13 to 10.4.14 (mastodon#24108) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump sass from 1.58.3 to 1.59.3 (mastodon#24105) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Regen rubocop-todo without Max shadowing (mastodon#24076) * Refactor monkey-patching of `PrivateAddressCheck` (mastodon#24122) * Replace `Status#translatable?` with language matrix in separate endpoint (mastodon#24037) * New Crowdin updates (mastodon#23904) Co-authored-by: Yamagishi Kazutoshi <[email protected]> * Roll back unintentionally activated rubocop rules (mastodon#24132) Co-authored-by: Eugen Rochko <[email protected]> Co-authored-by: Nick Schonning <[email protected]> * Change user backups to use expiring URLs for download when possible (mastodon#24136) * Add warning for object storage misconfiguration (mastodon#24137) * Ignore additional Style/OptionalBooleanParameter (mastodon#24138) * Bump glob from 8.1.0 to 9.3.0 (mastodon#24110) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump rimraf from 4.1.2 to 4.4.0 (mastodon#24048) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Link to the Identity provider's account settings from the account settings (mastodon#24100) Co-authored-by: Claire <[email protected]> * Include config/ and update all rubcop deps (mastodon#23963) * Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 (mastodon#24142) Co-authored-by: Jean Boussier <[email protected]> * Dedupe yarn.lock with yarn-deduplicate (mastodon#24119) * Revert "Dedupe yarn.lock with yarn-deduplicate" (mastodon#24155) * Upgrade redis-node to latest (mastodon#24154) * Webhooks for local status.create, status.update, account.update (mastodon#24133) --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Nick Schonning <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: 9p4 <[email protected]> Co-authored-by: Christian Schmidt <[email protected]> Co-authored-by: Matt Jankowski <[email protected]> Co-authored-by: Rodion Borisov <[email protected]> Co-authored-by: Claire <[email protected]> Co-authored-by: CSDUMMI <[email protected]> Co-authored-by: Renaud Chaput <[email protected]> Co-authored-by: Eugen Rochko <[email protected]> Co-authored-by: Yamagishi Kazutoshi <[email protected]> Co-authored-by: Jean byroot Boussier <[email protected]> Co-authored-by: Jean Boussier <[email protected]> Co-authored-by: Vyr Cossont <[email protected]>
arachnist
pushed a commit
to arachnist/mastodon
that referenced
this pull request
Apr 4, 2023
skerit
pushed a commit
to 11ways/mastodon
that referenced
this pull request
Jul 7, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #22486
Manually removed the npmjs.org entry and regnerated and ended up with 2 entries, so combined the 2 entries and confirmed that yarn was still happy afterwardsFound https://www.npmjs.com/package/yarn-deduplicate and redid this with the tool + a second
yarn installto collapse the tree instead of manually editing the lockfile