diff --git a/desktop/app/src/__tests__/__snapshots__/createMockFlipperWithPlugin.node.tsx.snap b/desktop/app/src/__tests__/__snapshots__/createMockFlipperWithPlugin.node.tsx.snap index 952f76355..b27a29062 100644 --- a/desktop/app/src/__tests__/__snapshots__/createMockFlipperWithPlugin.node.tsx.snap +++ b/desktop/app/src/__tests__/__snapshots__/createMockFlipperWithPlugin.node.tsx.snap @@ -84,7 +84,7 @@ Object { "disabledPlugins": Array [], "failedPlugins": Array [], "gatekeepedPlugins": Array [], - "initialised": false, + "initialized": false, "installedPlugins": Map {}, "loadedPlugins": Map {}, "marketplacePlugins": Array [], diff --git a/desktop/app/src/dispatcher/plugins.tsx b/desktop/app/src/dispatcher/plugins.tsx index b185bbbb1..6b73d496d 100644 --- a/desktop/app/src/dispatcher/plugins.tsx +++ b/desktop/app/src/dispatcher/plugins.tsx @@ -22,7 +22,7 @@ import { registerBundledPlugins, registerMarketplacePlugins, MarketplacePluginDetails, - pluginsInitialised, + pluginsInitialized, } from '../reducers/plugins'; import GK from '../fb-stubs/GK'; import {FlipperBasePlugin} from '../plugin'; @@ -110,7 +110,7 @@ export default async (store: Store, logger: Logger) => { store.dispatch(addDisabledPlugins(disabledPlugins)); store.dispatch(addFailedPlugins(failedPlugins)); store.dispatch(registerPlugins(initialPlugins)); - store.dispatch(pluginsInitialised()); + store.dispatch(pluginsInitialized()); sideEffect( store, diff --git a/desktop/app/src/reducers/__tests__/plugins.node.tsx b/desktop/app/src/reducers/__tests__/plugins.node.tsx index a5c290914..b5721783b 100644 --- a/desktop/app/src/reducers/__tests__/plugins.node.tsx +++ b/desktop/app/src/reducers/__tests__/plugins.node.tsx @@ -45,7 +45,7 @@ test('add clientPlugin', () => { marketplacePlugins: [], uninstalledPluginNames: new Set(), installedPlugins: new Map(), - initialised: false, + initialized: false, }, registerPlugins([testPlugin]), ); @@ -66,7 +66,7 @@ test('add devicePlugin', () => { marketplacePlugins: [], uninstalledPluginNames: new Set(), installedPlugins: new Map(), - initialised: false, + initialized: false, }, registerPlugins([testDevicePlugin]), ); @@ -87,7 +87,7 @@ test('do not add plugin twice', () => { marketplacePlugins: [], uninstalledPluginNames: new Set(), installedPlugins: new Map(), - initialised: false, + initialized: false, }, registerPlugins([testPlugin, testPlugin]), ); @@ -124,7 +124,7 @@ test('add gatekeeped plugin', () => { marketplacePlugins: [], installedPlugins: new Map(), uninstalledPluginNames: new Set(), - initialised: false, + initialized: false, }, addGatekeepedPlugins(gatekeepedPlugins), ); diff --git a/desktop/app/src/reducers/application.tsx b/desktop/app/src/reducers/application.tsx index 37c1973d0..dc229b357 100644 --- a/desktop/app/src/reducers/application.tsx +++ b/desktop/app/src/reducers/application.tsx @@ -7,6 +7,8 @@ * @format */ +// This is fine, we're using a focus event. +// eslint-disable-next-line flipper/no-electron-remote-imports import {remote} from 'electron'; import {v1 as uuidv1} from 'uuid'; import {ReactElement} from 'react'; diff --git a/desktop/app/src/reducers/plugins.tsx b/desktop/app/src/reducers/plugins.tsx index 480d745c7..235689d7b 100644 --- a/desktop/app/src/reducers/plugins.tsx +++ b/desktop/app/src/reducers/plugins.tsx @@ -41,7 +41,7 @@ type StateV1 = { marketplacePlugins: Array; uninstalledPluginNames: Set; installedPlugins: Map; - initialised: boolean; + initialized: boolean; }; type StateV0 = Omit & { @@ -112,7 +112,7 @@ export type Action = payload: PluginDefinition; } | { - type: 'PLUGINS_INITIALISED'; + type: 'PLUGINS_INITIALIZED'; }; const INITIAL_STATE: State = { @@ -127,7 +127,7 @@ const INITIAL_STATE: State = { marketplacePlugins: [], uninstalledPluginNames: new Set(), installedPlugins: new Map(), - initialised: false, + initialized: false, }; export default function reducer( @@ -219,9 +219,9 @@ export default function reducer( draft.uninstalledPluginNames.delete(plugin.details.name); draft.loadedPlugins.set(plugin.id, plugin.details); }); - } else if (action.type === 'PLUGINS_INITIALISED') { + } else if (action.type === 'PLUGINS_INITIALIZED') { return produce(state, (draft) => { - draft.initialised = true; + draft.initialized = true; }); } else { return state; @@ -304,6 +304,6 @@ export const pluginLoaded = (payload: PluginDefinition): Action => ({ payload, }); -export const pluginsInitialised = (): Action => ({ - type: 'PLUGINS_INITIALISED', +export const pluginsInitialized = (): Action => ({ + type: 'PLUGINS_INITIALIZED', }); diff --git a/desktop/app/src/reducers/usageTracking.tsx b/desktop/app/src/reducers/usageTracking.tsx index 456aceb6c..7cb386135 100644 --- a/desktop/app/src/reducers/usageTracking.tsx +++ b/desktop/app/src/reducers/usageTracking.tsx @@ -8,6 +8,8 @@ */ import {produce} from 'immer'; +// Used for focus events which is fine. +// eslint-disable-next-line flipper/no-electron-remote-imports import {remote} from 'electron'; import {Actions} from './'; import {SelectionInfo} from '../utils/info'; diff --git a/desktop/app/src/utils/__tests__/exportData.node.tsx b/desktop/app/src/utils/__tests__/exportData.node.tsx index ae14cfbbb..73422101c 100644 --- a/desktop/app/src/utils/__tests__/exportData.node.tsx +++ b/desktop/app/src/utils/__tests__/exportData.node.tsx @@ -772,7 +772,7 @@ test('test determinePluginsToProcess for mutilple clients having plugins present marketplacePlugins: [], installedPlugins: new Map(), uninstalledPluginNames: new Set(), - initialised: true, + initialized: true, }; const op = determinePluginsToProcess( [client1, client2, client3], @@ -845,7 +845,7 @@ test('test determinePluginsToProcess for no selected plugin present in any clien marketplacePlugins: [], installedPlugins: new Map(), uninstalledPluginNames: new Set(), - initialised: true, + initialized: true, }; const op = determinePluginsToProcess([client1, client2], device1, plugins); expect(op).toBeDefined(); @@ -897,7 +897,7 @@ test('test determinePluginsToProcess for multiple clients on same device', async marketplacePlugins: [], installedPlugins: new Map(), uninstalledPluginNames: new Set(), - initialised: true, + initialized: true, }; const op = determinePluginsToProcess([client1, client2], device1, plugins); expect(op).toBeDefined(); @@ -986,7 +986,7 @@ test('test determinePluginsToProcess for multiple clients on different device', marketplacePlugins: [], installedPlugins: new Map(), uninstalledPluginNames: new Set(), - initialised: true, + initialized: true, }; const op = determinePluginsToProcess( [client1Device1, client2Device1, client1Device2, client2Device2], @@ -1071,7 +1071,7 @@ test('test determinePluginsToProcess to ignore archived clients', async () => { marketplacePlugins: [], installedPlugins: new Map(), uninstalledPluginNames: new Set(), - initialised: true, + initialized: true, }; const op = determinePluginsToProcess( [client, archivedClient],