diff --git a/src/Client.tsx b/src/Client.tsx
index 2c9b0e9c8..76c730f90 100644
--- a/src/Client.tsx
+++ b/src/Client.tsx
@@ -14,7 +14,7 @@ import {setPluginState} from './reducers/pluginStates';
 import {RSocketClientSocket} from 'rsocket-core/RSocketClient';
 import {performance} from 'perf_hooks';
 import {reportPlatformFailures, reportPluginFailures} from './utils/metrics';
-import {default as isProduction} from './utils/isProduction.js';
+import {default as isProduction} from './utils/isProduction';
 import {registerPlugins} from './reducers/plugins';
 import createTableNativePlugin from './plugins/TableNativePlugin';
 import EventEmitter from 'events';
diff --git a/src/chrome/AutoUpdateVersion.tsx b/src/chrome/AutoUpdateVersion.tsx
index 889be8511..a2cfa647e 100644
--- a/src/chrome/AutoUpdateVersion.tsx
+++ b/src/chrome/AutoUpdateVersion.tsx
@@ -7,7 +7,7 @@
 
 import {FlexRow, colors, LoadingIndicator, Glyph, styled} from 'flipper';
 import {remote} from 'electron';
-import isProduction from '../utils/isProduction.js';
+import isProduction from '../utils/isProduction';
 import React, {Component} from 'react';
 import config from '../fb-stubs/config';
 
diff --git a/src/chrome/TitleBar.tsx b/src/chrome/TitleBar.tsx
index 3421dd9c3..c4385e0bd 100644
--- a/src/chrome/TitleBar.tsx
+++ b/src/chrome/TitleBar.tsx
@@ -33,7 +33,7 @@ import AutoUpdateVersion from './AutoUpdateVersion';
 import UpdateIndicator from './UpdateIndicator';
 import config from '../fb-stubs/config';
 import {isAutoUpdaterEnabled} from '../utils/argvUtils';
-import isProduction from '../utils/isProduction.js';
+import isProduction from '../utils/isProduction';
 import {clipboard} from 'electron';
 import React from 'react';
 import {State} from 'src/reducers';
diff --git a/src/chrome/WelcomeScreen.tsx b/src/chrome/WelcomeScreen.tsx
index 8b91666fd..86b425160 100644
--- a/src/chrome/WelcomeScreen.tsx
+++ b/src/chrome/WelcomeScreen.tsx
@@ -14,7 +14,7 @@ import {
   colors,
   brandColors,
 } from 'flipper';
-import isProduction from '../utils/isProduction.js';
+import isProduction from '../utils/isProduction';
 import {shell, remote} from 'electron';
 import React, {PureComponent} from 'react';
 
diff --git a/src/dispatcher/iOSDevice.tsx b/src/dispatcher/iOSDevice.tsx
index 8b8918802..b7e1f9273 100644
--- a/src/dispatcher/iOSDevice.tsx
+++ b/src/dispatcher/iOSDevice.tsx
@@ -15,7 +15,7 @@ import child_process from 'child_process';
 const execFile = child_process.execFile;
 import iosUtil from '../fb-stubs/iOSContainerUtility';
 import IOSDevice from '../devices/IOSDevice';
-import isProduction from '../utils/isProduction.js';
+import isProduction from '../utils/isProduction';
 import GK from '../fb-stubs/GK';
 import {registerDeviceCallbackOnPlugins} from '../utils/onRegisterDevice.js';
 type iOSSimulatorDevice = {
diff --git a/src/dispatcher/notifications.tsx b/src/dispatcher/notifications.tsx
index b10c47c4e..b23b59691 100644
--- a/src/dispatcher/notifications.tsx
+++ b/src/dispatcher/notifications.tsx
@@ -9,7 +9,7 @@ import {Store} from '../reducers/index';
 import {Logger} from '../fb-interfaces/Logger.js';
 import {PluginNotification} from '../reducers/notifications';
 import {FlipperPlugin, FlipperDevicePlugin} from '../plugin';
-import isHeadless from '../utils/isHeadless.js';
+import isHeadless from '../utils/isHeadless';
 import {ipcRenderer} from 'electron';
 import {selectPlugin} from '../reducers/connections';
 import {
diff --git a/src/index.js b/src/index.js
index 346742001..df56a0c8d 100644
--- a/src/index.js
+++ b/src/index.js
@@ -37,7 +37,7 @@ export {
   LogLevel,
 } from './devices/BaseDevice.tsx';
 export {shouldParseAndroidLog} from './utils/crashReporterUtility.tsx';
-export {default as isProduction} from './utils/isProduction.js';
+export {default as isProduction} from './utils/isProduction.tsx';
 export {createTablePlugin} from './createTablePlugin.js';
 export {default as DetailSidebar} from './chrome/DetailSidebar.js';
 
diff --git a/src/utils/electronCrashReporter.tsx b/src/utils/electronCrashReporter.tsx
index b2ce9335c..3ef36b6e7 100644
--- a/src/utils/electronCrashReporter.tsx
+++ b/src/utils/electronCrashReporter.tsx
@@ -8,7 +8,7 @@
 import {exists, mkdir} from 'fs';
 import {promisify} from 'util';
 import {crashReporter, remote} from 'electron';
-import isProduction from '../utils/isProduction.js';
+import isProduction from '../utils/isProduction';
 import constants from '../fb-stubs/constants';
 import {tmpName} from 'tmp';
 import {resolve} from 'path';
diff --git a/src/utils/isHeadless.js b/src/utils/isHeadless.tsx
similarity index 100%
rename from src/utils/isHeadless.js
rename to src/utils/isHeadless.tsx
diff --git a/src/utils/isProduction.js b/src/utils/isProduction.tsx
similarity index 100%
rename from src/utils/isProduction.js
rename to src/utils/isProduction.tsx
diff --git a/src/utils/packageMetadata.js b/src/utils/packageMetadata.js
index f5cb25213..eaf69ac26 100644
--- a/src/utils/packageMetadata.js
+++ b/src/utils/packageMetadata.js
@@ -7,7 +7,7 @@
 
 import electron from 'electron';
 import lodash from 'lodash';
-import isProduction from './isProduction';
+import isProduction from './isProduction.tsx';
 import path from 'path';
 import fs from 'fs';
 import {promisify} from 'util';
diff --git a/types/nodejs.tsx b/types/nodejs.tsx
index dce102805..dd85c12c0 100644
--- a/types/nodejs.tsx
+++ b/types/nodejs.tsx
@@ -8,5 +8,6 @@
 declare module NodeJS {
   interface Global {
     electronRequire: (name: string) => void;
+    window: Window | undefined;
   }
 }