@sentry/bundler-plugin-core 4.6.2 → 4.8.0

package/dist/cjs/index.js

@@ -419,6 +419,28 @@ function _asyncToGenerator(fn) {
     });
   };
 }
+function _classCallCheck(instance, Constructor) {
+  if (!(instance instanceof Constructor)) {
+    throw new TypeError("Cannot call a class as a function");
+  }
+}
+function _defineProperties(target, props) {
+  for (var i = 0; i < props.length; i++) {
+    var descriptor = props[i];
+    descriptor.enumerable = descriptor.enumerable || false;
+    descriptor.configurable = true;
+    if ("value" in descriptor) descriptor.writable = true;
+    Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor);
+  }
+}
+function _createClass(Constructor, protoProps, staticProps) {
+  if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+  if (staticProps) _defineProperties(Constructor, staticProps);
+  Object.defineProperty(Constructor, "prototype", {
+    writable: false
+  });
+  return Constructor;
+}
 function _defineProperty(obj, key, value) {
   key = _toPropertyKey(key);
   if (key in obj) {
@@ -7961,25 +7983,19 @@ function determineReleaseName() {
 function generateGlobalInjectorCode(_ref2) {
   var release = _ref2.release,
     injectBuildInformation = _ref2.injectBuildInformation;
-  // The code below is mostly ternary operators because it saves bundle size.
-  // The checks are to support as many environments as possible. (Node.js, Browser, webworkers, etc.)
-  var code = "!function(){try{var e=\"undefined\"!=typeof window?window:\"undefined\"!=typeof global?global:\"undefined\"!=typeof globalThis?globalThis:\"undefined\"!=typeof self?self:{};";
-  code += "e.SENTRY_RELEASE={id:".concat(JSON.stringify(release), "};");
+  var code = "e.SENTRY_RELEASE={id:".concat(JSON.stringify(release), "};");
   if (injectBuildInformation) {
     var buildInfo = getBuildInformation();
     code += "e.SENTRY_BUILD_INFO=".concat(JSON.stringify(buildInfo), ";");
   }
-  code += "}catch(e){}}();";
-  return code;
+  return new CodeInjection(code);
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function generateModuleMetadataInjectorCode(metadata) {
-  // The code below is mostly ternary operators because it saves bundle size.
-  // The checks are to support as many environments as possible. (Node.js, Browser, webworkers, etc.)
   // We are merging the metadata objects in case modules are bundled twice with the plugin
   // Use try-catch to avoid issues when bundlers rename global variables like 'window' to 'k'
-  return "!function(){try{var e=\"undefined\"!=typeof window?window:\"undefined\"!=typeof global?global:\"undefined\"!=typeof globalThis?globalThis:\"undefined\"!=typeof self?self:{};e._sentryModuleMetadata=e._sentryModuleMetadata||{},e._sentryModuleMetadata[(new e.Error).stack]=function(e){for(var n=1;n<arguments.length;n++){var a=arguments[n];if(null!=a)for(var t in a)a.hasOwnProperty(t)&&(e[t]=a[t])}return e}({},e._sentryModuleMetadata[(new e.Error).stack],".concat(JSON.stringify(metadata), ")}catch(e){}}();");
+  return new CodeInjection("e._sentryModuleMetadata=e._sentryModuleMetadata||{},e._sentryModuleMetadata[(new e.Error).stack]=function(e){for(var n=1;n<arguments.length;n++){var a=arguments[n];if(null!=a)for(var t in a)a.hasOwnProperty(t)&&(e[t]=a[t])}return e}({},e._sentryModuleMetadata[(new e.Error).stack],".concat(JSON.stringify(metadata), ");"));
 }
 function getBuildInformation() {
   var packageJson = getPackageJson();
@@ -8036,6 +8052,93 @@ function getProjects(project) {
   return undefined;
 }
 
+/**
+ * Inlined functionality from @sentry/cli helper code to add `--ignore` options.
+ *
+ * Temporary workaround until we expose a function for injecting debug IDs. Currently, we directly call `execute` with CLI args to inject them.
+ */
+function serializeIgnoreOptions(ignoreValue) {
+  var DEFAULT_IGNORE = ["node_modules"];
+  var ignoreOptions = Array.isArray(ignoreValue) ? ignoreValue : typeof ignoreValue === "string" ? [ignoreValue] : DEFAULT_IGNORE;
+  return ignoreOptions.reduce(function (acc, value) {
+    return acc.concat(["--ignore", String(value)]);
+  }, []);
+}
+
+/**
+ * Checks if a chunk contains only import/export statements and no substantial code.
+ *
+ * In Vite MPA (multi-page application) mode, HTML entry points create "facade" chunks
+ * that only contain import statements to load shared modules. These should not have
+ * Sentry code injected. However, in SPA mode, the main bundle also has an HTML facade
+ * but contains substantial application code that SHOULD have debug IDs injected.
+ *
+ * @ref https://github.com/getsentry/sentry-javascript-bundler-plugins/issues/829
+ * @ref https://github.com/getsentry/sentry-javascript-bundler-plugins/issues/839
+ */
+function containsOnlyImports(code) {
+  var codeWithoutImports = code
+  // Remove side effect imports: import '/path'; or import "./path";
+  // Using explicit negated character classes to avoid polynomial backtracking
+  .replace(/^\s*import\s+(?:'[^'\n]*'|"[^"\n]*"|`[^`\n]*`)[\s;]*$/gm, "")
+  // Remove named/default imports: import x from '/path'; import { x } from '/path';
+  .replace(/^\s*import\b[^'"`\n]*\bfrom\s+(?:'[^'\n]*'|"[^"\n]*"|`[^`\n]*`)[\s;]*$/gm, "")
+  // Remove re-exports: export * from '/path'; export { x } from '/path';
+  .replace(/^\s*export\b[^'"`\n]*\bfrom\s+(?:'[^'\n]*'|"[^"\n]*"|`[^`\n]*`)[\s;]*$/gm, "")
+  // Remove block comments
+  .replace(/\/\*[\s\S]*?\*\//g, "")
+  // Remove line comments
+  .replace(/\/\/.*$/gm, "")
+  // Remove "use strict" directives
+  .replace(/["']use strict["']\s*;?/g, "").trim();
+  return codeWithoutImports.length === 0;
+}
+var CodeInjection = /*#__PURE__*/function () {
+  function CodeInjection() {
+    var body = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
+    _classCallCheck(this, CodeInjection);
+    // The code below is mostly ternary operators because it saves bundle size.
+    // The checks are to support as many environments as possible. (Node.js, Browser, webworkers, etc.)
+    _defineProperty(this, "header", "!function(){try{var e=\"undefined\"!=typeof window?window:\"undefined\"!=typeof global?global:\"undefined\"!=typeof globalThis?globalThis:\"undefined\"!=typeof self?self:{};");
+    _defineProperty(this, "footer", "}catch(e){}}();");
+    this.body = body;
+  }
+  _createClass(CodeInjection, [{
+    key: "code",
+    value: function code() {
+      if (this.isEmpty()) {
+        return "";
+      }
+      return this.header + this.body + this.footer;
+    }
+  }, {
+    key: "isEmpty",
+    value: function isEmpty() {
+      return this.body.length === 0;
+    }
+  }, {
+    key: "append",
+    value: function append(code) {
+      if (code instanceof CodeInjection) {
+        this.body += code.body;
+      } else {
+        this.body += code;
+      }
+    }
+  }, {
+    key: "clear",
+    value: function clear() {
+      this.body = "";
+    }
+  }, {
+    key: "clone",
+    value: function clone() {
+      return new CodeInjection(this.body);
+    }
+  }]);
+  return CodeInjection;
+}();
+
 var SENTRY_SAAS_URL = "https://sentry.io";
 function normalizeUserOptions(userOptions) {
   var _userOptions$org, _userOptions$project, _process$env$SENTRY_P, _userOptions$authToke, _ref, _userOptions$url, _userOptions$debug, _userOptions$silent, _userOptions$telemetr, _userOptions$disable, _ref2, _userOptions$release$, _userOptions$release, _userOptions$release$2, _userOptions$release2, _userOptions$release$3, _userOptions$release3, _userOptions$release$4, _userOptions$release4, _ref3, _userOptions$release$5, _userOptions$release5, _userOptions$release6, _userOptions$_metaOpt, _userOptions$_metaOpt2, _userOptions$_experim;
@@ -8336,7 +8439,7 @@ function createSentryInstance(options, shouldSendTelemetry, buildTool) {
     dsn: "https://4c2bae7d9fbc413e8f7385f55c515d51@o1.ingest.sentry.io/6690737",
     tracesSampleRate: 1,
     sampleRate: 1,
-    release: "4.6.2",
+    release: "4.8.0",
     integrations: [],
     tracePropagationTargets: ["sentry.io/api"],
     stackParser: stackParser,
@@ -8945,7 +9048,7 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
   });
 
   // Set the User-Agent that Sentry CLI will use when interacting with Sentry
-  process.env["SENTRY_PIPELINE"] = "".concat(bundlerPluginMetaContext.buildTool, "-plugin/", "4.6.2");
+  process.env["SENTRY_PIPELINE"] = "".concat(bundlerPluginMetaContext.buildTool, "-plugin/", "4.8.0");
 
   // Propagate debug flag to Sentry CLI via environment variable
   // Only set if not already defined to respect user's explicit configuration
@@ -9313,14 +9416,14 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
                 scope: sentryScope,
                 forceTransaction: true
               }, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-                var _options$debug, cliInstance;
+                var _options$sourcemaps, cliInstance;
                 return _regeneratorRuntime().wrap(function _callee8$(_context8) {
                   while (1) switch (_context8.prev = _context8.next) {
                     case 0:
                       _context8.prev = 0;
                       cliInstance = createCliInstance(options);
                       _context8.next = 4;
-                      return cliInstance.execute(["sourcemaps", "inject"].concat(_toConsumableArray(buildArtifactPaths)), (_options$debug = options.debug) !== null && _options$debug !== void 0 ? _options$debug : false);
+                      return cliInstance.execute(["sourcemaps", "inject"].concat(_toConsumableArray(serializeIgnoreOptions((_options$sourcemaps = options.sourcemaps) === null || _options$sourcemaps === void 0 ? void 0 : _options$sourcemaps.ignore)), _toConsumableArray(buildArtifactPaths)), options.debug ? "rejectOnError" : false);
                     case 4:
                       _context8.next = 10;
                       break;
@@ -9360,7 +9463,7 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
      */
     uploadSourcemaps: function uploadSourcemaps(buildArtifactPaths, opts) {
       return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
-        var _options$sourcemaps;
+        var _options$sourcemaps2;
         var assets;
         return _regeneratorRuntime().wrap(function _callee19$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
@@ -9372,7 +9475,7 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
               return _context19.abrupt("return");
             case 2:
               // Early exit if assets is explicitly set to an empty array
-              assets = (_options$sourcemaps = options.sourcemaps) === null || _options$sourcemaps === void 0 ? void 0 : _options$sourcemaps.assets;
+              assets = (_options$sourcemaps2 = options.sourcemaps) === null || _options$sourcemaps2 === void 0 ? void 0 : _options$sourcemaps2.assets;
               if (!(Array.isArray(assets) && assets.length === 0)) {
                 _context19.next = 6;
                 break;
@@ -9389,7 +9492,7 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
                 forceTransaction: true
               }, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
                 var _opts$prepareArtifact;
-                var shouldPrepare, folderToCleanUp, freeUploadDependencyOnBuildArtifacts, _options$sourcemaps2, _options$sourcemaps3, _options$sourcemaps4, _options$sourcemaps5, pathsToUpload, ignorePaths, globAssets, globResult, debugIdChunkFilePaths, tmpUploadFolder, _process$env2;
+                var shouldPrepare, folderToCleanUp, freeUploadDependencyOnBuildArtifacts, _options$sourcemaps3, _options$sourcemaps4, _options$sourcemaps5, _options$sourcemaps6, pathsToUpload, ignorePaths, globAssets, globResult, debugIdChunkFilePaths, tmpUploadFolder, _process$env2;
                 return _regeneratorRuntime().wrap(function _callee18$(_context18) {
                   while (1) switch (_context18.prev = _context18.next) {
                     case 0:
@@ -9412,7 +9515,7 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
                         // Use original paths e.g. like ['.next/server'] directly –> preferred way when no globbing is done
                         pathsToUpload = buildArtifactPaths;
                       }
-                      ignorePaths = (_options$sourcemaps2 = options.sourcemaps) !== null && _options$sourcemaps2 !== void 0 && _options$sourcemaps2.ignore ? Array.isArray((_options$sourcemaps3 = options.sourcemaps) === null || _options$sourcemaps3 === void 0 ? void 0 : _options$sourcemaps3.ignore) ? (_options$sourcemaps4 = options.sourcemaps) === null || _options$sourcemaps4 === void 0 ? void 0 : _options$sourcemaps4.ignore : [(_options$sourcemaps5 = options.sourcemaps) === null || _options$sourcemaps5 === void 0 ? void 0 : _options$sourcemaps5.ignore] : [];
+                      ignorePaths = (_options$sourcemaps3 = options.sourcemaps) !== null && _options$sourcemaps3 !== void 0 && _options$sourcemaps3.ignore ? Array.isArray((_options$sourcemaps4 = options.sourcemaps) === null || _options$sourcemaps4 === void 0 ? void 0 : _options$sourcemaps4.ignore) ? (_options$sourcemaps5 = options.sourcemaps) === null || _options$sourcemaps5 === void 0 ? void 0 : _options$sourcemaps5.ignore : [(_options$sourcemaps6 = options.sourcemaps) === null || _options$sourcemaps6 === void 0 ? void 0 : _options$sourcemaps6.ignore] : [];
                       _context18.next = 8;
                       return startSpan({
                         name: "upload",
@@ -9459,7 +9562,7 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
                         name: "glob",
                         scope: sentryScope
                       }, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
-                        var _options$sourcemaps6;
+                        var _options$sourcemaps7;
                         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
                           while (1) switch (_context11.prev = _context11.next) {
                             case 0:
@@ -9468,7 +9571,7 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
                                 absolute: true,
                                 nodir: true,
                                 // We need individual files for preparation
-                                ignore: (_options$sourcemaps6 = options.sourcemaps) === null || _options$sourcemaps6 === void 0 ? void 0 : _options$sourcemaps6.ignore
+                                ignore: (_options$sourcemaps7 = options.sourcemaps) === null || _options$sourcemaps7 === void 0 ? void 0 : _options$sourcemaps7.ignore
                               });
                             case 2:
                               return _context11.abrupt("return", _context11.sent);
@@ -9538,12 +9641,12 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
                                 // instead we do it with a maximum of 16 concurrent workers
                                 preparationTasks = debugIdChunkFilePaths.map(function (chunkFilePath, chunkIndex) {
                                   return /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
-                                    var _options$sourcemaps$r, _options$sourcemaps7, _options$sourcemaps8;
+                                    var _options$sourcemaps$r, _options$sourcemaps8, _options$sourcemaps9;
                                     return _regeneratorRuntime().wrap(function _callee13$(_context13) {
                                       while (1) switch (_context13.prev = _context13.next) {
                                         case 0:
                                           _context13.next = 2;
-                                          return prepareBundleForDebugIdUpload(chunkFilePath, tmpUploadFolder, chunkIndex, logger, (_options$sourcemaps$r = (_options$sourcemaps7 = options.sourcemaps) === null || _options$sourcemaps7 === void 0 ? void 0 : _options$sourcemaps7.rewriteSources) !== null && _options$sourcemaps$r !== void 0 ? _options$sourcemaps$r : defaultRewriteSourcesHook, (_options$sourcemaps8 = options.sourcemaps) === null || _options$sourcemaps8 === void 0 ? void 0 : _options$sourcemaps8.resolveSourceMap);
+                                          return prepareBundleForDebugIdUpload(chunkFilePath, tmpUploadFolder, chunkIndex, logger, (_options$sourcemaps$r = (_options$sourcemaps8 = options.sourcemaps) === null || _options$sourcemaps8 === void 0 ? void 0 : _options$sourcemaps8.rewriteSources) !== null && _options$sourcemaps$r !== void 0 ? _options$sourcemaps$r : defaultRewriteSourcesHook, (_options$sourcemaps9 = options.sourcemaps) === null || _options$sourcemaps9 === void 0 ? void 0 : _options$sourcemaps9.resolveSourceMap);
                                         case 2:
                                         case "end":
                                           return _context13.stop();
@@ -9706,13 +9809,13 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
      */
     deleteArtifacts: function deleteArtifacts() {
       return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
-        var _options$sourcemaps9, filesToDelete, filePathsToDelete;
+        var _options$sourcemaps10, filesToDelete, filePathsToDelete;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
             case 0:
               _context20.prev = 0;
               _context20.next = 3;
-              return (_options$sourcemaps9 = options.sourcemaps) === null || _options$sourcemaps9 === void 0 ? void 0 : _options$sourcemaps9.filesToDeleteAfterUpload;
+              return (_options$sourcemaps10 = options.sourcemaps) === null || _options$sourcemaps10 === void 0 ? void 0 : _options$sourcemaps10.filesToDeleteAfterUpload;
             case 3:
               filesToDelete = _context20.sent;
               if (!(filesToDelete !== undefined)) {
@@ -9766,8 +9869,8 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
   };
 }
 function canUploadSourceMaps(options, logger, isDevMode) {
-  var _options$sourcemaps10, _getProjects3;
-  if ((_options$sourcemaps10 = options.sourcemaps) !== null && _options$sourcemaps10 !== void 0 && _options$sourcemaps10.disable) {
+  var _options$sourcemaps11, _getProjects3;
+  if ((_options$sourcemaps11 = options.sourcemaps) !== null && _options$sourcemaps11 !== void 0 && _options$sourcemaps11.disable) {
     logger.debug("Source map upload was disabled. Will not upload sourcemaps using debug ID process.");
     return false;
   }
@@ -9794,14 +9897,12 @@ function canUploadSourceMaps(options, logger, isDevMode) {
  * Creates an unplugin instance used to create Sentry plugins for Vite, Rollup, esbuild, and Webpack.
  */
 function sentryUnpluginFactory(_ref) {
-  var releaseInjectionPlugin = _ref.releaseInjectionPlugin,
+  var injectionPlugin = _ref.injectionPlugin,
     componentNameAnnotatePlugin = _ref.componentNameAnnotatePlugin,
-    moduleMetadataInjectionPlugin = _ref.moduleMetadataInjectionPlugin,
-    debugIdInjectionPlugin = _ref.debugIdInjectionPlugin,
     debugIdUploadPlugin = _ref.debugIdUploadPlugin,
     bundleSizeOptimizationsPlugin = _ref.bundleSizeOptimizationsPlugin;
   return unplugin.createUnplugin(function () {
-    var _userOptions$_metaOpt, _userOptions$_metaOpt2, _options$sourcemaps;
+    var _userOptions$_metaOpt, _userOptions$_metaOpt2, _options$sourcemaps, _options$sourcemaps3;
     var userOptions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var unpluginMetaContext = arguments.length > 1 ? arguments[1] : undefined;
     var sentryBuildPluginManager = createSentryBuildPluginManager(userOptions, {
@@ -9838,20 +9939,33 @@ function sentryUnpluginFactory(_ref) {
     if (Object.keys(bundleSizeOptimizationReplacementValues).length > 0) {
       plugins.push(bundleSizeOptimizationsPlugin(bundleSizeOptimizationReplacementValues));
     }
+    var injectionCode = new CodeInjection();
     if (!options.release.inject) {
       logger.debug("Release injection disabled via `release.inject` option. Will not inject release.");
     } else if (!options.release.name) {
       logger.debug("No release name provided. Will not inject release. Please set the `release.name` option to identify your release.");
     } else {
-      var _injectionCode = generateGlobalInjectorCode({
+      var _code = generateGlobalInjectorCode({
         release: options.release.name,
         injectBuildInformation: options._experiments.injectBuildInformation || false
       });
-      plugins.push(releaseInjectionPlugin(_injectionCode));
+      if (typeof injectionPlugin !== "function") {
+        plugins.push(injectionPlugin.releaseInjectionPlugin(_code.code()));
+      } else {
+        injectionCode.append(_code);
+      }
     }
     if (Object.keys(sentryBuildPluginManager.bundleMetadata).length > 0) {
-      var _injectionCode2 = generateModuleMetadataInjectorCode(sentryBuildPluginManager.bundleMetadata);
-      plugins.push(moduleMetadataInjectionPlugin(_injectionCode2));
+      var _code2 = generateModuleMetadataInjectorCode(sentryBuildPluginManager.bundleMetadata);
+      if (typeof injectionPlugin !== "function") {
+        plugins.push(injectionPlugin.moduleMetadataInjectionPlugin(_code2.code()));
+      } else {
+        injectionCode.append(_code2);
+      }
+    }
+    if (typeof injectionPlugin === "function" && (!injectionCode.isEmpty() || ((_options$sourcemaps = options.sourcemaps) === null || _options$sourcemaps === void 0 ? void 0 : _options$sourcemaps.disable) !== true)) {
+      var _options$sourcemaps2;
+      plugins.push(injectionPlugin(injectionCode, ((_options$sourcemaps2 = options.sourcemaps) === null || _options$sourcemaps2 === void 0 ? void 0 : _options$sourcemaps2.disable) !== true, logger));
     }
 
     // Add plugin to create and finalize releases, and also take care of adding commits and legacy sourcemaps
@@ -9878,10 +9992,12 @@ function sentryUnpluginFactory(_ref) {
         }))();
       }
     });
-    if (((_options$sourcemaps = options.sourcemaps) === null || _options$sourcemaps === void 0 ? void 0 : _options$sourcemaps.disable) !== true) {
-      var _options$sourcemaps2;
-      plugins.push(debugIdInjectionPlugin(logger));
-      if (((_options$sourcemaps2 = options.sourcemaps) === null || _options$sourcemaps2 === void 0 ? void 0 : _options$sourcemaps2.disable) !== "disable-upload") {
+    if (((_options$sourcemaps3 = options.sourcemaps) === null || _options$sourcemaps3 === void 0 ? void 0 : _options$sourcemaps3.disable) !== true) {
+      var _options$sourcemaps4;
+      if (typeof injectionPlugin !== "function") {
+        plugins.push(injectionPlugin.debugIdInjectionPlugin(logger));
+      }
+      if (((_options$sourcemaps4 = options.sourcemaps) === null || _options$sourcemaps4 === void 0 ? void 0 : _options$sourcemaps4.disable) !== "disable-upload") {
         // This option is only strongly typed for the webpack plugin, where it is used. It has no effect on other plugins
         var _webpack_forceExitOnBuildComplete = typeof options._experiments["forceExitOnBuildCompletion"] === "boolean" ? options._experiments["forceExitOnBuildCompletion"] : undefined;
         plugins.push(debugIdUploadPlugin(createDebugIdUploadFunction({
@@ -9895,7 +10011,7 @@ function sentryUnpluginFactory(_ref) {
       } else if (options.reactComponentAnnotation.enabled && !componentNameAnnotatePlugin) {
         logger.warn("The component name annotate plugin is currently not supported by '@sentry/esbuild-plugin'");
       } else {
-        componentNameAnnotatePlugin && plugins.push(componentNameAnnotatePlugin(options.reactComponentAnnotation.ignoredComponents));
+        componentNameAnnotatePlugin && plugins.push(componentNameAnnotatePlugin(options.reactComponentAnnotation.ignoredComponents || [], !!options.reactComponentAnnotation._experimentalInjectIntoHtml));
       }
     }
 
@@ -9960,6 +10076,9 @@ function isJsFile(fileName) {
  * HTML entry points create "facade" chunks that should not contain injected code.
  * See: https://github.com/getsentry/sentry-javascript-bundler-plugins/issues/829
  *
+ * However, in SPA mode, the main bundle also has an HTML facade but contains
+ * substantial application code. We should NOT skip injection for these bundles.
+ *
  * @param code - The chunk's code content
  * @param facadeModuleId - The facade module ID (if any) - HTML files create facade chunks
  * @returns true if the chunk should be skipped
@@ -9970,48 +10089,12 @@ function shouldSkipCodeInjection(code, facadeModuleId) {
     return true;
   }
 
-  // Skip HTML facade chunks
-  // They only contain import statements and should not have Sentry code injected
+  // For HTML facade chunks, only skip if they contain only import statements
   if (facadeModuleId && stripQueryAndHashFromPath(facadeModuleId).endsWith(".html")) {
-    return true;
+    return containsOnlyImports(code);
   }
   return false;
 }
-function createRollupReleaseInjectionHooks(injectionCode) {
-  return {
-    renderChunk: function renderChunk(code, chunk) {
-      var _code$match;
-      if (!isJsFile(chunk.fileName)) {
-        return null; // returning null means not modifying the chunk at all
-      }
-
-      // Skip empty chunks and HTML facade chunks (Vite MPA)
-      if (shouldSkipCodeInjection(code, chunk.facadeModuleId)) {
-        return null;
-      }
-      var ms = new MagicString__default["default"](code, {
-        filename: chunk.fileName
-      });
-      var match = (_code$match = code.match(COMMENT_USE_STRICT_REGEX)) === null || _code$match === void 0 ? void 0 : _code$match[0];
-      if (match) {
-        // Add injected code after any comments or "use strict" at the beginning of the bundle.
-        ms.appendLeft(match.length, injectionCode);
-      } else {
-        // ms.replace() doesn't work when there is an empty string match (which happens if
-        // there is neither, a comment, nor a "use strict" at the top of the chunk) so we
-        // need this special case here.
-        ms.prepend(injectionCode);
-      }
-      return {
-        code: ms.toString(),
-        map: ms.generateMap({
-          file: chunk.fileName,
-          hires: "boundary"
-        })
-      };
-    }
-  };
-}
 function createRollupBundleSizeOptimizationHooks(replacementValues) {
   return {
     transform: function transform(code) {
@@ -10019,10 +10102,10 @@ function createRollupBundleSizeOptimizationHooks(replacementValues) {
     }
   };
 }
-function createRollupDebugIdInjectionHooks() {
+function createRollupInjectionHooks(injectionCode, debugIds) {
   return {
-    renderChunk: function renderChunk(code, chunk) {
-      var _code$match2;
+    renderChunk: function renderChunk(code, chunk, _, meta) {
+      var _code$match, _ms$constructor;
       if (!isJsFile(chunk.fileName)) {
         return null; // returning null means not modifying the chunk at all
       }
@@ -10031,70 +10114,46 @@ function createRollupDebugIdInjectionHooks() {
       if (shouldSkipCodeInjection(code, chunk.facadeModuleId)) {
         return null;
       }
-
-      // Check if a debug ID has already been injected to avoid duplicate injection (e.g. by another plugin or Sentry CLI)
-      var chunkStartSnippet = code.slice(0, 6000);
-      var chunkEndSnippet = code.slice(-500);
-      if (chunkStartSnippet.includes("_sentryDebugIdIdentifier") || chunkEndSnippet.includes("//# debugId=")) {
-        return null; // Debug ID already present, skip injection
+      var codeToInject = injectionCode.clone();
+      if (debugIds) {
+        // Check if a debug ID has already been injected to avoid duplicate injection (e.g. by another plugin or Sentry CLI)
+        var chunkStartSnippet = code.slice(0, 6000);
+        var chunkEndSnippet = code.slice(-500);
+        if (!(chunkStartSnippet.includes("_sentryDebugIdIdentifier") || chunkEndSnippet.includes("//# debugId="))) {
+          var debugId = stringToUUID(code); // generate a deterministic debug ID
+          codeToInject.append(getDebugIdSnippet(debugId));
+        }
       }
-
-      var debugId = stringToUUID(code); // generate a deterministic debug ID
-      var codeToInject = getDebugIdSnippet(debugId);
-      var ms = new MagicString__default["default"](code, {
+      var ms = (meta === null || meta === void 0 ? void 0 : meta.magicString) || new MagicString__default["default"](code, {
         filename: chunk.fileName
       });
-      var match = (_code$match2 = code.match(COMMENT_USE_STRICT_REGEX)) === null || _code$match2 === void 0 ? void 0 : _code$match2[0];
+      var match = (_code$match = code.match(COMMENT_USE_STRICT_REGEX)) === null || _code$match === void 0 ? void 0 : _code$match[0];
       if (match) {
         // Add injected code after any comments or "use strict" at the beginning of the bundle.
-        ms.appendLeft(match.length, codeToInject);
+        ms.appendLeft(match.length, codeToInject.code());
       } else {
         // ms.replace() doesn't work when there is an empty string match (which happens if
         // there is neither, a comment, nor a "use strict" at the top of the chunk) so we
         // need this special case here.
-        ms.prepend(codeToInject);
-      }
-      return {
-        code: ms.toString(),
-        map: ms.generateMap({
-          file: chunk.fileName,
-          hires: "boundary"
-        })
-      };
-    }
-  };
-}
-function createRollupModuleMetadataInjectionHooks(injectionCode) {
-  return {
-    renderChunk: function renderChunk(code, chunk) {
-      var _code$match3;
-      if (!isJsFile(chunk.fileName)) {
-        return null; // returning null means not modifying the chunk at all
+        ms.prepend(codeToInject.code());
       }
 
-      // Skip empty chunks and HTML facade chunks (Vite MPA)
-      if (shouldSkipCodeInjection(code, chunk.facadeModuleId)) {
-        return null;
-      }
-      var ms = new MagicString__default["default"](code, {
-        filename: chunk.fileName
-      });
-      var match = (_code$match3 = code.match(COMMENT_USE_STRICT_REGEX)) === null || _code$match3 === void 0 ? void 0 : _code$match3[0];
-      if (match) {
-        // Add injected code after any comments or "use strict" at the beginning of the bundle.
-        ms.appendLeft(match.length, injectionCode);
-      } else {
-        // ms.replace() doesn't work when there is an empty string match (which happens if
-        // there is neither, a comment, nor a "use strict" at the top of the chunk) so we
-        // need this special case here.
-        ms.prepend(injectionCode);
+      // Rolldown can pass a native MagicString instance in meta.magicString
+      // https://rolldown.rs/in-depth/native-magic-string#usage-examples
+      if ((ms === null || ms === void 0 ? void 0 : (_ms$constructor = ms.constructor) === null || _ms$constructor === void 0 ? void 0 : _ms$constructor.name) === "BindingMagicString") {
+        // Rolldown docs say to return the magic string instance directly in this case
+        return {
+          code: ms
+        };
       }
       return {
         code: ms.toString(),
-        map: ms.generateMap({
-          file: chunk.fileName,
-          hires: "boundary"
-        })
+        get map() {
+          return ms.generateMap({
+            file: chunk.fileName,
+            hires: "boundary"
+          });
+        }
       };
     }
   };
@@ -10160,11 +10219,11 @@ function createRollupDebugIdUploadHooks(upload, _logger, createDependencyOnBuild
     }
   };
 }
-function createComponentNameAnnotateHooks(ignoredComponents) {
+function createComponentNameAnnotateHooks(ignoredComponents, injectIntoHtml) {
   return {
     transform: function transform(code, id) {
       return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var idWithoutQueryAndHash, parserPlugins, _result$code, result;
+        var idWithoutQueryAndHash, parserPlugins, plugin, _result$code, result;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -10190,10 +10249,11 @@ function createComponentNameAnnotateHooks(ignoredComponents) {
               } else if (idWithoutQueryAndHash.endsWith(".tsx")) {
                 parserPlugins.push("jsx", "typescript");
               }
-              _context4.prev = 7;
-              _context4.next = 10;
+              plugin = injectIntoHtml ? componentNameAnnotatePlugin.experimentalComponentNameAnnotatePlugin : componentNameAnnotatePlugin__default["default"];
+              _context4.prev = 8;
+              _context4.next = 11;
               return core.transformAsync(code, {
-                plugins: [[componentNameAnnotatePlugin__default["default"], {
+                plugins: [[plugin, {
                   ignoredComponents: ignoredComponents
                 }]],
                 filename: id,
@@ -10207,39 +10267,38 @@ function createComponentNameAnnotateHooks(ignoredComponents) {
                 },
                 sourceMaps: true
               });
-            case 10:
+            case 11:
               result = _context4.sent;
               return _context4.abrupt("return", {
                 code: (_result$code = result === null || result === void 0 ? void 0 : result.code) !== null && _result$code !== void 0 ? _result$code : code,
                 map: result === null || result === void 0 ? void 0 : result.map
               });
-            case 14:
-              _context4.prev = 14;
-              _context4.t0 = _context4["catch"](7);
+            case 15:
+              _context4.prev = 15;
+              _context4.t0 = _context4["catch"](8);
               logger.error("Failed to apply react annotate plugin", _context4.t0);
-            case 17:
+            case 18:
               return _context4.abrupt("return", {
                 code: code
               });
-            case 18:
+            case 19:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, null, [[7, 14]]);
+        }, _callee4, null, [[8, 15]]);
       }))();
     }
   };
 }
 function getDebugIdSnippet(debugId) {
-  return ";{try{(function(){var e=\"undefined\"!=typeof window?window:\"undefined\"!=typeof global?global:\"undefined\"!=typeof globalThis?globalThis:\"undefined\"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]=\"".concat(debugId, "\",e._sentryDebugIdIdentifier=\"sentry-dbid-").concat(debugId, "\");})();}catch(e){}};");
+  return new CodeInjection("var n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]=\"".concat(debugId, "\",e._sentryDebugIdIdentifier=\"sentry-dbid-").concat(debugId, "\");"));
 }
 
+exports.CodeInjection = CodeInjection;
 exports.createComponentNameAnnotateHooks = createComponentNameAnnotateHooks;
 exports.createRollupBundleSizeOptimizationHooks = createRollupBundleSizeOptimizationHooks;
-exports.createRollupDebugIdInjectionHooks = createRollupDebugIdInjectionHooks;
 exports.createRollupDebugIdUploadHooks = createRollupDebugIdUploadHooks;
-exports.createRollupModuleMetadataInjectionHooks = createRollupModuleMetadataInjectionHooks;
-exports.createRollupReleaseInjectionHooks = createRollupReleaseInjectionHooks;
+exports.createRollupInjectionHooks = createRollupInjectionHooks;
 exports.createSentryBuildPluginManager = createSentryBuildPluginManager;
 exports.getDebugIdSnippet = getDebugIdSnippet;
 exports.replaceBooleanFlagsInCode = replaceBooleanFlagsInCode;