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
This commit is contained in:
Michael Telatynski
2026-04-30 07:44:29 +00:00
committed by GitHub
parent 98b56a3d2f
commit 30484ef126
12 changed files with 434 additions and 543 deletions
+5 -4
View File
@@ -30,21 +30,22 @@
"test:unit": "vitest"
},
"devDependencies": {
"@element-hq/vite-common": "workspace:*",
"@matrix-org/react-sdk-module-api": "^2.5.0",
"@microsoft/api-extractor": "^7.49.1",
"@types/node": "^22.10.7",
"@types/react": "^19",
"@types/react-dom": "^19.0.4",
"@types/semver": "^7.5.8",
"@vitest/coverage-v8": "^4.0.0",
"@vitest/coverage-v8": "catalog:",
"matrix-widget-api": "^1.17.0",
"rollup-plugin-external-globals": "^0.13.0",
"semver": "^7.6.3",
"typescript": "^6.0.0",
"unplugin-dts": "1.0.0-beta.6",
"vite": "^8.0.0",
"vitest": "^4.0.0",
"vitest-sonar-reporter": "^3.0.0"
"vite": "catalog:",
"vitest": "catalog:",
"vitest-sonar-reporter": "catalog:"
},
"peerDependencies": {
"@matrix-org/react-sdk-module-api": "*",
+31 -45
View File
@@ -7,57 +7,43 @@ Please see LICENSE files in the repository root for full details.
import { dirname, resolve } from "node:path";
import { fileURLToPath } from "node:url";
import { defineConfig } from "vite";
import { defineConfig, mergeConfig } from "vitest/config";
import dts from "unplugin-dts/vite";
import externalGlobals from "rollup-plugin-external-globals";
import baseConfig from "@element-hq/vite-common/vite.config";
import packageJson from "./package.json" with { type: "json" };
const __dirname = dirname(fileURLToPath(import.meta.url));
export default defineConfig({
build: {
lib: {
entry: resolve(__dirname, "src/index.ts"),
name: "element-web-plugin-engine",
fileName: "element-web-plugin-engine",
export default mergeConfig(
baseConfig,
defineConfig({
build: {
lib: {
entry: resolve(__dirname, "src/index.ts"),
name: "element-web-plugin-engine",
fileName: "element-web-plugin-engine",
},
outDir: "lib",
target: "esnext",
sourcemap: true,
},
outDir: "lib",
target: "esnext",
sourcemap: true,
},
plugins: [
dts(),
externalGlobals({
// Reuse React from the host app
react: "window.React",
}),
],
define: {
// We cannot use `process.env.npm_package_version` as when building element-web with module-api set to `workspace`
// this would contain the version of element-web rather than that of the module-api.
__VERSION__: JSON.stringify(packageJson.version),
// Use production mode for the build as it is tested against production builds of Element Web,
// this is required for React JSX versions to be compatible.
process: { env: { NODE_ENV: "production" } },
},
test: {
coverage: {
provider: "v8",
include: ["src/**/*"],
reporter: [["lcov", { projectRoot: "../../" }]],
},
reporters: [
["default", { summary: false }],
[
"vitest-sonar-reporter",
{
outputFile: "coverage/sonar-report.xml",
onWritePath(path: string): string {
return `packages/element-web-module-api/${path}`;
},
},
],
plugins: [
dts(),
externalGlobals({
// Reuse React from the host app
react: "window.React",
}),
],
},
});
define: {
// We cannot use `process.env.npm_package_version` as when building element-web with module-api set to `workspace`
// this would contain the version of element-web rather than that of the module-api.
__VERSION__: JSON.stringify(packageJson.version),
// Use production mode for the build as it is tested against production builds of Element Web,
// this is required for React JSX versions to be compatible.
process: { env: { NODE_ENV: "production" } },
},
}),
true,
);