diff --git a/README.md b/README.md index 9f19661..0c8c516 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,12 @@ git fetch upstream --tags git merge v1.0.12 # the next release tag ``` +## Versions + +INBUXA Admin has its own dated version (`inbuxa-version.json`), shown with the +WebUI release it's based on: `INBUXA Admin 2026.9.18 (WebUI 1.0.11)`. +`package.json` keeps upstream's version, so upstream's bumps merge cleanly. + ## License and credits Free software under the [GNU Affero General Public License, version 3](./LICENSES/AGPL-3.0-only.txt). diff --git a/inbuxa-version.json b/inbuxa-version.json new file mode 100644 index 0000000..2f57ffb --- /dev/null +++ b/inbuxa-version.json @@ -0,0 +1,3 @@ +{ + "version": "2026.9.18" +} diff --git a/src/components/layout/TopBar.tsx b/src/components/layout/TopBar.tsx index 3013b13..77e9d6d 100644 --- a/src/components/layout/TopBar.tsx +++ b/src/components/layout/TopBar.tsx @@ -88,7 +88,7 @@ export function TopBar() { - {t('version.label', 'INBUXA Admin v{{version}}', { version: __APP_VERSION__ })} + {t('version.label', 'INBUXA Admin {{version}}', { version: __APP_VERSION__ })} diff --git a/src/i18n/en.json b/src/i18n/en.json index 17c6f26..c9777fb 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -303,7 +303,7 @@ }, "logout": "Logout", "version": { - "label": "INBUXA Admin v{{version}}" + "label": "INBUXA Admin {{version}}" }, "oauth": { "backToLogin": "Back to login", diff --git a/vite.config.ts b/vite.config.ts index b8d037f..92ce537 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -5,11 +5,14 @@ import react from '@vitejs/plugin-react' import tailwindcss from '@tailwindcss/vite' import path from 'path' import { version } from './package.json' with { type: 'json' } +// INBUXA's own dated version lives apart from package.json, whose version +// follows upstream WebUI so its bumps merge without conflicts. +import inbuxa from './inbuxa-version.json' with { type: 'json' } export default defineConfig({ base: './', define: { - __APP_VERSION__: JSON.stringify(version), + __APP_VERSION__: JSON.stringify(`${inbuxa.version} (WebUI ${version})`), }, plugins: [react(), tailwindcss()], resolve: {