From 6aad1842838789dc08f8ffc1187a79e39be9d7cd Mon Sep 17 00:00:00 2001 From: chengqian Date: Mon, 8 Jun 2026 16:07:06 +0800 Subject: [PATCH] =?UTF-8?q?fix(build):=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E6=89=93=E5=8C=85=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest/docker/Dockerfile | 2 +- web/tenant/vite.config.ts | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/manifest/docker/Dockerfile b/manifest/docker/Dockerfile index aba3771..5b40301 100644 --- a/manifest/docker/Dockerfile +++ b/manifest/docker/Dockerfile @@ -31,7 +31,7 @@ RUN if [ "$VERSION" = "dev" ]; then \ fi && \ echo "Building frontend with version: ${VERSION}" && \ cd admin && VITE_APP_VERSION=$VERSION bun run build && \ - cd ../tenant && bun run build + cd ../tenant && VITE_APP_VERSION=$VERSION bun run build # Stage 2: Go build FROM golang:1.25-alpine AS builder diff --git a/web/tenant/vite.config.ts b/web/tenant/vite.config.ts index c3e8107..08ebf63 100644 --- a/web/tenant/vite.config.ts +++ b/web/tenant/vite.config.ts @@ -3,9 +3,24 @@ import vue from '@vitejs/plugin-vue' import tailwindcss from '@tailwindcss/vite' import { fileURLToPath, URL } from 'node:url' import { readFileSync } from 'node:fs' +import { execSync } from 'node:child_process' import { resolve } from 'node:path' -const version = readFileSync(resolve(__dirname, '../../VERSION'), 'utf-8').trim() +function getVersion(): string { + if (process.env.NODE_ENV === 'development') return 'dev' + if (process.env.VITE_APP_VERSION) return process.env.VITE_APP_VERSION + try { + return execSync('git describe --tags --always', { encoding: 'utf-8' }).trim() + } catch { + try { + return readFileSync(resolve(__dirname, '../../VERSION'), 'utf-8').trim() + } catch { + return 'dev' + } + } +} + +const version = getVersion() export default defineConfig({ base: '/',