[MOB-11925] Support Monorepos in Source Maps Scripts (#915)

TheBuggedYRN · ymabdallah · commit 5a39a02e8b52 · 2023-02-20T16:52:57.000+02:00
Source Maps scripts wasn't working inside Monorepos due to the relative paths of node_modules. This was replaced by a combination of require and require.resolve to get the node_modules path dynamically.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 - Bumps Instabug Android SDK to v11.8.0
 - Bumps Instabug iOS SDK to v11.7.0
+- Adds monorepo support for source maps scripts
 - Fixes global error handler not being called.
 - Deprecates Instabug.start in favour of Instabug.init that takes a configuration object for SDK initialization.
 - Deprecates Instabug.setDebugEnabled, Instabug.setSdkDebugLogsLevel, and APM.setLogLevel in favour of debugLogsLevel property, which can be passed to InstabugConfig while initializing the SDK using Instabug.init.
diff --git a/android/upload_sourcemap.sh b/android/upload_sourcemap.sh
@@ -60,18 +60,26 @@ else
             *)        echo "unknown: $OSTYPE" ;;
         esac
 
-        #Find hermes(c) binary file path
-        INSTALLED_RN_VERSION_MAJOR=$(node -p "require('./node_modules/react-native/package.json').version" | cut -d "." -f2)
-        if [ "$INSTALLED_RN_VERSION_MAJOR" -ge 69 ]
-        then
-            HERMES_PATH=node_modules/react-native/sdks/hermesc/$HERMES_OS_BIN/hermesc
-        elif [ "$INSTALLED_RN_VERSION_MAJOR" -lt 63 ]
-        then
-            HERMES_PATH=node_modules/hermes-engine/$HERMES_OS_BIN/hermes
+        # Find hermes(c) binary file path
+        RN_VERSION=$(node -p "require('react-native/package.json').version")
+        RN_VERSION_MINOR=$(echo $RN_VERSION | cut -d "." -f2)
+        echo "Instabug: Using React Native v$RN_VERSION"
+
+        if [ "$RN_VERSION_MINOR" -ge 69 ]; then
+            RN_PACKAGE_PATH=$(node -p "require.resolve('react-native/package.json')")
+            RN_PATH=${RN_PACKAGE_PATH%"/package.json"}
+            HERMES_PATH=$RN_PATH/sdks/hermesc/$HERMES_OS_BIN/hermesc
         else
-            HERMES_PATH=node_modules/hermes-engine/$HERMES_OS_BIN/hermesc
+            HERMES_ENGINE_PACKAGE_PATH=$(node -p "require.resolve('hermes-engine/package.json')")
+            HERMES_ENGINE_PATH=${HERMES_ENGINE_PACKAGE_PATH%"/package.json"}
+            if [ "$RN_VERSION_MINOR" -lt 63 ]; then
+                HERMES_PATH=$HERMES_ENGINE_PATH/$HERMES_OS_BIN/hermes
+            else
+                HERMES_PATH=$HERMES_ENGINE_PATH/$HERMES_OS_BIN/hermesc
+            fi
         fi
-        if [ "$INSTALLED_RN_VERSION_MAJOR" -ge 65 ]
+    
+        if [ "$RN_VERSION_MINOR" -ge 65 ]
         then
             EXTRA_ARGS="--minify false"
         fi
@@ -84,11 +92,13 @@ else
         --sourcemap-output index.android.bundle.packager.map \
         $EXTRA_ARGS
 
+        echo "Instabug: Using Hermes from: $HERMES_PATH"
         $HERMES_PATH -emit-binary -out index.android.bundle.hbc index.android.bundle -O -output-source-map > /dev/null 2>&1
 
         cp index.android.bundle.hbc.map index.android.bundle.compiler.map
 
-        node node_modules/react-native/scripts/compose-source-maps.js index.android.bundle.packager.map index.android.bundle.compiler.map -o android-sourcemap.json
+        COMPOSE_SCRIPT_PATH=$(node -p "require.resolve('react-native/scripts/compose-source-maps.js')")
+        node $COMPOSE_SCRIPT_PATH index.android.bundle.packager.map index.android.bundle.compiler.map -o android-sourcemap.json
         rm -rf index.android.bundle
         rm -rf index.android.bundle.hbc.map
         rm -rf index.android.bundle.compiler.map
diff --git a/example/ios/InstabugExample.xcodeproj/project.pbxproj b/example/ios/InstabugExample.xcodeproj/project.pbxproj
@@ -401,7 +401,7 @@
 			name = "[CP-User] [instabug-reactnative] Upload Sourcemap";
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "#!/bin/sh\ncd ${PROJECT_DIR}\ncd ..\nif [ -s \"$HOME/.nvm/nvm.sh\" ]; then\n. \"$HOME/.nvm/nvm.sh\"\nelif [ -x \"$(command -v brew)\" ] && [ -s \"$(brew --prefix nvm)/nvm.sh\" ]; then\n. \"$(brew --prefix nvm)/nvm.sh\"\nfi\nexport NODE_BINARY=node\n\nINSTABUG_SOURCEMAPS_UPLOAD_DISABLE=$(echo $INSTABUG_SOURCEMAPS_UPLOAD_DISABLE | tr 'A-Z' 'a-z')\nif [ \"${INSTABUG_SOURCEMAPS_UPLOAD_DISABLE}\" = \"true\" ]; then\n    echo \"Instabug: Environment variable INSTABUG_SOURCEMAPS_UPLOAD_DISABLE was set to true, skipping sourcemap upload\"\n    exit 0\nfi\n\nif [ ! \"$INFOPLIST_FILE\" ] || [ -z \"$INFOPLIST_FILE\" ]; then\n    echo \"Instabug: INFOPLIST_FILE not found in Xcode build settings, skipping sourcemap upload\"\n    exit 0\nfi\n\nif [ ! \"${PROJECT_DIR}\" ] || [ -z \"${PROJECT_DIR}\" ]; then\n    echo \"Instabug: PROJECT_DIR not found in Xcode build settings, skipping sourcemap upload\"\n    exit 0\nfi\n\nPLIST_ABS_PATH=\"$PROJECT_DIR/$INFOPLIST_FILE\"\necho \"Instabug: PLIST_ABS_PATH: $PLIST_ABS_PATH\"\n\nif [ ! \"${INSTABUG_APP_TOKEN}\" ] || [ -z \"${INSTABUG_APP_TOKEN}\" ]; then\n    echo \"Instabug: Looking for Token...\"\n    INSTABUG_APP_TOKEN=$(grep -r -A 6  --exclude-dir={node_modules,ios,android} --exclude='*.json' \"Instabug.init({\" ./ -m1 | grep \"token:[[:space:]]*[\\\"\\'][0-9a-zA-Z]*[\\\"\\']\" | grep -o \"[\\\"\\'][0-9a-zA-Z]*[\\\"\\']\" | cut -d \"\\\"\" -f 2 | cut -d \"'\" -f 2)\n    if [ -z \"${INSTABUG_APP_TOKEN}\" ]; then\n    INSTABUG_APP_TOKEN=$(grep -r --exclude-dir={node_modules,ios,android} --exclude='*.json' \"Instabug.start[WithToken]*([\\\"\\'][0-9a-zA-Z]*[\\\"\\']\" ./ -m 1 | grep -o \"[\\\"\\'][0-9a-zA-Z]*[\\\"\\']\" | cut -d \"\\\"\" -f 2 | cut -d \"'\" -f 2)\n    fi\nfi\n\nif [ ! \"${INSTABUG_APP_TOKEN}\" ] || [ -z \"${INSTABUG_APP_TOKEN}\" ]; then\n    echo \"Instabug: INSTABUG_APP_TOKEN not found. Make sure you've added the SDK initialization line Instabug.init Or added the environment variable INSTABUG_APP_TOKEN\"\n    exit 0\nelse\n    if [ ! \"${INSTABUG_APP_VERSION_CODE}\" ] || [ -z \"${INSTABUG_APP_VERSION_CODE}\" ]; then\n        INSTABUG_APP_VERSION_CODE=$(/usr/libexec/PlistBuddy -c 'print CFBundleVersion' ${PLIST_ABS_PATH} )\n        if [ ! \"${INSTABUG_APP_VERSION_CODE}\" ] || [ -z \"${INSTABUG_APP_VERSION_CODE}\" ]; then\n            echo \"CFBundleVersion could not be found, please upload the sourcemap files manually\"\n            exit 0\n        fi\n        INSTABUG_APP_VERSION_CODE_ENV=$(grep -o '$(.*)' <<< $INSTABUG_APP_VERSION_CODE | cut -d \"(\" -f2 | cut -d \")\" -f1)\n        if !([ ! \"${INSTABUG_APP_VERSION_CODE_ENV}\" ] || [ -z \"${INSTABUG_APP_VERSION_CODE_ENV}\" ]); then\n            INSTABUG_APP_VERSION_CODE=${!INSTABUG_APP_VERSION_CODE_ENV}\n            if [ ! \"${INSTABUG_APP_VERSION_CODE}\" ] || [ -z \"${INSTABUG_APP_VERSION_CODE}\" ]; then\n                echo \"Environment variable $INSTABUG_APP_VERSION_CODE_ENV was specified inside Info.plist but was not found, please upload the sourcemap files manually\" \n                exit 0\n            fi\n        fi\n    fi\n    if [ ! \"${INSTABUG_APP_VERSION_NAME}\" ] || [ -z \"${INSTABUG_APP_VERSION_NAME}\" ]; then\n        INSTABUG_APP_VERSION_NAME=$(/usr/libexec/PlistBuddy -c 'print CFBundleShortVersionString' ${PLIST_ABS_PATH} )\n        if [ ! \"${INSTABUG_APP_VERSION_NAME}\" ] || [ -z \"${INSTABUG_APP_VERSION_NAME}\" ]; then\n            echo \"CFBundleShortVersionString could not be found, please upload the sourcemap files manually\"\n            exit 0\n        fi\n        INSTABUG_APP_VERSION_NAME_ENV=$(grep -o '$(.*)' <<< $INSTABUG_APP_VERSION_NAME | cut -d \"(\" -f2 | cut -d \")\" -f1)\n        if !([ ! \"${INSTABUG_APP_VERSION_NAME_ENV}\" ] || [ -z \"${INSTABUG_APP_VERSION_NAME_ENV}\" ]); then\n            INSTABUG_APP_VERSION_NAME=${!INSTABUG_APP_VERSION_NAME_ENV}\n            if [ ! \"${INSTABUG_APP_VERSION_NAME}\" ] || [ -z \"${INSTABUG_APP_VERSION_NAME}\" ]; then\n                echo \"Environment variable $INSTABUG_APP_VERSION_NAME_ENV was specified inside Info.plist but was not found, please upload the sourcemap files manually\" \n                exit 0\n            fi\n        fi\n    fi\n    if [ -z \"${INSTABUG_ENTRY_FILE}\" ]; then \n        ENTRY_FILE='index.js'\n    else \n        ENTRY_FILE=${INSTABUG_ENTRY_FILE}\n    fi\n    if [ ! -f $ENTRY_FILE ]; then\n        echo \"Instabug: err: entry file not found. Make sure\" \"\\\"${ENTRY_FILE}\\\"\" \"exists in your projects root directory. Or add the environment variable INSTABUG_ENTRY_FILE with the name of your entry file\"\n        exit 0\n    fi\n    VERSION='{\"code\":\"'\"$INSTABUG_APP_VERSION_CODE\"'\",\"name\":\"'\"$INSTABUG_APP_VERSION_NAME\"'\"}'\n    echo \"Instabug: Token:\" \"\\\"\"${INSTABUG_APP_TOKEN}\"\\\"\"\n    echo \"Instabug: VERSION: $VERSION\"\n    echo \"Instabug: Entry file found\" \"\\\"\"${ENTRY_FILE}\"\\\"\"\n    echo \"Instabug: Generating sourcemap files...\"\n    HERMES_ENABLED=$(grep hermes-engine ./ios/Podfile.lock -m 1)\n    INSTALLED_RN_VERSION_MAJOR=$(node -p \"require('./node_modules/react-native/package.json').version\" | cut -d \".\" -f2)\n    if [[ ! -z \"$HERMES_ENABLED\" && \"$INSTALLED_RN_VERSION_MAJOR\" -ge 65 && \"$INSTALLED_RN_VERSION_MAJOR\" -lt 70 ]]; then\n        EXTRA_ARGS=\"--minify false\"\n    fi\n    #Generate ios sourcemap\n    npx react-native bundle --platform ios \\\n    --reset-cache \\\n    --entry-file $ENTRY_FILE \\\n    --dev false \\\n    --bundle-output ./ios/main.jsbundle \\\n    --sourcemap-output ./ios-sourcemap.json \\\n    $EXTRA_ARGS\n    \n    echo \"Instabug: Uploading files...\"\n    #Upload ios sourcemap\n    curl -X POST 'https://api.instabug.com/api/sdk/v3/symbols_files' -F \"app_version=${VERSION}\" -F \"symbols_file=@./ios-sourcemap.json\"  -F \"application_token=${INSTABUG_APP_TOKEN}\"  -F \"platform=react_native\"  -F \"os=ios\" \n    rm -rf ios-sourcemap.json\n    echo \nfi\n";
+			shellScript = "#!/bin/sh\ncd ${PROJECT_DIR}\ncd ..\nif [ -s \"$HOME/.nvm/nvm.sh\" ]; then\n. \"$HOME/.nvm/nvm.sh\"\nelif [ -x \"$(command -v brew)\" ] && [ -s \"$(brew --prefix nvm)/nvm.sh\" ]; then\n. \"$(brew --prefix nvm)/nvm.sh\"\nfi\nexport NODE_BINARY=node\n\nINSTABUG_SOURCEMAPS_UPLOAD_DISABLE=$(echo $INSTABUG_SOURCEMAPS_UPLOAD_DISABLE | tr 'A-Z' 'a-z')\nif [ \"${INSTABUG_SOURCEMAPS_UPLOAD_DISABLE}\" = \"true\" ]; then\n    echo \"Instabug: Environment variable INSTABUG_SOURCEMAPS_UPLOAD_DISABLE was set to true, skipping sourcemap upload\"\n    exit 0\nfi\n\nif [ ! \"$INFOPLIST_FILE\" ] || [ -z \"$INFOPLIST_FILE\" ]; then\n    echo \"Instabug: INFOPLIST_FILE not found in Xcode build settings, skipping sourcemap upload\"\n    exit 0\nfi\n\nif [ ! \"${PROJECT_DIR}\" ] || [ -z \"${PROJECT_DIR}\" ]; then\n    echo \"Instabug: PROJECT_DIR not found in Xcode build settings, skipping sourcemap upload\"\n    exit 0\nfi\n\nPLIST_ABS_PATH=\"$PROJECT_DIR/$INFOPLIST_FILE\"\necho \"Instabug: PLIST_ABS_PATH: $PLIST_ABS_PATH\"\n\nif [ ! \"${INSTABUG_APP_TOKEN}\" ] || [ -z \"${INSTABUG_APP_TOKEN}\" ]; then\n    echo \"Instabug: Looking for Token...\"\n    INSTABUG_APP_TOKEN=$(grep -r -A 6  --exclude-dir={node_modules,ios,android} --exclude='*.json' \"Instabug.init({\" ./ -m1 | grep \"token:[[:space:]]*[\\\"\\'][0-9a-zA-Z]*[\\\"\\']\" | grep -o \"[\\\"\\'][0-9a-zA-Z]*[\\\"\\']\" | cut -d \"\\\"\" -f 2 | cut -d \"'\" -f 2)\n    if [ -z \"${INSTABUG_APP_TOKEN}\" ]; then\n    INSTABUG_APP_TOKEN=$(grep -r --exclude-dir={node_modules,ios,android} --exclude='*.json' \"Instabug.start[WithToken]*([\\\"\\'][0-9a-zA-Z]*[\\\"\\']\" ./ -m 1 | grep -o \"[\\\"\\'][0-9a-zA-Z]*[\\\"\\']\" | cut -d \"\\\"\" -f 2 | cut -d \"'\" -f 2)\n    fi\nfi\n\nif [ ! \"${INSTABUG_APP_TOKEN}\" ] || [ -z \"${INSTABUG_APP_TOKEN}\" ]; then\n    echo \"Instabug: INSTABUG_APP_TOKEN not found. Make sure you've added the SDK initialization line Instabug.init Or added the environment variable INSTABUG_APP_TOKEN\"\n    exit 0\nelse\n    if [ ! \"${INSTABUG_APP_VERSION_CODE}\" ] || [ -z \"${INSTABUG_APP_VERSION_CODE}\" ]; then\n        INSTABUG_APP_VERSION_CODE=$(/usr/libexec/PlistBuddy -c 'print CFBundleVersion' ${PLIST_ABS_PATH} )\n        if [ ! \"${INSTABUG_APP_VERSION_CODE}\" ] || [ -z \"${INSTABUG_APP_VERSION_CODE}\" ]; then\n            echo \"CFBundleVersion could not be found, please upload the sourcemap files manually\"\n            exit 0\n        fi\n        INSTABUG_APP_VERSION_CODE_ENV=$(grep -o '$(.*)' <<< $INSTABUG_APP_VERSION_CODE | cut -d \"(\" -f2 | cut -d \")\" -f1)\n        if !([ ! \"${INSTABUG_APP_VERSION_CODE_ENV}\" ] || [ -z \"${INSTABUG_APP_VERSION_CODE_ENV}\" ]); then\n            INSTABUG_APP_VERSION_CODE=${!INSTABUG_APP_VERSION_CODE_ENV}\n            if [ ! \"${INSTABUG_APP_VERSION_CODE}\" ] || [ -z \"${INSTABUG_APP_VERSION_CODE}\" ]; then\n                echo \"Environment variable $INSTABUG_APP_VERSION_CODE_ENV was specified inside Info.plist but was not found, please upload the sourcemap files manually\" \n                exit 0\n            fi\n        fi\n    fi\n    if [ ! \"${INSTABUG_APP_VERSION_NAME}\" ] || [ -z \"${INSTABUG_APP_VERSION_NAME}\" ]; then\n        INSTABUG_APP_VERSION_NAME=$(/usr/libexec/PlistBuddy -c 'print CFBundleShortVersionString' ${PLIST_ABS_PATH} )\n        if [ ! \"${INSTABUG_APP_VERSION_NAME}\" ] || [ -z \"${INSTABUG_APP_VERSION_NAME}\" ]; then\n            echo \"CFBundleShortVersionString could not be found, please upload the sourcemap files manually\"\n            exit 0\n        fi\n        INSTABUG_APP_VERSION_NAME_ENV=$(grep -o '$(.*)' <<< $INSTABUG_APP_VERSION_NAME | cut -d \"(\" -f2 | cut -d \")\" -f1)\n        if !([ ! \"${INSTABUG_APP_VERSION_NAME_ENV}\" ] || [ -z \"${INSTABUG_APP_VERSION_NAME_ENV}\" ]); then\n            INSTABUG_APP_VERSION_NAME=${!INSTABUG_APP_VERSION_NAME_ENV}\n            if [ ! \"${INSTABUG_APP_VERSION_NAME}\" ] || [ -z \"${INSTABUG_APP_VERSION_NAME}\" ]; then\n                echo \"Environment variable $INSTABUG_APP_VERSION_NAME_ENV was specified inside Info.plist but was not found, please upload the sourcemap files manually\" \n                exit 0\n            fi\n        fi\n    fi\n    if [ -z \"${INSTABUG_ENTRY_FILE}\" ]; then \n        ENTRY_FILE='index.js'\n    else \n        ENTRY_FILE=${INSTABUG_ENTRY_FILE}\n    fi\n    if [ ! -f $ENTRY_FILE ]; then\n        echo \"Instabug: err: entry file not found. Make sure\" \"\\\"${ENTRY_FILE}\\\"\" \"exists in your projects root directory. Or add the environment variable INSTABUG_ENTRY_FILE with the name of your entry file\"\n        exit 0\n    fi\n    VERSION='{\"code\":\"'\"$INSTABUG_APP_VERSION_CODE\"'\",\"name\":\"'\"$INSTABUG_APP_VERSION_NAME\"'\"}'\n    echo \"Instabug: Token:\" \"\\\"\"${INSTABUG_APP_TOKEN}\"\\\"\"\n    echo \"Instabug: VERSION: $VERSION\"\n    echo \"Instabug: Entry file found\" \"\\\"\"${ENTRY_FILE}\"\\\"\"\n    echo \"Instabug: Generating sourcemap files...\"\n    HERMES_ENABLED=$(grep hermes-engine ./ios/Podfile.lock -m 1)\n    INSTALLED_RN_VERSION_MAJOR=$(node -p \"require('react-native/package.json').version\" | cut -d \".\" -f2)\n    if [[ ! -z \"$HERMES_ENABLED\" && \"$INSTALLED_RN_VERSION_MAJOR\" -ge 65 && \"$INSTALLED_RN_VERSION_MAJOR\" -lt 70 ]]; then\n        EXTRA_ARGS=\"--minify false\"\n    fi\n    #Generate ios sourcemap\n    npx react-native bundle --platform ios \\\n    --reset-cache \\\n    --entry-file $ENTRY_FILE \\\n    --dev false \\\n    --bundle-output ./ios/main.jsbundle \\\n    --sourcemap-output ./ios-sourcemap.json \\\n    $EXTRA_ARGS\n    \n    echo \"Instabug: Uploading files...\"\n    #Upload ios sourcemap\n    curl -X POST 'https://api.instabug.com/api/sdk/v3/symbols_files' -F \"app_version=${VERSION}\" -F \"symbols_file=@./ios-sourcemap.json\"  -F \"application_token=${INSTABUG_APP_TOKEN}\"  -F \"platform=react_native\"  -F \"os=ios\" \n    rm -rf ios-sourcemap.json\n    echo \nfi\n";
 		};
 		DD1AA4DBFEAB75A854826F0C /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
diff --git a/ios/upload_sourcemap.sh b/ios/upload_sourcemap.sh
@@ -84,7 +84,7 @@ else
     echo "Instabug: Entry file found" "\""${ENTRY_FILE}"\""
     echo "Instabug: Generating sourcemap files..."
     HERMES_ENABLED=$(grep hermes-engine ./ios/Podfile.lock -m 1)
-    INSTALLED_RN_VERSION_MAJOR=$(node -p "require('./node_modules/react-native/package.json').version" | cut -d "." -f2)
+    INSTALLED_RN_VERSION_MAJOR=$(node -p "require('react-native/package.json').version" | cut -d "." -f2)
     if [[ ! -z "$HERMES_ENABLED" && "$INSTALLED_RN_VERSION_MAJOR" -ge 65 && "$INSTALLED_RN_VERSION_MAJOR" -lt 70 ]]; then
         EXTRA_ARGS="--minify false"
     fi
