merge dev to main (v2.4.0) (#1635)

Author: ymc9

.npmrc

@@ -1,2 +1,3 @@
 auto-install-peers=true
 git-checks=false
+node-linker=hoisted

package.json

@@ -1,6 +1,6 @@
 {
     "name": "zenstack-monorepo",
-    "version": "2.3.3",
+    "version": "2.4.0",
     "description": "",
     "scripts": {
         "build": "pnpm -r build",

packages/ide/jetbrains/build.gradle.kts

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

packages/ide/jetbrains/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jetbrains",
-  "version": "2.3.3",
+  "version": "2.4.0",
   "displayName": "ZenStack JetBrains IDE Plugin",
   "description": "ZenStack JetBrains IDE plugin",
   "homepage": "https://zenstack.dev",

packages/language/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/language",
-    "version": "2.3.3",
+    "version": "2.4.0",
     "displayName": "ZenStack modeling language compiler",
     "description": "ZenStack modeling language compiler",
     "homepage": "https://zenstack.dev",

packages/misc/redwood/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/redwood",
     "displayName": "ZenStack RedwoodJS Integration",
-    "version": "2.3.3",
+    "version": "2.4.0",
     "description": "CLI and runtime for integrating ZenStack with RedwoodJS projects.",
     "repository": {
         "type": "git",
@@ -39,17 +39,18 @@
     "homepage": "https://zenstack.dev",
     "license": "MIT",
     "dependencies": {
+        "@redwoodjs/cli-helpers": "^7.7.3",
         "@zenstackhq/runtime": "workspace:*",
         "colors": "1.4.0",
-        "ts-morph": "^16.0.0",
-        "@redwoodjs/cli-helpers": "^6.6.0",
         "execa": "^5.0.0",
         "listr2": "^6.0.0",
+        "semver": "^7.5.2",
         "terminal-link": "^2.0.0",
+        "ts-morph": "^16.0.0",
         "yargs": "^17.7.2"
     },
     "devDependencies": {
-        "@redwoodjs/graphql-server": "^6.6.0",
+        "@redwoodjs/graphql-server": "^7.7.3",
         "@types/yargs": "^17.0.32",
         "graphql-yoga": "^5.0.2"
     }

packages/misc/redwood/src/commands/setup.ts

@@ -1,9 +1,10 @@
-import { getPaths, updateTomlConfig } from '@redwoodjs/cli-helpers';
+import { getInstalledRedwoodVersion, getPaths, updateTomlConfig } from '@redwoodjs/cli-helpers';
 import colors from 'colors';
 import execa from 'execa';
 import fs from 'fs';
 import { Listr, ListrTask } from 'listr2';
 import path from 'path';
+import semver from 'semver';
 import terminalLink from 'terminal-link';
 import { Project, SyntaxKind, type PropertyAssignment } from 'ts-morph';
 import type { CommandModule } from 'yargs';
@@ -47,8 +48,8 @@ function bootstrapSchema() {
                 const pkg = JSON.parse(content);
                 if (!pkg.zenstack) {
                     pkg.zenstack = {
-                        schema: path.relative(apiPaths.base, zmodel),
-                        prisma: path.relative(apiPaths.base, apiPaths.dbSchema),
+                        schema: normalizePath(path.relative(apiPaths.base, zmodel)),
+                        prisma: normalizePath(path.relative(apiPaths.base, apiPaths.dbSchema)),
                     };
                     fs.writeFileSync(pkgJson, JSON.stringify(pkg, null, 4));
                 }
@@ -57,6 +58,11 @@ function bootstrapSchema() {
     };
 }
 
+// ensures posix path separators are used in package.json
+function normalizePath(_path: string) {
+    return _path.replaceAll(path.sep, path.posix.sep);
+}
+
 // install ZenStack GraphQLYoga plugin
 function installGraphQLPlugin() {
     return {
@@ -144,11 +150,17 @@ function installGraphQLPlugin() {
             if (graphQlSourcePath.endsWith('.ts')) {
                 const typeDefPath = path.join(getPaths().api.src, 'zenstack.d.ts');
                 if (!fs.existsSync(typeDefPath)) {
+                    const rwVersion: string = getInstalledRedwoodVersion();
+                    const contextModule =
+                        rwVersion && semver.lt(rwVersion, '7.0.0')
+                            ? '@redwoodjs/graphql-server' // pre v7
+                            : '@redwoodjs/context'; // v7+
+
                     const typeDefSourceFile = project.createSourceFile(
                         typeDefPath,
-                        `import type { PrismaClient } from '@prisma/client'
+                        `import type { PrismaClient } from '@zenstackhq/runtime'
 
-declare module '@redwoodjs/graphql-server' {
+declare module '${contextModule}' {
   interface GlobalContext {
     db: PrismaClient
   }

packages/plugins/openapi/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zenstackhq/openapi",
   "displayName": "ZenStack Plugin and Runtime for OpenAPI",
-  "version": "2.3.3",
+  "version": "2.4.0",
   "description": "ZenStack plugin and runtime supporting OpenAPI",
   "main": "index.js",
   "repository": {

packages/plugins/swr/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/swr",
     "displayName": "ZenStack plugin for generating SWR hooks",
-    "version": "2.3.3",
+    "version": "2.4.0",
     "description": "ZenStack plugin for generating SWR hooks",
     "main": "index.js",
     "repository": {

packages/plugins/tanstack-query/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/tanstack-query",
     "displayName": "ZenStack plugin for generating tanstack-query hooks",
-    "version": "2.3.3",
+    "version": "2.4.0",
     "description": "ZenStack plugin for generating tanstack-query hooks",
     "main": "index.js",
     "exports": {