lee/Recordly
1
0
Fork 0
mirror of https://github.com/webadderallorg/Recordly.git synced 2026-09-26 15:55:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(electron): avoid cjs dirname binding collision

Browse Source
This commit is contained in:
wiiiii123
2026-05-08 20:07:36 +07:00
parent 4802b5868a
commit 1efc9f1706
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
electron/main.ts
+2 -2
View File
@@ -52,7 +52,7 @@ import {
showUpdateToastWindow,
} from "./windows";
const __dirname = path.dirname(fileURLToPath(import.meta.url));
const electronMainDir = path.dirname(fileURLToPath(import.meta.url));
const IS_SMOKE_EXPORT = process.env.RECORDLY_SMOKE_EXPORT === "1";
function ignoreBrokenConsolePipe(stream: NodeJS.WritableStream | undefined) {
@@ -118,7 +118,7 @@ async function ensureRecordingsDir() {
// │ │ ├── main.js
// │ │ └── preload.mjs
// │
process.env.APP_ROOT = path.join(__dirname, "..");
process.env.APP_ROOT = path.join(electronMainDir, "..");
// Use ['ENV_NAME'] avoid vite:define plugin - Vite@2.x
export const VITE_DEV_SERVER_URL = process.env["VITE_DEV_SERVER_URL"];
electron/windows.ts
+7 -7
View File
@@ -7,10 +7,10 @@ import { app, BrowserWindow, ipcMain } from "electron";
import { USER_DATA_PATH } from "./appPaths";
import { getPackagedRendererBaseUrl } from "./rendererServer";
const __dirname = path.dirname(fileURLToPath(import.meta.url));
const electronWindowsDir = path.dirname(fileURLToPath(import.meta.url));
const nodeRequire = createRequire(import.meta.url);
const APP_ROOT = path.join(__dirname, "..");
const APP_ROOT = path.join(electronWindowsDir, "..");
const VITE_DEV_SERVER_URL = process.env["VITE_DEV_SERVER_URL"];
const RENDERER_DIST = path.join(APP_ROOT, "dist");
const WINDOW_ICON_PATH = path.join(
@@ -374,7 +374,7 @@ export function createHudOverlayWindow(): BrowserWindow {
hasShadow: false,
show: false,
webPreferences: {
preload: path.join(__dirname, "preload.mjs"),
preload: path.join(electronWindowsDir, "preload.mjs"),
nodeIntegration: false,
contextIsolation: true,
webSecurity: false,
@@ -537,7 +537,7 @@ export function createUpdateToastWindow(): BrowserWindow {
...(parentWindow ? { parent: parentWindow } : {}),
backgroundColor: useTransparentToastWindow ? "#00000000" : "#101418",
webPreferences: {
preload: path.join(__dirname, "preload.mjs"),
preload: path.join(electronWindowsDir, "preload.mjs"),
nodeIntegration: false,
contextIsolation: true,
backgroundThrottling: false,
@@ -726,7 +726,7 @@ export function createEditorWindow(): BrowserWindow {
show: false,
backgroundColor: "#000000",
webPreferences: {
preload: path.join(__dirname, "preload.mjs"),
preload: path.join(electronWindowsDir, "preload.mjs"),
nodeIntegration: false,
contextIsolation: true,
webSecurity: false,
@@ -799,7 +799,7 @@ export function createSourceSelectorWindow(): BrowserWindow {
}),
backgroundColor: "#00000000",
webPreferences: {
preload: path.join(__dirname, "preload.mjs"),
preload: path.join(electronWindowsDir, "preload.mjs"),
nodeIntegration: false,
contextIsolation: true,
},
@@ -846,7 +846,7 @@ export function createCountdownWindow(): BrowserWindow {
focusable: true,
show: false,
webPreferences: {
preload: path.join(__dirname, "preload.mjs"),
preload: path.join(electronWindowsDir, "preload.mjs"),
nodeIntegration: false,
contextIsolation: true,
},