Skip to content

Commit d70bd9b

Browse files
authored
merge dev to main (v2.18.0) (#2217)
2 parents 692b714 + f889796 commit d70bd9b

File tree

87 files changed

+1122
-968
lines changed

Some content is hidden

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

87 files changed

+1122
-968
lines changed

.changeset/README.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

.changeset/config.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

.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: 9.4.0
49+
version: 9.15.9
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: 9.4.0
49+
version: 9.15.9
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: 9.4.0
49+
version: 9.15.9
5050

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

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ I want to think you first for considering contributing to ZenStack 🙏🏻. It'
55
## Prerequisites
66

77
- [Node.js](https://nodejs.org/): v20 or above
8-
- [pnpm](https://pnpm.io/): v9.4.0
8+
- [pnpm](https://pnpm.io/): v9.15.9
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

package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "zenstack-monorepo",
3-
"version": "2.17.2",
3+
"version": "2.18.0",
44
"description": "",
55
"scripts": {
66
"build": "pnpm -r --filter=\"!./packages/ide/*\" build",
@@ -22,11 +22,10 @@
2222
"keywords": [],
2323
"author": "",
2424
"license": "MIT",
25-
"packageManager": "pnpm@9.4.0+sha256.b6fd0bfda555e7e584ad7e56b30c68b01d5a04f9ee93989f4b93ca8473c49c74",
25+
"packageManager": "pnpm@9.15.9",
2626
"devDependencies": {
27-
"@changesets/cli": "^2.26.0",
2827
"@types/jest": "^29.5.10",
29-
"@types/node": "^20.10.2",
28+
"@types/node": "^20.14.9",
3029
"@typescript-eslint/eslint-plugin": "^7.6.0",
3130
"@typescript-eslint/parser": "^7.6.0",
3231
"concurrently": "^7.4.0",
@@ -38,6 +37,6 @@
3837
"ts-jest": "^29.1.1",
3938
"tsup": "^8.0.1",
4039
"tsx": "^4.7.1",
41-
"typescript": "^5.4.4"
40+
"typescript": "catalog:"
4241
}
4342
}

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.17.2"
12+
version = "2.18.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.17.2",
3+
"version": "2.18.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.17.2",
3+
"version": "2.18.0",
44
"displayName": "ZenStack modeling language compiler",
55
"description": "ZenStack modeling language compiler",
66
"homepage": "https://zenstack.dev",

0 commit comments

Comments
 (0)