From 7e9ad72baa107db5880303af8e0756d594be63c0 Mon Sep 17 00:00:00 2001
From: Michel Weststrate <mweststrate@fb.com>
Date: Mon, 13 Dec 2021 05:46:42 -0800
Subject: [PATCH] Fix --no-bundled-plugins was not respected

Summary: Even with the `--no-bundled-plugins` flag, still a hundred plugins were loaded when running flipper-server

Reviewed By: timur-valiev, aigoncharov

Differential Revision: D32987158

fbshipit-source-id: 19e51e7e5f8ec9e664eb48cf2f2b8936f2f5ed73
---
 desktop/flipper-server-core/src/plugins/PluginManager.tsx | 5 ++++-
 desktop/scripts/start-dev-server.ts                       | 2 +-
 desktop/scripts/start-flipper-server.ts                   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/desktop/flipper-server-core/src/plugins/PluginManager.tsx b/desktop/flipper-server-core/src/plugins/PluginManager.tsx
index 0c7320848..c3056258c 100644
--- a/desktop/flipper-server-core/src/plugins/PluginManager.tsx
+++ b/desktop/flipper-server-core/src/plugins/PluginManager.tsx
@@ -68,7 +68,10 @@ export class PluginManager {
   }
 
   async getBundledPlugins(): Promise<Array<BundledPluginDetails>> {
-    if (process.env.NODE_ENV === 'test') {
+    if (
+      process.env.NODE_ENV === 'test' ||
+      process.env.FLIPPER_NO_BUNDLED_PLUGINS === 'true'
+    ) {
       return [];
     }
     // defaultPlugins that are included in the Flipper distributive.
diff --git a/desktop/scripts/start-dev-server.ts b/desktop/scripts/start-dev-server.ts
index 8fb2abec3..b5ad11422 100644
--- a/desktop/scripts/start-dev-server.ts
+++ b/desktop/scripts/start-dev-server.ts
@@ -41,7 +41,7 @@ const argv = yargs
     },
     'bundled-plugins': {
       describe:
-        'Enables bundling of plugins into Flipper bundle. This is useful for debugging, because it makes Flipper dev mode loading faster and unblocks fast refresh. The flag is enabled by default. Env var FLIPPER_NO_BUNDLEDD_PLUGINS is equivalent to the command-line option "--no-bundled-plugins".',
+        'Enables bundling of plugins into Flipper bundle. This is useful for debugging, because it makes Flipper dev mode loading faster and unblocks fast refresh. The flag is enabled by default. Env var FLIPPER_NO_BUNDLED_PLUGINS is equivalent to the command-line option "--no-bundled-plugins".',
       type: 'boolean',
     },
     'rebuild-plugins': {
diff --git a/desktop/scripts/start-flipper-server.ts b/desktop/scripts/start-flipper-server.ts
index 3a73ceac5..e983e783b 100644
--- a/desktop/scripts/start-flipper-server.ts
+++ b/desktop/scripts/start-flipper-server.ts
@@ -27,7 +27,7 @@ const argv = yargs
     },
     'bundled-plugins': {
       describe:
-        'Enables bundling of plugins into Flipper bundle. This is useful for debugging, because it makes Flipper dev mode loading faster and unblocks fast refresh. The flag is enabled by default. Env var FLIPPER_NO_BUNDLEDD_PLUGINS is equivalent to the command-line option "--no-bundled-plugins".',
+        'Enables bundling of plugins into Flipper bundle. This is useful for debugging, because it makes Flipper dev mode loading faster and unblocks fast refresh. The flag is enabled by default. Env var FLIPPER_NO_BUNDLED_PLUGINS is equivalent to the command-line option "--no-bundled-plugins".',
       type: 'boolean',
     },
     'rebuild-plugins': {