From 7c6706be8ca9ad754cbe12a83b007c046702fd72 Mon Sep 17 00:00:00 2001 From: ymc9 <104139426+ymc9@users.noreply.github.com> Date: Wed, 3 Sep 2025 21:59:40 -0700 Subject: [PATCH 01/12] chore: fix telemetry token --- packages/cli/tsup.config.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/cli/tsup.config.ts b/packages/cli/tsup.config.ts index c1881d32..40dd724c 100644 --- a/packages/cli/tsup.config.ts +++ b/packages/cli/tsup.config.ts @@ -13,6 +13,7 @@ export default defineConfig({ dts: true, format: ['esm', 'cjs'], onSuccess: async () => { + console.log('TELEMETRY_TRACKING_TOKEN:', process.env['TELEMETRY_TRACKING_TOKEN']); if (!process.env['TELEMETRY_TRACKING_TOKEN']) { return; } From 35c4f3eb7ff70382e699b6289681418c992df9a3 Mon Sep 17 00:00:00 2001 From: ymc9 <104139426+ymc9@users.noreply.github.com> Date: Wed, 3 Sep 2025 22:11:54 -0700 Subject: [PATCH 02/12] update --- packages/cli/tsup.config.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/cli/tsup.config.ts b/packages/cli/tsup.config.ts index 40dd724c..64dddb44 100644 --- a/packages/cli/tsup.config.ts +++ b/packages/cli/tsup.config.ts @@ -12,6 +12,9 @@ export default defineConfig({ clean: true, dts: true, format: ['esm', 'cjs'], + env: { + TELEMETRY_TRACKING_TOKEN: process.env['TELEMETRY_TRACKING_TOKEN'] ?? '', + }, onSuccess: async () => { console.log('TELEMETRY_TRACKING_TOKEN:', process.env['TELEMETRY_TRACKING_TOKEN']); if (!process.env['TELEMETRY_TRACKING_TOKEN']) { From d80eaded3fa4d982928c6331fa7cb925f55dccc7 Mon Sep 17 00:00:00 2001 From: ymc9 <104139426+ymc9@users.noreply.github.com> Date: Wed, 3 Sep 2025 22:24:02 -0700 Subject: [PATCH 03/12] update --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 8fc0495b..faba7e32 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -68,7 +68,7 @@ jobs: run: pnpm install --frozen-lockfile - name: Build - run: pnpm run build + run: echo TOKEN $TELEMETRY_TRACKING_TOKEN && pnpm run build - name: Lint run: pnpm run lint From 4b20b3ffa686b9e0843f6e3016bee7f4b676174b Mon Sep 17 00:00:00 2001 From: ymc9 <104139426+ymc9@users.noreply.github.com> Date: Wed, 3 Sep 2025 22:38:01 -0700 Subject: [PATCH 04/12] try again --- .github/workflows/build-test.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index faba7e32..fbff4370 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -6,10 +6,6 @@ on: - main - dev -env: - TELEMETRY_TRACKING_TOKEN: ${{ secrets.TELEMETRY_TRACKING_TOKEN }} - DO_NOT_TRACK: '1' - permissions: contents: read @@ -68,6 +64,8 @@ jobs: run: pnpm install --frozen-lockfile - name: Build + env: + TELEMETRY_TRACKING_TOKEN: ${{ secrets.TELEMETRY_TRACKING_TOKEN }} run: echo TOKEN $TELEMETRY_TRACKING_TOKEN && pnpm run build - name: Lint From 01defdc1a8dac117e8e413f541452201779a9abf Mon Sep 17 00:00:00 2001 From: ymc9 <104139426+ymc9@users.noreply.github.com> Date: Wed, 3 Sep 2025 22:54:21 -0700 Subject: [PATCH 05/12] update --- packages/cli/package.json | 2 +- packages/cli/scripts/post-build.ts | 17 +++++++++++++++++ packages/cli/tsup.config.ts | 21 --------------------- 3 files changed, 18 insertions(+), 22 deletions(-) create mode 100644 packages/cli/scripts/post-build.ts diff --git a/packages/cli/package.json b/packages/cli/package.json index 586b70b5..ed9926d6 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -22,7 +22,7 @@ "zenstack": "bin/cli" }, "scripts": { - "build": "tsc --noEmit && tsup-node", + "build": "tsc --noEmit && tsup-node && tsx scripts/post-build.ts", "watch": "tsup-node --watch", "lint": "eslint src --ext ts", "test": "vitest run", diff --git a/packages/cli/scripts/post-build.ts b/packages/cli/scripts/post-build.ts new file mode 100644 index 00000000..d44fc165 --- /dev/null +++ b/packages/cli/scripts/post-build.ts @@ -0,0 +1,17 @@ +import fs from 'node:fs'; +import path from 'node:path'; +import { fileURLToPath } from 'node:url'; + +const token = process.env['TELEMETRY_TRACKING_TOKEN'] ?? ''; + +console.log('TELEMETRY_TRACKING_TOKEN:', token); + +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 content = fs.readFileSync(path.join(_dirname, '..', file), 'utf-8'); + const updatedContent = content.replace('', token); + fs.writeFileSync(file, updatedContent, 'utf-8'); +} diff --git a/packages/cli/tsup.config.ts b/packages/cli/tsup.config.ts index 64dddb44..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,23 +10,4 @@ export default defineConfig({ clean: true, dts: true, format: ['esm', 'cjs'], - env: { - TELEMETRY_TRACKING_TOKEN: process.env['TELEMETRY_TRACKING_TOKEN'] ?? '', - }, - onSuccess: async () => { - console.log('TELEMETRY_TRACKING_TOKEN:', process.env['TELEMETRY_TRACKING_TOKEN']); - 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 34e984254708004b26a6b91b1fb3f7153291361d Mon Sep 17 00:00:00 2001 From: ymc9 <104139426+ymc9@users.noreply.github.com> Date: Wed, 3 Sep 2025 23:00:09 -0700 Subject: [PATCH 06/12] update --- packages/cli/scripts/post-build.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/scripts/post-build.ts b/packages/cli/scripts/post-build.ts index d44fc165..bb56b7b7 100644 --- a/packages/cli/scripts/post-build.ts +++ b/packages/cli/scripts/post-build.ts @@ -4,7 +4,7 @@ import { fileURLToPath } from 'node:url'; const token = process.env['TELEMETRY_TRACKING_TOKEN'] ?? ''; -console.log('TELEMETRY_TRACKING_TOKEN:', token); +console.log('TELEMETRY_TRACKING_TOKEN:', token?.[0]); const filesToProcess = ['dist/index.js', 'dist/index.cjs']; const _dirname = path.dirname(fileURLToPath(import.meta.url)); From 832434e1b96fa4466f8511d9adb3e457e1d45aa9 Mon Sep 17 00:00:00 2001 From: ymc9 <104139426+ymc9@users.noreply.github.com> Date: Wed, 3 Sep 2025 23:08:52 -0700 Subject: [PATCH 07/12] update --- .github/workflows/build-test.yml | 6 ++++-- packages/cli/scripts/post-build.ts | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index fbff4370..faba7e32 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -6,6 +6,10 @@ on: - main - dev +env: + TELEMETRY_TRACKING_TOKEN: ${{ secrets.TELEMETRY_TRACKING_TOKEN }} + DO_NOT_TRACK: '1' + permissions: contents: read @@ -64,8 +68,6 @@ jobs: run: pnpm install --frozen-lockfile - name: Build - env: - TELEMETRY_TRACKING_TOKEN: ${{ secrets.TELEMETRY_TRACKING_TOKEN }} run: echo TOKEN $TELEMETRY_TRACKING_TOKEN && pnpm run build - name: Lint diff --git a/packages/cli/scripts/post-build.ts b/packages/cli/scripts/post-build.ts index bb56b7b7..1dfc3972 100644 --- a/packages/cli/scripts/post-build.ts +++ b/packages/cli/scripts/post-build.ts @@ -2,7 +2,7 @@ import fs from 'node:fs'; import path from 'node:path'; import { fileURLToPath } from 'node:url'; -const token = process.env['TELEMETRY_TRACKING_TOKEN'] ?? ''; +const token = process.env.TELEMETRY_TRACKING_TOKEN ?? ''; console.log('TELEMETRY_TRACKING_TOKEN:', token?.[0]); From 90a7072d05ee2e84ec59f6512950a4b02b98020b Mon Sep 17 00:00:00 2001 From: ymc9 <104139426+ymc9@users.noreply.github.com> Date: Wed, 3 Sep 2025 23:31:35 -0700 Subject: [PATCH 08/12] update --- .github/workflows/build-test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index faba7e32..cf2a3cb7 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -68,7 +68,10 @@ jobs: run: pnpm install --frozen-lockfile - name: Build - run: echo TOKEN $TELEMETRY_TRACKING_TOKEN && pnpm run build + run: | + echo TOKEN $TELEMETRY_TRACKING_TOKEN + pnpm run build + pnpm tsx packages/cli/scripts/post-build.ts - name: Lint run: pnpm run lint From db06bc401ffa14b2f9820d70ea4b97c9d54c2273 Mon Sep 17 00:00:00 2001 From: ymc9 <104139426+ymc9@users.noreply.github.com> Date: Wed, 3 Sep 2025 23:32:02 -0700 Subject: [PATCH 09/12] update --- packages/cli/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index ed9926d6..586b70b5 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -22,7 +22,7 @@ "zenstack": "bin/cli" }, "scripts": { - "build": "tsc --noEmit && tsup-node && tsx scripts/post-build.ts", + "build": "tsc --noEmit && tsup-node", "watch": "tsup-node --watch", "lint": "eslint src --ext ts", "test": "vitest run", From f91e196a5d275c0eec5b7fd720d2b40fc69edff7 Mon Sep 17 00:00:00 2001 From: ymc9 <104139426+ymc9@users.noreply.github.com> Date: Wed, 3 Sep 2025 23:42:12 -0700 Subject: [PATCH 10/12] update --- packages/cli/scripts/post-build.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/cli/scripts/post-build.ts b/packages/cli/scripts/post-build.ts index 1dfc3972..7bf88b90 100644 --- a/packages/cli/scripts/post-build.ts +++ b/packages/cli/scripts/post-build.ts @@ -4,14 +4,17 @@ import { fileURLToPath } from 'node:url'; const token = process.env.TELEMETRY_TRACKING_TOKEN ?? ''; -console.log('TELEMETRY_TRACKING_TOKEN:', token?.[0]); +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 content = fs.readFileSync(path.join(_dirname, '..', file), 'utf-8'); + const filePath = path.join(_dirname, '..', file); + const content = fs.readFileSync(path.join(_dirname, '..', filePath), 'utf-8'); const updatedContent = content.replace('', token); - fs.writeFileSync(file, updatedContent, 'utf-8'); + fs.writeFileSync(filePath, updatedContent, 'utf-8'); } From dcd2c3b9cb8b0a165f8b64f16bf5d4efe37a3b5d Mon Sep 17 00:00:00 2001 From: ymc9 <104139426+ymc9@users.noreply.github.com> Date: Wed, 3 Sep 2025 23:43:09 -0700 Subject: [PATCH 11/12] update --- .github/workflows/build-test.yml | 1 - .github/workflows/publish-release.yml | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index cf2a3cb7..944d4a59 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -69,7 +69,6 @@ jobs: - name: Build run: | - echo TOKEN $TELEMETRY_TRACKING_TOKEN pnpm run build pnpm tsx packages/cli/scripts/post-build.ts 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 From 72d408112957e1007b5244dd9dbe95fce54d0f21 Mon Sep 17 00:00:00 2001 From: ymc9 <104139426+ymc9@users.noreply.github.com> Date: Wed, 3 Sep 2025 23:50:33 -0700 Subject: [PATCH 12/12] fix --- packages/cli/scripts/post-build.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/scripts/post-build.ts b/packages/cli/scripts/post-build.ts index 7bf88b90..99d4e3fb 100644 --- a/packages/cli/scripts/post-build.ts +++ b/packages/cli/scripts/post-build.ts @@ -14,7 +14,7 @@ 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(path.join(_dirname, '..', filePath), 'utf-8'); + const content = fs.readFileSync(filePath, 'utf-8'); const updatedContent = content.replace('', token); fs.writeFileSync(filePath, updatedContent, 'utf-8'); }