Merge pull request #1865 from StoDevX/bugsnag-sourcemaps

Upload source maps to Bugsnag for actual line-based error numbers

Author: hawkrives

.travis.yml

@@ -164,7 +164,7 @@ before_install:
   - nvm install "$TRAVIS_NODE_VERSION"
   - nvm use "$TRAVIS_NODE_VERSION"
   - echo "node -v is now $(node -v)"
-  
+
   # travis doesn't install yarn automatically on osx
   - if [[ $TRAVIS_OS_NAME == "osx" ]]; then brew install yarn --without-node; fi
 

Gemfile.lock

@@ -36,7 +36,7 @@ GEM
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.0)
-    fastlane (2.62.0)
+    fastlane (2.64.0)
       CFPropertyList (>= 2.3, < 3.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -104,7 +104,7 @@ GEM
     httparty (0.15.6)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (0.9.0)
+    i18n (0.9.1)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
     jwt (2.1.0)
@@ -131,7 +131,7 @@ GEM
     public_suffix (2.0.5)
     rainbow (2.2.2)
       rake
-    rake (12.1.0)
+    rake (12.2.1)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
@@ -175,23 +175,23 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    tty-screen (0.5.0)
-    tzinfo (1.2.3)
+    tty-screen (0.5.1)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.4)
     unicode-display_width (1.3.0)
     word_wrap (1.0.0)
-    xcodeproj (1.5.2)
+    xcodeproj (1.5.3)
       CFPropertyList (~> 2.3.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.2.3)
     xcpretty (0.2.8)
       rouge (~> 2.0.7)
-    xcpretty-travis-formatter (0.0.4)
+    xcpretty-travis-formatter (1.0.0)
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
@@ -205,6 +205,5 @@ DEPENDENCIES
   rubocop (= 0.46)
   xcodeproj
 
-
 BUNDLED WITH
-   1.15.4
+   1.16.0

fastlane/README.md

@@ -12,9 +12,9 @@ xcode-select --install
 
 <table width="100%" >
 <tr>
-<th width="33%"><a href="http://brew.sh">Homebrew</a></td>
-<th width="33%">Installer Script</td>
-<th width="33%">Rubygems</td>
+<th width="33%"><a href="http://brew.sh">Homebrew</a></th>
+<th width="33%">Installer Script</th>
+<th width="33%">RubyGems</th>
 </tr>
 <tr>
 <td width="33%" align="center">macOS</td>
@@ -53,6 +53,11 @@ Submit a new beta build to Google Play
 fastlane android nightly
 ```
 Submit a new nightly build to Google Play
+### android sourcemap
+```
+fastlane android sourcemap
+```
+Bundle an Android sourcemap
 ### android ci-run
 ```
 fastlane android ci-run
@@ -97,6 +102,11 @@ Submit a new Beta Build to Testflight
 fastlane ios nightly
 ```
 Submit a new nightly Beta Build to Testflight
+### ios sourcemap
+```
+fastlane ios sourcemap
+```
+Bundle an iOS sourcemap
 ### ios refresh_dsyms
 ```
 fastlane ios refresh_dsyms

fastlane/lib/util.rb

@@ -49,7 +49,8 @@ def propagate_version(**args)
   UI.message "Propagating version: #{version}"
   UI.message 'into the Info.plist and build.gradle files'
 
-  # encode build number into js-land
+  # encode build number into js-land – we've already fetched it, so we'll
+  # never set the "+" into the binaries
   set_package_data(data: { version: "#{version}+#{build}" })
 
   case lane_context[:PLATFORM_NAME]
@@ -63,6 +64,70 @@ def propagate_version(**args)
   end
 end
 
+# Generate argument values for the generate_sourcemap and upload_sourcemap_to_bugsnag lanes
+def get_sourcemap_args
+  # The cwd is /fastlane. I don't know why entry_file doesn't need to be ../, but
+  # I believe that watchman finds the project root and automatically looks there
+  case lane_context[:PLATFORM_NAME]
+  when :android
+    platform = 'android'
+    entry_file = 'index.android.js'
+    bundle_output = '../android-release.bundle'
+    sourcemap_output = '../android-release.bundle.map'
+    bundle_url = 'index.android.bundle'
+  when :ios
+    platform = 'ios'
+    entry_file = 'index.ios.js'
+    bundle_output = '../ios-release.bundle'
+    sourcemap_output = '../ios-release.bundle.map'
+    bundle_url = 'main.jsbundle'
+  end
+
+  {
+    platform: platform,
+    entry_file: entry_file,
+    bundle_output: bundle_output,
+    sourcemap_output: sourcemap_output,
+    bundle_url: bundle_url,
+  }
+end
+
+# Use react-native cli to generate the source map
+def generate_sourcemap
+  args = get_sourcemap_args
+
+  cmd = [
+    'npx react-native bundle',
+    '--dev false',
+    "--platform '#{args[:platform]}'",
+    "--entry-file '#{args[:entry_file]}'",
+    "--bundle-output '#{args[:bundle_output]}'",
+    "--sourcemap-output '#{args[:sourcemap_output]}'",
+  ].join ' '
+
+  FastlaneCore::CommandExecutor.execute(command: cmd,
+                                        print_all: true,
+                                        print_command: true)
+end
+
+# Upload source map to Bugsnag
+def upload_sourcemap_to_bugsnag
+  args = get_sourcemap_args
+
+  cmd = [
+    'npx bugsnag-sourcemaps upload',
+    "--api-key '#{ENV['BUGSNAG_KEY']}'",
+    "--minified-file '#{args[:bundle_output]}'",
+    "--source-map '#{args[:sourcemap_output]}'",
+    "--minified-url '#{args[:bundle_url]}'",
+    '--upload-sources',
+  ].join ' '
+
+  FastlaneCore::CommandExecutor.execute(command: cmd,
+                                        print_all: true,
+                                        print_command: true)
+end
+
 # last_git_tag returns the most recent tag, chronologically.
 # newest_tag returns the most recent tag *on this branch*.
 def newest_tag

fastlane/platforms/android.rb

@@ -27,6 +27,9 @@
 
     supply(track: track,
            check_superseded_tracks: true)
+
+    generate_sourcemap
+    upload_sourcemaps_to_bugsnag
   end
 
   desc 'Submit a new beta build to Google Play'
@@ -39,6 +42,11 @@
     submit(track: 'alpha')
   end
 
+  desc 'Bundle an Android sourcemap'
+  lane :sourcemap do
+    generate_sourcemap
+  end
+
   desc 'Run the appropriate action on CI'
   lane :'ci-run' do
     # prepare for the bright future with signed android betas

fastlane/platforms/ios.rb

@@ -13,7 +13,7 @@
       # 'iPhone 4s',
       'iPad Pro (9.7-inch)',
       'iPad Pro (12.9-inch)',
-   ]
+    ]
     snapshot(devices: devices,
              languages: ['en-US'],
              scheme: ENV['GYM_SCHEME'],
@@ -47,6 +47,13 @@
       puts 'Changelog failed to upload:'
       puts error
     end
+    generate_sourcemap
+    upload_sourcemaps_to_bugsnag
+  end
+
+  desc 'Bundle an iOS sourcemap'
+  lane :sourcemap do
+    generate_sourcemap
   end
 
   desc 'Upload dYSM symbols to Bugsnag from Apple'

package.json

@@ -104,6 +104,7 @@
     "babel-jest": "21.2.0",
     "babel-plugin-flow-react-proptypes": "9.0.0",
     "babel-preset-react-native": "3.0.1",
+    "bugsnag-sourcemaps": "1.0.1",
     "danger": "2.0.1",
     "eslint": "4.10.0",
     "eslint-config-prettier": "2.7.0",

source/bugsnag.js

@@ -1,13 +1,11 @@
 // @flow
 import {Client, Configuration} from 'bugsnag-react-native'
-import pkg from '../package.json'
 
-const PRODUCTION = process.env.NODE_ENV === 'production'
+const IS_PRODUCTION = process.env.NODE_ENV === 'production'
 
 const config = new Configuration()
-config.autoNotify = PRODUCTION
-config.codeBundleId = pkg.version
-if (!PRODUCTION) {
+config.autoNotify = IS_PRODUCTION
+if (!IS_PRODUCTION) {
   // disable bugsnag in dev builds
   config.beforeSendCallbacks.push(() => false)
 }