jscrambler-metro-plugin 8.4.16 → 8.4.18

package/lib/sourceMaps.js

@@ -55,8 +55,15 @@ module.exports = async function generateSourceMaps(payload) {
   const metroSourceMap = await readFile(bundleSourceMapPath, 'utf8');
   const finalBundleLocs = await extractLocs(finalBundle);
 
-  const metroSourceMapConsumer = new sourceMap.SourceMapConsumer(metroSourceMap);
-  const finalSourceMapGenerator = new sourceMap.SourceMapGenerator({file: bundlePath});
+  const metroSourceMapConsumer = new sourceMap.SourceMapConsumer(
+    metroSourceMap,
+  );
+  // retrieve debug ids after the validation by the sourcemap package
+  // eslint-disable-next-line camelcase
+  const { debugId, debug_id } = JSON.parse(metroSourceMap);
+  const finalSourceMapGenerator = new sourceMap.SourceMapGenerator({
+    file: bundlePath,
+  });
   const ofuscatedSourceMapConsumers = obfuscatedSourceMaps.map((map) =>
     // when a source file is excluded, the sourcemap is not produced
     map ? new sourceMap.SourceMapConsumer(map) : null,
@@ -138,15 +145,31 @@ module.exports = async function generateSourceMaps(payload) {
       /* vendor code */
       newMappings[0].generated.line += shiftLines;
 
-      // code inserted with no real source file associated,
-      // so we need to clean the invalid source value (f.e. ".")
-      if (normalizePath.length === 0) {
+      // when the original line/column can't be found, it means that there isn't a real source file associated.
+      // Thus, if source file name exists it must be cleaned (f.e ".") to avoid an invalid mapping error
+      if (newMappings[0].original === null && newMappings[0].source) {
         newMappings[0].source = null;
       }
     }
 
-    newMappings.forEach((newMapping) => finalSourceMapGenerator.addMapping(newMapping));
+    newMappings.forEach((newMapping) =>
+      finalSourceMapGenerator.addMapping(newMapping),
+    );
   })
 
-  return finalSourceMapGenerator.toString();
-}
+  const finalSourceMaps = finalSourceMapGenerator.toString();
+
+  // for when react native debugIds are necessary in the sourcemaps (upload to sentry for example)
+  // needs to be added in the end since the debugIds are not in SourceMapGenerator type
+  const finalSourceMapsJson = JSON.parse(finalSourceMaps);
+  if (debugId) {
+    finalSourceMapsJson.debugId = debugId;
+  }
+  // eslint-disable-next-line camelcase
+  if (debug_id) {
+    // eslint-disable-next-line camelcase
+    finalSourceMapsJson.debugId = debug_id;
+  }
+
+  return JSON.stringify(finalSourceMapsJson);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jscrambler-metro-plugin",
-  "version": "8.4.16",
+  "version": "8.4.18",
   "description": "A plugin to use metro with Jscrambler Code Integrity",
   "exports": "./lib/index.js",
   "peerDependencies": {