@sentry/bundler-plugin-core 2.2.1 → 2.3.0

package/dist/cjs/index.js

@@ -566,7 +566,11 @@ function stringToUUID(str) {
   var md5sum = crypto__default["default"].createHash("md5");
   md5sum.update(str);
   var md5Hash = md5sum.digest("hex");
-  return (md5Hash.substring(0, 8) + "-" + md5Hash.substring(8, 12) + "-4" + md5Hash.substring(13, 16) + "-" + md5Hash.substring(16, 20) + "-" + md5Hash.substring(20)).toLowerCase();
+
+  // Position 16 is fixed to either 8, 9, a, or b in the uuid v4 spec (10xx in binary)
+  // RFC 4122 section 4.4
+  var v4variant = ["8", "9", "a", "b"][md5Hash.substring(16, 17).charCodeAt(0) % 4];
+  return (md5Hash.substring(0, 8) + "-" + md5Hash.substring(8, 12) + "-4" + md5Hash.substring(13, 16) + "-" + v4variant + md5Hash.substring(17, 20) + "-" + md5Hash.substring(20)).toLowerCase();
 }
 
 /**
@@ -634,7 +638,7 @@ function stripQueryAndHashFromPath(path) {
 
 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, _userOptions$release$, _userOptions$release, _userOptions$release$2, _userOptions$release2, _userOptions$release$3, _userOptions$release3, _userOptions$release$4, _userOptions$release4, _ref2, _userOptions$release$5, _userOptions$release5, _userOptions$release$6, _userOptions$release6, _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$release$6, _userOptions$release6, _userOptions$_experim;
   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"],
@@ -648,11 +652,11 @@ function normalizeUserOptions(userOptions) {
     disable: (_userOptions$disable = userOptions.disable) !== null && _userOptions$disable !== void 0 ? _userOptions$disable : false,
     sourcemaps: userOptions.sourcemaps,
     release: _objectSpread2(_objectSpread2({}, userOptions.release), {}, {
-      name: (_userOptions$release$ = (_userOptions$release = userOptions.release) === null || _userOptions$release === void 0 ? void 0 : _userOptions$release.name) !== null && _userOptions$release$ !== void 0 ? _userOptions$release$ : determineReleaseName(),
+      name: (_ref2 = (_userOptions$release$ = (_userOptions$release = userOptions.release) === null || _userOptions$release === void 0 ? void 0 : _userOptions$release.name) !== null && _userOptions$release$ !== void 0 ? _userOptions$release$ : process.env["SENTRY_RELEASE"]) !== null && _ref2 !== void 0 ? _ref2 : determineReleaseName(),
       inject: (_userOptions$release$2 = (_userOptions$release2 = userOptions.release) === null || _userOptions$release2 === void 0 ? void 0 : _userOptions$release2.inject) !== null && _userOptions$release$2 !== void 0 ? _userOptions$release$2 : true,
       create: (_userOptions$release$3 = (_userOptions$release3 = userOptions.release) === null || _userOptions$release3 === void 0 ? void 0 : _userOptions$release3.create) !== null && _userOptions$release$3 !== void 0 ? _userOptions$release$3 : true,
       finalize: (_userOptions$release$4 = (_userOptions$release4 = userOptions.release) === null || _userOptions$release4 === void 0 ? void 0 : _userOptions$release4.finalize) !== null && _userOptions$release$4 !== void 0 ? _userOptions$release$4 : true,
-      vcsRemote: (_ref2 = (_userOptions$release$5 = (_userOptions$release5 = userOptions.release) === null || _userOptions$release5 === void 0 ? void 0 : _userOptions$release5.vcsRemote) !== null && _userOptions$release$5 !== void 0 ? _userOptions$release$5 : process.env["SENTRY_VSC_REMOTE"]) !== null && _ref2 !== void 0 ? _ref2 : "origin",
+      vcsRemote: (_ref3 = (_userOptions$release$5 = (_userOptions$release5 = userOptions.release) === null || _userOptions$release5 === void 0 ? void 0 : _userOptions$release5.vcsRemote) !== null && _userOptions$release$5 !== void 0 ? _userOptions$release$5 : process.env["SENTRY_VSC_REMOTE"]) !== null && _ref3 !== void 0 ? _ref3 : "origin",
       cleanArtifacts: (_userOptions$release$6 = (_userOptions$release6 = userOptions.release) === null || _userOptions$release6 === void 0 ? void 0 : _userOptions$release6.cleanArtifacts) !== null && _userOptions$release$6 !== void 0 ? _userOptions$release$6 : false
     }),
     _experiments: (_userOptions$_experim = userOptions._experiments) !== null && _userOptions$_experim !== void 0 ? _userOptions$_experim : {}
@@ -702,7 +706,7 @@ function createDebugIdUploadFunction(_ref) {
     sentryClient = _ref.sentryClient,
     sentryCliOptions = _ref.sentryCliOptions,
     rewriteSourcesHook = _ref.rewriteSourcesHook,
-    deleteFilesAfterUpload = _ref.deleteFilesAfterUpload;
+    filesToDeleteAfterUpload = _ref.filesToDeleteAfterUpload;
   return /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(buildArtifactPaths) {
       var artifactBundleUploadTransaction, folderToCleanUp, mkdtempSpan, tmpUploadFolder, globAssets, globSpan, globResult, debugIdChunkFilePaths, prepareSpan, files, stats, uploadSize, uploadSpan, cliInstance, deleteGlobSpan, filePathsToDelete, deleteSpan, cleanupSpan;
@@ -742,27 +746,29 @@ function createDebugIdUploadFunction(_ref) {
             globSpan.finish();
             debugIdChunkFilePaths = globResult.filter(function (debugIdChunkFilePath) {
               return debugIdChunkFilePath.endsWith(".js") || debugIdChunkFilePath.endsWith(".mjs") || debugIdChunkFilePath.endsWith(".cjs");
-            });
+            }); // The order of the files output by glob() is not deterministic
+            // Ensure order within the files so that {debug-id}-{chunkIndex} coupling is consistent
+            debugIdChunkFilePaths.sort();
             if (!(Array.isArray(assets) && assets.length === 0)) {
-              _context2.next = 19;
+              _context2.next = 20;
               break;
             }
             logger.debug("Empty `sourcemaps.assets` option provided. Will not upload sourcemaps with debug ID.");
-            _context2.next = 41;
+            _context2.next = 43;
             break;
-          case 19:
+          case 20:
             if (!(debugIdChunkFilePaths.length === 0)) {
-              _context2.next = 23;
+              _context2.next = 24;
               break;
             }
             logger.warn("Didn't find any matching sources for debug ID upload. Please check the `sourcemaps.assets` option.");
-            _context2.next = 41;
+            _context2.next = 43;
             break;
-          case 23:
+          case 24:
             prepareSpan = artifactBundleUploadTransaction.startChild({
               description: "prepare-bundles"
             });
-            _context2.next = 26;
+            _context2.next = 27;
             return Promise.all(debugIdChunkFilePaths.map( /*#__PURE__*/function () {
               var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(chunkFilePath, chunkIndex) {
                 return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -780,18 +786,18 @@ function createDebugIdUploadFunction(_ref) {
                 return _ref3.apply(this, arguments);
               };
             }()));
-          case 26:
+          case 27:
             prepareSpan.finish();
-            _context2.next = 29;
+            _context2.next = 30;
             return fs__default["default"].promises.readdir(tmpUploadFolder);
-          case 29:
+          case 30:
             files = _context2.sent;
             stats = files.map(function (file) {
               return fs__default["default"].promises.stat(path__default["default"].join(tmpUploadFolder, file));
             });
-            _context2.next = 33;
+            _context2.next = 34;
             return Promise.all(stats);
-          case 33:
+          case 34:
             uploadSize = _context2.sent.reduce(function (accumulator, _ref4) {
               var size = _ref4.size;
               return accumulator + size;
@@ -808,7 +814,7 @@ function createDebugIdUploadFunction(_ref) {
                 baggage: utils.dynamicSamplingContextToSentryBaggageHeader(artifactBundleUploadTransaction.getDynamicSamplingContext())
               }, sentryCliOptions.headers)
             }));
-            _context2.next = 40;
+            _context2.next = 41;
             return cliInstance.releases.uploadSourceMaps(releaseName !== null && releaseName !== void 0 ? releaseName : "undefined",
             // unfortunetly this needs a value for now but it will not matter since debug IDs overpower releases anyhow
             {
@@ -819,22 +825,23 @@ function createDebugIdUploadFunction(_ref) {
               }],
               useArtifactBundle: true
             });
-          case 40:
-            uploadSpan.finish();
           case 41:
-            if (!deleteFilesAfterUpload) {
-              _context2.next = 52;
+            uploadSpan.finish();
+            logger.info("Successfully uploaded source maps to Sentry");
+          case 43:
+            if (!filesToDeleteAfterUpload) {
+              _context2.next = 54;
               break;
             }
             deleteGlobSpan = artifactBundleUploadTransaction.startChild({
               description: "delete-glob"
             });
-            _context2.next = 45;
-            return glob.glob(deleteFilesAfterUpload, {
+            _context2.next = 47;
+            return glob.glob(filesToDeleteAfterUpload, {
               absolute: true,
               nodir: true
             });
-          case 45:
+          case 47:
             filePathsToDelete = _context2.sent;
             deleteGlobSpan.finish();
             filePathsToDelete.forEach(function (filePathToDelete) {
@@ -843,27 +850,27 @@ function createDebugIdUploadFunction(_ref) {
             deleteSpan = artifactBundleUploadTransaction.startChild({
               description: "delete-files-after-upload"
             });
-            _context2.next = 51;
+            _context2.next = 53;
             return Promise.all(filePathsToDelete.map(function (filePathToDelete) {
               return fs__default["default"].promises.rm(filePathToDelete, {
                 force: true
               });
             }));
-          case 51:
+          case 53:
             deleteSpan.finish();
-          case 52:
-            _context2.next = 58;
-            break;
           case 54:
-            _context2.prev = 54;
+            _context2.next = 60;
+            break;
+          case 56:
+            _context2.prev = 56;
             _context2.t0 = _context2["catch"](1);
             sentryHub.withScope(function (scope) {
               scope.setSpan(artifactBundleUploadTransaction);
               sentryHub.captureException('Error in "debugIdUploadPlugin" writeBundle hook');
             });
             handleRecoverableError(_context2.t0);
-          case 58:
-            _context2.prev = 58;
+          case 60:
+            _context2.prev = 60;
             if (folderToCleanUp) {
               cleanupSpan = artifactBundleUploadTransaction.startChild({
                 description: "cleanup"
@@ -875,15 +882,15 @@ function createDebugIdUploadFunction(_ref) {
               cleanupSpan.finish();
             }
             artifactBundleUploadTransaction.finish();
-            _context2.next = 63;
+            _context2.next = 65;
             return sentryClient.flush();
-          case 63:
-            return _context2.finish(58);
-          case 64:
+          case 65:
+            return _context2.finish(60);
+          case 66:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[1, 54, 58, 64]]);
+      }, _callee2, null, [[1, 56, 60, 66]]);
     }));
     return function (_x) {
       return _ref2.apply(this, arguments);
@@ -1284,7 +1291,7 @@ function createSentryInstance(options, shouldSendTelemetry, bundler) {
     dsn: "https://4c2bae7d9fbc413e8f7385f55c515d51@o1.ingest.sentry.io/6690737",
     tracesSampleRate: 1,
     sampleRate: 1,
-    release: "2.2.1",
+    release: "2.3.0",
     integrations: [],
     tracePropagationTargets: ["sentry.io/api"],
     stackParser: node.defaultStackParser,
@@ -1368,7 +1375,7 @@ function setTelemetryDataOnHub(options, hub, bundler) {
   // Miscelaneous options
   hub.setTag("custom-error-handler", !!errorHandler);
   hub.setTag("sourcemaps-assets", !!(sourcemaps !== null && sourcemaps !== void 0 && sourcemaps.assets));
-  hub.setTag("delete-after-upload", !!(sourcemaps !== null && sourcemaps !== void 0 && sourcemaps.deleteFilesAfterUpload));
+  hub.setTag("delete-after-upload", !!(sourcemaps !== null && sourcemaps !== void 0 && sourcemaps.deleteFilesAfterUpload) || !!(sourcemaps !== null && sourcemaps !== void 0 && sourcemaps.filesToDeleteAfterUpload));
   hub.setTag("node", process.version);
   hub.setTag("platform", process.platform);
   hub.setTags({
@@ -1500,7 +1507,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.2.1");
+    process.env["SENTRY_PIPELINE"] = "".concat(unpluginMetaContext.framework, "-plugin/", "2.3.0");
     function handleRecoverableError(unknownError) {
       sentrySession.status = "abnormal";
       try {
@@ -1580,6 +1587,7 @@ function sentryUnpluginFactory(_ref) {
         }
       }));
     }
+    plugins.push(debugIdInjectionPlugin());
     if (!options.authToken) {
       logger.warn("No auth token provided. Will not upload source maps. Please set the `authToken` option. You can find information on how to generate a Sentry auth token here: https://docs.sentry.io/api/auth/");
     } else if (!options.org) {
@@ -1587,17 +1595,16 @@ function sentryUnpluginFactory(_ref) {
     } else if (!options.project) {
       logger.warn("No project provided. Will not upload source maps. Please set the `project` option to your Sentry project slug.");
     } else {
-      var _options$sourcemaps, _options$sourcemaps2, _options$sourcemaps3, _options$sourcemaps4;
-      plugins.push(debugIdInjectionPlugin());
+      var _options$sourcemaps, _options$sourcemaps2, _options$sourcemaps$f, _options$sourcemaps3, _options$sourcemaps4, _options$sourcemaps5;
       plugins.push(debugIdUploadPlugin(createDebugIdUploadFunction({
         assets: (_options$sourcemaps = options.sourcemaps) === null || _options$sourcemaps === void 0 ? void 0 : _options$sourcemaps.assets,
         ignore: (_options$sourcemaps2 = options.sourcemaps) === null || _options$sourcemaps2 === void 0 ? void 0 : _options$sourcemaps2.ignore,
-        deleteFilesAfterUpload: (_options$sourcemaps3 = options.sourcemaps) === null || _options$sourcemaps3 === void 0 ? void 0 : _options$sourcemaps3.deleteFilesAfterUpload,
+        filesToDeleteAfterUpload: (_options$sourcemaps$f = (_options$sourcemaps3 = options.sourcemaps) === null || _options$sourcemaps3 === void 0 ? void 0 : _options$sourcemaps3.filesToDeleteAfterUpload) !== null && _options$sourcemaps$f !== void 0 ? _options$sourcemaps$f : (_options$sourcemaps4 = options.sourcemaps) === null || _options$sourcemaps4 === void 0 ? void 0 : _options$sourcemaps4.deleteFilesAfterUpload,
         dist: options.release.dist,
         releaseName: options.release.name,
         logger: logger,
         handleRecoverableError: handleRecoverableError,
-        rewriteSourcesHook: (_options$sourcemaps4 = options.sourcemaps) === null || _options$sourcemaps4 === void 0 ? void 0 : _options$sourcemaps4.rewriteSources,
+        rewriteSourcesHook: (_options$sourcemaps5 = options.sourcemaps) === null || _options$sourcemaps5 === void 0 ? void 0 : _options$sourcemaps5.rewriteSources,
         sentryHub: sentryHub,
         sentryClient: sentryClient,
         sentryCliOptions: {
@@ -1703,7 +1710,7 @@ function createRollupDebugIdInjectionHooks() {
         // As an additional complication `"use strict";`s may come after any number of comments.
         var commentUseStrictRegex =
         // Note: CodeQL complains that this regex potentially has n^2 runtime. This likely won't affect realistic files.
-        /^(?:\s*|\/\*(?:.|\r|\n)*\*\/|\/\/.*[\n\r])*(?:"[^"]*";|'[^']*';)?/;
+        /^(?:\s*|\/\*(?:.|\r|\n)*?\*\/|\/\/.*[\n\r])*(?:"[^"]*";|'[^']*';)?/;
         var match = (_code$match = code.match(commentUseStrictRegex)) === 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.
@@ -1784,4 +1791,5 @@ exports.getBuildInformation = getBuildInformation;
 exports.getDebugIdSnippet = getDebugIdSnippet;
 exports.sentryCliBinaryExists = sentryCliBinaryExists;
 exports.sentryUnpluginFactory = sentryUnpluginFactory;
+exports.stringToUUID = stringToUUID;
 //# sourceMappingURL=index.js.map