Repository navigation
chore(deps): bump five npm packages in one branch - #95
Merged
Merged
Conversation
- Combine dependabot #93 (production, 2) and #94 (development, 3) into one tree; both touch package.json and package-lock.json, so merging them separately forces a rebase-and-rerun round. - The two branches merged without conflict, so the lockfile is the plain union of both PRs' lockfiles and was not regenerated. Co-Authored-By: htjulia <htjulia1@gmail.com>
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
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.
Combines the two open dependabot PRs into one tree. Both touch
package.jsonandpackage-lock.json, so merging them one by one would force a rebase-and-rerun round.Updates
@tanstack/react-virtuallucide-react@types/nodeoxlintshadcnAll minor/patch. Each original PR was green on
ci-completeon its own.How it was combined
pr-93andpr-94merged without conflict, so the lockfile is the plain union of both PRs' lockfiles and was not regenerated — no drift beyond what dependabot locked (lucide-reactstays at 1.63.0).main, so no merge commits are in the diff.shadcn4.23.0 dependency tree).Verification (local,
npm cion the combined tree)npm run lint— pass; 7 warnings, same count asmain(theoxlintbump adds none).npm run build— pass; main chunk 537.49 → 537.63 kB (gzip 170.11 → 170.13).npm test— 20 files / 245 tests passed.npm audit— 6 (low 2, moderate 4) vs. 10 onmain(incl. 1 high); all dev-only.npm audit --omit=dev— 0.Closes #93
Closes #94