Skip to content

Commit de795f5

Browse files
authored
Merge pull request #545 from zenstackhq/dev
merge dev to main
2 parents e71bee7 + 97ec4af commit de795f5

File tree

148 files changed

+13618
-1922
lines changed

Some content is hidden

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

148 files changed

+13618
-1922
lines changed

.github/workflows/build-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
strategy:
3535
matrix:
36-
node-version: [20.x]
36+
node-version: [22.x]
3737
provider: [sqlite, postgresql]
3838

3939
steps:

.github/workflows/bump-version.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@ name: Bump Version
22

33
on:
44
workflow_dispatch:
5+
inputs:
6+
version_type:
7+
description: 'Version type to bump'
8+
required: true
9+
type: choice
10+
options:
11+
- patch
12+
- minor
513

614
permissions:
715
contents: write
@@ -26,15 +34,15 @@ jobs:
2634
- name: Use Node.js
2735
uses: actions/setup-node@v4
2836
with:
29-
node-version: 20.x
37+
node-version: 22.x
3038
cache: 'pnpm'
3139

3240
- name: Install dependencies
3341
run: pnpm install --frozen-lockfile
3442

3543
- name: Bump version
3644
id: bump
37-
run: npx tsx scripts/bump-version.ts
45+
run: npx tsx scripts/bump-version.ts ${{ inputs.version_type }}
3846

3947
- name: Create PR
4048
uses: peter-evans/create-pull-request@v7

.github/workflows/publish-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Use Node.js
2929
uses: actions/setup-node@v4
3030
with:
31-
node-version: 20.x
31+
node-version: 22.x
3232
cache: 'pnpm'
3333
registry-url: 'https://registry.npmjs.org'
3434

.github/workflows/update-samples.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
if: steps.check-package.outputs.exists == 'true'
6666
uses: actions/setup-node@v4
6767
with:
68-
node-version: 20.x
68+
node-version: 22.x
6969
cache: 'npm'
7070

7171
- name: Update @zenstackhq packages to latest

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ dist
99
.pnpm-store
1010
*.vsix
1111
.DS_Store
12+
coverage

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Before you start working on anything major, please make sure to open an issue or
66

77
## Prerequisites
88

9-
- Node.js: v20 or above
9+
- Node.js: v22 or above
1010
- PNPM: as specified in [package.json](./package.json)
1111

1212
Test cases are run against both SQLite and Postgres. You should have a postgres server (16 or above) running (either natively or via Docker). The default connection is:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</a>
88
<h1>ZenStack: Modern Data Layer for TypeScript Apps</h1>
99
<a href="https://www.npmjs.com/package/@zenstackhq/cli?activeTab=versions">
10-
<img src="https://img.shields.io/npm/v/%40zenstackhq%2Fcli/next">
10+
<img src="https://img.shields.io/npm/v/%40zenstackhq%2Fcli/latest">
1111
</a>
1212
<img src="https://github.com/zenstackhq/zenstack-v3/actions/workflows/build-test.yml/badge.svg">
1313
<a href="https://twitter.com/zenstackhq">

package.json

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "zenstack-v3",
3-
"version": "3.0.0",
3+
"version": "3.1.0",
44
"description": "ZenStack",
55
"packageManager": "pnpm@10.23.0",
66
"type": "module",
@@ -12,10 +12,12 @@
1212
"test:all": "pnpm run test:sqlite && pnpm run test:pg",
1313
"test:pg": "TEST_DB_PROVIDER=postgresql turbo run test",
1414
"test:sqlite": "TEST_DB_PROVIDER=sqlite turbo run test",
15+
"test:coverage": "vitest run --coverage",
1516
"format": "prettier --write \"**/*.{ts,tsx,md}\"",
1617
"pr": "gh pr create --fill-first --base dev",
1718
"merge-main": "gh pr create --title \"merge dev to main\" --body \"\" --base main --head dev",
18-
"bump-version": "gh workflow run .github/workflows/bump-version.yml --ref dev",
19+
"bump-patch": "gh workflow run .github/workflows/bump-version.yml --ref dev -f version_type=patch",
20+
"bump-minor": "gh workflow run .github/workflows/bump-version.yml --ref dev -f version_type=minor",
1921
"publish-all": "pnpm --filter \"./packages/**\" -r publish --access public",
2022
"publish-preview": "pnpm --filter \"./packages/**\" -r publish --force --registry https://preview.registry.zenstack.dev/",
2123
"unpublish-preview": "pnpm --filter \"./packages/**\" -r --shell-mode exec -- npm unpublish -f --registry https://preview.registry.zenstack.dev/ \"\\$PNPM_PACKAGE_NAME\""
@@ -26,8 +28,10 @@
2628
"devDependencies": {
2729
"@eslint/js": "^9.29.0",
2830
"@types/node": "catalog:",
31+
"@vitest/coverage-v8": "^4.0.16",
2932
"eslint": "~9.29.0",
3033
"glob": "^11.1.0",
34+
"npm-run-all": "^4.1.5",
3135
"prettier": "^3.5.3",
3236
"prisma": "catalog:",
3337
"tsup": "^8.5.0",
@@ -40,7 +44,10 @@
4044
},
4145
"pnpm": {
4246
"onlyBuiltDependencies": [
43-
"better-sqlite3"
47+
"@parcel/watcher",
48+
"better-sqlite3",
49+
"esbuild",
50+
"vue-demi"
4451
]
4552
}
4653
}

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",
3+
"version": "3.1.0",
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: 4 additions & 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",
6+
"version": "3.1.0",
77
"type": "module",
88
"author": {
99
"name": "ZenStack Team"
@@ -28,6 +28,9 @@
2828
"test": "vitest run",
2929
"pack": "pnpm pack"
3030
},
31+
"exports": {
32+
"./package.json": "./package.json"
33+
},
3134
"dependencies": {
3235
"@zenstackhq/common-helpers": "workspace:*",
3336
"@zenstackhq/language": "workspace:*",

0 commit comments

Comments
 (0)