DRY vite configs using a shared config (#33334)

* Fix OIDC login callback handling on Element Desktop * Add unit tests * Iterate * Fix lcov reporter * DRY vite configs using a shared config * Iterate * Revert change to electron-builder.ts * Iterate
2026-11-05 22:25:36 +00:00 · 2026-04-30 08:44:29 +01:00
parent 98b56a3d2f
commit 30484ef126
12 changed files with 434 additions and 543 deletions
@@ -5,60 +5,19 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE files in the repository root for full details.
 */

-import { defineConfig } from "vitest/config";
-import { type UserConfig } from "vite";
-import { type Reporter } from "vitest/reporters";
-import { env } from "node:process";
+import { defineConfig, mergeConfig } from "vitest/config";
+import baseConfig from "@element-hq/vite-common/vite.config.js";

-const reporters: NonNullable<UserConfig["test"]>["reporters"] = [["default"]];
-
-const slowTestReporter: Reporter = {
-    onTestRunEnd(testModules, unhandledErrors, reason) {
-        const tests = testModules
-            .flatMap((m) => Array.from(m.children.allTests()))
-            .filter((test) => test.diagnostic()?.slow);
-        tests.sort((x, y) => x.diagnostic()!.duration! - y.diagnostic()!.duration!);
-        tests.reverse();
-
-        if (tests.length > 0) {
-            console.warn("Slowest 10 tests:");
-        }
-        for (const t of tests.slice(0, 10)) {
-            console.warn(`${t.module.moduleId} > ${t.fullName}: ${t.diagnostic()?.duration.toFixed(0)}ms`);
-        }
-    },
-};
-
-// if we're running under GHA, enable the GHA & Sonar reporters
-if (env["GITHUB_ACTIONS"] !== undefined) {
-    reporters.push(["github-actions", { silent: false }]);
-    reporters.push([
-        "vitest-sonar-reporter",
-        {
-            outputFile: "coverage/sonar-report.xml",
-            onWritePath: (path): string => `apps/desktop/${path}`,
+export default mergeConfig(
+    baseConfig,
+    defineConfig({
+        test: {
+            coverage: {
+                // The coverage report currently chokes on this file as it doesn't process it as TypeScript
+                exclude: ["src/preload.cts"],
+            },
+            include: ["src/**/*.test.ts"],
        },
-    ]);
-
-    // if we're running against the develop branch, also enable the slow test reporter
-    if (env["GITHUB_REF"] == "refs/heads/develop") {
-        reporters.push(slowTestReporter);
-    }
-}
-
-export default defineConfig({
-    test: {
-        coverage: {
-            provider: "v8",
-            include: ["src/**/*"],
-            // The coverage report currently chokes on this file as it doesn't process it as TypeScript
-            exclude: ["src/preload.cts"],
-            reporter: [["lcov", { projectRoot: "../../" }]],
-        },
-        environment: "node",
-        reporters,
-        globals: true,
-        pool: "threads",
-        include: ["src/**/*.test.ts"],
-    },
-});
+    }),
+    true,
+);