Make Sentry work properly in the popup and recorder pages

This lazy-loads sentry.js in those contexts.
mozilla-extensions · Oct 3, 2019 · 0ecc124 · 0ecc124
1 parent fd7e9b4
commit 0ecc124
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/extension/catcher.js b/extension/catcher.js
@@ -1,4 +1,4 @@
-/* globals Sentry, buildSettings */
+/* globals Sentry, buildSettings, catcherAsyncSetup */
 
 this.catcher = (function() {
   const exports = {};
@@ -17,7 +17,8 @@ this.catcher = (function() {
     if (!buildSettings.sentryDsn) {
       return;
     }
-    Sentry.init({
+    const sentryOptions = {
+      url: "/js/vendor/sentry.js",
       dsn: buildSettings.sentryDsn,
       release: manifest.version,
       environment: buildSettings.channel,
@@ -39,7 +40,13 @@ this.catcher = (function() {
         }
         return event;
       },
-    });
+    };
+    if (typeof Sentry === "undefined") {
+      window.SENTRY_DSK = sentryOptions;
+      catcherAsyncSetup();
+    } else {
+      Sentry.init(sentryOptions);
+    }
   }
 
   exports.capture = function(e) {

diff --git a/extension/catcherAsyncSetup.js b/extension/catcherAsyncSetup.js