@sentry/bundler-plugin-core 2.21.0 → 2.21.1

package/dist/cjs/index.js

@@ -13659,7 +13659,7 @@ function createSentryInstance(options, shouldSendTelemetry, bundler) {
     dsn: "https://4c2bae7d9fbc413e8f7385f55c515d51@o1.ingest.sentry.io/6690737",
     tracesSampleRate: 1,
     sampleRate: 1,
-    release: "2.21.0",
+    release: "2.21.1",
     integrations: [],
     tracePropagationTargets: ["sentry.io/api"],
     stackParser: defaultStackParser,
@@ -13863,23 +13863,27 @@ function createDebugIdUploadFunction(_ref) {
     sentryClient = _ref.sentryClient,
     sentryCliOptions = _ref.sentryCliOptions,
     rewriteSourcesHook = _ref.rewriteSourcesHook,
-    freeDependencyOnSourcemapFiles = _ref.freeDependencyOnSourcemapFiles;
+    createDependencyOnSourcemapFiles = _ref.createDependencyOnSourcemapFiles;
+  var freeGlobalDependencyOnSourcemapFiles = createDependencyOnSourcemapFiles();
   return /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(buildArtifactPaths) {
-      var artifactBundleUploadTransaction, folderToCleanUp, mkdtempSpan, tmpUploadFolder, globAssets, globSpan, globResult, debugIdChunkFilePaths, prepareSpan, preparationTasks, workers, worker, workerIndex, files, stats, uploadSize, uploadSpan, cliInstance, cleanupSpan;
+      var artifactBundleUploadTransaction, folderToCleanUp, freeUploadDependencyOnSourcemapFiles, mkdtempSpan, tmpUploadFolder, globAssets, globSpan, globResult, debugIdChunkFilePaths, prepareSpan, preparationTasks, workers, worker, workerIndex, files, stats, uploadSize, uploadSpan, cliInstance, cleanupSpan;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             artifactBundleUploadTransaction = sentryHub.startTransaction({
               name: "debug-id-sourcemap-upload"
             });
-            _context3.prev = 1;
+            // It is possible that this writeBundle hook (which calls this function) is called multiple times in one build (for example when reusing the plugin, or when using build tooling like `@vitejs/plugin-legacy`)
+            // Therefore we need to actually register the execution of this hook as dependency on the sourcemap files.
+            freeUploadDependencyOnSourcemapFiles = createDependencyOnSourcemapFiles();
+            _context3.prev = 2;
             mkdtempSpan = artifactBundleUploadTransaction.startChild({
               description: "mkdtemp"
             });
-            _context3.next = 5;
+            _context3.next = 6;
             return fs__default["default"].promises.mkdtemp(path__default["default"].join(os__default["default"].tmpdir(), "sentry-bundler-plugin-upload-"));
-          case 5:
+          case 6:
             tmpUploadFolder = _context3.sent;
             mkdtempSpan.finish();
             folderToCleanUp = tmpUploadFolder;
@@ -13892,13 +13896,13 @@ function createDebugIdUploadFunction(_ref) {
             globSpan = artifactBundleUploadTransaction.startChild({
               description: "glob"
             });
-            _context3.next = 12;
+            _context3.next = 13;
             return glob.glob(globAssets, {
               absolute: true,
               nodir: true,
               ignore: ignore
             });
-          case 12:
+          case 13:
             globResult = _context3.sent;
             globSpan.finish();
             debugIdChunkFilePaths = globResult.filter(function (debugIdChunkFilePath) {
@@ -13907,21 +13911,21 @@ function createDebugIdUploadFunction(_ref) {
             // Ensure order within the files so that {debug-id}-{chunkIndex} coupling is consistent
             debugIdChunkFilePaths.sort();
             if (!(Array.isArray(assets) && assets.length === 0)) {
-              _context3.next = 20;
+              _context3.next = 21;
               break;
             }
             logger.debug("Empty `sourcemaps.assets` option provided. Will not upload sourcemaps with debug ID.");
-            _context3.next = 47;
+            _context3.next = 48;
             break;
-          case 20:
+          case 21:
             if (!(debugIdChunkFilePaths.length === 0)) {
-              _context3.next = 24;
+              _context3.next = 25;
               break;
             }
             logger.warn("Didn't find any matching sources for debug ID upload. Please check the `sourcemaps.assets` option.");
-            _context3.next = 47;
+            _context3.next = 48;
             break;
-          case 24:
+          case 25:
             prepareSpan = artifactBundleUploadTransaction.startChild({
               description: "prepare-bundles"
             }); // Preparing the bundles can be a lot of work and doing it all at once has the potential of nuking the heap so
@@ -13974,20 +13978,20 @@ function createDebugIdUploadFunction(_ref) {
             for (workerIndex = 0; workerIndex < 16; workerIndex++) {
               workers.push(worker());
             }
-            _context3.next = 31;
+            _context3.next = 32;
             return Promise.all(workers);
-          case 31:
+          case 32:
             prepareSpan.finish();
-            _context3.next = 34;
+            _context3.next = 35;
             return fs__default["default"].promises.readdir(tmpUploadFolder);
-          case 34:
+          case 35:
             files = _context3.sent;
             stats = files.map(function (file) {
               return fs__default["default"].promises.stat(path__default["default"].join(tmpUploadFolder, file));
             });
-            _context3.next = 38;
+            _context3.next = 39;
             return Promise.all(stats);
-          case 38:
+          case 39:
             uploadSize = _context3.sent.reduce(function (accumulator, _ref5) {
               var size = _ref5.size;
               return accumulator + size;
@@ -14004,7 +14008,7 @@ function createDebugIdUploadFunction(_ref) {
                 baggage: dynamicSamplingContextToSentryBaggageHeader(artifactBundleUploadTransaction.getDynamicSamplingContext())
               }, sentryCliOptions.headers)
             }));
-            _context3.next = 45;
+            _context3.next = 46;
             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
             {
@@ -14015,22 +14019,22 @@ function createDebugIdUploadFunction(_ref) {
               }],
               useArtifactBundle: true
             });
-          case 45:
+          case 46:
             uploadSpan.finish();
             logger.info("Successfully uploaded source maps to Sentry");
-          case 47:
-            _context3.next = 53;
+          case 48:
+            _context3.next = 54;
             break;
-          case 49:
-            _context3.prev = 49;
-            _context3.t0 = _context3["catch"](1);
+          case 50:
+            _context3.prev = 50;
+            _context3.t0 = _context3["catch"](2);
             sentryHub.withScope(function (scope) {
               scope.setSpan(artifactBundleUploadTransaction);
               sentryHub.captureException('Error in "debugIdUploadPlugin" writeBundle hook');
             });
             handleRecoverableError(_context3.t0);
-          case 53:
-            _context3.prev = 53;
+          case 54:
+            _context3.prev = 54;
             if (folderToCleanUp) {
               cleanupSpan = artifactBundleUploadTransaction.startChild({
                 description: "cleanup"
@@ -14042,16 +14046,17 @@ function createDebugIdUploadFunction(_ref) {
               cleanupSpan.finish();
             }
             artifactBundleUploadTransaction.finish();
-            freeDependencyOnSourcemapFiles();
-            _context3.next = 59;
+            freeGlobalDependencyOnSourcemapFiles();
+            freeUploadDependencyOnSourcemapFiles();
+            _context3.next = 61;
             return safeFlushTelemetry(sentryClient);
-          case 59:
-            return _context3.finish(53);
-          case 60:
+          case 61:
+            return _context3.finish(54);
+          case 62:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[1, 49, 53, 60]]);
+      }, _callee3, null, [[2, 50, 54, 62]]);
     }));
     return function (_x) {
       return _ref2.apply(this, arguments);
@@ -14298,26 +14303,30 @@ function releaseManagementPlugin(_ref) {
     sentryHub = _ref.sentryHub,
     sentryClient = _ref.sentryClient,
     sentryCliOptions = _ref.sentryCliOptions,
-    freeDependencyOnSourcemapFiles = _ref.freeDependencyOnSourcemapFiles;
+    createDependencyOnSourcemapFiles = _ref.createDependencyOnSourcemapFiles;
+  var freeGlobalDependencyOnSourcemapFiles = createDependencyOnSourcemapFiles();
   return {
     name: "sentry-debug-id-upload-plugin",
     writeBundle: function writeBundle() {
       return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var cliInstance, normalizedInclude;
+        var freeWriteBundleInvocationDependencyOnSourcemapFiles, cliInstance, normalizedInclude;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _context.prev = 0;
+              // It is possible that this writeBundle hook is called multiple times in one build (for example when reusing the plugin, or when using build tooling like `@vitejs/plugin-legacy`)
+              // Therefore we need to actually register the execution of this hook as dependency on the sourcemap files.
+              freeWriteBundleInvocationDependencyOnSourcemapFiles = createDependencyOnSourcemapFiles();
+              _context.prev = 1;
               cliInstance = new SentryCli__default["default"](null, sentryCliOptions);
               if (!shouldCreateRelease) {
-                _context.next = 5;
+                _context.next = 6;
                 break;
               }
-              _context.next = 5;
+              _context.next = 6;
               return cliInstance.releases["new"](releaseName);
-            case 5:
+            case 6:
               if (!include) {
-                _context.next = 9;
+                _context.next = 10;
                 break;
               }
               normalizedInclude = arrayify$1(include).map(function (includeItem) {
@@ -14334,52 +14343,53 @@ function releaseManagementPlugin(_ref) {
                   ignore: includeEntry.ignore ? arrayify$1(includeEntry.ignore) : undefined
                 });
               });
-              _context.next = 9;
+              _context.next = 10;
               return cliInstance.releases.uploadSourceMaps(releaseName, {
                 include: normalizedInclude,
                 dist: dist
               });
-            case 9:
+            case 10:
               if (!setCommitsOption) {
-                _context.next = 12;
+                _context.next = 13;
                 break;
               }
-              _context.next = 12;
+              _context.next = 13;
               return cliInstance.releases.setCommits(releaseName, setCommitsOption);
-            case 12:
+            case 13:
               if (!shouldFinalizeRelease) {
-                _context.next = 15;
+                _context.next = 16;
                 break;
               }
-              _context.next = 15;
+              _context.next = 16;
               return cliInstance.releases.finalize(releaseName);
-            case 15:
+            case 16:
               if (!deployOptions) {
-                _context.next = 18;
+                _context.next = 19;
                 break;
               }
-              _context.next = 18;
+              _context.next = 19;
               return cliInstance.releases.newDeploy(releaseName, deployOptions);
-            case 18:
-              _context.next = 26;
+            case 19:
+              _context.next = 27;
               break;
-            case 20:
-              _context.prev = 20;
-              _context.t0 = _context["catch"](0);
+            case 21:
+              _context.prev = 21;
+              _context.t0 = _context["catch"](1);
               sentryHub.captureException('Error in "releaseManagementPlugin" writeBundle hook');
-              _context.next = 25;
+              _context.next = 26;
               return safeFlushTelemetry(sentryClient);
-            case 25:
-              handleRecoverableError(_context.t0);
             case 26:
-              _context.prev = 26;
-              freeDependencyOnSourcemapFiles();
-              return _context.finish(26);
-            case 29:
+              handleRecoverableError(_context.t0);
+            case 27:
+              _context.prev = 27;
+              freeGlobalDependencyOnSourcemapFiles();
+              freeWriteBundleInvocationDependencyOnSourcemapFiles();
+              return _context.finish(27);
+            case 31:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[0, 20, 26, 29]]);
+        }, _callee, null, [[1, 21, 27, 31]]);
       }))();
     }
   };
@@ -14470,73 +14480,62 @@ function fileDeletionPlugin(_ref) {
     sentryHub = _ref.sentryHub,
     sentryClient = _ref.sentryClient,
     filesToDeleteAfterUpload = _ref.filesToDeleteAfterUpload,
-    dependenciesAreFreedPromise = _ref.dependenciesAreFreedPromise,
+    waitUntilSourcemapFileDependenciesAreFreed = _ref.waitUntilSourcemapFileDependenciesAreFreed,
     logger = _ref.logger;
-  var writeBundle = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var filePathsToDelete;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.prev = 0;
-            if (!(filesToDeleteAfterUpload !== undefined)) {
-              _context.next = 11;
-              break;
-            }
-            _context.next = 4;
-            return glob.glob(filesToDeleteAfterUpload, {
-              absolute: true,
-              nodir: true
-            });
-          case 4:
-            filePathsToDelete = _context.sent;
-            logger.debug("Waiting for dependencies on generated files to be freed before deleting...");
-            _context.next = 8;
-            return dependenciesAreFreedPromise;
-          case 8:
-            filePathsToDelete.forEach(function (filePathToDelete) {
-              logger.debug("Deleting asset after upload: ".concat(filePathToDelete));
-            });
-            _context.next = 11;
-            return Promise.all(filePathsToDelete.map(function (filePathToDelete) {
-              return fs__default["default"].promises.rm(filePathToDelete, {
-                force: true
-              })["catch"](function (e) {
-                // This is allowed to fail - we just don't do anything
-                logger.debug("An error occurred while attempting to delete asset: ".concat(filePathToDelete), e);
-              });
-            }));
-          case 11:
-            _context.next = 19;
-            break;
-          case 13:
-            _context.prev = 13;
-            _context.t0 = _context["catch"](0);
-            sentryHub.captureException('Error in "sentry-file-deletion-plugin" buildEnd hook');
-            _context.next = 18;
-            return safeFlushTelemetry(sentryClient);
-          case 18:
-            handleRecoverableError(_context.t0);
-          case 19:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[0, 13]]);
-    }));
-    return function writeBundle() {
-      return _ref2.apply(this, arguments);
-    };
-  }();
   return {
     name: "sentry-file-deletion-plugin",
-    vite: {
-      writeBundle: {
-        sequential: true,
-        order: "post",
-        handler: writeBundle
-      }
-    },
-    writeBundle: writeBundle
+    writeBundle: function writeBundle() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var filePathsToDelete;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.prev = 0;
+              if (!(filesToDeleteAfterUpload !== undefined)) {
+                _context.next = 11;
+                break;
+              }
+              _context.next = 4;
+              return glob.glob(filesToDeleteAfterUpload, {
+                absolute: true,
+                nodir: true
+              });
+            case 4:
+              filePathsToDelete = _context.sent;
+              logger.debug("Waiting for dependencies on generated files to be freed before deleting...");
+              _context.next = 8;
+              return waitUntilSourcemapFileDependenciesAreFreed();
+            case 8:
+              filePathsToDelete.forEach(function (filePathToDelete) {
+                logger.debug("Deleting asset after upload: ".concat(filePathToDelete));
+              });
+              _context.next = 11;
+              return Promise.all(filePathsToDelete.map(function (filePathToDelete) {
+                return fs__default["default"].promises.rm(filePathToDelete, {
+                  force: true
+                })["catch"](function (e) {
+                  // This is allowed to fail - we just don't do anything
+                  logger.debug("An error occurred while attempting to delete asset: ".concat(filePathToDelete), e);
+                });
+              }));
+            case 11:
+              _context.next = 19;
+              break;
+            case 13:
+              _context.prev = 13;
+              _context.t0 = _context["catch"](0);
+              sentryHub.captureException('Error in "sentry-file-deletion-plugin" buildEnd hook');
+              _context.next = 18;
+              return safeFlushTelemetry(sentryClient);
+            case 18:
+              handleRecoverableError(_context.t0);
+            case 19:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, null, [[0, 13]]);
+      }))();
+    }
   };
 }
 
@@ -14624,7 +14623,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.21.0");
+    process.env["SENTRY_PIPELINE"] = "".concat(unpluginMetaContext.framework, "-plugin/", "2.21.1");
     function handleRecoverableError(unknownError) {
       sentrySession.status = "abnormal";
       try {
@@ -14685,6 +14684,9 @@ function sentryUnpluginFactory(_ref) {
 
     /**
      * Returns a Promise that resolves when all the currently active dependencies are freed again.
+     *
+     * It is very important that this function is called as late as possible before wanting to await the Promise to give
+     * the dependency producers as much time as possible to register themselves.
      */
     function waitUntilSourcemapFileDependenciesAreFreed() {
       return new Promise(function (resolve) {
@@ -14792,7 +14794,7 @@ function sentryUnpluginFactory(_ref) {
           vcsRemote: options.release.vcsRemote,
           headers: options.headers
         },
-        freeDependencyOnSourcemapFiles: createDependencyOnSourcemapFiles()
+        createDependencyOnSourcemapFiles: createDependencyOnSourcemapFiles
       }));
     }
     plugins.push(debugIdInjectionPlugin(logger));
@@ -14807,7 +14809,7 @@ function sentryUnpluginFactory(_ref) {
       plugins.push(debugIdUploadPlugin(createDebugIdUploadFunction({
         assets: (_options$sourcemaps2 = options.sourcemaps) === null || _options$sourcemaps2 === void 0 ? void 0 : _options$sourcemaps2.assets,
         ignore: (_options$sourcemaps3 = options.sourcemaps) === null || _options$sourcemaps3 === void 0 ? void 0 : _options$sourcemaps3.ignore,
-        freeDependencyOnSourcemapFiles: createDependencyOnSourcemapFiles(),
+        createDependencyOnSourcemapFiles: createDependencyOnSourcemapFiles,
         dist: options.release.dist,
         releaseName: options.release.name,
         logger: logger,
@@ -14836,9 +14838,7 @@ function sentryUnpluginFactory(_ref) {
       }
     }
     plugins.push(fileDeletionPlugin({
-      // It is very important that this is only called after all other dependencies have been created with `createDependencyOnSourcemapFiles`.
-      // Ideally, we always register this plugin last.
-      dependenciesAreFreedPromise: waitUntilSourcemapFileDependenciesAreFreed(),
+      waitUntilSourcemapFileDependenciesAreFreed: waitUntilSourcemapFileDependenciesAreFreed,
       filesToDeleteAfterUpload: (_options$sourcemaps$f = (_options$sourcemaps5 = options.sourcemaps) === null || _options$sourcemaps5 === void 0 ? void 0 : _options$sourcemaps5.filesToDeleteAfterUpload) !== null && _options$sourcemaps$f !== void 0 ? _options$sourcemaps$f : (_options$sourcemaps6 = options.sourcemaps) === null || _options$sourcemaps6 === void 0 ? void 0 : _options$sourcemaps6.deleteFilesAfterUpload,
       logger: logger,
       handleRecoverableError: handleRecoverableError,