-
Notifications
You must be signed in to change notification settings - Fork 200
chore: upgrade thrift and @tiptap/* to resolve Dependabot alerts
#9874
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+438
−616
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
mainhas since movedthrifttov0.23.0anddatabricks-sql-gotov1.15.1(#9852), andgit merge-treereports content conflicts in bothgo.modandgo.sum. Keepv0.24.0when resolving: GHSA-8wv5-x4w7-5gww's first patched version is0.24.0, somain's0.23.0is still vulnerable, anddatabricks-sql-go v1.15.1builds cleanly againstv0.24.0.package-lock.jsonauto-merges textually, butmainnow has@tiptap/*@3.22.1hoisted at the root, so a text merge leaves both those entries and this PR's nested3.31.3ones; regenerate the lockfile after rebasing rather than accepting the merged text, and runnpm dedupeat that point.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Kept
thriftatv0.24.0when resolving — confirmed GHSA-8wv5-x4w7-5gww requires 0.24.0, anddatabricks-sql-go v1.15.1builds cleanly against it.