fix(cli): sync latest upstream changes

microsoft · Sep 21, 2023 · baca983 · baca983
1 parent f752ad3
commit baca983
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/.changeset/famous-dryers-joke.md b/.changeset/famous-dryers-joke.md
@@ -0,0 +1,5 @@
+---
+"@rnx-kit/cli": patch
+---
+
+Synced latest changes from upstream: https://github.com/facebook/react-native/commit/982f6f99d43b21b3a81d3388591934d6f83afa63
diff --git a/packages/cli/src/serve/types.ts b/packages/cli/src/serve/types.ts
@@ -74,6 +74,7 @@ type DevMiddlewareAPI = {
 
 type DevMiddlewareOptions = {
   projectRoot: string;
+  serverBaseUrl: string;
   logger?: typeof logger;
   unstable_browserLauncher?: unknown;
   unstable_eventReporter?: unknown;

diff --git a/packages/cli/src/start.ts b/packages/cli/src/start.ts
@@ -105,16 +105,18 @@ export async function rnxStart(
   // create middleware -- a collection of plugins which handle incoming
   // http(s) requests, routing them to static pages or JS functions.
   const host = args.host?.length ? args.host : "localhost";
+  const devServerUrl = `${scheme}://${host}:${port}`;
   const devServer = createDevServerMiddleware({ host, port, watchFolders });
 
   const coreDevMiddleware = (() => {
     try {
-      // https://github.com/facebook/react-native/blob/3e7a873f2d1c5170a7f4c88064897e74a149c5d5/packages/community-cli-plugin/src/commands/start/runServer.js#L115
+      // https://github.com/facebook/react-native/blob/7888338295476f4d4f00733309e54b8d22318e1e/packages/community-cli-plugin/src/commands/start/runServer.js#L115
       const { createDevMiddleware } = requireExternal(
         "@react-native/dev-middleware"
       );
       return createDevMiddleware({
         projectRoot,
+        serverBaseUrl: devServerUrl,
         logger,
         unstable_experiments: {
           // NOTE: Only affects the /open-debugger endpoint
@@ -157,19 +159,15 @@ export async function rnxStart(
     reportEventDelegate = devServer.eventsSocketEndpoint.reportEvent;
   }
 
-  const printHelp = makeHelp(terminal, {
-    hasDebugger: Boolean(coreDevMiddleware),
-  });
+  const help = makeHelp(terminal, { hasDebugger: Boolean(coreDevMiddleware) });
 
   // @ts-expect-error We want to override `reporter`
   metroConfig.reporter = {
     update(event: ReportableEvent) {
       terminalReporter.update(event);
-      if (reportEventDelegate) {
-        reportEventDelegate(event);
-      }
+      reportEventDelegate?.(event);
       if (interactive && event.type === "dep_graph_loading") {
-        printHelp();
+        help();
       }
     },
   };
@@ -222,11 +220,6 @@ export async function rnxStart(
   // in interactive mode, listen for keyboard events from stdin and bind
   // them to specific actions.
   if (interactive) {
-    attachKeyHandlers({
-      devServerUrl: `${scheme}://${host}:${port}`,
-      help: printHelp,
-      messageSocketEndpoint,
-      terminal,
-    });
+    attachKeyHandlers({ devServerUrl, help, messageSocketEndpoint, terminal });
   }
 }