chore: merge conflicts Refs: PL-240

Author: mikkojamG

Dockerfile

@@ -21,8 +21,6 @@ COPY --chown=default:root ./.git ./.git
 # ============================================================
 FROM appbase AS development
 
-WORKDIR /servicemap-ui
-
 # Set NODE_ENV to development in the development container
 ARG NODE_ENV=development
 ENV NODE_ENV $NODE_ENV

config/default.js

@@ -97,8 +97,8 @@ function getVersion() {
   }
   // Use process.env for server-side
   return {
-    tag: s.REACT_APP_GIT_TAG,
-    commit: s.REACT_APP_GIT_COMMIT,
+    tag: process.env.REACT_APP_GIT_TAG,
+    commit: process.env.REACT_APP_GIT_COMMIT,
   };
 }
 

package.json

@@ -63,7 +63,7 @@
     "vitest": "^3.2.4"
   },
   "scripts": {
-    "build": "rm -rf dist && pnpm build:client && pnpm build:server && pnpm update-runtime-env",
+    "build": "rm -rf dist && pnpm update-runtime-env && pnpm build:client && pnpm build:server",
     "build:client": "vite build --outDir dist/client --ssrManifest",
     "build:server": "vite build --ssr server/server-entry.js --outDir dist/server",
     "dev": "pnpm update-runtime-env && node server.mjs",

scripts/update-runtime-env.js

@@ -20,7 +20,7 @@ const configFile = USE_TEST_ENV ? 'test-env-config.js' : 'env-config.js';
 
 // Tests require the file directly from public/ (see src/setupTests.js).
 // All other contexts write to dist/ — created if it doesn't exist yet (e.g. before first build in dev).
-const outputDir = path.resolve(process.cwd(), USE_TEST_ENV ? 'public' : 'dist');
+const outputDir = path.resolve(process.cwd(), 'public');
 fs.mkdirSync(outputDir, { recursive: true });
 
 const configurationFile = path.join(outputDir, configFile);