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/features/publishDebugInfo/Component.js | 2 +- src/features/publishDebugInfo/index.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/features/publishDebugInfo') diff --git a/src/features/publishDebugInfo/Component.js b/src/features/publishDebugInfo/Component.js index 3d4e85dbf..ff052a050 100644 --- a/src/features/publishDebugInfo/Component.js +++ b/src/features/publishDebugInfo/Component.js @@ -14,7 +14,7 @@ import { DEBUG_API } from '../../config'; import AppStore from '../../stores/AppStore'; import ServicesStore from '../../stores/ServicesStore'; -const debug = require('debug')('Ferdium:feature:publishDebugInfo'); +const debug = require('../../preload-safe-debug')('Ferdium:feature:publishDebugInfo'); const messages = defineMessages({ title: { diff --git a/src/features/publishDebugInfo/index.ts b/src/features/publishDebugInfo/index.ts index 33b8eb6f5..597bcdc12 100644 --- a/src/features/publishDebugInfo/index.ts +++ b/src/features/publishDebugInfo/index.ts @@ -3,7 +3,7 @@ import { state as ModalState } from './store'; export { default as Component } from './Component'; const state = ModalState; -const debug = require('debug')('Ferdium:feature:publishDebugInfo'); +const debug = require('../../preload-safe-debug')('Ferdium:feature:publishDebugInfo'); export default function initialize() { debug('Initialize publishDebugInfo feature'); -- cgit v1.2.3-54-g00ecf