@rnx-kit/cli 0.9.55 → 0.10.0

package/src/start.ts

@@ -6,13 +6,15 @@ import {
   startServer,
 } from "@rnx-kit/metro-service";
 import chalk from "chalk";
-import type { Reporter, ReportableEvent } from "metro";
-import type Server from "metro/src/Server";
+import type { ReportableEvent, Reporter } from "metro";
 import type { Middleware } from "metro-config";
+import type Server from "metro/src/Server";
+import os from "os";
 import path from "path";
+import qrcode from "qrcode";
 import readline from "readline";
-import { getKitServerConfig } from "./serve/kit-config";
 import { customizeMetroConfig } from "./metro-config";
+import { getKitServerConfig } from "./serve/kit-config";
 import type { TypeScriptValidationOptions } from "./types";
 
 export type CLIStartOptions = {
@@ -85,17 +87,16 @@ export async function rnxStart(
         reportEventDelegate(event);
       }
       if (interactive && event.type === "dep_graph_loading") {
-        terminal.log("To reload the app press '" + chalk.cyanBright("r") + "'");
-        terminal.log(
-          "To open developer menu press '" + chalk.cyanBright("d") + "'"
-        );
-        terminal.log(
-          "To quit, press '" +
-            chalk.cyanBright("control") +
-            "-" +
-            chalk.cyanBright("c") +
-            "'"
-        );
+        const dim = chalk.dim;
+        const press = dim(" › Press ");
+        [
+          ["r", "reload the app"],
+          ["d", "open developer menu"],
+          ["a", "show bundler address QR code"],
+          ["ctrl-c", "quit"],
+        ].forEach(([key, description]) => {
+          terminal.log(press + key + dim(` to ${description}.`));
+        });
       }
     },
   };
@@ -199,14 +200,31 @@ export async function rnxStart(
             process.emit("SIGTSTP", "SIGTSTP");
             break;
         }
-      } else if (name === "r") {
-        terminal.log(chalk.green("Reloading app..."));
-        messageSocket.broadcast("reload", undefined);
-      } else if (name === "d") {
-        terminal.log(chalk.green("Opening developer menu..."));
-        messageSocket.broadcast("devMenu", undefined);
       } else {
-        terminal.log(chalk.grey(_key));
+        switch (name) {
+          case "a": {
+            const protocol = cliOptions.https ? "https" : "http";
+            const host = cliOptions.host || os.hostname();
+            const port = metroConfig.server.port;
+            const url = `${protocol}://${host}:${port}/index.bundle`;
+            qrcode.toString(url, { type: "terminal" }, (_err, qr) => {
+              terminal.log("");
+              terminal.log(url + ":");
+              terminal.log(qr);
+            });
+            break;
+          }
+
+          case "d":
+            terminal.log(chalk.green("Opening developer menu..."));
+            messageSocket.broadcast("devMenu", undefined);
+            break;
+
+          case "r":
+            terminal.log(chalk.green("Reloading app..."));
+            messageSocket.broadcast("reload", undefined);
+            break;
+        }
       }
     });
   }

package/src/typescript/project-cache.ts

@@ -12,6 +12,11 @@ import {
 import path from "path";
 import ts from "typescript";
 
+export type ProjectInfo = {
+  tsproject: Project;
+  tssourceFiles: Set<string>;
+};
+
 /**
  * Collection of TypeScript projects, separated by their target platform.
  *
@@ -32,14 +37,14 @@ export interface ProjectCache {
   clearPlatform(platform: AllPlatforms): void;
 
   /**
-   * Get the project which targets a specific platform and contains a specific
+   * Get info on the project which targets a specific platform and contains a specific
    * source file. If the project is not cached, load it and add it to the cache.
    *
    * @param platform Target platform
    * @param sourceFile Source file
    * @returns Project targeting the given platform and containing the given source file
    */
-  getProject(sourceFile: string, platform: AllPlatforms): Project;
+  getProjectInfo(sourceFile: string, platform: AllPlatforms): ProjectInfo;
 }
 
 /**
@@ -55,7 +60,10 @@ export function createProjectCache(
   const diagnosticWriter = createDiagnosticWriter(print);
 
   // Collection of projects organized by root directory, then by platform.
-  const projects: Record<string, Partial<Record<AllPlatforms, Project>>> = {};
+  const projects: Record<
+    string,
+    Partial<Record<AllPlatforms, ProjectInfo>>
+  > = {};
 
   function findProjectRoot(sourceFile: string): string {
     // Search known root directories to see if the source file is in one of them.
@@ -91,10 +99,25 @@ export function createProjectCache(
     return cmdLine;
   }
 
-  function createProject(root: string, platform: AllPlatforms): Project {
+  function createProjectInfo(
+    root: string,
+    platform: AllPlatforms
+  ): ProjectInfo {
     // Load the TypeScript configuration file for this project.
     const cmdLine = readTSConfig(root);
 
+    //  Trim down the list of source files found by TypeScript. This ensures
+    //  that only explicitly added files are loaded and parsed by TypeScript.
+    //  This is a perf optimization. We don't want to spend cycles on files
+    //  that won't be used, such as *.android.ts when bundling for ios.
+    //
+    //  The exception to this rule are .d.ts files. They hold global types,
+    //  modules and namespaces, and having them in the project is the only
+    //  way they can be loaded.
+
+    const tssourceFiles = new Set(cmdLine.fileNames);
+    cmdLine.fileNames = cmdLine.fileNames.filter((f) => f.endsWith(".d.ts"));
+
     // Create a TypeScript project using the configuration file. Enhance the
     // underlying TS language service with our react-native module resolver.
     const enhanceLanguageServiceHost = (host: ts.LanguageServiceHost): void => {
@@ -119,28 +142,34 @@ export function createProjectCache(
       enhanceLanguageServiceHost
     );
 
-    // Start with an empty project, ignoring the file graph from tsconfig.json.
-    tsproject.removeAllFiles();
-
-    return tsproject;
+    return {
+      tsproject,
+      tssourceFiles,
+    };
   }
 
-  function getProject(sourceFile: string, platform: AllPlatforms): Project {
+  function getProjectInfo(
+    sourceFile: string,
+    platform: AllPlatforms
+  ): ProjectInfo {
     const root = findProjectRoot(sourceFile);
-    if (!projects[root]) {
-      projects[root] = {};
-    }
-    if (!projects[root][platform]) {
-      projects[root][platform] = createProject(root, platform);
+    projects[root] ||= {};
+
+    let info = projects[root][platform];
+    if (!info) {
+      info = createProjectInfo(root, platform);
+      projects[root][platform] = info;
     }
-    return projects[root][platform]!;
+    return info;
   }
 
   function clearPlatform(platform: AllPlatforms): void {
     Object.values(projects).forEach((projectsByPlatform) => {
-      const project = projectsByPlatform[platform];
-      if (project) {
-        project.dispose();
+      const info = projectsByPlatform[platform];
+      if (info) {
+        if (info.tsproject) {
+          info.tsproject.dispose();
+        }
         delete projectsByPlatform[platform];
       }
     });
@@ -148,6 +177,6 @@ export function createProjectCache(
 
   return {
     clearPlatform,
-    getProject,
+    getProjectInfo,
   };
 }