@sentry/bundler-plugin-core 0.2.4 → 0.4.0

package/dist/cjs/index.js

@@ -775,7 +775,7 @@ function arrayify(maybeArray) {
 
 var SENTRY_SAAS_URL = "https://sentry.io";
 function normalizeUserOptions(userOptions) {
-  var _userOptions$org, _userOptions$project, _ref, _userOptions$release, _ref2, _userOptions$url, _userOptions$finalize, _userOptions$cleanArt, _userOptions$dryRun, _userOptions$debug, _userOptions$silent, _userOptions$telemetr, _userOptions$injectRe, _ref3, _userOptions$customHe;
+  var _userOptions$org, _userOptions$project, _ref, _userOptions$release, _ref2, _userOptions$url, _userOptions$finalize, _userOptions$cleanArt, _userOptions$dryRun, _userOptions$debug, _userOptions$silent, _userOptions$telemetr, _userOptions$injectRe;
 
   var options = {
     // include is the only strictly required option
@@ -810,10 +810,7 @@ function normalizeUserOptions(userOptions) {
     // the passed options are undefined.
     authToken: userOptions.authToken,
     // env var: `SENTRY_AUTH_TOKEN`
-    // CLI v1 (and the "old" webpack plugin) use `CUSTOM_HEADER`,
-    // but CLI v2 uses `SENTRY_HEADER` (which is also better aligned with other naming)
-    // In the spirit of maximum compatibility, we allow both here.
-    customHeader: (_ref3 = (_userOptions$customHe = userOptions.customHeader) !== null && _userOptions$customHe !== void 0 ? _userOptions$customHe : process.env["SENTRY_HEADER"]) !== null && _ref3 !== void 0 ? _ref3 : process.env["CUSTOM_HEADER"],
+    headers: userOptions.headers,
     vcsRemote: userOptions.vcsRemote,
     // env var: `SENTRY_VSC_REMOTE`
     // Optional options
@@ -872,12 +869,12 @@ function normalizeInclude(userOptions) {
 
 
 function normalizeIncludeEntry(userOptions, includeEntry) {
-  var _ref4, _includeEntry$ignore, _ref5, _includeEntry$ext, _includeEntry$ignoreF, _includeEntry$urlPref, _includeEntry$urlSuff, _includeEntry$stripPr, _ref6, _includeEntry$stripCo, _ref7, _includeEntry$sourceM, _ref8, _includeEntry$rewrite, _ref9, _includeEntry$validat;
+  var _ref3, _includeEntry$ignore, _ref4, _includeEntry$ext, _includeEntry$ignoreF, _includeEntry$urlPref, _includeEntry$urlSuff, _includeEntry$stripPr, _ref5, _includeEntry$stripCo, _ref6, _includeEntry$sourceM, _ref7, _includeEntry$rewrite, _ref8, _includeEntry$validat;
 
-  var ignoreOption = (_ref4 = (_includeEntry$ignore = includeEntry.ignore) !== null && _includeEntry$ignore !== void 0 ? _includeEntry$ignore : userOptions.ignore) !== null && _ref4 !== void 0 ? _ref4 : ["node_modules"];
+  var ignoreOption = (_ref3 = (_includeEntry$ignore = includeEntry.ignore) !== null && _includeEntry$ignore !== void 0 ? _includeEntry$ignore : userOptions.ignore) !== null && _ref3 !== void 0 ? _ref3 : ["node_modules"];
   var ignore = Array.isArray(ignoreOption) ? ignoreOption : [ignoreOption]; // We're prefixing all entries in the `ext` option with a `.` (if it isn't already) to align with Node.js' `path.extname()`
 
-  var ext = (_ref5 = (_includeEntry$ext = includeEntry.ext) !== null && _includeEntry$ext !== void 0 ? _includeEntry$ext : userOptions.ext) !== null && _ref5 !== void 0 ? _ref5 : ["js", "map", "jsbundle", "bundle"];
+  var ext = (_ref4 = (_includeEntry$ext = includeEntry.ext) !== null && _includeEntry$ext !== void 0 ? _includeEntry$ext : userOptions.ext) !== null && _ref4 !== void 0 ? _ref4 : ["js", "map", "jsbundle", "bundle"];
   var dotPrefixedExt = ext.map(function (extension) {
     return ".".concat(extension.replace(/^\./, ""));
   });
@@ -889,10 +886,10 @@ function normalizeIncludeEntry(userOptions, includeEntry) {
     urlPrefix: (_includeEntry$urlPref = includeEntry.urlPrefix) !== null && _includeEntry$urlPref !== void 0 ? _includeEntry$urlPref : userOptions.urlPrefix,
     urlSuffix: (_includeEntry$urlSuff = includeEntry.urlSuffix) !== null && _includeEntry$urlSuff !== void 0 ? _includeEntry$urlSuff : userOptions.urlSuffix,
     stripPrefix: (_includeEntry$stripPr = includeEntry.stripPrefix) !== null && _includeEntry$stripPr !== void 0 ? _includeEntry$stripPr : userOptions.stripPrefix,
-    stripCommonPrefix: (_ref6 = (_includeEntry$stripCo = includeEntry.stripCommonPrefix) !== null && _includeEntry$stripCo !== void 0 ? _includeEntry$stripCo : userOptions.stripCommonPrefix) !== null && _ref6 !== void 0 ? _ref6 : false,
-    sourceMapReference: (_ref7 = (_includeEntry$sourceM = includeEntry.sourceMapReference) !== null && _includeEntry$sourceM !== void 0 ? _includeEntry$sourceM : userOptions.sourceMapReference) !== null && _ref7 !== void 0 ? _ref7 : true,
-    rewrite: (_ref8 = (_includeEntry$rewrite = includeEntry.rewrite) !== null && _includeEntry$rewrite !== void 0 ? _includeEntry$rewrite : userOptions.rewrite) !== null && _ref8 !== void 0 ? _ref8 : true,
-    validate: (_ref9 = (_includeEntry$validat = includeEntry.validate) !== null && _includeEntry$validat !== void 0 ? _includeEntry$validat : userOptions.validate) !== null && _ref9 !== void 0 ? _ref9 : false
+    stripCommonPrefix: (_ref5 = (_includeEntry$stripCo = includeEntry.stripCommonPrefix) !== null && _includeEntry$stripCo !== void 0 ? _includeEntry$stripCo : userOptions.stripCommonPrefix) !== null && _ref5 !== void 0 ? _ref5 : false,
+    sourceMapReference: (_ref6 = (_includeEntry$sourceM = includeEntry.sourceMapReference) !== null && _includeEntry$sourceM !== void 0 ? _includeEntry$sourceM : userOptions.sourceMapReference) !== null && _ref6 !== void 0 ? _ref6 : true,
+    rewrite: (_ref7 = (_includeEntry$rewrite = includeEntry.rewrite) !== null && _includeEntry$rewrite !== void 0 ? _includeEntry$rewrite : userOptions.rewrite) !== null && _ref7 !== void 0 ? _ref7 : true,
+    validate: (_ref8 = (_includeEntry$validat = includeEntry.validate) !== null && _includeEntry$validat !== void 0 ? _includeEntry$validat : userOptions.validate) !== null && _ref8 !== void 0 ? _ref8 : false
   };
 }
 /**
@@ -946,7 +943,7 @@ function makeSentryClient(dsn, allowedToSendTelemetryPromise, userProject) {
     // a dashboard.
     // Yes, this is slightly abusing the purpose of this field.
     dist: userProject,
-    release: "0.2.4",
+    release: "0.4.0",
     integrations: [],
     tracePropagationTargets: ["sentry.io/api"],
     stackParser: node.defaultStackParser,
@@ -1098,12 +1095,12 @@ function _shouldSendTelemetry() {
   _shouldSendTelemetry = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(options) {
     var _cliInfo$split$, _cliInfo$split$$repla;
 
-    var silent, org, project, authToken, url, vcsRemote, customHeader, dist, telemetry, dryRun, cli, cliInfo, cliInfoUrl;
+    var silent, org, project, authToken, url, vcsRemote, headers, telemetry, dryRun, cli, cliInfo, cliInfoUrl;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            silent = options.silent, org = options.org, project = options.project, authToken = options.authToken, url = options.url, vcsRemote = options.vcsRemote, customHeader = options.customHeader, dist = options.dist, telemetry = options.telemetry, dryRun = options.dryRun; // `options.telemetry` defaults to true
+            silent = options.silent, org = options.org, project = options.project, authToken = options.authToken, url = options.url, vcsRemote = options.vcsRemote, headers = options.headers, telemetry = options.telemetry, dryRun = options.dryRun; // `options.telemetry` defaults to true
 
             if (!(telemetry === false)) {
               _context2.next = 3;
@@ -1135,9 +1132,8 @@ function _shouldSendTelemetry() {
               org: org,
               project: project,
               vcsRemote: vcsRemote,
-              dist: dist,
               silent: silent,
-              customHeader: customHeader
+              headers: headers
             });
             _context2.prev = 8;
             _context2.next = 11;
@@ -1299,7 +1295,8 @@ function _uploadSourceMaps() {
             _context3.prev = 2;
             _context3.next = 5;
             return ctx.cli.releases.uploadSourceMaps(releaseName, {
-              include: options.include
+              include: options.include,
+              dist: options.dist
             });
 
           case 5:
@@ -1593,17 +1590,15 @@ function getSentryCli(internalOptions, logger) {
       authToken = internalOptions.authToken,
       url = internalOptions.url,
       vcsRemote = internalOptions.vcsRemote,
-      customHeader = internalOptions.customHeader,
-      dist = internalOptions.dist;
+      headers = internalOptions.headers;
   var cli = new SentryCli__default["default"](internalOptions.configFile, {
     url: url,
     authToken: authToken,
     org: org,
     project: project,
     vcsRemote: vcsRemote,
-    dist: dist,
     silent: silent,
-    customHeader: customHeader
+    headers: headers
   });
 
   if (internalOptions.dryRun) {
@@ -1655,10 +1650,6 @@ function getDryRunCLI(cli, logger) {
   };
 }
 
-// This hack is taken straight from https://rollupjs.org/guide/en/#resolveid.
-// This probably doesn't work for all bundlers but for rollup it does.
-
-var RELEASE_INJECTOR_ID = "\0sentry-release-injector";
 var ALLOWED_TRANSFORMATION_FILE_ENDINGS = [".js", ".ts", ".jsx", ".tsx", ".mjs"];
 /**
  * The sentry bundler plugin concerns itself with two things:
@@ -1666,17 +1657,17 @@ var ALLOWED_TRANSFORMATION_FILE_ENDINGS = [".js", ".ts", ".jsx", ".tsx", ".mjs"]
  * - Sourcemaps upload
  *
  * Release injection:
- *
- * Per default the sentry bundler plugin will inject a global `SENTRY_RELEASE` into each JavaScript/TypeScript module
- * that is part of the bundle. On a technical level this is done by appending an import (`import "sentry-release-injector;"`)
- * to all entrypoint files of the user code (see `transformInclude` and `transform` hooks). This import is then resolved
- * by the sentry plugin to a virtual module that sets the global variable (see `resolveId` and `load` hooks).
- * If a user wants to inject the release into a particular set of modules they can use the `releaseInjectionTargets` option.
+ * Per default the sentry bundler plugin will inject a global `SENTRY_RELEASE` into
+ * each JavaScript/TypeScript entrypoint. On a technical level this is done by identifying
+ * entrypoints in the `resolveId` hook and prepending user code in the `transform` hook.
+ * If a user wants to inject the release into a particular set of modules instead,
+ * they can use the `releaseInjectionTargets` option.
  *
  * Source maps upload:
  *
- * The sentry bundler plugin will also take care of uploading source maps to Sentry. This is all done in the
- * `writeBundle` hook. In this hook the sentry plugin will execute the release creation pipeline:
+ * The sentry bundler plugin will also take care of uploading source maps to Sentry. This
+ * is all done in the `writeBundle` hook. In this hook the sentry plugin will execute the
+ * release creation pipeline:
  *
  * 1. Create a new release
  * 2. Delete already uploaded artifacts for this release (if `cleanArtifacts` is enabled)
@@ -1723,6 +1714,7 @@ var unplugin = unplugin$1.createUnplugin(function (options, unpluginMetaContext)
   });
   var transaction;
   var releaseInjectionSpan;
+  var absolueEntrypointPaths = new Set();
   return {
     name: "sentry-plugin",
     enforce: "pre",
@@ -1809,68 +1801,11 @@ var unplugin = unplugin$1.createUnplugin(function (options, unpluginMetaContext)
         isEntry: isEntry
       });
 
-      if (id === RELEASE_INJECTOR_ID) {
-        return RELEASE_INJECTOR_ID;
-      } else {
-        return undefined;
+      if (isEntry) {
+        absolueEntrypointPaths.add(path__default["default"].resolve(path__default["default"].normalize(id)));
       }
-    },
-    loadInclude: function loadInclude(id) {
-      logger.debug('Called "loadInclude":', {
-        id: id
-      });
-      return id === RELEASE_INJECTOR_ID;
-    },
 
-    /**
-     * Responsible for "virtually" loading the "sentry-release-injector" module. "Virtual" means that the module is not
-     * read from somewhere on disk but rather just returned via a string.
-     *
-     * @param id Always the absolute (fully resolved) path to the module.
-     * @returns The global injector code when we load the "sentry-release-injector" module. Otherwise returns `undefined`.
-     */
-    load: function load(id) {
-      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                logger.debug('Called "load":', {
-                  id: id
-                });
-
-                if (!(id === RELEASE_INJECTOR_ID)) {
-                  _context2.next = 13;
-                  break;
-                }
-
-                _context2.t0 = generateGlobalInjectorCode;
-                _context2.next = 5;
-                return releaseNamePromise;
-
-              case 5:
-                _context2.t1 = _context2.sent;
-                _context2.t2 = internalOptions.injectReleasesMap;
-                _context2.t3 = internalOptions.org;
-                _context2.t4 = internalOptions.project;
-                _context2.t5 = {
-                  release: _context2.t1,
-                  injectReleasesMap: _context2.t2,
-                  org: _context2.t3,
-                  project: _context2.t4
-                };
-                return _context2.abrupt("return", (0, _context2.t0)(_context2.t5));
-
-              case 13:
-                return _context2.abrupt("return", undefined);
-
-              case 14:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2);
-      }))();
+      return undefined;
     },
 
     /**
@@ -1887,11 +1822,7 @@ var unplugin = unplugin$1.createUnplugin(function (options, unpluginMetaContext)
       }); // We normalize the id because vite always passes `id` as a unix style path which causes problems when a user passes
       // a windows style path to `releaseInjectionTargets`
 
-      var normalizedId = path__default["default"].normalize(id); // We don't want to transform our injected code.
-
-      if (normalizedId === RELEASE_INJECTOR_ID) {
-        return false;
-      }
+      var normalizedId = path__default["default"].normalize(id);
 
       if (internalOptions.releaseInjectionTargets) {
         // If there's an `releaseInjectionTargets` option transform (ie. inject the release varible) when the file path matches the option.
@@ -1907,13 +1838,14 @@ var unplugin = unplugin$1.createUnplugin(function (options, unpluginMetaContext)
             return normalizedId === normalizedEntry;
           }
         });
-      } else {
-        var isInNodeModules = normalizedId.split(path__default["default"].sep).includes("node_modules");
+      } else if (absolueEntrypointPaths.has(normalizedId)) {
         var pathIsOrdinary = !normalizedId.includes("?") && !normalizedId.includes("#");
         var pathHasAllowedFileEnding = ALLOWED_TRANSFORMATION_FILE_ENDINGS.some(function (allowedFileEnding) {
           return normalizedId.endsWith(allowedFileEnding);
         });
-        return !isInNodeModules && pathIsOrdinary && pathHasAllowedFileEnding;
+        return pathIsOrdinary && pathHasAllowedFileEnding;
+      } else {
+        return false;
       }
     },
 
@@ -1926,26 +1858,57 @@ var unplugin = unplugin$1.createUnplugin(function (options, unpluginMetaContext)
      * @returns transformed code + source map
      */
     transform: function transform(code, id) {
-      logger.debug('Called "transform":', {
-        id: id
-      }); // The MagicString library allows us to generate sourcemaps for the changes we make to the user code.
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var ms;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                logger.debug('Called "transform":', {
+                  id: id
+                }); // The MagicString library allows us to generate sourcemaps for the changes we make to the user code.
 
-      var ms = new MagicString__default["default"](code); // Appending instead of prepending has less probability of mucking with user's source maps.
-      // Luckily import statements get hoisted to the top anyways.
+                ms = new MagicString__default["default"](code);
+                _context2.t0 = ms;
+                _context2.t1 = generateGlobalInjectorCode;
+                _context2.next = 6;
+                return releaseNamePromise;
 
-      ms.append(";\nimport \"".concat(RELEASE_INJECTOR_ID, "\";"));
+              case 6:
+                _context2.t2 = _context2.sent;
+                _context2.t3 = internalOptions.injectReleasesMap;
+                _context2.t4 = internalOptions.org;
+                _context2.t5 = internalOptions.project;
+                _context2.t6 = {
+                  release: _context2.t2,
+                  injectReleasesMap: _context2.t3,
+                  org: _context2.t4,
+                  project: _context2.t5
+                };
+                _context2.t7 = (0, _context2.t1)(_context2.t6);
 
-      if (unpluginMetaContext.framework === "esbuild") {
-        // esbuild + unplugin is buggy at the moment when we return an object with a `map` (sourcemap) property.
-        // Currently just returning a string here seems to work and even correctly sourcemaps the code we generate.
-        // However, other bundlers need the `map` property
-        return ms.toString();
-      } else {
-        return {
-          code: ms.toString(),
-          map: ms.generateMap()
-        };
-      }
+                _context2.t0.prepend.call(_context2.t0, _context2.t7);
+
+                if (!(unpluginMetaContext.framework === "esbuild")) {
+                  _context2.next = 17;
+                  break;
+                }
+
+                return _context2.abrupt("return", ms.toString());
+
+              case 17:
+                return _context2.abrupt("return", {
+                  code: ms.toString(),
+                  map: ms.generateMap()
+                });
+
+              case 18:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2);
+      }))();
     },
 
     /**
@@ -2087,7 +2050,7 @@ function generateGlobalInjectorCode(_ref2) {
 
   if (injectReleasesMap && project) {
     var key = org ? "".concat(project, "@").concat(org) : project;
-    code += "\n      _global.SENTRY_RELEASES=_global.SENTRY_RELEASES || {};\n      _global.SENTRY_RELEASES[\"".concat(key, "\"]={id:\"").concat(release, "\"};\n      ");
+    code += "\n      _global.SENTRY_RELEASES=_global.SENTRY_RELEASES || {};\n      _global.SENTRY_RELEASES[\"".concat(key, "\"]={id:\"").concat(release, "\"};");
   }
 
   return code;