From b191fe2335d26ef82d916828cd9736366aea494d Mon Sep 17 00:00:00 2001
From: marshal <marshyordanos@gmail.com>
Date: Wed, 17 Jun 2026 00:44:39 +0300
Subject: [PATCH] Update Vite configuration to use Vitest for testing, add
 TypeScript source resolution for types, and deduplicate Mantine dependencies
 to ensure shared context.

---
 apps/edr-freight-web/portal/vite.config.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/edr-freight-web/portal/vite.config.ts b/apps/edr-freight-web/portal/vite.config.ts
index 8d01990aa..3d8023494 100644
--- a/apps/edr-freight-web/portal/vite.config.ts
+++ b/apps/edr-freight-web/portal/vite.config.ts
@@ -1,7 +1,7 @@
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 
-import { defineConfig } from "vite";
+import { defineConfig } from "vitest/config";
 import react from "@vitejs/plugin-react";
 import tailwindcss from "@tailwindcss/vite";
 
@@ -12,10 +12,20 @@ export default defineConfig({
   resolve: {
     alias: {
       "@": path.resolve(__dirname, "./src"),
+      // Resolve from TS source so Vite gets ESM named exports (dist is CommonJS).
+      "@edr/types": path.resolve(__dirname, "../../../packages/types/src/index.ts"),
     },
+    // Force a single copy of these singletons so MantineProvider context is
+    // shared between the portal app and @edr/ui-common (which ships its
+    // own node_modules copy). Without this, two separate @mantine/core
+    // instances are bundled and the context lookup fails at runtime.
+    dedupe: ["react", "react-dom", "@mantine/core", "@mantine/hooks"],
   },
   server: {
     port: 5173,
     host: "0.0.0.0",
   },
+  test: {
+    environment: "node",
+  },
 });