Bump dependencies (non-major)#2210
Closed
stipsan wants to merge 3 commits into
Closed
Conversation
- @floating-ui/react-dom to ^2.1.8 - csstype to ^3.2.3 - motion to ^12.42.2
- @figma/plugin-typings to ^1.130.0 - @testing-library/jest-dom to ^6.9.1 - @testing-library/react to ^16.3.2 - @types/react to ^19.2.17 - @types/react-dom to ^19.2.3 - babel-plugin-styled-components to ^2.3.0 - commitizen to ^4.3.2 - eslint-plugin-react-hooks to 7.1.1 - jest to ^30.4.2 - jest-environment-jsdom to ^30.4.1 - module-alias to ^2.3.4 - react/react-dom/react-is (dev) to ^19.2.7 - styled-components (@sanity/styled-components) to ^6.1.24 - typescript-eslint to ^8.62.1 Also removes three now-unused react-hooks/set-state-in-effect eslint-disable directives surfaced by the eslint-plugin-react-hooks bump, since the rule no longer flags those patterns.
|
The latest updates on your projects. Learn more about Vercel for GitHub.
1 Skipped Deployment
|
|
Review the following changes in direct dependencies. Learn more about Socket for GitHub.
|
main underwent a full monorepo restructuring since this branch was cut (refactor: structure as a monorepo and migrate to Changesets, #2216) plus several tooling migrations (prettier -> oxfmt, ESLint -> oxlint, jest/cypress -> vitest, workshop folded into apps/storybook). Conflict resolution: - figma/package.json: accepted main's move to packages/figma/package.json, then re-applied our @figma/plugin-typings ^1.130.0 bump there (main hadn't independently bumped it). - package.json (root): accepted main's version wholesale, since the old root package.json (the @sanity/ui manifest) was replaced by a minimal monorepo root and its contents moved to packages/ui/package.json. - packages/ui/package.json (not flagged as a conflict by git, but silently dropped all of this branch's bumps since it's a new path): re-applied the still-applicable bumps that main had not already picked up independently (@floating-ui/react-dom ^2.1.8, csstype ^3.2.3, motion ^12.42.2, @testing-library/jest-dom ^6.9.1, @testing-library/react ^16.3.2, styled-components/@sanity/styled-components ^6.1.24). @types/react, @types/react-dom, react, react-dom and react-is were already at or above our target versions on main, so left untouched. Intentionally did NOT re-add babel-plugin-styled-components, commitizen, eslint-plugin-react-hooks, jest, jest-environment-jsdom, module-alias or typescript-eslint: main removed these tools entirely as part of the oxlint/oxfmt/vitest/tsdown/ Changesets migration, so bumping their versions would conflict with that migration's intent. - packages/ui/src/core/primitives/avatar/avatar.tsx: kept main's oxlint-disable-next-line react-compiler comment (added by the ESLint to oxlint migration) over this branch's removal of the old eslint-disable-next-line react-hooks/set-state-in-effect comment. Both changes touched the same suppression for the same line, but for two different lint tools with different rule behavior; since main has fully moved to oxlint, its suppression is the one that matters now, and oxlint confirms it is still required (removing it reintroduces the warning). - pnpm-lock.yaml: regenerated via pnpm install against pnpm@11.9.0 (main's pinned package manager) rather than hand-merging, since the lockfile format/content changed too extensively (pnpm 9 to 11, full dependency graph reshuffle) for a textual merge to be meaningful. Verified after resolution: pnpm lint (oxlint, type-aware), pnpm build (tsdown, both packages), pnpm test (vitest, 42 files / 125 tests), and oxfmt --check all pass. Co-authored-by: Cody Olsen <stipsan@users.noreply.github.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
2 participants
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.
Update: merged with
mainmainunderwent a full monorepo restructuring after this PR was opened (monorepo migration + Changesets,prettier→oxfmt,ESLint→oxlint,jest/cypress→vitest, workshop folded intoapps/storybook). This PR now includes a merge commit resolving the resulting conflicts. See "Merge conflict resolution" below for the full classification of simple vs. complicated conflicts and how each was handled. Everything (pnpm lint,pnpm build,pnpm test,oxfmt --check) passes after the merge, using a cleanpnpm install --frozen-lockfile.Merge conflict resolution
Simple (mechanical, no conflicting intent) — fixed:
figma/package.json(deleted-by-them): main moved this topackages/figma/package.jsonwith an otherwise-unrelated rewrite (newtsdownbuild, dropped the oldpkg/babel tooling). Took main's file and re-applied our@figma/plugin-typings→^1.130.0bump there, since main hadn't independently touched that dependency.packages/ui/src/core/hooks/useClickOutside.tsand.../utils/virtualList/virtualList.tsx: auto-merged cleanly by git, no action needed.pnpm-lock.yaml: not hand-mergeable (pnpm 9→11, full dependency graph reshuffle), so regenerated viapnpm installagainst main's pinnedpnpm@11.9.0after resolving all manifest files.package.json: textually conflicting, but unambiguous — main replaced the entire@sanity/uimanifest with a minimal monorepo root (scripts moved topackages/ui/packages/figma/apps/storybook). Took main's version as-is.Complicated (conflicting intent) — resolved with explicit judgment calls, flagged for review:
packages/ui/package.json— not even flagged as a conflict by git (silent data loss risk): since this is a "new path" from git's perspective, a plain merge would have silently dropped every dependency bump from this PR. I manually reconciled it:@floating-ui/react-dom→^2.1.8,csstype→^3.2.3,motion→^12.42.2,@testing-library/jest-dom→^6.9.1,@testing-library/react→^16.3.2,styled-components(@sanity/styled-components) →^6.1.24.@types/react,@types/react-dom,react,react-dom,react-is.babel-plugin-styled-components,commitizen,eslint-plugin-react-hooks,jest,jest-environment-jsdom,module-alias,typescript-eslint. Main removed all of these repo-wide as part of the tooling migration (verified viagit grepacrossorigin/main— zero remaining references). Bumping their versions would resurrect dependencies the migration deliberately deleted.packages/ui/src/core/primitives/avatar/avatar.tsx— genuine same-line conflict: this PR removed a staleeslint-disable-next-line react-hooks/set-state-in-effect(no longer needed undereslint-plugin-react-hooks@7.1.1), while main's ESLint→oxlint migration replaced that exact comment withoxlint-disable-next-line react-compiler. These are two different lint tools' suppressions for the same line, not a trivial textual overlap. Kept main's oxlint suppression — confirmed still necessary by running oxlint directly on the file (removing it reintroduces the warning), and it's consistent withAGENTS.md's note that suppressions now useoxlint-disable-next-line.None of the version-bump reconciliations above could be verified against the original PR's own CI (which no longer exists —
pnpm ts:check,eslint,jest,prettierare all gone frommain), so I re-validated everything against the new toolchain instead (oxlintwith type-aware checking viaoxlint-tsgolint,tsdownbuild,vitest,oxfmt).Original PR: bump dependencies (non-major)
Bumps dependencies to their latest versions within the current major version (i.e. the kind of update Renovate would normally open individually). Split into two commits to match this repo's semantic-release commit conventions (
fix(deps)for runtimedependencies,chore(deps)fordevDependencies):fix(deps): production dependencies@floating-ui/react-dom→^2.1.8csstype→^3.2.3motion→^12.42.2chore(deps): development dependencies@figma/plugin-typings(figma workspace) →^1.130.0@testing-library/jest-dom→^6.9.1@testing-library/react→^16.3.2@types/react→^19.2.17@types/react-dom→^19.2.3babel-plugin-styled-components→^2.3.0commitizen→^4.3.2eslint-plugin-react-hooks→7.1.1jest→^30.4.2jest-environment-jsdom→^30.4.1module-alias→^2.3.4react/react-dom/react-is(dev) →^19.2.7styled-components(@sanity/styled-components) →^6.1.24typescript-eslint→^8.62.1The
eslint-plugin-react-hooksbump refined thereact-hooks/set-state-in-effectrule, which made three existingeslint-disable-next-linecomments unnecessary (useClickOutside.ts,avatar.tsx,virtualList.tsx). Those were removed in the same commit so the tree stayed lint-clean. (Note: after the merge above, theavatar.tsxsuppression comment is back, but as anoxlintsuppression — see "Merge conflict resolution".)What was intentionally left alone (pre-merge; now largely moot, see above)
typescript5→6,eslint/@eslint/js9→10,vite7→8,@vitejs/plugin-react5→6,cypress13→15,husky8→9,@babel/*7→8,@sanity/pkg-utils8→10,@sanity/prettier-config2→3,@sanity/semantic-release-preset5→6,@commitlint/*19→21,rimraf5→6,semantic-release24→25,lint-staged14→17,npm-run-all28→9,start-server-and-test2→3,globals16→17,eslint-plugin-boundaries5→6,eslint-plugin-simple-import-sort12→13,eslint-formatter-gha1→2,@types/node22→26,vite-tsconfig-paths5→6, and the pre-1.0 "breaking-equivalent" bumpeslint-plugin-react-refresh0.4→0.5). These needed dedicated migration/testing effort and were out of scope for a routine bump.storybook,@storybook/*,eslint-plugin-storybook) was kept at8.6.14/0.12.0on purpose —.github/renovate.jsonexplicitly pinned these to<=8onmain/v2since the Storybook major upgrade was being handled separately on thev4branch. (Main has since merged that Storybook v10 upgrade in as part of the monorepo restructuring.)prettier→3.9.4was tried and reverted: the then-pinned@sanity/prettier-config@^2.0.1depended on@prettier/plugin-oxc@0.0.4, which crashed under prettier3.9.4. Moot now thatmainhas replaced prettier withoxfmtentirely.@babel/plugin-transform-object-rest-spread(figma workspace) was left at7.28.4for the same reason as the other@babel/*7→8 majors. Moot now thatmain'spackages/figmano longer uses Babel at all.Testing (pre-merge)
Ran locally after a clean
pnpm install --frozen-lockfile:pnpm ts:checkpnpm lint -f gha --max-warnings 0pnpm buildpnpm test(42 suites / 125 tests passing)pnpm format(no diffs)