disable hook for webpack and move flag to experimental

Author: chargome

packages/nextjs/package.json

@@ -79,14 +79,14 @@
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/semantic-conventions": "^1.34.0",
     "@rollup/plugin-commonjs": "28.0.1",
-    "@sentry/bundler-plugin-core": "^4.1.0",
+    "@sentry/bundler-plugin-core": "^4.2.0",
     "@sentry-internal/browser-utils": "10.8.0",
     "@sentry/core": "10.8.0",
     "@sentry/node": "10.8.0",
     "@sentry/opentelemetry": "10.8.0",
     "@sentry/react": "10.8.0",
     "@sentry/vercel-edge": "10.8.0",
-    "@sentry/webpack-plugin": "^4.1.1",
+    "@sentry/webpack-plugin": "^4.2.0",
     "chalk": "3.0.0",
     "glob": "^11.0.3",
     "resolve": "1.22.8",

packages/nextjs/src/config/handleRunAfterProductionCompile.ts

@@ -17,6 +17,12 @@ export async function handleRunAfterProductionCompile(
     console.debug('[@sentry/nextjs] Running runAfterProductionCompile logic.');
   }
 
+  // We don't want to do anything for webpack at this point because the plugin already handles this
+  // TODO: Actually implement this for webpack as well
+  if (buildTool === 'webpack') {
+    return;
+  }
+
   const { createSentryBuildPluginManager } =
     loadModule<{ createSentryBuildPluginManager: typeof createSentryBuildPluginManagerType }>(
       '@sentry/bundler-plugin-core',
@@ -57,6 +63,9 @@ export async function handleRunAfterProductionCompile(
   await sentryBuildPluginManager.telemetry.emitBundlerPluginExecutionSignal();
   await sentryBuildPluginManager.createRelease();
   await sentryBuildPluginManager.injectDebugIds(buildArtifacts);
-  await sentryBuildPluginManager.uploadSourcemaps(buildArtifacts);
+  await sentryBuildPluginManager.uploadSourcemaps(buildArtifacts, {
+    // We don't want to prepare the artifacts because we injected debug ids manually before
+    prepareArtifacts: true,
+  });
   await sentryBuildPluginManager.deleteArtifacts();
 }

packages/nextjs/src/config/types.ts

@@ -501,22 +501,22 @@ export type SentryBuildOptions = {
    */
   disableSentryWebpackConfig?: boolean;
 
-  /**
-   * When true (and Next.js >= 15), use the runAfterProductionCompile hook to consolidate sourcemap uploads
-   * into a single operation after all webpack/turbopack builds complete, reducing build time.
-   *
-   * When false, use the traditional approach of uploading sourcemaps during each webpack build.
-   *
-   * @default false
-   */
-  useRunAfterProductionCompileHook?: boolean;
 
   /**
    * Contains a set of experimental flags that might change in future releases. These flags enable
    * features that are still in development and may be modified, renamed, or removed without notice.
    * Use with caution in production environments.
-   */
-  _experimental?: Partial<{
+  */
+ _experimental?: Partial<{
+    /**
+     * When true (and Next.js >= 15), use the runAfterProductionCompile hook to consolidate sourcemap uploads
+     * into a single operation after all webpack/turbopack builds complete, reducing build time.
+     *
+     * When false, use the traditional approach of uploading sourcemaps during each webpack build.
+     *
+     * @default false
+     */
+    useRunAfterProductionCompileHook?: boolean;
     thirdPartyOriginStackFrames: boolean;
   }>;
 };

packages/nextjs/src/config/webpackPluginOptions.ts

@@ -70,10 +70,7 @@ export function getWebpackPluginOptions(
     silent: sentryBuildOptions.silent,
     url: sentryBuildOptions.sentryUrl,
     sourcemaps: {
-      // if the user has enabled the runAfterProductionCompileHook, we handle sourcemap uploads a later step
-      disable: sentryBuildOptions.useRunAfterProductionCompileHook
-        ? 'disable-upload'
-        : sentryBuildOptions.sourcemaps?.disable,
+      disable: sentryBuildOptions.sourcemaps?.disable,
       rewriteSources(source) {
         if (source.startsWith('webpack://_N_E/')) {
           return source.replace('webpack://_N_E/', '');
@@ -98,8 +95,7 @@ export function getWebpackPluginOptions(
       ...sentryBuildOptions.unstable_sentryWebpackPluginOptions?.sourcemaps,
     },
     release:
-      // if the user has enabled the runAfterProductionCompileHook, we handle release creation a later step
-      releaseName !== undefined && !sentryBuildOptions.useRunAfterProductionCompileHook
+      releaseName !== undefined
         ? {
             inject: false, // The webpack plugin's release injection breaks the `app` directory - we inject the release manually with the value injection loader instead.
             name: releaseName,

packages/nextjs/src/config/withSentryConfig.ts

@@ -294,7 +294,7 @@ function getFinalConfigObject(
     }
   }
 
-  if (userSentryOptions.useRunAfterProductionCompileHook === true && supportsProductionCompileHook()) {
+  if (userSentryOptions?._experimental?.useRunAfterProductionCompileHook === true && supportsProductionCompileHook()) {
     if (incomingUserNextConfigObject?.compiler?.runAfterProductionCompile === undefined) {
       incomingUserNextConfigObject.compiler ??= {};
       incomingUserNextConfigObject.compiler.runAfterProductionCompile = async ({ distDir }) => {

yarn.lock

@@ -6941,7 +6941,12 @@
   resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-4.1.1.tgz#371415afc602f6b2ba0987b51123bd34d1603193"
   integrity sha512-HUpqrCK7zDVojTV6KL6BO9ZZiYrEYQqvYQrscyMsq04z+WCupXaH6YEliiNRvreR8DBJgdsG3lBRpebhUGmvfA==
 
-"@sentry/[email protected]", "@sentry/bundler-plugin-core@^4.1.0":
+"@sentry/[email protected]":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-4.2.0.tgz#6c616e6d645f49f15f83b891ef42a795ba4dbb3f"
+  integrity sha512-GFpS3REqaHuyX4LCNqlneAQZIKyHb5ePiI1802n0fhtYjk68I1DTQ3PnbzYi50od/vAsTQVCknaS5F6tidNqTQ==
+
+"@sentry/[email protected]":
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/@sentry/bundler-plugin-core/-/bundler-plugin-core-4.1.0.tgz#c1b2f7a890a44e5ac5decc984a133aacf6147dd4"
   integrity sha512-/5XBtCF6M+9frEXrrvfSWOdOC2q6I1L7oY7qbUVegNkp3kYVGihNZZnJIXGzo9rmwnA0IV7jI3o0pF/HDRqPeA==
@@ -6969,6 +6974,20 @@
     magic-string "0.30.8"
     unplugin "1.0.1"
 
+"@sentry/[email protected]", "@sentry/bundler-plugin-core@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@sentry/bundler-plugin-core/-/bundler-plugin-core-4.2.0.tgz#b607937f7cd0a769aa26974c4af3fca94abad63f"
+  integrity sha512-EDG6ELSEN/Dzm4KUQOynoI2suEAdPdgwaBXVN4Ww705zdrYT79OGh51rkz74KGhovt7GukaPf0Z9LJwORXUbhg==
+  dependencies:
+    "@babel/core" "^7.18.5"
+    "@sentry/babel-plugin-component-annotate" "4.2.0"
+    "@sentry/cli" "^2.51.0"
+    dotenv "^16.3.1"
+    find-up "^5.0.0"
+    glob "^9.3.2"
+    magic-string "0.30.8"
+    unplugin "1.0.1"
+
 "@sentry/[email protected]":
   version "2.52.0"
   resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.52.0.tgz#05178cd819c2a33eb22a6e90bf7bb8f853f1b476"
@@ -7054,6 +7073,15 @@
     unplugin "1.0.1"
     uuid "^9.0.0"
 
+"@sentry/webpack-plugin@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-4.2.0.tgz#00b89aeb1261ae15f7bc81ee9e5b5a23ca3d2dbf"
+  integrity sha512-2lPuvJhbiEOd/NAQv5EL8at9QVKchkEmWFDioDsOG6csFqbZ8hdWtTcbsXnhzH9j+CM1LmdeDNVjIF+SMoxCNg==
+  dependencies:
+    "@sentry/bundler-plugin-core" "4.2.0"
+    unplugin "1.0.1"
+    uuid "^9.0.0"
+
 "@sigstore/protobuf-specs@^0.1.0":
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz#957cb64ea2f5ce527cc9cf02a096baeb0d2b99b4"