@sentry/bundler-plugin-core 4.2.0 → 4.3.0

package/dist/cjs/index.js

@@ -8102,7 +8102,7 @@ function normalizeUserOptions(userOptions) {
  * @returns `true` if the options are valid, `false` otherwise
  */
 function validateOptions(options, logger) {
-  var _options$release, _options$release2, _options$release3;
+  var _options$release, _options$release2;
   var setCommits = (_options$release = options.release) === null || _options$release === void 0 ? void 0 : _options$release.setCommits;
   if (setCommits) {
     if (!setCommits.auto && !(setCommits.repo && setCommits.commit)) {
@@ -8113,7 +8113,7 @@ function validateOptions(options, logger) {
       logger.warn("The `setCommits` options includes `auto` but also `repo` and `commit`.", "Ignoring `repo` and `commit`.", "Please only set either `auto` or both, `repo` and `commit`.");
     }
   }
-  if ((_options$release2 = options.release) !== null && _options$release2 !== void 0 && _options$release2.deploy && !((_options$release3 = options.release) !== null && _options$release3 !== void 0 && _options$release3.deploy.env)) {
+  if ((_options$release2 = options.release) !== null && _options$release2 !== void 0 && _options$release2.deploy && _typeof(options.release.deploy) === "object" && !options.release.deploy.env) {
     logger.error("The `deploy` option was specified but is missing the required `env` property.", "Please set the `env` property.");
     return false;
   }
@@ -8307,7 +8307,7 @@ function createSentryInstance(options, shouldSendTelemetry, buildTool) {
     dsn: "https://4c2bae7d9fbc413e8f7385f55c515d51@o1.ingest.sentry.io/6690737",
     tracesSampleRate: 1,
     sampleRate: 1,
-    release: "4.2.0",
+    release: "4.3.0",
     integrations: [],
     tracePropagationTargets: ["sentry.io/api"],
     stackParser: stackParser,
@@ -8910,7 +8910,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/", "4.2.0");
+  process.env["SENTRY_PIPELINE"] = "".concat(bundlerPluginMetaContext.buildTool, "-plugin/", "4.3.0");
 
   // 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
@@ -9313,6 +9313,8 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
      */
     uploadSourcemaps: function uploadSourcemaps(buildArtifactPaths, opts) {
       return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
+        var _options$sourcemaps;
+        var assets;
         return _regeneratorRuntime().wrap(function _callee19$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
             case 0:
@@ -9322,7 +9324,16 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
               }
               return _context19.abrupt("return");
             case 2:
-              _context19.next = 4;
+              // Early exit if assets is explicitly set to an empty array
+              assets = (_options$sourcemaps = options.sourcemaps) === null || _options$sourcemaps === void 0 ? void 0 : _options$sourcemaps.assets;
+              if (!(Array.isArray(assets) && assets.length === 0)) {
+                _context19.next = 6;
+                break;
+              }
+              logger.debug("Empty `sourcemaps.assets` option provided. Will not upload sourcemaps with debug ID.");
+              return _context19.abrupt("return");
+            case 6:
+              _context19.next = 8;
               return startSpan(
               // This is `forceTransaction`ed because this span is used in dashboards in the form of indexed transactions.
               {
@@ -9331,7 +9342,7 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
                 forceTransaction: true
               }, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
                 var _opts$prepareArtifact;
-                var shouldPrepare, folderToCleanUp, freeUploadDependencyOnBuildArtifacts, _options$sourcemaps, assets, globAssets, globResult, debugIdChunkFilePaths, tmpUploadFolder, _process$env2;
+                var shouldPrepare, folderToCleanUp, freeUploadDependencyOnBuildArtifacts, _options$sourcemaps2, _options$sourcemaps3, _options$sourcemaps4, _options$sourcemaps5, pathsToUpload, ignorePaths, globAssets, globResult, debugIdChunkFilePaths, tmpUploadFolder, _process$env2;
                 return _regeneratorRuntime().wrap(function _callee18$(_context18) {
                   while (1) switch (_context18.prev = _context18.next) {
                     case 0:
@@ -9341,96 +9352,100 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
                       // Therefore we need to actually register the execution of this hook as dependency on the sourcemap files.
                       freeUploadDependencyOnBuildArtifacts = createDependencyOnBuildArtifacts();
                       _context18.prev = 2;
-                      assets = (_options$sourcemaps = options.sourcemaps) === null || _options$sourcemaps === void 0 ? void 0 : _options$sourcemaps.assets;
+                      if (shouldPrepare) {
+                        _context18.next = 11;
+                        break;
+                      }
+                      // Direct CLI upload from existing artifact paths (no globbing, no preparation)
+
                       if (assets) {
-                        globAssets = assets;
+                        pathsToUpload = Array.isArray(assets) ? assets : [assets];
+                        logger.debug("Direct upload mode: passing user-provided assets directly to CLI: ".concat(pathsToUpload.join(", ")));
                       } else {
-                        logger.debug("No `sourcemaps.assets` option provided, falling back to uploading detected build artifacts.");
-                        globAssets = buildArtifactPaths;
+                        // Use original paths e.g. like ['.next/server'] directly –> preferred way when no globbing is done
+                        pathsToUpload = buildArtifactPaths;
                       }
-                      _context18.next = 7;
+                      ignorePaths = (_options$sourcemaps2 = options.sourcemaps) !== null && _options$sourcemaps2 !== void 0 && _options$sourcemaps2.ignore ? Array.isArray((_options$sourcemaps3 = options.sourcemaps) === null || _options$sourcemaps3 === void 0 ? void 0 : _options$sourcemaps3.ignore) ? (_options$sourcemaps4 = options.sourcemaps) === null || _options$sourcemaps4 === void 0 ? void 0 : _options$sourcemaps4.ignore : [(_options$sourcemaps5 = options.sourcemaps) === null || _options$sourcemaps5 === void 0 ? void 0 : _options$sourcemaps5.ignore] : [];
+                      _context18.next = 8;
                       return startSpan({
-                        name: "glob",
+                        name: "upload",
                         scope: sentryScope
                       }, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
-                        var _options$sourcemaps2;
+                        var _options$release$name;
+                        var cliInstance;
                         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
                           while (1) switch (_context10.prev = _context10.next) {
                             case 0:
-                              _context10.next = 2;
-                              return glob.glob(globAssets, {
-                                absolute: true,
-                                // If we do not use a temp folder, we allow directories and files; CLI will traverse as needed when given paths.
-                                nodir: shouldPrepare,
-                                ignore: (_options$sourcemaps2 = options.sourcemaps) === null || _options$sourcemaps2 === void 0 ? void 0 : _options$sourcemaps2.ignore
+                              cliInstance = createCliInstance(options);
+                              _context10.next = 3;
+                              return cliInstance.releases.uploadSourceMaps((_options$release$name = options.release.name) !== null && _options$release$name !== void 0 ? _options$release$name : "undefined", {
+                                include: [{
+                                  paths: pathsToUpload,
+                                  rewrite: true,
+                                  dist: options.release.dist
+                                }],
+                                ignore: ignorePaths,
+                                live: "rejectOnError"
                               });
-                            case 2:
-                              return _context10.abrupt("return", _context10.sent);
                             case 3:
                             case "end":
                               return _context10.stop();
                           }
                         }, _callee10);
                       })));
-                    case 7:
-                      globResult = _context18.sent;
-                      debugIdChunkFilePaths = shouldPrepare ? globResult.filter(function (debugIdChunkFilePath) {
-                        return !!stripQueryAndHashFromPath(debugIdChunkFilePath).match(/\.(js|mjs|cjs)$/);
-                      }) : globResult; // 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)) {
-                        _context18.next = 14;
-                        break;
-                      }
-                      logger.debug("Empty `sourcemaps.assets` option provided. Will not upload sourcemaps with debug ID.");
-                      _context18.next = 31;
-                      break;
-                    case 14:
-                      if (!(debugIdChunkFilePaths.length === 0)) {
-                        _context18.next = 18;
-                        break;
-                      }
-                      logger.warn("Didn't find any matching sources for debug ID upload. Please check the `sourcemaps.assets` option.");
-                      _context18.next = 31;
+                    case 8:
+                      logger.info("Successfully uploaded source maps to Sentry");
+                      _context18.next = 28;
                       break;
-                    case 18:
-                      if (shouldPrepare) {
-                        _context18.next = 24;
-                        break;
+                    case 11:
+                      // Prepare artifacts in temp folder before uploading
+
+                      if (assets) {
+                        globAssets = assets;
+                      } else {
+                        logger.debug("No `sourcemaps.assets` option provided, falling back to uploading detected build artifacts.");
+                        globAssets = buildArtifactPaths;
                       }
-                      _context18.next = 21;
+                      _context18.next = 14;
                       return startSpan({
-                        name: "upload",
+                        name: "glob",
                         scope: sentryScope
                       }, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
-                        var _options$release$name;
-                        var cliInstance;
+                        var _options$sourcemaps6;
                         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
                           while (1) switch (_context11.prev = _context11.next) {
                             case 0:
-                              cliInstance = createCliInstance(options);
-                              _context11.next = 3;
-                              return cliInstance.releases.uploadSourceMaps((_options$release$name = options.release.name) !== null && _options$release$name !== void 0 ? _options$release$name : "undefined", {
-                                include: [{
-                                  paths: debugIdChunkFilePaths,
-                                  rewrite: false,
-                                  dist: options.release.dist
-                                }],
-                                live: "rejectOnError"
+                              _context11.next = 2;
+                              return glob.glob(globAssets, {
+                                absolute: true,
+                                nodir: true,
+                                // We need individual files for preparation
+                                ignore: (_options$sourcemaps6 = options.sourcemaps) === null || _options$sourcemaps6 === void 0 ? void 0 : _options$sourcemaps6.ignore
                               });
+                            case 2:
+                              return _context11.abrupt("return", _context11.sent);
                             case 3:
                             case "end":
                               return _context11.stop();
                           }
                         }, _callee11);
                       })));
-                    case 21:
-                      logger.info("Successfully uploaded source maps to Sentry");
-                      _context18.next = 31;
+                    case 14:
+                      globResult = _context18.sent;
+                      debugIdChunkFilePaths = globResult.filter(function (debugIdChunkFilePath) {
+                        return !!stripQueryAndHashFromPath(debugIdChunkFilePath).match(/\.(js|mjs|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 (!(debugIdChunkFilePaths.length === 0)) {
+                        _context18.next = 21;
+                        break;
+                      }
+                      logger.warn("Didn't find any matching sources for debug ID upload. Please check the `sourcemaps.assets` option.");
+                      _context18.next = 28;
                       break;
-                    case 24:
-                      _context18.next = 26;
+                    case 21:
+                      _context18.next = 23;
                       return startSpan({
                         name: "mkdtemp",
                         scope: sentryScope
@@ -9456,12 +9471,12 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
                           }
                         }, _callee12);
                       })));
-                    case 26:
+                    case 23:
                       tmpUploadFolder = _context18.sent;
                       folderToCleanUp = tmpUploadFolder;
 
                       // Prepare into temp folder, then upload
-                      _context18.next = 30;
+                      _context18.next = 27;
                       return startSpan({
                         name: "prepare-bundles",
                         scope: sentryScope
@@ -9475,12 +9490,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 _callee13() {
-                                    var _options$sourcemaps$r, _options$sourcemaps3, _options$sourcemaps4;
+                                    var _options$sourcemaps$r, _options$sourcemaps7, _options$sourcemaps8;
                                     return _regeneratorRuntime().wrap(function _callee13$(_context13) {
                                       while (1) switch (_context13.prev = _context13.next) {
                                         case 0:
                                           _context13.next = 2;
-                                          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);
+                                          return prepareBundleForDebugIdUpload(chunkFilePath, tmpUploadFolder, chunkIndex, logger, (_options$sourcemaps$r = (_options$sourcemaps7 = options.sourcemaps) === null || _options$sourcemaps7 === void 0 ? void 0 : _options$sourcemaps7.rewriteSources) !== null && _options$sourcemaps$r !== void 0 ? _options$sourcemaps$r : defaultRewriteSourcesHook, (_options$sourcemaps8 = options.sourcemaps) === null || _options$sourcemaps8 === void 0 ? void 0 : _options$sourcemaps8.resolveSourceMap);
                                         case 2:
                                         case "end":
                                           return _context13.stop();
@@ -9577,18 +9592,18 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
                           return _ref6.apply(this, arguments);
                         };
                       }());
-                    case 30:
+                    case 27:
                       logger.info("Successfully uploaded source maps to Sentry");
-                    case 31:
-                      _context18.next = 37;
+                    case 28:
+                      _context18.next = 34;
                       break;
-                    case 33:
-                      _context18.prev = 33;
+                    case 30:
+                      _context18.prev = 30;
                       _context18.t0 = _context18["catch"](2);
                       sentryScope.captureException('Error in "debugIdUploadPlugin" writeBundle hook');
                       handleRecoverableError(_context18.t0, false);
-                    case 37:
-                      _context18.prev = 37;
+                    case 34:
+                      _context18.prev = 34;
                       if (folderToCleanUp && !((_process$env2 = process.env) !== null && _process$env2 !== void 0 && _process$env2["SENTRY_TEST_OVERRIDE_TEMP_DIR"])) {
                         void startSpan({
                           name: "cleanup",
@@ -9614,17 +9629,17 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
                         })));
                       }
                       freeUploadDependencyOnBuildArtifacts();
-                      _context18.next = 42;
+                      _context18.next = 39;
                       return safeFlushTelemetry(sentryClient);
-                    case 42:
-                      return _context18.finish(37);
-                    case 43:
+                    case 39:
+                      return _context18.finish(34);
+                    case 40:
                     case "end":
                       return _context18.stop();
                   }
-                }, _callee18, null, [[2, 33, 37, 43]]);
+                }, _callee18, null, [[2, 30, 34, 40]]);
               })));
-            case 4:
+            case 8:
             case "end":
               return _context19.stop();
           }
@@ -9636,13 +9651,13 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
      */
     deleteArtifacts: function deleteArtifacts() {
       return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
-        var _options$sourcemaps5, filesToDelete, filePathsToDelete;
+        var _options$sourcemaps9, filesToDelete, filePathsToDelete;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
             case 0:
               _context20.prev = 0;
               _context20.next = 3;
-              return (_options$sourcemaps5 = options.sourcemaps) === null || _options$sourcemaps5 === void 0 ? void 0 : _options$sourcemaps5.filesToDeleteAfterUpload;
+              return (_options$sourcemaps9 = options.sourcemaps) === null || _options$sourcemaps9 === void 0 ? void 0 : _options$sourcemaps9.filesToDeleteAfterUpload;
             case 3:
               filesToDelete = _context20.sent;
               if (!(filesToDelete !== undefined)) {
@@ -9696,8 +9711,8 @@ function createSentryBuildPluginManager(userOptions, bundlerPluginMetaContext) {
   };
 }
 function canUploadSourceMaps(options, logger, isDevMode) {
-  var _options$sourcemaps6;
-  if ((_options$sourcemaps6 = options.sourcemaps) !== null && _options$sourcemaps6 !== void 0 && _options$sourcemaps6.disable) {
+  var _options$sourcemaps10;
+  if ((_options$sourcemaps10 = options.sourcemaps) !== null && _options$sourcemaps10 !== void 0 && _options$sourcemaps10.disable) {
     logger.debug("Source map upload was disabled. Will not upload sourcemaps using debug ID process.");
     return false;
   }