@rnx-kit/cli 0.14.1 → 0.14.2

package/lib/start.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -29,159 +20,163 @@ function friendlyRequire(module) {
         throw new Error(`Cannot find module '${module}'. This probably means that '@rnx-kit/cli' is not compatible with the version of '@react-native-community/cli' that you are currently using. Please update to the latest version and try again. If the issue still persists after the update, please file a bug at https://github.com/microsoft/rnx-kit/issues.`);
     }
 }
-function hasWebsocketEndpoints(devServer) {
-    return !("attachToServer" in devServer);
+function hasAttachToServerFunction(devServer) {
+    return "attachToServer" in devServer;
 }
-function rnxStart(_argv, cliConfig, cliOptions) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const serverConfig = (0, kit_config_1.getKitServerConfig)(cliOptions);
-        const { createDevServerMiddleware, indexPageMiddleware } = friendlyRequire("@react-native-community/cli-server-api");
-        // interactive mode requires raw access to stdin
-        let interactive = cliOptions.interactive;
-        if (interactive) {
-            interactive = process.stdin.isTTY;
-            if (!interactive) {
-                console.warn(chalk_1.default.yellow("Warning: Interactive mode is not supported on this terminal"));
-            }
+async function rnxStart(_argv, cliConfig, cliOptions) {
+    const serverConfig = (0, kit_config_1.getKitServerConfig)(cliOptions);
+    const { createDevServerMiddleware, indexPageMiddleware } = friendlyRequire("@react-native-community/cli-server-api");
+    // interactive mode requires raw access to stdin
+    let interactive = cliOptions.interactive;
+    if (interactive) {
+        interactive = process.stdin.isTTY;
+        if (!interactive) {
+            console.warn(chalk_1.default.yellow("Warning: Interactive mode is not supported on this terminal"));
         }
-        // create a Metro terminal and reporter for writing to the console
-        const { terminal, reporter: terminalReporter } = (0, metro_service_1.createTerminal)(cliOptions.customLogReporterPath);
-        // create a reporter function, to be bound to the Metro configuration.
-        // which writes to the Metro terminal and
-        // also notifies the `reportEvent` delegate.
-        let reportEventDelegate = undefined;
-        const reporter = {
-            update(event) {
-                terminalReporter.update(event);
-                if (reportEventDelegate) {
-                    reportEventDelegate(event);
-                }
-                if (interactive && event.type === "dep_graph_loading") {
-                    const dim = chalk_1.default.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}.`));
-                    });
-                }
-            },
-        };
-        // load Metro configuration, applying overrides from the command line
-        const metroConfig = yield (0, metro_service_1.loadMetroConfig)(cliConfig, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, cliOptions), (serverConfig.projectRoot
+    }
+    // create a Metro terminal and reporter for writing to the console
+    const { terminal, reporter: terminalReporter } = (0, metro_service_1.createTerminal)(cliOptions.customLogReporterPath);
+    // create a reporter function, to be bound to the Metro configuration.
+    // which writes to the Metro terminal and
+    // also notifies the `reportEvent` delegate.
+    let reportEventDelegate = undefined;
+    const reporter = {
+        update(event) {
+            terminalReporter.update(event);
+            if (reportEventDelegate) {
+                reportEventDelegate(event);
+            }
+            if (interactive && event.type === "dep_graph_loading") {
+                const dim = chalk_1.default.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}.`));
+                });
+            }
+        },
+    };
+    // load Metro configuration, applying overrides from the command line
+    const metroConfig = await (0, metro_service_1.loadMetroConfig)(cliConfig, {
+        ...cliOptions,
+        ...(serverConfig.projectRoot
             ? { projectRoot: path_1.default.resolve(serverConfig.projectRoot) }
-            : undefined)), { reporter }), (serverConfig.sourceExts
+            : undefined),
+        reporter,
+        ...(serverConfig.sourceExts
             ? { sourceExts: serverConfig.sourceExts }
-            : undefined)), (serverConfig.assetPlugins
+            : undefined),
+        ...(serverConfig.assetPlugins
             ? {
                 assetPlugins: serverConfig.assetPlugins.map((p) => require.resolve(p)),
             }
-            : undefined)));
-        // customize the metro config to include plugins, presets, etc.
-        (0, metro_config_1.customizeMetroConfig)(metroConfig, serverConfig.detectCyclicDependencies, serverConfig.detectDuplicateDependencies, serverConfig.typescriptValidation, serverConfig.treeShake, (message) => {
-            terminal.log(message);
-        });
-        // create middleware -- a collection of plugins which handle incoming
-        // http(s) requests, routing them to static pages or JS functions.
-        const devServer = createDevServerMiddleware({
-            host: cliOptions.host,
-            port: metroConfig.server.port,
-            watchFolders: metroConfig.watchFolders,
-        });
-        const middleware = devServer.middleware;
-        middleware.use(indexPageMiddleware);
-        // merge the Metro config middleware with our middleware
-        const enhanceMiddleware = metroConfig.server.enhanceMiddleware;
-        // @ts-expect-error We want to assign to read-only `enhanceMiddleware`
-        metroConfig.server.enhanceMiddleware = (metroMiddleware, metroServer) => {
-            return middleware.use(enhanceMiddleware
-                ? enhanceMiddleware(metroMiddleware, metroServer)
-                : metroMiddleware);
-        };
-        // `createDevServerMiddleware` changed its return type in
-        // https://github.com/react-native-community/cli/pull/1560
-        let websocketEndpoints = undefined;
-        let messageSocketEndpoint;
-        if (hasWebsocketEndpoints(devServer)) {
-            websocketEndpoints = devServer.websocketEndpoints;
-            messageSocketEndpoint = devServer.messageSocketEndpoint;
-            // bind our `reportEvent` delegate to the Metro server
-            reportEventDelegate = devServer.eventsSocketEndpoint.reportEvent;
-        }
-        // start the Metro server
-        const serverOptions = {
-            host: cliOptions.host,
-            secure: cliOptions.https,
-            secureCert: cliOptions.cert,
-            secureKey: cliOptions.key,
-            websocketEndpoints,
-        };
-        const serverInstance = yield (0, metro_service_1.startServer)(metroConfig, serverOptions);
-        if (!hasWebsocketEndpoints(devServer)) {
-            const { messageSocket, eventsSocket } = devServer.attachToServer(serverInstance);
-            messageSocketEndpoint = messageSocket;
-            // bind our `reportEvent` delegate to the Metro server
-            reportEventDelegate = eventsSocket.reportEvent;
-        }
-        // In Node 8, the default keep-alive for an HTTP connection is 5 seconds. In
-        // early versions of Node 8, this was implemented in a buggy way which caused
-        // some HTTP responses (like those containing large JS bundles) to be
-        // terminated early.
-        //
-        // As a workaround, arbitrarily increase the keep-alive from 5 to 30 seconds,
-        // which should be enough to send even the largest of JS bundles.
-        //
-        // For more info: https://github.com/nodejs/node/issues/13391
-        //
-        serverInstance.keepAliveTimeout = 30000;
-        // in interactive mode, listen for keyboard events from stdin and bind
-        // them to specific actions.
-        if (interactive) {
-            readline_1.default.emitKeypressEvents(process.stdin);
-            process.stdin.setRawMode(true);
-            process.stdin.on("keypress", (_key, data) => {
-                const { ctrl, name } = data;
-                if (ctrl === true) {
-                    switch (name) {
-                        case "c":
-                            terminal.log(chalk_1.default.green("Exiting..."));
-                            process.exit();
-                            break;
-                        case "z":
-                            process.emit("SIGTSTP", "SIGTSTP");
-                            break;
-                    }
+            : undefined),
+    });
+    // customize the metro config to include plugins, presets, etc.
+    (0, metro_config_1.customizeMetroConfig)(metroConfig, serverConfig.detectCyclicDependencies, serverConfig.detectDuplicateDependencies, serverConfig.typescriptValidation, serverConfig.treeShake, (message) => {
+        terminal.log(message);
+    });
+    // create middleware -- a collection of plugins which handle incoming
+    // http(s) requests, routing them to static pages or JS functions.
+    const devServer = createDevServerMiddleware({
+        host: cliOptions.host,
+        port: metroConfig.server.port,
+        watchFolders: metroConfig.watchFolders,
+    });
+    const middleware = devServer.middleware;
+    middleware.use(indexPageMiddleware);
+    // merge the Metro config middleware with our middleware
+    const enhanceMiddleware = metroConfig.server.enhanceMiddleware;
+    // @ts-expect-error We want to assign to read-only `enhanceMiddleware`
+    metroConfig.server.enhanceMiddleware = (metroMiddleware, metroServer) => {
+        return middleware.use(enhanceMiddleware
+            ? enhanceMiddleware(metroMiddleware, metroServer)
+            : metroMiddleware);
+    };
+    // `createDevServerMiddleware` changed its return type in
+    // https://github.com/react-native-community/cli/pull/1560
+    let websocketEndpoints = undefined;
+    let messageSocketEndpoint;
+    if (!hasAttachToServerFunction(devServer)) {
+        websocketEndpoints = devServer.websocketEndpoints;
+        messageSocketEndpoint = devServer.messageSocketEndpoint;
+        // bind our `reportEvent` delegate to the Metro server
+        reportEventDelegate = devServer.eventsSocketEndpoint.reportEvent;
+    }
+    // start the Metro server
+    const serverOptions = {
+        host: cliOptions.host,
+        secure: cliOptions.https,
+        secureCert: cliOptions.cert,
+        secureKey: cliOptions.key,
+        websocketEndpoints,
+    };
+    const serverInstance = await (0, metro_service_1.startServer)(metroConfig, serverOptions);
+    if (hasAttachToServerFunction(devServer)) {
+        const { messageSocket, eventsSocket } = devServer.attachToServer(serverInstance);
+        messageSocketEndpoint = messageSocket;
+        // bind our `reportEvent` delegate to the Metro server
+        reportEventDelegate = eventsSocket.reportEvent;
+    }
+    // In Node 8, the default keep-alive for an HTTP connection is 5 seconds. In
+    // early versions of Node 8, this was implemented in a buggy way which caused
+    // some HTTP responses (like those containing large JS bundles) to be
+    // terminated early.
+    //
+    // As a workaround, arbitrarily increase the keep-alive from 5 to 30 seconds,
+    // which should be enough to send even the largest of JS bundles.
+    //
+    // For more info: https://github.com/nodejs/node/issues/13391
+    //
+    serverInstance.keepAliveTimeout = 30000;
+    // in interactive mode, listen for keyboard events from stdin and bind
+    // them to specific actions.
+    if (interactive) {
+        readline_1.default.emitKeypressEvents(process.stdin);
+        process.stdin.setRawMode(true);
+        process.stdin.on("keypress", (_key, data) => {
+            const { ctrl, name } = data;
+            if (ctrl === true) {
+                switch (name) {
+                    case "c":
+                        terminal.log(chalk_1.default.green("Exiting..."));
+                        process.exit();
+                        break;
+                    case "z":
+                        process.emit("SIGTSTP", "SIGTSTP");
+                        break;
                 }
-                else {
-                    switch (name) {
-                        case "a": {
-                            const protocol = cliOptions.https ? "https" : "http";
-                            const host = cliOptions.host || os_1.default.hostname();
-                            const port = metroConfig.server.port;
-                            const url = `${protocol}://${host}:${port}/index.bundle`;
-                            qrcode_1.default.toString(url, { type: "terminal" }, (_err, qr) => {
-                                terminal.log("");
-                                terminal.log(url + ":");
-                                terminal.log(qr);
-                            });
-                            break;
-                        }
-                        case "d":
-                            terminal.log(chalk_1.default.green("Opening developer menu..."));
-                            messageSocketEndpoint.broadcast("devMenu", undefined);
-                            break;
-                        case "r":
-                            terminal.log(chalk_1.default.green("Reloading app..."));
-                            messageSocketEndpoint.broadcast("reload", undefined);
-                            break;
+            }
+            else {
+                switch (name) {
+                    case "a": {
+                        const protocol = cliOptions.https ? "https" : "http";
+                        const host = cliOptions.host || os_1.default.hostname();
+                        const port = metroConfig.server.port;
+                        const url = `${protocol}://${host}:${port}/index.bundle`;
+                        qrcode_1.default.toString(url, { type: "terminal" }, (_err, qr) => {
+                            terminal.log("");
+                            terminal.log(url + ":");
+                            terminal.log(qr);
+                        });
+                        break;
                     }
+                    case "d":
+                        terminal.log(chalk_1.default.green("Opening developer menu..."));
+                        messageSocketEndpoint.broadcast("devMenu", undefined);
+                        break;
+                    case "r":
+                        terminal.log(chalk_1.default.green("Reloading app..."));
+                        messageSocketEndpoint.broadcast("reload", undefined);
+                        break;
                 }
-            });
-        }
-    });
+            }
+        });
+    }
 }
 exports.rnxStart = rnxStart;
 //# sourceMappingURL=start.js.map

package/lib/start.js.map

@@ -1 +1 @@
-{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rnx-kit/cli",
-  "version": "0.14.1",
+  "version": "0.14.2",
   "description": "Command-line interface for working with kit packages in your repo",
   "homepage": "https://github.com/microsoft/rnx-kit/tree/main/packages/cli",
   "license": "MIT",
@@ -26,7 +26,7 @@
     "@rnx-kit/metro-plugin-duplicates-checker": "^1.2.15",
     "@rnx-kit/metro-serializer": "^1.0.11",
     "@rnx-kit/metro-serializer-esbuild": "^0.1.0",
-    "@rnx-kit/metro-service": "^2.0.0",
+    "@rnx-kit/metro-service": "^3.0.0",
     "@rnx-kit/third-party-notices": "^1.2.13",
     "@rnx-kit/tools-language": "^1.3.0",
     "@rnx-kit/tools-node": "^1.2.7",
@@ -56,9 +56,10 @@
     "@types/metro-babel-transformer": "^0.66.0",
     "@types/metro-config": "^0.66.0",
     "@types/qrcode": "^1.4.2",
+    "jest": "^27.0.0",
     "jest-extended": "^2.0.0",
     "memfs": "^3.4.1",
-    "metro-config": "^0.66.2",
+    "metro-config": "^0.67.0",
     "typescript": "^4.0.0"
   },
   "depcheck": {

package/src/start.ts

@@ -6,6 +6,8 @@ import {
   startServer,
 } from "@rnx-kit/metro-service";
 import chalk from "chalk";
+import type { Server as HttpServer } from "http";
+import type { Server as HttpsServer } from "https";
 import type { ReportableEvent, Reporter } from "metro";
 import type { Middleware } from "metro-config";
 import type Server from "metro/src/Server";
@@ -20,13 +22,12 @@ type DevServerMiddleware = ReturnType<
   typeof CliServerApi["createDevServerMiddleware"]
 >;
 
-type DevServer = ReturnType<DevServerMiddleware["attachToServer"]>;
-
-type DevServerMiddleware7 = Pick<DevServerMiddleware, "middleware"> & {
-  websocketEndpoints: unknown;
-  debuggerProxyEndpoint: DevServer["debuggerProxy"];
-  messageSocketEndpoint: DevServer["messageSocket"];
-  eventsSocketEndpoint: DevServer["eventsSocket"];
+type DevServerMiddleware6 = Pick<DevServerMiddleware, "middleware"> & {
+  attachToServer: (server: HttpServer | HttpsServer) => {
+    debuggerProxy: DevServerMiddleware["debuggerProxyEndpoint"];
+    eventsSocket: DevServerMiddleware["eventsSocketEndpoint"];
+    messageSocket: DevServerMiddleware["messageSocketEndpoint"];
+  };
 };
 
 export type CLIStartOptions = {
@@ -56,10 +57,10 @@ function friendlyRequire<T>(module: string): T {
   }
 }
 
-function hasWebsocketEndpoints(
-  devServer: DevServerMiddleware | DevServerMiddleware7
-): devServer is DevServerMiddleware7 {
-  return !("attachToServer" in devServer);
+function hasAttachToServerFunction(
+  devServer: DevServerMiddleware | DevServerMiddleware6
+): devServer is DevServerMiddleware6 {
+  return "attachToServer" in devServer;
 }
 
 export async function rnxStart(
@@ -174,9 +175,9 @@ export async function rnxStart(
   // `createDevServerMiddleware` changed its return type in
   // https://github.com/react-native-community/cli/pull/1560
   let websocketEndpoints: unknown = undefined;
-  let messageSocketEndpoint: DevServer["messageSocket"];
+  let messageSocketEndpoint: DevServerMiddleware["messageSocketEndpoint"];
 
-  if (hasWebsocketEndpoints(devServer)) {
+  if (!hasAttachToServerFunction(devServer)) {
     websocketEndpoints = devServer.websocketEndpoints;
     messageSocketEndpoint = devServer.messageSocketEndpoint;
 
@@ -194,7 +195,7 @@ export async function rnxStart(
   };
   const serverInstance = await startServer(metroConfig, serverOptions);
 
-  if (!hasWebsocketEndpoints(devServer)) {
+  if (hasAttachToServerFunction(devServer)) {
     const { messageSocket, eventsSocket } =
       devServer.attachToServer(serverInstance);
     messageSocketEndpoint = messageSocket;