From ed93dfe978e854577e0ea968e97b2e9a95974522 Mon Sep 17 00:00:00 2001 From: Andrey Goncharov Date: Thu, 15 Sep 2022 10:02:19 -0700 Subject: [PATCH] Refine prod and dev deps Summary: Move flipper local deps to prod deps, so yarn installs them later when we build a bundle Reviewed By: lblasa Differential Revision: D39475545 fbshipit-source-id: 5b61d15b45ee315c3b35d8e6836c114b90503b1a --- desktop/doctor/package.json | 4 ++-- desktop/flipper-frontend-core/package.json | 1 - desktop/flipper-server-companion/package.json | 1 - desktop/flipper-server-core/package.json | 11 +++++------ desktop/flipper-server/package.json | 13 +++++++------ desktop/pkg-lib/package.json | 1 - desktop/scripts/build-flipper-server-release.tsx | 2 ++ 7 files changed, 16 insertions(+), 17 deletions(-) diff --git a/desktop/doctor/package.json b/desktop/doctor/package.json index c80da7208..31f355b90 100644 --- a/desktop/doctor/package.json +++ b/desktop/doctor/package.json @@ -8,8 +8,7 @@ "license": "MIT", "devDependencies": { "@types/fb-watchman": "2.0.1", - "@types/node": "^17.0.31", - "flipper-common": "0.0.0" + "@types/node": "^17.0.31" }, "scripts": { "reset": "rimraf lib *.tsbuildinfo", @@ -28,6 +27,7 @@ "dependencies": { "envinfo": "^7.8.1", "fb-watchman": "^2.0.1", + "flipper-common": "0.0.0", "fs-extra": "^10.1.0" } } diff --git a/desktop/flipper-frontend-core/package.json b/desktop/flipper-frontend-core/package.json index b8bbbe520..3370dcf4f 100644 --- a/desktop/flipper-frontend-core/package.json +++ b/desktop/flipper-frontend-core/package.json @@ -1,6 +1,5 @@ { "name": "flipper-frontend-core", - "private": true, "version": "0.0.0", "description": "Exposes core functionality for Flipper frontends: Flipper Electron, Flipper Browser UI, Flipper Server Companion.", "repository": "facebook/flipper", diff --git a/desktop/flipper-server-companion/package.json b/desktop/flipper-server-companion/package.json index 68aa68e0a..a7ce086b1 100644 --- a/desktop/flipper-server-companion/package.json +++ b/desktop/flipper-server-companion/package.json @@ -1,6 +1,5 @@ { "name": "flipper-server-companion", - "private": true, "version": "0.0.0", "description": "Runs Flipper plugins on Flipper Server", "repository": "facebook/flipper", diff --git a/desktop/flipper-server-core/package.json b/desktop/flipper-server-core/package.json index 93807e2f5..3ebd0e7e5 100644 --- a/desktop/flipper-server-core/package.json +++ b/desktop/flipper-server-core/package.json @@ -1,6 +1,5 @@ { "name": "flipper-server-core", - "private": true, "version": "0.0.0", "description": "Flipper server connection SDK", "repository": "facebook/flipper", @@ -17,6 +16,8 @@ "archiver": "^5.3.1", "async-mutex": "^0.3.2", "axios": "^0.26.0", + "exit-hook": "^2.1.1", + "express": "^4.17.3", "flipper-common": "0.0.0", "flipper-doctor": "0.0.0", "flipper-plugin-core": "0.0.0", @@ -24,9 +25,11 @@ "flipper-server-companion": "0.0.0", "form-data": "^4.0.0", "fs-extra": "^10.1.0", + "http-proxy": "^1.18.1", "invariant": "^2.2.4", "js-base64": "^3.7.2", "lodash.memoize": "^4.1.2", + "memorystream": "^0.3.1", "node-fetch": "2", "node-forge": "^0.10.0", "open": "^8.3.0", @@ -60,11 +63,7 @@ "@types/split2": "^3.2.1", "@types/tmp": "^0.2.3", "@types/which": "^2.0.1", - "@types/ws": "^8.5.3", - "exit-hook": "^2.1.1", - "express": "^4.17.3", - "http-proxy": "^1.18.1", - "memorystream": "^0.3.1" + "@types/ws": "^8.5.3" }, "peerDependencies": {}, "scripts": { diff --git a/desktop/flipper-server/package.json b/desktop/flipper-server/package.json index 344e0cc30..1dabde4f0 100644 --- a/desktop/flipper-server/package.json +++ b/desktop/flipper-server/package.json @@ -8,11 +8,7 @@ "bin": "server.js", "license": "MIT", "bugs": "https://github.com/facebook/flipper/issues", - "dependencies": {}, - "devDependencies": { - "@types/express": "^4.17.13", - "@types/http-proxy": "^1.17.8", - "@types/node": "^17.0.31", + "dependencies": { "chalk": "^4", "exit-hook": "^2.1.1", "express": "^4.17.3", @@ -30,13 +26,18 @@ "xdg-basedir": "^4", "yargs": "^17.4.1" }, + "devDependencies": { + "@types/express": "^4.17.13", + "@types/http-proxy": "^1.17.8", + "@types/node": "^17.0.31" + }, "peerDependencies": {}, "scripts": { "reset": "rimraf lib *.tsbuildinfo", "build": "tsc -b" }, "files": [ - "dist/**/*", + "lib/**/*", "static/**/*", "README.md", "server.js" diff --git a/desktop/pkg-lib/package.json b/desktop/pkg-lib/package.json index d758a8e2f..b773e83c9 100644 --- a/desktop/pkg-lib/package.json +++ b/desktop/pkg-lib/package.json @@ -10,7 +10,6 @@ "bugs": "https://github.com/facebook/flipper/issues", "dependencies": { "esbuild": "^0.15.7", - "flipper-babel-transformer": "0.0.0", "flipper-plugin-lib": "0.0.0", "fs-extra": "^10.1.0", "metro": "^0.70.2", diff --git a/desktop/scripts/build-flipper-server-release.tsx b/desktop/scripts/build-flipper-server-release.tsx index a15ce170f..a4a579abc 100644 --- a/desktop/scripts/build-flipper-server-release.tsx +++ b/desktop/scripts/build-flipper-server-release.tsx @@ -273,6 +273,8 @@ async function modifyPackageManifest( // not needed in public builds delete manifest.scripts; delete manifest.devDependencies; + // TODO: Remove me later + delete manifest.dependencies; await fs.writeFile( path.join(buildFolder, 'package.json'), JSON.stringify(manifest, null, ' '),