Skip to content

merge dev to main (v2.10.0) #1907

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.

Sign up for GitHub

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
merged 8 commits into from
Dec 5, 2024
Merged

merge dev to main (v2.10.0) #1907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ea72e9c
chore: bump prisma dependency to 6.0.x (#1896)
ymc9 Dec 3, 2024
5c27357
chore: bump version (#1899)
ymc9 Dec 3, 2024
7fce0f0
chore: remove CLI version from generated code to avoid unnecessarily …
ymc9 Dec 3, 2024
1bdfbf4
fix: support "Unsupported" type of fields in "@@index" (#1902)
ymc9 Dec 3, 2024
6642f33
fix(delegate): nested create/connect in delegate model requires refer…
ymc9 Dec 3, 2024
d5c30f9
feat(tanstack): return query key and pass in abort signal to fetcher …
ymc9 Dec 3, 2024
d123047
fix: make sure the logical DMMF respects `auth()` in `@default` (#1904)
ymc9 Dec 4, 2024
4c8b86f
fix(cli): install proper prisma version during init (#1906)
ymc9 Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zenstack-monorepo",
"version": "2.9.4",
"version": "2.10.0",
"description": "",
"scripts": {
"build": "pnpm -r build",
Expand Down
2 changes: 1 addition & 1 deletion packages/ide/jetbrains/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
}

group = "dev.zenstack"
version = "2.9.4"
version = "2.10.0"

repositories {
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion packages/ide/jetbrains/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jetbrains",
"version": "2.9.4",
"version": "2.10.0",
"displayName": "ZenStack JetBrains IDE Plugin",
"description": "ZenStack JetBrains IDE plugin",
"homepage": "https://zenstack.dev",
Expand Down
2 changes: 1 addition & 1 deletion packages/language/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zenstackhq/language",
"version": "2.9.4",
"version": "2.10.0",
"displayName": "ZenStack modeling language compiler",
"description": "ZenStack modeling language compiler",
"homepage": "https://zenstack.dev",
Expand Down
2 changes: 1 addition & 1 deletion packages/misc/redwood/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@zenstackhq/redwood",
"displayName": "ZenStack RedwoodJS Integration",
"version": "2.9.4",
"version": "2.10.0",
"description": "CLI and runtime for integrating ZenStack with RedwoodJS projects.",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/openapi/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@zenstackhq/openapi",
"displayName": "ZenStack Plugin and Runtime for OpenAPI",
"version": "2.9.4",
"version": "2.10.0",
"description": "ZenStack plugin and runtime supporting OpenAPI",
"main": "index.js",
"repository": {
Expand Down
40 changes: 20 additions & 20 deletions packages/plugins/openapi/tests/baseline/rpc-3.0.0.baseline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ components:
$ref: '#/components/schemas/Post_ItemListRelationFilter'
profile:
oneOf:
- $ref: '#/components/schemas/ProfileNullableRelationFilter'
- $ref: '#/components/schemas/ProfileNullableScalarRelationFilter'
- $ref: '#/components/schemas/ProfileWhereInput'
nullable: true
UserOrderByWithRelationInput:
Expand Down Expand Up @@ -241,7 +241,7 @@ components:
$ref: '#/components/schemas/Post_ItemListRelationFilter'
profile:
oneOf:
- $ref: '#/components/schemas/ProfileNullableRelationFilter'
- $ref: '#/components/schemas/ProfileNullableScalarRelationFilter'
- $ref: '#/components/schemas/ProfileWhereInput'
nullable: true
UserScalarWhereWithAggregatesInput:
Expand Down Expand Up @@ -319,7 +319,7 @@ components:
- type: string
user:
oneOf:
- $ref: '#/components/schemas/UserRelationFilter'
- $ref: '#/components/schemas/UserScalarRelationFilter'
- $ref: '#/components/schemas/UserWhereInput'
ProfileOrderByWithRelationInput:
type: object
Expand Down Expand Up @@ -364,7 +364,7 @@ components:
nullable: true
user:
oneOf:
- $ref: '#/components/schemas/UserRelationFilter'
- $ref: '#/components/schemas/UserScalarRelationFilter'
- $ref: '#/components/schemas/UserWhereInput'
ProfileScalarWhereWithAggregatesInput:
type: object
Expand Down Expand Up @@ -455,7 +455,7 @@ components:
nullable: true
author:
oneOf:
- $ref: '#/components/schemas/UserNullableRelationFilter'
- $ref: '#/components/schemas/UserNullableScalarRelationFilter'
- $ref: '#/components/schemas/UserWhereInput'
nullable: true
Post_ItemOrderByWithRelationInput:
Expand Down Expand Up @@ -538,7 +538,7 @@ components:
nullable: true
author:
oneOf:
- $ref: '#/components/schemas/UserNullableRelationFilter'
- $ref: '#/components/schemas/UserNullableScalarRelationFilter'
- $ref: '#/components/schemas/UserWhereInput'
nullable: true
Post_ItemScalarWhereWithAggregatesInput:
Expand Down Expand Up @@ -951,7 +951,7 @@ components:
$ref: '#/components/schemas/Post_ItemWhereInput'
none:
$ref: '#/components/schemas/Post_ItemWhereInput'
ProfileNullableRelationFilter:
ProfileNullableScalarRelationFilter:
type: object
properties:
is:
Expand Down Expand Up @@ -1105,7 +1105,7 @@ components:
- type: string
- $ref: '#/components/schemas/NestedStringNullableFilter'
nullable: true
UserRelationFilter:
UserScalarRelationFilter:
type: object
properties:
is:
Expand Down Expand Up @@ -1198,7 +1198,7 @@ components:
oneOf:
- type: integer
- $ref: '#/components/schemas/NestedIntFilter'
UserNullableRelationFilter:
UserNullableScalarRelationFilter:
type: object
properties:
is:
Expand Down Expand Up @@ -2660,14 +2660,14 @@ components:
- type: string
- $ref: '#/components/schemas/NullableStringFieldUpdateOperationsInput'
nullable: true
UserArgs:
UserDefaultArgs:
type: object
properties:
select:
$ref: '#/components/schemas/UserSelect'
include:
$ref: '#/components/schemas/UserInclude'
ProfileArgs:
ProfileDefaultArgs:
type: object
properties:
select:
Expand All @@ -2684,31 +2684,31 @@ components:
profile:
oneOf:
- type: boolean
- $ref: '#/components/schemas/ProfileArgs'
- $ref: '#/components/schemas/ProfileDefaultArgs'
_count:
oneOf:
- type: boolean
- $ref: '#/components/schemas/UserCountOutputTypeArgs'
- $ref: '#/components/schemas/UserCountOutputTypeDefaultArgs'
ProfileInclude:
type: object
properties:
user:
oneOf:
- type: boolean
- $ref: '#/components/schemas/UserArgs'
- $ref: '#/components/schemas/UserDefaultArgs'
Post_ItemInclude:
type: object
properties:
author:
oneOf:
- type: boolean
- $ref: '#/components/schemas/UserArgs'
- $ref: '#/components/schemas/UserDefaultArgs'
UserCountOutputTypeSelect:
type: object
properties:
posts:
type: boolean
UserCountOutputTypeArgs:
UserCountOutputTypeDefaultArgs:
type: object
properties:
select:
Expand All @@ -2733,11 +2733,11 @@ components:
profile:
oneOf:
- type: boolean
- $ref: '#/components/schemas/ProfileArgs'
- $ref: '#/components/schemas/ProfileDefaultArgs'
_count:
oneOf:
- type: boolean
- $ref: '#/components/schemas/UserCountOutputTypeArgs'
- $ref: '#/components/schemas/UserCountOutputTypeDefaultArgs'
ProfileSelect:
type: object
properties:
Expand All @@ -2748,7 +2748,7 @@ components:
user:
oneOf:
- type: boolean
- $ref: '#/components/schemas/UserArgs'
- $ref: '#/components/schemas/UserDefaultArgs'
userId:
type: boolean
Post_ItemSelect:
Expand All @@ -2765,7 +2765,7 @@ components:
author:
oneOf:
- type: boolean
- $ref: '#/components/schemas/UserArgs'
- $ref: '#/components/schemas/UserDefaultArgs'
authorId:
type: boolean
published:
Expand Down
40 changes: 20 additions & 20 deletions packages/plugins/openapi/tests/baseline/rpc-3.1.0.baseline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ components:
$ref: '#/components/schemas/Post_ItemListRelationFilter'
profile:
oneOf:
- $ref: '#/components/schemas/ProfileNullableRelationFilter'
- $ref: '#/components/schemas/ProfileNullableScalarRelationFilter'
- $ref: '#/components/schemas/ProfileWhereInput'
- type: 'null'
UserOrderByWithRelationInput:
Expand Down Expand Up @@ -244,7 +244,7 @@ components:
$ref: '#/components/schemas/Post_ItemListRelationFilter'
profile:
oneOf:
- $ref: '#/components/schemas/ProfileNullableRelationFilter'
- $ref: '#/components/schemas/ProfileNullableScalarRelationFilter'
- $ref: '#/components/schemas/ProfileWhereInput'
- type: 'null'
UserScalarWhereWithAggregatesInput:
Expand Down Expand Up @@ -322,7 +322,7 @@ components:
- type: string
user:
oneOf:
- $ref: '#/components/schemas/UserRelationFilter'
- $ref: '#/components/schemas/UserScalarRelationFilter'
- $ref: '#/components/schemas/UserWhereInput'
ProfileOrderByWithRelationInput:
type: object
Expand Down Expand Up @@ -367,7 +367,7 @@ components:
- type: 'null'
user:
oneOf:
- $ref: '#/components/schemas/UserRelationFilter'
- $ref: '#/components/schemas/UserScalarRelationFilter'
- $ref: '#/components/schemas/UserWhereInput'
ProfileScalarWhereWithAggregatesInput:
type: object
Expand Down Expand Up @@ -458,7 +458,7 @@ components:
- type: 'null'
author:
oneOf:
- $ref: '#/components/schemas/UserNullableRelationFilter'
- $ref: '#/components/schemas/UserNullableScalarRelationFilter'
- $ref: '#/components/schemas/UserWhereInput'
- type: 'null'
Post_ItemOrderByWithRelationInput:
Expand Down Expand Up @@ -541,7 +541,7 @@ components:
- type: 'null'
author:
oneOf:
- $ref: '#/components/schemas/UserNullableRelationFilter'
- $ref: '#/components/schemas/UserNullableScalarRelationFilter'
- $ref: '#/components/schemas/UserWhereInput'
- type: 'null'
Post_ItemScalarWhereWithAggregatesInput:
Expand Down Expand Up @@ -959,7 +959,7 @@ components:
$ref: '#/components/schemas/Post_ItemWhereInput'
none:
$ref: '#/components/schemas/Post_ItemWhereInput'
ProfileNullableRelationFilter:
ProfileNullableScalarRelationFilter:
type: object
properties:
is:
Expand Down Expand Up @@ -1116,7 +1116,7 @@ components:
- type: string
- $ref: '#/components/schemas/NestedStringNullableFilter'
- type: 'null'
UserRelationFilter:
UserScalarRelationFilter:
type: object
properties:
is:
Expand Down Expand Up @@ -1212,7 +1212,7 @@ components:
oneOf:
- type: integer
- $ref: '#/components/schemas/NestedIntFilter'
UserNullableRelationFilter:
UserNullableScalarRelationFilter:
type: object
properties:
is:
Expand Down Expand Up @@ -2689,14 +2689,14 @@ components:
- type: string
- $ref: '#/components/schemas/NullableStringFieldUpdateOperationsInput'
- type: 'null'
UserArgs:
UserDefaultArgs:
type: object
properties:
select:
$ref: '#/components/schemas/UserSelect'
include:
$ref: '#/components/schemas/UserInclude'
ProfileArgs:
ProfileDefaultArgs:
type: object
properties:
select:
Expand All @@ -2713,31 +2713,31 @@ components:
profile:
oneOf:
- type: boolean
- $ref: '#/components/schemas/ProfileArgs'
- $ref: '#/components/schemas/ProfileDefaultArgs'
_count:
oneOf:
- type: boolean
- $ref: '#/components/schemas/UserCountOutputTypeArgs'
- $ref: '#/components/schemas/UserCountOutputTypeDefaultArgs'
ProfileInclude:
type: object
properties:
user:
oneOf:
- type: boolean
- $ref: '#/components/schemas/UserArgs'
- $ref: '#/components/schemas/UserDefaultArgs'
Post_ItemInclude:
type: object
properties:
author:
oneOf:
- type: boolean
- $ref: '#/components/schemas/UserArgs'
- $ref: '#/components/schemas/UserDefaultArgs'
UserCountOutputTypeSelect:
type: object
properties:
posts:
type: boolean
UserCountOutputTypeArgs:
UserCountOutputTypeDefaultArgs:
type: object
properties:
select:
Expand All @@ -2762,11 +2762,11 @@ components:
profile:
oneOf:
- type: boolean
- $ref: '#/components/schemas/ProfileArgs'
- $ref: '#/components/schemas/ProfileDefaultArgs'
_count:
oneOf:
- type: boolean
- $ref: '#/components/schemas/UserCountOutputTypeArgs'
- $ref: '#/components/schemas/UserCountOutputTypeDefaultArgs'
ProfileSelect:
type: object
properties:
Expand All @@ -2777,7 +2777,7 @@ components:
user:
oneOf:
- type: boolean
- $ref: '#/components/schemas/UserArgs'
- $ref: '#/components/schemas/UserDefaultArgs'
userId:
type: boolean
Post_ItemSelect:
Expand All @@ -2794,7 +2794,7 @@ components:
author:
oneOf:
- type: boolean
- $ref: '#/components/schemas/UserArgs'
- $ref: '#/components/schemas/UserDefaultArgs'
authorId:
type: boolean
published:
Expand Down
Loading
Loading