Skip to content

Commit 4b598bb

Browse files
authored
Merge pull request #460 from zenstackhq/dev
merge dev to main (v3.0.0-beta.27)
2 parents 29c4df2 + 6330c3b commit 4b598bb

File tree

59 files changed

+1161
-320
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1161
-320
lines changed

.github/workflows/build-test.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ jobs:
5151
node-version: ${{ matrix.node-version }}
5252
cache: 'pnpm'
5353

54+
- name: Use Bun
55+
uses: oven-sh/setup-bun@v2
56+
with:
57+
bun-version: latest
58+
5459
- name: Get pnpm store directory
5560
id: pnpm-cache
5661
shell: bash

.vscode/extensions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
44

55
// List of extensions which should be recommended for users of this workspace.
6-
"recommendations": ["langium.langium-vscode", "kingwl.vscode-vitest-runner"]
6+
"recommendations": ["langium.langium-vscode", "vitest.explorer"]
77
}

.vscode/settings.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
{}
1+
{
2+
"vitest.maximumConfigs": 20
3+
}

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
"name": "zenstack-v3",
3-
"version": "3.0.0-beta.26",
3+
"version": "3.0.0-beta.27",
44
"description": "ZenStack",
55
"packageManager": "[email protected]",
6+
"type": "module",
67
"scripts": {
78
"build": "turbo run build",
89
"watch": "turbo run watch build",
910
"lint": "turbo run lint",
10-
"test": "vitest run",
11+
"test": "turbo run test",
1112
"format": "prettier --write \"**/*.{ts,tsx,md}\"",
1213
"pr": "gh pr create --fill-first --base dev",
1314
"merge-main": "gh pr create --title \"merge dev to main\" --body \"\" --base main --head dev",
@@ -31,7 +32,7 @@
3132
"turbo": "^2.5.4",
3233
"typescript": "catalog:",
3334
"typescript-eslint": "^8.34.1",
34-
"vitest": "^3.2.4",
35+
"vitest": "^4.0.14",
3536
"yaml": "^2.8.0"
3637
},
3738
"pnpm": {

packages/auth-adapters/better-auth/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@zenstackhq/better-auth",
3-
"version": "3.0.0-beta.26",
3+
"version": "3.0.0-beta.27",
44
"description": "ZenStack Better Auth Adapter. This adapter is modified from better-auth's Prisma adapter.",
55
"type": "module",
66
"scripts": {

packages/cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"publisher": "zenstack",
44
"displayName": "ZenStack CLI",
55
"description": "FullStack database toolkit with built-in access control and automatic API generation.",
6-
"version": "3.0.0-beta.26",
6+
"version": "3.0.0-beta.27",
77
"type": "module",
88
"author": {
99
"name": "ZenStack Team"

packages/cli/src/utils/exec-utils.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,19 @@ export function execPrisma(args: string, options?: Omit<ExecSyncOptions, 'env'>
4343
// ignore and fallback
4444
}
4545

46+
const _options = {
47+
...options,
48+
env: {
49+
...options?.env,
50+
PRISMA_HIDE_UPDATE_MESSAGE: '1',
51+
},
52+
};
53+
4654
if (!prismaPath) {
4755
// fallback to npx/bunx execute
48-
execPackage(`prisma ${args}`, options);
56+
execPackage(`prisma ${args}`, _options);
4957
return;
5058
}
5159

52-
execSync(`node ${prismaPath} ${args}`, options);
60+
execSync(`node ${prismaPath} ${args}`, _options);
5361
}

packages/clients/tanstack-query/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@zenstackhq/tanstack-query",
3-
"version": "3.0.0-beta.26",
3+
"version": "3.0.0-beta.27",
44
"description": "TanStack Query Client for consuming ZenStack v3's CRUD service",
55
"main": "index.js",
66
"type": "module",

packages/common-helpers/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@zenstackhq/common-helpers",
3-
"version": "3.0.0-beta.26",
3+
"version": "3.0.0-beta.27",
44
"description": "ZenStack Common Helpers",
55
"type": "module",
66
"scripts": {

packages/config/eslint-config/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@zenstackhq/eslint-config",
3-
"version": "3.0.0-beta.26",
3+
"version": "3.0.0-beta.27",
44
"type": "module",
55
"private": true,
66
"license": "MIT"

0 commit comments

Comments
 (0)