metro-source-map 0.80.12 → 0.81.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro-source-map",
-  "version": "0.80.12",
+  "version": "0.81.0-alpha.1",
   "description": "🚇 Source map generator for Metro.",
   "main": "src/source-map.js",
   "repository": {
@@ -12,23 +12,24 @@
     "cleanup-release": "test ! -e build && mv src build && mv src.real src"
   },
   "dependencies": {
-    "@babel/traverse": "^7.20.0",
-    "@babel/types": "^7.20.0",
+    "@babel/traverse": "^7.25.3",
+    "@babel/traverse--for-generate-function-map": "npm:@babel/traverse@^7.25.3",
+    "@babel/types": "^7.25.2",
     "flow-enums-runtime": "^0.0.6",
     "invariant": "^2.2.4",
-    "metro-symbolicate": "0.80.12",
+    "metro-symbolicate": "0.81.0-alpha.1",
     "nullthrows": "^1.1.1",
-    "ob1": "0.80.12",
+    "ob1": "0.81.0-alpha.1",
     "source-map": "^0.5.6",
     "vlq": "^1.0.0"
   },
   "license": "MIT",
   "devDependencies": {
-    "@babel/core": "^7.20.0",
-    "@babel/parser": "^7.20.0",
+    "@babel/core": "^7.25.2",
+    "@babel/parser": "^7.25.3",
     "terser": "^5.15.0"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=18.18"
   }
 }

package/src/generateFunctionMap.js

@@ -1,9 +1,11 @@
 "use strict";
 
-var _traverse = _interopRequireDefault(require("@babel/traverse"));
+var _traverseForGenerateFunctionMap = _interopRequireDefault(
+  require("@babel/traverse--for-generate-function-map")
+);
 var _types = require("@babel/types");
-function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : { default: obj };
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : { default: e };
 }
 const B64Builder = require("./B64Builder");
 const t = require("@babel/types");
@@ -116,15 +118,12 @@ function getFunctionMapVisitor(context, pushMapping) {
 }
 function forEachMapping(ast, context, pushMapping) {
   const visitor = getFunctionMapVisitor(context, pushMapping);
-  const previousCache = _traverse.default.cache.path;
-  _traverse.default.cache.clearPath();
-  (0, _traverse.default)(ast, {
+  (0, _traverseForGenerateFunctionMap.default)(ast, {
     noScope: true,
     Function: visitor,
     Program: visitor,
     Class: visitor,
   });
-  _traverse.default.cache.path = previousCache;
 }
 const ANONYMOUS_NAME = "<anonymous>";
 function getNameForPath(path) {

package/src/generateFunctionMap.js.flow

@@ -17,7 +17,8 @@ import type {NodePath} from '@babel/traverse';
 import type {Node} from '@babel/types';
 import type {MetroBabelFileMetadata} from 'metro-babel-transformer';
 
-import traverse from '@babel/traverse';
+// $FlowFixMe[cannot-resolve-module] - resolves to @babel/traverse
+import traverseForGenerateFunctionMap from '@babel/traverse--for-generate-function-map';
 import {
   isAssignmentExpression,
   isClassBody,
@@ -156,7 +157,7 @@ function getFunctionMapVisitor(
 ): FunctionMapVisitor {
   const nameStack: Array<{loc: BabelNodeSourceLocation, name: string}> = [];
   let tailPos = {line: 1, column: 0};
-  let tailName = null;
+  let tailName: null | string = null;
 
   function advanceToPos(pos: {column: number, line: number}) {
     if (tailPos && positionGreater(pos, tailPos)) {
@@ -222,11 +223,9 @@ function forEachMapping(
 
   // Traversing populates/pollutes the path cache (`traverse.cache.path`) with
   // values missing the `hub` property needed by Babel transformation, so we
-  // save, clear, and restore the cache around our traversal.
-  // See: https://github.com/facebook/metro/pull/854#issuecomment-1336499395
-  const previousCache = traverse.cache.path;
-  traverse.cache.clearPath();
-  traverse(ast, {
+  // use a separate copy of traverse to populate a separate cache to not pollute
+  // the main @babel/traverse cache. See: https://github.com/facebook/metro/pull/1340
+  traverseForGenerateFunctionMap(ast, {
     // Our visitor doesn't care about scope
     noScope: true,
 
@@ -234,7 +233,6 @@ function forEachMapping(
     Program: visitor,
     Class: visitor,
   });
-  traverse.cache.path = previousCache;
 }
 
 const ANONYMOUS_NAME = '<anonymous>';