metro 0.83.2 → 0.83.4

package/src/IncrementalBundler.js

@@ -19,31 +19,42 @@ var transformHelpers = _interopRequireWildcard(
 var _crypto = _interopRequireDefault(require("crypto"));
 var _fs = _interopRequireDefault(require("fs"));
 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,
+      };
 }
 function createRevisionId() {
   return _crypto.default.randomBytes(8).toString("hex");
@@ -108,6 +119,8 @@ class IncrementalBundler {
         this._config.transformer.unstable_allowRequireContext,
       unstable_enablePackageExports:
         this._config.resolver.unstable_enablePackageExports,
+      unstable_incrementalResolution:
+        this._config.resolver.unstable_incrementalResolution,
       shallow: otherOptions.shallow,
     });
     this._config.serializer.experimentalSerializerHook(graph, {
@@ -152,6 +165,8 @@ class IncrementalBundler {
           this._config.transformer.unstable_allowRequireContext,
         unstable_enablePackageExports:
           this._config.resolver.unstable_enablePackageExports,
+        unstable_incrementalResolution:
+          this._config.resolver.unstable_incrementalResolution,
         shallow: otherOptions.shallow,
       },
     );

package/src/IncrementalBundler.js.flow

@@ -33,7 +33,7 @@ export opaque type RevisionId: string = string;
 
 export type OutputGraph = Graph<>;
 
-type OtherOptions = $ReadOnly<{
+type OtherOptions = Readonly<{
   onProgress: DeltaBundlerOptions<>['onProgress'],
   shallow: boolean,
   lazy: boolean,
@@ -45,10 +45,10 @@ export type GraphRevision = {
   +date: Date,
   +graphId: GraphId,
   +graph: OutputGraph,
-  +prepend: $ReadOnlyArray<Module<>>,
+  +prepend: ReadonlyArray<Module<>>,
 };
 
-export type IncrementalBundlerOptions = $ReadOnly<{
+export type IncrementalBundlerOptions = Readonly<{
   hasReducedPerformance?: boolean,
   watch?: boolean,
 }>;
@@ -99,7 +99,7 @@ export default class IncrementalBundler {
   }
 
   async buildGraphForEntries(
-    entryFiles: $ReadOnlyArray<string>,
+    entryFiles: ReadonlyArray<string>,
     transformOptions: TransformInputOptions,
     resolverOptions: ResolverInputOptions,
     otherOptions?: OtherOptions = {
@@ -131,6 +131,8 @@ export default class IncrementalBundler {
         this._config.transformer.unstable_allowRequireContext,
       unstable_enablePackageExports:
         this._config.resolver.unstable_enablePackageExports,
+      unstable_incrementalResolution:
+        this._config.resolver.unstable_incrementalResolution,
       shallow: otherOptions.shallow,
     });
 
@@ -145,7 +147,7 @@ export default class IncrementalBundler {
   }
 
   async getDependencies(
-    entryFiles: $ReadOnlyArray<string>,
+    entryFiles: ReadonlyArray<string>,
     transformOptions: TransformInputOptions,
     resolverOptions: ResolverInputOptions,
     otherOptions?: OtherOptions = {
@@ -179,6 +181,8 @@ export default class IncrementalBundler {
           this._config.transformer.unstable_allowRequireContext,
         unstable_enablePackageExports:
           this._config.resolver.unstable_enablePackageExports,
+        unstable_incrementalResolution:
+          this._config.resolver.unstable_incrementalResolution,
         shallow: otherOptions.shallow,
       },
     );
@@ -195,7 +199,7 @@ export default class IncrementalBundler {
       shallow: false,
       lazy: false,
     },
-  ): Promise<{+graph: OutputGraph, +prepend: $ReadOnlyArray<Module<>>}> {
+  ): Promise<{+graph: OutputGraph, +prepend: ReadonlyArray<Module<>>}> {
     const graph = await this.buildGraphForEntries(
       [entryFile],
       transformOptions,
@@ -330,8 +334,8 @@ export default class IncrementalBundler {
   }
 
   async _getAbsoluteEntryFiles(
-    entryFiles: $ReadOnlyArray<string>,
-  ): Promise<$ReadOnlyArray<string>> {
+    entryFiles: ReadonlyArray<string>,
+  ): Promise<ReadonlyArray<string>> {
     const absoluteEntryFiles = entryFiles.map((entryFile: string) =>
       path.resolve(
         this._config.server.unstable_serverRoot ?? this._config.projectRoot,
@@ -342,7 +346,7 @@ export default class IncrementalBundler {
     await Promise.all(
       absoluteEntryFiles.map(
         (entryFile: string) =>
-          new Promise((resolve: void => void, reject: mixed => mixed) => {
+          new Promise((resolve: void => void, reject: unknown => unknown) => {
             // This should throw an error if the file doesn't exist.
             // Using this instead of fs.exists to account for SimLinks.
             fs.realpath(entryFile, err => {

package/src/ModuleGraph/worker/JsFileWrapping.js

@@ -12,31 +12,42 @@ var _template = _interopRequireDefault(require("@babel/template"));
 var _traverse = _interopRequireDefault(require("@babel/traverse"));
 var t = _interopRequireWildcard(require("@babel/types"));
 var _invariant = _interopRequireDefault(require("invariant"));
-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 WRAP_NAME = (exports.WRAP_NAME = "$$_REQUIRE");
 const IIFE_PARAM = _template.default.expression(

package/src/ModuleGraph/worker/JsFileWrapping.js.flow

@@ -4,11 +4,16 @@
  * 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-local
+ * @format
  */
 
-import type {FunctionExpression, Identifier, Program} from '@babel/types';
+import type {
+  File as BabelNodeFile,
+  FunctionExpression,
+  Identifier,
+  Program,
+} from '@babel/types';
 
 import template from '@babel/template';
 import traverse from '@babel/traverse';
@@ -33,7 +38,7 @@ function wrapModule(
   skipRequireRename: boolean,
   {
     unstable_useStaticHermesModuleFactory = false,
-  }: $ReadOnly<{unstable_useStaticHermesModuleFactory?: boolean}> = {},
+  }: Readonly<{unstable_useStaticHermesModuleFactory?: boolean}> = {},
 ): {
   ast: BabelNodeFile,
   requireName: string,
@@ -106,7 +111,7 @@ function wrapJson(
 
 function functionFromProgram(
   program: Program,
-  parameters: $ReadOnlyArray<string>,
+  parameters: ReadonlyArray<string>,
 ): FunctionExpression {
   return t.functionExpression(
     undefined,
@@ -123,7 +128,7 @@ function buildParameters(
   importDefaultName: string,
   importAllName: string,
   dependencyMapName: string,
-): $ReadOnlyArray<string> {
+): ReadonlyArray<string> {
   return [
     'global',
     'require',

package/src/ModuleGraph/worker/collectDependencies.js

@@ -12,31 +12,42 @@ var types = _types;
 var _crypto = _interopRequireDefault(require("crypto"));
 var _invariant = _interopRequireDefault(require("invariant"));
 var _nullthrows = _interopRequireDefault(require("nullthrows"));
-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,
+      };
 }
 function collectDependencies(ast, options) {
   const visited = new WeakSet();

package/src/ModuleGraph/worker/collectDependencies.js.flow

@@ -4,12 +4,18 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
  * @flow
+ * @format
  */
 
+import type {ReadonlySourceLocation} from '../../shared/types';
 import type {NodePath} from '@babel/traverse';
-import type {CallExpression, Identifier, StringLiteral} from '@babel/types';
+import type {
+  CallExpression,
+  File as BabelNodeFile,
+  Identifier,
+  StringLiteral,
+} from '@babel/types';
 import type {
   AllowOptionalDependencies,
   AsyncDependencyType,
@@ -24,12 +30,12 @@ import crypto from 'crypto';
 import invariant from 'invariant';
 import nullthrows from 'nullthrows';
 
-type ImportDependencyOptions = $ReadOnly<{
+type ImportDependencyOptions = Readonly<{
   asyncType: AsyncDependencyType,
   isESMImport: boolean,
 }>;
 
-export type Dependency = $ReadOnly<{
+export type Dependency = Readonly<{
   data: DependencyData,
   name: string,
 }>;
@@ -37,18 +43,18 @@ export type Dependency = $ReadOnly<{
 // TODO: Convert to a Flow enum
 export type ContextMode = 'sync' | 'eager' | 'lazy' | 'lazy-once';
 
-type ContextFilter = $ReadOnly<{pattern: string, flags: string}>;
+type ContextFilter = Readonly<{pattern: string, flags: string}>;
 
-export type RequireContextParams = $ReadOnly<{
+export type RequireContextParams = 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 */
-  filter: $ReadOnly<ContextFilter>,
+  filter: Readonly<ContextFilter>,
   /** Mode for resolving dynamic dependencies. Defaults to `sync` */
   mode: ContextMode,
 }>;
 
-type DependencyData = $ReadOnly<{
+type DependencyData = Readonly<{
   // A locally unique key for this dependency within the current module.
   key: string,
   // If null, then the dependency is synchronous.
@@ -60,19 +66,19 @@ type DependencyData = $ReadOnly<{
   // and subpath imports.
   isESMImport: boolean,
   isOptional?: boolean,
-  locs: $ReadOnlyArray<BabelSourceLocation>,
+  locs: ReadonlyArray<ReadonlySourceLocation>,
   /** Context for requiring a collection of modules. */
   contextParams?: RequireContextParams,
 }>;
 
 export type MutableInternalDependency = {
   ...DependencyData,
-  locs: Array<BabelSourceLocation>,
+  locs: Array<ReadonlySourceLocation>,
   index: number,
   name: string,
 };
 
-export type InternalDependency = $ReadOnly<MutableInternalDependency>;
+export type InternalDependency = Readonly<MutableInternalDependency>;
 
 export type State = {
   asyncRequireModulePathStringLiteral: ?StringLiteral,
@@ -85,26 +91,26 @@ export type State = {
   allowOptionalDependencies: AllowOptionalDependencies,
   /** Enable `require.context` statements which can be used to import multiple files in a directory. */
   unstable_allowRequireContext: boolean,
-  unstable_isESMImportAtSource: ?(BabelSourceLocation) => boolean,
+  unstable_isESMImportAtSource: ?(ReadonlySourceLocation) => boolean,
 };
 
-export type Options = $ReadOnly<{
+export type Options = Readonly<{
   asyncRequireModulePath: string,
   dependencyMapName: ?string,
   dynamicRequires: DynamicRequiresBehavior,
-  inlineableCalls: $ReadOnlyArray<string>,
+  inlineableCalls: ReadonlyArray<string>,
   keepRequireNames: boolean,
   allowOptionalDependencies: AllowOptionalDependencies,
   dependencyTransformer?: DependencyTransformer,
   /** Enable `require.context` statements which can be used to import multiple files in a directory. */
   unstable_allowRequireContext: boolean,
-  unstable_isESMImportAtSource?: ?(BabelSourceLocation) => boolean,
+  unstable_isESMImportAtSource?: ?(ReadonlySourceLocation) => boolean,
 }>;
 
-export type CollectedDependencies = $ReadOnly<{
+export type CollectedDependencies = Readonly<{
   ast: BabelNodeFile,
   dependencyMapName: string,
-  dependencies: $ReadOnlyArray<Dependency>,
+  dependencies: ReadonlyArray<Dependency>,
 }>;
 
 export interface DependencyTransformer {
@@ -562,7 +568,7 @@ function processRequireCall(
   transformer.transformSyncRequire(path, dep, state);
 }
 
-function getNearestLocFromPath(path: NodePath<>): ?BabelSourceLocation {
+function getNearestLocFromPath(path: NodePath<>): ?ReadonlySourceLocation {
   let current: ?(NodePath<> | NodePath<BabelNode>) = path;
   while (
     current &&
@@ -582,7 +588,7 @@ function getNearestLocFromPath(path: NodePath<>): ?BabelSourceLocation {
   );
 }
 
-export type ImportQualifier = $ReadOnly<{
+export type ImportQualifier = Readonly<{
   name: string,
   asyncType: AsyncDependencyType | null,
   isESMImport: boolean,
@@ -732,11 +738,11 @@ const DefaultDependencyTransformer: DependencyTransformer = {
     state: State,
   ): void {
     const moduleIDExpression = createModuleIDExpression(dependency, state);
-    path.node.arguments = ([moduleIDExpression]: Array<
+    path.node.arguments = [moduleIDExpression] as Array<
       | BabelNodeExpression
       | BabelNodeSpreadElement
       | BabelNodeArgumentPlaceholder,
-    >);
+    >;
     // Always add the debug name argument last
     if (state.keepRequireNames) {
       path.node.arguments.push(types.stringLiteral(dependency.name));

package/src/ModuleGraph/worker/generateImportNames.js

@@ -7,7 +7,11 @@ exports.default = generateImportNames;
 var _traverse = _interopRequireDefault(require("@babel/traverse"));
 var _nullthrows = _interopRequireDefault(require("nullthrows"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 function generateImportNames(ast) {
   let importDefault;

package/src/ModuleGraph/worker/generateImportNames.js.flow

@@ -4,10 +4,12 @@
  * 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-local
+ * @format
  */
 
+import type {Node} from '@babel/types';
+
 import traverse from '@babel/traverse';
 import nullthrows from 'nullthrows';
 
@@ -15,7 +17,7 @@ import nullthrows from 'nullthrows';
  * Select unused names for "metroImportDefault" and "metroImportAll", by
  * calling "generateUid".
  */
-export default function generateImportNames(ast: BabelNode): {
+export default function generateImportNames(ast: Node): {
   importAll: string,
   importDefault: string,
 } {

package/src/ModuleGraph/worker/importLocationsPlugin.js.flow

@@ -9,7 +9,8 @@
  * @oncall react_native
  */
 
-import type {File, PluginObj} from '@babel/core';
+import type {ReadonlySourceLocation} from '../../shared/types';
+import type {PluginObj} from '@babel/core';
 import typeof * as Types from '@babel/types';
 import type {MetroBabelFileMetadata} from 'metro-babel-transformer';
 
@@ -17,7 +18,10 @@ type ImportDeclarationLocs = Set<string>;
 
 type State = {
   importDeclarationLocs: ImportDeclarationLocs,
-  file: File,
+  file: {
+    metadata?: MetroBabelFileMetadata,
+    ...
+  },
   ...
 };
 
@@ -78,7 +82,7 @@ function importLocationsPlugin({
 // Very simple serialisation of a source location. This should remain opaque to
 // the caller.
 const MISSING_LOC = {line: -1, column: -1};
-function locToKey(loc: BabelSourceLocation): string {
+function locToKey(loc: ReadonlySourceLocation): string {
   const {start = MISSING_LOC, end = MISSING_LOC} = loc;
   return `${start.line},${start.column}:${end.line},${end.column}`;
 }

package/src/Server/MultipartResponse.js

@@ -6,7 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _accepts = _interopRequireDefault(require("accepts"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 const CRLF = "\r\n";
 const BOUNDARY = "3beqjf3apnqeu3h5jqorms4i";

package/src/Server/MultipartResponse.js.flow

@@ -94,7 +94,7 @@ export default class MultipartResponse {
     this.res.end();
   }
 
-  once(name: string, fn: () => mixed): this {
+  once(name: string, fn: () => unknown): this {
     this.res.once(name, fn);
     return this;
   }

package/src/Server/symbolicate.js.flow

@@ -31,7 +31,7 @@ export type IntermediateStackFrame = {
   collapse?: boolean,
   ...
 };
-export type StackFrameOutput = $ReadOnly<IntermediateStackFrame>;
+export type StackFrameOutput = Readonly<IntermediateStackFrame>;
 type ExplodedSourceMapModule = ExplodedSourceMap[number];
 type Position = {+line1Based: number, column0Based: number};
 
@@ -57,11 +57,11 @@ function createFunctionNameGetter(
 }
 
 export default async function symbolicate(
-  stack: $ReadOnlyArray<StackFrameInput>,
+  stack: ReadonlyArray<StackFrameInput>,
   maps: Iterable<[string, ExplodedSourceMap]>,
   config: ConfigT,
-  extraData: mixed,
-): Promise<$ReadOnlyArray<StackFrameOutput>> {
+  extraData: unknown,
+): Promise<ReadonlyArray<StackFrameOutput>> {
   const mapsByUrl = new Map<?string, ExplodedSourceMap>();
   for (const [url, map] of maps) {
     mapsByUrl.set(url, map);