Merge pull request #575 from Instabug/fix/upload-sourcemap

Use npx with react-native scripts

Author: Ali Abdelfattah

.circleci/config.yml

@@ -206,13 +206,15 @@ jobs:
 
   publish:
     macos:
-      xcode: "10.1.0"
+      xcode: "10.2.0"
+    working_directory: ~
     steps:
-      - checkout
+      - checkout:
+          path: ~/project
       - run: git clone https://InstabugCI:$RELEASE_GITHUB_TOKEN@github.com/Instabug/Escape.git
       - run: cd Escape; swift build -c release -Xswiftc -static-stdlib
       - run: cd Escape/.build/release; cp -f Escape /usr/local/bin/escape
-      - run: Escape react-native publish
+      - run: cd project && Escape react-native publish
 
 workflows:
   version: 2

__tests__/xhrNetworkInterceptor.spec.js

@@ -63,7 +63,7 @@ describe('Network Interceptor', () => {
         const requestBody = { data: [{ item: 'first' }, { item: 'second' }] };
         Interceptor.enableInterception();
         Interceptor.setOnDoneCallback((network) => {
-            expect(network.requestBody).toEqual(requestBody);
+            expect(network.requestBody).toEqual(JSON.stringify(requestBody));
             done();
         })
         FakeRequest.open(method, url);
@@ -170,4 +170,4 @@ describe('Network Interceptor', () => {
     });
 
 
-});
+});

android/upload_sourcemap.sh

@@ -40,7 +40,7 @@ else
     IS_HERMES=$(grep "enableHermes:" ./android/app/build.gradle -m 1)
     if [[ $IS_HERMES == *"true"* ]]; then
         #Generate android sourcemap (HERMES)
-        react-native bundle --platform android \
+        npx react-native bundle --platform android \
         --reset-cache \
         --entry-file index.js \
         --dev false \
@@ -60,7 +60,7 @@ else
         rm -rf index.android.bundle.map
     else
         #Generate android sourcemap
-        react-native bundle --platform android \
+        npx react-native bundle --platform android \
         --entry-file index.js \
         --dev false \
         --bundle-output ./android/main.jsbundle \

ios/upload_sourcemap.sh

@@ -51,7 +51,7 @@ else
     echo "Instabug: Token found" "\""${INSTABUG_APP_TOKEN}"\""
     echo "Instabug: Generating sourcemap files..."
     #Generate ios sourcemap
-    react-native bundle --platform ios \
+    npx react-native bundle --platform ios \
     --entry-file index.js \
     --dev false \
     --bundle-output ./ios/main.jsbundle \

utils/XhrNetworkInterceptor.js

@@ -48,14 +48,18 @@ const XHRInterceptor = {
       if (network.requestHeaders === '') {
         network.requestHeaders = {};
       }
-      network.requestHeaders[header] = value;
+      network.requestHeaders[header] = typeof value === 'string' ? value : JSON.stringify(value);
       originalXHRSetRequestHeader.apply(this, arguments);
     };
 
     XMLHttpRequest.prototype.send = function(data) {
       var cloneNetwork = JSON.parse(JSON.stringify(network));
       cloneNetwork.requestBody = data ? data : '';
 
+      if (typeof cloneNetwork.requestBody !== "string") {
+        cloneNetwork.requestBody = JSON.stringify(cloneNetwork.requestBody);
+      }
+      
       if (this.addEventListener) {
         this.addEventListener(
           'readystatechange',