Skip to content

Commit 06e87f8

Browse files
authored
merge dev to main (v2.3.0) (#1569)
2 parents b06cee6 + 4c6cde6 commit 06e87f8

File tree

83 files changed

+14112
-10374
lines changed

Some content is hidden

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

83 files changed

+14112
-10374
lines changed

.github/workflows/build-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- name: Install pnpm
4747
uses: pnpm/action-setup@v2
4848
with:
49-
version: ^7.15.0
49+
version: 9.4.0
5050

5151
- name: Use Node.js ${{ matrix.node-version }}
5252
uses: buildjet/setup-node@v3

.github/workflows/integration-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- name: Install pnpm
4747
uses: pnpm/action-setup@v2
4848
with:
49-
version: ^7.15.0
49+
version: 9.4.0
5050

5151
- name: Use Node.js ${{ matrix.node-version }}
5252
uses: buildjet/setup-node@v3

.github/workflows/regression-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- name: Install pnpm
4747
uses: pnpm/action-setup@v2
4848
with:
49-
version: ^7.15.0
49+
version: 9.4.0
5050

5151
- name: Use Node.js ${{ matrix.node-version }}
5252
uses: buildjet/setup-node@v3

CONTRIBUTING.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ I want to think you first for considering contributing to ZenStack 🙏🏻. It'
44

55
## Prerequisites
66

7-
- [Node.js](https://nodejs.org/): v18 or above
8-
- [pnpm](https://pnpm.io/): v8.x
7+
- [Node.js](https://nodejs.org/): v20 or above
8+
- [pnpm](https://pnpm.io/): v9.4.0
99

1010
If you want to run the tests, you should be aware that some of the integration tests run against postgres. These tests will attempt to set up and subsequently their own database, so you'll need to provide a connection details for a postgres user with at least those permissions. To provide connection details, you can configure the following environment variables or provide them when executing `pnpm test` commands.
1111

12-
- `ZENSTACK_TEST_DB_USER`: The postgres username, for a user with permission to create/drop databases. Default: `postgres`.
13-
- `ZENSTACK_TEST_DB_PASS`: Password for said user. Default: `abc123`.
14-
- `ZENSTACK_TEST_DB_NAME`: Default database to connect onto. This database isn't used any further, so it's recommended to just use the default `postgres` database. Default: `postgres`.
15-
- `ZENSTACK_TEST_DB_HOST`: Hostname or IP to connect onto. Default: `localhost`.
16-
- `ZENSTACK_TEST_DB_PORT`: Port number to connect onto. Default: `5432`.
12+
- `ZENSTACK_TEST_DB_USER`: The postgres username, for a user with permission to create/drop databases. Default: `postgres`.
13+
- `ZENSTACK_TEST_DB_PASS`: Password for said user. Default: `abc123`.
14+
- `ZENSTACK_TEST_DB_NAME`: Default database to connect onto. This database isn't used any further, so it's recommended to just use the default `postgres` database. Default: `postgres`.
15+
- `ZENSTACK_TEST_DB_HOST`: Hostname or IP to connect onto. Default: `localhost`.
16+
- `ZENSTACK_TEST_DB_PORT`: Port number to connect onto. Default: `5432`.
1717

1818
## Get started
1919

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
## What it is
2828

29-
ZenStack is a Node.js/TypeScript toolkit that simplifies the development of a web app's backend. It supercharges [Prisma ORM](https://prisma.io) with a powerful access control layer and unleashes its full potential for full-stack development.
29+
ZenStack is a Node.js/TypeScript toolkit that simplifies the development of a web app's backend. It enhances [Prisma ORM](https://prisma.io) with a flexible Authorization layer and auto-generated, type-safe APIs/hooks, unlocking its full potential for full-stack development.
3030

3131
Our goal is to let you save time writing boilerplate code and focus on building real features!
3232

@@ -234,6 +234,7 @@ Thank you for your support!
234234

235235
<table>
236236
<tr>
237+
<td align="center"><a href="https://github.com/umussetu"><img src="https://avatars.githubusercontent.com/u/152648499?v=4" width="100" style="border-radius:50%" alt="Ulric"/><br />Ulric</a></td>
237238
<td align="center"><a href="https://github.com/Mermaid-Chart"><img src="https://avatars.githubusercontent.com/u/117662492?s=200&v=4" width="100" style="border-radius:50%" alt="Mermaid Chart"/><br />Mermaid Chart</a></td>
238239
<td align="center"><a href="https://github.com/coderabbitai"><img src="https://avatars.githubusercontent.com/u/132028505?v=4" width="100" style="border-radius:50%" alt="CodeRabbit"/><br />CodeRabbit</a></td>
239240
<td align="center"><a href="https://github.com/j0hannr"><img src="https://avatars.githubusercontent.com/u/52762073?v=4" width="100" style="border-radius:50%" alt="Johann Rohn"/><br />Johann Rohn</a></td>

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "zenstack-monorepo",
3-
"version": "2.2.4",
3+
"version": "2.3.0",
44
"description": "",
55
"scripts": {
66
"build": "pnpm -r build",
@@ -21,6 +21,7 @@
2121
"keywords": [],
2222
"author": "",
2323
"license": "MIT",
24+
"packageManager": "[email protected]+sha256.b6fd0bfda555e7e584ad7e56b30c68b01d5a04f9ee93989f4b93ca8473c49c74",
2425
"devDependencies": {
2526
"@changesets/cli": "^2.26.0",
2627
"@types/jest": "^29.5.10",

packages/ide/jetbrains/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
}
1010

1111
group = "dev.zenstack"
12-
version = "2.2.4"
12+
version = "2.3.0"
1313

1414
repositories {
1515
mavenCentral()

packages/ide/jetbrains/package.json

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

packages/language/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@zenstackhq/language",
3-
"version": "2.2.4",
3+
"version": "2.3.0",
44
"displayName": "ZenStack modeling language compiler",
55
"description": "ZenStack modeling language compiler",
66
"homepage": "https://zenstack.dev",

packages/misc/redwood/package.json

Lines changed: 1 addition & 1 deletion
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.2.4",
4+
"version": "2.3.0",
55
"description": "CLI and runtime for integrating ZenStack with RedwoodJS projects.",
66
"repository": {
77
"type": "git",

0 commit comments

Comments
 (0)