From 976399b950d4aa227e1386534d60906828eda1ca Mon Sep 17 00:00:00 2001 From: Andrey Goncharov Date: Tue, 31 May 2022 02:58:21 -0700 Subject: [PATCH] Move Tail to flipper-server-core Summary: Tail is a server-side logging utility. We cannot add it to flipper-frontend-core as it is going to be included into the browser bundle then and break the build. Reviewed By: antonk52 Differential Revision: D36771864 fbshipit-source-id: 169cdb88543f1e47f39e8c0976c3a3f45c0439d5 --- desktop/flipper-frontend-core/package.json | 5 ++--- desktop/flipper-frontend-core/src/index.tsx | 1 - desktop/flipper-server-core/src/index.tsx | 1 + .../src/utils/tail.tsx | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) rename desktop/{flipper-frontend-core => flipper-server-core}/src/utils/tail.tsx (98%) diff --git a/desktop/flipper-frontend-core/package.json b/desktop/flipper-frontend-core/package.json index 09cb6ae72..3f529fffd 100644 --- a/desktop/flipper-frontend-core/package.json +++ b/desktop/flipper-frontend-core/package.json @@ -13,12 +13,11 @@ "eventemitter3": "^4.0.7", "flipper-common": "0.0.0", "flipper-plugin": "0.0.0", - "fs-extra": "^10.1.0", "immer": "^9.0.12", "js-base64": "^3.7.2", "p-map": "^5.3.0", - "semver": "^7.3.7", - "reconnecting-websocket": "^4.4.0" + "reconnecting-websocket": "^4.4.0", + "semver": "^7.3.7" }, "devDependencies": { "flipper-test-utils": "0.0.0" diff --git a/desktop/flipper-frontend-core/src/index.tsx b/desktop/flipper-frontend-core/src/index.tsx index 641e8ce9b..2beca1acb 100644 --- a/desktop/flipper-frontend-core/src/index.tsx +++ b/desktop/flipper-frontend-core/src/index.tsx @@ -15,4 +15,3 @@ export * from './globalObject'; export * from './plugins'; export * from './flipperLibImplementation'; export * from './client/FlipperServerClient'; -export * from './utils/tail'; diff --git a/desktop/flipper-server-core/src/index.tsx b/desktop/flipper-server-core/src/index.tsx index 1541d3821..5a2a2d641 100644 --- a/desktop/flipper-server-core/src/index.tsx +++ b/desktop/flipper-server-core/src/index.tsx @@ -12,6 +12,7 @@ export {loadSettings} from './utils/settings'; export {loadLauncherSettings} from './utils/launcherSettings'; export {loadProcessConfig} from './utils/processConfig'; export {getEnvironmentInfo} from './utils/environmentInfo'; +export * from './utils/tail'; import GKImplementation from './fb-stubs/GK'; export {setupPrefetcher} from './fb-stubs/Prefetcher'; diff --git a/desktop/flipper-frontend-core/src/utils/tail.tsx b/desktop/flipper-server-core/src/utils/tail.tsx similarity index 98% rename from desktop/flipper-frontend-core/src/utils/tail.tsx rename to desktop/flipper-server-core/src/utils/tail.tsx index a861ad56a..2c78b8fe4 100644 --- a/desktop/flipper-frontend-core/src/utils/tail.tsx +++ b/desktop/flipper-server-core/src/utils/tail.tsx @@ -7,7 +7,7 @@ * @format */ -import EventEmitter from 'eventemitter3'; +import EventEmitter from 'events'; import fs, {FSWatcher} from 'fs-extra'; import path from 'path';