@expo/metro-config 58.0.1 → 58.0.3

package/build/serializer/sourceMap.js

@@ -10,10 +10,12 @@ Object.defineProperty(exports, "__esModule", {
 0 && (module.exports = {
     appendDebugIdToSourceMap: null,
     composeSourceMaps: null,
-    patchMetroSourceMapStringForPackedMaps: null,
+    flattenSourceMap: null,
     rawMappingsToEncodedMap: null,
     sourceMapString: null,
-    sourceMapStringNonBlocking: null
+    sourceMapStringNonBlocking: null,
+    vlqMapFromDecodedMap: null,
+    vlqMapFromEncodedMap: null
 });
 function _export(target, all) {
     for(var name in all)Object.defineProperty(target, name, {
@@ -28,8 +30,8 @@ _export(exports, {
     get composeSourceMaps () {
         return composeSourceMaps;
     },
-    get patchMetroSourceMapStringForPackedMaps () {
-        return patchMetroSourceMapStringForPackedMaps;
+    get flattenSourceMap () {
+        return flattenSourceMap;
     },
     get rawMappingsToEncodedMap () {
         return rawMappingsToEncodedMap;
@@ -39,9 +41,14 @@ _export(exports, {
     },
     get sourceMapStringNonBlocking () {
         return sourceMapStringNonBlocking;
+    },
+    get vlqMapFromDecodedMap () {
+        return vlqMapFromDecodedMap;
+    },
+    get vlqMapFromEncodedMap () {
+        return vlqMapFromEncodedMap;
     }
 });
-const _packedMap = require("./packedMap");
 let _remapping;
 function loadRemapping() {
     if (!_remapping) {
@@ -56,174 +63,96 @@ function loadSourcemapCodec() {
     }
     return _sourcemapCodec;
 }
-let _Generator;
-function loadGenerator() {
-    if (!_Generator) {
-        _Generator = require('@expo/metro/metro-source-map/Generator').default;
+let _metroSourceMap;
+function loadMetroSourceMap() {
+    if (!_metroSourceMap) {
+        _metroSourceMap = require('@expo/metro/metro-source-map');
     }
-    return _Generator;
+    return _metroSourceMap;
 }
-let _isJsModule;
-function loadMetroSerializerHelpers() {
-    if (!_isJsModule) {
-        _isJsModule = require('@expo/metro/metro/DeltaBundler/Serializers/helpers/js.js').isJsModule;
+let _metroSourceMapString;
+function loadMetroSourceMapString() {
+    if (!_metroSourceMapString) {
+        _metroSourceMapString = require('@expo/metro/metro/DeltaBundler/Serializers/sourceMapString');
     }
-    return {
-        isJsModule: _isJsModule
-    };
+    return _metroSourceMapString;
 }
-function feedModuleSegments(generator, tuples, carryOver) {
-    for(let i = 0, n = tuples.length; i < n; i++){
-        const tuple = tuples[i];
-        const line = tuple[0] + carryOver;
-        const column = tuple[1];
-        if (tuple.length === 2) {
-            generator.addSimpleMapping(line, column);
-        } else if (tuple.length === 4) {
-            generator.addSourceMapping(line, column, tuple[2], tuple[3]);
-        } else {
-            generator.addNamedSourceMapping(line, column, tuple[2], tuple[3], tuple[4]);
-        }
+let _traceMapping;
+function loadTraceMapping() {
+    if (!_traceMapping) {
+        _traceMapping = require('@jridgewell/trace-mapping');
     }
+    return _traceMapping;
 }
-// Encoder fast path: read the `Int32Array` directly, skipping the Proxy
-// and the tuple-per-segment allocation that Proxy iteration would incur.
-// Without this, encoding a large bundle would allocate millions of
-// transient tuples per pass — defeating the in-memory storage win.
-function feedModuleSegmentsPacked(generator, packed, carryOver) {
-    const buf = packed.buf;
-    const names = packed.names;
-    const count = packed.count;
-    for(let i = 0; i < count; i++){
-        const off = i * _packedMap.STRIDE;
-        const line = buf[off] + carryOver;
-        const column = buf[off + 1];
-        const srcLine = buf[off + 2];
-        if (srcLine === _packedMap.SENTINEL) {
-            generator.addSimpleMapping(line, column);
-            continue;
-        }
-        const srcCol = buf[off + 3];
-        const nameIdx = buf[off + 4];
-        if (nameIdx === _packedMap.SENTINEL) {
-            generator.addSourceMapping(line, column, srcLine, srcCol);
-        } else {
-            generator.addNamedSourceMapping(line, column, srcLine, srcCol, names[nameIdx]);
-        }
+function flattenSourceMap(map) {
+    if (!('sections' in map)) {
+        return map;
+    }
+    const { FlattenMap, encodedMap } = loadTraceMapping();
+    const flat = encodedMap(new FlattenMap(map));
+    const result = {
+        version: flat.version,
+        mappings: flat.mappings,
+        names: flat.names,
+        sources: flat.sources
+    };
+    if (flat.file != null) {
+        result.file = flat.file;
     }
+    if (flat.sourcesContent) {
+        result.sourcesContent = flat.sourcesContent;
+    }
+    if (flat.ignoreList && flat.ignoreList.length > 0) {
+        result.ignoreList = flat.ignoreList;
+    }
+    return result;
 }
-// Inlined rather than going through Metro's `getSourceMapInfo` because
-// it spreads `data` and drops the non-enumerable `__packedMap`,
-// silently forcing the encoder onto the slow Proxy path.
-function readSourceMapInfo(module1, options) {
-    const data = getModuleJsData(module1);
-    // Don't read `data.map` when `__packedMap` is set — `data.map` is a
-    // lazy accessor that materializes the Proxy on first read, and the
-    // fast path below doesn't need it.
-    let packed = data.data.__packedMap;
-    let map;
-    if (!packed) {
-        map = data.data.map;
-        // Self-heal a `SerializableSourceMap` `data.map` that bypassed the wrapper.
-        if ((0, _packedMap.isSerializableSourceMap)(map)) {
-            packed = _packedMap.PackedMap.deserialize(map);
-            map = undefined;
-        }
+const NEWLINE = /\r\n?|\n|\u2028|\u2029/g;
+function countLinesAndLastLineColumn(code) {
+    let lineCount = 1;
+    let lastLineStart = 0;
+    for (const match of code.matchAll(NEWLINE)){
+        lineCount++;
+        lastLineStart = match.index + match[0].length;
     }
     return {
-        path: options.getSourceUrl?.(module1) ?? module1.path,
-        source: options.excludeSource || data.type === 'js/module/asset' ? '' : module1.getSource().toString(),
-        functionMap: data.data.functionMap,
-        isIgnored: options.shouldAddToIgnoreList(module1),
-        map,
-        packed,
-        lineCount: data.data.lineCount
+        lineCount,
+        lastLineColumn: code.length - lastLineStart
     };
 }
-function getModuleJsData(module1) {
-    for (const out of module1.output){
-        const type = out.type;
-        if (typeof type === 'string' && type.startsWith('js/')) {
-            return out;
-        }
-    }
-    throw new Error(`[expo-metro-config] Module "${module1.path}" has no JS output. Cannot build a sourcemap entry.`);
-}
-function processModuleIntoGenerator(generator, module1, options, carryOver) {
-    const info = readSourceMapInfo(module1, options);
-    generator.startFile(info.path, info.source, info.functionMap ?? null, {
-        addToIgnoreList: info.isIgnored
-    });
-    if (info.packed) {
-        feedModuleSegmentsPacked(generator, info.packed, carryOver);
-    } else if (Array.isArray(info.map)) {
-        // Legacy plain-tuple path — hits for cache entries written before
-        // `data.map` switched to `SerializableSourceMap`, and for modules from custom
-        // transformers that don't emit packed format.
-        feedModuleSegments(generator, info.map, carryOver);
-    }
-    generator.endFile();
-    return carryOver + info.lineCount;
+function vlqMapFromDecodedMap(decodedMap, code) {
+    const { lineCount, lastLineColumn } = countLinesAndLastLineColumn(code);
+    const map = loadMetroSourceMap().vlqMapFromBabelDecodedMap(decodedMap ?? {
+        mappings: [],
+        names: []
+    }, [
+        lineCount,
+        lastLineColumn
+    ]);
+    return {
+        lineCount,
+        map
+    };
 }
-function filterModules(modules, processModuleFilter) {
-    const { isJsModule } = loadMetroSerializerHelpers();
-    const out = [];
-    for (const m of modules){
-        if (isJsModule(m) && processModuleFilter(m)) {
-            out.push(m);
-        }
-    }
-    return out;
+function vlqMapFromEncodedMap(encoded, code) {
+    const mappings = loadSourcemapCodec().decode(encoded.mappings);
+    return vlqMapFromDecodedMap({
+        mappings,
+        names: encoded.names
+    }, code);
 }
 function appendDebugIdToSourceMap(sourceMap, debugId) {
     return sourceMap.slice(0, -1) + `,"debugId":${JSON.stringify(debugId)}}`;
 }
-function emitGeneratorJson(generator, options) {
-    const json = generator.toString(undefined, {
-        excludeSource: options.excludeSource
-    });
-    return options.debugId ? appendDebugIdToSourceMap(json, options.debugId) : json;
-}
 function sourceMapString(modules, options) {
-    const Generator = loadGenerator();
-    const generator = new Generator();
-    const filtered = filterModules(modules, options.processModuleFilter);
-    let carryOver = 0;
-    for (const mod of filtered){
-        carryOver = processModuleIntoGenerator(generator, mod, options, carryOver);
-    }
-    return emitGeneratorJson(generator, options);
+    const { debugId, ...generatorOptions } = options;
+    const json = loadMetroSourceMapString().sourceMapString(modules, generatorOptions);
+    return debugId ? appendDebugIdToSourceMap(json, debugId) : json;
 }
 async function sourceMapStringNonBlocking(modules, options) {
-    const Generator = loadGenerator();
-    const generator = new Generator();
-    const filtered = filterModules(modules, options.processModuleFilter);
-    const NS_IN_MS = 1_000_000;
-    const SLICE_NS = 50 * NS_IN_MS;
-    let carryOver = 0;
-    let i = 0;
-    await new Promise((resolve)=>{
-        const tick = ()=>{
-            const start = process.hrtime();
-            while(i < filtered.length){
-                carryOver = processModuleIntoGenerator(generator, filtered[i], options, carryOver);
-                i++;
-                const diff = process.hrtime(start);
-                if (diff[1] > SLICE_NS || diff[0] > 0) {
-                    setImmediate(tick);
-                    return;
-                }
-            }
-            resolve();
-        };
-        tick();
-    });
-    return emitGeneratorJson(generator, options);
-}
-function patchMetroSourceMapStringForPackedMaps() {
-    const stock = require('@expo/metro/metro/DeltaBundler/Serializers/sourceMapString');
-    stock.sourceMapString = sourceMapString;
-    stock.sourceMapStringNonBlocking = sourceMapStringNonBlocking;
+    const { debugId, ...generatorOptions } = options;
+    const json = await loadMetroSourceMapString().sourceMapStringNonBlocking(modules, generatorOptions);
+    return debugId ? appendDebugIdToSourceMap(json, debugId) : json;
 }
 function repairInvalidNegativeIndices(map) {
     const { decode, encode } = loadSourcemapCodec();
@@ -252,7 +181,8 @@ function composeSourceMaps(maps) {
     if (maps.length < 1) {
         throw new Error('composeSourceMaps: Expected at least one map');
     }
-    const normalized = maps.map((map)=>{
+    const normalized = maps.map((input)=>{
+        const map = flattenSourceMap(input);
         if (map.ignoreList || !map.x_google_ignoreList) {
             return map;
         }
@@ -309,7 +239,7 @@ function composeSourceMaps(maps) {
     }
     // Required by Hermes for bytecode-frame symbolication. Lives on the
     // most-recent map (the Hermes map) and passes through unchanged.
-    const last = maps[maps.length - 1];
+    const last = normalized[normalized.length - 1];
     if (last.x_hermes_function_offsets) {
         result.x_hermes_function_offsets = last.x_hermes_function_offsets;
     }

package/build/serializer/sourceMap.js.map

@@ -1 +1 @@
-{"version":3,"sources":["serializer/sourceMap.ts"],"sourcesContent":[null],"names":["appendDebugIdToSourceMap","composeSourceMaps","patchMetroSourceMapStringForPackedMaps","rawMappingsToEncodedMap","sourceMapString","sourceMapStringNonBlocking","_remapping","loadRemapping","require","_sourcemapCodec","loadSourcemapCodec","_Generator","loadGenerator","default","_isJsModule","loadMetroSerializerHelpers","isJsModule","feedModuleSegments","generator","tuples","carryOver","i","n","length","tuple","line","column","addSimpleMapping","addSourceMapping","addNamedSourceMapping","feedModuleSegmentsPacked","packed","buf","names","count","off","STRIDE","srcLine","SENTINEL","srcCol","nameIdx","readSourceMapInfo","module","options","data","getModuleJsData","__packedMap","map","isSerializableSourceMap","PackedMap","deserialize","undefined","path","getSourceUrl","source","excludeSource","type","getSource","toString","functionMap","isIgnored","shouldAddToIgnoreList","lineCount","out","output","startsWith","Error","processModuleIntoGenerator","info","startFile","addToIgnoreList","Array","isArray","endFile","filterModules","modules","processModuleFilter","m","push","sourceMap","debugId","slice","JSON","stringify","emitGeneratorJson","json","Generator","filtered","mod","NS_IN_MS","SLICE_NS","Promise","resolve","tick","start","process","hrtime","diff","setImmediate","stock","repairInvalidNegativeIndices","decode","encode","decoded","mappings","changed","segment","maps","normalized","ignoreList","x_google_ignoreList","input","reverse","remap","composed","error","didRepair","fixed","result","version","sources","file","sourceRoot","sourcesContent","last","x_hermes_function_offsets","_genMapping","loadGenMapping","opts","GenMapping","addSegment","setSourceContent","toEncodedMap","filename","rawMappings","genLine","generated","genCol","original","name","encoded"],"mappings":"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"}
+{"version":3,"sources":["serializer/sourceMap.ts"],"sourcesContent":[null],"names":["appendDebugIdToSourceMap","composeSourceMaps","flattenSourceMap","rawMappingsToEncodedMap","sourceMapString","sourceMapStringNonBlocking","vlqMapFromDecodedMap","vlqMapFromEncodedMap","_remapping","loadRemapping","require","_sourcemapCodec","loadSourcemapCodec","_metroSourceMap","loadMetroSourceMap","_metroSourceMapString","loadMetroSourceMapString","_traceMapping","loadTraceMapping","map","FlattenMap","encodedMap","flat","result","version","mappings","names","sources","file","sourcesContent","ignoreList","length","NEWLINE","countLinesAndLastLineColumn","code","lineCount","lastLineStart","match","matchAll","index","lastLineColumn","decodedMap","vlqMapFromBabelDecodedMap","encoded","decode","sourceMap","debugId","slice","JSON","stringify","modules","options","generatorOptions","json","repairInvalidNegativeIndices","encode","decoded","changed","line","i","segment","maps","Error","normalized","input","x_google_ignoreList","reverse","remap","composed","error","didRepair","fixed","sourceRoot","last","x_hermes_function_offsets","_genMapping","loadGenMapping","opts","GenMapping","addSegment","setSourceContent","toEncodedMap","filename","source","m","rawMappings","genLine","generated","genCol","column","original","name","undefined"],"mappings":"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"}

package/build/transform-worker/metro-transform-worker.d.ts

@@ -11,8 +11,7 @@
 import { types as t } from '@babel/core';
 import type { JsTransformerConfig, JsTransformOptions } from '@expo/metro/metro-transform-worker';
 import type { ExpoJsOutput } from '../serializer/jsOutput';
-import { type SerializableSourceMap } from '../serializer/packedMap';
-import { type BabelSourceMapSegment, type EncodedTransformerSourceMap } from '../serializer/sourceMap';
+import { type BabelSourceMapSegment, type EncodedMappings, type EncodedTransformerSourceMap } from '../serializer/sourceMap';
 import type { CollectedDependencies, Options as CollectDependenciesOptions } from './collect-dependencies';
 import { InvalidRequireCallError as InternalInvalidRequireCallError } from './collect-dependencies';
 import type { ExpoJsTransformerConfig } from './types';
@@ -28,7 +27,7 @@ export declare class InvalidRequireCallError extends Error {
 }
 export declare const minifyCode: (config: Pick<JsTransformerConfig, "minifierPath" | "minifierConfig">, filename: string, code: string, source: string, rawMappings: readonly BabelSourceMapSegment[], reserved?: string[], inputSourceMap?: EncodedTransformerSourceMap) => Promise<{
     code: string;
-    sourceMap: SerializableSourceMap;
+    map: EncodedMappings;
 }>;
 export declare function applyImportSupport<TFile extends t.File>(ast: TFile, { filename, options, importDefault, importAll, collectLocations, performConstantFolding, }: {
     filename: string;

package/build/transform-worker/metro-transform-worker.js

@@ -115,7 +115,7 @@ function _nodeassert() {
     };
     return data;
 }
-const _packedMap = require("../serializer/packedMap");
+const _ambient = require("../cache-vary/ambient");
 const _sourceMap = require("../serializer/sourceMap");
 const _transformplugins = require("../transform-plugins");
 const _assettransformer = /*#__PURE__*/ _interop_require_wildcard(require("./asset-transformer"));
@@ -227,10 +227,10 @@ const minifyCode = async (config, filename, code, source, rawMappings, reserved
         });
         return {
             code: minified.code,
-            sourceMap: minified.map ? (0, _packedMap.packDecodedMappings)({
-                mappings: minified.map.mappings,
-                names: minified.map.names
-            }) : (0, _packedMap.emptySourceMap)()
+            map: minified.map ?? {
+                mappings: '',
+                names: []
+            }
         };
     } catch (error) {
         if (error.constructor.name === 'JS_Parse_Error') {
@@ -396,7 +396,7 @@ async function transformJS(file, { config, options }) {
     // Add "use strict" if the file was parsed as a module, and the directive did
     // not exist yet.
     applyUseStrictDirective(ast);
-    const unstable_renameRequire = config.unstable_renameRequire;
+    const unstable_useStaticHermesModuleFactory = Boolean(options.customTransformOptions?.unstable_staticHermesOptimizedRequire);
     // NOTE(@hassankhan): Constant folding can be an expensive/slow operation, so we limit it to
     // production builds, or files that have specifically seen a change in their exports
     if (!options.dev || file.performConstantFolding) {
@@ -473,10 +473,9 @@ async function transformJS(file, { config, options }) {
             wrappedAst = ast;
         } else {
             // TODO: Replace this with a cheaper transform that doesn't require AST.
-            ({ ast: wrappedAst } = _JsFileWrapping().wrapModule(ast, importDefault, importAll, dependencyMapName, config.globalPrefix, // TODO: This config is optional to allow its introduction in a minor
-            // release. It should be made non-optional in ConfigT or removed in
-            // future.
-            unstable_renameRequire === false));
+            ({ ast: wrappedAst } = _JsFileWrapping().wrapModule(ast, importDefault, importAll, dependencyMapName, config.globalPrefix, {
+                unstable_useStaticHermesModuleFactory
+            }));
         }
     }
     const minify = (0, _resolveOptions.shouldMinify)(options);
@@ -526,19 +525,21 @@ async function transformJS(file, { config, options }) {
         })
     ]) : null;
     let code = result.code;
-    let sourceMap;
+    let lineCount;
+    let map;
     // NOTE: We might want to enable this on native + hermes when tree shaking is enabled.
     if (minify) {
-        ({ sourceMap, code } = await minifyCode(config, file.filename, result.code, file.code, rawMappings, reserved, generatedSourceMap ? {
+        let minifiedMap;
+        ({ map: minifiedMap, code } = await minifyCode(config, file.filename, result.code, file.code, rawMappings, reserved, generatedSourceMap ? {
             ...generatedSourceMap,
             version: 3,
             sources: generatedSourceMap.sources.map((source)=>source ?? file.filename)
         } : undefined));
+        ({ lineCount, map } = (0, _sourceMap.vlqMapFromEncodedMap)(minifiedMap, code));
+    } else if (generatedSourceMap) {
+        ({ lineCount, map } = (0, _sourceMap.vlqMapFromEncodedMap)(generatedSourceMap, code));
     } else {
-        sourceMap = generatedSourceMap ? (0, _packedMap.packDecodedMappings)({
-            mappings: generatedSourceMap.mappings,
-            names: generatedSourceMap.names
-        }) : (0, _packedMap.packRawMappings)(rawMappings);
+        ({ lineCount, map } = (0, _sourceMap.vlqMapFromDecodedMap)(result?.decodedMap, code));
     }
     const possibleReconcile = optimize && collectDependenciesOptions ? {
         inlineRequires: options.inlineRequires,
@@ -555,10 +556,8 @@ async function transformJS(file, { config, options }) {
         unstable_dependencyMapReservedName: config.unstable_dependencyMapReservedName,
         optimizationSizeLimit: config.optimizationSizeLimit,
         unstable_disableNormalizePseudoGlobals: config.unstable_disableNormalizePseudoGlobals,
-        unstable_renameRequire
+        unstable_useStaticHermesModuleFactory
     } : undefined;
-    let lineCount;
-    ({ lineCount, sourceMap } = (0, _packedMap.countLinesAndTerminateSourceMap)(code, sourceMap));
     // Clean the AST for tree shaking by stripping non-serializable values (Symbols, functions, etc.)
     // that React Compiler and other Babel plugins may add.
     const output = [
@@ -566,17 +565,18 @@ async function transformJS(file, { config, options }) {
             data: {
                 code,
                 lineCount,
-                // Reconcile re-runs Babel codegen and replaces `data.map` via
-                // `installPackedMap` before any reader sees it, so the sourceMap emitted
-                // here would be discarded — short-circuit to an empty Array to skip
-                // the work and avoid GC pressure on optimize builds.
-                map: possibleReconcile ? [] : sourceMap,
+                // Reconcile re-runs Babel codegen and replaces `data.map` before any reader sees it.
+                map: possibleReconcile ? {
+                    mappings: '',
+                    names: []
+                } : map,
                 functionMap: file.functionMap,
                 hasCjsExports: file.hasCjsExports,
                 reactServerReference: file.reactServerReference,
                 reactClientReference: file.reactClientReference,
                 expoDomComponentReference: file.expoDomComponentReference,
                 loaderReference: file.loaderReference,
+                expoCacheVary: await (0, _ambient.embedCurrentFingerprints)(file.cacheVary),
                 ...possibleReconcile ? {
                     ast: wrappedAst,
                     // Store settings for the module that will be used to finish transformation after graph-based optimizations
@@ -661,6 +661,7 @@ function enableExperimentalImportSupportForReactCompiler(context) {
     }
 }
 async function completeFullNoxcturnalTransform(file, context, fullNoxcturnal) {
+    const cacheVary = fullNoxcturnal.result.metadata.cacheVary;
     if (String(context.options.customTransformOptions?.optimize) === 'true') {
         return transformJS({
             ...file,
@@ -675,16 +676,19 @@ async function completeFullNoxcturnalTransform(file, context, fullNoxcturnal) {
             reactClientReference: typeof fullNoxcturnal.result.metadata.reactClientReference === 'string' ? fullNoxcturnal.result.metadata.reactClientReference : file.reactClientReference,
             expoDomComponentReference: typeof fullNoxcturnal.result.metadata.expoDomComponentReference === 'string' ? fullNoxcturnal.result.metadata.expoDomComponentReference : file.expoDomComponentReference,
             loaderReference: typeof fullNoxcturnal.result.metadata.loaderReference === 'string' ? fullNoxcturnal.result.metadata.loaderReference : file.loaderReference,
-            functionMap: fullNoxcturnal.result.functionMap ?? file.functionMap
+            functionMap: fullNoxcturnal.result.functionMap ?? file.functionMap,
+            cacheVary
         }, context);
     }
     let code = fullNoxcturnal.result.code;
-    let sourceMap;
+    let lineCount;
+    let map;
     if ((0, _resolveOptions.shouldMinify)(context.options)) {
         const reserved = context.config.unstable_dependencyMapReservedName == null ? [] : [
             context.config.unstable_dependencyMapReservedName
         ];
-        ({ code, sourceMap } = await minifyCode(context.config, file.filename, code, file.code, [], reserved, {
+        let minifiedMap;
+        ({ code, map: minifiedMap } = await minifyCode(context.config, file.filename, code, file.code, [], reserved, {
             version: 3,
             sources: [
                 file.filename
@@ -695,14 +699,10 @@ async function completeFullNoxcturnalTransform(file, context, fullNoxcturnal) {
             names: fullNoxcturnal.result.map.names,
             mappings: fullNoxcturnal.result.map.mappings
         }));
+        ({ lineCount, map } = (0, _sourceMap.vlqMapFromEncodedMap)(minifiedMap, code));
     } else {
-        sourceMap = (0, _packedMap.packDecodedMappings)({
-            mappings: fullNoxcturnal.result.map.mappings,
-            names: fullNoxcturnal.result.map.names
-        });
+        ({ lineCount, map } = (0, _sourceMap.vlqMapFromEncodedMap)(fullNoxcturnal.result.map, code));
     }
-    let lineCount;
-    ({ lineCount, sourceMap } = (0, _packedMap.countLinesAndTerminateSourceMap)(code, sourceMap));
     return {
         dependencies: fullNoxcturnal.dependencies,
         output: [
@@ -711,13 +711,14 @@ async function completeFullNoxcturnalTransform(file, context, fullNoxcturnal) {
                 data: {
                     code,
                     lineCount,
-                    map: sourceMap,
+                    map,
                     functionMap: fullNoxcturnal.result.functionMap ?? file.functionMap,
                     hasCjsExports: typeof fullNoxcturnal.result.metadata.hasCjsExports === 'boolean' ? fullNoxcturnal.result.metadata.hasCjsExports : file.hasCjsExports,
                     reactServerReference: typeof fullNoxcturnal.result.metadata.reactServerReference === 'string' ? fullNoxcturnal.result.metadata.reactServerReference : file.reactServerReference,
                     reactClientReference: typeof fullNoxcturnal.result.metadata.reactClientReference === 'string' ? fullNoxcturnal.result.metadata.reactClientReference : file.reactClientReference,
                     expoDomComponentReference: typeof fullNoxcturnal.result.metadata.expoDomComponentReference === 'string' ? fullNoxcturnal.result.metadata.expoDomComponentReference : file.expoDomComponentReference,
-                    loaderReference: typeof fullNoxcturnal.result.metadata.loaderReference === 'string' ? fullNoxcturnal.result.metadata.loaderReference : file.loaderReference
+                    loaderReference: typeof fullNoxcturnal.result.metadata.loaderReference === 'string' ? fullNoxcturnal.result.metadata.loaderReference : file.loaderReference,
+                    expoCacheVary: await (0, _ambient.embedCurrentFingerprints)(cacheVary)
                 }
             }
         ]
@@ -743,16 +744,20 @@ async function transformJSWithBabelFallback(file, context, transformer) {
         reactClientReference: metadata?.reactClientReference,
         expoDomComponentReference: metadata?.expoDomComponentReference,
         loaderReference: metadata?.loaderReference,
-        performConstantFolding: metadata?.performConstantFolding
+        performConstantFolding: metadata?.performConstantFolding,
+        cacheVary: metadata?.cacheVary
     };
     return await transformJS(jsFile, context);
 }
 async function transformJSON(file, { options, config }) {
     let code = config.unstable_disableModuleWrapping === true ? _JsFileWrapping().jsonToCommonJS(file.code) : _JsFileWrapping().wrapJson(file.code, config.globalPrefix);
-    let sourceMap = (0, _packedMap.emptySourceMap)();
+    let encodedMap = {
+        mappings: '',
+        names: []
+    };
     const minify = (0, _resolveOptions.shouldMinify)(options);
     if (minify) {
-        ({ sourceMap, code } = await minifyCode(config, file.filename, code, file.code, []));
+        ({ map: encodedMap, code } = await minifyCode(config, file.filename, code, file.code, []));
     }
     let jsType;
     if (file.type === 'asset') {
@@ -762,14 +767,13 @@ async function transformJSON(file, { options, config }) {
     } else {
         jsType = 'js/module';
     }
-    let lineCount;
-    ({ lineCount, sourceMap } = (0, _packedMap.countLinesAndTerminateSourceMap)(code, sourceMap));
+    const { lineCount, map } = (0, _sourceMap.vlqMapFromEncodedMap)(encodedMap, code);
     const output = [
         {
             data: {
                 code,
                 lineCount,
-                map: sourceMap,
+                map,
                 functionMap: null
             },
             type: jsType
@@ -845,7 +849,9 @@ async function transform(config, projectRoot, filename, data, options) {
 }
 // NOTE: Increment if cache becomes incompatible (original value would be '')
 // 1. Added new packed source map format
-const CACHE_VERSION = '2';
+// 3. Replaced the packed source map format with Metro's compact `VlqMap`
+// 4. `expoCacheVary` is embedded in cached transform results
+const CACHE_VERSION = '4';
 function getCacheKey(config, opts) {
     const { // The `expo_customTransformerPath` from `./supervising-transform-worker` should not be part of the cache key
     expo_customTransformerPath: _customTransformerPath, babelTransformerPath, minifierPath, ...remainingConfig } = config;