fix(feedback): Ensure pluggable feedback CDN bundle is correctly built

dev-packages/browser-integration-tests/suites/feedback/captureFeedback/init.js

@@ -1,11 +1,13 @@
 import * as Sentry from '@sentry/browser';
+// Import this separately so that generatePlugin can handle it for CDN scenarios
+import { feedbackIntegration } from '@sentry/browser';
 
 window.Sentry = Sentry;
 
 Sentry.init({
  dsn: 'https://public@dsn.ingest.sentry.io/1337',
  integrations: [
- Sentry.feedbackIntegration({
+ feedbackIntegration({
  tags: { from: 'integration init' },
  }),
  ],

dev-packages/browser-integration-tests/suites/feedback/captureFeedbackAndReplay/hasSampling/init.js

@@ -1,4 +1,6 @@
 import * as Sentry from '@sentry/browser';
+// Import this separately so that generatePlugin can handle it for CDN scenarios
+import { feedbackIntegration } from '@sentry/browser';
 
 window.Sentry = Sentry;
 
@@ -12,6 +14,6 @@ Sentry.init({
  flushMaxDelay: 200,
  minReplayDuration: 0,
  }),
- Sentry.feedbackIntegration(),
+ feedbackIntegration(),
  ],
 });

dev-packages/browser-integration-tests/utils/generatePlugin.ts

@@ -34,6 +34,7 @@ const IMPORTED_INTEGRATION_CDN_BUNDLE_PATHS: Record<string, string> = {
  extraErrorDataIntegration: 'extraerrordata',
  reportingObserverIntegration: 'reportingobserver',
  sessionTimingIntegration: 'sessiontiming',
+ feedbackIntegration: 'feedback',
 };
 
 const BUNDLE_PATHS: Record<string, Record<string, string>> = {

dev-packages/browser-integration-tests/utils/helpers.ts

@@ -246,15 +246,11 @@ export function shouldSkipTracingTest(): boolean {
 }
 
 /**
- * We can only test feedback tests in certain bundles/packages:
- * - NPM (ESM, CJS)
- * - CDN bundles that contain the Replay integration
- *
- * @returns `true` if we should skip the feedback test
+ * Today we always run feedback tests, but this can be used to guard this if we ever need to.
  */
 export function shouldSkipFeedbackTest(): boolean {
- const bundle = process.env.PW_BUNDLE as string | undefined;
- return bundle != null && !bundle.includes('feedback') && !bundle.includes('esm') && !bundle.includes('cjs');
+ // We always run these, in bundles the pluggable integration is automatically added
+ return false;
 }
 
 /**

packages/browser/rollup.bundle.config.mjs

@@ -4,13 +4,14 @@ const builds = [];
 
 const browserPluggableIntegrationFiles = ['contextlines', 'httpclient', 'reportingobserver', 'browserprofiling'];
 
-const corePluggableIntegrationFiles = [
+const reexportedPluggableIntegrationFiles = [
  'captureconsole',
  'debug',
  'dedupe',
  'extraerrordata',
  'rewriteframes',
  'sessiontiming',
+ 'feedback',
 ];
 
 browserPluggableIntegrationFiles.forEach(integrationName => {
@@ -24,7 +25,7 @@ browserPluggableIntegrationFiles.forEach(integrationName => {
  builds.push(...makeBundleConfigVariants(integrationsBundleConfig));
 });
 
-corePluggableIntegrationFiles.forEach(integrationName => {
+reexportedPluggableIntegrationFiles.forEach(integrationName => {
  const integrationsBundleConfig = makeBaseBundleConfig({
  bundleType: 'addon',
  entrypoints: [`src/integrations-bundle/index.${integrationName}.ts`],

packages/browser/src/integrations-bundle/index.feedback.ts

@@ -0,0 +1,7 @@
+import { feedbackAsyncIntegration } from '../feedbackAsync';
+
+export { getFeedback } from '@sentry-internal/feedback';
+
+export { feedbackAsyncIntegration, feedbackAsyncIntegration as feedbackIntegration };
+
+export { captureFeedback } from '@sentry/core';

packages/feedback/rollup.bundle.config.mjs

@@ -1,21 +1,8 @@
 import { makeBaseBundleConfig, makeBundleConfigVariants } from '@sentry-internal/rollup-utils';
 
 export default [
- ...makeBundleConfigVariants(
- makeBaseBundleConfig({
- bundleType: 'addon',
- entrypoints: ['src/index.ts'],
- jsVersion: 'es6',
- licenseTitle: '@sentry-internal/feedback',
- outputFileBase: () => 'bundles/feedback',
- sucrase: {
- // The feedback widget is using preact so we need different pragmas and jsx runtimes
- jsxPragma: 'h',
- jsxFragmentPragma: 'Fragment',
- jsxRuntime: 'classic',
- },
- }),
- ),
+ // The core `feedback` bundle is built in the browser package
+ // Sub-bundles are built here
  ...makeBundleConfigVariants(
  makeBaseBundleConfig({
  bundleType: 'addon',