feat: Export integrations on Sentry.Integrations

HazAT · HazAT · commit 7a62d0299872 · 2019-03-20T08:04:32.000+01:00
diff --git a/packages/browser/test/integration/common.js b/packages/browser/test/integration/common.js
@@ -117,7 +117,10 @@ function initSDK() {
   Sentry.init({
     dsn: 'https://public@example.com/1',
     // debug: true,
-    integrations: [new SentryIntegration.Dedupe()],
+    integrations: [
+      (Sentry.Integrations && Sentry.Integrations.Dedupe && new Sentry.Integrations.Dedupe()) ||
+        (SentryIntegrations && new SentryIntegrations.Dedupe()),
+    ],
     attachStacktrace: true,
     transport: DummyTransport,
     ignoreErrors: ['ignoreErrorTest'],
diff --git a/packages/browser/test/integration/frame.html b/packages/browser/test/integration/frame.html
@@ -6,9 +6,9 @@
   <title></title>
   <script src="polyfills/es6-promise-4.2.5.auto.js"></script>
   <script src="polyfills/whatwg-fetch-3.0.0.js"></script>
-  <script src="dedupe.js"></script>
   <script src="common.js"></script>
   <script src="../../build/bundle.js"></script>
+  <script src="dedupe.js"></script>
   <script src="init.js"></script>
 </head>
 
diff --git a/packages/browser/test/manual/test-code.js b/packages/browser/test/manual/test-code.js
@@ -1,8 +1,10 @@
 const Sentry = require('../../dist/index.js');
+const Integrations = require('../../../integrations/dist/dedupe.js');
 
 // Init
 Sentry.init({
   dsn: 'https://completelyrandom@dsn.asdf/42',
+  integrations: [new Integrations.Dedupe()],
   beforeSend(event) {
     console.log('Got an event');
     return null;
diff --git a/packages/integrations/rollup.config.js b/packages/integrations/rollup.config.js
@@ -53,12 +53,27 @@ function toPascalCase(string) {
 }
 
 function mergeIntoSentry(name) {
-  return `window.SentryIntegration = window.SentryIntegration || {}; \n
-  window.SentryIntegration.${name} = exports.${name};`;
+  return `
+  if (window.Sentry && window.Sentry.Integrations) {
+    window.Sentry.Integrations['${name}'] = exports.${name};
+  } else {
+    if ((typeof __SENTRY_INTEGRATIONS_LOG === 'undefined')) {
+      console.warn('Sentry.Integrations is not defined, make sure you included this script after the SDK.');
+      console.warn('In case you were using the loader, we added the Integration is now available under SentryIntegrations.${name}');
+      console.warn('To disable these warning set __SENTRY_INTEGRATIONS_LOG = true; somewhere before loading this script.');
+    }
+    window.SentryIntegrations = window.SentryIntegrations || {};
+    window.SentryIntegrations['${name}'] = exports.${name};
+  }
+  `;
+}
+
+function allIntegrations() {
+  return fs.readdirSync('./src').filter(file => file != 'modules.ts');
 }
 
 function loadAllIntegrations() {
-  return fs.readdirSync('./src').map(file => ({
+  return allIntegrations().map(file => ({
     input: `src/${file}`,
     output: {
       banner: '(function (window) {',
