Turn off usage of 'debug' npm package using with electron-16 (fixes #17)

3 files changed, 19 insertions, 16 deletions

diff --git a/src/electron/ipc-api/download.ts b/src/electron/ipc-api/download.ts
index cb2aa7383..3631e8fee 100644
--- a/src/electron/ipc-api/download.ts
+++ b/src/electron/ipc-api/download.ts
@@ -4,7 +4,8 @@ import mime from 'mime-types';
 import { writeFileSync } from 'fs-extra';
 import { PathLike } from 'fs';
 
-const debug = require('debug')('Ferdium:ipcApi:download');
+// TODO: Go back to 'debug' from 'console.log' when https://github.com/electron/electron/issues/31689 is fixed
+// const debug = require('debug')('Ferdium:ipcApi:download');
 
 function decodeBase64Image(dataString: string) {
   const matches = dataString.match(/^data:([+/A-Za-z-]+);base64,(.+)$/);
@@ -27,7 +28,7 @@ export default (params: { mainWindow: BrowserWindow }) => {
           const dl = await download(win!, url, {
             saveAs: true,
           });
-          debug('File saved to', dl.savePath);
+          console.log('File saved to', dl.savePath);
         } else {
           const extension = mime.extension(fileOptions.mime);
           const filename = `${fileOptions.name}.${extension}`;
@@ -46,7 +47,7 @@ export default (params: { mainWindow: BrowserWindow }) => {
               'binary',
             );
 
-            debug('File blob saved to', saveDialog.filePath);
+            console.log('File blob saved to', saveDialog.filePath);
           } catch (error) {
             console.error(error);
           }
diff --git a/src/electron/ipc-api/sessionStorage.ts b/src/electron/ipc-api/sessionStorage.ts
index 20f0ac9d2..96acacd12 100644
--- a/src/electron/ipc-api/sessionStorage.ts
+++ b/src/electron/ipc-api/sessionStorage.ts
@@ -2,7 +2,8 @@ import { ipcMain, Session, session } from 'electron';
 
 import { TODOS_PARTITION_ID } from '../../config';
 
-const debug = require('debug')('Ferdium:ipcApi:sessionStorage');
+// TODO: Go back to 'debug' from 'console.log' when https://github.com/electron/electron/issues/31689 is fixed
+// const debug = require('debug')('Ferdium:ipcApi:sessionStorage');
 
 function deduceSession(serviceId: string | undefined | null): Session {
   if (serviceId) {
@@ -21,14 +22,14 @@ export default async () => {
       const serviceSession = deduceSession(serviceId);
       serviceSession.flushStorageData();
       if (targetsToClear) {
-        debug('Clearing targets:', targetsToClear);
+        console.log('Clearing targets:', targetsToClear);
         serviceSession.clearStorageData(targetsToClear);
       } else {
-        debug('Clearing all targets');
+        console.log('Clearing all targets');
         serviceSession.clearStorageData();
       }
     } catch (error) {
-      debug(error);
+      console.log(error);
     }
   });
 
diff --git a/src/electron/macOSPermissions.ts b/src/electron/macOSPermissions.ts
index 7e4bb3c4d..07caaaada 100644
--- a/src/electron/macOSPermissions.ts
+++ b/src/electron/macOSPermissions.ts
@@ -6,11 +6,12 @@ import { dirname } from 'path';
 import { askForScreenCaptureAccess } from 'node-mac-permissions';
 import { userDataPath } from '../environment-remote';
 
-const debug = require('debug')('Ferdium:macOSPermissions');
+// TODO: Go back to 'debug' from 'console.log' when https://github.com/electron/electron/issues/31689 is fixed
+// const debug = require('debug')('Ferdium:macOSPermissions');
 
 const isExplicitScreenCapturePermissionReqd =
   macosVersion.isGreaterThanOrEqualTo('10.15');
-debug(
+console.log(
   `Should check explicitly for screen-capture permissions: ${isExplicitScreenCapturePermissionReqd}`,
 );
 
@@ -21,7 +22,7 @@ function hasPromptedForScreenCapturePermission(): string | boolean {
     return false;
   }
 
-  debug('Checking if status file exists');
+  console.log('Checking if status file exists');
   return filePath && pathExistsSync(filePath);
 }
 
@@ -31,7 +32,7 @@ function hasScreenCapturePermissionAlreadyBeenGranted(): boolean {
   }
 
   const screenCaptureStatus = systemPreferences.getMediaAccessStatus('screen');
-  debug(`screen-capture permissions status: ${screenCaptureStatus}`);
+  console.log(`screen-capture permissions status: ${screenCaptureStatus}`);
   return screenCaptureStatus === 'granted';
 }
 
@@ -49,18 +50,18 @@ function createStatusFile() {
 }
 
 export const askFormacOSPermissions = async (mainWindow: BrowserWindow) => {
-  debug('Checking camera & microphone permissions');
+  console.log('Checking camera & microphone permissions');
   systemPreferences.askForMediaAccess('camera');
   systemPreferences.askForMediaAccess('microphone');
 
   if (hasScreenCapturePermissionAlreadyBeenGranted()) {
-    debug('Already obtained screen-capture permissions - writing status file');
+    console.log('Already obtained screen-capture permissions - writing status file');
     createStatusFile();
     return;
   }
 
   if (!hasPromptedForScreenCapturePermission()) {
-    debug('Checking screen capture permissions');
+    console.log('Checking screen capture permissions');
 
     const { response } = await dialog.showMessageBox(mainWindow, {
       type: 'info',
@@ -73,11 +74,11 @@ export const askFormacOSPermissions = async (mainWindow: BrowserWindow) => {
     });
 
     if (response === 0) {
-      debug('Asking for access');
+      console.log('Asking for access');
       askForScreenCaptureAccess();
       createStatusFile();
     } else if (response === 1) {
-      debug("Don't ask again");
+      console.log("Don't ask again");
       createStatusFile();
     }
   }