From 38de1e0cf41b9d5527d405952e2d66e983ca2a5c Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Thu, 27 May 2021 20:37:32 +0200 Subject: Environmental variables for dev/production mode (#1455) * Restore ELECTRON_IS_DEV environment variable As part of migrating to @electron/remote from electron.remote, 296ce5ce6 removed the electron-is-dev package and with it the support of selecting dev/production mode with the ELECTRON_IS_DEV environmental variable. This commit restores support for this variable. Because even the newest version of the electron-is-dev package breaks in renderer processes, we instead query the environment ourselves. * Add support for NODE_ENV variable Also support NODE_ENV for specifying dev mode in addition to the ELECTRON_IS_DEV variable. This variable is used by e.g., the packaging in Arch Linux to trigger production mode with an explicit electron command line invocation: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=ferdi-git&id=61dc59e5eb19a2c9e8f9edaf0a63aaae72990a0b#n109 * Refactor environmental variable handling --- src/environment.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/environment.js') diff --git a/src/environment.js b/src/environment.js index 1aa0def04..fb7c9d133 100644 --- a/src/environment.js +++ b/src/environment.js @@ -1,4 +1,5 @@ import { + isDevMode as isDev, LIVE_API, DEV_API, LOCAL_API, @@ -15,7 +16,9 @@ import { // eslint-disable-next-line global-require export const { app } = process.type === 'renderer' ? require('@electron/remote') : require('electron'); -export const isDevMode = !app.isPackaged; +// TODO Remove this re-export and move the code from config.js to here. +export const isDevMode = isDev; + export const useLiveAPI = process.env.LIVE_API; export const useLocalAPI = process.env.LOCAL_API; -- cgit v1.2.3-70-g09d2