metro 0.83.4 → 0.84.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.83.4",
+  "version": "0.84.0",
   "description": "🚇 The JavaScript bundler for React Native.",
   "main": "src/index.js",
   "bin": "src/cli.js",
@@ -11,7 +11,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git@github.com:facebook/metro.git"
+    "url": "git+https://github.com/facebook/metro.git",
+    "directory": "packages/metro"
   },
   "scripts": {
     "prepare-release": "test -d build && rm -rf src.real && mv src src.real && mv build src",
@@ -39,18 +40,18 @@
     "jest-worker": "^29.7.0",
     "jsc-safe-url": "^0.2.2",
     "lodash.throttle": "^4.1.1",
-    "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",
+    "metro-babel-transformer": "0.84.0",
+    "metro-cache": "0.84.0",
+    "metro-cache-key": "0.84.0",
+    "metro-config": "0.84.0",
+    "metro-core": "0.84.0",
+    "metro-file-map": "0.84.0",
+    "metro-resolver": "0.84.0",
+    "metro-runtime": "0.84.0",
+    "metro-source-map": "0.84.0",
+    "metro-symbolicate": "0.84.0",
+    "metro-transform-plugins": "0.84.0",
+    "metro-transform-worker": "0.84.0",
     "mime-types": "^3.0.1",
     "nullthrows": "^1.1.1",
     "serialize-error": "^2.1.0",
@@ -71,7 +72,7 @@
     "dedent": "^0.7.0",
     "jest-snapshot": "^29.7.0",
     "jest-snapshot-serializer-raw": "^1.2.0",
-    "metro-babel-register": "0.83.4",
+    "metro-babel-register": "0.84.0",
     "metro-memory-fs": "*",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",
@@ -79,6 +80,6 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=20.19.4"
+    "node": "^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0"
   }
 }

package/src/Assets.js

@@ -17,11 +17,7 @@ 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,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 function _interopRequireWildcard(e, t) {
   if ("function" == typeof WeakMap)
@@ -31,10 +27,7 @@ function _interopRequireWildcard(e, t) {
     if (!t && e && e.__esModule) return e;
     var o,
       i,
-      f = {
-        __proto__: null,
-        default: e,
-      };
+      f = { __proto__: null, default: e };
     if (null === e || ("object" != typeof e && "function" != typeof e))
       return f;
     if ((o = t ? n : r)) {

package/src/Bundler/util.js

@@ -9,11 +9,7 @@ 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 _interopRequireWildcard(e, t) {
   if ("function" == typeof WeakMap)
@@ -23,10 +19,7 @@ function _interopRequireWildcard(e, t) {
     if (!t && e && e.__esModule) return e;
     var o,
       i,
-      f = {
-        __proto__: null,
-        default: e,
-      };
+      f = { __proto__: null, default: e };
     if (null === e || ("object" != typeof e && "function" != typeof e))
       return f;
     if ((o = t ? n : r)) {

package/src/Bundler.js

@@ -11,11 +11,7 @@ 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/DeltaBundler/DeltaCalculator.js

@@ -8,11 +8,7 @@ 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 {

package/src/DeltaBundler/Graph.js

@@ -11,11 +11,7 @@ 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;

package/src/DeltaBundler/Serializers/baseJSBundle.js

@@ -11,11 +11,7 @@ var _processModules = _interopRequireDefault(
   require("./helpers/processModules"),
 );
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 function baseJSBundle(entryPoint, preModules, graph, options) {
   for (const module of graph.dependencies.values()) {

package/src/DeltaBundler/Serializers/getAssets.js

@@ -8,11 +8,7 @@ var _Assets = require("../../Assets");
 var _js = require("./helpers/js");
 var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 async function getAssets(dependencies, options) {
   const promises = [];

package/src/DeltaBundler/Serializers/getRamBundleInfo.js

@@ -16,11 +16,7 @@ var _sourceMapObject = require("./sourceMapObject");
 var _nullthrows = _interopRequireDefault(require("nullthrows"));
 var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 async function getRamBundleInfo(entryPoint, pre, graph, options) {
   let modules = [...pre, ...graph.dependencies.values()];

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

@@ -21,10 +21,7 @@ function _interopRequireWildcard(e, t) {
     if (!t && e && e.__esModule) return e;
     var o,
       i,
-      f = {
-        __proto__: null,
-        default: e,
-      };
+      f = { __proto__: null, default: e };
     if (null === e || ("object" != typeof e && "function" != typeof e))
       return f;
     if ((o = t ? n : r)) {
@@ -44,11 +41,7 @@ function _interopRequireWildcard(e, t) {
   })(e, t);
 }
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 function wrapModule(module, options) {
   const output = getJsOutput(module);

package/src/DeltaBundler/Serializers/hmrJSBundle.js

@@ -9,11 +9,7 @@ var jscSafeUrl = _interopRequireWildcard(require("jsc-safe-url"));
 var _metroTransformPlugins = require("metro-transform-plugins");
 var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 function _interopRequireWildcard(e, t) {
   if ("function" == typeof WeakMap)
@@ -23,10 +19,7 @@ function _interopRequireWildcard(e, t) {
     if (!t && e && e.__esModule) return e;
     var o,
       i,
-      f = {
-        __proto__: null,
-        default: e,
-      };
+      f = { __proto__: null, default: e };
     if (null === e || ("object" != typeof e && "function" != typeof e))
       return f;
     if ((o = t ? n : r)) {

package/src/DeltaBundler/Serializers/sourceMapGenerator.js

@@ -11,11 +11,7 @@ var _getSourceMapInfo = _interopRequireDefault(
 var _js = require("./helpers/js");
 var _metroSourceMap = require("metro-source-map");
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 function getSourceMapInfosImpl(isBlocking, onDone, modules, options) {
   const sourceMapInfos = [];

package/src/DeltaBundler/Transformer.js

@@ -15,11 +15,7 @@ var _fs = _interopRequireDefault(require("fs"));
 var _metroCache = require("metro-cache");
 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:Transformer");
 class Transformer {

package/src/DeltaBundler/Worker.flow.js

@@ -9,11 +9,7 @@ var _crypto = _interopRequireDefault(require("crypto"));
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 function asDeserializedBuffer(value) {
   if (Buffer.isBuffer(value)) {

package/src/DeltaBundler/buildSubgraph.js

@@ -8,11 +8,7 @@ var _contextModule = require("../lib/contextModule");
 var _isResolvedDependency = require("../lib/isResolvedDependency");
 var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 function resolveDependencies(parentPath, dependencies, resolve) {
   const maybeResolvedDeps = new Map();

package/src/DeltaBundler/getTransformCacheKey.js

@@ -7,11 +7,7 @@ exports.default = getTransformCacheKey;
 var _crypto = _interopRequireDefault(require("crypto"));
 var _metroCacheKey = require("metro-cache-key");
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 const VERSION = require("../../package.json").version;
 function getTransformCacheKey(opts) {

package/src/DeltaBundler/types.js

@@ -2,9 +2,5 @@
 
 var _CountingSet = _interopRequireDefault(require("../lib/CountingSet"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }

package/src/DeltaBundler.js

@@ -8,11 +8,7 @@ var _DeltaCalculator = _interopRequireDefault(
   require("./DeltaBundler/DeltaCalculator"),
 );
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 class DeltaBundler {
   _deltaCalculators = new Map();

package/src/HmrServer.js

@@ -39,10 +39,7 @@ function _interopRequireWildcard(e, t) {
     if (!t && e && e.__esModule) return e;
     var o,
       i,
-      f = {
-        __proto__: null,
-        default: e,
-      };
+      f = { __proto__: null, default: e };
     if (null === e || ("object" != typeof e && "function" != typeof e))
       return f;
     if ((o = t ? n : r)) {
@@ -62,11 +59,7 @@ function _interopRequireWildcard(e, t) {
   })(e, t);
 }
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 const debug = require("debug")("Metro:HMR");
 const { createActionStartEntry, createActionEndEntry, log } = _metroCore.Logger;

package/src/IncrementalBundler.js

@@ -27,10 +27,7 @@ function _interopRequireWildcard(e, t) {
     if (!t && e && e.__esModule) return e;
     var o,
       i,
-      f = {
-        __proto__: null,
-        default: e,
-      };
+      f = { __proto__: null, default: e };
     if (null === e || ("object" != typeof e && "function" != typeof e))
       return f;
     if ((o = t ? n : r)) {
@@ -50,11 +47,7 @@ function _interopRequireWildcard(e, t) {
   })(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");

package/src/ModuleGraph/worker/JsFileWrapping.js

@@ -20,10 +20,7 @@ function _interopRequireWildcard(e, t) {
     if (!t && e && e.__esModule) return e;
     var o,
       i,
-      f = {
-        __proto__: null,
-        default: e,
-      };
+      f = { __proto__: null, default: e };
     if (null === e || ("object" != typeof e && "function" != typeof e))
       return f;
     if ((o = t ? n : r)) {
@@ -43,11 +40,7 @@ function _interopRequireWildcard(e, t) {
   })(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/collectDependencies.js

@@ -20,10 +20,7 @@ function _interopRequireWildcard(e, t) {
     if (!t && e && e.__esModule) return e;
     var o,
       i,
-      f = {
-        __proto__: null,
-        default: e,
-      };
+      f = { __proto__: null, default: e };
     if (null === e || ("object" != typeof e && "function" != typeof e))
       return f;
     if ((o = t ? n : r)) {
@@ -43,11 +40,7 @@ function _interopRequireWildcard(e, t) {
   })(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/generateImportNames.js

@@ -7,11 +7,7 @@ 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/Server/MultipartResponse.js

@@ -6,11 +6,7 @@ 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.js

@@ -66,10 +66,7 @@ function _interopRequireWildcard(e, t) {
     if (!t && e && e.__esModule) return e;
     var o,
       i,
-      f = {
-        __proto__: null,
-        default: e,
-      };
+      f = { __proto__: null, default: e };
     if (null === e || ("object" != typeof e && "function" != typeof e))
       return f;
     if ((o = t ? n : r)) {
@@ -89,11 +86,7 @@ function _interopRequireWildcard(e, t) {
   })(e, t);
 }
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 const debug = require("debug")("Metro:Server");
 const { createActionStartEntry, createActionEndEntry, log } = _metroCore.Logger;
@@ -136,6 +129,8 @@ class Server {
       ]),
     ];
     this._isEnded = false;
+    this._fetchTimings = [];
+    this._activeFetchCount = 0;
     this._createModuleId = config.serializer.createModuleIdFactory();
     this._bundler = new _IncrementalBundler.default(config, {
       hasReducedPerformance: options && options.hasReducedPerformance,
@@ -748,8 +743,16 @@ class Server {
       const logEntry = log(
         createActionStartEntry(createStartEntry(startContext)),
       );
+      const fetchTiming = {
+        graphId,
+        startTime: requestStartTimestamp,
+        endTime: null,
+        isPrefetch: req.method === "HEAD",
+      };
       let result;
       try {
+        this._fetchTimings.push(fetchTiming);
+        this._activeFetchCount++;
         result = await build(startContext);
       } catch (error) {
         const formattedError = (0, _formatBundlingError.default)(error);
@@ -779,6 +782,31 @@ class Server {
         debug("Bundling error", error);
         buildContext.bundlePerfLogger.end("FAIL");
         return;
+      } finally {
+        fetchTiming.endTime =
+          _perf_hooks.performance.timeOrigin + _perf_hooks.performance.now();
+        if (!fetchTiming.isPrefetch) {
+          buildContext.bundlePerfLogger.annotate({
+            bool: {
+              had_competing_prefetch: this._fetchTimings
+                .filter((t) => t.isPrefetch && t.graphId !== graphId)
+                .some((prefetch) => {
+                  const prefetchEndTime =
+                    prefetch.endTime ?? Number.MAX_SAFE_INTEGER;
+                  const fetchEndTime =
+                    fetchTiming.endTime ?? Number.MAX_SAFE_INTEGER;
+                  return (
+                    prefetch.startTime < fetchEndTime &&
+                    prefetchEndTime > fetchTiming.startTime
+                  );
+                }),
+            },
+          });
+        }
+        this._activeFetchCount--;
+        if (this._activeFetchCount === 0) {
+          this._fetchTimings = [];
+        }
       }
       const endContext = {
         ...startContext,

package/src/Server.js.flow

@@ -130,6 +130,13 @@ export type ServerOptions = Readonly<{
 const DELTA_ID_HEADER = 'X-Metro-Delta-ID';
 const FILES_CHANGED_COUNT_HEADER = 'X-Metro-Files-Changed-Count';
 
+type FetchTiming = {
+  graphId: GraphId,
+  startTime: number,
+  endTime: number | null,
+  isPrefetch: boolean,
+};
+
 export default class Server {
   _bundler: IncrementalBundler;
   _config: ConfigT;
@@ -144,6 +151,8 @@ export default class Server {
   _sourceRequestRoutingMap: ReadonlyArray<
     [pathnamePrefix: string, normalizedRootDir: string],
   >;
+  _fetchTimings: Array<FetchTiming>;
+  _activeFetchCount: number;
 
   constructor(config: ConfigT, options?: ServerOptions) {
     this._config = config;
@@ -176,6 +185,8 @@ export default class Server {
       ]),
     ];
     this._isEnded = false;
+    this._fetchTimings = [];
+    this._activeFetchCount = 0;
 
     // TODO(T34760917): These two properties should eventually be instantiated
     // elsewhere and passed as parameters, since they are also needed by
@@ -926,8 +937,18 @@ export default class Server {
         createActionStartEntry(createStartEntry(startContext)),
       );
 
+      const fetchTiming: FetchTiming = {
+        graphId,
+        startTime: requestStartTimestamp,
+        endTime: null,
+        isPrefetch: req.method === 'HEAD',
+      };
+
       let result;
       try {
+        this._fetchTimings.push(fetchTiming);
+        this._activeFetchCount++;
+
         result = await build(startContext);
       } catch (error) {
         const formattedError = formatBundlingError(error);
@@ -960,6 +981,33 @@ export default class Server {
         buildContext.bundlePerfLogger.end('FAIL');
 
         return;
+      } finally {
+        fetchTiming.endTime = performance.timeOrigin + performance.now();
+
+        if (!fetchTiming.isPrefetch) {
+          buildContext.bundlePerfLogger.annotate({
+            bool: {
+              had_competing_prefetch: this._fetchTimings
+                // fetching the same bundle as a prefetch don't compete, since they resolve a shared promise for the same graph id
+                .filter(t => t.isPrefetch && t.graphId !== graphId)
+                .some(prefetch => {
+                  const prefetchEndTime =
+                    prefetch.endTime ?? Number.MAX_SAFE_INTEGER;
+                  const fetchEndTime =
+                    fetchTiming.endTime ?? Number.MAX_SAFE_INTEGER;
+                  return (
+                    prefetch.startTime < fetchEndTime &&
+                    prefetchEndTime > fetchTiming.startTime
+                  );
+                }),
+            },
+          });
+        }
+
+        this._activeFetchCount--;
+        if (this._activeFetchCount === 0) {
+          this._fetchTimings = [];
+        }
       }
 
       const endContext: ProcessEndContext<T> = {

package/src/cli-utils.js

@@ -6,11 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.watchFile = exports.makeAsyncCommand = void 0;
 var _fs = _interopRequireDefault(require("fs"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 const watchFile = async function (filename, callback) {
   _fs.default.watchFile(filename, () => {

package/src/commands/build.js

@@ -14,11 +14,7 @@ var _TerminalReporter = _interopRequireDefault(
 var _metroConfig = require("metro-config");
 var _metroCore = require("metro-core");
 function _interopRequireDefault(e) {
-  return e && e.__esModule
-    ? e
-    : {
-        default: e,
-      };
+  return e && e.__esModule ? e : { default: e };
 }
 const term = new _metroCore.Terminal(process.stdout);
 const updateReporter = new _TerminalReporter.default(term);