@sentry/bundler-plugin-core 3.5.0 → 3.6.1

package/dist/cjs/index.js

@@ -8195,7 +8195,7 @@ function createSentryInstance(options, shouldSendTelemetry, buildTool) {
     dsn: "https://4c2bae7d9fbc413e8f7385f55c515d51@o1.ingest.sentry.io/6690737",
     tracesSampleRate: 1,
     sampleRate: 1,
-    release: "3.5.0",
+    release: "3.6.1",
     integrations: [],
     tracePropagationTargets: ["sentry.io/api"],
     stackParser: stackParser,
@@ -8771,7 +8771,7 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
   });
 
   // Set the User-Agent that Sentry CLI will use when interacting with Sentry
-  process.env["SENTRY_PIPELINE"] = "".concat(bundlerPluginMetaContext.buildTool, "-plugin/", "3.5.0");
+  process.env["SENTRY_PIPELINE"] = "".concat(bundlerPluginMetaContext.buildTool, "-plugin/", "3.6.1");
 
   // Not a bulletproof check but should be good enough to at least sometimes determine
   // if the plugin is called in dev/watch mode or for a  prod build. The important part
@@ -9051,7 +9051,10 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
               _context6.next = 33;
               return cliInstance.releases.uploadSourceMaps(options.release.name, {
                 include: normalizedInclude,
-                dist: options.release.dist
+                dist: options.release.dist,
+                // We want this promise to throw if the sourcemaps fail to upload so that we know about it.
+                // see: https://github.com/getsentry/sentry-cli/pull/2605
+                live: "rejectOnError"
               });
             case 33:
               if (!(options.release.setCommits !== false)) {
@@ -9120,22 +9123,16 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
      */
     uploadSourcemaps: function uploadSourcemaps(buildArtifactPaths) {
       return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
-        var _options$sourcemaps;
         return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              if ((_options$sourcemaps = options.sourcemaps) !== null && _options$sourcemaps !== void 0 && _options$sourcemaps.disable) {
-                logger.debug("Source map upload was disabled. Will not upload sourcemaps using debug ID process.");
-              } else if (isDevMode) {
-                logger.debug("Running in development mode. Will not upload sourcemaps.");
-              } else 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/" + getTurborepoEnvPassthroughWarning("SENTRY_AUTH_TOKEN"));
-              } else if (!options.org && !options.authToken.startsWith("sntrys_")) {
-                logger.warn("No org provided. Will not upload source maps. Please set the `org` option to your Sentry organization slug." + getTurborepoEnvPassthroughWarning("SENTRY_ORG"));
-              } else if (!options.project) {
-                logger.warn("No project provided. Will not upload source maps. Please set the `project` option to your Sentry project slug." + getTurborepoEnvPassthroughWarning("SENTRY_PROJECT"));
+              if (canUploadSourceMaps(options, logger, isDevMode)) {
+                _context15.next = 2;
+                break;
               }
-              _context15.next = 3;
+              return _context15.abrupt("return");
+            case 2:
+              _context15.next = 4;
               return startSpan(
               // This is `forceTransaction`ed because this span is used in dashboards in the form of indexed transactions.
               {
@@ -9143,7 +9140,7 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
                 scope: sentryScope,
                 forceTransaction: true
               }, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
-                var folderToCleanUp, freeUploadDependencyOnBuildArtifacts, _options$sourcemaps2, tmpUploadFolder, assets, globAssets, globResult, debugIdChunkFilePaths, _process$env2;
+                var folderToCleanUp, freeUploadDependencyOnBuildArtifacts, _options$sourcemaps, tmpUploadFolder, assets, globAssets, globResult, debugIdChunkFilePaths, numUploadedFiles, _process$env2;
                 return _regeneratorRuntime().wrap(function _callee14$(_context14) {
                   while (1) switch (_context14.prev = _context14.next) {
                     case 0:
@@ -9180,7 +9177,7 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
                     case 4:
                       tmpUploadFolder = _context14.sent;
                       folderToCleanUp = tmpUploadFolder;
-                      assets = (_options$sourcemaps2 = options.sourcemaps) === null || _options$sourcemaps2 === void 0 ? void 0 : _options$sourcemaps2.assets;
+                      assets = (_options$sourcemaps = options.sourcemaps) === null || _options$sourcemaps === void 0 ? void 0 : _options$sourcemaps.assets;
                       if (assets) {
                         globAssets = assets;
                       } else {
@@ -9192,7 +9189,7 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
                         name: "glob",
                         scope: sentryScope
                       }, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-                        var _options$sourcemaps3;
+                        var _options$sourcemaps2;
                         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
                           while (1) switch (_context8.prev = _context8.next) {
                             case 0:
@@ -9200,7 +9197,7 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
                               return glob.glob(globAssets, {
                                 absolute: true,
                                 nodir: true,
-                                ignore: (_options$sourcemaps3 = options.sourcemaps) === null || _options$sourcemaps3 === void 0 ? void 0 : _options$sourcemaps3.ignore
+                                ignore: (_options$sourcemaps2 = options.sourcemaps) === null || _options$sourcemaps2 === void 0 ? void 0 : _options$sourcemaps2.ignore
                               });
                             case 2:
                               return _context8.abrupt("return", _context8.sent);
@@ -9222,7 +9219,7 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
                         break;
                       }
                       logger.debug("Empty `sourcemaps.assets` option provided. Will not upload sourcemaps with debug ID.");
-                      _context14.next = 24;
+                      _context14.next = 25;
                       break;
                     case 17:
                       if (!(debugIdChunkFilePaths.length === 0)) {
@@ -9230,7 +9227,7 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
                         break;
                       }
                       logger.warn("Didn't find any matching sources for debug ID upload. Please check the `sourcemaps.assets` option.");
-                      _context14.next = 24;
+                      _context14.next = 25;
                       break;
                     case 21:
                       _context14.next = 23;
@@ -9247,12 +9244,12 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
                                 // instead we do it with a maximum of 16 concurrent workers
                                 preparationTasks = debugIdChunkFilePaths.map(function (chunkFilePath, chunkIndex) {
                                   return /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
-                                    var _options$sourcemaps$r, _options$sourcemaps4, _options$sourcemaps5;
+                                    var _options$sourcemaps$r, _options$sourcemaps3, _options$sourcemaps4;
                                     return _regeneratorRuntime().wrap(function _callee9$(_context9) {
                                       while (1) switch (_context9.prev = _context9.next) {
                                         case 0:
                                           _context9.next = 2;
-                                          return prepareBundleForDebugIdUpload(chunkFilePath, tmpUploadFolder, chunkIndex, logger, (_options$sourcemaps$r = (_options$sourcemaps4 = options.sourcemaps) === null || _options$sourcemaps4 === void 0 ? void 0 : _options$sourcemaps4.rewriteSources) !== null && _options$sourcemaps$r !== void 0 ? _options$sourcemaps$r : defaultRewriteSourcesHook, (_options$sourcemaps5 = options.sourcemaps) === null || _options$sourcemaps5 === void 0 ? void 0 : _options$sourcemaps5.resolveSourceMap);
+                                          return prepareBundleForDebugIdUpload(chunkFilePath, tmpUploadFolder, chunkIndex, logger, (_options$sourcemaps$r = (_options$sourcemaps3 = options.sourcemaps) === null || _options$sourcemaps3 === void 0 ? void 0 : _options$sourcemaps3.rewriteSources) !== null && _options$sourcemaps$r !== void 0 ? _options$sourcemaps$r : defaultRewriteSourcesHook, (_options$sourcemaps4 = options.sourcemaps) === null || _options$sourcemaps4 === void 0 ? void 0 : _options$sourcemaps4.resolveSourceMap);
                                         case 2:
                                         case "end":
                                           return _context9.stop();
@@ -9345,7 +9342,10 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
                                               paths: [tmpUploadFolder],
                                               rewrite: false,
                                               dist: options.release.dist
-                                            }]
+                                            }],
+                                            // We want this promise to throw if the sourcemaps fail to upload so that we know about it.
+                                            // see: https://github.com/getsentry/sentry-cli/pull/2605
+                                            live: "rejectOnError"
                                           });
                                         case 3:
                                         case "end":
@@ -9358,6 +9358,8 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
                                   };
                                 }());
                               case 17:
+                                return _context12.abrupt("return", files.length);
+                              case 18:
                               case "end":
                                 return _context12.stop();
                             }
@@ -9368,17 +9370,20 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
                         };
                       }());
                     case 23:
-                      logger.info("Successfully uploaded source maps to Sentry");
-                    case 24:
-                      _context14.next = 30;
+                      numUploadedFiles = _context14.sent;
+                      if (numUploadedFiles > 0) {
+                        logger.info("Successfully uploaded source maps to Sentry");
+                      }
+                    case 25:
+                      _context14.next = 31;
                       break;
-                    case 26:
-                      _context14.prev = 26;
+                    case 27:
+                      _context14.prev = 27;
                       _context14.t0 = _context14["catch"](1);
                       sentryScope.captureException('Error in "debugIdUploadPlugin" writeBundle hook');
                       handleRecoverableError(_context14.t0, false);
-                    case 30:
-                      _context14.prev = 30;
+                    case 31:
+                      _context14.prev = 31;
                       if (folderToCleanUp && !((_process$env2 = process.env) !== null && _process$env2 !== void 0 && _process$env2["SENTRY_TEST_OVERRIDE_TEMP_DIR"])) {
                         void startSpan({
                           name: "cleanup",
@@ -9404,17 +9409,17 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
                         })));
                       }
                       freeUploadDependencyOnBuildArtifacts();
-                      _context14.next = 35;
+                      _context14.next = 36;
                       return safeFlushTelemetry(sentryClient);
-                    case 35:
-                      return _context14.finish(30);
                     case 36:
+                      return _context14.finish(31);
+                    case 37:
                     case "end":
                       return _context14.stop();
                   }
-                }, _callee14, null, [[1, 26, 30, 36]]);
+                }, _callee14, null, [[1, 27, 31, 37]]);
               })));
-            case 3:
+            case 4:
             case "end":
               return _context15.stop();
           }
@@ -9426,13 +9431,13 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
      */
     deleteArtifacts: function deleteArtifacts() {
       return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
-        var _options$sourcemaps6, filesToDelete, filePathsToDelete;
+        var _options$sourcemaps5, filesToDelete, filePathsToDelete;
         return _regeneratorRuntime().wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
               _context16.prev = 0;
               _context16.next = 3;
-              return (_options$sourcemaps6 = options.sourcemaps) === null || _options$sourcemaps6 === void 0 ? void 0 : _options$sourcemaps6.filesToDeleteAfterUpload;
+              return (_options$sourcemaps5 = options.sourcemaps) === null || _options$sourcemaps5 === void 0 ? void 0 : _options$sourcemaps5.filesToDeleteAfterUpload;
             case 3:
               filesToDelete = _context16.sent;
               if (!(filesToDelete !== undefined)) {
@@ -9485,6 +9490,30 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
     createDependencyOnBuildArtifacts: createDependencyOnBuildArtifacts
   };
 }
+function canUploadSourceMaps(options, logger, isDevMode) {
+  var _options$sourcemaps6;
+  if ((_options$sourcemaps6 = options.sourcemaps) !== null && _options$sourcemaps6 !== void 0 && _options$sourcemaps6.disable) {
+    logger.debug("Source map upload was disabled. Will not upload sourcemaps using debug ID process.");
+    return false;
+  }
+  if (isDevMode) {
+    logger.debug("Running in development mode. Will not upload sourcemaps.");
+    return false;
+  }
+  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/" + getTurborepoEnvPassthroughWarning("SENTRY_AUTH_TOKEN"));
+    return false;
+  }
+  if (!options.org && !options.authToken.startsWith("sntrys_")) {
+    logger.warn("No org provided. Will not upload source maps. Please set the `org` option to your Sentry organization slug." + getTurborepoEnvPassthroughWarning("SENTRY_ORG"));
+    return false;
+  }
+  if (!options.project) {
+    logger.warn("No project provided. Will not upload source maps. Please set the `project` option to your Sentry project slug." + getTurborepoEnvPassthroughWarning("SENTRY_PROJECT"));
+    return false;
+  }
+  return true;
+}
 
 /**
  * Creates an unplugin instance used to create Sentry plugins for Vite, Rollup, esbuild, and Webpack.
@@ -9580,13 +9609,13 @@ function sentryUnpluginFactory(_ref) {
     });
     if (!((_options$sourcemaps = options.sourcemaps) !== null && _options$sourcemaps !== void 0 && _options$sourcemaps.disable)) {
       plugins.push(debugIdInjectionPlugin(logger));
-    }
 
-    // This option is only strongly typed for the webpack plugin, where it is used. It has no effect on other plugins
-    var webpack_forceExitOnBuildComplete = typeof options._experiments["forceExitOnBuildCompletion"] === "boolean" ? options._experiments["forceExitOnBuildCompletion"] : undefined;
-    plugins.push(debugIdUploadPlugin(createDebugIdUploadFunction({
-      sentryBuildPluginManager: sentryBuildPluginManager
-    }), logger, sentryBuildPluginManager.createDependencyOnBuildArtifacts, webpack_forceExitOnBuildComplete));
+      // This option is only strongly typed for the webpack plugin, where it is used. It has no effect on other plugins
+      var _webpack_forceExitOnBuildComplete = typeof options._experiments["forceExitOnBuildCompletion"] === "boolean" ? options._experiments["forceExitOnBuildCompletion"] : undefined;
+      plugins.push(debugIdUploadPlugin(createDebugIdUploadFunction({
+        sentryBuildPluginManager: sentryBuildPluginManager
+      }), logger, sentryBuildPluginManager.createDependencyOnBuildArtifacts, _webpack_forceExitOnBuildComplete));
+    }
     if (options.reactComponentAnnotation) {
       if (!options.reactComponentAnnotation.enabled) {
         logger.debug("The component name annotate plugin is currently disabled. Skipping component name annotations.");
@@ -9620,23 +9649,11 @@ function sentryUnpluginFactory(_ref) {
 }
 
 /**
- * @deprecated
+ * @deprecated This will be removed in v4
  */
-// TODO(v4): Don't export this from the package
-function getBuildInformation() {
-  var packageJson = getPackageJson();
-  var _ref2 = packageJson ? getDependencies(packageJson) : {
-      deps: [],
-      depsVersions: {}
-    },
-    deps = _ref2.deps,
-    depsVersions = _ref2.depsVersions;
-  return {
-    deps: deps,
-    depsVersions: depsVersions,
-    nodeVersion: parseMajorVersion(process.version)
-  };
-}
+// TODO(v4): Don't export this from the package but keep the utils version
+// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+var getBuildInformation = getBuildInformation$1;
 
 /**
  * Determines whether the Sentry CLI binary is in its expected location.
@@ -9709,6 +9726,13 @@ function createRollupBundleSizeOptimizationHooks(replacementValues) {
 var COMMENT_USE_STRICT_REGEX =
 // Note: CodeQL complains that this regex potentially has n^2 runtime. This likely won't affect realistic files.
 /^(?:\s*|\/\*(?:.|\r|\n)*?\*\/|\/\/.*[\n\r])*(?:"[^"]*";|'[^']*';)?/;
+
+/**
+ * Simplified `renderChunk` hook type from Rollup.
+ * We can't reference the type directly because the Vite plugin complains
+ * about type mismatches
+ */
+
 function createRollupDebugIdInjectionHooks() {
   return {
     renderChunk: function renderChunk(code, chunk) {