From 1035e5034a6bc8c714c008ed40057b0249069527 Mon Sep 17 00:00:00 2001
From: Ryan Albrecht <ryan.albrecht@sentry.io>
Date: Sat, 6 Apr 2024 13:08:31 -0700
Subject: [PATCH 1/4] feat(feedback): Maintain v7 compat in the
 @sentry-internal/feedback package

---
 packages/feedback/src/core/integration.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/feedback/src/core/integration.ts b/packages/feedback/src/core/integration.ts
index e0a0e273e6f0..270eb145f37b 100644
--- a/packages/feedback/src/core/integration.ts
+++ b/packages/feedback/src/core/integration.ts
@@ -17,6 +17,7 @@ import {
   SUBMIT_BUTTON_LABEL,
   SUCCESS_MESSAGE_TEXT,
 } from '../constants';
+import { feedbackModalIntegration } from '../modal/integration';
 import type { IFeedbackModalIntegration } from '../modal/integration';
 import type { IFeedbackScreenshotIntegration } from '../screenshot/integration';
 import type {
@@ -55,7 +56,7 @@ export const feedbackIntegration = (({
   autoInject = true,
   showEmail = true,
   showName = true,
-  showScreenshot = true,
+  showScreenshot = false,
   useSentryUser = {
     email: 'email',
     name: 'username',
@@ -153,8 +154,9 @@ export const feedbackIntegration = (({
     if (!client) {
       throw new Error('Sentry Client is not initialized correctly');
     }
-    const modalIntegration = client.getIntegrationByName<IFeedbackModalIntegration>('FeedbackModal');
-    const screenshotIntegration = client.getIntegrationByName<IFeedbackScreenshotIntegration>('FeedbackScreenshot');
+    const modalIntegration: IFeedbackModalIntegration = feedbackModalIntegration();
+    client.addIntegration(modalIntegration);
+    const screenshotIntegration: IFeedbackScreenshotIntegration = client.getIntegrationByName('FeedbackScreenshot');
     const screenshotIsSupported = isScreenshotSupported();
 
     // START TEMP: Error messages

From 24e41e2bced95aed2a276de1278f2db49d19ba69 Mon Sep 17 00:00:00 2001
From: Ryan Albrecht <ryan.albrecht@sentry.io>
Date: Mon, 8 Apr 2024 15:01:51 -0700
Subject: [PATCH 2/4] increase size-limit for feedback -> we are bundling
 preact in here now, and hooks for screenshots, which were missing before

---
 .size-limit.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.size-limit.js b/.size-limit.js
index 7fd6db3be736..465eabefb562 100644
--- a/.size-limit.js
+++ b/.size-limit.js
@@ -59,21 +59,21 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/index.js',
     import: createImport('init', 'feedbackIntegration'),
     gzip: true,
-    limit: '35 KB',
+    limit: '37 KB',
   },
   {
     name: '@sentry/browser (incl. Feedback, Feedback Modal)',
     path: 'packages/browser/build/npm/esm/index.js',
     import: createImport('init', 'feedbackIntegration', 'feedbackModalIntegration'),
     gzip: true,
-    limit: '35 KB',
+    limit: '37 KB',
   },
   {
     name: '@sentry/browser (incl. Feedback, Feedback Modal, Feedback Screenshot)',
     path: 'packages/browser/build/npm/esm/index.js',
     import: createImport('init', 'feedbackIntegration', 'feedbackModalIntegration', 'feedbackScreenshotIntegration'),
     gzip: true,
-    limit: '35 KB',
+    limit: '37 KB',
   },
   {
     name: '@sentry/browser (incl. sendFeedback)',

From fe18c0ee3801110c0828d3b06ab030d1627c8731 Mon Sep 17 00:00:00 2001
From: Ryan Albrecht <ryan.albrecht@sentry.io>
Date: Mon, 8 Apr 2024 15:52:42 -0700
Subject: [PATCH 3/4] also everything bundle

---
 .size-limit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.size-limit.js b/.size-limit.js
index 465eabefb562..e5d5fcc2f3e6 100644
--- a/.size-limit.js
+++ b/.size-limit.js
@@ -52,7 +52,7 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/index.js',
     import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'feedbackIntegration'),
     gzip: true,
-    limit: '80 KB',
+    limit: '83 KB',
   },
   {
     name: '@sentry/browser (incl. Feedback)',

From 203f6b8679838665d57ffc44e3d3292ecfd0b684 Mon Sep 17 00:00:00 2001
From: Ryan Albrecht <ryan.albrecht@sentry.io>
Date: Tue, 9 Apr 2024 08:18:14 -0700
Subject: [PATCH 4/4] another size-limit to break through

---
 .size-limit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.size-limit.js b/.size-limit.js
index e5d5fcc2f3e6..d102cf8d63b0 100644
--- a/.size-limit.js
+++ b/.size-limit.js
@@ -143,7 +143,7 @@ module.exports = [
     name: 'CDN Bundle (incl. Tracing, Replay, Feedback)',
     path: createCDNPath('bundle.tracing.replay.feedback.min.js'),
     gzip: true,
-    limit: '75 KB',
+    limit: '83 KB',
   },
   // browser CDN bundles (non-gzipped)
   {