facebook · huntie · Aug 28, 2024
diff --git a/packages/community-cli-plugin/src/commands/start/attachKeyHandlers.js b/packages/community-cli-plugin/src/commands/start/attachKeyHandlers.js
@@ -24,15 +24,13 @@ export default function attachKeyHandlers({
   cliConfig,
   devServerUrl,
   messageSocket,
-  experimentalDebuggerFrontend,
 }: {
   cliConfig: Config,
   devServerUrl: string,
   messageSocket: $ReadOnly<{
     broadcast: (type: string, params?: Record<string, mixed> | null) => void,
     ...
   }>,
-  experimentalDebuggerFrontend: boolean,
 }) {
   if (process.stdin.isTTY !== true) {
     logger.debug('Interactive mode is not supported in this environment');
@@ -78,9 +76,7 @@ export default function attachKeyHandlers({
         ).stdout?.pipe(process.stdout);
         break;
       case 'j':
-        if (!experimentalDebuggerFrontend) {
-          return;
-        }
+        // TODO(T192878199): Add multi-target selection
         await fetch(devServerUrl + '/open-debugger', {method: 'POST'});
         break;
       case CTRL_C:
@@ -101,11 +97,9 @@ export default function attachKeyHandlers({
       '',
       `${chalk.bold('i')} - run on iOS`,
       `${chalk.bold('a')} - run on Android`,
-      `${chalk.bold('d')} - open Dev Menu`,
-      ...(experimentalDebuggerFrontend
-        ? [`${chalk.bold('j')} - open debugger (experimental, Hermes only)`]
-        : []),
       `${chalk.bold('r')} - reload app`,
+      `${chalk.bold('d')} - open Dev Menu`,
+      `${chalk.bold('j')} - open DevTools`,
       '',
     ].join('\n'),
   );

diff --git a/packages/community-cli-plugin/src/commands/start/index.js b/packages/community-cli-plugin/src/commands/start/index.js
@@ -95,13 +95,6 @@ const startCommand: Command = {
       name: '--no-interactive',
       description: 'Disables interactive mode',
     },
-    {
-      name: '--experimental-debugger',
-      description:
-        "[Experimental] Enable the new debugger experience and 'j' to " +
-        'debug. This enables the new frontend experience only: connection ' +
-        'reliability and some basic features are unstable in this release.',
-    },
   ],
 };
 

diff --git a/packages/community-cli-plugin/src/commands/start/runServer.js b/packages/community-cli-plugin/src/commands/start/runServer.js
@@ -34,7 +34,6 @@ export type StartCommandArgs = {
   assetPlugins?: string[],
   cert?: string,
   customLogReporterPath?: string,
-  experimentalDebugger: boolean,
   host?: string,
   https?: boolean,
   maxWorkers?: number,
@@ -113,10 +112,6 @@ async function runServer(
     projectRoot,
     serverBaseUrl: devServerUrl,
     logger,
-    unstable_experiments: {
-      // NOTE: Only affects the /open-debugger endpoint
-      enableNewDebugger: args.experimentalDebugger,
-    },
   });
 
   let reportEvent: (event: TerminalReportableEvent) => void;
@@ -135,7 +130,6 @@ async function runServer(
           cliConfig: ctx,
           devServerUrl,
           messageSocket: messageSocketEndpoint,
-          experimentalDebuggerFrontend: args.experimentalDebugger,
         });
       }
     },

diff --git a/packages/dev-middleware/src/__tests__/getDevToolsFrontendUrl-test.js b/packages/dev-middleware/src/__tests__/getDevToolsFrontendUrl-test.js
@@ -18,7 +18,6 @@ describe('getDevToolsFrontendUrl', () => {
 
   const experiments = {
     enableNetworkInspector: false,
-    enableNewDebugger: false,
     enableOpenDebuggerRedirect: false,
   };
 
@@ -39,7 +38,7 @@ describe('getDevToolsFrontendUrl', () => {
 
     test('should return a valid url for enableNetworkInspector experiment on', async () => {
       const actual = getDevToolsFrontendUrl(
-        {...experiments, enableNetworkInspector: true, enableNewDebugger: true},
+        {...experiments, enableNetworkInspector: true},
         webSocketDebuggerUrl,
         devServerUrl,
       );
@@ -96,7 +95,7 @@ describe('getDevToolsFrontendUrl', () => {
 
     test('should return a valid url for enableNetworkInspector experiment on', async () => {
       const actual = getDevToolsFrontendUrl(
-        {...experiments, enableNetworkInspector: true, enableNewDebugger: true},
+        {...experiments, enableNetworkInspector: true},
         webSocketDebuggerUrl,
         devServerUrl,
         {
@@ -151,7 +150,7 @@ describe('getDevToolsFrontendUrl', () => {
 
     test('should return a valid url for enableNetworkInspector experiment on', async () => {
       const actual = getDevToolsFrontendUrl(
-        {...experiments, enableNetworkInspector: true, enableNewDebugger: true},
+        {...experiments, enableNetworkInspector: true},
         webSocketDebuggerUrl,
         devServerUrl,
         {

diff --git a/packages/dev-middleware/src/createDevMiddleware.js b/packages/dev-middleware/src/createDevMiddleware.js
@@ -17,7 +17,6 @@ import type {Logger} from './types/Logger';
 import type {NextHandleFunction} from 'connect';
 
 import InspectorProxy from './inspector-proxy/InspectorProxy';
-import deprecated_openFlipperMiddleware from './middleware/deprecated_openFlipperMiddleware';
 import openDebuggerMiddleware from './middleware/openDebuggerMiddleware';
 import DefaultBrowserLauncher from './utils/DefaultBrowserLauncher';
 import reactNativeDebuggerFrontendPath from '@react-native/debugger-frontend';
@@ -97,18 +96,14 @@ export default function createDevMiddleware({
   const middleware = connect()
     .use(
       '/open-debugger',
-      experiments.enableNewDebugger
-        ? openDebuggerMiddleware({
-            serverBaseUrl,
-            inspectorProxy,
-            browserLauncher: unstable_browserLauncher,
-            eventReporter: unstable_eventReporter,
-            experiments,
-            logger,
-          })
-        : deprecated_openFlipperMiddleware({
-            logger,
-          }),
+      openDebuggerMiddleware({
+        serverBaseUrl,
+        inspectorProxy,
+        browserLauncher: unstable_browserLauncher,
+        eventReporter: unstable_eventReporter,
+        experiments,
+        logger,
+      }),
     )
     .use(
       '/debugger-frontend',
@@ -126,7 +121,6 @@ export default function createDevMiddleware({
 
 function getExperiments(config: ExperimentsConfig): Experiments {
   return {
-    enableNewDebugger: config.enableNewDebugger ?? false,
     enableOpenDebuggerRedirect: config.enableOpenDebuggerRedirect ?? false,
     enableNetworkInspector: config.enableNetworkInspector ?? false,
   };

diff --git a/packages/dev-middleware/src/middleware/deprecated_openFlipperMiddleware.js b/packages/dev-middleware/src/middleware/deprecated_openFlipperMiddleware.js
diff --git a/packages/dev-middleware/src/middleware/openDebuggerMiddleware.js b/packages/dev-middleware/src/middleware/openDebuggerMiddleware.js
@@ -30,7 +30,7 @@ type Options = $ReadOnly<{
 }>;
 
 /**
- * Open the JavaScript debugger for a given CDP target (direct Hermes debugging).
+ * Open the debugger frontend for a given CDP target.
  *
  * Currently supports Hermes targets, opening debugger websocket URL in Chrome
  * DevTools.

diff --git a/packages/dev-middleware/src/types/Experiments.js b/packages/dev-middleware/src/types/Experiments.js
@@ -9,13 +9,6 @@
  */
 
 export type Experiments = $ReadOnly<{
-  /**
-   * Enables the new JS debugger launch flow and custom debugger frontend
-   * (@react-native/debugger-frontend). When disabled, /open-debugger will
-   * trigger the legacy Flipper connection flow.
-   */
-  enableNewDebugger: boolean,
-
   /**
    * Enables the handling of GET requests in the /open-debugger endpoint,
    * in addition to POST requests. GET requests respond by redirecting to
@@ -25,7 +18,7 @@ export type Experiments = $ReadOnly<{
   enableOpenDebuggerRedirect: boolean,
 
   /**
-   * Enables the Network panel when launching the custom debugger frontend.
+   * Enables the Network panel in the debugger frontend.
    */
   enableNetworkInspector: boolean,
 }>;