@sentry/bundler-plugin-core 2.20.0 → 2.20.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.20.0",
+    release: "2.20.1",
     integrations: [],
     tracePropagationTargets: ["sentry.io/api"],
     stackParser: defaultStackParser,
@@ -13751,6 +13751,7 @@ function setTelemetryDataOnHub(options, hub, bundler) {
   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.setTag("application-key-set", options.applicationKey !== undefined);
   hub.setTags({
     organization: org,
     project: project,
@@ -13861,7 +13862,7 @@ function createDebugIdUploadFunction(_ref) {
     sentryClient = _ref.sentryClient,
     sentryCliOptions = _ref.sentryCliOptions,
     rewriteSourcesHook = _ref.rewriteSourcesHook,
-    deleteFilesUpForDeletion = _ref.deleteFilesUpForDeletion;
+    freeDependencyOnSourcemapFiles = _ref.freeDependencyOnSourcemapFiles;
   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;
@@ -14017,21 +14018,18 @@ function createDebugIdUploadFunction(_ref) {
             uploadSpan.finish();
             logger.info("Successfully uploaded source maps to Sentry");
           case 47:
-            _context3.next = 49;
-            return deleteFilesUpForDeletion();
-          case 49:
-            _context3.next = 55;
+            _context3.next = 53;
             break;
-          case 51:
-            _context3.prev = 51;
+          case 49:
+            _context3.prev = 49;
             _context3.t0 = _context3["catch"](1);
             sentryHub.withScope(function (scope) {
               scope.setSpan(artifactBundleUploadTransaction);
               sentryHub.captureException('Error in "debugIdUploadPlugin" writeBundle hook');
             });
             handleRecoverableError(_context3.t0);
-          case 55:
-            _context3.prev = 55;
+          case 53:
+            _context3.prev = 53;
             if (folderToCleanUp) {
               cleanupSpan = artifactBundleUploadTransaction.startChild({
                 description: "cleanup"
@@ -14043,15 +14041,16 @@ function createDebugIdUploadFunction(_ref) {
               cleanupSpan.finish();
             }
             artifactBundleUploadTransaction.finish();
-            _context3.next = 60;
+            freeDependencyOnSourcemapFiles();
+            _context3.next = 59;
             return safeFlushTelemetry(sentryClient);
+          case 59:
+            return _context3.finish(53);
           case 60:
-            return _context3.finish(55);
-          case 61:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[1, 51, 55, 61]]);
+      }, _callee3, null, [[1, 49, 53, 60]]);
     }));
     return function (_x) {
       return _ref2.apply(this, arguments);
@@ -14298,7 +14297,7 @@ function releaseManagementPlugin(_ref) {
     sentryHub = _ref.sentryHub,
     sentryClient = _ref.sentryClient,
     sentryCliOptions = _ref.sentryCliOptions,
-    deleteFilesUpForDeletion = _ref.deleteFilesUpForDeletion;
+    freeDependencyOnSourcemapFiles = _ref.freeDependencyOnSourcemapFiles;
   return {
     name: "sentry-debug-id-upload-plugin",
     writeBundle: function writeBundle() {
@@ -14361,24 +14360,25 @@ function releaseManagementPlugin(_ref) {
               _context.next = 18;
               return cliInstance.releases.newDeploy(releaseName, deployOptions);
             case 18:
-              _context.next = 20;
-              return deleteFilesUpForDeletion();
-            case 20:
-              _context.next = 28;
+              _context.next = 26;
               break;
-            case 22:
-              _context.prev = 22;
+            case 20:
+              _context.prev = 20;
               _context.t0 = _context["catch"](0);
               sentryHub.captureException('Error in "releaseManagementPlugin" writeBundle hook');
-              _context.next = 27;
+              _context.next = 25;
               return safeFlushTelemetry(sentryClient);
-            case 27:
+            case 25:
               handleRecoverableError(_context.t0);
-            case 28:
+            case 26:
+              _context.prev = 26;
+              freeDependencyOnSourcemapFiles();
+              return _context.finish(26);
+            case 29:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[0, 22]]);
+        }, _callee, null, [[0, 20, 26, 29]]);
       }))();
     }
   };
@@ -14468,33 +14468,61 @@ function fileDeletionPlugin(_ref) {
   var handleRecoverableError = _ref.handleRecoverableError,
     sentryHub = _ref.sentryHub,
     sentryClient = _ref.sentryClient,
-    deleteFilesUpForDeletion = _ref.deleteFilesUpForDeletion;
+    filesToDeleteAfterUpload = _ref.filesToDeleteAfterUpload,
+    dependenciesAreFreedPromise = _ref.dependenciesAreFreedPromise,
+    logger = _ref.logger;
   return {
     name: "sentry-file-deletion-plugin",
     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;
-              _context.next = 3;
-              return deleteFilesUpForDeletion();
-            case 3:
+              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 5:
-              _context.prev = 5;
+            case 13:
+              _context.prev = 13;
               _context.t0 = _context["catch"](0);
               sentryHub.captureException('Error in "sentry-file-deletion-plugin" buildEnd hook');
-              _context.next = 10;
+              _context.next = 18;
               return safeFlushTelemetry(sentryClient);
-            case 10:
+            case 18:
               handleRecoverableError(_context.t0);
-            case 11:
+            case 19:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[0, 5]]);
+        }, _callee, null, [[0, 13]]);
       }))();
     }
   };
@@ -14534,7 +14562,7 @@ function sentryUnpluginFactory(_ref) {
     debugIdUploadPlugin = _ref.debugIdUploadPlugin,
     bundleSizeOptimizationsPlugin = _ref.bundleSizeOptimizationsPlugin;
   return unplugin.createUnplugin(function () {
-    var _userOptions$_metaOpt, _userOptions$_metaOpt2, _userOptions$silent, _userOptions$debug, _userOptions$_experim;
+    var _userOptions$_metaOpt, _userOptions$_metaOpt2, _userOptions$silent, _userOptions$debug, _userOptions$_experim, _options$sourcemaps$f, _options$sourcemaps4, _options$sourcemaps5;
     var userOptions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var unpluginMetaContext = arguments.length > 1 ? arguments[1] : undefined;
     var logger = createLogger({
@@ -14584,7 +14612,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.20.0");
+    process.env["SENTRY_PIPELINE"] = "".concat(unpluginMetaContext.framework, "-plugin/", "2.20.1");
     function handleRecoverableError(unknownError) {
       sentrySession.status = "abnormal";
       try {
@@ -14620,47 +14648,43 @@ function sentryUnpluginFactory(_ref) {
       logger: logger,
       shouldSendTelemetry: shouldSendTelemetry
     }));
-    function deleteFilesUpForDeletion() {
-      return _deleteFilesUpForDeletion.apply(this, arguments);
+
+    // We have multiple plugins depending on generated source map files. (debug ID upload, legacy upload)
+    // Additionally, we also want to have the functionality to delete files after uploading sourcemaps.
+    // All of these plugins and the delete functionality need to run in the same hook (`writeBundle`).
+    // Since the plugins among themselves are not aware of when they run and finish, we need a system to
+    // track their dependencies on the generated files, so that we can initiate the file deletion only after
+    // nothing depends on the files anymore.
+    var dependenciesOnSourcemapFiles = new Set();
+    var sourcemapFileDependencySubscribers = [];
+    function notifySourcemapFileDependencySubscribers() {
+      sourcemapFileDependencySubscribers.forEach(function (subscriber) {
+        subscriber();
+      });
     }
-    function _deleteFilesUpForDeletion() {
-      _deleteFilesUpForDeletion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var _options$sourcemaps$f, _options$sourcemaps4, _options$sourcemaps5;
-        var filesToDeleteAfterUpload, filePathsToDelete;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              filesToDeleteAfterUpload = (_options$sourcemaps$f = (_options$sourcemaps4 = options.sourcemaps) === null || _options$sourcemaps4 === void 0 ? void 0 : _options$sourcemaps4.filesToDeleteAfterUpload) !== null && _options$sourcemaps$f !== void 0 ? _options$sourcemaps$f : (_options$sourcemaps5 = options.sourcemaps) === null || _options$sourcemaps5 === void 0 ? void 0 : _options$sourcemaps5.deleteFilesAfterUpload;
-              if (!filesToDeleteAfterUpload) {
-                _context.next = 8;
-                break;
-              }
-              _context.next = 4;
-              return glob.glob(filesToDeleteAfterUpload, {
-                absolute: true,
-                nodir: true
-              });
-            case 4:
-              filePathsToDelete = _context.sent;
-              filePathsToDelete.forEach(function (filePathToDelete) {
-                logger.debug("Deleting asset after upload: ".concat(filePathToDelete));
-              });
-              _context.next = 8;
-              return Promise.all(filePathsToDelete.map(function (filePathToDelete) {
-                return fs__namespace.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 8:
-            case "end":
-              return _context.stop();
+    function createDependencyOnSourcemapFiles() {
+      var dependencyIdentifier = Symbol();
+      dependenciesOnSourcemapFiles.add(dependencyIdentifier);
+      return function freeDependencyOnSourcemapFiles() {
+        dependenciesOnSourcemapFiles["delete"](dependencyIdentifier);
+        notifySourcemapFileDependencySubscribers();
+      };
+    }
+
+    /**
+     * Returns a Promise that resolves when all the currently active dependencies are freed again.
+     */
+    function waitUntilSourcemapFileDependenciesAreFreed() {
+      return new Promise(function (resolve) {
+        sourcemapFileDependencySubscribers.push(function () {
+          if (dependenciesOnSourcemapFiles.size === 0) {
+            resolve();
           }
-        }, _callee);
-      }));
-      return _deleteFilesUpForDeletion.apply(this, arguments);
+        });
+        if (dependenciesOnSourcemapFiles.size === 0) {
+          resolve();
+        }
+      });
     }
     if (options.bundleSizeOptimizations) {
       var bundleSizeOptimizations = options.bundleSizeOptimizations;
@@ -14754,16 +14778,10 @@ function sentryUnpluginFactory(_ref) {
           vcsRemote: options.release.vcsRemote,
           headers: options.headers
         },
-        deleteFilesUpForDeletion: deleteFilesUpForDeletion
+        freeDependencyOnSourcemapFiles: createDependencyOnSourcemapFiles()
       }));
     }
     plugins.push(debugIdInjectionPlugin(logger));
-    plugins.push(fileDeletionPlugin({
-      deleteFilesUpForDeletion: deleteFilesUpForDeletion,
-      handleRecoverableError: handleRecoverableError,
-      sentryHub: sentryHub,
-      sentryClient: sentryClient
-    }));
     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 && !options.authToken.startsWith("sntrys_")) {
@@ -14775,7 +14793,7 @@ function sentryUnpluginFactory(_ref) {
       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,
-        deleteFilesUpForDeletion: deleteFilesUpForDeletion,
+        freeDependencyOnSourcemapFiles: createDependencyOnSourcemapFiles(),
         dist: options.release.dist,
         releaseName: options.release.name,
         logger: logger,
@@ -14803,6 +14821,16 @@ function sentryUnpluginFactory(_ref) {
         componentNameAnnotatePlugin && plugins.push(componentNameAnnotatePlugin());
       }
     }
+    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(),
+      filesToDeleteAfterUpload: (_options$sourcemaps$f = (_options$sourcemaps4 = options.sourcemaps) === null || _options$sourcemaps4 === void 0 ? void 0 : _options$sourcemaps4.filesToDeleteAfterUpload) !== null && _options$sourcemaps$f !== void 0 ? _options$sourcemaps$f : (_options$sourcemaps5 = options.sourcemaps) === null || _options$sourcemaps5 === void 0 ? void 0 : _options$sourcemaps5.deleteFilesAfterUpload,
+      logger: logger,
+      handleRecoverableError: handleRecoverableError,
+      sentryHub: sentryHub,
+      sentryClient: sentryClient
+    }));
     return plugins;
   });
 }
@@ -14967,50 +14995,50 @@ function createRollupModuleMetadataInjectionHooks(injectionCode) {
 function createRollupDebugIdUploadHooks(upload) {
   return {
     writeBundle: function writeBundle(outputOptions, bundle) {
-      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         var outputDir, _buildArtifacts, _buildArtifacts2;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
             case 0:
               if (!outputOptions.dir) {
-                _context2.next = 9;
+                _context.next = 9;
                 break;
               }
               outputDir = outputOptions.dir;
-              _context2.next = 4;
+              _context.next = 4;
               return glob.glob(["/**/*.js", "/**/*.mjs", "/**/*.cjs", "/**/*.js.map", "/**/*.mjs.map", "/**/*.cjs.map"], {
                 root: outputDir,
                 absolute: true,
                 nodir: true
               });
             case 4:
-              _buildArtifacts = _context2.sent;
-              _context2.next = 7;
+              _buildArtifacts = _context.sent;
+              _context.next = 7;
               return upload(_buildArtifacts);
             case 7:
-              _context2.next = 17;
+              _context.next = 17;
               break;
             case 9:
               if (!outputOptions.file) {
-                _context2.next = 14;
+                _context.next = 14;
                 break;
               }
-              _context2.next = 12;
+              _context.next = 12;
               return upload([outputOptions.file]);
             case 12:
-              _context2.next = 17;
+              _context.next = 17;
               break;
             case 14:
               _buildArtifacts2 = Object.keys(bundle).map(function (asset) {
                 return path__namespace.join(path__namespace.resolve(), asset);
               });
-              _context2.next = 17;
+              _context.next = 17;
               return upload(_buildArtifacts2);
             case 17:
             case "end":
-              return _context2.stop();
+              return _context.stop();
           }
-        }, _callee2);
+        }, _callee);
       }))();
     }
   };
@@ -15018,26 +15046,26 @@ function createRollupDebugIdUploadHooks(upload) {
 function createComponentNameAnnotateHooks() {
   return {
     transform: function transform(code, id) {
-      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
         var idWithoutQueryAndHash, parserPlugins, _result$code, result;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               // id may contain query and hash which will trip up our file extension logic below
               idWithoutQueryAndHash = stripQueryAndHashFromPath(id);
               if (!idWithoutQueryAndHash.match(/\\node_modules\\|\/node_modules\//)) {
-                _context3.next = 3;
+                _context2.next = 3;
                 break;
               }
-              return _context3.abrupt("return", null);
+              return _context2.abrupt("return", null);
             case 3:
               if ([".jsx", ".tsx"].some(function (ending) {
                 return idWithoutQueryAndHash.endsWith(ending);
               })) {
-                _context3.next = 5;
+                _context2.next = 5;
                 break;
               }
-              return _context3.abrupt("return", null);
+              return _context2.abrupt("return", null);
             case 5:
               parserPlugins = [];
               if (idWithoutQueryAndHash.endsWith(".jsx")) {
@@ -15045,8 +15073,8 @@ function createComponentNameAnnotateHooks() {
               } else if (idWithoutQueryAndHash.endsWith(".tsx")) {
                 parserPlugins.push("jsx", "typescript");
               }
-              _context3.prev = 7;
-              _context3.next = 10;
+              _context2.prev = 7;
+              _context2.next = 10;
               return core.transformAsync(code, {
                 plugins: [[componentNameAnnotatePlugin__default["default"]]],
                 filename: id,
@@ -15061,24 +15089,24 @@ function createComponentNameAnnotateHooks() {
                 sourceMaps: true
               });
             case 10:
-              result = _context3.sent;
-              return _context3.abrupt("return", {
+              result = _context2.sent;
+              return _context2.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:
-              _context3.prev = 14;
-              _context3.t0 = _context3["catch"](7);
-              logger.error("Failed to apply react annotate plugin", _context3.t0);
+              _context2.prev = 14;
+              _context2.t0 = _context2["catch"](7);
+              logger.error("Failed to apply react annotate plugin", _context2.t0);
             case 17:
-              return _context3.abrupt("return", {
+              return _context2.abrupt("return", {
                 code: code
               });
             case 18:
             case "end":
-              return _context3.stop();
+              return _context2.stop();
           }
-        }, _callee3, null, [[7, 14]]);
+        }, _callee2, null, [[7, 14]]);
       }))();
     }
   };