Skip to content

Commit ff8b691

Browse files
authored
merge dev to main (v1.8.0) (#975)
2 parents 2b2bfcf + fd9ba9c commit ff8b691

Some content is hidden

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

63 files changed

+2165
-237
lines changed

.github/workflows/build-test.yml

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

3232
strategy:
3333
matrix:
34-
node-version: [18.x]
34+
node-version: [20.x]
3535
prisma-version: [v4, v5]
3636

3737
steps:

README.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,18 @@ The following diagram gives a high-level architecture overview of ZenStack.
183183

184184
## Examples
185185

186-
### Todo SaaS App
186+
### Schema Samples
187+
188+
The [sample repo](https://github.com/zenstackhq/authz-modeling-samples) includes the following patterns:
189+
190+
- ACL
191+
- RBAC
192+
- ABAC
193+
- Multi-Tenancy
194+
195+
You can use [this blog post](https://zenstack.dev/blog/model-authz) as an introduction.
196+
197+
### Multi-Tenant Todo App
187198

188199
Check out the [Multi-tenant Todo App](https://zenstack-todo.vercel.app/) for a running example. You can find different implementations below:
189200

@@ -213,6 +224,8 @@ Join our [discord server](https://discord.gg/Ykhr738dUe) for chat and updates!
213224

214225
If you like ZenStack, join us to make it a better tool! Please use the [Contributing Guide](CONTRIBUTING.md) for details on how to get started, and don't hesitate to join [Discord](https://discord.gg/Ykhr738dUe) to share your thoughts.
215226

227+
Please also consider [sponsoring our work](https://github.com/sponsors/zenstackhq) to speed up the development of ZenStack. Thank you!
228+
216229
## License
217230

218231
[MIT](LICENSE)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "zenstack-monorepo",
3-
"version": "1.7.1",
3+
"version": "1.8.0",
44
"description": "",
55
"scripts": {
66
"build": "pnpm -r build",

packages/ide/jetbrains/.idea/misc.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Changelog
2+
3+
## [Unreleased]
4+
5+
### Added
6+
- Auto-completion is now supported inside attributes.

packages/ide/jetbrains/build.gradle.kts

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1+
import org.jetbrains.changelog.Changelog
2+
import org.jetbrains.changelog.date
3+
14
plugins {
25
id("java")
36
id("org.jetbrains.kotlin.jvm") version "1.9.21"
47
id("org.jetbrains.intellij") version "1.16.1"
8+
id("org.jetbrains.changelog") version "2.2.0"
59
}
610

711
group = "dev.zenstack"
8-
version = "1.7.1"
12+
version = "1.8.0"
913

1014
repositories {
1115
mavenCentral()
@@ -52,8 +56,17 @@ tasks {
5256
}
5357

5458
patchPluginXml {
55-
sinceBuild.set("231")
56-
untilBuild.set("241.*")
59+
sinceBuild.set("233.2")
60+
untilBuild.set("251.*")
61+
changeNotes.set(provider {
62+
changelog.renderItem(
63+
changelog
64+
.getUnreleased()
65+
.withHeader(false)
66+
.withEmptySections(false),
67+
Changelog.OutputType.HTML
68+
)
69+
})
5770
}
5871

5972
signPlugin {
@@ -66,3 +79,21 @@ tasks {
6679
token.set(System.getenv("PUBLISH_TOKEN"))
6780
}
6881
}
82+
83+
changelog {
84+
header.set(provider { "[${version.get()}] - ${date()}" })
85+
introduction.set(
86+
"""
87+
[ZenStack](https://zenstack.dev) is a toolkit that simplifies the development of a web app's backend. This plugin provides code editing experiences for its ZModel schema language.
88+
89+
## Features
90+
91+
- Syntax highlighting
92+
- Error highlighting
93+
- Go to definition
94+
- Code completion
95+
- Formatting
96+
""".trimIndent()
97+
)
98+
groups.set(listOf("Added", "Changed", "Deprecated", "Removed", "Fixed", "Security"))
99+
}

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": "1.7.1",
3+
"version": "1.8.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": "1.7.1",
3+
"version": "1.8.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": "1.7.1",
4+
"version": "1.8.0",
55
"description": "CLI and runtime for integrating ZenStack with RedwoodJS projects.",
66
"repository": {
77
"type": "git",

packages/plugins/openapi/package.json

Lines changed: 1 addition & 1 deletion
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": "1.7.1",
4+
"version": "1.8.0",
55
"description": "ZenStack plugin and runtime supporting OpenAPI",
66
"main": "index.js",
77
"repository": {

0 commit comments

Comments
 (0)