merge from dev and resolve conflicts

Author: ymc9

.changeset/README.md

@@ -46,7 +46,7 @@ jobs:
             - name: Install pnpm
               uses: pnpm/action-setup@v2
               with:
-                  version: 9.4.0
+                  version: 9.15.9
 
             - name: Use Node.js ${{ matrix.node-version }}
               uses: buildjet/setup-node@v3

.changeset/config.json

@@ -46,7 +46,7 @@ jobs:
             - name: Install pnpm
               uses: pnpm/action-setup@v2
               with:
-                  version: 9.4.0
+                  version: 9.15.9
 
             - name: Use Node.js ${{ matrix.node-version }}
               uses: buildjet/setup-node@v3

.github/workflows/build-test.yml

@@ -46,7 +46,7 @@ jobs:
             - name: Install pnpm
               uses: pnpm/action-setup@v2
               with:
-                  version: 9.4.0
+                  version: 9.15.9
 
             - name: Use Node.js ${{ matrix.node-version }}
               uses: buildjet/setup-node@v3

.github/workflows/integration-test.yml

@@ -5,7 +5,7 @@ I want to think you first for considering contributing to ZenStack 🙏🏻. It'
 ## Prerequisites
 
 -   [Node.js](https://nodejs.org/): v20 or above
--   [pnpm](https://pnpm.io/): v9.4.0
+-   [pnpm](https://pnpm.io/): v9.15.9
 
 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.
 

.github/workflows/regression-test.yml

@@ -10,7 +10,7 @@
         <img src="https://img.shields.io/npm/v/zenstack">
     </a>
     <a href="https://www.npmjs.com/package/zenstack">
-        <img src="https://img.shields.io/npm/dm/zenstack">
+        <img src="https://img.shields.io/npm/dm/@zenstackhq/runtime">
     </a>
     <img src="https://github.com/zenstackhq/zenstack/actions/workflows/build-test.yml/badge.svg">
     <a href="https://twitter.com/zenstackhq">

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 {
     "name": "zenstack-monorepo",
-    "version": "2.17.2",
+    "version": "2.18.1",
     "description": "",
     "scripts": {
         "build": "pnpm -r --filter=\"!./packages/ide/*\" build",
@@ -22,11 +22,10 @@
     "keywords": [],
     "author": "",
     "license": "MIT",
-    "packageManager": "pnpm@9.4.0+sha256.b6fd0bfda555e7e584ad7e56b30c68b01d5a04f9ee93989f4b93ca8473c49c74",
+    "packageManager": "pnpm@9.15.9",
     "devDependencies": {
-        "@changesets/cli": "^2.26.0",
         "@types/jest": "^29.5.10",
-        "@types/node": "^20.10.2",
+        "@types/node": "^20.14.9",
         "@typescript-eslint/eslint-plugin": "^7.6.0",
         "@typescript-eslint/parser": "^7.6.0",
         "concurrently": "^7.4.0",
@@ -38,6 +37,6 @@
         "ts-jest": "^29.1.1",
         "tsup": "^8.0.1",
         "tsx": "^4.7.1",
-        "typescript": "^5.4.4"
+        "typescript": "catalog:"
     }
 }

README.md

@@ -4,6 +4,12 @@
 
 ### Fixed
 
+-   Views are not required to have a unique identifying field marked with `@id` or `@unique`.
+
+## 2.17.0
+
+### Fixed
+
 -   Support `@db.Json` and `@db.JsonB` attributes on strongly typed JSON fields.
 
 ## 2.16.0

package.json

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "dev.zenstack"
-version = "2.17.2"
+version = "2.18.1"
 
 repositories {
     mavenCentral()