merge dev to main (v2.11.5)

[ymc9]

No description provided.

[coderabbitai]

📝 Walkthrough

Walkthrough

This pull request involves version updates across multiple files. The build.gradle.kts file in the JetBrains IDE package has been updated from version 2.11.4 to 2.11.5. Additionally, the test scaffold and integration tests have been modified to use Prisma dependencies version 6.3.x instead of the previous 6.2.x version.

Changes

File	Change Summary
packages/ide/jetbrains/build.gradle.kts	Version bumped from 2.11.4 to 2.11.5
script/test-scaffold.ts	Updated Prisma package installation to version 6.3.x
tests/integration/tests/cli/plugins.test.ts	Updated Prisma dependencies (@prisma/client and prisma) from 6.2.x to 6.3.x

Possibly related PRs

• chore: bump version #1459: Version update in the same build.gradle.kts file
• chore: bump version #1481: Similar version update in build.gradle.kts
• merge dev to main (v2.2.2) #1511: Version increment in the same file

---

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between ff393da and 3e699e7.

⛔ Files ignored due to path filters (20)

• package.json is excluded by !**/*.json
• packages/ide/jetbrains/package.json is excluded by !**/*.json
• packages/language/package.json is excluded by !**/*.json
• packages/misc/redwood/package.json is excluded by !**/*.json
• packages/plugins/openapi/package.json is excluded by !**/*.json
• packages/plugins/swr/package.json is excluded by !**/*.json
• packages/plugins/tanstack-query/package.json is excluded by !**/*.json
• packages/plugins/trpc/package.json is excluded by !**/*.json
• packages/plugins/trpc/tests/projects/nuxt-trpc-v10/package.json is excluded by !**/*.json
• packages/plugins/trpc/tests/projects/nuxt-trpc-v11/package.json is excluded by !**/*.json
• packages/plugins/trpc/tests/projects/t3-trpc-v11/package.json is excluded by !**/*.json
• packages/runtime/package.json is excluded by !**/*.json
• packages/schema/package.json is excluded by !**/*.json
• packages/sdk/package.json is excluded by !**/*.json
• packages/server/package.json is excluded by !**/*.json
• packages/testtools/package.json is excluded by !**/*.json
• pnpm-lock.yaml is excluded by !**/pnpm-lock.yaml, !**/*.yaml
• tests/integration/test-run/package.json is excluded by !**/*.json
• tests/integration/tests/frameworks/nextjs/test-project/package.json is excluded by !**/*.json
• tests/integration/tests/frameworks/trpc/test-project/package.json is excluded by !**/*.json

📒 Files selected for processing (3)

• packages/ide/jetbrains/build.gradle.kts (1 hunks)
• script/test-scaffold.ts (1 hunks)
• tests/integration/tests/cli/plugins.test.ts (2 hunks)

✅ Files skipped from review due to trivial changes (1)

• packages/ide/jetbrains/build.gradle.kts

⏰ Context from checks skipped due to timeout of 90000ms (7)

• GitHub Check: build-test (20.x)
• GitHub Check: Analyze (javascript-typescript)
• GitHub Check: build-test (20.x)
• GitHub Check: build-test (20.x)
• GitHub Check: OSSAR-Scan
• GitHub Check: dependency-review
• GitHub Check: OSSAR-Scan

🔇 Additional comments (3)

script/test-scaffold.ts (1)

22-22: Verify Prisma v6.3.x compatibility with other dependencies.

The version update from 6.2.x to 6.3.x looks good and aligns with the PR objective.

Let's verify the compatibility of Prisma v6.3.x with the fixed version of zod:

✅ Verification successful

Prisma v6.3.x and zod v3.22.4 are compatible

The version combination is already being used successfully across multiple packages in the codebase, including server adapters and test infrastructure, with no compatibility issues.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check compatibility between Prisma v6.3.x and zod v3.22.4

# Check Prisma's peer dependencies
curl -s https://registry.npmjs.org/@prisma/client/6.3.0 | jq -r '.peerDependencies | select(.zod != null) | .zod'

# Check for any known compatibility issues in the changelog
curl -s https://raw.githubusercontent.com/prisma/prisma/6.3.x/CHANGELOG.md | grep -B 2 -A 2 "zod"

Length of output: 213

---

Script:

#!/bin/bash
# Find files using both Prisma and zod
echo "=== Files using both Prisma and zod ==="
rg -l "from ['\"]@prisma/client['\"]" | xargs rg -l "from ['\"]zod['\"]"

echo -e "\n=== Package.json dependencies ==="
# Check existing package.json for version constraints
fd package.json --type f --exec cat {} \; | jq '.dependencies, .devDependencies'

echo -e "\n=== Prisma and zod usage patterns ==="
# Look for any version-specific code or patterns
rg -A 2 -B 2 "prisma.*zod|zod.*prisma" --type ts

Length of output: 19586

tests/integration/tests/cli/plugins.test.ts (2)

Line range hint 23-23: Consider enabling tests for all package managers.

The test suite has commented-out support for pnpm and pnpm-workspace. Consider enabling these tests to ensure the version updates work correctly across all package managers.

Would you like me to help implement the additional package manager tests?

---

78-78: LGTM! Version updates are consistent.

The Prisma dependency updates to v6.3.x are consistent across both client and dev dependencies.

Let's verify version consistency across the project:

Also applies to: 88-88

✅ Verification successful

✅ Version consistency verified across the project

The Prisma version update to 6.3.x in plugins.test.ts is consistent with all package.json files across the project, including test projects and framework implementations.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for any mismatched Prisma versions in package.json files

# Search for Prisma version specifications
echo "Checking Prisma version specifications across the project..."
rg -g "package*.json" -g "!node_modules" "(@prisma|prisma).*6\.[0-9]\.x"

Length of output: 2443

✨ Finishing Touches

• 📝 Generate Docstrings (Beta)

---

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

‼️ IMPORTANT
Auto-reply has been disabled for this repository in the CodeRabbit settings. The CodeRabbit bot will not respond to your replies unless it is explicitly tagged.

• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai generate unit testing code for this file.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
  • @coderabbitai read src/utils.ts and generate unit testing code.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
  • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai full review to do a full review from scratch and review all the files again.
• @coderabbitai summary to regenerate the summary of the PR.
• @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Other keywords and placeholders

• Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
• Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
• Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.