metro 0.76.7 → 0.77.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.76.7",
+  "version": "0.77.0",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -29,28 +29,26 @@
     "denodeify": "^1.2.1",
     "error-stack-parser": "^2.0.6",
     "graceful-fs": "^4.2.4",
-    "hermes-parser": "0.12.0",
+    "hermes-parser": "0.14.0",
     "image-size": "^1.0.2",
     "invariant": "^2.2.4",
     "jest-worker": "^27.2.0",
     "jsc-safe-url": "^0.2.2",
     "lodash.throttle": "^4.1.1",
-    "metro-babel-transformer": "0.76.7",
-    "metro-cache": "0.76.7",
-    "metro-cache-key": "0.76.7",
-    "metro-config": "0.76.7",
-    "metro-core": "0.76.7",
-    "metro-file-map": "0.76.7",
-    "metro-inspector-proxy": "0.76.7",
-    "metro-minify-terser": "0.76.7",
-    "metro-minify-uglify": "0.76.7",
-    "metro-react-native-babel-preset": "0.76.7",
-    "metro-resolver": "0.76.7",
-    "metro-runtime": "0.76.7",
-    "metro-source-map": "0.76.7",
-    "metro-symbolicate": "0.76.7",
-    "metro-transform-plugins": "0.76.7",
-    "metro-transform-worker": "0.76.7",
+    "metro-babel-transformer": "0.77.0",
+    "metro-cache": "0.77.0",
+    "metro-cache-key": "0.77.0",
+    "metro-config": "0.77.0",
+    "metro-core": "0.77.0",
+    "metro-file-map": "0.77.0",
+    "metro-inspector-proxy": "0.77.0",
+    "metro-minify-terser": "0.77.0",
+    "metro-resolver": "0.77.0",
+    "metro-runtime": "0.77.0",
+    "metro-source-map": "0.77.0",
+    "metro-symbolicate": "0.77.0",
+    "metro-transform-plugins": "0.77.0",
+    "metro-transform-worker": "0.77.0",
     "mime-types": "^2.1.27",
     "node-fetch": "^2.2.0",
     "nullthrows": "^1.1.1",
@@ -68,16 +66,16 @@
     "dedent": "^0.7.0",
     "jest-snapshot": "^26.5.2",
     "jest-snapshot-serializer-raw": "^1.2.0",
-    "metro-babel-register": "0.76.7",
-    "metro-memory-fs": "0.76.7",
-    "metro-react-native-babel-preset": "0.76.7",
-    "metro-react-native-babel-transformer": "0.76.7",
+    "metro-babel-register": "0.77.0",
+    "metro-memory-fs": "0.77.0",
+    "metro-react-native-babel-preset": "0.77.0",
+    "metro-react-native-babel-transformer": "0.77.0",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",
     "stack-trace": "^0.0.10"
   },
   "license": "MIT",
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   }
 }

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

@@ -26,8 +26,6 @@ const {
   fromRawMappingsNonBlocking,
 } = require('metro-source-map');
 
-type ReturnType<F> = $Call<<A, R>((...A) => R) => R, F>;
-
 function getSourceMapInfosImpl(
   isBlocking: boolean,
   onDone: ($ReadOnlyArray<ReturnType<typeof getSourceMapInfo>>) => void,

package/src/DeltaBundler/WorkerFarm.js

@@ -17,9 +17,10 @@ class WorkerFarm {
   constructor(config, transformerConfig) {
     this._config = config;
     this._transformerConfig = transformerConfig;
+    const absoluteWorkerPath = require.resolve(config.transformer.workerPath);
     if (this._config.maxWorkers > 1) {
       const worker = this._makeFarm(
-        this._config.transformer.workerPath,
+        absoluteWorkerPath,
         ["transform"],
         this._config.maxWorkers
       );
@@ -69,13 +70,13 @@ class WorkerFarm {
       }
     }
   }
-  _makeFarm(workerPath, exposedMethods, numWorkers) {
+  _makeFarm(absoluteWorkerPath, exposedMethods, numWorkers) {
     const env = {
       ...process.env,
       // Force color to print syntax highlighted code frames.
       FORCE_COLOR: 1,
     };
-    return new JestWorker(workerPath, {
+    return new JestWorker(absoluteWorkerPath, {
       computeWorkerKey: this._config.stickyWorkers
         ? // $FlowFixMe[method-unbinding] added when improving typing for this parameters
           // $FlowFixMe[incompatible-call]

package/src/DeltaBundler/WorkerFarm.js.flow

@@ -39,10 +39,11 @@ class WorkerFarm {
   constructor(config: ConfigT, transformerConfig: TransformerConfig) {
     this._config = config;
     this._transformerConfig = transformerConfig;
+    const absoluteWorkerPath = require.resolve(config.transformer.workerPath);
 
     if (this._config.maxWorkers > 1) {
       const worker = this._makeFarm(
-        this._config.transformer.workerPath,
+        absoluteWorkerPath,
         ['transform'],
         this._config.maxWorkers,
       );
@@ -107,7 +108,7 @@ class WorkerFarm {
   }
 
   _makeFarm(
-    workerPath: string,
+    absoluteWorkerPath: string,
     exposedMethods: $ReadOnlyArray<string>,
     numWorkers: number,
   ): any {
@@ -117,7 +118,7 @@ class WorkerFarm {
       FORCE_COLOR: 1,
     };
 
-    return new JestWorker(workerPath, {
+    return new JestWorker(absoluteWorkerPath, {
       computeWorkerKey: this._config.stickyWorkers
         ? // $FlowFixMe[method-unbinding] added when improving typing for this parameters
           // $FlowFixMe[incompatible-call]

package/src/lib/contextModule.js

@@ -51,7 +51,7 @@ function deriveAbsolutePathFromContext(from, context) {
 /** Match a file against a require context. */
 function fileMatchesContext(testPath, context) {
   // NOTE(EvanBacon): Ensure this logic is synchronized with the similar
-  // functionality in `metro-file-map/src/HasteFS.js` (`matchFilesWithContext()`)
+  // functionality in `metro-file-map/src/lib/TreeFS.js` (`matchFiles()`)
 
   const filePath = _path.default.relative(
     (0, _nullthrows.default)(context.from),

package/src/lib/contextModule.js.flow

@@ -63,7 +63,7 @@ export function fileMatchesContext(
   context: RequireContext,
 ): boolean {
   // NOTE(EvanBacon): Ensure this logic is synchronized with the similar
-  // functionality in `metro-file-map/src/HasteFS.js` (`matchFilesWithContext()`)
+  // functionality in `metro-file-map/src/lib/TreeFS.js` (`matchFiles()`)
 
   const filePath = path.relative(nullthrows(context.from), testPath);
   const filter = context.filter;

package/src/lib/transformHelpers.js

@@ -127,12 +127,13 @@ async function getTransformFn(
       // TODO: Check delta changes to avoid having to look over all files each time
       // this is a massive performance boost.
 
-      // Search against all files, this is very expensive.
-      // TODO: Maybe we could let the user specify which root to check against.
-      const files = graph.matchFilesWithContext(requireContext.from, {
-        filter: requireContext.filter,
-        recursive: requireContext.recursive,
-      });
+      // Search against all files in a subtree.
+      const files = Array.from(
+        graph.matchFilesWithContext(requireContext.from, {
+          filter: requireContext.filter,
+          recursive: requireContext.recursive,
+        })
+      );
       const template = (0, _contextModuleTemplates.getContextModuleTemplate)(
         requireContext.mode,
         requireContext.from,

package/src/lib/transformHelpers.js.flow

@@ -152,12 +152,13 @@ async function getTransformFn(
       // TODO: Check delta changes to avoid having to look over all files each time
       // this is a massive performance boost.
 
-      // Search against all files, this is very expensive.
-      // TODO: Maybe we could let the user specify which root to check against.
-      const files = graph.matchFilesWithContext(requireContext.from, {
-        filter: requireContext.filter,
-        recursive: requireContext.recursive,
-      });
+      // Search against all files in a subtree.
+      const files = Array.from(
+        graph.matchFilesWithContext(requireContext.from, {
+          filter: requireContext.filter,
+          recursive: requireContext.recursive,
+        }),
+      );
 
       const template = getContextModuleTemplate(
         requireContext.mode,

package/src/node-haste/DependencyGraph/{createHasteMap.js → createFileMap.js}

@@ -53,7 +53,6 @@ function _interopRequireWildcard(obj, nodeInterop) {
  */
 
 const ci = require("ci-info");
-const path = require("path");
 function getIgnorePattern(config) {
   // For now we support both options
   const { blockList, blacklistRE } = config.resolver;
@@ -66,8 +65,21 @@ function getIgnorePattern(config) {
   const combine = (regexes) =>
     new RegExp(
       regexes
-        .map((regex) => "(" + regex.source.replaceAll("/", path.sep) + ")")
-        .join("|")
+        .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
@@ -76,7 +88,7 @@ function getIgnorePattern(config) {
   }
   return ignorePattern;
 }
-function createHasteMap(config, options) {
+function createFileMap(config, options) {
   const dependencyExtractor =
     options?.extractDependencies === false
       ? null
@@ -110,7 +122,10 @@ function createHasteMap(config, options) {
     ignorePattern: getIgnorePattern(config),
     maxWorkers: config.maxWorkers,
     mocksPattern: "",
-    platforms: config.resolver.platforms,
+    platforms: [
+      ...config.resolver.platforms,
+      _metroFileMap.default.H.NATIVE_PLATFORM,
+    ],
     retainAllFiles: true,
     resetCache: config.resetCache,
     rootDir: config.projectRoot,
@@ -121,4 +136,4 @@ function createHasteMap(config, options) {
     watchmanDeferStates: config.watcher.watchman.deferStates,
   });
 }
-module.exports = createHasteMap;
+module.exports = createFileMap;

package/src/node-haste/DependencyGraph/{createHasteMap.js.flow → createFileMap.js.flow}

@@ -14,7 +14,6 @@ import type {ConfigT} from 'metro-config/src/configTypes.flow';
 import MetroFileMap, {DiskCacheManager} from 'metro-file-map';
 
 const ci = require('ci-info');
-const path = require('path');
 
 function getIgnorePattern(config: ConfigT): RegExp {
   // For now we support both options
@@ -29,8 +28,21 @@ function getIgnorePattern(config: ConfigT): RegExp {
   const combine = (regexes: Array<RegExp>) =>
     new RegExp(
       regexes
-        .map(regex => '(' + regex.source.replaceAll('/', path.sep) + ')')
+        .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
@@ -41,7 +53,7 @@ function getIgnorePattern(config: ConfigT): RegExp {
   return ignorePattern;
 }
 
-function createHasteMap(
+function createFileMap(
   config: ConfigT,
   options?: $ReadOnly<{
     extractDependencies?: boolean,
@@ -84,7 +96,7 @@ function createHasteMap(
     ignorePattern: getIgnorePattern(config),
     maxWorkers: config.maxWorkers,
     mocksPattern: '',
-    platforms: config.resolver.platforms,
+    platforms: [...config.resolver.platforms, MetroFileMap.H.NATIVE_PLATFORM],
     retainAllFiles: true,
     resetCache: config.resetCache,
     rootDir: config.projectRoot,
@@ -96,4 +108,4 @@ function createHasteMap(
   });
 }
 
-module.exports = createHasteMap;
+module.exports = createFileMap;

package/src/node-haste/DependencyGraph.js

@@ -13,7 +13,7 @@ var _metroFileMap = require("metro-file-map");
  */
 
 const canonicalize = require("metro-core/src/canonicalize");
-const createHasteMap = require("./DependencyGraph/createHasteMap");
+const createFileMap = require("./DependencyGraph/createFileMap");
 const { ModuleResolver } = require("./DependencyGraph/ModuleResolution");
 const ModuleCache = require("./ModuleCache");
 const { EventEmitter } = require("events");
@@ -47,34 +47,32 @@ class DependencyGraph extends EventEmitter {
       type: "dep_graph_loading",
       hasReducedPerformance: !!hasReducedPerformance,
     });
-    const haste = createHasteMap(config, {
+    const fileMap = createFileMap(config, {
       watch,
     });
 
     // We can have a lot of graphs listening to Haste for changes.
     // Bump this up to silence the max listeners EventEmitter warning.
-    haste.setMaxListeners(1000);
-    this._haste = haste;
+    fileMap.setMaxListeners(1000);
+    this._haste = fileMap;
     this._haste.on("status", (status) => this._onWatcherStatus(status));
-    this._readyPromise = haste
-      .build()
-      .then(({ fileSystem, hasteModuleMap }) => {
-        log(createActionEndEntry(initializingMetroLogEntry));
-        config.reporter.update({
-          type: "dep_graph_loaded",
-        });
-        this._fileSystem = fileSystem;
-        this._hasteModuleMap = hasteModuleMap;
-        this._haste.on("change", (changeEvent) =>
-          this._onHasteChange(changeEvent)
-        );
-        this._haste.on("healthCheck", (result) =>
-          this._onWatcherHealthCheck(result)
-        );
-        this._resolutionCache = new Map();
-        this._moduleCache = this._createModuleCache();
-        this._createModuleResolver();
+    this._readyPromise = fileMap.build().then(({ fileSystem, hasteMap }) => {
+      log(createActionEndEntry(initializingMetroLogEntry));
+      config.reporter.update({
+        type: "dep_graph_loaded",
       });
+      this._fileSystem = fileSystem;
+      this._hasteMap = hasteMap;
+      this._haste.on("change", (changeEvent) =>
+        this._onHasteChange(changeEvent)
+      );
+      this._haste.on("healthCheck", (result) =>
+        this._onWatcherHealthCheck(result)
+      );
+      this._resolutionCache = new Map();
+      this._moduleCache = this._createModuleCache();
+      this._createModuleResolver();
+    });
   }
   _onWatcherHealthCheck(result) {
     this._config.reporter.update({
@@ -143,9 +141,9 @@ class DependencyGraph extends EventEmitter {
       emptyModulePath: this._config.resolver.emptyModulePath,
       extraNodeModules: this._config.resolver.extraNodeModules,
       getHasteModulePath: (name, platform) =>
-        this._hasteModuleMap.getModule(name, platform, true),
+        this._hasteMap.getModule(name, platform, true),
       getHastePackagePath: (name, platform) =>
-        this._hasteModuleMap.getPackage(name, platform, true),
+        this._hasteMap.getPackage(name, platform, true),
       mainFields: this._config.resolver.resolverMainFields,
       moduleCache: this._moduleCache,
       nodeModulesPaths: this._config.resolver.nodeModulesPaths,
@@ -231,7 +229,13 @@ class DependencyGraph extends EventEmitter {
 
   /** Given a search context, return a list of file paths matching the query. */
   matchFilesWithContext(from, context) {
-    return this._fileSystem.matchFilesWithContext(from, context);
+    return this._fileSystem.matchFiles({
+      rootDir: from,
+      recursive: context.recursive,
+      filter: context.filter,
+      filterComparePosix: true,
+      follow: true,
+    });
   }
   resolveDependency(
     from,

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

@@ -14,7 +14,7 @@ import type {ConfigT} from 'metro-config/src/configTypes.flow';
 import type MetroFileMap, {
   ChangeEvent,
   FileSystem,
-  IModuleMap,
+  HasteMap,
   HealthCheckResult,
   WatcherStatus,
 } from 'metro-file-map';
@@ -22,7 +22,7 @@ import type MetroFileMap, {
 import {DuplicateHasteCandidatesError} from 'metro-file-map';
 
 const canonicalize = require('metro-core/src/canonicalize');
-const createHasteMap = require('./DependencyGraph/createHasteMap');
+const createFileMap = require('./DependencyGraph/createFileMap');
 const {ModuleResolver} = require('./DependencyGraph/ModuleResolution');
 const ModuleCache = require('./ModuleCache');
 const {EventEmitter} = require('events');
@@ -57,7 +57,7 @@ class DependencyGraph extends EventEmitter {
   _haste: MetroFileMap;
   _fileSystem: FileSystem;
   _moduleCache: ModuleCache;
-  _hasteModuleMap: IModuleMap;
+  _hasteMap: HasteMap;
   _moduleResolver: ModuleResolver<Package>;
   _resolutionCache: Map<
     // Custom resolver options
@@ -98,21 +98,21 @@ class DependencyGraph extends EventEmitter {
       type: 'dep_graph_loading',
       hasReducedPerformance: !!hasReducedPerformance,
     });
-    const haste = createHasteMap(config, {watch});
+    const fileMap = createFileMap(config, {watch});
 
     // We can have a lot of graphs listening to Haste for changes.
     // Bump this up to silence the max listeners EventEmitter warning.
-    haste.setMaxListeners(1000);
+    fileMap.setMaxListeners(1000);
 
-    this._haste = haste;
+    this._haste = fileMap;
     this._haste.on('status', status => this._onWatcherStatus(status));
 
-    this._readyPromise = haste.build().then(({fileSystem, hasteModuleMap}) => {
+    this._readyPromise = fileMap.build().then(({fileSystem, hasteMap}) => {
       log(createActionEndEntry(initializingMetroLogEntry));
       config.reporter.update({type: 'dep_graph_loaded'});
 
       this._fileSystem = fileSystem;
-      this._hasteModuleMap = hasteModuleMap;
+      this._hasteMap = hasteMap;
 
       this._haste.on('change', changeEvent => this._onHasteChange(changeEvent));
       this._haste.on('healthCheck', result =>
@@ -191,9 +191,9 @@ class DependencyGraph extends EventEmitter {
       emptyModulePath: this._config.resolver.emptyModulePath,
       extraNodeModules: this._config.resolver.extraNodeModules,
       getHasteModulePath: (name, platform) =>
-        this._hasteModuleMap.getModule(name, platform, true),
+        this._hasteMap.getModule(name, platform, true),
       getHastePackagePath: (name, platform) =>
-        this._hasteModuleMap.getPackage(name, platform, true),
+        this._hasteMap.getPackage(name, platform, true),
       mainFields: this._config.resolver.resolverMainFields,
       moduleCache: this._moduleCache,
       nodeModulesPaths: this._config.resolver.nodeModulesPaths,
@@ -298,8 +298,14 @@ class DependencyGraph extends EventEmitter {
       /* Filter relative paths against a pattern. */
       filter: RegExp,
     }>,
-  ): string[] {
-    return this._fileSystem.matchFilesWithContext(from, context);
+  ): Iterable<string> {
+    return this._fileSystem.matchFiles({
+      rootDir: from,
+      recursive: context.recursive,
+      filter: context.filter,
+      filterComparePosix: true,
+      follow: true,
+    });
   }
 
   resolveDependency(