From e5946e095ca620be039b2b4b66140a447ecc0d08 Mon Sep 17 00:00:00 2001 From: Yiming Cao Date: Fri, 28 Oct 2022 23:52:32 +0800 Subject: [PATCH 1/2] fix: make sure path in Prisma schema is escaped (for windows) --- packages/internal/package.json | 2 +- packages/runtime/package.json | 2 +- packages/schema/package.json | 2 +- packages/schema/src/generator/prisma/prisma-builder.ts | 2 +- packages/schema/src/generator/prisma/schema-generator.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/internal/package.json b/packages/internal/package.json index b0f4b5ddf..64768aa96 100644 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -1,6 +1,6 @@ { "name": "@zenstackhq/internal", - "version": "0.1.57", + "version": "0.1.58", "displayName": "ZenStack Internal Library", "description": "ZenStack internal runtime library. This package is for supporting runtime functionality of ZenStack and not supposed to be used directly.", "repository": { diff --git a/packages/runtime/package.json b/packages/runtime/package.json index f21788dd2..009281db6 100644 --- a/packages/runtime/package.json +++ b/packages/runtime/package.json @@ -1,7 +1,7 @@ { "name": "@zenstackhq/runtime", "displayName": "ZenStack Runtime Library", - "version": "0.1.57", + "version": "0.1.58", "description": "This package contains runtime library for consuming client and server side code generated by ZenStack.", "repository": { "type": "git", diff --git a/packages/schema/package.json b/packages/schema/package.json index 11b4db2b9..345c73e82 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -3,7 +3,7 @@ "publisher": "zenstack", "displayName": "ZenStack Language Tools", "description": "ZenStack is a toolkit that simplifies full-stack development", - "version": "0.1.57", + "version": "0.1.58", "author": { "name": "ZenStack Team" }, diff --git a/packages/schema/src/generator/prisma/prisma-builder.ts b/packages/schema/src/generator/prisma/prisma-builder.ts index 8ac425da8..cec02bb06 100644 --- a/packages/schema/src/generator/prisma/prisma-builder.ts +++ b/packages/schema/src/generator/prisma/prisma-builder.ts @@ -101,7 +101,7 @@ export class Generator { return ( `generator ${this.name} {\n` + indentString(`provider = "${this.provider}"\n`) + - indentString(`output = "${this.output}"\n`) + + indentString(`output = ${JSON.stringify(this.output)}\n`) + (this.previewFeatures ? indentString( `previewFeatures = [${this.previewFeatures diff --git a/packages/schema/src/generator/prisma/schema-generator.ts b/packages/schema/src/generator/prisma/schema-generator.ts index 907cebb33..6d85d38a9 100644 --- a/packages/schema/src/generator/prisma/schema-generator.ts +++ b/packages/schema/src/generator/prisma/schema-generator.ts @@ -144,7 +144,7 @@ export default class PrismaSchemaGenerator { prisma.addGenerator( 'client', 'prisma-client-js', - path.join('../', this.context.generatedCodeDir, '.prisma'), + path.join('..', this.context.generatedCodeDir, '.prisma'), [ 'fieldReference', 'interactiveTransactions', From 68a7f36a29822f4530aecdd5f251eae591a31c0d Mon Sep 17 00:00:00 2001 From: Yiming Cao Date: Fri, 28 Oct 2022 23:54:12 +0800 Subject: [PATCH 2/2] update todo version --- samples/todo/package-lock.json | 46 +++++++++++++++++----------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/samples/todo/package-lock.json b/samples/todo/package-lock.json index b62a8f5d0..9713daecf 100644 --- a/samples/todo/package-lock.json +++ b/samples/todo/package-lock.json @@ -10,8 +10,8 @@ "dependencies": { "@heroicons/react": "^2.0.12", "@prisma/client": "^4.4.0", - "@zenstackhq/internal": "^0.1.57", - "@zenstackhq/runtime": "^0.1.57", + "@zenstackhq/internal": "^0.1.58", + "@zenstackhq/runtime": "^0.1.58", "daisyui": "^2.31.0", "moment": "^2.29.4", "nanoid": "^4.0.0", @@ -33,7 +33,7 @@ "postcss": "^8.4.16", "tailwindcss": "^3.1.8", "typescript": "^4.6.2", - "zenstack": "^0.1.57" + "zenstack": "^0.1.58" } }, "node_modules/@babel/code-frame": { @@ -721,9 +721,9 @@ } }, "node_modules/@zenstackhq/internal": { - "version": "0.1.57", - "resolved": "https://registry.npmjs.org/@zenstackhq/internal/-/internal-0.1.57.tgz", - "integrity": "sha512-ypXXporbkbYtbAQGLy+6OB6VfK6j3XOds6giKWkz+6rVOLYpogznr+kz0QmGgekscV2WjbsNEudvzvDAAlwykQ==", + "version": "0.1.58", + "resolved": "https://registry.npmjs.org/@zenstackhq/internal/-/internal-0.1.58.tgz", + "integrity": "sha512-s55IURh2XBq+Es91fMU+jxfiAVl3jE4luZdXUL0JWd+ZujxQDLbNy4X5oZWWrsHUxHa9ydL7pmsnnT3cFG4keQ==", "dependencies": { "bcryptjs": "^2.4.3", "deepcopy": "^2.1.0", @@ -738,9 +738,9 @@ } }, "node_modules/@zenstackhq/runtime": { - "version": "0.1.57", - "resolved": "https://registry.npmjs.org/@zenstackhq/runtime/-/runtime-0.1.57.tgz", - "integrity": "sha512-AgphSR29IU3h+EZsirFs72wIRMArhJ28A/CT8arW3MnbkDuhVRpbDSsarPHO5/IwcPFhpCaNShhdldCKJk25kw==", + "version": "0.1.58", + "resolved": "https://registry.npmjs.org/@zenstackhq/runtime/-/runtime-0.1.58.tgz", + "integrity": "sha512-3fzd5/tuYvuphX1VzceAsczYY73gefc/dv6/xrkuwIjVMNebP90/e7Hi3GfbpEFiyyJ+rXut2VJAiXV/FZgSWw==", "dependencies": { "@zenstackhq/internal": "latest" }, @@ -4522,12 +4522,12 @@ } }, "node_modules/zenstack": { - "version": "0.1.57", - "resolved": "https://registry.npmjs.org/zenstack/-/zenstack-0.1.57.tgz", - "integrity": "sha512-hVLiCEMcKCT0pVujik9NrdcdB1+eE5Zrv8jRvV9u/4JNGDBkMgQ2OHrsyPxMmmqm8A2C2exmWpIJlnGlky7IzQ==", + "version": "0.1.58", + "resolved": "https://registry.npmjs.org/zenstack/-/zenstack-0.1.58.tgz", + "integrity": "sha512-wTTUA9Ns5FY29+5rFu1jOlq4p9xpZJmFLBGXJAyERCGu8I+xB63wQ2G50D6bkk2a0T4uGcjrI8Juhs0Pk1cROA==", "dev": true, "dependencies": { - "@zenstackhq/internal": "0.1.57", + "@zenstackhq/internal": "0.1.58", "change-case": "^4.1.2", "chevrotain": "^9.1.0", "colors": "^1.4.0", @@ -5011,9 +5011,9 @@ } }, "@zenstackhq/internal": { - "version": "0.1.57", - "resolved": "https://registry.npmjs.org/@zenstackhq/internal/-/internal-0.1.57.tgz", - "integrity": "sha512-ypXXporbkbYtbAQGLy+6OB6VfK6j3XOds6giKWkz+6rVOLYpogznr+kz0QmGgekscV2WjbsNEudvzvDAAlwykQ==", + "version": "0.1.58", + "resolved": "https://registry.npmjs.org/@zenstackhq/internal/-/internal-0.1.58.tgz", + "integrity": "sha512-s55IURh2XBq+Es91fMU+jxfiAVl3jE4luZdXUL0JWd+ZujxQDLbNy4X5oZWWrsHUxHa9ydL7pmsnnT3cFG4keQ==", "requires": { "bcryptjs": "^2.4.3", "deepcopy": "^2.1.0", @@ -5022,9 +5022,9 @@ } }, "@zenstackhq/runtime": { - "version": "0.1.57", - "resolved": "https://registry.npmjs.org/@zenstackhq/runtime/-/runtime-0.1.57.tgz", - "integrity": "sha512-AgphSR29IU3h+EZsirFs72wIRMArhJ28A/CT8arW3MnbkDuhVRpbDSsarPHO5/IwcPFhpCaNShhdldCKJk25kw==", + "version": "0.1.58", + "resolved": "https://registry.npmjs.org/@zenstackhq/runtime/-/runtime-0.1.58.tgz", + "integrity": "sha512-3fzd5/tuYvuphX1VzceAsczYY73gefc/dv6/xrkuwIjVMNebP90/e7Hi3GfbpEFiyyJ+rXut2VJAiXV/FZgSWw==", "requires": { "@zenstackhq/internal": "latest" } @@ -7762,12 +7762,12 @@ "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==" }, "zenstack": { - "version": "0.1.57", - "resolved": "https://registry.npmjs.org/zenstack/-/zenstack-0.1.57.tgz", - "integrity": "sha512-hVLiCEMcKCT0pVujik9NrdcdB1+eE5Zrv8jRvV9u/4JNGDBkMgQ2OHrsyPxMmmqm8A2C2exmWpIJlnGlky7IzQ==", + "version": "0.1.58", + "resolved": "https://registry.npmjs.org/zenstack/-/zenstack-0.1.58.tgz", + "integrity": "sha512-wTTUA9Ns5FY29+5rFu1jOlq4p9xpZJmFLBGXJAyERCGu8I+xB63wQ2G50D6bkk2a0T4uGcjrI8Juhs0Pk1cROA==", "dev": true, "requires": { - "@zenstackhq/internal": "0.1.57", + "@zenstackhq/internal": "0.1.58", "change-case": "^4.1.2", "chevrotain": "^9.1.0", "colors": "^1.4.0",