Skip to content

Commit 689d013

Browse files
ymc9ymc9
authored
merge dev to main (v2.10.2) (#1919)
2 parents f7f85ea + b41fd93 commit 689d013

File tree

28 files changed

+113
-192
lines changed

28 files changed

+113
-192
lines changed

‎.github/workflows/codeql.yml

+1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ jobs:
6262
- name: Initialize CodeQL
6363
uses: github/codeql-action/init@v3
6464
with:
65+
config-file: ./.github/workflows/config/codeql-config.yml
6566
languages: ${{ matrix.language }}
6667
build-mode: ${{ matrix.build-mode }}
6768
# If you wish to specify custom queries, you can do so here or in a config file.

‎.github/workflows/config/codeql-config.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
paths:
2+
- 'packages'
3+
paths-ignore:
4+
- '**/*.test.js'
5+
- '**/*.test.ts'
6+
- '**/*.test.tsx'
7+
- '**/__tests__/**'
8+
- 'packages/ide/**'

‎.github/workflows/management-changelog.yml

-58
This file was deleted.

‎.github/workflows/security-defender-for-devops.yml

-66
This file was deleted.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "zenstack-monorepo",
3-
"version": "2.10.1",
3+
"version": "2.10.2",
44
"description": "",
55
"scripts": {
66
"build": "pnpm -r --filter=\"!./packages/ide/*\" build",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
}
1010

1111
group = "dev.zenstack"
12-
version = "2.10.1"
12+
version = "2.10.2"
1313

1414
repositories {
1515
mavenCentral()

‎packages/ide/jetbrains/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jetbrains",
3-
"version": "2.10.1",
3+
"version": "2.10.2",
44
"displayName": "ZenStack JetBrains IDE Plugin",
55
"description": "ZenStack JetBrains IDE plugin",
66
"homepage": "https://zenstack.dev",

‎packages/language/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@zenstackhq/language",
3-
"version": "2.10.1",
3+
"version": "2.10.2",
44
"displayName": "ZenStack modeling language compiler",
55
"description": "ZenStack modeling language compiler",
66
"homepage": "https://zenstack.dev",

‎packages/misc/redwood/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@zenstackhq/redwood",
33
"displayName": "ZenStack RedwoodJS Integration",
4-
"version": "2.10.1",
4+
"version": "2.10.2",
55
"description": "CLI and runtime for integrating ZenStack with RedwoodJS projects.",
66
"repository": {
77
"type": "git",

‎packages/plugins/openapi/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@zenstackhq/openapi",
33
"displayName": "ZenStack Plugin and Runtime for OpenAPI",
4-
"version": "2.10.1",
4+
"version": "2.10.2",
55
"description": "ZenStack plugin and runtime supporting OpenAPI",
66
"main": "index.js",
77
"repository": {

‎packages/plugins/swr/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@zenstackhq/swr",
33
"displayName": "ZenStack plugin for generating SWR hooks",
4-
"version": "2.10.1",
4+
"version": "2.10.2",
55
"description": "ZenStack plugin for generating SWR hooks",
66
"main": "index.js",
77
"repository": {

‎packages/plugins/tanstack-query/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@zenstackhq/tanstack-query",
33
"displayName": "ZenStack plugin for generating tanstack-query hooks",
4-
"version": "2.10.1",
4+
"version": "2.10.2",
55
"description": "ZenStack plugin for generating tanstack-query hooks",
66
"main": "index.js",
77
"exports": {

‎packages/plugins/trpc/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@zenstackhq/trpc",
33
"displayName": "ZenStack plugin for tRPC",
4-
"version": "2.10.1",
4+
"version": "2.10.2",
55
"description": "ZenStack plugin for tRPC",
66
"main": "index.js",
77
"repository": {

‎packages/plugins/trpc/tests/projects/nuxt-trpc-v10/package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/plugins/trpc/tests/projects/nuxt-trpc-v10/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"postinstall": "nuxt prepare"
1111
},
1212
"dependencies": {
13-
"@prisma/client": "6.0.x",
13+
"@prisma/client": "6.1.x",
1414
"@trpc/client": "^10.45.2",
1515
"@trpc/server": "^10.45.2",
1616
"nuxt": "^3.14.1592",
@@ -21,7 +21,7 @@
2121
},
2222
"devDependencies": {
2323
"esbuild": "^0.24.0",
24-
"prisma": "6.0.x",
24+
"prisma": "6.1.x",
2525
"typescript": "^5.6.2",
2626
"vue-tsc": "^2.1.10"
2727
}

‎packages/plugins/trpc/tests/projects/nuxt-trpc-v11/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"postinstall": "nuxt prepare"
1111
},
1212
"dependencies": {
13-
"@prisma/client": "6.0.x",
13+
"@prisma/client": "6.1.x",
1414
"@trpc/client": "^11.0.0-rc.563",
1515
"@trpc/server": "^11.0.0-rc.563",
1616
"nuxt": "^3.14.1592",
@@ -21,7 +21,7 @@
2121
},
2222
"devDependencies": {
2323
"esbuild": "^0.24.0",
24-
"prisma": "6.0.x",
24+
"prisma": "6.1.x",
2525
"typescript": "^5.6.2",
2626
"vue-tsc": "^2.1.10"
2727
}

‎packages/plugins/trpc/tests/projects/t3-trpc-v11/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"start": "next start"
1616
},
1717
"dependencies": {
18-
"@prisma/client": "6.0.x",
18+
"@prisma/client": "6.1.x",
1919
"@t3-oss/env-nextjs": "^0.10.1",
2020
"@tanstack/react-query": "^5.50.0",
2121
"@trpc/client": "^11.0.0-rc.446",
@@ -39,7 +39,7 @@
3939
"@typescript-eslint/parser": "^8.1.0",
4040
"eslint": "^8.57.0",
4141
"eslint-config-next": "^14.2.4",
42-
"prisma": "6.0.x",
42+
"prisma": "6.1.x",
4343
"typescript": "^5.5.3"
4444
},
4545
"ct3aMetadata": {

‎packages/runtime/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@zenstackhq/runtime",
33
"displayName": "ZenStack Runtime Library",
4-
"version": "2.10.1",
4+
"version": "2.10.2",
55
"description": "Runtime of ZenStack for both client-side and server-side environments.",
66
"repository": {
77
"type": "git",
@@ -111,7 +111,7 @@
111111
"zod-validation-error": "^1.5.0"
112112
},
113113
"peerDependencies": {
114-
"@prisma/client": "5.0.0 - 6.0.x"
114+
"@prisma/client": "5.0.0 - 6.1.x"
115115
},
116116
"author": {
117117
"name": "ZenStack Team"

‎packages/schema/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"publisher": "zenstack",
44
"displayName": "ZenStack Language Tools",
55
"description": "FullStack enhancement for Prisma ORM: seamless integration from database to UI",
6-
"version": "2.10.1",
6+
"version": "2.10.2",
77
"author": {
88
"name": "ZenStack Team"
99
},
@@ -123,10 +123,10 @@
123123
"zod-validation-error": "^1.5.0"
124124
},
125125
"peerDependencies": {
126-
"prisma": "5.0.0 - 6.0.x"
126+
"prisma": "5.0.0 - 6.1.x"
127127
},
128128
"devDependencies": {
129-
"@prisma/client": "6.0.x",
129+
"@prisma/client": "6.1.x",
130130
"@types/async-exit-hook": "^2.0.0",
131131
"@types/pluralize": "^0.0.29",
132132
"@types/semver": "^7.3.13",

‎packages/sdk/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@zenstackhq/sdk",
3-
"version": "2.10.1",
3+
"version": "2.10.2",
44
"description": "ZenStack plugin development SDK",
55
"main": "index.js",
66
"scripts": {
@@ -18,8 +18,8 @@
1818
"author": "",
1919
"license": "MIT",
2020
"dependencies": {
21-
"@prisma/generator-helper": "6.0.x",
22-
"@prisma/internals": "6.0.x",
21+
"@prisma/generator-helper": "6.1.x",
22+
"@prisma/internals": "6.1.x",
2323
"@zenstackhq/language": "workspace:*",
2424
"@zenstackhq/runtime": "workspace:*",
2525
"langium": "1.3.1",

‎packages/server/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@zenstackhq/server",
3-
"version": "2.10.1",
3+
"version": "2.10.2",
44
"displayName": "ZenStack Server-side Adapters",
55
"description": "ZenStack server-side adapters",
66
"homepage": "https://zenstack.dev",

‎packages/testtools/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@zenstackhq/testtools",
3-
"version": "2.10.1",
3+
"version": "2.10.2",
44
"description": "ZenStack Test Tools",
55
"main": "index.js",
66
"private": true,

0 commit comments

Comments
 (0)