@sentry/bundler-plugin-core 2.17.0 → 2.18.0

package/dist/cjs/index.js

@@ -659,7 +659,8 @@ function generateGlobalInjectorCode(_ref2) {
 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.)
-  return "\n    var _global2 =\n      typeof window !== 'undefined' ?\n        window :\n        typeof global !== 'undefined' ?\n          global :\n          typeof self !== 'undefined' ?\n            self :\n            {};\n\n    _global2._sentryModuleMetadata = _global2._sentryModuleMetadata || {};\n    _global2._sentryModuleMetadata[new Error().stack] = ".concat(JSON.stringify(metadata), ";");
+  // We are merging the metadata objects in case modules are bundled twice with the plugin
+  return "{\n  var _sentryModuleMetadataGlobal =\n    typeof window !== \"undefined\"\n      ? window\n      : typeof global !== \"undefined\"\n      ? global\n      : typeof self !== \"undefined\"\n      ? self\n      : {};\n\n  _sentryModuleMetadataGlobal._sentryModuleMetadata =\n    _sentryModuleMetadataGlobal._sentryModuleMetadata || {};\n\n  _sentryModuleMetadataGlobal._sentryModuleMetadata[new Error().stack] =\n    Object.assign(\n      {},\n      _sentryModuleMetadataGlobal._sentryModuleMetadata[new Error().stack],\n      ".concat(JSON.stringify(metadata), "\n    );\n}");
 }
 function getBuildInformation$1() {
   var packageJson = getPackageJson();
@@ -700,7 +701,7 @@ function replaceBooleanFlagsInCode(code, replacementValues) {
 
 var SENTRY_SAAS_URL = "https://sentry.io";
 function normalizeUserOptions(userOptions) {
-  var _userOptions$org, _userOptions$project, _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$_experim;
+  var _userOptions$org, _userOptions$project, _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$_metaOpt, _userOptions$_metaOpt2, _userOptions$_experim, _userOptions$_experim2;
   var options = {
     org: (_userOptions$org = userOptions.org) !== null && _userOptions$org !== void 0 ? _userOptions$org : process.env["SENTRY_ORG"],
     project: (_userOptions$project = userOptions.project) !== null && _userOptions$project !== void 0 ? _userOptions$project : process.env["SENTRY_PROJECT"],
@@ -722,7 +723,14 @@ function normalizeUserOptions(userOptions) {
     }),
     bundleSizeOptimizations: userOptions.bundleSizeOptimizations,
     reactComponentAnnotation: userOptions.reactComponentAnnotation,
-    _experiments: (_userOptions$_experim = userOptions._experiments) !== null && _userOptions$_experim !== void 0 ? _userOptions$_experim : {}
+    _metaOptions: {
+      telemetry: {
+        metaFramework: (_userOptions$_metaOpt = userOptions._metaOptions) === null || _userOptions$_metaOpt === void 0 ? void 0 : (_userOptions$_metaOpt2 = _userOptions$_metaOpt.telemetry) === null || _userOptions$_metaOpt2 === void 0 ? void 0 : _userOptions$_metaOpt2.metaFramework
+      }
+    },
+    applicationKey: userOptions.applicationKey,
+    moduleMetadata: userOptions.moduleMetadata || ((_userOptions$_experim = userOptions._experiments) === null || _userOptions$_experim === void 0 ? void 0 : _userOptions$_experim.moduleMetadata),
+    _experiments: (_userOptions$_experim2 = userOptions._experiments) !== null && _userOptions$_experim2 !== void 0 ? _userOptions$_experim2 : {}
   };
   return options;
 }
@@ -13604,7 +13612,7 @@ function createSentryInstance(options, shouldSendTelemetry, bundler) {
     dsn: "https://4c2bae7d9fbc413e8f7385f55c515d51@o1.ingest.sentry.io/6690737",
     tracesSampleRate: 1,
     sampleRate: 1,
-    release: "2.17.0",
+    release: "2.18.0",
     integrations: [],
     tracePropagationTargets: ["sentry.io/api"],
     stackParser: defaultStackParser,
@@ -13665,6 +13673,7 @@ function createSentryInstance(options, shouldSendTelemetry, bundler) {
   };
 }
 function setTelemetryDataOnHub(options, hub, bundler) {
+  var _options$_metaOptions;
   var org = options.org,
     project = options.project,
     release = options.release,
@@ -13675,7 +13684,7 @@ function setTelemetryDataOnHub(options, hub, bundler) {
   if (release.uploadLegacySourcemaps) {
     hub.setTag("uploadLegacySourcemapsEntries", Array.isArray(release.uploadLegacySourcemaps) ? release.uploadLegacySourcemaps.length : 1);
   }
-  hub.setTag("module-metadata", !!options._experiments.moduleMetadata);
+  hub.setTag("module-metadata", !!options.moduleMetadata);
   hub.setTag("inject-build-information", !!options._experiments.injectBuildInformation);
 
   // Optional release pipeline steps
@@ -13694,6 +13703,7 @@ function setTelemetryDataOnHub(options, hub, bundler) {
   hub.setTag("react-annotate", !!(reactComponentAnnotation !== null && reactComponentAnnotation !== void 0 && reactComponentAnnotation.enabled));
   hub.setTag("node", process.version);
   hub.setTag("platform", process.platform);
+  hub.setTag("meta-framework", (_options$_metaOptions = options._metaOptions.telemetry.metaFramework) !== null && _options$_metaOptions !== void 0 ? _options$_metaOptions : "none");
   hub.setTags({
     organization: org,
     project: project,
@@ -14467,7 +14477,7 @@ function sentryUnpluginFactory(_ref) {
     debugIdUploadPlugin = _ref.debugIdUploadPlugin,
     bundleSizeOptimizationsPlugin = _ref.bundleSizeOptimizationsPlugin;
   return unplugin.createUnplugin(function () {
-    var _userOptions$_metaOpt, _userOptions$_metaOpt2, _userOptions$silent, _userOptions$debug;
+    var _userOptions$_metaOpt, _userOptions$_metaOpt2, _userOptions$silent, _userOptions$debug, _userOptions$_experim;
     var userOptions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var unpluginMetaContext = arguments.length > 1 ? arguments[1] : undefined;
     var logger = createLogger({
@@ -14488,6 +14498,11 @@ function sentryUnpluginFactory(_ref) {
       }
     }
     var options = normalizeUserOptions(userOptions);
+
+    // TODO(v3): Remove this warning
+    if ((_userOptions$_experim = userOptions._experiments) !== null && _userOptions$_experim !== void 0 && _userOptions$_experim.moduleMetadata) {
+      logger.warn("The `_experiments.moduleMetadata` option has been promoted to being stable. You can safely move the option out of the `_experiments` object scope.");
+    }
     if (unpluginMetaContext.watchMode || options.disable) {
       return [{
         name: "sentry-noop-plugin"
@@ -14509,7 +14524,7 @@ function sentryUnpluginFactory(_ref) {
     });
 
     // Set the User-Agent that Sentry CLI will use when interacting with Sentry
-    process.env["SENTRY_PIPELINE"] = "".concat(unpluginMetaContext.framework, "-plugin/", "2.17.0");
+    process.env["SENTRY_PIPELINE"] = "".concat(unpluginMetaContext.framework, "-plugin/", "2.18.0");
     function handleRecoverableError(unknownError) {
       sentrySession.status = "abnormal";
       try {
@@ -14581,24 +14596,31 @@ function sentryUnpluginFactory(_ref) {
       });
       plugins.push(releaseInjectionPlugin(_injectionCode));
     }
-    if (moduleMetadataInjectionPlugin && options._experiments.moduleMetadata) {
-      var metadata;
-      if (typeof options._experiments.moduleMetadata === "function") {
+    if (options.moduleMetadata || options.applicationKey) {
+      var metadata = {};
+      if (options.applicationKey) {
+        // We use different keys so that if user-code receives multiple bundling passes, we will store the application keys of all the passes.
+        // It is a bit unfortunate that we have to inject the metadata snippet at the top, because after multiple
+        // injections, the first injection will always "win" because it comes last in the code. We would generally be
+        // fine with making the last bundling pass win. But because it cannot win, we have to use a workaround of storing
+        // the app keys in different object keys.
+        // We can simply use the `_sentryBundlerPluginAppKey:` to filter for app keys in the SDK.
+        metadata["_sentryBundlerPluginAppKey:".concat(options.applicationKey)] = true;
+      }
+      if (typeof options.moduleMetadata === "function") {
         var args = {
           org: options.org,
           project: options.project,
           release: options.release.name
         };
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
-        metadata = options._experiments.moduleMetadata(args);
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        metadata = _objectSpread2(_objectSpread2({}, metadata), options.moduleMetadata(args));
       } else {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        metadata = options._experiments.moduleMetadata;
+        metadata = _objectSpread2(_objectSpread2({}, metadata), options.moduleMetadata);
       }
       var _injectionCode2 = generateModuleMetadataInjectorCode(metadata);
       plugins.push(moduleMetadataInjectionPlugin(_injectionCode2));
-    } else if (options._experiments.moduleMetadata) {
-      logger.warn("'moduleMetadata' is currently only supported by '@sentry/webpack-plugin'");
     }
     if (!options.release.name) {
       logger.warn("No release name provided. Will not create release. Please set the `release.name` option to identify your release.");