Skip to content

Commit db5e4c6

Browse files
authored
merge dev to main (v2.20.0) (#2271)
2 parents dfe721c + a93a2db commit db5e4c6

File tree

78 files changed

+716
-272
lines changed

Some content is hidden

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

78 files changed

+716
-272
lines changed

.devcontainer/.env

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
POSTGRES_USER=postgres
2+
POSTGRES_PASSWORD=abc123
3+
POSTGRES_DB=postgres
4+
POSTGRES_HOST=postgres
5+
POSTGRES_PORT=5432
6+
7+
ZENSTACK_TEST_DB_USER=postgres
8+
ZENSTACK_TEST_DB_PASS=abc123
9+
ZENSTACK_TEST_DB_NAME=postgres
10+
ZENSTACK_TEST_DB_HOST=postgres
11+
ZENSTACK_TEST_DB_PORT=5432

.devcontainer/devcontainer.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"name": "zenstack",
3+
"dockerComposeFile": [
4+
"./docker-compose.yml"
5+
],
6+
"workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind",
7+
"workspaceFolder": "/workspace",
8+
"service": "workspace",
9+
"shutdownAction": "stopCompose",
10+
"postCreateCommand": "npm i -g [email protected] && pnpm install && pnpm build && pnpm test-scaffold",
11+
"remoteUser": "node",
12+
"customizations": {
13+
"vscode": {
14+
"extensions": [
15+
"langium.langium-vscode",
16+
"firsttris.vscode-jest-runner"
17+
]
18+
}
19+
}
20+
}

.devcontainer/docker-compose.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: zenstack
2+
3+
volumes:
4+
postgres-data:
5+
6+
networks:
7+
workspace:
8+
external: false
9+
10+
services:
11+
workspace:
12+
container_name: zenstack-workspace
13+
image: mcr.microsoft.com/devcontainers/javascript-node:20
14+
restart: always
15+
volumes:
16+
- ..:/workspace:cached
17+
env_file: ./.env
18+
command: sleep infinity
19+
networks:
20+
- workspace
21+
22+
postgres:
23+
container_name: zenstack-postgres
24+
image: postgres
25+
restart: always
26+
volumes:
27+
- postgres-data:/var/lib/postgresql/
28+
env_file: ./.env
29+
networks:
30+
- workspace
31+
ports:
32+
- 5432:5432
33+
healthcheck:
34+
test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
35+
interval: 5s
36+
timeout: 5s
37+
retries: 5

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ dist
88
coverage
99
.build
1010
.test
11+
.pnpm-store

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": "2.19.2",
3+
"version": "2.20.0",
44
"description": "",
55
"scripts": {
66
"build": "pnpm -r --filter=\"!./packages/ide/*\" build",

packages/ide/jetbrains/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44

55
### Fixed
66

7+
- Update JetBrains platform version compatibility.
8+
9+
## 2.18.0
10+
11+
### Fixed
12+
713
- Views are not required to have a unique identifying field marked with `@id` or `@unique`.
814

915
## 2.17.0

packages/ide/jetbrains/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
}
1010

1111
group = "dev.zenstack"
12-
version = "2.19.2"
12+
version = "2.20.0"
1313

1414
repositories {
1515
mavenCentral()
@@ -57,7 +57,7 @@ tasks {
5757

5858
patchPluginXml {
5959
sinceBuild.set("233.2")
60-
untilBuild.set("251.*")
60+
untilBuild.set("271.*")
6161
changeNotes.set(provider {
6262
changelog.renderItem(
6363
changelog

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

0 commit comments

Comments
 (0)