@dynatrace/react-native-plugin 2.335.1 → 2.337.2

package/scripts/Ios.js

@@ -1,63 +1,68 @@
 #!/usr/bin/env node
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-const nodePath = require("path");
+const nodePath = require("node:path");
+const fs = require("node:fs");
 const plist_1 = require("plist");
 const Logger_1 = require("./Logger");
 const FileOperationHelper_1 = require("./FileOperationHelper");
 const PathsConstants_1 = require("./PathsConstants");
 const PlistConstants_1 = require("./util/PlistConstants");
+const NON_APP_TARGET_SEGMENTS = new Set(['test', 'tests', 'uitest', 'uitests', 'tvos', 'watch', 'widget', 'extension', 'appex']);
+const NON_APP_TARGET_SEGMENT_SUFFIXES = ['tests', 'uitests', 'tvos', 'watch', 'widget', 'extension', 'appex'];
+const isNonAppTargetPath = (filePath) => {
+    const normalizedSegments = filePath
+        .toLowerCase()
+        .split(/[\\/]+/)
+        .filter((segment) => segment.length > 0);
+    const directorySegments = normalizedSegments.slice(0, -1);
+    const candidateSegments = directorySegments.slice(-3);
+    return candidateSegments.some((segment) => NON_APP_TARGET_SEGMENTS.has(segment) ||
+        NON_APP_TARGET_SEGMENT_SUFFIXES.some((suffix) => segment.endsWith(suffix)));
+};
 const modifyPListFile = (pathToPList, iosConfig, removeOnly) => {
+    const resolvedPListPath = resolvePListPath(pathToPList);
+    if (removeOnly) {
+        removePListConfig(resolvedPListPath);
+        return;
+    }
+    const configProps = iosConfig === null || iosConfig === void 0 ? void 0 : iosConfig.config;
+    if (iosConfig === undefined || configProps == null) {
+        throw new Error("Can't write configuration of iOS agent because it is missing!");
+    }
+    if (hasDuplicateProperties(configProps)) {
+        throw new Error('Duplicate properties found! Please remove duplicates and try again.');
+    }
+    validateAutoStartConfiguration(configProps);
+    createNewPListIfRequired(parsePList(resolvedPListPath), configProps, resolvedPListPath);
+};
+const resolvePListPath = (pathToPList) => {
     if (pathToPList === undefined) {
-        pathToPList = findPListFile();
+        return findPListFile();
     }
-    else {
-        if (!pathToPList.endsWith('.plist')) {
-            throw new Error("Can't find .plist file. plist path must also include the plist file!");
-        }
-        try {
-            FileOperationHelper_1.default.checkIfFileExistsSync(pathToPList);
-        }
-        catch (e) {
-            throw new Error('Could not read plist file: ' + pathToPList);
-        }
+    if (!pathToPList.endsWith('.plist')) {
+        throw new Error("Can't find .plist file. plist path must also include the plist file!");
     }
-    const parsedPList = parsePList(pathToPList);
-    const configProps = iosConfig === null || iosConfig === void 0 ? void 0 : iosConfig.config;
-    if (removeOnly) {
-        removePListConfig(pathToPList);
+    if (!fs.existsSync(pathToPList)) {
+        throw new Error('Could not read plist file: ' + pathToPList);
     }
-    else {
-        if (iosConfig && (configProps != null)) {
-            if (hasDuplicateProperties(configProps)) {
-                throw new Error('Duplicate properties found! Please remove duplicates and try again.');
-            }
-            if (isAutoStartEnabled(configProps)) {
-                if (checkForBeaconUrlAndAppId(configProps)) {
-                    createNewPListIfRequired(parsedPList, configProps, pathToPList);
-                }
-                else {
-                    throw new Error('The dynatrace.config.js file does not contain DTXBeaconURL or DTXApplicationID properties. ' +
-                        'If you want to auto-start the iOS agent, please add these two properties at minimum as they are required. ' +
-                        'If you are using a manual startup of the iOS agent, please add just the DTXAutoStart property ' +
-                        '(no other properties are needed and none will be considered) with the value set to false.');
-                }
-            }
-            else {
-                if (checkForBeaconUrlAndAppId(configProps)) {
-                    throw new Error('The dynatrace.config.js file contains DTXBeaconURL and or DTXApplicationID properties while ' +
-                        'DTXAutoStart is set to false. Any properties that you add to the dynatrace.config.js file will not be used ' +
-                        'if DTXAutoStart is set to false. If you want to manually start the iOS agent, please only add the ' +
-                        'DTXAutoStart property and set the value to false.');
-                }
-                else {
-                    createNewPListIfRequired(parsedPList, configProps, pathToPList);
-                }
-            }
-        }
-        else {
-            throw new Error("Can't write configuration of iOS agent because it is missing!");
+    return pathToPList;
+};
+const validateAutoStartConfiguration = (configProps) => {
+    if (isAutoStartEnabled(configProps)) {
+        if (!checkForBeaconUrlAndAppId(configProps)) {
+            throw new Error('The dynatrace.config.js file does not contain DTXBeaconURL or DTXApplicationID properties. ' +
+                'If you want to auto-start the iOS agent, please add these two properties at minimum as they are required. ' +
+                'If you are using a manual startup of the iOS agent, please add just the DTXAutoStart property ' +
+                '(no other properties are needed and none will be considered) with the value set to false.');
         }
+        return;
+    }
+    if (checkForBeaconUrlAndAppId(configProps)) {
+        throw new Error('The dynatrace.config.js file contains DTXBeaconURL and or DTXApplicationID properties while ' +
+            'DTXAutoStart is set to false. Any properties that you add to the dynatrace.config.js file will not be used ' +
+            'if DTXAutoStart is set to false. If you want to manually start the iOS agent, please only add the ' +
+            'DTXAutoStart property and set the value to false.');
     }
 };
 const removePListConfig = (file) => {
@@ -79,52 +84,264 @@ const addAgentConfigToPListFile = (file, config) => {
     Logger_1.default.logMessageSync('Updated configuration in plist file: ' + file, Logger_1.default.INFO);
 };
 const findPListFile = () => {
-    const appJson = FileOperationHelper_1.default.readTextFromFileSync(PathsConstants_1.default.getAppJsonFile());
-    const appJsonObj = JSON.parse(appJson);
-    let appName;
-    if (appJsonObj.expo !== undefined) {
-        appName = appJsonObj.expo.name;
+    const iosFolder = PathsConstants_1.default.getIOSFolder();
+    if (!fs.existsSync(iosFolder)) {
+        throw new Error('Could not find iOS folder. For Expo managed projects, run "expo prebuild" first or provide plist=... custom argument.');
     }
-    else if (appJsonObj.name !== undefined) {
-        appName = appJsonObj.name;
+    const appRoot = nodePath.dirname(iosFolder);
+    const appNames = resolveAppNames(appRoot);
+    const fromXcode = resolvePlistsFromXcodeProject(iosFolder, appNames);
+    const appXcodePlists = fromXcode.filter((pathToPlist) => !isNonAppTargetPath(pathToPlist));
+    const xcodeCandidates = appXcodePlists.length > 0 ? appXcodePlists : fromXcode;
+    if (xcodeCandidates.length === 1) {
+        return xcodeCandidates[0];
     }
-    else {
-        throw new Error('Name of the application is unknown. Check your app.json file!');
+    if (xcodeCandidates.length > 1) {
+        const examples = xcodeCandidates.slice(0, 5).join(', ');
+        throw new Error(`Found multiple plist files from Xcode build settings: ${examples}. ` +
+            'Please provide plist=... custom argument to select the correct one.');
+    }
+    const byName = resolvePlistByAppNames(iosFolder, appNames);
+    if (byName !== undefined) {
+        return byName;
+    }
+    const scanned = scanPlistCandidates(iosFolder);
+    if (scanned.length === 1) {
+        return scanned[0];
     }
-    const pListPaths = [];
-    pListPaths.push(nodePath.join(PathsConstants_1.default.getIOSFolder(), appName, 'Info.plist'));
-    pListPaths.push(nodePath.join(PathsConstants_1.default.getIOSFolder(), appName, 'Supporting', 'Info.plist'));
-    for (const pListPath of pListPaths) {
-        try {
-            FileOperationHelper_1.default.checkIfFileExistsSync(pListPath);
-            return pListPath;
+    if (scanned.length > 1) {
+        const examples = scanned.slice(0, 5).join(', ');
+        throw new Error(`Found multiple plist files in iOS folder: ${examples}. ` +
+            'Please provide plist=... custom argument to select the correct one.');
+    }
+    throw new Error("Can't find .plist file in iOS Folder! Try to use plist= custom argument. See documentation for help!");
+};
+const resolvePlistByAppNames = (iosFolder, appNames) => {
+    for (const appName of appNames) {
+        const pListPaths = [
+            nodePath.join(iosFolder, appName, 'Info.plist'),
+            nodePath.join(iosFolder, appName, `${appName}.plist`),
+            nodePath.join(iosFolder, appName, 'Supporting', 'Info.plist'),
+            nodePath.join(iosFolder, appName, 'Supporting', `${appName}.plist`),
+        ];
+        for (const pListPath of pListPaths) {
+            if (fs.existsSync(pListPath)) {
+                return pListPath;
+            }
         }
-        catch (e) {
+    }
+    return undefined;
+};
+const resolveAppNames = (appRoot) => {
+    const candidates = [
+        nodePath.join(appRoot, 'app.json'),
+        nodePath.join(appRoot, 'app.config.js'),
+        nodePath.join(appRoot, 'app.config.ts'),
+    ];
+    const names = [];
+    for (const filePath of candidates) {
+        if (!fs.existsSync(filePath)) {
+            continue;
         }
+        const fileText = FileOperationHelper_1.default.readTextFromFileSync(filePath);
+        const parsedNames = extractAppNames(fileText, filePath.endsWith('.json'));
+        parsedNames.forEach((name) => {
+            if (!names.includes(name)) {
+                names.push(name);
+            }
+        });
     }
-    throw new Error("Can't find .plist file in iOS Folder! Try to use plist= custom argument. See documentation for help!");
+    return names;
+};
+const resolvePlistsFromXcodeProject = (iosFolder, appNames) => {
+    const xcodeProjDirs = fs.readdirSync(iosFolder, { withFileTypes: true })
+        .filter((entry) => entry.isDirectory() && entry.name.endsWith('.xcodeproj'))
+        .map((entry) => nodePath.join(iosFolder, entry.name));
+    if (xcodeProjDirs.length === 0) {
+        return [];
+    }
+    const plistPaths = [];
+    for (const xcodeProjDir of xcodeProjDirs) {
+        const projectFile = nodePath.join(xcodeProjDir, 'project.pbxproj');
+        if (!fs.existsSync(projectFile)) {
+            continue;
+        }
+        const projectContent = FileOperationHelper_1.default.readTextFromFileSync(projectFile);
+        const srcRoot = nodePath.dirname(xcodeProjDir);
+        const projectName = nodePath.basename(xcodeProjDir, '.xcodeproj');
+        const plistSettingValues = extractInfoPlistSettingValues(projectContent);
+        for (const plistSettingValue of plistSettingValues) {
+            const resolvedPath = resolvePbxPlistPath(plistSettingValue, srcRoot, projectName, appNames);
+            if (resolvedPath !== undefined && fs.existsSync(resolvedPath) && !plistPaths.includes(resolvedPath)) {
+                plistPaths.push(resolvedPath);
+            }
+        }
+    }
+    return plistPaths.sort((a, b) => rankPlistCandidate(a, appNames) - rankPlistCandidate(b, appNames));
+};
+const extractInfoPlistSettingValues = (projectContent) => {
+    const settings = [];
+    const marker = 'INFOPLIST_FILE';
+    for (const line of projectContent.split(/\r?\n/)) {
+        const markerIndex = line.indexOf(marker);
+        if (markerIndex < 0) {
+            continue;
+        }
+        const equalsIndex = line.indexOf('=', markerIndex + marker.length);
+        if (equalsIndex < 0) {
+            continue;
+        }
+        const semicolonIndex = line.indexOf(';', equalsIndex + 1);
+        if (semicolonIndex < 0) {
+            continue;
+        }
+        const settingValue = line.slice(equalsIndex + 1, semicolonIndex).trim();
+        if (settingValue.length > 0) {
+            settings.push(settingValue);
+        }
+    }
+    return settings;
+};
+const resolvePbxPlistPath = (plistValue, srcRoot, projectName, appNames) => {
+    const trimmedValue = plistValue.trim();
+    const cleanedValue = trimmedValue.startsWith('"') && trimmedValue.endsWith('"')
+        ? trimmedValue.slice(1, -1)
+        : trimmedValue;
+    const substitutions = buildPbxPathSubstitutions(srcRoot, projectName, appNames);
+    for (const substitution of substitutions) {
+        let candidate = cleanedValue;
+        for (const [key, value] of Object.entries(substitution)) {
+            candidate = candidate
+                .split(`$(${key})`).join(value)
+                .split(`\${${key}}`).join(value);
+        }
+        if (/\$\(|\$\{/.test(candidate)) {
+            continue;
+        }
+        if (!nodePath.isAbsolute(candidate)) {
+            candidate = nodePath.join(srcRoot, candidate);
+        }
+        const normalized = nodePath.normalize(candidate);
+        if (normalized.endsWith('.plist')) {
+            return normalized;
+        }
+    }
+    return undefined;
+};
+const buildPbxPathSubstitutions = (srcRoot, projectName, appNames) => {
+    const productNames = [projectName, ...appNames].filter((name, index, arr) => arr.indexOf(name) === index);
+    const substitutions = [];
+    for (const productName of productNames) {
+        substitutions.push({
+            SRCROOT: srcRoot,
+            PROJECT_DIR: srcRoot,
+            PROJECT_NAME: projectName,
+            TARGET_NAME: productName,
+            PRODUCT_NAME: productName,
+        });
+    }
+    return substitutions;
+};
+const extractAppNames = (content, isJson) => {
+    var _a;
+    if (!isJson) {
+        return [];
+    }
+    const names = [];
+    try {
+        const parsed = JSON.parse(content);
+        const expoName = (_a = parsed === null || parsed === void 0 ? void 0 : parsed.expo) === null || _a === void 0 ? void 0 : _a.name;
+        const rootName = parsed === null || parsed === void 0 ? void 0 : parsed.name;
+        if (typeof expoName === 'string' && expoName.length > 0) {
+            names.push(expoName);
+        }
+        if (typeof rootName === 'string' && rootName.length > 0 && !names.includes(rootName)) {
+            names.push(rootName);
+        }
+    }
+    catch (_b) {
+    }
+    return names;
+};
+const scanPlistCandidates = (iosFolder) => {
+    const excludedDirs = new Set(['Pods', 'build', 'DerivedData', 'node_modules', '.git']);
+    const results = [];
+    const walk = (dir) => {
+        const entries = fs.readdirSync(dir, { withFileTypes: true });
+        for (const entry of entries) {
+            if (entry.isDirectory()) {
+                if (!excludedDirs.has(entry.name)) {
+                    walk(nodePath.join(dir, entry.name));
+                }
+                continue;
+            }
+            if (entry.name.endsWith('.plist')) {
+                results.push(nodePath.join(dir, entry.name));
+            }
+        }
+    };
+    try {
+        walk(iosFolder);
+    }
+    catch (e) {
+        Logger_1.default.logMessageSync(`Failed to scan iOS folder for plist files: ${String(e)}`, Logger_1.default.INFO);
+        return [];
+    }
+    return results.sort((a, b) => rankPlistCandidate(a) - rankPlistCandidate(b));
+};
+const rankPlistCandidate = (filePath, appNames = []) => {
+    const normalizedPath = filePath.toLowerCase();
+    const fileName = nodePath.basename(filePath).toLowerCase();
+    let rank = 0;
+    if (fileName === 'info.plist') {
+        rank -= 30;
+    }
+    if (normalizedPath.includes(`${nodePath.sep}supporting${nodePath.sep}`)) {
+        rank -= 20;
+    }
+    if (isNonAppTargetPath(filePath)) {
+        rank += 200;
+    }
+    for (const appName of appNames) {
+        const escapedName = escapeRegexLiteral(appName).toLowerCase();
+        if (normalizedPath.includes(`${nodePath.sep}${escapedName}${nodePath.sep}`)) {
+            rank -= 40;
+            break;
+        }
+    }
+    const parts = filePath.split(nodePath.sep);
+    rank += parts.length;
+    return rank;
+};
+const escapeRegexLiteral = (value) => {
+    const specialChars = new Set(['\\', '^', '$', '.', '|', '?', '*', '+', '(', ')', '[', ']', '{', '}']);
+    let escaped = '';
+    for (const char of value) {
+        escaped += specialChars.has(char) ? `\\${char}` : char;
+    }
+    return escaped;
 };
 const parsePList = (file) => {
     const pListContent = FileOperationHelper_1.default.readTextFromFileSync(file);
-    let pListObj = (0, plist_1.parse)(pListContent);
-    return pListObj = Object.assign({}, pListObj);
+    const pListObj = (0, plist_1.parse)(pListContent);
+    return Object.assign({}, pListObj);
 };
 const isAutoStartEnabled = (config) => {
-    if (config !== undefined && config.indexOf(PlistConstants_1.AUTO_START_PROP) >= 0) {
+    if ((config === null || config === void 0 ? void 0 : config.includes(PlistConstants_1.AUTO_START_PROP)) === true) {
         const configObj = PlistConstants_1.START_PLIST + config + PlistConstants_1.END_PLIST;
         const configObjCopy = (0, plist_1.parse)(configObj);
         const configKeys = Object.keys(configObjCopy);
         const configValues = Object.values(configObjCopy);
         for (const key in configKeys) {
             if (configKeys[key] === 'DTXAutoStart' && typeof configValues[key] === 'boolean') {
-                return configValues[key];
+                return configValues[key] === true;
             }
         }
     }
     return true;
 };
-const checkForBeaconUrlAndAppId = (config) => config != null && config.indexOf('DTXApplicationID') >= 0 && config.indexOf('DTXBeaconURL') >= 0;
-const checkForExcludedControls = (config) => config != null && config.indexOf('DTXExcludedControls') >= 0;
+const checkForBeaconUrlAndAppId = (config) => config != null && config.includes('DTXApplicationID') && config.includes('DTXBeaconURL');
+const checkForExcludedControls = (config) => (config === null || config === void 0 ? void 0 : config.includes('DTXExcludedControls')) === true;
 const updatedExcludedStr = (config) => {
     if (checkForExcludedControls(config)) {
         const controlsArr = Object.keys(PlistConstants_1.CONTROLS_PROP_OPTIONS);
@@ -132,7 +349,7 @@ const updatedExcludedStr = (config) => {
         for (let index = 0; index < controlsArr.length; index++) {
             if (controlsArr[index] !== 'PickerView'
                 && controlsArr[index] !== 'Switch'
-                && config.indexOf(PlistConstants_1.CONTROLS_PROP_OPTIONS[controlsArr[index]].trim()) >= 0) {
+                && config.includes(PlistConstants_1.CONTROLS_PROP_OPTIONS[controlsArr[index]].trim())) {
                 updatedStr = updatedStr + PlistConstants_1.CONTROLS_PROP_OPTIONS[controlsArr[index]];
             }
         }

package/scripts/PathsConstants.js

@@ -2,35 +2,49 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DYNATRACE_CONFIG_GRADLE_FILE = void 0;
-const path_1 = require("path");
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
 const PATH_FILES = 'files';
 const PATH_LOGS = 'logs';
 exports.DYNATRACE_CONFIG_GRADLE_FILE = 'dynatrace.gradle';
+const GRADLE_FILE = 'build.gradle';
+const GRADLE_KTS_FILE = 'build.gradle.kts';
 let rootPath = __dirname;
+const resolveAndroidGradleFile = (folder) => {
+    const gradlePath = (0, node_path_1.join)(folder, GRADLE_FILE);
+    if ((0, node_fs_1.existsSync)(gradlePath)) {
+        return gradlePath;
+    }
+    const gradleKtsPath = (0, node_path_1.join)(folder, GRADLE_KTS_FILE);
+    if ((0, node_fs_1.existsSync)(gradleKtsPath)) {
+        return gradleKtsPath;
+    }
+    return gradlePath;
+};
 exports.default = {
     setRoot: (newRoot) => {
-        rootPath = (0, path_1.resolve)(newRoot);
+        rootPath = (0, node_path_1.resolve)(newRoot);
     },
-    getApplicationPath: () => (0, path_1.join)(getPluginPath(), '..', '..', '..'),
-    getAppJsonFile: () => (0, path_1.join)(getApplicationPath(), 'app.json'),
+    getApplicationPath: () => (0, node_path_1.join)(getPluginPath(), '..', '..', '..'),
+    getAppJsonFile: () => (0, node_path_1.join)(getApplicationPath(), 'app.json'),
     getPackageJsonFile() {
-        return (0, path_1.join)(this.getApplicationPath(), 'package.json');
+        return (0, node_path_1.join)(this.getApplicationPath(), 'package.json');
     },
     getMetroSouceMapPath() {
-        return (0, path_1.join)(this.getApplicationPath(), 'node_modules', 'metro', 'src', 'DeltaBundler', 'Serializers', 'helpers');
+        return (0, node_path_1.join)(this.getApplicationPath(), 'node_modules', 'metro', 'src', 'DeltaBundler', 'Serializers', 'helpers');
     },
-    getOurSourceMapFile: () => (0, path_1.join)(getPluginPath(), 'lib', 'metro', 'getSourceMapInfo.js'),
-    getInternalPackageJsonFile: () => (0, path_1.join)(getPluginPath(), 'package.json'),
-    getDefaultConfig: () => (0, path_1.join)(getPluginPath(), PATH_FILES, 'default.config.js'),
-    getBuildPath: () => (0, path_1.join)(getPluginPath(), 'build'),
-    getConfigFilePath: () => (0, path_1.join)(getApplicationPath(), 'dynatrace.config.js'),
-    getAndroidFolder: () => (0, path_1.join)(getApplicationPath(), 'android'),
-    getAndroidGradleFile: (androidFolder) => (0, path_1.join)(androidFolder, 'build.gradle'),
-    getAndroidAppGradleFile: (androidFolder) => (0, path_1.join)(androidFolder, 'app', 'build.gradle'),
-    getIOSFolder: () => (0, path_1.join)(getApplicationPath(), 'ios'),
-    getDynatraceGradleFile: () => (0, path_1.join)(getPluginPath(), PATH_FILES, exports.DYNATRACE_CONFIG_GRADLE_FILE),
-    getCurrentLogPath: () => (0, path_1.join)(getPluginPath(), PATH_LOGS, 'currentLog.txt'),
-    getLogPath: () => (0, path_1.join)(getPluginPath(), PATH_LOGS),
+    getOurSourceMapFile: () => (0, node_path_1.join)(getPluginPath(), 'lib', 'metro', 'getSourceMapInfo.js'),
+    getInternalPackageJsonFile: () => (0, node_path_1.join)(getPluginPath(), 'package.json'),
+    getDefaultConfig: () => (0, node_path_1.join)(getPluginPath(), PATH_FILES, 'default.config.js'),
+    getBuildPath: () => (0, node_path_1.join)(getPluginPath(), 'build'),
+    getConfigFilePath: () => (0, node_path_1.join)(getApplicationPath(), 'dynatrace.config.js'),
+    getAndroidFolder: () => (0, node_path_1.join)(getApplicationPath(), 'android'),
+    getAndroidGradleFile: (androidFolder) => resolveAndroidGradleFile(androidFolder),
+    getAndroidAppGradleFile: (androidFolder) => resolveAndroidGradleFile((0, node_path_1.join)(androidFolder, 'app')),
+    getIOSFolder: () => (0, node_path_1.join)(getApplicationPath(), 'ios'),
+    getDynatraceGradleFile: () => (0, node_path_1.join)(getPluginPath(), PATH_FILES, exports.DYNATRACE_CONFIG_GRADLE_FILE),
+    getCurrentLogPath: () => (0, node_path_1.join)(getPluginPath(), PATH_LOGS, 'currentLog.txt'),
+    getLogPath: () => (0, node_path_1.join)(getPluginPath(), PATH_LOGS),
 };
-const getPluginPath = () => (0, path_1.join)(rootPath, '..');
-const getApplicationPath = () => (0, path_1.join)(getPluginPath(), '..', '..', '..');
+const getPluginPath = () => (0, node_path_1.join)(rootPath, '..');
+const getApplicationPath = () => (0, node_path_1.join)(getPluginPath(), '..', '..', '..');

package/scripts/core/InstrumentCall.js

@@ -44,7 +44,7 @@ const instrumentCommand = () => {
     Logger_1.default.withPrefix({ info: '  ℹ️  ', warning: '  ⚠️  ' }, () => (0, InstrumentUtil_1.showVersionOfPlugin)());
     let pathToConfig = PathsConstants_1.default.getConfigFilePath();
     let pathToGradle = PathsConstants_1.default.getAndroidGradleFile(PathsConstants_1.default.getAndroidFolder());
-    const pathToAppGradle = PathsConstants_1.default.getAndroidAppGradleFile(PathsConstants_1.default.getAndroidFolder());
+    let pathToAppGradle = PathsConstants_1.default.getAndroidAppGradleFile(PathsConstants_1.default.getAndroidFolder());
     let androidAvailable = true;
     let pathToPList;
     let iosAvailable = true;
@@ -61,6 +61,11 @@ const instrumentCommand = () => {
     Logger_1.default.withPrefix({ info: '  ℹ️  ', warning: '  ⚠️  ', error: '  ❌ ' }, () => {
         if (argv.isCustomGradlePathSet()) {
             pathToGradle = argv.getCustomGradlePath();
+            if (!/build\.gradle(\.kts)?$/.test(pathToGradle)) {
+                throw new Error(`--gradle must point to build.gradle or build.gradle.kts file, got ${pathToGradle}`);
+            }
+            const androidFolder = nodePath.dirname(pathToGradle);
+            pathToAppGradle = PathsConstants_1.default.getAndroidAppGradleFile(androidFolder);
             androidAvailable = (0, InstrumentUtil_1.isPlatformAvailable)(pathToGradle, Platform_1.Platform.Android);
         }
         else {
@@ -76,6 +81,7 @@ const instrumentCommand = () => {
     });
     pathToConfig = (0, path_1.resolve)(pathToConfig);
     pathToGradle = (0, path_1.resolve)(pathToGradle);
+    pathToAppGradle = (0, path_1.resolve)(pathToAppGradle);
     if (iosAvailable || androidAvailable) {
         try {
             Logger_1.default.logMessageSync('⏳ Trying to read configuration file: ' + pathToConfig, Logger_1.default.INFO);

package/scripts/util/SourceMapUtil.js

@@ -1,30 +1,68 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.patchMetroSourceMap = exports.SOURCE_MAP_FILE = exports.SOURCE_MAP_BACKUP_FILE = void 0;
-const path_1 = require("path");
+const node_path_1 = require("node:path");
 const Logger_1 = require("../Logger");
 const PathsConstants_1 = require("../PathsConstants");
 const FileOperationHelper_1 = require("../FileOperationHelper");
 exports.SOURCE_MAP_BACKUP_FILE = 'getSourceMapInfoOrig.js';
 exports.SOURCE_MAP_FILE = 'getSourceMapInfo.js';
-const patchMetroSourceMap = () => {
-    Logger_1.default.logMessageSync('⏳ Patching SourceMap generation of Metro .. ', Logger_1.default.INFO);
-    const origSourceMapPath = (0, path_1.join)(PathsConstants_1.default.getMetroSouceMapPath(), exports.SOURCE_MAP_BACKUP_FILE);
-    try {
-        FileOperationHelper_1.default.checkIfFileExistsSync(origSourceMapPath);
-        Logger_1.default.logMessageSync('  ℹ️  Patching of SourceMap already happened!', Logger_1.default.INFO);
+const getMetroResolveLookupPaths = () => {
+    const lookupPaths = [];
+    let currentPath = process.cwd();
+    while (true) {
+        lookupPaths.push(currentPath);
+        const pnpmLookupPath = (0, node_path_1.join)(currentPath, 'node_modules', '.pnpm', 'node_modules');
+        if (!lookupPaths.includes(pnpmLookupPath)) {
+            lookupPaths.push(pnpmLookupPath);
+        }
+        const parentPath = (0, node_path_1.dirname)(currentPath);
+        if (parentPath === currentPath) {
+            break;
+        }
+        currentPath = parentPath;
     }
-    catch (e) {
+    return lookupPaths;
+};
+const resolveMetroSourceMapPaths = (resolveModule) => {
+    const paths = [PathsConstants_1.default.getMetroSouceMapPath()];
+    for (const lookupPath of getMetroResolveLookupPaths()) {
+        try {
+            const resolvedMetroSourceMapFile = resolveModule('metro/src/DeltaBundler/Serializers/helpers/getSourceMapInfo.js', { paths: [lookupPath] });
+            const resolvedMetroSourceMapDir = (0, node_path_1.dirname)(resolvedMetroSourceMapFile);
+            if (!paths.includes(resolvedMetroSourceMapDir)) {
+                paths.push(resolvedMetroSourceMapDir);
+            }
+            break;
+        }
+        catch (_a) {
+        }
+    }
+    return paths;
+};
+const patchMetroSourceMap = (resolveModule = require.resolve) => {
+    Logger_1.default.logMessageSync('⏳ Patching SourceMap generation of Metro .. ', Logger_1.default.INFO);
+    const metroSourceMapPaths = resolveMetroSourceMapPaths(resolveModule);
+    for (const metroSourceMapPath of metroSourceMapPaths) {
+        const origSourceMapPath = (0, node_path_1.join)(metroSourceMapPath, exports.SOURCE_MAP_BACKUP_FILE);
+        try {
+            FileOperationHelper_1.default.checkIfFileExistsSync(origSourceMapPath);
+            Logger_1.default.logMessageSync('  ℹ️  Patching of SourceMap already happened!', Logger_1.default.INFO);
+            return;
+        }
+        catch (_a) {
+        }
         try {
-            const currentSourceMapPath = (0, path_1.join)(PathsConstants_1.default.getMetroSouceMapPath(), exports.SOURCE_MAP_FILE);
+            const currentSourceMapPath = (0, node_path_1.join)(metroSourceMapPath, exports.SOURCE_MAP_FILE);
             FileOperationHelper_1.default.checkIfFileExistsSync(currentSourceMapPath);
             FileOperationHelper_1.default.renameFileSync(currentSourceMapPath, origSourceMapPath);
             FileOperationHelper_1.default.copyFileSync(PathsConstants_1.default.getOurSourceMapFile(), currentSourceMapPath);
             Logger_1.default.logMessageSync('  ✅ Patching of SourceMap successful!', Logger_1.default.INFO);
+            return;
         }
-        catch (e) {
-            Logger_1.default.logMessageSync('  ❌ Patching of SourceMap generation failed!', Logger_1.default.ERROR);
+        catch (_b) {
         }
     }
+    Logger_1.default.logMessageSync('  ❌ Patching of SourceMap generation failed!', Logger_1.default.ERROR);
 };
 exports.patchMetroSourceMap = patchMetroSourceMap;