@react-native/community-cli-plugin 0.73.0 → 0.73.2

package/dist/commands/start/runServer.js.flow

@@ -4,31 +4,13 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  * @oncall react_native
  */
 
-import type {Config} from '@react-native-community/cli-types';
-import type {Reporter} from 'metro/src/lib/reporting';
-import type {TerminalReportableEvent} from 'metro/src/lib/TerminalReporter';
-import typeof TerminalReporter from 'metro/src/lib/TerminalReporter';
-import type Server from 'metro/src/Server';
-import type {Middleware} from 'metro-config';
-
-import Metro from 'metro';
-import {Terminal} from 'metro-core';
-import path from 'path';
-import {
-  createDevServerMiddleware,
-  indexPageMiddleware,
-} from '@react-native-community/cli-server-api';
-
-import loadMetroConfig from '../../utils/loadMetroConfig';
-import {version} from '@react-native-community/cli-tools';
-import enableWatchMode from './watchMode';
-
-export type Args = {
+import type { Config } from "@react-native-community/cli-types";
+export type StartCommandArgs = {
   assetPlugins?: string[],
   cert?: string,
   customLogReporterPath?: string,
@@ -47,110 +29,10 @@ export type Args = {
   interactive: boolean,
 };
 
-async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
-  let reportEvent: (event: any) => void;
-  const terminal = new Terminal(process.stdout);
-  const ReporterImpl = getReporterImpl(args.customLogReporterPath);
-  const terminalReporter = new ReporterImpl(terminal);
-  const reporter: Reporter = {
-    update(event: TerminalReportableEvent) {
-      terminalReporter.update(event);
-      if (reportEvent) {
-        reportEvent(event);
-      }
-    },
-  };
-
-  const metroConfig = await loadMetroConfig(ctx, {
-    config: args.config,
-    maxWorkers: args.maxWorkers,
-    port: args.port,
-    resetCache: args.resetCache,
-    watchFolders: args.watchFolders,
-    projectRoot: args.projectRoot,
-    sourceExts: args.sourceExts,
-    reporter,
-  });
-
-  if (args.assetPlugins) {
-    // $FlowIgnore[cannot-write] Assigning to readonly property
-    metroConfig.transformer.assetPlugins = args.assetPlugins.map(plugin =>
-      require.resolve(plugin),
-    );
-  }
-
-  const {
-    middleware,
-    websocketEndpoints,
-    messageSocketEndpoint,
-    eventsSocketEndpoint,
-  } = createDevServerMiddleware({
-    host: args.host,
-    port: metroConfig.server.port,
-    watchFolders: metroConfig.watchFolders,
-  });
-  middleware.use(indexPageMiddleware);
-
-  const customEnhanceMiddleware = metroConfig.server.enhanceMiddleware;
-  // $FlowIgnore[cannot-write] Assigning to readonly property
-  metroConfig.server.enhanceMiddleware = (
-    metroMiddleware: Middleware,
-    server: Server,
-  ) => {
-    if (customEnhanceMiddleware) {
-      metroMiddleware = customEnhanceMiddleware(metroMiddleware, server);
-    }
-    return middleware.use(metroMiddleware);
-  };
-
-  const serverInstance = await Metro.runServer(metroConfig, {
-    host: args.host,
-    secure: args.https,
-    secureCert: args.cert,
-    secureKey: args.key,
-    // $FlowFixMe[incompatible-call] Incompatibly defined WebSocketServer type
-    websocketEndpoints,
-  });
-
-  reportEvent = eventsSocketEndpoint.reportEvent;
-
-  if (args.interactive) {
-    enableWatchMode(messageSocketEndpoint, ctx);
-  }
-
-  // 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;
-
-  await version.logIfUpdateAvailable(ctx.root);
-}
-
-function getReporterImpl(customLogReporterPath?: string): TerminalReporter {
-  if (customLogReporterPath == null) {
-    return require('metro/src/lib/TerminalReporter');
-  }
-  try {
-    // First we let require resolve it, so we can require packages in node_modules
-    // as expected. eg: require('my-package/reporter');
-    // $FlowIgnore[unsupported-syntax]
-    return require(customLogReporterPath);
-  } catch (e) {
-    if (e.code !== 'MODULE_NOT_FOUND') {
-      throw e;
-    }
-    // If that doesn't work, then we next try relative to the cwd, eg:
-    // require('./reporter');
-    // $FlowIgnore[unsupported-syntax]
-    return require(path.resolve(customLogReporterPath));
-  }
-}
+declare function runServer(
+  _argv: Array<string>,
+  ctx: Config,
+  args: StartCommandArgs
+): void;
 
-export default runServer;
+declare export default runServer;

package/dist/index.flow.js

@@ -27,8 +27,8 @@ Object.defineProperty(exports, "unstable_buildBundleWithConfig", {
     return _buildBundle.unstable_buildBundleWithConfig;
   },
 });
-var _bundle = _interopRequireDefault(require("./commands/bundle/bundle"));
-var _ramBundle = _interopRequireDefault(require("./commands/bundle/ramBundle"));
+var _bundle = _interopRequireDefault(require("./commands/bundle"));
+var _ramBundle = _interopRequireDefault(require("./commands/ram-bundle"));
 var _start = _interopRequireDefault(require("./commands/start"));
 var _buildBundle = require("./commands/bundle/buildBundle");
 function _interopRequireDefault(obj) {

package/dist/index.flow.js.flow

@@ -4,13 +4,13 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  * @oncall react_native
  */
 
-export {default as bundleCommand} from './commands/bundle/bundle';
-export {default as ramBundleCommand} from './commands/bundle/ramBundle';
-export {default as startCommand} from './commands/start';
+export { default as bundleCommand } from "./commands/bundle";
+export { default as ramBundleCommand } from "./commands/ram-bundle";
+export { default as startCommand } from "./commands/start";
 
-export {unstable_buildBundleWithConfig} from './commands/bundle/buildBundle';
+export { unstable_buildBundleWithConfig } from "./commands/bundle/buildBundle";

package/dist/index.js.flow

@@ -9,12 +9,4 @@
  * @oncall react_native
  */
 
-/*::
-export type * from './index.flow';
-*/
-
-if (!process.env.BUILD_EXCLUDE_BABEL_REGISTER) {
-  require('../../../scripts/build/babel-register').registerForMonorepo();
-}
-
-module.exports = require('./index.flow');
+declare module.exports: $FlowFixMe;

package/dist/utils/KeyPressHandler.js

@@ -0,0 +1,91 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.KeyPressHandler = void 0;
+var _cliTools = require("@react-native-community/cli-tools");
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ *
+ * @format
+ * @oncall react_native
+ */
+
+const CTRL_C = "\u0003";
+
+/** An abstract key stroke interceptor. */
+class KeyPressHandler {
+  _isInterceptingKeyStrokes = false;
+  _isHandlingKeyPress = false;
+  constructor(onPress) {
+    this._onPress = onPress;
+  }
+
+  /** Start observing interaction pause listeners. */
+  createInteractionListener() {
+    // Support observing prompts.
+    let wasIntercepting = false;
+    const listener = ({ pause }) => {
+      if (pause) {
+        // Track if we were already intercepting key strokes before pausing, so we can
+        // resume after pausing.
+        wasIntercepting = this._isInterceptingKeyStrokes;
+        this.stopInterceptingKeyStrokes();
+      } else if (wasIntercepting) {
+        // Only start if we were previously intercepting.
+        this.startInterceptingKeyStrokes();
+      }
+    };
+    return listener;
+  }
+  _handleKeypress = async (key) => {
+    // Prevent sending another event until the previous event has finished.
+    if (this._isHandlingKeyPress && key !== CTRL_C) {
+      return;
+    }
+    this._isHandlingKeyPress = true;
+    try {
+      _cliTools.logger.debug(`Key pressed: ${key}`);
+      await this._onPress(key);
+    } catch (error) {
+      return new _cliTools.CLIError(
+        "There was an error with the key press handler."
+      );
+    } finally {
+      this._isHandlingKeyPress = false;
+    }
+  };
+
+  /** Start intercepting all key strokes and passing them to the input `onPress` method. */
+  startInterceptingKeyStrokes() {
+    if (this._isInterceptingKeyStrokes) {
+      return;
+    }
+    this._isInterceptingKeyStrokes = true;
+    const { stdin } = process;
+    // $FlowFixMe[prop-missing]
+    stdin.setRawMode(true);
+    stdin.resume();
+    stdin.setEncoding("utf8");
+    stdin.on("data", this._handleKeypress);
+  }
+
+  /** Stop intercepting all key strokes. */
+  stopInterceptingKeyStrokes() {
+    if (!this._isInterceptingKeyStrokes) {
+      return;
+    }
+    this._isInterceptingKeyStrokes = false;
+    const { stdin } = process;
+    stdin.removeListener("data", this._handleKeypress);
+    // $FlowFixMe[prop-missing]
+    stdin.setRawMode(false);
+    stdin.resume();
+  }
+}
+exports.KeyPressHandler = KeyPressHandler;

package/dist/utils/KeyPressHandler.js.flow

@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ * @oncall react_native
+ */
+
+/** An abstract key stroke interceptor. */
+declare export class KeyPressHandler {
+  _isInterceptingKeyStrokes: $FlowFixMe;
+  _isHandlingKeyPress: $FlowFixMe;
+  _onPress: (key: string) => Promise<void>;
+  constructor(onPress: (key: string) => Promise<void>): void;
+  createInteractionListener(): ({ pause: boolean, ... }) => void;
+  _handleKeypress: $FlowFixMe;
+  startInterceptingKeyStrokes(): void;
+  stopInterceptingKeyStrokes(): void;
+}

package/dist/utils/isDevServerRunning.js

@@ -0,0 +1,74 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = isDevServerRunning;
+var _net = _interopRequireDefault(require("net"));
+var _nodeFetch = _interopRequireDefault(require("node-fetch"));
+function _interopRequireDefault(obj) {
+  return obj && obj.__esModule ? obj : { default: obj };
+}
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ *
+ * @format
+ * @oncall react_native
+ */
+
+/**
+ * Determine whether we can run the dev server.
+ *
+ * Return values:
+ * - `not_running`: The port is unoccupied.
+ * - `matched_server_running`: The port is occupied by another instance of this
+ *   dev server (matching the passed `projectRoot`).
+ * - `port_taken`: The port is occupied by another process.
+ * - `unknown`: An error was encountered; attempt server creation anyway.
+ */
+async function isDevServerRunning(scheme, host, port, projectRoot) {
+  try {
+    if (!(await isPortOccupied(host, port))) {
+      return "not_running";
+    }
+    const statusResponse = await (0, _nodeFetch.default)(
+      `${scheme}://${host}:${port}/status`
+    );
+    const body = await statusResponse.text();
+    return body === "packager-status:running" &&
+      statusResponse.headers.get("X-React-Native-Project-Root") === projectRoot
+      ? "matched_server_running"
+      : "port_taken";
+  } catch (e) {
+    return "unknown";
+  }
+}
+async function isPortOccupied(host, port) {
+  let result = false;
+  const server = _net.default.createServer();
+  return new Promise((resolve, reject) => {
+    server.once("error", (e) => {
+      server.close();
+      if (e.code === "EADDRINUSE") {
+        result = true;
+      } else {
+        reject(e);
+      }
+    });
+    server.once("listening", () => {
+      result = false;
+      server.close();
+    });
+    server.once("close", () => {
+      resolve(result);
+    });
+    server.listen({
+      host,
+      port,
+    });
+  });
+}

package/dist/utils/isDevServerRunning.js.flow

@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ * @oncall react_native
+ */
+
+/**
+ * Determine whether we can run the dev server.
+ *
+ * Return values:
+ * - `not_running`: The port is unoccupied.
+ * - `matched_server_running`: The port is occupied by another instance of this
+ *   dev server (matching the passed `projectRoot`).
+ * - `port_taken`: The port is occupied by another process.
+ * - `unknown`: An error was encountered; attempt server creation anyway.
+ */
+declare export default function isDevServerRunning(
+  scheme: string,
+  host: string,
+  port: number,
+  projectRoot: string
+): Promise<"not_running" | "matched_server_running" | "port_taken" | "unknown">;

package/dist/utils/loadMetroConfig.js

@@ -65,6 +65,7 @@ function getOverrideConfig(ctx) {
     },
   };
 }
+
 /**
  * Load Metro config.
  *
@@ -73,15 +74,13 @@ function getOverrideConfig(ctx) {
  */
 async function loadMetroConfig(ctx, options = {}) {
   const overrideConfig = getOverrideConfig(ctx);
-  if (options.reporter) {
-    overrideConfig.reporter = options.reporter;
-  }
+  const cwd = ctx.root;
   const projectConfig = await (0, _metroConfig.resolveConfig)(
-    undefined,
-    ctx.root
+    options.config,
+    cwd
   );
   if (projectConfig.isEmpty) {
-    throw new _cliTools.CLIError(`No metro config found in ${ctx.root}`);
+    throw new _cliTools.CLIError(`No Metro config found in ${cwd}`);
   }
   _cliTools.logger.debug(`Reading Metro config from ${projectConfig.filepath}`);
   if (!global.__REACT_NATIVE_METRO_CONFIG_LOADED) {
@@ -100,7 +99,7 @@ This warning will be removed in future (https://github.com/facebook/metro/issues
   }
   return (0, _metroConfig.mergeConfig)(
     await (0, _metroConfig.loadConfig)({
-      cwd: ctx.root,
+      cwd,
       ...options,
     }),
     overrideConfig

package/dist/utils/loadMetroConfig.js.flow

@@ -4,122 +4,30 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  * @oncall react_native
  */
 
-import type {Config} from '@react-native-community/cli-types';
-import type {ConfigT, InputConfigT} from 'metro-config';
+import type { Config } from "@react-native-community/cli-types";
+import type { ConfigT, YargArguments } from "metro-config";
 
-import path from 'path';
-import {loadConfig, mergeConfig, resolveConfig} from 'metro-config';
-import {CLIError, logger} from '@react-native-community/cli-tools';
-import {reactNativePlatformResolver} from './metroPlatformResolver';
-
-export type {Config};
+export type { Config };
 
 export type ConfigLoadingContext = $ReadOnly<{
-  root: Config['root'],
-  reactNativePath: Config['reactNativePath'],
-  platforms: Config['platforms'],
+  root: Config["root"],
+  reactNativePath: Config["reactNativePath"],
+  platforms: Config["platforms"],
   ...
 }>;
 
-/**
- * Get the config options to override based on RN CLI inputs.
- */
-function getOverrideConfig(ctx: ConfigLoadingContext): InputConfigT {
-  const outOfTreePlatforms = Object.keys(ctx.platforms).filter(
-    platform => ctx.platforms[platform].npmPackageName,
-  );
-  const resolver: Partial<{...ConfigT['resolver']}> = {
-    platforms: [...Object.keys(ctx.platforms), 'native'],
-  };
-
-  if (outOfTreePlatforms.length) {
-    resolver.resolveRequest = reactNativePlatformResolver(
-      outOfTreePlatforms.reduce<{[platform: string]: string}>(
-        (result, platform) => {
-          result[platform] = ctx.platforms[platform].npmPackageName;
-          return result;
-        },
-        {},
-      ),
-    );
-  }
-
-  return {
-    resolver,
-    serializer: {
-      // We can include multiple copies of InitializeCore here because metro will
-      // only add ones that are already part of the bundle
-      getModulesRunBeforeMainModule: () => [
-        require.resolve(
-          path.join(ctx.reactNativePath, 'Libraries/Core/InitializeCore'),
-          {paths: [ctx.root]},
-        ),
-        ...outOfTreePlatforms.map(platform =>
-          require.resolve(
-            `${ctx.platforms[platform].npmPackageName}/Libraries/Core/InitializeCore`,
-          ),
-        ),
-      ],
-    },
-  };
-}
-
-export type ConfigOptionsT = $ReadOnly<{
-  maxWorkers?: number,
-  port?: number,
-  projectRoot?: string,
-  resetCache?: boolean,
-  watchFolders?: string[],
-  sourceExts?: string[],
-  reporter?: any,
-  config?: string,
-}>;
-
 /**
  * Load Metro config.
  *
  * Allows the CLI to override select values in `metro.config.js` based on
  * dynamic user options in `ctx`.
  */
-export default async function loadMetroConfig(
+declare export default function loadMetroConfig(
   ctx: ConfigLoadingContext,
-  options: ConfigOptionsT = {},
-): Promise<ConfigT> {
-  const overrideConfig = getOverrideConfig(ctx);
-  if (options.reporter) {
-    overrideConfig.reporter = options.reporter;
-  }
-
-  const projectConfig = await resolveConfig(undefined, ctx.root);
-
-  if (projectConfig.isEmpty) {
-    throw new CLIError(`No metro config found in ${ctx.root}`);
-  }
-
-  logger.debug(`Reading Metro config from ${projectConfig.filepath}`);
-
-  if (!global.__REACT_NATIVE_METRO_CONFIG_LOADED) {
-    const warning = `
-=================================================================================================
-From React Native 0.73, your project's Metro config should extend '@react-native/metro-config'
-or it will fail to build. Please copy the template at:
-https://github.com/facebook/react-native/blob/main/packages/react-native/template/metro.config.js
-This warning will be removed in future (https://github.com/facebook/metro/issues/1018).
-=================================================================================================
-    `;
-
-    for (const line of warning.trim().split('\n')) {
-      logger.warn(line);
-    }
-  }
-
-  return mergeConfig(
-    await loadConfig({cwd: ctx.root, ...options}),
-    overrideConfig,
-  );
-}
+  options: YargArguments
+): Promise<ConfigT>;

package/dist/utils/metroPlatformResolver.js.flow

@@ -4,12 +4,12 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  * @oncall react_native
  */
 
-import type {CustomResolver} from 'metro-resolver';
+import type { CustomResolver } from "metro-resolver";
 
 /**
  * This is an implementation of a metro resolveRequest option which will remap react-native imports
@@ -25,20 +25,6 @@ import type {CustomResolver} from 'metro-resolver';
  *    macos: 'react-native-macos'
  * }
  */
-export function reactNativePlatformResolver(platformImplementations: {
+declare export function reactNativePlatformResolver(platformImplementations: {
   [platform: string]: string,
-}): CustomResolver {
-  return (context, moduleName, platform) => {
-    let modifiedModuleName = moduleName;
-    if (platform != null && platformImplementations[platform]) {
-      if (moduleName === 'react-native') {
-        modifiedModuleName = platformImplementations[platform];
-      } else if (moduleName.startsWith('react-native/')) {
-        modifiedModuleName = `${
-          platformImplementations[platform]
-        }/${modifiedModuleName.slice('react-native/'.length)}`;
-      }
-    }
-    return context.resolveRequest(context, modifiedModuleName, platform);
-  };
-}
+}): CustomResolver;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/community-cli-plugin",
-  "version": "0.73.0",
+  "version": "0.73.2",
   "description": "Core CLI commands for React Native",
   "keywords": ["react-native", "tools"],
   "homepage": "https://github.com/facebook/react-native/tree/HEAD/packages/buid-scripts#readme",
@@ -12,18 +12,20 @@
   },
   "license": "MIT",
   "exports": { ".": "./dist/index.js", "./package.json": "./package.json" },
-  "files": ["dist", "launchPackager.bat", "launchPackager.command"],
+  "files": ["dist"],
   "dependencies": {
-    "@react-native-community/cli-server-api": "12.0.0-alpha.7",
-    "@react-native-community/cli-tools": "12.0.0-alpha.7",
-    "@react-native/metro-babel-transformer": "^0.73.11",
+    "@react-native/dev-middleware": "^0.73.2",
+    "@react-native-community/cli-server-api": "12.0.0-alpha.15",
+    "@react-native-community/cli-tools": "12.0.0-alpha.15",
+    "@react-native/metro-babel-transformer": "^0.73.12",
     "chalk": "^4.0.0",
     "execa": "^5.1.1",
-    "metro": "0.77.0",
-    "metro-config": "0.77.0",
-    "metro-core": "0.77.0",
-    "metro-resolver": "0.77.0",
+    "metro": "0.79.1",
+    "metro-config": "0.79.1",
+    "metro-core": "0.79.1",
+    "node-fetch": "^2.2.0",
     "readline": "^1.3.0"
   },
+  "devDependencies": { "metro-resolver": "0.79.1" },
   "engines": { "node": ">=18" }
 }