From f408ac873d60cc3fc5db25cb6dea260d5a09be8a Mon Sep 17 00:00:00 2001 From: keiya sasaki <34934510+keiya01@users.noreply.github.com> Date: Wed, 3 Jul 2024 12:36:08 +0900 Subject: [PATCH] fix(web): embed git commit hash from vite in correct way (#1049) --- web/src/main.tsx | 1 + web/src/services/config/index.ts | 2 ++ web/vite.config.ts | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/web/src/main.tsx b/web/src/main.tsx index 47b2052b3d..2d27610e60 100644 --- a/web/src/main.tsx +++ b/web/src/main.tsx @@ -11,6 +11,7 @@ import wdyr from "./wdyr"; window.React = React; window.ReactDOM = ReactDOM; +window.REEARTH_COMMIT_HASH = __REEARTH_COMMIT_HASH__; loadConfig().finally(async () => { const element = document.getElementById("root"); diff --git a/web/src/services/config/index.ts b/web/src/services/config/index.ts index d7a354cb4c..2bc061db5f 100644 --- a/web/src/services/config/index.ts +++ b/web/src/services/config/index.ts @@ -51,10 +51,12 @@ export type Config = { declare global { let __APP_VERSION__: string; + let __REEARTH_COMMIT_HASH__: string; interface Window { REEARTH_CONFIG?: Config; REEARTH_E2E_ACCESS_TOKEN?: string; REEARTH_E2E_CESIUM_VIEWER?: any; + REEARTH_COMMIT_HASH?: string; } } diff --git a/web/vite.config.ts b/web/vite.config.ts index 68fe2e3d93..7424039fcc 100644 --- a/web/vite.config.ts +++ b/web/vite.config.ts @@ -34,7 +34,7 @@ export default defineConfig({ define: { "process.env.QTS_DEBUG": "false", // quickjs-emscripten __APP_VERSION__: JSON.stringify(pkg.version), - "window.REEARTH_COMMIT_HASH": JSON.stringify(commitHash), + __REEARTH_COMMIT_HASH__: JSON.stringify(commitHash), }, mode: NO_MINIFY ? "development" : undefined, server: {