From d02644f7c41150709795e57bfd40351b4da35a7b Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Sat, 23 Apr 2022 01:59:21 +0200 Subject: Preload safe debug shim (#29) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In https://github.com/ferdium/ferdium-app/pull/23 we removed usages of the debug package due to an electron bug. This patch aims to restore some debug functionality by introducing a shim. The shim detect whether if it is being introduced in a preload script where the electron but would be triggered, and falls back to a simple replacement for debug. However, in the main and renderer processes, where a preload script is not being used, we still get full debug functionality. In this way, a module can be used both in a preload script and outside of it, while still preserving debug functionality whenever possible. Signed-off-by: Kristóf Marussy --- src/stores/UserStore.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/stores/UserStore.js') diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js index 8c413a065..661c03e2c 100644 --- a/src/stores/UserStore.js +++ b/src/stores/UserStore.js @@ -10,8 +10,7 @@ import Store from './lib/Store'; import Request from './lib/Request'; import CachedRequest from './lib/CachedRequest'; -// TODO: Go back to 'debug' from 'console.log' when https://github.com/electron/electron/issues/31689 is fixed -// const debug = require('debug')('Ferdium:UserStore'); +const debug = require('../preload-safe-debug')('Ferdium:UserStore'); // TODO: split stores into UserStore and AuthStore export default class UserStore extends Store { @@ -395,7 +394,7 @@ export default class UserStore extends Store { } if (!this.data.locale) { - console.log('Migrate "locale" to user data'); + debug('Migrate "locale" to user data'); this.actions.user.update({ userData: { locale: this.stores.app.locale, -- cgit v1.2.3-54-g00ecf