metro 0.83.2 → 0.83.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.83.2",
+  "version": "0.83.4",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -18,14 +18,14 @@
     "cleanup-release": "test ! -e build && mv src build && mv src.real src"
   },
   "dependencies": {
-    "@babel/code-frame": "^7.24.7",
+    "@babel/code-frame": "^7.29.0",
     "@babel/core": "^7.25.2",
-    "@babel/generator": "^7.25.0",
-    "@babel/parser": "^7.25.3",
-    "@babel/template": "^7.25.0",
-    "@babel/traverse": "^7.25.3",
-    "@babel/types": "^7.25.2",
-    "accepts": "^1.3.7",
+    "@babel/generator": "^7.29.1",
+    "@babel/parser": "^7.29.0",
+    "@babel/template": "^7.28.6",
+    "@babel/traverse": "^7.29.0",
+    "@babel/types": "^7.29.0",
+    "accepts": "^2.0.0",
     "chalk": "^4.0.0",
     "ci-info": "^2.0.0",
     "connect": "^3.6.5",
@@ -33,25 +33,25 @@
     "error-stack-parser": "^2.0.6",
     "flow-enums-runtime": "^0.0.6",
     "graceful-fs": "^4.2.4",
-    "hermes-parser": "0.32.0",
+    "hermes-parser": "0.33.3",
     "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.83.2",
-    "metro-cache": "0.83.2",
-    "metro-cache-key": "0.83.2",
-    "metro-config": "0.83.2",
-    "metro-core": "0.83.2",
-    "metro-file-map": "0.83.2",
-    "metro-resolver": "0.83.2",
-    "metro-runtime": "0.83.2",
-    "metro-source-map": "0.83.2",
-    "metro-symbolicate": "0.83.2",
-    "metro-transform-plugins": "0.83.2",
-    "metro-transform-worker": "0.83.2",
-    "mime-types": "^2.1.27",
+    "metro-babel-transformer": "0.83.4",
+    "metro-cache": "0.83.4",
+    "metro-cache-key": "0.83.4",
+    "metro-config": "0.83.4",
+    "metro-core": "0.83.4",
+    "metro-file-map": "0.83.4",
+    "metro-resolver": "0.83.4",
+    "metro-runtime": "0.83.4",
+    "metro-source-map": "0.83.4",
+    "metro-symbolicate": "0.83.4",
+    "metro-transform-plugins": "0.83.4",
+    "metro-transform-worker": "0.83.4",
+    "mime-types": "^3.0.1",
     "nullthrows": "^1.1.1",
     "serialize-error": "^2.1.0",
     "source-map": "^0.5.6",
@@ -65,11 +65,13 @@
     "@babel/plugin-transform-runtime": "^7.24.7",
     "@react-native/babel-preset": "0.78.0",
     "@react-native/metro-babel-transformer": "0.78.0",
+    "@types/ws": "^7.4.7",
+    "@types/yargs": "^17.0.35",
     "babel-jest": "^29.7.0",
     "dedent": "^0.7.0",
     "jest-snapshot": "^29.7.0",
     "jest-snapshot-serializer-raw": "^1.2.0",
-    "metro-babel-register": "0.83.2",
+    "metro-babel-register": "0.83.4",
     "metro-memory-fs": "*",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",

package/src/Assets.js

@@ -17,30 +17,41 @@ var _fs = _interopRequireDefault(require("fs"));
 var _imageSize = _interopRequireDefault(require("image-size"));
 var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
-}
-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);
+  return e && e.__esModule
+    ? e
+    : {
+        default: 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 isAssetTypeAnImage(type) {
   return (
@@ -158,7 +169,7 @@ async function getAssetData(
   assetPath,
   localPath,
   assetDataPlugins,
-  platform = null,
+  platform,
   publicPath,
 ) {
   let assetUrlPath = localPath.startsWith("..")
@@ -166,7 +177,7 @@ async function getAssetData(
     : _path.default.join(publicPath, _path.default.dirname(localPath));
   assetUrlPath = (0, _pathUtils.normalizePathSeparatorsToPosix)(assetUrlPath);
   const isImage = isAssetTypeAnImage(_path.default.extname(assetPath).slice(1));
-  const assetInfo = await getAbsoluteAssetInfo(assetPath, platform);
+  const assetInfo = await getAbsoluteAssetInfo(assetPath, platform ?? null);
   const isImageInput = assetInfo.files[0].includes(".zip/")
     ? _fs.default.readFileSync(assetInfo.files[0])
     : assetInfo.files[0];
@@ -203,8 +214,9 @@ async function getAsset(
   relativePath,
   projectRoot,
   watchFolders,
-  platform = null,
+  platform,
   assetExts,
+  fileExistsInFileMap,
 ) {
   const assetData = AssetPaths.parse(
     relativePath,
@@ -216,12 +228,20 @@ async function getAsset(
       `'${relativePath}' cannot be loaded as its extension is not registered in assetExts`,
     );
   }
-  if (!pathBelongsToRoots(absolutePath, [projectRoot, ...watchFolders])) {
-    throw new Error(
-      `'${relativePath}' could not be found, because it cannot be found in the project root or any watch folder`,
-    );
+  if (fileExistsInFileMap != null) {
+    if (!fileExistsInFileMap(absolutePath)) {
+      throw new Error(
+        `'${relativePath}' could not be found, because it is not within the projectRoot or watchFolders, or it is blocked via the resolver.blockList config`,
+      );
+    }
+  } else {
+    if (!pathBelongsToRoots(absolutePath, [projectRoot, ...watchFolders])) {
+      throw new Error(
+        `'${relativePath}' could not be found, because it cannot be found in the project root or any watch folder`,
+      );
+    }
   }
-  const record = await getAbsoluteAssetRecord(absolutePath, platform);
+  const record = await getAbsoluteAssetRecord(absolutePath, platform ?? null);
   for (let i = 0; i < record.scales.length; i++) {
     if (record.scales[i] >= assetData.resolution) {
       return _fs.default.promises.readFile(record.files[i]);

package/src/Assets.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
  */
@@ -15,6 +15,7 @@ import {normalizePathSeparatorsToPosix} from './lib/pathUtils';
 import * as AssetPaths from './node-haste/lib/AssetPaths';
 import crypto from 'crypto';
 import fs from 'fs';
+// $FlowFixMe[untyped-import] image-size
 import getImageSize from 'image-size';
 import path from 'path';
 
@@ -92,7 +93,7 @@ export type AssetDataPlugin = (
 
 function buildAssetMap(
   dir: string,
-  files: $ReadOnlyArray<string>,
+  files: ReadonlyArray<string>,
   platform: ?string,
 ): Map<string, {files: Array<string>, scales: Array<number>}> {
   const platforms = new Set(platform != null ? [platform] : []);
@@ -200,8 +201,8 @@ async function getAbsoluteAssetInfo(
 export async function getAssetData(
   assetPath: string,
   localPath: string,
-  assetDataPlugins: $ReadOnlyArray<string>,
-  platform: ?string = null,
+  assetDataPlugins: ReadonlyArray<string>,
+  platform: ?string,
   publicPath: string,
 ): Promise<AssetData> {
   // If the path of the asset is outside of the projectRoot, we don't want to
@@ -215,7 +216,7 @@ export async function getAssetData(
   assetUrlPath = normalizePathSeparatorsToPosix(assetUrlPath);
 
   const isImage = isAssetTypeAnImage(path.extname(assetPath).slice(1));
-  const assetInfo = await getAbsoluteAssetInfo(assetPath, platform);
+  const assetInfo = await getAbsoluteAssetInfo(assetPath, platform ?? null);
 
   const isImageInput = assetInfo.files[0].includes('.zip/')
     ? fs.readFileSync(assetInfo.files[0])
@@ -239,7 +240,7 @@ export async function getAssetData(
 }
 
 async function applyAssetDataPlugins(
-  assetDataPlugins: $ReadOnlyArray<string>,
+  assetDataPlugins: ReadonlyArray<string>,
   assetData: AssetData,
 ): Promise<AssetData> {
   if (!assetDataPlugins.length) {
@@ -279,9 +280,10 @@ export async function getAssetFiles(
 export async function getAsset(
   relativePath: string,
   projectRoot: string,
-  watchFolders: $ReadOnlyArray<string>,
-  platform: ?string = null,
-  assetExts: $ReadOnlyArray<string>,
+  watchFolders: ReadonlyArray<string>,
+  platform: ?string,
+  assetExts: ReadonlyArray<string>,
+  fileExistsInFileMap?: (absolutePath: string) => boolean,
 ): Promise<Buffer> {
   const assetData = AssetPaths.parse(
     relativePath,
@@ -296,13 +298,22 @@ export async function getAsset(
     );
   }
 
-  if (!pathBelongsToRoots(absolutePath, [projectRoot, ...watchFolders])) {
-    throw new Error(
-      `'${relativePath}' could not be found, because it cannot be found in the project root or any watch folder`,
-    );
+  // NOTE: If fileExistsInFileMap is not provided, we fall back to pathBelongsToRoots for backward compatibility, as getAsset is part of the public API.
+  if (fileExistsInFileMap != null) {
+    if (!fileExistsInFileMap(absolutePath)) {
+      throw new Error(
+        `'${relativePath}' could not be found, because it is not within the projectRoot or watchFolders, or it is blocked via the resolver.blockList config`,
+      );
+    }
+  } else {
+    if (!pathBelongsToRoots(absolutePath, [projectRoot, ...watchFolders])) {
+      throw new Error(
+        `'${relativePath}' could not be found, because it cannot be found in the project root or any watch folder`,
+      );
+    }
   }
 
-  const record = await getAbsoluteAssetRecord(absolutePath, platform);
+  const record = await getAbsoluteAssetRecord(absolutePath, platform ?? null);
 
   for (let i = 0; i < record.scales.length; i++) {
     if (record.scales[i] >= assetData.resolution) {
@@ -315,7 +326,7 @@ export async function getAsset(
 
 function pathBelongsToRoots(
   pathToCheck: string,
-  roots: $ReadOnlyArray<string>,
+  roots: ReadonlyArray<string>,
 ): boolean {
   for (const rootFolder of roots) {
     if (pathToCheck.startsWith(path.resolve(rootFolder))) {

package/src/Bundler/util.js

@@ -9,30 +9,41 @@ var babylon = _interopRequireWildcard(require("@babel/parser"));
 var _template = _interopRequireDefault(require("@babel/template"));
 var babelTypes = _interopRequireWildcard(require("@babel/types"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
-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);
 }
 const assetPropertyBlockList = new Set(["files", "fileSystemLocation", "path"]);
 function generateAssetCodeFileAst(assetRegistryPath, assetDescriptor) {

package/src/Bundler/util.js.flow

@@ -67,8 +67,8 @@ function filterObject(
 }
 
 export function createRamBundleGroups<T: ModuleTransportLike>(
-  ramGroups: $ReadOnlyArray<string>,
-  groupableModules: $ReadOnlyArray<T>,
+  ramGroups: ReadonlyArray<string>,
+  groupableModules: ReadonlyArray<T>,
   subtree: SubTree<T>,
 ): Map<number, Set<number>> {
   // build two maps that allow to lookup module data

package/src/Bundler.js

@@ -11,7 +11,11 @@ var _DependencyGraph = _interopRequireDefault(
   require("./node-haste/DependencyGraph"),
 );
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 class Bundler {
   constructor(config, options) {

package/src/Bundler.js.flow

@@ -17,7 +17,7 @@ import type {ConfigT} from 'metro-config';
 import Transformer from './DeltaBundler/Transformer';
 import DependencyGraph from './node-haste/DependencyGraph';
 
-export type BundlerOptions = $ReadOnly<{
+export type BundlerOptions = Readonly<{
   hasReducedPerformance?: boolean,
   watch?: boolean,
 }>;

package/src/DeltaBundler/DeltaCalculator.js

@@ -8,7 +8,11 @@ var _Graph = require("./Graph");
 var _events = _interopRequireDefault(require("events"));
 var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 const debug = require("debug")("Metro:DeltaCalculator");
 class DeltaCalculator extends _events.default {
@@ -84,8 +88,8 @@ class DeltaCalculator extends _events.default {
       });
       return {
         added: this._graph.dependencies,
-        modified: new Map(),
         deleted: new Set(),
+        modified: new Map(),
         reset: true,
       };
     }
@@ -157,8 +161,8 @@ class DeltaCalculator extends _events.default {
       );
       return {
         added,
-        modified: new Map(),
         deleted: new Set(),
+        modified: new Map(),
         reset: true,
       };
     }
@@ -182,8 +186,8 @@ class DeltaCalculator extends _events.default {
     if (modifiedDependencies.length === 0) {
       return {
         added: new Map(),
-        modified: new Map(),
         deleted: new Set(),
+        modified: new Map(),
         reset: false,
       };
     }
@@ -200,8 +204,8 @@ class DeltaCalculator extends _events.default {
     );
     return {
       added,
-      modified,
       deleted,
+      modified,
       reset: false,
     };
   }

package/src/DeltaBundler/DeltaCalculator.js.flow

@@ -34,12 +34,12 @@ export default class DeltaCalculator<T> extends EventEmitter {
   _deletedFiles: Set<string> = new Set();
   _modifiedFiles: Set<string> = new Set();
   _addedFiles: Set<string> = new Set();
-  _requiresReset = false;
+  _requiresReset: boolean = false;
 
   _graph: Graph<T>;
 
   constructor(
-    entryPoints: $ReadOnlySet<string>,
+    entryPoints: ReadonlySet<string>,
     changeEventSource: EventEmitter,
     options: Options<T>,
   ) {
@@ -154,8 +154,8 @@ export default class DeltaCalculator<T> extends EventEmitter {
 
       return {
         added: this._graph.dependencies,
-        modified: new Map(),
         deleted: new Set(),
+        modified: new Map(),
         reset: true,
       };
     }
@@ -186,7 +186,7 @@ export default class DeltaCalculator<T> extends EventEmitter {
   _handleFileChange = (
     {type, filePath, metadata}: ChangeEvent['eventsQueue'][number],
     logger: ?RootPerfLogger,
-  ): mixed => {
+  ): unknown => {
     debug('Handling %s: %s (type: %s)', type, filePath, metadata.type);
     if (
       metadata.type === 'l' ||
@@ -234,7 +234,7 @@ export default class DeltaCalculator<T> extends EventEmitter {
         this._addedFiles.delete(filePath);
         break;
       default:
-        (nextState: empty);
+        nextState as empty;
     }
 
     // Notify users that there is a change in some of the bundle files. This
@@ -256,8 +256,8 @@ export default class DeltaCalculator<T> extends EventEmitter {
 
       return {
         added,
-        modified: new Map(),
         deleted: new Set(),
+        modified: new Map(),
         reset: true,
       };
     }
@@ -297,8 +297,8 @@ export default class DeltaCalculator<T> extends EventEmitter {
     if (modifiedDependencies.length === 0) {
       return {
         added: new Map(),
-        modified: new Map(),
         deleted: new Set(),
+        modified: new Map(),
         reset: false,
       };
     }
@@ -317,8 +317,8 @@ export default class DeltaCalculator<T> extends EventEmitter {
 
     return {
       added,
-      modified,
       deleted,
+      modified,
       reset: false,
     };
   }

package/src/DeltaBundler/Graph.js

@@ -11,18 +11,22 @@ var _buildSubgraph = require("./buildSubgraph");
 var _invariant = _interopRequireDefault(require("invariant"));
 var _nullthrows = _interopRequireDefault(require("nullthrows"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 function getInternalOptions({ transform, resolve, onProgress, lazy, shallow }) {
   let numProcessed = 0;
   let total = 0;
   return {
     lazy,
-    transform,
-    resolve,
     onDependencyAdd: () => onProgress && onProgress(numProcessed, ++total),
     onDependencyAdded: () => onProgress && onProgress(++numProcessed, total),
+    resolve,
     shallow,
+    transform,
   };
 }
 function isWeakOrLazy(dependency, options) {
@@ -88,11 +92,11 @@ class Graph {
     } catch (error) {
       const rollbackDelta = {
         added: delta.added,
+        baseModuleData: new Map(),
         deleted: delta.deleted,
+        errors: new Map(),
         touched: new Set(),
         updatedModuleData: delta.baseModuleData,
-        baseModuleData: new Map(),
-        errors: new Map(),
       };
       for (const modified of modifiedPathsInBaseGraph) {
         const module = this.dependencies.get(modified);
@@ -127,8 +131,8 @@ class Graph {
     }
     return {
       added,
-      modified,
       deleted: delta.deleted,
+      modified,
     };
   }
   async initialTraverseDependencies(options) {
@@ -155,8 +159,8 @@ class Graph {
     });
     return {
       added: this.dependencies,
-      modified: new Map(),
       deleted: new Set(),
+      modified: new Map(),
     };
   }
   async _buildDelta(pathsToVisit, options, moduleFilter) {
@@ -165,27 +169,27 @@ class Graph {
       this.#resolvedContexts,
       {
         resolve: options.resolve,
-        transform: async (absolutePath, requireContext) => {
-          options.onDependencyAdd();
-          const result = await options.transform(absolutePath, requireContext);
-          options.onDependencyAdded();
-          return result;
-        },
         shouldTraverse: (dependency) => {
           if (options.shallow || isWeakOrLazy(dependency, options)) {
             return false;
           }
           return moduleFilter == null || moduleFilter(dependency.absolutePath);
         },
+        transform: async (absolutePath, requireContext) => {
+          options.onDependencyAdd();
+          const result = await options.transform(absolutePath, requireContext);
+          options.onDependencyAdded();
+          return result;
+        },
       },
     );
     return {
       added: new Set(),
-      touched: new Set(),
-      deleted: new Set(),
-      updatedModuleData: subGraph.moduleData,
       baseModuleData: new Map(),
+      deleted: new Set(),
       errors: subGraph.errors,
+      touched: new Set(),
+      updatedModuleData: subGraph.moduleData,
     };
   }
   _recursivelyCommitModule(
@@ -462,9 +466,9 @@ class Graph {
     }
     return {
       dependencies: new Map(dependencies),
-      resolvedContexts,
       getSource,
       output,
+      resolvedContexts,
       unstable_transformResultKey,
     };
   }