metro 0.83.3 → 0.83.5

package/src/index.flow.js.flow

@@ -4,7 +4,7 @@
  * 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
  */
@@ -15,7 +15,10 @@ import type {ServerOptions} from './Server';
 import type {BuildOptions, OutputOptions, RequestOptions} from './shared/types';
 import type {HandleFunction} from 'connect';
 import type {Server as HttpServer} from 'http';
-import type {Server as HttpsServer} from 'https';
+import type {
+  Server as HttpsServer,
+  ServerOptions as HttpsServerOptions,
+} from 'https';
 import type {TransformProfile} from 'metro-babel-transformer';
 import type {
   ConfigT,
@@ -25,6 +28,7 @@ import type {
 } from 'metro-config';
 import type {CustomResolverOptions} from 'metro-resolver';
 import type {CustomTransformOptions} from 'metro-transform-worker';
+import type {Server as WebSocketServer} from 'ws';
 import typeof Yargs from 'yargs';
 
 import makeBuildCommand from './commands/build';
@@ -65,21 +69,21 @@ export type RunMetroOptions = {
   waitForBundler?: boolean,
 };
 
-export type RunServerOptions = $ReadOnly<{
+export type RunServerOptions = Readonly<{
   hasReducedPerformance?: boolean,
   host?: string,
   onError?: (Error & {code?: string}) => void,
   onReady?: (server: HttpServer | HttpsServer) => void,
   onClose?: () => void,
-  secureServerOptions?: Object,
+  secureServerOptions?: HttpsServerOptions,
   secure?: boolean, // deprecated
   secureCert?: string, // deprecated
   secureKey?: string, // deprecated
-  unstable_extraMiddleware?: $ReadOnlyArray<HandleFunction>,
+  unstable_extraMiddleware?: ReadonlyArray<HandleFunction>,
   waitForBundler?: boolean,
   watch?: boolean,
-  websocketEndpoints?: $ReadOnly<{
-    [path: string]: ws$WebSocketServer,
+  websocketEndpoints?: Readonly<{
+    [path: string]: WebSocketServer,
   }>,
 }>;
 
@@ -88,7 +92,7 @@ export type RunServerResult = {
 };
 
 type BuildGraphOptions = {
-  entries: $ReadOnlyArray<string>,
+  entries: ReadonlyArray<string>,
   customTransformOptions?: CustomTransformOptions,
   dev?: boolean,
   minify?: boolean,
@@ -108,7 +112,7 @@ export type RunBuildOptions = {
   onComplete?: () => void,
   onProgress?: (transformedFileCount: number, totalFileCount: number) => void,
   minify?: boolean,
-  output?: $ReadOnly<{
+  output?: Readonly<{
     build: (
       MetroServer,
       RequestOptions,
@@ -116,7 +120,7 @@ export type RunBuildOptions = {
     ) => Promise<{
       code: string,
       map: string,
-      assets?: $ReadOnlyArray<AssetData>,
+      assets?: ReadonlyArray<AssetData>,
       ...
     }>,
     save: (
@@ -127,7 +131,7 @@ export type RunBuildOptions = {
       },
       OutputOptions,
       (logMessage: string) => void,
-    ) => Promise<mixed>,
+    ) => Promise<unknown>,
     ...
   }>,
   platform?: string,
@@ -141,12 +145,13 @@ export type RunBuildOptions = {
 export type RunBuildResult = {
   code: string,
   map: string,
-  assets?: $ReadOnlyArray<AssetData>,
+  assets?: ReadonlyArray<AssetData>,
   ...
 };
 
-type BuildCommandOptions = {} | null;
-type ServeCommandOptions = {} | null;
+type BuildCommandOptions = Readonly<{[string]: unknown}> | null;
+type ServeCommandOptions = Readonly<{[string]: unknown}> | null;
+type DependenciesCommandOptions = Readonly<{[string]: unknown}> | null;
 
 export {Terminal, JsonReporter, TerminalReporter};
 
@@ -263,7 +268,7 @@ export const runServer = async (
     secureKey, // deprecated
     unstable_extraMiddleware,
     waitForBundler = false,
-    websocketEndpoints = {},
+    websocketEndpoints: userWebsocketEndpoints = {},
     watch,
   }: RunServerOptions = {},
 ): Promise<RunServerResult> => {
@@ -275,7 +280,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
@@ -302,15 +307,30 @@ export const runServer = async (
 
   let httpServer;
 
-  if (secure || 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 {
@@ -333,8 +353,8 @@ export const runServer = async (
         family,
       });
 
-      websocketEndpoints = {
-        ...websocketEndpoints,
+      const websocketEndpoints = {
+        ...userWebsocketEndpoints,
         '/hot': createWebsocketServer({
           websocketServer: new MetroHmrServer(
             metroServer.getBundler(),
@@ -441,7 +461,7 @@ export const runBuild = async (
       onComplete();
     }
 
-    if (out || bundleOut) {
+    if (out != null || bundleOut != null) {
       const bundleOutput =
         bundleOut ?? nullthrows(out).replace(/(\.js)?$/, '.js');
 
@@ -510,7 +530,7 @@ export const buildGraph = async function (
 type AttachMetroCLIOptions = {
   build?: BuildCommandOptions,
   serve?: ServeCommandOptions,
-  dependencies?: any,
+  dependencies?: DependenciesCommandOptions,
   ...
 };
 

package/src/integration_tests/basic_bundle/AssetRegistry.js.flow

@@ -11,7 +11,7 @@
 'use strict';
 
 module.exports = {
-  registerAsset(data: mixed): mixed {
+  registerAsset(data: unknown): unknown {
     return data;
   },
 };

package/src/integration_tests/basic_bundle/ErrorBundle.js.flow

@@ -20,4 +20,4 @@ const calcSum = (value: string) => {
   return error;
 };
 
-module.exports = (calcSum('anything'): Error);
+module.exports = calcSum('anything') as Error;

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

@@ -14,4 +14,4 @@ import type DoesNotExistT from './does-not-exist';
 // $FlowExpectedError[cannot-resolve-module]
 import DoesNotExist from './does-not-exist';
 
-global.x = (DoesNotExist: DoesNotExistT);
+global.x = DoesNotExist as DoesNotExistT;

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-multi-line-import-with-escapes.js.flow

@@ -26,4 +26,4 @@ import {
   // $FlowExpectedError[cannot-resolve-module]
 } from './does-not\'"-exist';
 
-global.x = (aaaaaaaaaa: DoesNotExistT);
+global.x = aaaaaaaaaa as DoesNotExistT;

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

@@ -26,4 +26,4 @@ import {
   // $FlowExpectedError[cannot-resolve-module]
 } from './does-not-exist';
 
-global.x = (aaaaaaaaaa: DoesNotExistT);
+global.x = aaaaaaaaaa as DoesNotExistT;

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-require-with-embedded-comment.js.flow

@@ -14,4 +14,4 @@ import type DoesNotExistT from './foo';
 // $FlowExpectedError[cannot-resolve-module]
 const DoesNotExist = require('./foo' /* ./foo */);
 
-global.x = (DoesNotExist: DoesNotExistT);
+global.x = DoesNotExist as DoesNotExistT;

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

@@ -14,4 +14,4 @@ import type DoesNotExistT from './does-not-exist';
 // $FlowExpectedError[cannot-resolve-module]
 const DoesNotExist = require('./does-not-exist');
 
-global.x = (DoesNotExist: DoesNotExistT);
+global.x = DoesNotExist as DoesNotExistT;

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-specifier-with-escapes.js.flow

@@ -16,4 +16,4 @@ import type DoesNotExistT from './does-not\'"-exist';
 // $FlowExpectedError[cannot-resolve-module]
 import {DoesNotExist} from './does-not\'"-exist';
 
-global.x = (DoesNotExist: DoesNotExistT);
+global.x = DoesNotExist as DoesNotExistT;

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

@@ -14,4 +14,4 @@ import type DoesNotExistT from './does-not-exist';
 // $FlowExpectedError[cannot-resolve-module]
 import DoesNotExist from './does-not-exist';
 
-global.x = (DoesNotExist: DoesNotExistT);
+global.x = DoesNotExist as DoesNotExistT;

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

@@ -14,4 +14,4 @@ import type DoesNotExistT from './does-not-exist';
 // $FlowExpectedError[cannot-resolve-module]
 const DoesNotExist = require('./does-not-exist');
 
-global.x = (DoesNotExist: DoesNotExistT);
+global.x = DoesNotExist as DoesNotExistT;

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

@@ -32,28 +32,32 @@ var _export4 = require("./export-4");
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : { default: e };
 }
-function _getRequireWildcardCache(e) {
-  if ("function" != typeof WeakMap) return null;
-  var r = new WeakMap(),
-    t = new WeakMap();
-  return (_getRequireWildcardCache = function (e) {
-    return e ? t : r;
-  })(e);
-}
-function _interopRequireWildcard(e, r) {
-  if (!r && e && e.__esModule) return e;
-  if (null === e || ("object" != typeof e && "function" != typeof e))
-    return { default: e };
-  var t = _getRequireWildcardCache(r);
-  if (t && t.has(e)) return t.get(e);
-  var n = { __proto__: null },
-    a = Object.defineProperty && Object.getOwnPropertyDescriptor;
-  for (var u in e)
-    if ("default" !== u && {}.hasOwnProperty.call(e, u)) {
-      var i = a ? Object.getOwnPropertyDescriptor(e, u) : null;
-      i && (i.get || i.set) ? Object.defineProperty(n, u, i) : (n[u] = e[u]);
+function _interopRequireWildcard(e, t) {
+  if ("function" == typeof WeakMap)
+    var r = new WeakMap(),
+      n = new WeakMap();
+  return (_interopRequireWildcard = function (e, t) {
+    if (!t && e && e.__esModule) return e;
+    var o,
+      i,
+      f = { __proto__: null, default: e };
+    if (null === e || ("object" != typeof e && "function" != typeof e))
+      return f;
+    if ((o = t ? n : r)) {
+      if (o.has(e)) return o.get(e);
+      o.set(e, f);
     }
-  return ((n.default = e), t && t.set(e, n), n);
+    for (const t in e)
+      "default" !== t &&
+        {}.hasOwnProperty.call(e, t) &&
+        ((i =
+          (o = Object.defineProperty) &&
+          Object.getOwnPropertyDescriptor(e, t)) &&
+        (i.get || i.set)
+          ? o(f, t, i)
+          : (f[t] = e[t]));
+    return f;
+  })(e, t);
 }
 const extraData = (exports.extraData = {
   foo: _exportNull.foo,

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

@@ -29,7 +29,7 @@ export const extraData = {
   importStar,
   myDefault,
   myFoo,
-  myFunction: (myFunction(): string),
+  myFunction: myFunction() as string,
   primitiveDefault,
   primitiveFoo,
 };
@@ -37,7 +37,7 @@ export const extraData = {
 export const asyncImportCJS = import('./export-5');
 export const asyncImportESM = import('./export-6');
 
-export const asyncImportMaybeSyncCJS: mixed =
+export const asyncImportMaybeSyncCJS: unknown =
   require.unstable_importMaybeSync('./export-7');
-export const asyncImportMaybeSyncESM: mixed =
+export const asyncImportMaybeSyncESM: unknown =
   require.unstable_importMaybeSync('./export-8');

package/src/integration_tests/basic_bundle/import-export/utils.js.flow

@@ -9,6 +9,6 @@
  */
 
 export type RequireWithUnstableImportMaybeSync = {
-  (id: string | number): mixed,
-  unstable_importMaybeSync: (id: string) => mixed,
+  (id: string | number): unknown,
+  unstable_importMaybeSync: (id: string) => unknown,
 };

package/src/integration_tests/basic_bundle/loadBundleAsyncForTest.js.flow

@@ -11,7 +11,7 @@
 'use strict';
 
 declare var __METRO_GLOBAL_PREFIX__: string;
-declare var __DOWNLOAD_AND_EXEC_FOR_TESTS__: (path: string) => Promise<mixed>;
+declare var __DOWNLOAD_AND_EXEC_FOR_TESTS__: (path: string) => Promise<unknown>;
 
 const key = `${global.__METRO_GLOBAL_PREFIX__ ?? ''}__loadBundleAsync`;
 

package/src/integration_tests/basic_bundle/optional-dependencies/index.js.flow

@@ -10,7 +10,7 @@
 
 'use strict';
 
-let shouldBeB: mixed, shouldBeC: mixed;
+let shouldBeB: unknown, shouldBeC: unknown;
 try {
   // $FlowExpectedError[cannot-resolve-module]
   shouldBeB = require('./not-exists');

package/src/integration_tests/basic_bundle/require-context/conflict.js.flow

@@ -24,4 +24,4 @@ function main() {
   };
 }
 
-module.exports = (main(): mixed);
+module.exports = main() as unknown;

package/src/integration_tests/basic_bundle/require-context/empty.js.flow

@@ -23,4 +23,4 @@ function main() {
   return null;
 }
 
-module.exports = (main(): mixed);
+module.exports = main() as unknown;

package/src/integration_tests/basic_bundle/require-context/matching.js.flow

@@ -24,4 +24,4 @@ function main() {
   };
 }
 
-module.exports = (main(): mixed);
+module.exports = main() as unknown;

package/src/integration_tests/basic_bundle/require-context/mode-eager.js.flow

@@ -22,4 +22,4 @@ function main() {
   );
 }
 
-module.exports = (main(): mixed);
+module.exports = main() as unknown;

package/src/integration_tests/basic_bundle/require-context/mode-lazy-once.js.flow

@@ -22,4 +22,4 @@ function main() {
   );
 }
 
-module.exports = (main(): mixed);
+module.exports = main() as unknown;

package/src/integration_tests/basic_bundle/require-context/mode-lazy.js.flow

@@ -22,4 +22,4 @@ function main() {
   );
 }
 
-module.exports = (main(): mixed);
+module.exports = main() as unknown;

package/src/integration_tests/basic_bundle/require-context/mode-sync.js.flow

@@ -14,11 +14,11 @@ import {copyContextToObject} from './utils';
 
 declare var require: RequireWithContext;
 
-function main(): mixed {
+function main(): unknown {
   return copyContextToObject(
     // $FlowFixMe[underconstrained-implicit-instantiation]
     require.context('./subdir', undefined, undefined, 'sync'),
   );
 }
 
-module.exports = (main(): mixed);
+module.exports = main() as unknown;

package/src/integration_tests/basic_bundle/require-context/utils.js.flow

@@ -33,7 +33,7 @@ export function copyContextToObject<T>(ctx: ContextModule<T>): {
 }
 
 export function awaitProperties<T>(
-  obj: $ReadOnly<{[key: string]: Promise<T>}>,
+  obj: Readonly<{[key: string]: Promise<T>}>,
 ): Promise<{[key: string]: T}> {
   const result: {[string]: T} = {};
   return Promise.all(

package/src/integration_tests/basic_bundle/require-resolveWeak/import-and-resolveWeak.js.flow

@@ -30,4 +30,4 @@ async function main() {
   };
 }
 
-module.exports = (main(): mixed);
+module.exports = main() as unknown;

package/src/integration_tests/basic_bundle/require-resolveWeak/multiple.js.flow

@@ -20,4 +20,4 @@ async function main() {
   };
 }
 
-module.exports = (main(): mixed);
+module.exports = main() as unknown;

package/src/integration_tests/basic_bundle/require-resolveWeak/never-required.js.flow

@@ -18,4 +18,4 @@ function main() {
   };
 }
 
-module.exports = (main(): mixed);
+module.exports = main() as unknown;

package/src/integration_tests/basic_bundle/require-resolveWeak/require-and-resolveWeak.js.flow

@@ -30,4 +30,4 @@ function main() {
   };
 }
 
-module.exports = (main(): mixed);
+module.exports = main() as unknown;

package/src/integration_tests/execBundle.js.flow

@@ -11,7 +11,7 @@
 
 import vm from 'vm';
 
-module.exports = function execBundle(code: string, context: any = {}): mixed {
+module.exports = function execBundle(code: string, context: any = {}): unknown {
   if (vm.isContext(context)) {
     return vm.runInContext(code, context);
   }

package/src/lib/BatchProcessor.d.ts

@@ -0,0 +1,54 @@
+/**
+ * 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
+ */
+
+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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _invariant = _interopRequireDefault(require("invariant"));
+var _timers = require("timers");
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : { default: e };
 }
@@ -50,12 +51,14 @@ class BatchProcessor {
   }
   _processQueueOnceReady() {
     if (this._queue.length >= this._options.maximumItems) {
-      clearTimeout(this._timeoutHandle);
+      if (this._timeoutHandle != null) {
+        (0, _timers.clearTimeout)(this._timeoutHandle);
+      }
       process.nextTick(() => this._processQueue());
       return;
     }
     if (this._timeoutHandle == null) {
-      this._timeoutHandle = setTimeout(
+      this._timeoutHandle = (0, _timers.setTimeout)(
         () => this._processQueue(),
         this._options.maximumDelayMs,
       );

package/src/lib/BatchProcessor.js.flow

@@ -10,6 +10,7 @@
  */
 
 import invariant from 'invariant';
+import {clearTimeout, setTimeout} from 'timers';
 
 type ProcessBatch<TItem, TResult> = (
   batch: Array<TItem>,
@@ -24,8 +25,8 @@ type BatchProcessorOptions = {
 
 type QueueItem<TItem, TResult> = {
   item: TItem,
-  reject: (error: mixed) => mixed,
-  resolve: (result: TResult) => mixed,
+  reject: (error: unknown) => unknown,
+  resolve: (result: TResult) => unknown,
   ...
 };
 
@@ -41,7 +42,7 @@ export default class BatchProcessor<TItem, TResult> {
   _options: BatchProcessorOptions;
   _processBatch: ProcessBatch<TItem, TResult>;
   _queue: Array<QueueItem<TItem, TResult>>;
-  _timeoutHandle: ?TimeoutID;
+  _timeoutHandle: ?ReturnType<typeof setTimeout>;
 
   constructor(
     options: BatchProcessorOptions,
@@ -70,7 +71,7 @@ export default class BatchProcessor<TItem, TResult> {
     this._onBatchFinished();
   }
 
-  _onBatchError(jobs: Array<QueueItem<TItem, TResult>>, error: mixed): void {
+  _onBatchError(jobs: Array<QueueItem<TItem, TResult>>, error: unknown): void {
     for (let i = 0; i < jobs.length; ++i) {
       jobs[i].reject(error);
     }
@@ -94,7 +95,9 @@ export default class BatchProcessor<TItem, TResult> {
 
   _processQueueOnceReady(): void {
     if (this._queue.length >= this._options.maximumItems) {
-      clearTimeout(this._timeoutHandle);
+      if (this._timeoutHandle != null) {
+        clearTimeout(this._timeoutHandle);
+      }
       process.nextTick(() => this._processQueue());
       return;
     }
@@ -109,8 +112,8 @@ export default class BatchProcessor<TItem, TResult> {
   queue(item: TItem): Promise<TResult> {
     return new Promise(
       (
-        resolve: (result: TResult) => mixed,
-        reject: (error: mixed) => mixed,
+        resolve: (result: TResult) => unknown,
+        reject: (error: unknown) => unknown,
       ) => {
         this._queue.push({item, resolve, reject});
         this._processQueueOnceReady();