Merge remote-tracking branch 'upstream/main' into timfish/feat/rolldown-build

Author: timfish

packages/bundler-plugin-core/package.json

@@ -60,8 +60,7 @@
     "dotenv": "^16.3.1",
     "find-up": "^5.0.0",
     "glob": "^10.5.0",
-    "magic-string": "0.30.8",
-    "unplugin": "1.0.1"
+    "magic-string": "0.30.8"
   },
   "devDependencies": {
     "@sentry-internal/eslint-config": "4.9.1",

packages/bundler-plugin-core/src/build-plugin-manager.ts

@@ -30,6 +30,16 @@ import { glob } from "glob";
 import { defaultRewriteSourcesHook, prepareBundleForDebugIdUpload } from "./debug-id-upload";
 import { LIB_VERSION } from "./version";
 
+// Module-level guard to prevent duplicate deploy records when multiple bundler plugin
+// instances run in the same process (e.g. Next.js creates separate webpack compilers
+// for client, server, and edge). Keyed by release name.
+const _deployedReleases = new Set<string>();
+
+/** @internal Exported for testing only. */
+export function _resetDeployedReleasesForTesting(): void {
+  _deployedReleases.clear();
+}
+
 export type SentryBuildPluginManager = {
   /**
    * A logger instance that takes the options passed to the build plugin manager into account. (for silencing and log level etc.)
@@ -533,8 +543,9 @@ export function createSentryBuildPluginManager(
           await cliInstance.releases.finalize(options.release.name);
         }
 
-        if (options.release.deploy) {
+        if (options.release.deploy && !_deployedReleases.has(options.release.name)) {
           await cliInstance.releases.newDeploy(options.release.name, options.release.deploy);
+          _deployedReleases.add(options.release.name);
         }
       } catch (e) {
         sentryScope.captureException('Error in "releaseManagementPlugin" writeBundle hook');