metro 0.83.4 → 0.83.6

package/src/index.flow.js

@@ -79,10 +79,7 @@ function _interopRequireWildcard(e, t) {
     if (!t && e && e.__esModule) return e;
     var o,
       i,
-      f = {
-        __proto__: null,
-        default: e,
-      };
+      f = { __proto__: null, default: e };
     if (null === e || ("object" != typeof e && "function" != typeof e))
       return f;
     if ((o = t ? n : r)) {
@@ -102,11 +99,7 @@ function _interopRequireWildcard(e, t) {
   })(e, t);
 }
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 const DEFAULTS = _Server.default.DEFAULT_BUNDLE_OPTIONS;
 async function getConfig(config) {
@@ -211,7 +204,7 @@ const runServer = async (
       _chalk.default.inverse.yellow.bold(" DEPRECATED "),
       "The `secure`, `secureCert`, and `secureKey` options are now deprecated. " +
         "Please use the `secureServerOptions` object instead to pass options to " +
-        "Metro's https development server.",
+        "Metro's https development server, or `config.server.tls` in Metro's configuration",
     );
   }
   const connect = require("connect");
@@ -230,15 +223,29 @@ const runServer = async (
   }
   serverApp.use(middleware);
   let httpServer;
-  if (secure === true || secureServerOptions != null) {
-    let options = secureServerOptions;
-    if (typeof secureKey === "string" && typeof secureCert === "string") {
-      options = {
-        key: _fs.default.readFileSync(secureKey),
-        cert: _fs.default.readFileSync(secureCert),
-        ...secureServerOptions,
-      };
-    }
+  const { tls } = config.server;
+  if (
+    secure === true ||
+    secureServerOptions != null ||
+    typeof tls === "object"
+  ) {
+    const options = {
+      key:
+        typeof tls === "object"
+          ? tls.key
+          : typeof secureKey === "string"
+            ? _fs.default.readFileSync(secureKey)
+            : undefined,
+      cert:
+        typeof tls === "object"
+          ? tls.cert
+          : typeof secureCert === "string"
+            ? _fs.default.readFileSync(secureCert)
+            : undefined,
+      ca: typeof tls === "object" ? tls.ca : undefined,
+      requestCert: typeof tls === "object" ? tls.requestCert : undefined,
+      ...(secureServerOptions ?? {}),
+    };
     httpServer = _https.default.createServer(options, serverApp);
   } else {
     httpServer = _http.default.createServer(serverApp);

package/src/index.flow.js.flow

@@ -156,9 +156,28 @@ type DependenciesCommandOptions = Readonly<{[string]: unknown}> | null;
 export {Terminal, JsonReporter, TerminalReporter};
 
 export type {AssetData} from './Assets';
-export type {Reporter, ReportableEvent} from './lib/reporting';
+export type {
+  AsyncDependencyType,
+  DeltaResult,
+  Dependency,
+  MixedOutput,
+  Module,
+  ReadOnlyDependencies,
+  ReadOnlyGraph,
+  SerializerOptions,
+  TransformInputOptions,
+  TransformResult,
+  TransformResultDependency,
+} from './DeltaBundler/types';
+export type {default as DependencyGraph} from './node-haste/DependencyGraph';
+export type {BundleDetails, Reporter, ReportableEvent} from './lib/reporting';
 export type {TerminalReportableEvent} from './lib/TerminalReporter';
-export type {MetroConfig};
+export type {
+  ContextMode,
+  RequireContextParams,
+} from './ModuleGraph/worker/collectDependencies';
+export type {ServerOptions} from './Server';
+export type {MetroConfig, MetroServer};
 
 async function getConfig(config: InputConfigT): Promise<ConfigT> {
   const defaultConfig = await getDefaultConfig(config.projectRoot);
@@ -280,7 +299,7 @@ export const runServer = async (
       chalk.inverse.yellow.bold(' DEPRECATED '),
       'The `secure`, `secureCert`, and `secureKey` options are now deprecated. ' +
         'Please use the `secureServerOptions` object instead to pass options to ' +
-        "Metro's https development server.",
+        "Metro's https development server, or `config.server.tls` in Metro's configuration",
     );
   }
   // Lazy require
@@ -307,15 +326,30 @@ export const runServer = async (
 
   let httpServer;
 
-  if (secure === true || secureServerOptions != null) {
-    let options = secureServerOptions;
-    if (typeof secureKey === 'string' && typeof secureCert === 'string') {
-      options = {
-        key: fs.readFileSync(secureKey),
-        cert: fs.readFileSync(secureCert),
-        ...secureServerOptions,
-      };
-    }
+  const {tls} = config.server;
+  if (
+    secure === true ||
+    secureServerOptions != null ||
+    typeof tls === 'object'
+  ) {
+    const options = {
+      key:
+        typeof tls === 'object'
+          ? tls.key
+          : typeof secureKey === 'string'
+            ? fs.readFileSync(secureKey)
+            : undefined,
+      cert:
+        typeof tls === 'object'
+          ? tls.cert
+          : typeof secureCert === 'string'
+            ? fs.readFileSync(secureCert)
+            : undefined,
+      ca: typeof tls === 'object' ? tls.ca : undefined,
+      requestCert: typeof tls === 'object' ? tls.requestCert : undefined,
+      ...(secureServerOptions ?? {}),
+    };
+
     // $FlowFixMe[incompatible-type] 'http' and 'https' Flow types do not match
     httpServer = https.createServer(options, serverApp);
   } else {

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-import.js

@@ -2,10 +2,6 @@
 
 var _doesNotExist = _interopRequireDefault(require("./does-not-exist"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 global.x = _doesNotExist.default;

package/src/integration_tests/basic_bundle/build-errors/inline-requires-cannot-resolve-import.js

@@ -2,10 +2,6 @@
 
 var _doesNotExist = _interopRequireDefault(require("./does-not-exist"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 global.x = _doesNotExist.default;

package/src/integration_tests/basic_bundle/import-export/index.js

@@ -30,11 +30,7 @@ var _exportPrimitiveDefault = _interopRequireWildcard(
 var _export3 = _interopRequireDefault(require("./export-3"));
 var _export4 = require("./export-4");
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 function _interopRequireWildcard(e, t) {
   if ("function" == typeof WeakMap)
@@ -44,10 +40,7 @@ function _interopRequireWildcard(e, t) {
     if (!t && e && e.__esModule) return e;
     var o,
       i,
-      f = {
-        __proto__: null,
-        default: e,
-      };
+      f = { __proto__: null, default: e };
     if (null === e || ("object" != typeof e && "function" != typeof e))
       return f;
     if ((o = t ? n : r)) {

package/src/integration_tests/execBundle.js

@@ -2,11 +2,7 @@
 
 var _vm = _interopRequireDefault(require("vm"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 module.exports = function execBundle(code, context = {}) {
   if (_vm.default.isContext(context)) {

package/src/lib/BatchProcessor.d.ts

@@ -0,0 +1,61 @@
+/**
+ * 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.
+ *
+ * @noformat
+ * @oncall react_native
+ * @generated SignedSource<<5872ab26db1c8f4499c971170c5012c4>>
+ *
+ * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
+ * Original file: packages/metro/src/lib/BatchProcessor.js
+ * To regenerate, run:
+ *   js1 build metro-ts-defs (internal) OR
+ *   yarn run build-ts-defs (OSS) 
+ */
+
+import {setTimeout} from 'timers';
+
+type ProcessBatch<TItem, TResult> = (
+  batch: Array<TItem>,
+) => Promise<Array<TResult>>;
+type BatchProcessorOptions = {
+  maximumDelayMs: number;
+  maximumItems: number;
+  concurrency: number;
+};
+type QueueItem<TItem, TResult> = {
+  item: TItem;
+  reject: (error: unknown) => unknown;
+  resolve: (result: TResult) => unknown;
+};
+/**
+ * We batch items together trying to minimize their processing, for example as
+ * network queries. For that we wait a small moment before processing a batch.
+ * We limit also the number of items we try to process in a single batch so that
+ * if we have many items pending in a short amount of time, we can start
+ * processing right away.
+ */
+declare class BatchProcessor<TItem, TResult> {
+  _currentProcessCount: number;
+  _options: BatchProcessorOptions;
+  _processBatch: ProcessBatch<TItem, TResult>;
+  _queue: Array<QueueItem<TItem, TResult>>;
+  _timeoutHandle: null | undefined | ReturnType<typeof setTimeout>;
+  constructor(
+    options: BatchProcessorOptions,
+    processBatch: ProcessBatch<TItem, TResult>,
+  );
+  _onBatchFinished(): void;
+  _onBatchResults(
+    jobs: Array<QueueItem<TItem, TResult>>,
+    results: Array<TResult>,
+  ): void;
+  _onBatchError(jobs: Array<QueueItem<TItem, TResult>>, error: unknown): void;
+  _processQueue(): void;
+  _processQueueOnceReady(): void;
+  queue(item: TItem): Promise<TResult>;
+  getQueueLength(): number;
+}
+export default BatchProcessor;

package/src/lib/BatchProcessor.js

@@ -7,11 +7,7 @@ exports.default = void 0;
 var _invariant = _interopRequireDefault(require("invariant"));
 var _timers = require("timers");
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 class BatchProcessor {
   constructor(options, processBatch) {

package/src/lib/CountingSet.d.ts

@@ -0,0 +1,55 @@
+/**
+ * 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.
+ *
+ * @noformat
+ * @oncall react_native
+ * @generated SignedSource<<0fccda5d7f0eb38539316fa1fedae97b>>
+ *
+ * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
+ * Original file: packages/metro/src/lib/CountingSet.js
+ * To regenerate, run:
+ *   js1 build metro-ts-defs (internal) OR
+ *   yarn run build-ts-defs (OSS) 
+ */
+
+export interface ReadOnlyCountingSet<T> extends Iterable<T> {
+  has(item: T): boolean;
+  readonly size: number;
+  count(item: T): number;
+  forEach<ThisT>(
+    callbackFn: (
+      this: ThisT,
+      value: T,
+      key: T,
+      set: ReadOnlyCountingSet<T>,
+    ) => unknown,
+    thisArg: ThisT,
+  ): void;
+}
+/**
+ * A Set that only deletes a given item when the number of delete(item) calls
+ * matches the number of add(item) calls. Iteration and `size` are in terms of
+ * *unique* items.
+ */
+declare class CountingSet<T> implements ReadOnlyCountingSet<T> {
+  constructor(items?: Iterable<T>);
+  has(item: T): boolean;
+  add(item: T): void;
+  delete(item: T): void;
+  keys(): Iterator<T>;
+  values(): Iterator<T>;
+  entries(): Iterator<[T, T]>;
+  [Symbol.iterator](): Iterator<T>;
+  get size(): number;
+  count(item: T): number;
+  clear(): void;
+  forEach<ThisT>(
+    callbackFn: (this: ThisT, value: T, key: T, set: CountingSet<T>) => unknown,
+    thisArg: ThisT,
+  ): void;
+  toJSON(): unknown;
+}
+export default CountingSet;

package/src/lib/JsonReporter.d.ts

@@ -0,0 +1,44 @@
+/**
+ * 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.
+ *
+ * @noformat
+ * @oncall react_native
+ * @generated SignedSource<<e7173f8dc5e076fd37b9a1cecd581f58>>
+ *
+ * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
+ * Original file: packages/metro/src/lib/JsonReporter.js
+ * To regenerate, run:
+ *   js1 build metro-ts-defs (internal) OR
+ *   yarn run build-ts-defs (OSS) 
+ */
+
+import type {Writable} from 'stream';
+
+export type SerializedError = {
+  message: string;
+  stack: string;
+  errors?: ReadonlyArray<SerializedError>;
+  cause?: SerializedError;
+};
+export type SerializedEvent<
+  TEvent extends {readonly [$$Key$$: string]: unknown},
+> = TEvent extends {error: Error}
+  ? Omit<Omit<TEvent, 'error'>, keyof {error: SerializedError}> & {
+      error: SerializedError;
+    }
+  : TEvent;
+declare class JsonReporter<
+  TEvent extends {readonly [$$Key$$: string]: unknown},
+> {
+  _stream: Writable;
+  constructor(stream: Writable);
+  /**
+   * There is a special case for errors because they have non-enumerable fields.
+   * (Perhaps we should switch in favor of plain object?)
+   */
+  update(event: TEvent): void;
+}
+export default JsonReporter;

package/src/lib/JsonReporter.js.flow

@@ -19,7 +19,7 @@ export type SerializedError = {
   ...
 };
 
-export type SerializedEvent<TEvent: {+[string]: unknown, ...}> =
+export type SerializedEvent<TEvent extends {+[string]: unknown, ...}> =
   TEvent extends {
     error: Error,
     ...
@@ -31,7 +31,7 @@ export type SerializedEvent<TEvent: {+[string]: unknown, ...}> =
       }
     : TEvent;
 
-export default class JsonReporter<TEvent: {+[string]: unknown, ...}> {
+export default class JsonReporter<TEvent extends {+[string]: unknown, ...}> {
   _stream: Writable;
 
   constructor(stream: Writable) {

package/src/lib/RamBundleParser.d.ts

@@ -0,0 +1,36 @@
+/**
+ * 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.
+ *
+ * @noformat
+ * @generated SignedSource<<ebddbde1dcdecbbee129fd96caaf3bb0>>
+ *
+ * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
+ * Original file: packages/metro/src/lib/RamBundleParser.js
+ * To regenerate, run:
+ *   js1 build metro-ts-defs (internal) OR
+ *   yarn run build-ts-defs (OSS) 
+ */
+
+/**
+ * Implementation of a RAM bundle parser in JS.
+ *
+ * It receives a Buffer as an input and implements two main methods, which are
+ * able to run in constant time no matter the size of the bundle:
+ *
+ * getStartupCode(): returns the runtime and the startup code of the bundle.
+ * getModule(): returns the code for the specified module.
+ */
+declare class RamBundleParser {
+  _buffer: Buffer;
+  _numModules: number;
+  _startupCodeLength: number;
+  _startOffset: number;
+  constructor(buffer: Buffer);
+  _readPosition(pos: number): number;
+  getStartupCode(): string;
+  getModule(id: number): string;
+}
+export default RamBundleParser;

package/src/lib/RamBundleParser.js

@@ -8,11 +8,7 @@ var _magicNumber = _interopRequireDefault(
   require("../shared/output/RamBundle/magic-number"),
 );
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 const SIZEOF_UINT32 = 4;
 const HEADER_SIZE = 3;

package/src/lib/TerminalReporter.d.ts

@@ -0,0 +1,125 @@
+/**
+ * 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.
+ *
+ * @noformat
+ * @oncall react_native
+ * @generated SignedSource<<8218e45d6b5186264c4bf9e54086708a>>
+ *
+ * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
+ * Original file: packages/metro/src/lib/TerminalReporter.js
+ * To regenerate, run:
+ *   js1 build metro-ts-defs (internal) OR
+ *   yarn run build-ts-defs (OSS) 
+ */
+
+import type {BundleDetails, ReportableEvent} from './reporting';
+import type {Terminal} from 'metro-core';
+import type {HealthCheckResult, WatcherStatus} from 'metro-file-map';
+
+type BundleProgress = {
+  bundleDetails: BundleDetails;
+  transformedFileCount: number;
+  totalFileCount: number;
+  ratio: number;
+  isPrefetch?: boolean;
+};
+export type TerminalReportableEvent =
+  | ReportableEvent
+  | {
+      buildID: string;
+      type: 'bundle_transform_progressed_throttled';
+      transformedFileCount: number;
+      totalFileCount: number;
+    }
+  | {
+      type: 'unstable_server_log';
+      level: 'info' | 'warn' | 'error';
+      data: string | Array<unknown>;
+    }
+  | {type: 'unstable_server_menu_updated'; message: string}
+  | {type: 'unstable_server_menu_cleared'};
+type BuildPhase = 'in_progress' | 'done' | 'failed';
+interface SnippetError extends Error {
+  code?: string;
+  filename?: string;
+  snippet?: string;
+}
+/**
+ * We try to print useful information to the terminal for interactive builds.
+ * This implements the `Reporter` interface from the './reporting' module.
+ */
+declare class TerminalReporter {
+  /**
+   * The bundle builds for which we are actively maintaining the status on the
+   * terminal, ie. showing a progress bar. There can be several bundles being
+   * built at the same time.
+   */
+  _activeBundles: Map<string, BundleProgress>;
+  _interactionStatus: null | undefined | string;
+  _scheduleUpdateBundleProgress: {
+    (data: {
+      buildID: string;
+      transformedFileCount: number;
+      totalFileCount: number;
+    }): void;
+    cancel(): void;
+  };
+  _prevHealthCheckResult: null | undefined | HealthCheckResult;
+  readonly terminal: Terminal;
+  constructor(terminal: Terminal);
+  /**
+   * Construct a message that represents the progress of a
+   * single bundle build, for example:
+   *
+   *     BUNDLE path/to/bundle.js ▓▓▓▓▓░░░░░░░░░░░ 36.6% (4790/7922)
+   */
+  _getBundleStatusMessage(
+    $$PARAM_0$$: BundleProgress,
+    phase: BuildPhase,
+  ): string;
+  _logBundleBuildDone(buildID: string): void;
+  _logBundleBuildFailed(buildID: string): void;
+  _logInitializing(port: number, hasReducedPerformance: boolean): void;
+  _logInitializingFailed(port: number, error: SnippetError): void;
+  /**
+   * This function is only concerned with logging and should not do state
+   * or terminal status updates.
+   */
+  _log(event: TerminalReportableEvent): void;
+  /**
+   * We do not want to log the whole stacktrace for bundling error, because
+   * these are operational errors, not programming errors, and the stacktrace
+   * is not actionable to end users.
+   */
+  _logBundlingError(error: SnippetError): void;
+  _logWorkerChunk(origin: 'stdout' | 'stderr', chunk: string): void;
+  _updateBundleProgress($$PARAM_0$$: {
+    buildID: string;
+    transformedFileCount: number;
+    totalFileCount: number;
+  }): void;
+  /**
+   * This function is exclusively concerned with updating the internal state.
+   * No logging or status updates should be done at this point.
+   */
+  _updateState(event: TerminalReportableEvent): void;
+  /**
+   * Return a status message that is always consistent with the current state
+   * of the application. Having this single function ensures we don't have
+   * different callsites overriding each other status messages.
+   */
+  _getStatusMessage(): string;
+  _logHmrClientError(e: Error): void;
+  _logWarning(message: string): void;
+  _logWatcherHealthCheckResult(result: HealthCheckResult): void;
+  _logWatcherStatus(status: WatcherStatus): void;
+  /**
+   * Single entry point for reporting events. That allows us to implement the
+   * corresponding JSON reporter easily and have a consistent reporting.
+   */
+  update(event: TerminalReportableEvent): void;
+}
+export default TerminalReporter;

package/src/lib/TerminalReporter.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true,
 });
 exports.default = void 0;
+var _bundleProgressUtils = require("./bundleProgressUtils");
 var _logToConsole = _interopRequireDefault(require("./logToConsole"));
 var reporting = _interopRequireWildcard(require("./reporting"));
 var _chalk = _interopRequireDefault(require("chalk"));
@@ -18,10 +19,7 @@ function _interopRequireWildcard(e, t) {
     if (!t && e && e.__esModule) return e;
     var o,
       i,
-      f = {
-        __proto__: null,
-        default: e,
-      };
+      f = { __proto__: null, default: e };
     if (null === e || ("object" != typeof e && "function" != typeof e))
       return f;
     if ((o = t ? n : r)) {
@@ -41,11 +39,7 @@ function _interopRequireWildcard(e, t) {
   })(e, t);
 }
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 const DARK_BLOCK_CHAR = "\u2593";
 const LIGHT_BLOCK_CHAR = "\u2591";
@@ -85,7 +79,7 @@ class TerminalReporter {
           _chalk.default.bgWhite.white(
             LIGHT_BLOCK_CHAR.repeat(MAX_PROGRESS_BAR_CHAR_WIDTH - filledBar),
           ) +
-          _chalk.default.bold(` ${(100 * ratio).toFixed(1)}% `) +
+          _chalk.default.bold(` ${Math.floor(100 * ratio)}% `) +
           _chalk.default.dim(`(${transformedFileCount}/${totalFileCount})`)
         : "";
     return (
@@ -294,12 +288,10 @@ class TerminalReporter {
     if (currentProgress == null) {
       return;
     }
-    const ratio = Math.min(
-      Math.max(
-        Math.pow(transformedFileCount / Math.max(totalFileCount, 10), 2),
-        currentProgress.ratio,
-      ),
-      0.999,
+    const ratio = (0, _bundleProgressUtils.calculateBundleProgressRatio)(
+      transformedFileCount,
+      totalFileCount,
+      currentProgress.ratio,
     );
     Object.assign(currentProgress, {
       ratio,