From b44301858504fa2d1bcc29e99ddea97a04a9e389 Mon Sep 17 00:00:00 2001 From: Yiming Cao Date: Thu, 4 Sep 2025 08:09:21 +0800 Subject: [PATCH 1/3] chore: add package.json export to sql.js project (#235) --- CLAUDE.md | 1 + packages/dialects/sql.js/package.json | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CLAUDE.md b/CLAUDE.md index 432af85c..4c48ffd2 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -82,3 +82,4 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co - Database migrations still use Prisma CLI under the hood - Plugin system allows interception at ORM, Kysely, and entity mutation levels - Computed fields are evaluated at database level for performance +- The "ide/vscode" package by-design has a different version from the rest of the packages as VSCode doesn't allow pre-release versions in its marketplace. diff --git a/packages/dialects/sql.js/package.json b/packages/dialects/sql.js/package.json index 4130d721..4b9e1b27 100644 --- a/packages/dialects/sql.js/package.json +++ b/packages/dialects/sql.js/package.json @@ -25,6 +25,10 @@ "types": "./dist/index.d.cts", "default": "./dist/index.cjs" } + }, + "./package.json": { + "import": "./package.json", + "require": "./package.json" } }, "devDependencies": { From b02958d9a6706e389aee0bf1e1a94b81bec23809 Mon Sep 17 00:00:00 2001 From: Yiming Cao Date: Wed, 3 Sep 2025 23:56:51 -0700 Subject: [PATCH 2/3] chore: fix telemetry token (#236) * chore: fix telemetry token * update * update * try again * update * update * update * update * update * update * update * fix --- .github/workflows/build-test.yml | 4 +++- .github/workflows/publish-release.yml | 4 +++- packages/cli/scripts/post-build.ts | 20 ++++++++++++++++++++ packages/cli/tsup.config.ts | 17 ----------------- 4 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 packages/cli/scripts/post-build.ts diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 8fc0495b..944d4a59 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -68,7 +68,9 @@ jobs: run: pnpm install --frozen-lockfile - name: Build - run: pnpm run build + run: | + pnpm run build + pnpm tsx packages/cli/scripts/post-build.ts - name: Lint run: pnpm run lint diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 19457988..471c2b52 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -36,7 +36,9 @@ jobs: run: pnpm install --frozen-lockfile - name: Build - run: pnpm run build + run: | + pnpm run build + pnpm tsx packages/cli/scripts/post-build.ts - name: Get version from package.json id: version diff --git a/packages/cli/scripts/post-build.ts b/packages/cli/scripts/post-build.ts new file mode 100644 index 00000000..99d4e3fb --- /dev/null +++ b/packages/cli/scripts/post-build.ts @@ -0,0 +1,20 @@ +import fs from 'node:fs'; +import path from 'node:path'; +import { fileURLToPath } from 'node:url'; + +const token = process.env.TELEMETRY_TRACKING_TOKEN ?? ''; + +if (!token) { + console.warn('TELEMETRY_TRACKING_TOKEN is not set.'); +} + +const filesToProcess = ['dist/index.js', 'dist/index.cjs']; +const _dirname = path.dirname(fileURLToPath(import.meta.url)); + +for (const file of filesToProcess) { + console.log(`Processing ${file} for telemetry token...`); + const filePath = path.join(_dirname, '..', file); + const content = fs.readFileSync(filePath, 'utf-8'); + const updatedContent = content.replace('', token); + fs.writeFileSync(filePath, updatedContent, 'utf-8'); +} diff --git a/packages/cli/tsup.config.ts b/packages/cli/tsup.config.ts index c1881d32..2496f3ea 100644 --- a/packages/cli/tsup.config.ts +++ b/packages/cli/tsup.config.ts @@ -1,5 +1,3 @@ -import fs from 'node:fs'; -import path from 'node:path'; import { defineConfig } from 'tsup'; export default defineConfig({ @@ -12,19 +10,4 @@ export default defineConfig({ clean: true, dts: true, format: ['esm', 'cjs'], - onSuccess: async () => { - if (!process.env['TELEMETRY_TRACKING_TOKEN']) { - return; - } - const filesToProcess = ['dist/index.js', 'dist/index.cjs']; - for (const file of filesToProcess) { - console.log(`Processing ${file} for telemetry token...`); - const content = fs.readFileSync(path.join(__dirname, file), 'utf-8'); - const updatedContent = content.replace( - '', - process.env['TELEMETRY_TRACKING_TOKEN'], - ); - fs.writeFileSync(file, updatedContent, 'utf-8'); - } - }, }); From 0f9764f328a16dd66b7762ca1ee563b657918d0e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 Sep 2025 04:46:44 -0700 Subject: [PATCH 3/3] chore: bump version 3.0.0-beta.3 (#237) Co-authored-by: ymc9 <104139426+ymc9@users.noreply.github.com> --- package.json | 2 +- packages/cli/package.json | 2 +- packages/common-helpers/package.json | 2 +- packages/create-zenstack/package.json | 2 +- packages/dialects/sql.js/package.json | 2 +- packages/eslint-config/package.json | 2 +- packages/language/package.json | 2 +- packages/runtime/package.json | 2 +- packages/sdk/package.json | 2 +- packages/tanstack-query/package.json | 2 +- packages/testtools/package.json | 2 +- packages/typescript-config/package.json | 2 +- packages/vitest-config/package.json | 2 +- packages/zod/package.json | 2 +- samples/blog/package.json | 2 +- tests/e2e/package.json | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 090976bb..458c7e98 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "zenstack-v3", - "version": "3.0.0-beta.2", + "version": "3.0.0-beta.3", "description": "ZenStack", "packageManager": "pnpm@10.12.1", "scripts": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 586b70b5..030ec4f5 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -3,7 +3,7 @@ "publisher": "zenstack", "displayName": "ZenStack CLI", "description": "FullStack database toolkit with built-in access control and automatic API generation.", - "version": "3.0.0-beta.2", + "version": "3.0.0-beta.3", "type": "module", "author": { "name": "ZenStack Team" diff --git a/packages/common-helpers/package.json b/packages/common-helpers/package.json index 11b3cbc4..cae11034 100644 --- a/packages/common-helpers/package.json +++ b/packages/common-helpers/package.json @@ -1,6 +1,6 @@ { "name": "@zenstackhq/common-helpers", - "version": "3.0.0-beta.2", + "version": "3.0.0-beta.3", "description": "ZenStack Common Helpers", "type": "module", "scripts": { diff --git a/packages/create-zenstack/package.json b/packages/create-zenstack/package.json index 8fa79f85..19f13f36 100644 --- a/packages/create-zenstack/package.json +++ b/packages/create-zenstack/package.json @@ -1,6 +1,6 @@ { "name": "create-zenstack", - "version": "3.0.0-beta.2", + "version": "3.0.0-beta.3", "description": "Create a new ZenStack project", "type": "module", "scripts": { diff --git a/packages/dialects/sql.js/package.json b/packages/dialects/sql.js/package.json index 4b9e1b27..b533df28 100644 --- a/packages/dialects/sql.js/package.json +++ b/packages/dialects/sql.js/package.json @@ -1,6 +1,6 @@ { "name": "@zenstackhq/kysely-sql-js", - "version": "3.0.0-beta.2", + "version": "3.0.0-beta.3", "description": "Kysely dialect for sql.js", "type": "module", "scripts": { diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index 17f184bc..1fed4454 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -1,6 +1,6 @@ { "name": "@zenstackhq/eslint-config", - "version": "3.0.0-beta.2", + "version": "3.0.0-beta.3", "type": "module", "private": true, "license": "MIT" diff --git a/packages/language/package.json b/packages/language/package.json index 155a12ef..7159b0d4 100644 --- a/packages/language/package.json +++ b/packages/language/package.json @@ -1,7 +1,7 @@ { "name": "@zenstackhq/language", "description": "ZenStack ZModel language specification", - "version": "3.0.0-beta.2", + "version": "3.0.0-beta.3", "license": "MIT", "author": "ZenStack Team", "files": [ diff --git a/packages/runtime/package.json b/packages/runtime/package.json index 2b06fb44..904b5033 100644 --- a/packages/runtime/package.json +++ b/packages/runtime/package.json @@ -1,6 +1,6 @@ { "name": "@zenstackhq/runtime", - "version": "3.0.0-beta.2", + "version": "3.0.0-beta.3", "description": "ZenStack Runtime", "type": "module", "scripts": { diff --git a/packages/sdk/package.json b/packages/sdk/package.json index c5aec65b..c8839e02 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@zenstackhq/sdk", - "version": "3.0.0-beta.2", + "version": "3.0.0-beta.3", "description": "ZenStack SDK", "type": "module", "scripts": { diff --git a/packages/tanstack-query/package.json b/packages/tanstack-query/package.json index 82385793..00637bda 100644 --- a/packages/tanstack-query/package.json +++ b/packages/tanstack-query/package.json @@ -1,6 +1,6 @@ { "name": "@zenstackhq/tanstack-query", - "version": "3.0.0-beta.2", + "version": "3.0.0-beta.3", "description": "", "main": "index.js", "type": "module", diff --git a/packages/testtools/package.json b/packages/testtools/package.json index b951b9c2..2d338b8a 100644 --- a/packages/testtools/package.json +++ b/packages/testtools/package.json @@ -1,6 +1,6 @@ { "name": "@zenstackhq/testtools", - "version": "3.0.0-beta.2", + "version": "3.0.0-beta.3", "description": "ZenStack Test Tools", "type": "module", "scripts": { diff --git a/packages/typescript-config/package.json b/packages/typescript-config/package.json index 3437f29a..c290d1ef 100644 --- a/packages/typescript-config/package.json +++ b/packages/typescript-config/package.json @@ -1,6 +1,6 @@ { "name": "@zenstackhq/typescript-config", - "version": "3.0.0-beta.2", + "version": "3.0.0-beta.3", "private": true, "license": "MIT" } diff --git a/packages/vitest-config/package.json b/packages/vitest-config/package.json index 61c8e722..660c1ada 100644 --- a/packages/vitest-config/package.json +++ b/packages/vitest-config/package.json @@ -1,7 +1,7 @@ { "name": "@zenstackhq/vitest-config", "type": "module", - "version": "3.0.0-beta.2", + "version": "3.0.0-beta.3", "private": true, "license": "MIT", "exports": { diff --git a/packages/zod/package.json b/packages/zod/package.json index 7b8434fb..4f8688ca 100644 --- a/packages/zod/package.json +++ b/packages/zod/package.json @@ -1,6 +1,6 @@ { "name": "@zenstackhq/zod", - "version": "3.0.0-beta.2", + "version": "3.0.0-beta.3", "description": "", "type": "module", "main": "index.js", diff --git a/samples/blog/package.json b/samples/blog/package.json index 1168c32b..20ef3f98 100644 --- a/samples/blog/package.json +++ b/samples/blog/package.json @@ -1,6 +1,6 @@ { "name": "sample-blog", - "version": "3.0.0-beta.2", + "version": "3.0.0-beta.3", "description": "", "main": "index.js", "scripts": { diff --git a/tests/e2e/package.json b/tests/e2e/package.json index d4e7e77c..b7988630 100644 --- a/tests/e2e/package.json +++ b/tests/e2e/package.json @@ -1,6 +1,6 @@ { "name": "e2e", - "version": "3.0.0-beta.2", + "version": "3.0.0-beta.3", "private": true, "type": "module", "scripts": {