metro 0.83.2 → 0.83.4

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

@@ -2,7 +2,11 @@
 
 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/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.js

@@ -5,8 +5,13 @@ 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 };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 class BatchProcessor {
   constructor(options, processBatch) {
@@ -50,12 +55,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();

package/src/lib/CountingSet.js.flow

@@ -11,7 +11,6 @@
 
 export interface ReadOnlyCountingSet<T> extends Iterable<T> {
   has(item: T): boolean;
-  @@iterator(): Iterator<T>;
   +size: number;
   count(item: T): number;
   forEach<ThisT>(
@@ -20,7 +19,7 @@ export interface ReadOnlyCountingSet<T> extends Iterable<T> {
       value: T,
       key: T,
       set: ReadOnlyCountingSet<T>,
-    ) => mixed,
+    ) => unknown,
 
     // NOTE: Should be optional, but Flow seems happy to infer undefined here
     // which is what we want.
@@ -88,6 +87,7 @@ export default class CountingSet<T> implements ReadOnlyCountingSet<T> {
 
   /*::
   // For Flow's benefit
+  // $FlowFixMe[duplicate-class-member]
   @@iterator(): Iterator<T> {
     return this.values();
   }
@@ -108,7 +108,7 @@ export default class CountingSet<T> implements ReadOnlyCountingSet<T> {
   }
 
   forEach<ThisT>(
-    callbackFn: (this: ThisT, value: T, key: T, set: CountingSet<T>) => mixed,
+    callbackFn: (this: ThisT, value: T, key: T, set: CountingSet<T>) => unknown,
     thisArg: ThisT,
   ): void {
     for (const item of this) {
@@ -121,7 +121,7 @@ export default class CountingSet<T> implements ReadOnlyCountingSet<T> {
   // extend to custom collection classes. Instead let's assume values are
   // sortable ( = strings) and make this look like an array with some stable
   // order.
-  toJSON(): mixed {
+  toJSON(): unknown {
     return [...this].sort();
   }
 }

package/src/lib/JsonReporter.js

@@ -9,15 +9,17 @@ class JsonReporter {
     this._stream = stream;
   }
   update(event) {
+    let eventToWrite = event;
     if (event.error instanceof Error) {
       const { message, stack } = event.error;
-      event = Object.assign(event, {
+      eventToWrite = {
+        ...eventToWrite,
         error: serializeError(event.error),
         message,
         stack,
-      });
+      };
     }
-    this._stream.write(JSON.stringify(event) + "\n");
+    this._stream.write(JSON.stringify(eventToWrite) + "\n");
   }
 }
 exports.default = JsonReporter;

package/src/lib/JsonReporter.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
  */
@@ -14,23 +14,24 @@ import type {Writable} from 'stream';
 export type SerializedError = {
   message: string,
   stack: string,
-  errors?: $ReadOnlyArray<SerializedError>,
+  errors?: ReadonlyArray<SerializedError>,
   cause?: SerializedError,
   ...
 };
 
-export type SerializedEvent<TEvent: {[string]: any, ...}> = TEvent extends {
-  error: Error,
-  ...
-}
-  ? {
-      ...Omit<TEvent, 'error'>,
-      error: SerializedError,
-      ...
-    }
-  : TEvent;
+export type SerializedEvent<TEvent: {+[string]: unknown, ...}> =
+  TEvent extends {
+    error: Error,
+    ...
+  }
+    ? {
+        ...Omit<TEvent, 'error'>,
+        error: SerializedError,
+        ...
+      }
+    : TEvent;
 
-export default class JsonReporter<TEvent: {[string]: any, ...}> {
+export default class JsonReporter<TEvent: {+[string]: unknown, ...}> {
   _stream: Writable;
 
   constructor(stream: Writable) {
@@ -42,19 +43,20 @@ export default class JsonReporter<TEvent: {[string]: any, ...}> {
    * (Perhaps we should switch in favor of plain object?)
    */
   update(event: TEvent): void {
+    let eventToWrite = event;
     if (event.error instanceof Error) {
       const {message, stack} = event.error;
-      // $FlowFixMe[unsafe-object-assign]
-      event = Object.assign(event, {
+      eventToWrite = {
+        ...eventToWrite,
         error: serializeError(event.error),
         // TODO: Preexisting issue - this writes message, stack, etc. as
         // top-level siblings of event.error (which was serialized to {}), whereas it was presumably
         // intended to nest them _under_ error. Fix this in a breaking change.
         message,
         stack,
-      });
+      };
     }
-    this._stream.write(JSON.stringify(event) + '\n');
+    this._stream.write(JSON.stringify(eventToWrite) + '\n');
   }
 }
 

package/src/lib/RamBundleParser.js

@@ -8,7 +8,11 @@ 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/RamBundleParser.js.flow

@@ -4,8 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
  * @flow strict
+ * @format
  */
 
 import MAGIC_NUMBER from '../shared/output/RamBundle/magic-number';

package/src/lib/TerminalReporter.js

@@ -10,31 +10,42 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _lodash = _interopRequireDefault(require("lodash.throttle"));
 var _metroCore = require("metro-core");
 var _path = _interopRequireDefault(require("path"));
-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);
 }
 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";
@@ -60,9 +71,6 @@ class TerminalReporter {
     },
     phase,
   ) {
-    if (isPrefetch) {
-      bundleType = "PREBUNDLE";
-    }
     const localPath = _path.default.relative(".", entryFile);
     const filledBar = Math.floor(ratio * MAX_PROGRESS_BAR_CHAR_WIDTH);
     const bundleTypeColor =
@@ -81,7 +89,9 @@ class TerminalReporter {
           _chalk.default.dim(`(${transformedFileCount}/${totalFileCount})`)
         : "";
     return (
-      bundleTypeColor.inverse.bold(` ${bundleType.toUpperCase()} `) +
+      bundleTypeColor.inverse.bold(
+        ` ${isPrefetch === true ? "PREBUNDLE" : bundleType.toUpperCase()} `,
+      ) +
       _chalk.default.reset.dim(` ${_path.default.dirname(localPath)}/`) +
       _chalk.default.bold(_path.default.basename(localPath)) +
       " " +
@@ -261,8 +271,9 @@ class TerminalReporter {
         message = error.stack;
       }
     }
-    if (error.filename && !message.includes(error.filename)) {
-      message += ` [${error.filename}]`;
+    const filename = error.filename;
+    if (filename?.length && !message.includes(filename)) {
+      message += ` [${filename}]`;
     }
     if (error.snippet != null) {
       message += "\n" + error.snippet;

package/src/lib/TerminalReporter.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
  */
@@ -16,6 +16,7 @@ import type {HealthCheckResult, WatcherStatus} from 'metro-file-map';
 import logToConsole from './logToConsole';
 import * as reporting from './reporting';
 import chalk from 'chalk';
+// $FlowFixMe[untyped-import] lodash.throttle
 import throttle from 'lodash.throttle';
 import {AmbiguousModuleResolutionError} from 'metro-core';
 import path from 'path';
@@ -41,7 +42,7 @@ export type TerminalReportableEvent =
   | {
       type: 'unstable_server_log',
       level: 'info' | 'warn' | 'error',
-      data: string | Array<mixed>,
+      data: string | Array<unknown>,
       ...
     }
   | {
@@ -56,11 +57,11 @@ export type TerminalReportableEvent =
 
 type BuildPhase = 'in_progress' | 'done' | 'failed';
 
-type SnippetError = ErrnoError &
-  interface {
-    filename?: string,
-    snippet?: string,
-  };
+interface SnippetError extends Error {
+  code?: string;
+  filename?: string;
+  snippet?: string;
+}
 
 const DARK_BLOCK_CHAR = '\u2593';
 const LIGHT_BLOCK_CHAR = '\u2591';
@@ -117,10 +118,6 @@ export default class TerminalReporter {
     }: BundleProgress,
     phase: BuildPhase,
   ): string {
-    if (isPrefetch) {
-      bundleType = 'PREBUNDLE';
-    }
-
     const localPath = path.relative('.', entryFile);
     const filledBar = Math.floor(ratio * MAX_PROGRESS_BAR_CHAR_WIDTH);
     const bundleTypeColor =
@@ -140,7 +137,9 @@ export default class TerminalReporter {
         : '';
 
     return (
-      bundleTypeColor.inverse.bold(` ${bundleType.toUpperCase()} `) +
+      bundleTypeColor.inverse.bold(
+        ` ${isPrefetch === true ? 'PREBUNDLE' : bundleType.toUpperCase()} `,
+      ) +
       chalk.reset.dim(` ${path.dirname(localPath)}/`) +
       chalk.bold(path.basename(localPath)) +
       ' ' +
@@ -273,6 +272,7 @@ export default class TerminalReporter {
       case 'dep_graph_loading':
         const color = event.hasReducedPerformance ? chalk.red : chalk.blue;
         // eslint-disable-next-line import/no-commonjs
+        // $FlowFixMe[untyped-import] package.json
         const version = 'v' + require('../../package.json').version;
         this.terminal.log(
           color.bold(
@@ -331,9 +331,9 @@ export default class TerminalReporter {
       }
     }
 
-    if (error.filename && !message.includes(error.filename)) {
-      // $FlowFixMe[incompatible-type]
-      message += ` [${error.filename}]`;
+    const filename = error.filename;
+    if (filename?.length && !message.includes(filename)) {
+      message += ` [${filename}]`;
     }
 
     if (error.snippet != null) {

package/src/lib/contextModule.js

@@ -9,7 +9,11 @@ var _crypto = _interopRequireDefault(require("crypto"));
 var _nullthrows = _interopRequireDefault(require("nullthrows"));
 var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 function toHash(value) {
   return _crypto.default.createHash("sha1").update(value).digest("hex");

package/src/lib/contextModule.js.flow

@@ -18,7 +18,7 @@ import crypto from 'crypto';
 import nullthrows from 'nullthrows';
 import path from 'path';
 
-export type RequireContext = $ReadOnly<{
+export type RequireContext = Readonly<{
   /* Should search for files recursively. Optional, default `true` when `require.context` is used */
   recursive: boolean,
   /* Filename filter pattern for use in `require.context`. Optional, default `.*` (any file) when `require.context` is used */