replaced hardcoded versions in the app

directus · Dec 20, 2023 · a5a1c26 · a5a1c26
1 parent c3211fc
commit a5a1c26
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 16 deletions.
diff --git a/app/env.d.ts b/app/env.d.ts
@@ -1,4 +1,2 @@
 /// <reference types="vite/client" />
 /// <reference types="@histoire/plugin-vue/components" />
-
-declare const __DIRECTUS_VERSION__: string;
diff --git a/app/src/main.ts b/app/src/main.ts
@@ -17,19 +17,13 @@ import { registerViews } from './views/register';
 init();
 
 async function init() {
-	const version = __DIRECTUS_VERSION__;
-
 	console.log(DIRECTUS_LOGO);
 
 	console.info(
 		`Hey! Interested in helping build this open-source data management platform?\nIf so, join our growing team of contributors at: https://directus.chat`,
 	);
 
-	if (import.meta.env.DEV) {
-		console.info(`%c🐰 Starting Directus v${version}...`, 'color:Green');
-	} else {
-		console.info(`%c🐰 Starting Directus...`, 'color:Green');
-	}
+	console.info(`%c🐰 Starting Directus...`, 'color:Green');
 
 	console.time('🕓 Application Loaded');
 

diff --git a/app/src/modules/settings/components/navigation.vue b/app/src/modules/settings/components/navigation.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
+import { useServerStore } from '@/stores/server';
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-const version = __DIRECTUS_VERSION__;
-
 const { t } = useI18n();
+const { info } = useServerStore();
 
 const dataItems = [
 	{
@@ -103,7 +103,7 @@ const externalItems = computed(() => {
 		<v-list-item href="https://github.com/directus/directus/releases" class="version">
 			<v-list-item-icon><v-icon name="directus" /></v-list-item-icon>
 			<v-list-item-content>
-				<v-text-overflow class="version" :text="`Directus ${version}`" />
+				<v-text-overflow class="version" :text="`Directus ${info.version}`" />
 			</v-list-item-content>
 		</v-list-item>
 	</v-list>

diff --git a/app/src/stores/server.ts b/app/src/stores/server.ts
@@ -43,6 +43,7 @@ export type Info = {
 		default: number;
 		max: number;
 	};
+	version?: string;
 };
 
 export type Auth = {
@@ -83,6 +84,7 @@ export const useServerStore = defineStore('serverStore', () => {
 
 		info.project = serverInfoResponse.data.data?.project;
 		info.queryLimit = serverInfoResponse.data.data?.queryLimit;
+		info.version = serverInfoResponse.data.data?.version;
 
 		auth.providers = authResponse.data.data;
 		auth.disableDefault = authResponse.data.disableDefault;

diff --git a/app/vite.config.js b/app/vite.config.js
@@ -18,16 +18,12 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { searchForWorkspaceRoot } from 'vite';
 import { defineConfig } from 'vitest/config';
-import { version } from '../directus/package.json';
 
 const API_PATH = path.join('..', 'api');
 const EXTENSIONS_PATH = path.join(API_PATH, 'extensions');
 
 // https://vitejs.dev/config/
 export default defineConfig({
-	define: {
-		__DIRECTUS_VERSION__: JSON.stringify(version),
-	},
 	plugins: [
 		directusExtensions(),
 		vue(),