Merge pull request #542 from bugsnag/expo-on-prem-config

feat(expo): Support "endpoint" option for builds/source maps
bugsnag · May 23, 2019 · 7f1d656 · 7f1d656
2 parents b579ddb + 4ecc945
commit 7f1d656
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/packages/expo/hooks/lib/report-build.js b/packages/expo/hooks/lib/report-build.js
@@ -1,10 +1,10 @@
 const reportBuild = require('bugsnag-build-reporter')
 
-module.exports = async (apiKey, manifest, projectRoot) => {
+module.exports = async (apiKey, manifest, projectRoot, endpoint) => {
   const { revisionId, version } = manifest
   await reportBuild({
     apiKey,
     appVersion: version,
     metadata: { [`bundle@${new Date().toISOString()}`]: revisionId }
-  }, { path: projectRoot })
+  }, { path: projectRoot, endpoint })
 }
diff --git a/packages/expo/hooks/lib/upload-source-maps.js b/packages/expo/hooks/lib/upload-source-maps.js
@@ -14,7 +14,8 @@ module.exports = async (
   androidManifest,
   androidBundle,
   androidSourceMap,
-  projectRoot
+  projectRoot,
+  endpoint
 ) => {
   const dir = await makeTmpDir()
 
@@ -30,26 +31,29 @@ module.exports = async (
   await writeFileAsync(androidSourceMapPath, androidSourceMap, 'utf-8')
   await writeFileAsync(androidBundlePath, androidBundle, 'utf-8')
 
+  const opts = { apiKey }
+  if (endpoint) opts.endpoint = endpoint
+
   // android
   console.log(`Uploading Android source map`)
   await upload({
-    apiKey,
     appVersion: androidManifest.version,
     minifiedUrl: '*/cached-bundle-experience-*',
     minifiedFile: androidBundlePath,
     codeBundleId: androidManifest.revisionId,
-    sourceMap: androidSourceMapPath
+    sourceMap: androidSourceMapPath,
+    ...opts
   })
 
   // ios
   console.log(`Uploading iOS source map`)
   await upload({
-    apiKey,
     appVersion: iosManifest.version,
     minifiedUrl: iosManifest.bundleUrl,
     minifiedFile: iosBundlePath,
     codeBundleId: iosManifest.revisionId,
-    sourceMap: iosSourceMapPath
+    sourceMap: iosSourceMapPath,
+    ...opts
   })
 }
 

diff --git a/packages/expo/hooks/post-publish.js b/packages/expo/hooks/post-publish.js
@@ -23,10 +23,14 @@ module.exports = async ({
         '@bugsnag/expo postPublish hook requires your Bugsnag API key'
       )
     }
-    if (!config || config.reportBuild !== false) {
-      await reportBuild(apiKey, iosManifest, projectRoot)
+
+    const buildReporterConfig = (config && config.buildReporter) ? config.buildReporter : {}
+    if (buildReporterConfig.disabled !== true) {
+      await reportBuild(apiKey, iosManifest, projectRoot, buildReporterConfig.endpoint)
     }
-    if (!config || config.uploadSourcemaps !== false) {
+
+    const sourceMapConfig = (config && config.sourceMapUploader) ? config.sourceMapUploader : {}
+    if (sourceMapConfig.disabled !== true) {
       await uploadSourcemaps(
         apiKey,
         iosManifest,
@@ -35,7 +39,8 @@ module.exports = async ({
         androidManifest,
         androidBundle,
         androidSourceMap,
-        projectRoot
+        projectRoot,
+        sourceMapConfig.endpoint
       )
     }
   } catch (e) {