fix: Allow using in ESM bundled by Vite #390

megahertz · Dec 30, 2023 · af7b7a0 · af7b7a0
1 parent 3526fec
commit af7b7a0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/main/initialize.js b/src/main/initialize.js
@@ -41,9 +41,18 @@ function initializePreload({
 }) {
   let preloadPath = typeof preloadOption === 'string'
     ? preloadOption
-    : path.resolve(__dirname, '../renderer/electron-log-preload.js');
+    : undefined;
 
-  if (!fs.existsSync(preloadPath)) {
+  try {
+    preloadPath = path.resolve(
+      __dirname,
+      '../renderer/electron-log-preload.js',
+    );
+  } catch {
+    // Ignore, the file is bundled to ESM
+  }
+
+  if (!preloadPath || !fs.existsSync(preloadPath)) {
     preloadPath = path.join(
       electronApi.getAppUserDataPath() || os.tmpdir(),
       'electron-log-preload.js',

diff --git a/src/main/transports/file/packageJson.js b/src/main/transports/file/packageJson.js
@@ -14,7 +14,7 @@ module.exports = {
  * @return {{ name?: string, version?: string}}
  */
 function readPackageJson() {
-  return tryReadJsonAt(require.main && require.main.filename)
+  return tryReadJsonAt(getMainModulePath())
     || tryReadJsonAt(extractPathFromArgs())
     || tryReadJsonAt(process.resourcesPath, 'app.asar')
     || tryReadJsonAt(process.resourcesPath, 'app')
@@ -96,3 +96,11 @@ function extractPathFromArgs() {
   const userDataDir = matchedArgs[0];
   return userDataDir.replace('--user-data-dir=', '');
 }
+
+function getMainModulePath() {
+  if (typeof require === 'function') {
+    return require.main?.filename;
+  }
+
+  return undefined;
+}