Repository navigation
chore: merge main back into dev ahead of v3.10.0 release - #2894
Merged
Merged
Conversation
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…el cascades (#2872) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
…into-dev # Conflicts: # package.json # packages/auth-adapters/better-auth/package.json # packages/cli/package.json # packages/clients/client-helpers/package.json # packages/clients/fetch-client/package.json # packages/clients/tanstack-query/package.json # packages/common-helpers/package.json # packages/config/eslint-config/package.json # packages/config/tsdown-config/package.json # packages/config/typescript-config/package.json # packages/config/vitest-config/package.json # packages/create-zenstack/package.json # packages/ide/vscode/package.json # packages/language/package.json # packages/orm/package.json # packages/orm/src/client/crud/operations/base.ts # packages/plugins/policy/package.json # packages/plugins/soft-delete/package.json # packages/schema/package.json # packages/sdk/package.json # packages/server/package.json # packages/testtools/package.json # packages/zod/package.json # samples/orm/package.json # samples/taskforge/package.json # tests/e2e/orm/client-api/delegate-cascade-delete.test.ts # tests/e2e/package.json # tests/regression/package.json # tests/runtimes/bun/package.json # tests/runtimes/edge-runtime/package.json
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.
Merges
mainintodevso the upcoming dev → main release PR (v3.10.0) has no conflicts.maindiverged fromdevwith the v3.9.8 patch release: cherry-picks of #2871 and #2872, plus a 3.9.8 version bump.Resolution
All conflicts were resolved to
dev's side. The resulting tree is identical todev. This PR only addsmainas a merge parent.package.jsonfiles: onlyversionconflicted (3.10.0 vs 3.9.8). Kept 3.10.0.packages/orm/src/client/crud/operations/base.ts,tests/e2e/orm/client-api/delegate-cascade-delete.test.ts: main's cherry-picks are patch-identical to dev's 2c81cbd / 8cbe1b0. Dev also has the follow-up fix fix(orm): resolve rows before simulating delegate cascades from regular models #2878 on top, so dev's version is kept.mainparent, and the conflicts would come back on the release PR.🤖 Generated with Claude Code