metro 0.85.0 → 0.86.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.85.0",
+  "version": "0.86.0",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -39,18 +39,18 @@
     "jest-worker": "^29.7.0",
     "jsc-safe-url": "^0.2.2",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.85.0",
-    "metro-cache": "0.85.0",
-    "metro-cache-key": "0.85.0",
-    "metro-config": "0.85.0",
-    "metro-core": "0.85.0",
-    "metro-file-map": "0.85.0",
-    "metro-resolver": "0.85.0",
-    "metro-runtime": "0.85.0",
-    "metro-source-map": "0.85.0",
-    "metro-symbolicate": "0.85.0",
-    "metro-transform-plugins": "0.85.0",
-    "metro-transform-worker": "0.85.0",
+    "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.85.0",
+    "metro-babel-register": "0.86.0",
     "metro-memory-fs": "*",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",

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,12 +13,13 @@ import type {Module} from '../types';
 import type {
   FBSourceFunctionMap,
   MetroSourceMapSegmentTuple,
+  VlqMap,
 } from 'metro-source-map';
 
 import {getJsOutput, isJsModule} from './helpers/js';
 
 export type ExplodedSourceMap = ReadonlyArray<{
-  readonly map: Array<MetroSourceMapSegmentTuple>,
+  readonly map: Array<MetroSourceMapSegmentTuple> | VlqMap,
   readonly firstLine1Based: number,
   readonly functionMap: ?FBSourceFunctionMap,
   readonly path: string,

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';
@@ -25,7 +26,7 @@ export default function getSourceMapInfo(
     getSourceUrl: ?(module: Module<>) => string,
   },
 ): {
-  readonly map: Array<MetroSourceMapSegmentTuple>,
+  readonly map: Array<MetroSourceMapSegmentTuple> | VlqMap,
   readonly functionMap: ?FBSourceFunctionMap,
   readonly code: string,
   readonly path: string,

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};

package/src/Server/symbolicate.js

@@ -5,7 +5,67 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = symbolicate;
 var _search = require("metro-source-map/private/Consumer/search");
+var _LineIndexedMappings = _interopRequireDefault(
+  require("metro-source-map/private/LineIndexedMappings"),
+);
 var _Symbolication = require("metro-symbolicate/private/Symbolication");
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
+}
+const lineIndexCache = new WeakMap();
+function originalPositionInModule(
+  map,
+  generatedLine1Based,
+  generatedColumn0Based,
+) {
+  if (Array.isArray(map)) {
+    return originalPositionInTuples(
+      map,
+      generatedLine1Based,
+      generatedColumn0Based,
+    );
+  }
+  let decoded = lineIndexCache.get(map);
+  if (decoded == null) {
+    decoded = new _LineIndexedMappings.default(map.mappings);
+    lineIndexCache.set(map, decoded);
+  }
+  return decoded.originalPositionFor(
+    generatedLine1Based,
+    generatedColumn0Based,
+  );
+}
+function originalPositionInTuples(
+  mappings,
+  generatedLine1Based,
+  generatedColumn0Based,
+) {
+  const target = {
+    line1Based: generatedLine1Based,
+    column0Based: generatedColumn0Based,
+  };
+  const mappingIndex = (0, _search.greatestLowerBound)(
+    mappings,
+    target,
+    (t, candidate) => {
+      if (t.line1Based === candidate[0]) {
+        return t.column0Based - candidate[1];
+      }
+      return t.line1Based - candidate[0];
+    },
+  );
+  if (mappingIndex == null) {
+    return null;
+  }
+  const mapping = mappings[mappingIndex];
+  if (mapping[0] !== target.line1Based || mapping.length < 4) {
+    return null;
+  }
+  return {
+    line1Based: mapping[2],
+    column0Based: mapping[3],
+  };
+}
 function createFunctionNameGetter(module) {
   const consumer = new _Symbolication.SourceMetadataMapConsumer(
     {
@@ -46,38 +106,16 @@ async function symbolicate(stack, maps, config, extraData) {
     return map[moduleIndex];
   }
   function findOriginalPos(frame, module) {
-    if (
-      module.map == null ||
-      frame.lineNumber == null ||
-      frame.column == null
-    ) {
+    const lineNumber = frame.lineNumber;
+    const column = frame.column;
+    if (module.map == null || lineNumber == null || column == null) {
       return null;
     }
-    const generatedPosInModule = {
-      line1Based: frame.lineNumber - module.firstLine1Based + 1,
-      column0Based: frame.column,
-    };
-    const mappingIndex = (0, _search.greatestLowerBound)(
+    return originalPositionInModule(
       module.map,
-      generatedPosInModule,
-      (target, candidate) => {
-        if (target.line1Based === candidate[0]) {
-          return target.column0Based - candidate[1];
-        }
-        return target.line1Based - candidate[0];
-      },
+      lineNumber - module.firstLine1Based + 1,
+      column,
     );
-    if (mappingIndex == null) {
-      return null;
-    }
-    const mapping = module.map[mappingIndex];
-    if (mapping[0] !== generatedPosInModule.line1Based || mapping.length < 4) {
-      return null;
-    }
-    return {
-      line1Based: mapping[2],
-      column0Based: mapping[3],
-    };
   }
   function findFunctionName(originalPos, module) {
     if (module.functionMap) {
@@ -97,11 +135,6 @@ async function symbolicate(stack, maps, config, extraData) {
         ...frame,
       };
     }
-    if (!Array.isArray(module.map)) {
-      throw new Error(
-        `Unexpected module with serialized source map found: ${module.path}`,
-      );
-    }
     const originalPos = findOriginalPos(frame, module);
     if (!originalPos) {
       return {

package/src/Server/symbolicate.js.flow

@@ -12,11 +12,13 @@
 import type {
   FBSourceFunctionMap,
   MetroSourceMapSegmentTuple,
+  VlqMap,
 } from '../../../metro-source-map/src/source-map';
 import type {ExplodedSourceMap} from '../DeltaBundler/Serializers/getExplodedSourceMap';
 import type {ConfigT} from 'metro-config';
 
 import {greatestLowerBound} from 'metro-source-map/private/Consumer/search';
+import LineIndexedMappings from 'metro-source-map/private/LineIndexedMappings';
 import {SourceMetadataMapConsumer} from 'metro-symbolicate/private/Symbolication';
 
 export type StackFrameInput = {
@@ -35,6 +37,75 @@ export type StackFrameOutput = Readonly<IntermediateStackFrame>;
 type ExplodedSourceMapModule = ExplodedSourceMap[number];
 type Position = {readonly line1Based: number, column0Based: number};
 
+// Cache of per-line indices, keyed on the VlqMap held by the module graph. A
+// WeakMap lets an index outlive the request that built it, so later requests
+// resolving frames in the same module reuse it, and releases it automatically
+// when the module leaves the graph. The index references the graph's existing
+// mappings string and adds only O(lines) integers, so retaining it alongside
+// the graph stays cheap.
+const lineIndexCache: WeakMap<VlqMap, LineIndexedMappings> = new WeakMap();
+
+// Resolve a generated (line, column) within a module to its original position.
+// Tuple-backed modules keep their decoded segments, so we search them directly;
+// VLQ-backed modules go through a compact per-line `LineIndexedMappings` that
+// decodes only the target line. Byte-identical either way.
+function originalPositionInModule(
+  map: Array<MetroSourceMapSegmentTuple> | VlqMap,
+  generatedLine1Based: number,
+  generatedColumn0Based: number,
+): ?Position {
+  if (Array.isArray(map)) {
+    return originalPositionInTuples(
+      map,
+      generatedLine1Based,
+      generatedColumn0Based,
+    );
+  }
+  let decoded = lineIndexCache.get(map);
+  if (decoded == null) {
+    decoded = new LineIndexedMappings(map.mappings);
+    lineIndexCache.set(map, decoded);
+  }
+  return decoded.originalPositionFor(
+    generatedLine1Based,
+    generatedColumn0Based,
+  );
+}
+
+// greatestLowerBound over pre-decoded tuples, ordered by (line, column).
+function originalPositionInTuples(
+  mappings: Array<MetroSourceMapSegmentTuple>,
+  generatedLine1Based: number,
+  generatedColumn0Based: number,
+): ?Position {
+  const target = {
+    line1Based: generatedLine1Based,
+    column0Based: generatedColumn0Based,
+  };
+  const mappingIndex = greatestLowerBound(mappings, target, (t, candidate) => {
+    if (t.line1Based === candidate[0]) {
+      return t.column0Based - candidate[1];
+    }
+    return t.line1Based - candidate[0];
+  });
+  if (mappingIndex == null) {
+    return null;
+  }
+  const mapping = mappings[mappingIndex];
+  if (
+    mapping[0] !== target.line1Based ||
+    mapping.length < 4 /* no source line/column info */
+  ) {
+    return null;
+  }
+  return {
+    // $FlowFixMe[invalid-tuple-index]: Length checks do not refine tuple unions.
+    line1Based: mapping[2],
+    // $FlowFixMe[invalid-tuple-index]: Length checks do not refine tuple unions.
+    column0Based: mapping[3],
+  };
+}
+
 function createFunctionNameGetter(
   module: ExplodedSourceMapModule,
 ): Position => ?string {
@@ -70,7 +141,7 @@ export default async function symbolicate(
     {
       readonly firstLine1Based: number,
       readonly functionMap: ?FBSourceFunctionMap,
-      readonly map: Array<MetroSourceMapSegmentTuple>,
+      readonly map: Array<MetroSourceMapSegmentTuple> | VlqMap,
       readonly path: string,
     },
     (Position) => ?string,
@@ -96,43 +167,16 @@ export default async function symbolicate(
     frame: StackFrameInput,
     module: ExplodedSourceMapModule,
   ): ?Position {
-    if (
-      module.map == null ||
-      frame.lineNumber == null ||
-      frame.column == null
-    ) {
+    const lineNumber = frame.lineNumber;
+    const column = frame.column;
+    if (module.map == null || lineNumber == null || column == null) {
       return null;
     }
-    const generatedPosInModule = {
-      line1Based: frame.lineNumber - module.firstLine1Based + 1,
-      column0Based: frame.column,
-    };
-    const mappingIndex = greatestLowerBound(
+    return originalPositionInModule(
       module.map,
-      generatedPosInModule,
-      (target, candidate) => {
-        if (target.line1Based === candidate[0]) {
-          return target.column0Based - candidate[1];
-        }
-        return target.line1Based - candidate[0];
-      },
+      lineNumber - module.firstLine1Based + 1,
+      column,
     );
-    if (mappingIndex == null) {
-      return null;
-    }
-    const mapping = module.map[mappingIndex];
-    if (
-      mapping[0] !== generatedPosInModule.line1Based ||
-      mapping.length < 4 /* no source line/column info */
-    ) {
-      return null;
-    }
-    return {
-      // $FlowFixMe[invalid-tuple-index]: Length checks do not refine tuple unions.
-      line1Based: mapping[2],
-      // $FlowFixMe[invalid-tuple-index]: Length checks do not refine tuple unions.
-      column0Based: mapping[3],
-    };
   }
 
   function findFunctionName(
@@ -140,7 +184,7 @@ export default async function symbolicate(
     module: {
       readonly firstLine1Based: number,
       readonly functionMap: ?FBSourceFunctionMap,
-      readonly map: Array<MetroSourceMapSegmentTuple>,
+      readonly map: Array<MetroSourceMapSegmentTuple> | VlqMap,
       readonly path: string,
     },
   ): ?string {
@@ -160,11 +204,6 @@ export default async function symbolicate(
     if (!module) {
       return {...frame};
     }
-    if (!Array.isArray(module.map)) {
-      throw new Error(
-        `Unexpected module with serialized source map found: ${module.path}`,
-      );
-    }
     const originalPos = findOriginalPos(frame, module);
     if (!originalPos) {
       return {...frame};

package/src/index.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<3c6460427c6760887187d6b16151c609>>
+ * @generated SignedSource<<8cfd5068558051749a42bc72eb4b915f>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro/src/index.flow.js
@@ -182,25 +182,3 @@ export declare const attachMetroCli: (
   options?: AttachMetroCLIOptions,
 ) => Yargs;
 export declare type attachMetroCli = typeof attachMetroCli;
-/**
- * Backwards-compatibility with CommonJS consumers using interopRequireDefault.
- * Do not add to this list.
- *
- * @deprecated Default import from 'metro' is deprecated, use named exports.
- */
-declare const $$EXPORT_DEFAULT_DECLARATION$$: {
-  attachMetroCli: typeof attachMetroCli;
-  runServer: typeof runServer;
-  Terminal: typeof Terminal;
-  JsonReporter: typeof JsonReporter;
-  TerminalReporter: typeof TerminalReporter;
-  loadConfig: typeof loadConfig;
-  mergeConfig: typeof mergeConfig;
-  resolveConfig: typeof resolveConfig;
-  createConnectMiddleware: typeof createConnectMiddleware;
-  runBuild: typeof runBuild;
-  buildGraph: typeof buildGraph;
-};
-declare type $$EXPORT_DEFAULT_DECLARATION$$ =
-  typeof $$EXPORT_DEFAULT_DECLARATION$$;
-export default $$EXPORT_DEFAULT_DECLARATION$$;

package/src/index.flow.js

@@ -21,8 +21,7 @@ Object.defineProperty(exports, "TerminalReporter", {
     return _TerminalReporter.default;
   },
 });
-exports.default =
-  exports.createConnectMiddleware =
+exports.createConnectMiddleware =
   exports.buildGraph =
   exports.attachMetroCli =
     void 0;
@@ -458,16 +457,3 @@ async function earlyPortCheck(host, port) {
     await new Promise((resolve) => server.close(() => resolve()));
   }
 }
-var _default = (exports.default = {
-  attachMetroCli,
-  runServer,
-  Terminal: _metroCore.Terminal,
-  JsonReporter: _JsonReporter.default,
-  TerminalReporter: _TerminalReporter.default,
-  loadConfig: _metroConfig.loadConfig,
-  mergeConfig: _metroConfig.mergeConfig,
-  resolveConfig: _metroConfig.resolveConfig,
-  createConnectMiddleware,
-  runBuild,
-  buildGraph,
-});

package/src/index.flow.js.flow

@@ -587,23 +587,3 @@ async function earlyPortCheck(host: void | string, port: number) {
     await new Promise(resolve => server.close(() => resolve()));
   }
 }
-
-/**
- * Backwards-compatibility with CommonJS consumers using interopRequireDefault.
- * Do not add to this list.
- *
- * @deprecated Default import from 'metro' is deprecated, use named exports.
- */
-export default {
-  attachMetroCli,
-  runServer,
-  Terminal,
-  JsonReporter,
-  TerminalReporter,
-  loadConfig,
-  mergeConfig,
-  resolveConfig,
-  createConnectMiddleware,
-  runBuild,
-  buildGraph,
-};

package/src/node-haste/DependencyGraph/createFileMap.js

@@ -36,36 +36,29 @@ function _interopRequireWildcard(e, t) {
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : { default: e };
 }
-function getIgnorePattern(config) {
-  const { blockList, blacklistRE } = config.resolver;
-  const ignorePattern = blacklistRE || blockList;
-  if (!ignorePattern) {
-    return / ^/;
+const flattenBlockList = (regexes) => {
+  if (!Array.isArray(regexes)) {
+    return regexes;
   }
-  const combine = (regexes) =>
-    new RegExp(
-      regexes
-        .map((regex, index) => {
-          if (regex.flags !== regexes[0].flags) {
-            throw new Error(
-              "Cannot combine blockList patterns, because they have different flags:\n" +
-                " - Pattern 0: " +
-                regexes[0].toString() +
-                "\n" +
-                ` - Pattern ${index}: ` +
-                regexes[index].toString(),
-            );
-          }
-          return "(" + regex.source + ")";
-        })
-        .join("|"),
-      regexes[0]?.flags ?? "",
-    );
-  if (Array.isArray(ignorePattern)) {
-    return combine(ignorePattern);
-  }
-  return ignorePattern;
-}
+  return new RegExp(
+    regexes
+      .map((regex, index) => {
+        if (regex.flags !== regexes[0].flags) {
+          throw new Error(
+            "Cannot combine blockList patterns, because they have different flags:\n" +
+              " - Pattern 0: " +
+              regexes[0].toString() +
+              "\n" +
+              ` - Pattern ${index}: ` +
+              regexes[index].toString(),
+          );
+        }
+        return "(" + regex.source + ")";
+      })
+      .join("|"),
+    regexes[0]?.flags ?? "",
+  );
+};
 function createFileMap(config, options) {
   const watch = options?.watch == null ? !_ciInfo.default.isCI : options.watch;
   const { enabled: autoSaveEnabled, ...autoSaveOpts } =
@@ -115,7 +108,7 @@ function createFileMap(config, options) {
       ]),
     ),
     healthCheck: config.watcher.healthCheck,
-    ignorePattern: getIgnorePattern(config),
+    ignorePattern: flattenBlockList(config.resolver.blockList),
     maxWorkers: config.maxWorkers,
     plugins,
     retainAllFiles: true,

package/src/node-haste/DependencyGraph/createFileMap.js.flow

@@ -19,43 +19,29 @@ import MetroFileMap, {
   HastePlugin,
 } from 'metro-file-map';
 
-function getIgnorePattern(config: ConfigT): RegExp {
-  // For now we support both options
-  const {blockList, blacklistRE} = config.resolver;
-  const ignorePattern = blacklistRE || blockList;
-
-  // If neither option has been set, use default pattern
-  if (!ignorePattern) {
-    return / ^/;
-  }
-
-  const combine = (regexes: Array<RegExp>) =>
-    new RegExp(
-      regexes
-        .map((regex, index) => {
-          if (regex.flags !== regexes[0].flags) {
-            throw new Error(
-              'Cannot combine blockList patterns, because they have different flags:\n' +
-                ' - Pattern 0: ' +
-                regexes[0].toString() +
-                '\n' +
-                ` - Pattern ${index}: ` +
-                regexes[index].toString(),
-            );
-          }
-          return '(' + regex.source + ')';
-        })
-        .join('|'),
-      regexes[0]?.flags ?? '',
-    );
-
-  // If ignorePattern is an array, merge it into one
-  if (Array.isArray(ignorePattern)) {
-    return combine(ignorePattern);
+const flattenBlockList = (regexes: ConfigT['resolver']['blockList']) => {
+  if (!Array.isArray(regexes)) {
+    return regexes;
   }
-
-  return ignorePattern;
-}
+  return new RegExp(
+    regexes
+      .map((regex, index) => {
+        if (regex.flags !== regexes[0].flags) {
+          throw new Error(
+            'Cannot combine blockList patterns, because they have different flags:\n' +
+              ' - Pattern 0: ' +
+              regexes[0].toString() +
+              '\n' +
+              ` - Pattern ${index}: ` +
+              regexes[index].toString(),
+          );
+        }
+        return '(' + regex.source + ')';
+      })
+      .join('|'),
+    regexes[0]?.flags ?? '',
+  );
+};
 
 export default function createFileMap(
   config: ConfigT,
@@ -126,7 +112,7 @@ export default function createFileMap(
       ]),
     ),
     healthCheck: config.watcher.healthCheck,
-    ignorePattern: getIgnorePattern(config),
+    ignorePattern: flattenBlockList(config.resolver.blockList),
     maxWorkers: config.maxWorkers,
     plugins,
     retainAllFiles: true,