From 5bab5a7378824d9079a1aae281683275143ba39e Mon Sep 17 00:00:00 2001 From: Zach Sais Date: Wed, 11 Jun 2025 08:25:26 -0500 Subject: [PATCH] fix version set for cli and slash commands (#892) --- esbuild.config.js | 6 ++++++ packages/cli/src/config/config.ts | 2 +- packages/cli/src/utils/version.ts | 2 +- scripts/start.js | 4 +++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/esbuild.config.js b/esbuild.config.js index e7e5cba8..a4ddd7dc 100644 --- a/esbuild.config.js +++ b/esbuild.config.js @@ -5,6 +5,9 @@ */ import esbuild from 'esbuild'; +import { readFileSync } from 'fs'; + +const pkg = JSON.parse(readFileSync('./package.json', 'utf-8')); esbuild .build({ @@ -13,6 +16,9 @@ esbuild outfile: 'bundle/gemini.js', platform: 'node', format: 'esm', + define: { + 'process.env.CLI_VERSION': JSON.stringify(pkg.version), + }, banner: { js: `import { createRequire } from 'module'; const require = createRequire(import.meta.url); globalThis.__filename = require('url').fileURLToPath(import.meta.url); globalThis.__dirname = require('path').dirname(globalThis.__filename);`, }, diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts index 0f7174fd..d1e7ea0c 100644 --- a/packages/cli/src/config/config.ts +++ b/packages/cli/src/config/config.ts @@ -91,7 +91,7 @@ async function parseArguments(): Promise { type: 'boolean', description: 'Enable telemetry?', }) - .version() // This will enable the --version flag based on package.json + .version(process.env.CLI_VERSION || '0.0.0') // This will enable the --version flag based on package.json .help() .alias('h', 'help') .strict().argv; diff --git a/packages/cli/src/utils/version.ts b/packages/cli/src/utils/version.ts index 50b69350..78aeafcd 100644 --- a/packages/cli/src/utils/version.ts +++ b/packages/cli/src/utils/version.ts @@ -5,5 +5,5 @@ */ export function getCliVersion(): string { - return process.env.CLI_VERSION || process.version; + return process.env.CLI_VERSION || 'unknown'; } diff --git a/scripts/start.js b/scripts/start.js index 17e0b665..16b8cb6c 100644 --- a/scripts/start.js +++ b/scripts/start.js @@ -19,8 +19,10 @@ import { spawn, execSync } from 'child_process'; import { join } from 'path'; +import { readFileSync } from 'fs'; const root = join(import.meta.dirname, '..'); +const pkg = JSON.parse(readFileSync(join(root, 'package.json'), 'utf-8')); // check build status, write warnings to file for app to display if needed execSync('node ./scripts/check-build-status.js', { @@ -56,7 +58,7 @@ nodeArgs.push(...process.argv.slice(2)); const env = { ...process.env, - CLI_VERSION: 'development', + CLI_VERSION: pkg.version, DEV: 'true', };