jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure that test stuff doesn't end up in bundles

Browse Source 
Summary: When bundling a production bundle of flipper-ui / flipper-server, noticed that a lot of irrelevant stuff ends up. Like: `jest`, `metro`, `testing-library`. The whole jungle basically. Will add safety checks in the next diffs that this no longer happens

Reviewed By: passy

Differential Revision: D33186531

fbshipit-source-id: 1e2034153c8c4a3fac02cd9ce27d99224223df7a
This commit is contained in:
Michel Weststrate
2021-12-17 14:11:20 -08:00
committed by Facebook GitHub Bot
parent e0afebeb32
commit e46fcba0b2
29 changed files with 167 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/flipper-ui-core/src/__tests__/PluginContainer.node.tsx
View File

@@ -12,7 +12,7 @@
import React from 'react';
import produce from 'immer';
import {FlipperPlugin} from '../plugin';
import {renderMockFlipperWithPlugin} from '../test-utils/createMockFlipperWithPlugin';
import {renderMockFlipperWithPlugin} from './test-utils/createMockFlipperWithPlugin';
import {
_SandyPluginDefinition,
PluginClient,

2
desktop/flipper-ui-core/src/__tests__/createMockFlipperWithPlugin.node.tsx
View File

@@ -7,7 +7,7 @@
* @format
*/
import {createMockFlipperWithPlugin} from '../test-utils/createMockFlipperWithPlugin';
import {createMockFlipperWithPlugin} from './test-utils/createMockFlipperWithPlugin';
import {FlipperPlugin} from '../plugin';
import {TestIdler} from '../utils/Idler';
import {getAllClients} from '../reducers/connections';

2
desktop/flipper-ui-core/src/__tests__/deeplink.node.tsx
View File

@@ -10,7 +10,7 @@
jest.useFakeTimers();
import React from 'react';
import {renderMockFlipperWithPlugin} from '../test-utils/createMockFlipperWithPlugin';
import {renderMockFlipperWithPlugin} from './test-utils/createMockFlipperWithPlugin';
import {
_SandyPluginDefinition,
PluginClient,

4
desktop/flipper-ui-core/src/__tests__/disconnect.node.tsx
View File

@@ -7,7 +7,7 @@
* @format
*/
import {createMockFlipperWithPlugin} from '../test-utils/createMockFlipperWithPlugin';
import {createMockFlipperWithPlugin} from './test-utils/createMockFlipperWithPlugin';
import {
TestUtils,
_SandyPluginDefinition,
@@ -16,7 +16,7 @@ import {
PluginClient,
} from 'flipper-plugin';
import {handleClientConnected} from '../dispatcher/flipperServer';
import {TestDevice} from '../test-utils/TestDevice';
import {TestDevice} from '../devices/TestDevice';
test('Devices can disconnect', async () => {
const deviceplugin = new _SandyPluginDefinition(

0
desktop/flipper-ui-core/src/test-utils/DeviceTestPlugin.tsx → desktop/flipper-ui-core/src/__tests__/test-utils/DeviceTestPlugin.tsx
View File

23
desktop/flipper-ui-core/src/test-utils/MockFlipper.tsx → desktop/flipper-ui-core/src/__tests__/test-utils/MockFlipper.tsx
View File

@@ -8,27 +8,26 @@
*/
import {createStore} from 'redux';
import BaseDevice from '../devices/BaseDevice';
import {createRootReducer} from '../reducers';
import {Store} from '../reducers/index';
import Client, {ClientConnection} from '../Client';
import BaseDevice from '../../devices/BaseDevice';
import {createRootReducer} from '../../reducers';
import {Store} from '../../reducers/index';
import Client, {ClientConnection} from '../../Client';
import {
Logger,
buildClientId,
FlipperServer,
ClientResponseType,
} from 'flipper-common';
import {PluginDefinition} from '../plugin';
import {pluginsInitialized, registerPlugins} from '../reducers/plugins';
import {PluginDefinition} from '../../plugin';
import {pluginsInitialized, registerPlugins} from '../../reducers/plugins';
import {getLogger} from 'flipper-common';
import {initializeFlipperLibImplementation} from '../utils/flipperLibImplementation';
import pluginManager from '../dispatcher/pluginManager';
import {initializeFlipperLibImplementation} from '../../utils/flipperLibImplementation';
import pluginManager from '../../dispatcher/pluginManager';
import {PluginDetails} from 'flipper-common';
import ArchivedDevice from '../devices/ArchivedDevice';
import ArchivedDevice from '../../devices/ArchivedDevice';
import {ClientQuery, DeviceOS} from 'flipper-common';
import {TestDevice} from './TestDevice';
import {getRenderHostInstance} from '../RenderHost';
import {waitFor} from '../utils/waitFor';
import {TestDevice} from '../../devices/TestDevice';
import {getRenderHostInstance} from '../../RenderHost';
export interface AppOptions {
plugins?: PluginDefinition[];

0
desktop/flipper-ui-core/src/test-utils/TestPlugin.tsx → desktop/flipper-ui-core/src/__tests__/test-utils/TestPlugin.tsx
View File

28
desktop/flipper-ui-core/src/test-utils/createMockFlipperWithPlugin.tsx → desktop/flipper-ui-core/src/__tests__/test-utils/createMockFlipperWithPlugin.tsx
View File

@@ -20,24 +20,28 @@ import {
selectPlugin,
selectDevice,
selectClient,
} from '../reducers/connections';
import BaseDevice from '../devices/BaseDevice';
} from '../../reducers/connections';
import BaseDevice from '../../devices/BaseDevice';
import {Store} from '../reducers/index';
import Client from '../Client';
import {Store} from '../../reducers/index';
import Client from '../../Client';
import {ClientQuery, FlipperServer, Logger} from 'flipper-common';
import {FlipperDevicePlugin, FlipperPlugin, PluginDefinition} from '../plugin';
import PluginContainer from '../PluginContainer';
import {isDevicePluginDefinition} from '../utils/pluginUtils';
import {getPluginKey} from '../utils/pluginKey';
import {
FlipperDevicePlugin,
FlipperPlugin,
PluginDefinition,
} from '../../plugin';
import PluginContainer from '../../PluginContainer';
import {isDevicePluginDefinition} from '../../utils/pluginUtils';
import {getPluginKey} from '../../utils/pluginKey';
import MockFlipper from './MockFlipper';
import {switchPlugin} from '../reducers/pluginManager';
import {createSandyPluginFromClassicPlugin} from '../dispatcher/plugins';
import {createMockActivatablePluginDetails} from '../utils/testUtils';
import {switchPlugin} from '../../reducers/pluginManager';
import {createSandyPluginFromClassicPlugin} from '../../dispatcher/plugins';
import {createMockActivatablePluginDetails} from '../../utils/testUtils';
import {_SandyPluginDefinition} from 'flipper-plugin';
import {awaitPluginCommandQueueEmpty} from '../dispatcher/pluginManager';
import {awaitPluginCommandQueueEmpty} from '../../dispatcher/pluginManager';
export type MockFlipperResult = {
client: Client;

49
desktop/flipper-ui-core/src/__tests__/test-utils/mockConsole.tsx Normal file
View File

@@ -0,0 +1,49 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @format
*/
import baseMockConsole from 'jest-mock-console';
/**
* Mockes the current console. Inspect results through e.g.
* console.errorCalls etc.
*
* Or, alternatively, expect(mockedConsole.error).toBeCalledWith...
*
* Don't forgot to call .unmock when done!
*/
export function mockConsole() {
const restoreConsole = baseMockConsole();
// The mocked console methods, make sure they remain available after unmocking
const {log, error, warn} = console as any;
return {
get logCalls(): any[][] {
return log.mock.calls;
},
get errorCalls(): any[][] {
return error.mock.calls;
},
get warnCalls(): any[][] {
return warn.mock.calls;
},
get log(): jest.Mock<any, any> {
return log as any;
},
get warn(): jest.Mock<any, any> {
return warn as any;
},
get error(): jest.Mock<any, any> {
return error as any;
},
unmock() {
restoreConsole();
},
};
}
export type MockedConsole = ReturnType<typeof mockConsole>;

3
desktop/flipper-ui-core/src/deprecated-exports.tsx
View File

@@ -119,8 +119,7 @@ export {Logger} from 'flipper-common';
export {getLogger} from 'flipper-common';
export {callVSCode} from './utils/vscodeUtils';
export {IDEFileResolver, IDEType} from './fb-stubs/IDEFileResolver';
export {renderMockFlipperWithPlugin} from './test-utils/createMockFlipperWithPlugin';
export {Tracked} from 'flipper-plugin'; // To be able to use it in legacy plugins
export {RequireLogin} from './ui/components/RequireLogin';
export {TestDevice} from './test-utils/TestDevice';
export {TestDevice} from './devices/TestDevice';
export {connect} from 'react-redux';

2
desktop/flipper-ui-core/src/test-utils/TestDevice.tsx → desktop/flipper-ui-core/src/devices/TestDevice.tsx
View File

@@ -9,7 +9,7 @@
import {DeviceOS, DeviceType} from 'flipper-plugin';
import {DeviceSpec} from 'flipper-common';
import BaseDevice from '../devices/BaseDevice';
import BaseDevice from './BaseDevice';
import {getRenderHostInstance} from '../RenderHost';
export class TestDevice extends BaseDevice {

6
desktop/flipper-ui-core/src/devices/__tests__/BaseDevice.node.tsx
View File

@@ -7,10 +7,10 @@
* @format
*/
import * as DeviceTestPluginModule from '../../test-utils/DeviceTestPlugin';
import * as DeviceTestPluginModule from '../../__tests__/test-utils/DeviceTestPlugin';
import {TestUtils, _SandyPluginDefinition} from 'flipper-plugin';
import {createMockFlipperWithPlugin} from '../../test-utils/createMockFlipperWithPlugin';
import {TestDevice} from '../../test-utils/TestDevice';
import {createMockFlipperWithPlugin} from '../../__tests__/test-utils/createMockFlipperWithPlugin';
import {TestDevice} from '../../devices/TestDevice';
import ArchivedDevice from '../../devices/ArchivedDevice';
const physicalDevicePluginDetails = TestUtils.createMockPluginDetails({

2
desktop/flipper-ui-core/src/dispatcher/__tests__/handleOpenPluginDeeplink.node.tsx
View File

@@ -10,7 +10,7 @@
jest.useFakeTimers();
import React from 'react';
import {renderMockFlipperWithPlugin} from '../../test-utils/createMockFlipperWithPlugin';
import {renderMockFlipperWithPlugin} from '../../__tests__/test-utils/createMockFlipperWithPlugin';
import {
_SandyPluginDefinition,
PluginClient,

4
desktop/flipper-ui-core/src/dispatcher/__tests__/pluginManager.node.tsx
View File

@@ -16,9 +16,9 @@ import {
import {requirePlugin} from '../plugins';
import {mocked} from 'ts-jest/utils';
import {TestUtils} from 'flipper-plugin';
import * as TestPlugin from '../../test-utils/TestPlugin';
import * as TestPlugin from '../../__tests__/test-utils/TestPlugin';
import {_SandyPluginDefinition as SandyPluginDefinition} from 'flipper-plugin';
import MockFlipper from '../../test-utils/MockFlipper';
import MockFlipper from '../../__tests__/test-utils/MockFlipper';
import Client from '../../Client';
import React from 'react';
import BaseDevice from '../../devices/BaseDevice';

11
desktop/flipper-ui-core/src/reducers/__tests__/connections.node.tsx
View File

@@ -13,21 +13,24 @@ import {
_SandyPluginDefinition,
_setFlipperLibImplementation,
TestUtils,
MockedConsole,
} from 'flipper-plugin';
import {TestDevice} from '../../test-utils/TestDevice';
import {TestDevice} from '../../devices/TestDevice';
import {
createMockFlipperWithPlugin,
MockFlipperResult,
} from '../../test-utils/createMockFlipperWithPlugin';
} from '../../__tests__/test-utils/createMockFlipperWithPlugin';
import {Store} from '..';
import {getActiveClient, getActiveDevice} from '../../selectors/connections';
import BaseDevice from '../../devices/BaseDevice';
import Client from '../../Client';
import {
mockConsole,
MockedConsole,
} from '../../__tests__/test-utils/mockConsole';
let mockedConsole: MockedConsole;
beforeEach(() => {
mockedConsole = TestUtils.mockConsole();
mockedConsole = mockConsole();
_setFlipperLibImplementation(TestUtils.createMockFlipperLib());
});

2
desktop/flipper-ui-core/src/reducers/__tests__/notifications.node.tsx
View File

@@ -7,7 +7,7 @@
* @format
*/
import {createMockFlipperWithPlugin} from '../../test-utils/createMockFlipperWithPlugin';
import {createMockFlipperWithPlugin} from '../../__tests__/test-utils/createMockFlipperWithPlugin';
import {
_SandyPluginDefinition,
TestUtils,

2
desktop/flipper-ui-core/src/reducers/__tests__/plugins.node.tsx
View File

@@ -15,7 +15,7 @@ import {
} from '../plugins';
import {FlipperPlugin, FlipperDevicePlugin, BaseAction} from '../../plugin';
import {InstalledPluginDetails} from 'flipper-common';
import {wrapSandy} from '../../test-utils/createMockFlipperWithPlugin';
import {wrapSandy} from '../../__tests__/test-utils/createMockFlipperWithPlugin';
const testPluginOrig = class extends FlipperPlugin<any, BaseAction, any> {
static id = 'TestPlugin';

2
desktop/flipper-ui-core/src/reducers/__tests__/sandydeviceplugins.node.tsx
View File

@@ -7,7 +7,7 @@
* @format
*/
import {createMockFlipperWithPlugin} from '../../test-utils/createMockFlipperWithPlugin';
import {createMockFlipperWithPlugin} from '../../__tests__/test-utils/createMockFlipperWithPlugin';
import {Store} from '../../reducers/';
import {selectPlugin} from '../../reducers/connections';
import {

2
desktop/flipper-ui-core/src/reducers/__tests__/sandyplugins.node.tsx
View File

@@ -7,7 +7,7 @@
* @format
*/
import {createMockFlipperWithPlugin} from '../../test-utils/createMockFlipperWithPlugin';
import {createMockFlipperWithPlugin} from '../../__tests__/test-utils/createMockFlipperWithPlugin';
import Client from '../../Client';
import {Store} from '../../reducers';
import {registerPlugins} from '../../reducers/plugins';

4
desktop/flipper-ui-core/src/sandy-chrome/appinspect/__tests__/PluginList.spec.tsx
View File

@@ -10,7 +10,7 @@
import {
createMockFlipperWithPlugin,
MockFlipperResult,
} from '../../../test-utils/createMockFlipperWithPlugin';
} from '../../../__tests__/test-utils/createMockFlipperWithPlugin';
import {FlipperPlugin} from '../../../plugin';
import BaseDevice from '../../../devices/BaseDevice';
import {_SandyPluginDefinition} from 'flipper-plugin';
@@ -32,7 +32,7 @@ import {
getMetroDevice,
getPluginLists,
} from '../../../selectors/connections';
import {TestDevice} from '../../../test-utils/TestDevice';
import {TestDevice} from '../../../devices/TestDevice';
const createMockPluginDetails = TestUtils.createMockPluginDetails;

4
desktop/flipper-ui-core/src/utils/__tests__/exportData.node.tsx
View File

@@ -24,7 +24,7 @@ import {selectedPlugins, State as PluginsState} from '../../reducers/plugins';
import {
createMockFlipperWithPlugin,
wrapSandy,
} from '../../test-utils/createMockFlipperWithPlugin';
} from '../../__tests__/test-utils/createMockFlipperWithPlugin';
import {
Notification,
TestUtils,
@@ -37,7 +37,7 @@ import {
} from 'flipper-plugin';
import {selectPlugin, getAllClients} from '../../reducers/connections';
import {TestIdler} from '../Idler';
import {TestDevice} from '../../test-utils/TestDevice';
import {TestDevice} from '../../devices/TestDevice';
const testIdler = new TestIdler();

2
desktop/flipper-ui-core/src/utils/__tests__/info.node.tsx
View File

@@ -15,7 +15,7 @@ import {registerLoadedPlugins} from '../../reducers/plugins';
import {TestUtils} from 'flipper-plugin';
import {getLogger} from 'flipper-common';
import {selectPlugin} from '../../reducers/connections';
import {renderMockFlipperWithPlugin} from '../../test-utils/createMockFlipperWithPlugin';
import {renderMockFlipperWithPlugin} from '../../__tests__/test-utils/createMockFlipperWithPlugin';
const networkPluginDetails = TestUtils.createMockPluginDetails({
id: 'Network',

2
desktop/flipper-ui-core/src/utils/__tests__/messageQueueSandy.node.tsx
View File

@@ -11,7 +11,7 @@ import {FlipperPlugin} from '../../plugin';
import {
createMockFlipperWithPlugin,
wrapSandy,
} from '../../test-utils/createMockFlipperWithPlugin';
} from '../../__tests__/test-utils/createMockFlipperWithPlugin';
import {sleep} from 'flipper-common';
import {Store} from '../../reducers';
import Client from '../../Client';

2
desktop/flipper-ui-core/src/utils/__tests__/pluginUtils.node.tsx
View File

@@ -9,7 +9,7 @@
import {getPluginKey} from '../pluginKey';
import {FlipperPlugin, FlipperDevicePlugin} from '../../plugin';
import {createMockFlipperWithPlugin} from '../../test-utils/createMockFlipperWithPlugin';
import {createMockFlipperWithPlugin} from '../../__tests__/test-utils/createMockFlipperWithPlugin';
import {getExportablePlugins} from '../../selectors/connections';
function createMockFlipperPluginWithDefaultPersistedState(id: string) {