diff --git a/packages/plugins/openapi/package.json b/packages/plugins/openapi/package.json index 93d0a2fa7..a4510f641 100644 --- a/packages/plugins/openapi/package.json +++ b/packages/plugins/openapi/package.json @@ -32,9 +32,11 @@ "semver": "^7.5.2", "ts-pattern": "^4.3.0", "yaml": "^2.2.2", - "zod": "^3.22.4", "zod-validation-error": "^1.5.0" }, + "peerDependencies": { + "zod": "catalog:" + }, "devDependencies": { "@readme/openapi-parser": "^2.4.0", "@types/pluralize": "^0.0.29", diff --git a/packages/plugins/trpc/package.json b/packages/plugins/trpc/package.json index c0dedfce1..05ca2aab9 100644 --- a/packages/plugins/trpc/package.json +++ b/packages/plugins/trpc/package.json @@ -32,7 +32,7 @@ "tslib": "^2.4.1" }, "peerDependencies": { - "zod": "^3.22.4" + "zod": "catalog:" }, "devDependencies": { "@trpc/next": "^10.32.0", diff --git a/packages/plugins/trpc/tests/projects/nuxt-trpc-v10/package.json b/packages/plugins/trpc/tests/projects/nuxt-trpc-v10/package.json index 3edfdb0a0..a829d8509 100644 --- a/packages/plugins/trpc/tests/projects/nuxt-trpc-v10/package.json +++ b/packages/plugins/trpc/tests/projects/nuxt-trpc-v10/package.json @@ -17,7 +17,7 @@ "trpc-nuxt": "^0.10.22", "vue": "latest", "vue-router": "latest", - "zod": "^3.22.4" + "zod": "^3.25.0" }, "devDependencies": { "esbuild": "^0.24.0", diff --git a/packages/plugins/trpc/tests/projects/nuxt-trpc-v11/package.json b/packages/plugins/trpc/tests/projects/nuxt-trpc-v11/package.json index 2e9589540..81f6e0d58 100644 --- a/packages/plugins/trpc/tests/projects/nuxt-trpc-v11/package.json +++ b/packages/plugins/trpc/tests/projects/nuxt-trpc-v11/package.json @@ -17,7 +17,7 @@ "trpc-nuxt": "^0.11.0-beta.1", "vue": "latest", "vue-router": "latest", - "zod": "^3.22.4" + "zod": "^3.25.0" }, "devDependencies": { "esbuild": "^0.24.0", diff --git a/packages/plugins/trpc/tests/projects/t3-trpc-v11/package.json b/packages/plugins/trpc/tests/projects/t3-trpc-v11/package.json index e2aedfdb0..29d1ea320 100644 --- a/packages/plugins/trpc/tests/projects/t3-trpc-v11/package.json +++ b/packages/plugins/trpc/tests/projects/t3-trpc-v11/package.json @@ -28,7 +28,7 @@ "react-dom": "^18.3.1", "server-only": "^0.0.1", "superjson": "^2.2.1", - "zod": "^3.22.4" + "zod": "^3.25.0" }, "devDependencies": { "@types/eslint": "^8.56.10", diff --git a/packages/runtime/package.json b/packages/runtime/package.json index c9fdcc28c..2372fa98f 100644 --- a/packages/runtime/package.json +++ b/packages/runtime/package.json @@ -110,11 +110,11 @@ "ts-pattern": "^4.3.0", "tslib": "^2.4.1", "uuid": "^9.0.0", - "zod": "^3.22.4", "zod-validation-error": "^1.5.0" }, "peerDependencies": { - "@prisma/client": "5.0.0 - 6.13.x" + "@prisma/client": "5.0.0 - 6.13.x", + "zod": "catalog:" }, "author": { "name": "ZenStack Team" diff --git a/packages/schema/package.json b/packages/schema/package.json index af5511325..0ba01af5e 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -113,11 +113,11 @@ "vscode-languageserver": "^8.0.2", "vscode-languageserver-textdocument": "^1.0.7", "vscode-uri": "^3.0.6", - "zod": "^3.22.4", "zod-validation-error": "^1.5.0" }, "peerDependencies": { - "prisma": "5.0.0 - 6.13.x" + "prisma": "5.0.0 - 6.13.x", + "zod": "catalog:" }, "devDependencies": { "@prisma/client": "6.13.x", diff --git a/packages/server/package.json b/packages/server/package.json index b1e30100f..2989446a9 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -31,10 +31,12 @@ "superjson": "^1.13.0", "ts-japi": "^1.10.1", "url-pattern": "^1.0.3", - "zod": "^3.22.4", "zod-validation-error": "^1.5.0", "decimal.js": "^10.4.2" }, + "peerDependencies": { + "zod": "catalog:" + }, "devDependencies": { "@nestjs/common": "^10.3.7", "@nestjs/platform-express": "^10.3.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 88b94da61..c7804dae0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,6 +12,9 @@ catalogs: typescript: specifier: ~5.8.0 version: 5.8.3 + zod: + specifier: ^3.25.0 + version: 3.25.76 importers: @@ -147,11 +150,11 @@ importers: specifier: ^2.2.2 version: 2.4.5 zod: - specifier: ^3.22.4 - version: 3.23.8 + specifier: 'catalog:' + version: 3.25.76 zod-validation-error: specifier: ^1.5.0 - version: 1.5.0(zod@3.23.8) + version: 1.5.0(zod@3.25.76) devDependencies: '@readme/openapi-parser': specifier: ^2.4.0 @@ -324,8 +327,8 @@ importers: specifier: ^2.4.1 version: 2.6.3 zod: - specifier: ^3.22.4 - version: 3.23.8 + specifier: 'catalog:' + version: 3.25.76 devDependencies: '@trpc/next': specifier: ^10.32.0 @@ -395,11 +398,11 @@ importers: specifier: ^9.0.0 version: 9.0.1 zod: - specifier: ^3.22.4 - version: 3.23.8 + specifier: 'catalog:' + version: 3.25.76 zod-validation-error: specifier: ^1.5.0 - version: 1.5.0(zod@3.23.8) + version: 1.5.0(zod@3.25.76) devDependencies: '@types/bcryptjs': specifier: ^2.4.2 @@ -493,11 +496,11 @@ importers: specifier: ^3.0.6 version: 3.0.8 zod: - specifier: ^3.22.4 - version: 3.23.8 + specifier: 'catalog:' + version: 3.25.76 zod-validation-error: specifier: ^1.5.0 - version: 1.5.0(zod@3.23.8) + version: 1.5.0(zod@3.25.76) devDependencies: '@prisma/client': specifier: 6.13.x @@ -599,11 +602,11 @@ importers: specifier: ^1.0.3 version: 1.0.3 zod: - specifier: ^3.22.4 - version: 3.23.8 + specifier: 'catalog:' + version: 3.25.76 zod-validation-error: specifier: ^1.5.0 - version: 1.5.0(zod@3.23.8) + version: 1.5.0(zod@3.25.76) devDependencies: '@nestjs/common': specifier: ^10.3.7 @@ -8746,8 +8749,8 @@ packages: peerDependencies: zod: ^3.18.0 - zod@3.23.8: - resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==} + zod@3.25.76: + resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==} snapshots: @@ -17892,8 +17895,8 @@ snapshots: compress-commons: 6.0.2 readable-stream: 4.5.2 - zod-validation-error@1.5.0(zod@3.23.8): + zod-validation-error@1.5.0(zod@3.25.76): dependencies: - zod: 3.23.8 + zod: 3.25.76 - zod@3.23.8: {} + zod@3.25.76: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 0fcc92e5a..5b2640a02 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -7,3 +7,4 @@ packages: catalog: ts-morph: ^26.0.0 typescript: ~5.8.0 + zod: ^3.25.0 \ No newline at end of file diff --git a/script/test-scaffold.ts b/script/test-scaffold.ts index b41f3bad9..b9c4aae4d 100644 --- a/script/test-scaffold.ts +++ b/script/test-scaffold.ts @@ -20,7 +20,7 @@ function run(cmd: string) { run('npm init -y'); run( - 'npm i --no-audit --no-fund typescript@~5.8.0 prisma@6.11.x @prisma/client@6.11.x zod@^3.22.4 decimal.js @types/node' + 'npm i --no-audit --no-fund typescript@~5.8.0 prisma@6.11.x @prisma/client@6.11.x zod@^3.25.0 decimal.js @types/node' ); console.log('Test scaffold setup complete.'); diff --git a/tests/integration/test-run/package.json b/tests/integration/test-run/package.json index 7e568d381..48bf46f3f 100644 --- a/tests/integration/test-run/package.json +++ b/tests/integration/test-run/package.json @@ -16,6 +16,6 @@ "react": "^18.2.0", "swr": "^1.3.0", "zenstack": "file:../../../packages/schema/dist", - "zod": "^3.22.4" + "zod": "^3.25.0" } } diff --git a/tests/integration/tests/cli/generate.test.ts b/tests/integration/tests/cli/generate.test.ts index 39e1611d5..a0f49817d 100644 --- a/tests/integration/tests/cli/generate.test.ts +++ b/tests/integration/tests/cli/generate.test.ts @@ -45,7 +45,7 @@ model Post { // set up project fs.writeFileSync('package.json', JSON.stringify({ name: 'my app', version: '1.0.0' })); createNpmrc(); - installPackage('prisma @prisma/client zod@3'); + installPackage('prisma @prisma/client zod@^3.25.0'); installPackage(path.join(__dirname, '../../../../packages/runtime/dist')); // set up schema diff --git a/tests/integration/tests/cli/plugins.test.ts b/tests/integration/tests/cli/plugins.test.ts index c8bc94aa6..7562f47b8 100644 --- a/tests/integration/tests/cli/plugins.test.ts +++ b/tests/integration/tests/cli/plugins.test.ts @@ -70,7 +70,7 @@ describe('CLI Plugins Tests', () => { // deps const ver = require('../../../../packages/schema/package.json').version; const depPkgs = [ - 'zod@3.21.1', + 'zod@^3.25.0', 'react', 'swr', '@tanstack/react-query@5.56.x', diff --git a/tests/integration/tests/frameworks/nextjs/test-project/package.json b/tests/integration/tests/frameworks/nextjs/test-project/package.json index ce16f75bd..8dc15c490 100644 --- a/tests/integration/tests/frameworks/nextjs/test-project/package.json +++ b/tests/integration/tests/frameworks/nextjs/test-project/package.json @@ -19,7 +19,7 @@ "superjson": "^1.13.0", "swr": "^2.2.0", "typescript": "5.x", - "zod": "^3.22.4", + "zod": "^3.25.0", "@zenstackhq/language": "../../../../../../../packages/language/dist", "@zenstackhq/runtime": "../../../../../../../packages/runtime/dist", "@zenstackhq/sdk": "../../../../../../../packages/sdk/dist", diff --git a/tests/integration/tests/frameworks/trpc/test-project/package.json b/tests/integration/tests/frameworks/trpc/test-project/package.json index 2e9c35898..eaafb9740 100644 --- a/tests/integration/tests/frameworks/trpc/test-project/package.json +++ b/tests/integration/tests/frameworks/trpc/test-project/package.json @@ -23,7 +23,7 @@ "react-dom": "18.2.0", "superjson": "^1.13.0", "typescript": "5.x", - "zod": "^3.22.4", + "zod": "^3.25.0", "@zenstackhq/language": "../../../../../../../packages/language/dist", "@zenstackhq/runtime": "../../../../../../../packages/runtime/dist", "@zenstackhq/sdk": "../../../../../../../packages/sdk/dist",