diff --git a/src/chrome/ScreenCaptureButtons.js b/src/chrome/ScreenCaptureButtons.js index ae4723f76..c290158bc 100644 --- a/src/chrome/ScreenCaptureButtons.js +++ b/src/chrome/ScreenCaptureButtons.js @@ -17,7 +17,7 @@ import {exec, spawn} from 'child_process'; import {remote} from 'electron'; import path from 'path'; import {reportPlatformFailures} from '../utils/metrics'; -import config from '../utils/processConfig'; +import config from '../utils/processConfig.tsx'; import type BaseDevice from '../devices/BaseDevice.tsx'; const CAPTURE_LOCATION = expandTilde( diff --git a/src/dispatcher/plugins.tsx b/src/dispatcher/plugins.tsx index 495df7540..f7f31d237 100644 --- a/src/dispatcher/plugins.tsx +++ b/src/dispatcher/plugins.tsx @@ -24,7 +24,7 @@ import GK from '../fb-stubs/GK'; import {FlipperBasePlugin} from '../plugin'; import {setupMenuBar} from '../MenuBar.js'; import path from 'path'; -import {default as config} from '../utils/processConfig.js'; +import {default as config} from '../utils/processConfig'; import isProduction from '../utils/isProduction'; export type PluginDefinition = { diff --git a/src/init.js b/src/init.js index 339b57aa6..f7939fc12 100644 --- a/src/init.js +++ b/src/init.js @@ -18,7 +18,7 @@ import {persistStore} from 'redux-persist'; import reducers from './reducers/index.tsx'; import dispatcher from './dispatcher/index.tsx'; import TooltipProvider from './ui/components/TooltipProvider.js'; -import config from './utils/processConfig.js'; +import config from './utils/processConfig.tsx'; import {stateSanitizer} from './utils/reduxDevToolsConfig.tsx'; import {initLauncherHooks} from './utils/launcher.js'; import initCrashReporter from './utils/electronCrashReporter'; diff --git a/src/utils/__tests__/processConfig.node.js b/src/utils/__tests__/processConfig.node.js index 4afc8caa0..c0e24512b 100644 --- a/src/utils/__tests__/processConfig.node.js +++ b/src/utils/__tests__/processConfig.node.js @@ -5,7 +5,7 @@ * @format */ -import {default as config, resetConfigForTesting} from '../processConfig.js'; +import {default as config, resetConfigForTesting} from '../processConfig.tsx'; afterEach(() => { resetConfigForTesting(); diff --git a/src/utils/launcher.js b/src/utils/launcher.js index 5c5912aad..b56899b52 100644 --- a/src/utils/launcher.js +++ b/src/utils/launcher.js @@ -5,7 +5,7 @@ * @format */ -import type {ProcessConfig} from './processConfig.js'; +import type {ProcessConfig} from './processConfig.tsx'; import type {Store} from '../reducers/index.tsx'; export function initLauncherHooks(config: ProcessConfig, store: Store) { diff --git a/src/utils/processConfig.js b/src/utils/processConfig.tsx similarity index 72% rename from src/utils/processConfig.js rename to src/utils/processConfig.tsx index d950f9f9a..686cffc32 100644 --- a/src/utils/processConfig.js +++ b/src/utils/processConfig.tsx @@ -7,23 +7,28 @@ import {remote} from 'electron'; -export type ProcessConfig = {| - disabledPlugins: Set, - pluginPaths: Array, - lastWindowPosition: ?{x: number, y: number, width: number, height: number}, - screenCapturePath: ?string, - launcherMsg: ?string, - updaterEnabled: boolean, +export type ProcessConfig = { + disabledPlugins: Set; + pluginPaths: Array; + lastWindowPosition: { + x: number; + y: number; + width: number; + height: number; + } | null; + screenCapturePath: string | null; + launcherMsg: string | null; + updaterEnabled: boolean; // Controls whether to delegate to the launcher if present. - launcherEnabled: boolean, -|}; + launcherEnabled: boolean; +}; let configObj = null; export default function config(): ProcessConfig { if (configObj === null) { const json = JSON.parse( // $FlowFixMe: process.env not in type defs - remote?.process.env.CONFIG || process.env.CONFIG || '{}', + (remote && remote.process.env.CONFIG) || process.env.CONFIG || '{}', ); configObj = { disabledPlugins: new Set(json.disabledPlugins || []),