metro 0.84.4 → 0.86.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.84.4",
+  "version": "0.86.0",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -11,7 +11,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/facebook/metro.git",
+    "url": "git+https://github.com/react/metro.git",
     "directory": "packages/metro"
   },
   "scripts": {
@@ -33,24 +33,24 @@
     "error-stack-parser": "^2.0.6",
     "flow-enums-runtime": "^0.0.6",
     "graceful-fs": "^4.2.4",
-    "hermes-parser": "0.35.0",
+    "hermes-parser": "0.36.1",
     "image-size": "^1.0.2",
     "invariant": "^2.2.4",
     "jest-worker": "^29.7.0",
     "jsc-safe-url": "^0.2.2",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.84.4",
-    "metro-cache": "0.84.4",
-    "metro-cache-key": "0.84.4",
-    "metro-config": "0.84.4",
-    "metro-core": "0.84.4",
-    "metro-file-map": "0.84.4",
-    "metro-resolver": "0.84.4",
-    "metro-runtime": "0.84.4",
-    "metro-source-map": "0.84.4",
-    "metro-symbolicate": "0.84.4",
-    "metro-transform-plugins": "0.84.4",
-    "metro-transform-worker": "0.84.4",
+    "metro-babel-transformer": "0.86.0",
+    "metro-cache": "0.86.0",
+    "metro-cache-key": "0.86.0",
+    "metro-config": "0.86.0",
+    "metro-core": "0.86.0",
+    "metro-file-map": "0.86.0",
+    "metro-resolver": "0.86.0",
+    "metro-runtime": "0.86.0",
+    "metro-source-map": "0.86.0",
+    "metro-symbolicate": "0.86.0",
+    "metro-transform-plugins": "0.86.0",
+    "metro-transform-worker": "0.86.0",
     "mime-types": "^3.0.1",
     "nullthrows": "^1.1.1",
     "serialize-error": "^2.1.0",
@@ -71,7 +71,7 @@
     "dedent": "^0.7.0",
     "jest-snapshot": "^29.7.0",
     "jest-snapshot-serializer-raw": "^1.2.0",
-    "metro-babel-register": "0.84.4",
+    "metro-babel-register": "0.86.0",
     "metro-memory-fs": "*",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",
@@ -80,6 +80,6 @@
   },
   "license": "MIT",
   "engines": {
-    "node": "^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0"
+    "node": "^22.13.0 || ^24.3.0 || >= 26.0.0"
   }
 }

package/src/Assets.js

@@ -195,7 +195,9 @@ async function applyAssetDataPlugins(assetDataPlugins, assetData) {
     return assetData;
   }
   const [currentAssetPlugin, ...remainingAssetPlugins] = assetDataPlugins;
-  const assetPluginFunction = require(currentAssetPlugin);
+  const mod = require(currentAssetPlugin);
+  const assetPluginFunction =
+    mod.__esModule === true && "default" in mod ? mod.default : mod;
   const resultAssetData = await assetPluginFunction(assetData);
   return await applyAssetDataPlugins(remainingAssetPlugins, resultAssetData);
 }

package/src/Assets.js.flow

@@ -20,34 +20,34 @@ import getImageSize from 'image-size';
 import path from 'path';
 
 export type AssetInfo = {
-  +files: Array<string>,
-  +hash: string,
-  +name: string,
-  +scales: Array<number>,
-  +type: string,
+  readonly files: Array<string>,
+  readonly hash: string,
+  readonly name: string,
+  readonly scales: Array<number>,
+  readonly type: string,
 };
 
 export type AssetDataWithoutFiles = {
-  +__packager_asset: boolean,
-  +fileSystemLocation: string,
-  +hash: string,
-  +height: ?number,
-  +httpServerLocation: string,
-  +name: string,
-  +scales: Array<number>,
-  +type: string,
-  +width: ?number,
+  readonly __packager_asset: boolean,
+  readonly fileSystemLocation: string,
+  readonly hash: string,
+  readonly height: ?number,
+  readonly httpServerLocation: string,
+  readonly name: string,
+  readonly scales: Array<number>,
+  readonly type: string,
+  readonly width: ?number,
   ...
 };
 export type AssetDataFiltered = {
-  +__packager_asset: boolean,
-  +hash: string,
-  +height: ?number,
-  +httpServerLocation: string,
-  +name: string,
-  +scales: Array<number>,
-  +type: string,
-  +width: ?number,
+  readonly __packager_asset: boolean,
+  readonly hash: string,
+  readonly height: ?number,
+  readonly httpServerLocation: string,
+  readonly name: string,
+  readonly scales: Array<number>,
+  readonly type: string,
+  readonly width: ?number,
   ...
 };
 
@@ -74,7 +74,7 @@ export function getAssetSize(
   type: string,
   content: Buffer,
   filePath: string,
-): ?{+width: number, +height: number} {
+): ?{readonly width: number, readonly height: number} {
   if (!isAssetTypeAnImage(type)) {
     return null;
   }
@@ -85,7 +85,10 @@ export function getAssetSize(
   return {width, height};
 }
 
-export type AssetData = AssetDataWithoutFiles & {+files: Array<string>, ...};
+export type AssetData = AssetDataWithoutFiles & {
+  readonly files: Array<string>,
+  ...
+};
 
 export type AssetDataPlugin = (
   assetData: AssetData,
@@ -249,7 +252,10 @@ async function applyAssetDataPlugins(
 
   const [currentAssetPlugin, ...remainingAssetPlugins] = assetDataPlugins;
   // $FlowFixMe[unsupported-syntax]: impossible to type a dynamic require.
-  const assetPluginFunction: AssetDataPlugin = require(currentAssetPlugin);
+  const mod = require(currentAssetPlugin);
+  const assetPluginFunction: AssetDataPlugin =
+    mod.__esModule === true && 'default' in mod ? mod.default : mod;
+
   const resultAssetData = await assetPluginFunction(assetData);
   return await applyAssetDataPlugins(remainingAssetPlugins, resultAssetData);
 }

package/src/Bundler.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<3d5664309abdece0f247fcd0c53c3aaf>>
+ * @generated SignedSource<<fe2c52b16f1a3036429ec004623d3603>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/Bundler.js
@@ -20,7 +20,6 @@ import type {TransformOptions} from './DeltaBundler/Worker';
 import type EventEmitter from 'events';
 import type {ConfigT} from 'metro-config';
 
-import Transformer from './DeltaBundler/Transformer';
 import DependencyGraph from './node-haste/DependencyGraph';
 
 export type BundlerOptions = Readonly<{
@@ -28,9 +27,6 @@ export type BundlerOptions = Readonly<{
   watch?: boolean;
 }>;
 declare class Bundler {
-  _depGraph: DependencyGraph;
-  _initializedPromise: Promise<void>;
-  _transformer: Transformer;
   constructor(config: ConfigT, options?: BundlerOptions);
   getWatcher(): EventEmitter;
   end(): Promise<void>;

package/src/DeltaBundler/DeltaCalculator.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<d06b53dd09157df95aeb941035d4ebf0>>
+ * @generated SignedSource<<1fbdc1ddc3526c8742b8c22d02311d38>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/DeltaBundler/DeltaCalculator.js
@@ -16,7 +16,6 @@
  */
 
 import type {DeltaResult, Options} from './types';
-import type {ChangeEvent} from 'metro-file-map';
 
 import {Graph} from './Graph';
 import EventEmitter from 'events';
@@ -27,14 +26,6 @@ import EventEmitter from 'events';
  * traverse the whole dependency tree for trivial small changes.
  */
 declare class DeltaCalculator<T> extends EventEmitter {
-  _changeEventSource: EventEmitter;
-  _options: Options<T>;
-  _currentBuildPromise: null | undefined | Promise<DeltaResult<T>>;
-  _deletedFiles: Set<string>;
-  _modifiedFiles: Set<string>;
-  _addedFiles: Set<string>;
-  _requiresReset: boolean;
-  _graph: Graph<T>;
   constructor(
     entryPoints: ReadonlySet<string>,
     changeEventSource: EventEmitter,
@@ -58,11 +49,5 @@ declare class DeltaCalculator<T> extends EventEmitter {
    * plus some metadata.
    */
   getGraph(): Graph<T>;
-  _handleMultipleFileChanges: (changeEvent: ChangeEvent) => void;
-  _getChangedDependencies(
-    modifiedFiles: Set<string>,
-    deletedFiles: Set<string>,
-    addedFiles: Set<string>,
-  ): Promise<DeltaResult<T>>;
 }
 export default DeltaCalculator;

package/src/DeltaBundler/DeltaCalculator.js.flow

@@ -182,7 +182,7 @@ export default class DeltaCalculator<T> extends EventEmitter {
 
   #shouldReset(
     canonicalPath: string,
-    metadata: {+isSymlink: boolean, ...},
+    metadata: {readonly isSymlink: boolean, ...},
   ): boolean {
     if (metadata.isSymlink) {
       return true;

package/src/DeltaBundler/Graph.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<2af7aa3b61c2afa4d8794e127666c226>>
+ * @generated SignedSource<<fc329765599e313b7d0cb6b45b7bbbdc>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/DeltaBundler/Graph.js
@@ -15,36 +15,12 @@
  *   yarn run build-ts-defs (OSS) 
  */
 
-/**
- * Portions of this code are based on the Synchronous Cycle Collection
- * algorithm described in:
- *
- * David F. Bacon and V. T. Rajan. 2001. Concurrent Cycle Collection in
- * Reference Counted Systems. In Proceedings of the 15th European Conference on
- * Object-Oriented Programming (ECOOP '01). Springer-Verlag, Berlin,
- * Heidelberg, 207–235.
- *
- * Notable differences from the algorithm in the paper:
- * 1. Our implementation uses the inverseDependencies set (which we already
- *    have to maintain) instead of a separate refcount variable. A module's
- *    reference count is equal to the size of its inverseDependencies set, plus
- *    1 if it's an entry point of the graph.
- * 2. We keep the "root buffer" (possibleCycleRoots) free of duplicates by
- *    making it a Set, instead of storing a "buffered" flag on each node.
- * 3. On top of tracking edges between nodes, we also count references between
- *    nodes and entries in the importBundleNodes set.
- */
-
-import type {RequireContext} from '../lib/contextModule';
 import type {
   Dependencies,
-  Dependency,
   GraphInputOptions,
   MixedOutput,
   Module,
-  ModuleData,
   Options,
-  ResolvedDependency,
   TransformInputOptions,
 } from './types';
 
@@ -55,22 +31,6 @@ export type Result<T> = {
   modified: Map<string, Module<T>>;
   deleted: Set<string>;
 };
-type Delta<T> = Readonly<{
-  added: Set<string>;
-  touched: Set<string>;
-  deleted: Set<string>;
-  updatedModuleData: ReadonlyMap<string, ModuleData<T>>;
-  baseModuleData: Map<string, ModuleData<T>>;
-  errors: ReadonlyMap<string, Error>;
-}>;
-type InternalOptions<T> = Readonly<{
-  lazy: boolean;
-  onDependencyAdd: () => unknown;
-  onDependencyAdded: () => unknown;
-  resolve: Options<T>['resolve'];
-  transform: Options<T>['transform'];
-  shallow: boolean;
-}>;
 export declare class Graph<T = MixedOutput> {
   readonly entryPoints: ReadonlySet<string>;
   readonly transformOptions: TransformInputOptions;
@@ -92,32 +52,6 @@ export declare class Graph<T = MixedOutput> {
     options: Options<T>,
   ): Promise<Result<T>>;
   initialTraverseDependencies(options: Options<T>): Promise<Result<T>>;
-  _buildDelta(
-    pathsToVisit: ReadonlySet<string>,
-    options: InternalOptions<T>,
-    moduleFilter?: (path: string) => boolean,
-  ): Promise<Delta<T>>;
-  _recursivelyCommitModule(
-    path: string,
-    delta: Delta<T>,
-    options: InternalOptions<T>,
-    commitOptions?: Readonly<{onlyRemove: boolean}>,
-  ): Module<T>;
-  _addDependency(
-    parentModule: Module<T>,
-    key: string,
-    dependency: Dependency,
-    requireContext: null | undefined | RequireContext,
-    delta: Delta<T>,
-    options: InternalOptions<T>,
-  ): void;
-  _removeDependency(
-    parentModule: Module<T>,
-    key: string,
-    dependency: Dependency,
-    delta: Delta<T>,
-    options: InternalOptions<T>,
-  ): void;
   /**
    * Collect a list of context modules which include a given file.
    */
@@ -136,39 +70,4 @@ export declare class Graph<T = MixedOutput> {
    * guarantee the same order between runs. This method mutates the passed graph.
    */
   reorderGraph(options: {shallow: boolean}): void;
-  _reorderDependencies(
-    module: Module<T>,
-    orderedDependencies: Map<string, Module<T>>,
-    options: {shallow: boolean},
-  ): void;
-  /** Garbage collection functions */
-
-  _incrementImportBundleReference(
-    dependency: ResolvedDependency,
-    parentModule: Module<T>,
-  ): void;
-  _decrementImportBundleReference(
-    dependency: ResolvedDependency,
-    parentModule: Module<T>,
-  ): void;
-  _markModuleInUse(module: Module<T>): void;
-  _children(
-    module: Module<T>,
-    options: InternalOptions<T>,
-  ): Iterator<Module<T>>;
-  _moduleSnapshot(module: Module<T>): ModuleData<T>;
-  _releaseModule(
-    module: Module<T>,
-    delta: Delta<T>,
-    options: InternalOptions<T>,
-  ): void;
-  _freeModule(module: Module<T>, delta: Delta<T>): void;
-  _markAsPossibleCycleRoot(module: Module<T>): void;
-  _collectCycles(delta: Delta<T>, options: InternalOptions<T>): void;
-  _markGray(module: Module<T>, options: InternalOptions<T>): void;
-  _scan(module: Module<T>, options: InternalOptions<T>): void;
-  _scanBlack(module: Module<T>, options: InternalOptions<T>): void;
-  _collectWhite(module: Module<T>, delta: Delta<T>): void;
-
-  /** End of garbage collection functions */
 }

package/src/DeltaBundler/Graph.js.flow

@@ -130,10 +130,10 @@ function isWeakOrLazy<T>(
 }
 
 export class Graph<T = MixedOutput> {
-  +entryPoints: ReadonlySet<string>;
-  +transformOptions: TransformInputOptions;
-  +dependencies: Dependencies<T> = new Map();
-  +#importBundleNodes: Map<
+  readonly entryPoints: ReadonlySet<string>;
+  readonly transformOptions: TransformInputOptions;
+  readonly dependencies: Dependencies<T> = new Map();
+  readonly #importBundleNodes: Map<
     string,
     Readonly<{
       inverseDependencies: CountingSet<string>,
@@ -141,9 +141,9 @@ export class Graph<T = MixedOutput> {
   > = new Map();
 
   /// GC state for nodes in the graph (this.dependencies)
-  +#gc: {
-    +color: Map<string, NodeColor>,
-    +possibleCycleRoots: Set<string>,
+  readonly #gc: {
+    readonly color: Map<string, NodeColor>,
+    readonly possibleCycleRoots: Set<string>,
   } = {
     color: new Map(),
     possibleCycleRoots: new Set(),

package/src/DeltaBundler/Serializers/getAllFiles.js.flow

@@ -16,7 +16,7 @@ import {getJsOutput, isJsModule} from './helpers/js';
 
 type Options = {
   platform: ?string,
-  +processModuleFilter: (module: Module<>) => boolean,
+  readonly processModuleFilter: (module: Module<>) => boolean,
 };
 
 export default async function getAllFiles(

package/src/DeltaBundler/Serializers/getAssets.js.flow

@@ -17,7 +17,7 @@ import {getJsOutput, isJsModule} from './helpers/js';
 import path from 'path';
 
 type Options = {
-  +processModuleFilter: (module: Module<>) => boolean,
+  readonly processModuleFilter: (module: Module<>) => boolean,
   assetPlugins: ReadonlyArray<string>,
   platform: ?string,
   projectRoot: string,

package/src/DeltaBundler/Serializers/getExplodedSourceMap.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<623892927b76c4f68802bb69f19d9974>>
+ * @generated SignedSource<<2f0ab0435f64798986366df74674d02a>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/DeltaBundler/Serializers/getExplodedSourceMap.js
@@ -19,10 +19,11 @@ import type {Module} from '../types';
 import type {
   FBSourceFunctionMap,
   MetroSourceMapSegmentTuple,
+  VlqMap,
 } from 'metro-source-map';
 
 export type ExplodedSourceMap = ReadonlyArray<{
-  readonly map: Array<MetroSourceMapSegmentTuple>;
+  readonly map: Array<MetroSourceMapSegmentTuple> | VlqMap;
   readonly firstLine1Based: number;
   readonly functionMap: null | undefined | FBSourceFunctionMap;
   readonly path: string;

package/src/DeltaBundler/Serializers/getExplodedSourceMap.js.flow

@@ -13,21 +13,22 @@ import type {Module} from '../types';
 import type {
   FBSourceFunctionMap,
   MetroSourceMapSegmentTuple,
+  VlqMap,
 } from 'metro-source-map';
 
 import {getJsOutput, isJsModule} from './helpers/js';
 
 export type ExplodedSourceMap = ReadonlyArray<{
-  +map: Array<MetroSourceMapSegmentTuple>,
-  +firstLine1Based: number,
-  +functionMap: ?FBSourceFunctionMap,
-  +path: string,
+  readonly map: Array<MetroSourceMapSegmentTuple> | VlqMap,
+  readonly firstLine1Based: number,
+  readonly functionMap: ?FBSourceFunctionMap,
+  readonly path: string,
 }>;
 
 export function getExplodedSourceMap(
   modules: ReadonlyArray<Module<>>,
   options: {
-    +processModuleFilter: (module: Module<>) => boolean,
+    readonly processModuleFilter: (module: Module<>) => boolean,
   },
 ): ExplodedSourceMap {
   const modulesToProcess = modules

package/src/DeltaBundler/Serializers/helpers/getSourceMapInfo.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<cd7e523b4fdfbff33e663b21c4529401>>
+ * @generated SignedSource<<af4dc08fc7e742357f7e2c12d3c89662>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/DeltaBundler/Serializers/helpers/getSourceMapInfo.js
@@ -19,6 +19,7 @@ import type {Module} from '../../types';
 import type {
   FBSourceFunctionMap,
   MetroSourceMapSegmentTuple,
+  VlqMap,
 } from 'metro-source-map';
 
 declare function getSourceMapInfo(
@@ -29,7 +30,7 @@ declare function getSourceMapInfo(
     getSourceUrl: null | undefined | ((module: Module) => string);
   },
 ): {
-  readonly map: Array<MetroSourceMapSegmentTuple>;
+  readonly map: Array<MetroSourceMapSegmentTuple> | VlqMap;
   readonly functionMap: null | undefined | FBSourceFunctionMap;
   readonly code: string;
   readonly path: string;

package/src/DeltaBundler/Serializers/helpers/getSourceMapInfo.js.flow

@@ -13,6 +13,7 @@ import type {Module} from '../../types';
 import type {
   FBSourceFunctionMap,
   MetroSourceMapSegmentTuple,
+  VlqMap,
 } from 'metro-source-map';
 
 import {getJsOutput} from './js';
@@ -20,18 +21,18 @@ import {getJsOutput} from './js';
 export default function getSourceMapInfo(
   module: Module<>,
   options: {
-    +excludeSource: boolean,
-    +shouldAddToIgnoreList: (Module<>) => boolean,
+    readonly excludeSource: boolean,
+    readonly shouldAddToIgnoreList: (Module<>) => boolean,
     getSourceUrl: ?(module: Module<>) => string,
   },
 ): {
-  +map: Array<MetroSourceMapSegmentTuple>,
-  +functionMap: ?FBSourceFunctionMap,
-  +code: string,
-  +path: string,
-  +source: string,
-  +lineCount: number,
-  +isIgnored: boolean,
+  readonly map: Array<MetroSourceMapSegmentTuple> | VlqMap,
+  readonly functionMap: ?FBSourceFunctionMap,
+  readonly code: string,
+  readonly path: string,
+  readonly source: string,
+  readonly lineCount: number,
+  readonly isIgnored: boolean,
 } {
   return {
     ...getJsOutput(module).data,

package/src/DeltaBundler/Serializers/hmrJSBundle.js.flow

@@ -148,9 +148,9 @@ export default function hmrJSBundle(
   graph: ReadOnlyGraph<>,
   options: Options,
 ): {
-  +added: ReadonlyArray<HmrModule>,
-  +deleted: ReadonlyArray<number>,
-  +modified: ReadonlyArray<HmrModule>,
+  readonly added: ReadonlyArray<HmrModule>,
+  readonly deleted: ReadonlyArray<number>,
+  readonly modified: ReadonlyArray<HmrModule>,
 } {
   return {
     added: generateModules(delta.added.values(), graph, options),

package/src/DeltaBundler/Serializers/sourceMapGenerator.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<49bc83c20821024a7b77f5d5c3168d62>>
+ * @generated SignedSource<<6c7d6cff28e917c03235af1d0c98db4e>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/DeltaBundler/Serializers/sourceMapGenerator.js
@@ -17,7 +17,7 @@
 
 import type {Module} from '../types';
 
-import {fromRawMappings, fromRawMappingsNonBlocking} from 'metro-source-map';
+import {fromRawMappingsIndexed} from 'metro-source-map';
 
 export type SourceMapGeneratorOptions = Readonly<{
   excludeSource: boolean;
@@ -28,9 +28,9 @@ export type SourceMapGeneratorOptions = Readonly<{
 declare function sourceMapGenerator(
   modules: ReadonlyArray<Module>,
   options: SourceMapGeneratorOptions,
-): ReturnType<typeof fromRawMappings>;
+): ReturnType<typeof fromRawMappingsIndexed>;
 declare function sourceMapGeneratorNonBlocking(
   modules: ReadonlyArray<Module>,
   options: SourceMapGeneratorOptions,
-): ReturnType<typeof fromRawMappingsNonBlocking>;
+): Promise<ReturnType<typeof fromRawMappingsIndexed>>;
 export {sourceMapGenerator, sourceMapGeneratorNonBlocking};

package/src/DeltaBundler/Serializers/sourceMapGenerator.js

@@ -66,11 +66,11 @@ function sourceMapGenerator(modules, options) {
       "Expected getSourceMapInfosImpl() to finish synchronously.",
     );
   }
-  return (0, _metroSourceMap.fromRawMappings)(sourceMapInfos);
+  return (0, _metroSourceMap.fromRawMappingsIndexed)(sourceMapInfos);
 }
 async function sourceMapGeneratorNonBlocking(modules, options) {
   const sourceMapInfos = await new Promise((resolve) => {
     getSourceMapInfosImpl(false, resolve, modules, options);
   });
-  return (0, _metroSourceMap.fromRawMappingsNonBlocking)(sourceMapInfos);
+  return (0, _metroSourceMap.fromRawMappingsIndexed)(sourceMapInfos);
 }

package/src/DeltaBundler/Serializers/sourceMapGenerator.js.flow

@@ -13,7 +13,7 @@ import type {Module} from '../types';
 
 import getSourceMapInfo from './helpers/getSourceMapInfo';
 import {isJsModule} from './helpers/js';
-import {fromRawMappings, fromRawMappingsNonBlocking} from 'metro-source-map';
+import {fromRawMappingsIndexed} from 'metro-source-map';
 
 export type SourceMapGeneratorOptions = Readonly<{
   excludeSource: boolean,
@@ -78,7 +78,7 @@ function getSourceMapInfosImpl(
 function sourceMapGenerator(
   modules: ReadonlyArray<Module<>>,
   options: SourceMapGeneratorOptions,
-): ReturnType<typeof fromRawMappings> {
+): ReturnType<typeof fromRawMappingsIndexed> {
   let sourceMapInfos;
   getSourceMapInfosImpl(
     true,
@@ -93,19 +93,21 @@ function sourceMapGenerator(
       'Expected getSourceMapInfosImpl() to finish synchronously.',
     );
   }
-  return fromRawMappings(sourceMapInfos);
+  return fromRawMappingsIndexed(sourceMapInfos);
 }
 
 async function sourceMapGeneratorNonBlocking(
   modules: ReadonlyArray<Module<>>,
   options: SourceMapGeneratorOptions,
-): ReturnType<typeof fromRawMappingsNonBlocking> {
+): Promise<ReturnType<typeof fromRawMappingsIndexed>> {
   const sourceMapInfos = await new Promise<
     ReadonlyArray<ReturnType<typeof getSourceMapInfo>>,
   >(resolve => {
     getSourceMapInfosImpl(false, resolve, modules, options);
   });
-  return fromRawMappingsNonBlocking(sourceMapInfos);
+  // Building an index map is a cheap synchronous passthrough (VLQ maps carry
+  // over verbatim); only gathering the per-module info above needs to yield.
+  return fromRawMappingsIndexed(sourceMapInfos);
 }
 
 export {sourceMapGenerator, sourceMapGeneratorNonBlocking};