use cli for webpack

chargome · chargome · commit ca81ae00bd64 · 2025-09-17T13:14:50.000+02:00
diff --git a/packages/nextjs/src/config/getBuildPluginOptions.ts b/packages/nextjs/src/config/getBuildPluginOptions.ts
@@ -81,7 +81,8 @@ export function getBuildPluginOptions({
       );
 
       // File deletion for webpack client builds
-      if (sentryBuildOptions.sourcemaps?.deleteSourcemapsAfterUpload) {
+      // If the user has opted into using the experimental hook, we delete the source maps in the hook instead
+      if (sentryBuildOptions.sourcemaps?.deleteSourcemapsAfterUpload && !useRunAfterProductionCompileHook) {
         filesToDeleteAfterUpload.push(
           // We only care to delete client bundle source maps because they would be the ones being served.
           // Removing the server source maps crashes Vercel builds for (thus far) unknown reasons:
@@ -94,8 +95,7 @@ export function getBuildPluginOptions({
     }
   }
 
-  // If the user has opted into using the experimental hook, we skip sourcemaps and release management in the plugin
-  // to avoid double sourcemap uploads.
+  // If the user has opted into using the experimental hook, we skip sourcemap uploads in the plugin
   const shouldSkipSourcemapsUpload = useRunAfterProductionCompileHook && buildTool.startsWith('webpack');
 
   return {
@@ -116,7 +116,7 @@ export function getBuildPluginOptions({
     silent: sentryBuildOptions.silent,
     url: sentryBuildOptions.sentryUrl,
     sourcemaps: {
-      disable: sentryBuildOptions.sourcemaps?.disable || shouldSkipSourcemapsUpload,
+      disable: shouldSkipSourcemapsUpload ? true : (sentryBuildOptions.sourcemaps?.disable ?? false),
       rewriteSources(source) {
         if (source.startsWith('webpack://_N_E/')) {
           return source.replace('webpack://_N_E/', '');
diff --git a/packages/nextjs/src/config/webpack.ts b/packages/nextjs/src/config/webpack.ts
@@ -40,13 +40,21 @@ let showedMissingGlobalErrorWarningMsg = false;
  * @param userSentryOptions The user's SentryWebpackPlugin config, as passed to `withSentryConfig`
  * @returns The function to set as the nextjs config's `webpack` value
  */
-export function constructWebpackConfigFunction(
-  userNextConfig: NextConfigObject = {},
-  userSentryOptions: SentryBuildOptions = {},
-  releaseName: string | undefined,
-  routeManifest: RouteManifest | undefined,
-  nextJsVersion: string | undefined,
-): WebpackConfigFunction {
+export function constructWebpackConfigFunction({
+  userNextConfig = {},
+  userSentryOptions = {},
+  releaseName,
+  routeManifest,
+  nextJsVersion,
+  useRunAfterProductionCompileHook,
+}: {
+  userNextConfig: NextConfigObject;
+  userSentryOptions: SentryBuildOptions;
+  releaseName: string | undefined;
+  routeManifest: RouteManifest | undefined;
+  nextJsVersion: string | undefined;
+  useRunAfterProductionCompileHook: boolean | undefined;
+}): WebpackConfigFunction {
   // Will be called by nextjs and passed its default webpack configuration and context data about the build (whether
   // we're building server or client, whether we're in dev, what version of webpack we're using, etc). Note that
   // `incomingConfig` and `buildContext` are referred to as `config` and `options` in the nextjs docs.
@@ -420,6 +428,7 @@ export function constructWebpackConfigFunction(
             releaseName,
             distDirAbsPath,
             buildTool,
+            useRunAfterProductionCompileHook,
           }),
         );
 
diff --git a/packages/nextjs/src/config/withSentryConfig.ts b/packages/nextjs/src/config/withSentryConfig.ts
@@ -368,13 +368,14 @@ function getFinalConfigObject(
     webpack:
       isTurbopack || userSentryOptions.disableSentryWebpackConfig
         ? incomingUserNextConfigObject.webpack // just return the original webpack config
-        : constructWebpackConfigFunction(
-            incomingUserNextConfigObject,
+        : constructWebpackConfigFunction({
+            userNextConfig: incomingUserNextConfigObject,
             userSentryOptions,
             releaseName,
             routeManifest,
             nextJsVersion,
-          ),
+            useRunAfterProductionCompileHook: userSentryOptions._experimental?.useRunAfterProductionCompileHook,
+          }),
     ...(isTurbopackSupported && isTurbopack
       ? {
           turbopack: constructTurbopackConfig({
diff --git a/packages/nextjs/test/config/getBuildPluginOptions.test.ts b/packages/nextjs/test/config/getBuildPluginOptions.test.ts
@@ -618,7 +618,7 @@ describe('getBuildPluginOptions', () => {
       });
 
       expect(result.sourcemaps).toMatchObject({
-        disable: undefined,
+        disable: false,
         assets: ['/path/to/.next/**'],
         ignore: [],
         filesToDeleteAfterUpload: undefined,
diff --git a/packages/nextjs/test/config/testUtils.ts b/packages/nextjs/test/config/testUtils.ts
@@ -56,6 +56,10 @@ export async function materializeFinalWebpackConfig(options: {
   incomingWebpackConfig: WebpackConfigObject;
   incomingWebpackBuildContext: BuildContext;
   sentryBuildTimeOptions?: SentryBuildOptions;
+  releaseName?: string;
+  routeManifest?: any;
+  nextJsVersion?: string;
+  useRunAfterProductionCompileHook?: boolean;
 }): Promise<WebpackConfigObjectWithModuleRules> {
   const { exportedNextConfig, incomingWebpackConfig, incomingWebpackBuildContext } = options;
 
@@ -66,11 +70,14 @@ export async function materializeFinalWebpackConfig(options: {
       : exportedNextConfig;
 
   // get the webpack config function we'd normally pass back to next
-  const webpackConfigFunction = constructWebpackConfigFunction(
-    materializedUserNextConfig,
-    options.sentryBuildTimeOptions,
-    undefined,
-  );
+  const webpackConfigFunction = constructWebpackConfigFunction({
+    userNextConfig: materializedUserNextConfig,
+    userSentryOptions: options.sentryBuildTimeOptions || {},
+    releaseName: options.releaseName,
+    routeManifest: options.routeManifest,
+    nextJsVersion: options.nextJsVersion,
+    useRunAfterProductionCompileHook: options.useRunAfterProductionCompileHook ?? options.sentryBuildTimeOptions?._experimental?.useRunAfterProductionCompileHook,
+  });
 
   // call it to get concrete values for comparison
   const finalWebpackConfigValue = webpackConfigFunction(incomingWebpackConfig, incomingWebpackBuildContext);
diff --git a/packages/nextjs/test/config/webpack/constructWebpackConfig.test.ts b/packages/nextjs/test/config/webpack/constructWebpackConfig.test.ts
@@ -87,6 +87,86 @@ describe('constructWebpackConfigFunction()', () => {
     getBuildPluginOptionsSpy.mockRestore();
   });
 
+  it('passes useRunAfterProductionCompileHook to getBuildPluginOptions when enabled', async () => {
+    const getBuildPluginOptionsSpy = vi.spyOn(getBuildPluginOptionsModule, 'getBuildPluginOptions');
+    vi.spyOn(core, 'loadModule').mockImplementation(() => ({
+      sentryWebpackPlugin: () => ({
+        _name: 'sentry-webpack-plugin',
+      }),
+    }));
+
+    await materializeFinalWebpackConfig({
+      exportedNextConfig,
+      incomingWebpackConfig: serverWebpackConfig,
+      incomingWebpackBuildContext: serverBuildContext,
+      sentryBuildTimeOptions: {
+        _experimental: {
+          useRunAfterProductionCompileHook: true,
+        },
+      },
+    });
+
+    expect(getBuildPluginOptionsSpy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        useRunAfterProductionCompileHook: true,
+      }),
+    );
+
+    getBuildPluginOptionsSpy.mockRestore();
+  });
+
+  it('passes useRunAfterProductionCompileHook to getBuildPluginOptions when disabled', async () => {
+    const getBuildPluginOptionsSpy = vi.spyOn(getBuildPluginOptionsModule, 'getBuildPluginOptions');
+    vi.spyOn(core, 'loadModule').mockImplementation(() => ({
+      sentryWebpackPlugin: () => ({
+        _name: 'sentry-webpack-plugin',
+      }),
+    }));
+
+    await materializeFinalWebpackConfig({
+      exportedNextConfig,
+      incomingWebpackConfig: serverWebpackConfig,
+      incomingWebpackBuildContext: serverBuildContext,
+      sentryBuildTimeOptions: {
+        _experimental: {
+          useRunAfterProductionCompileHook: false,
+        },
+      },
+    });
+
+    expect(getBuildPluginOptionsSpy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        useRunAfterProductionCompileHook: false,
+      }),
+    );
+
+    getBuildPluginOptionsSpy.mockRestore();
+  });
+
+  it('passes useRunAfterProductionCompileHook as undefined when not specified', async () => {
+    const getBuildPluginOptionsSpy = vi.spyOn(getBuildPluginOptionsModule, 'getBuildPluginOptions');
+    vi.spyOn(core, 'loadModule').mockImplementation(() => ({
+      sentryWebpackPlugin: () => ({
+        _name: 'sentry-webpack-plugin',
+      }),
+    }));
+
+    await materializeFinalWebpackConfig({
+      exportedNextConfig,
+      incomingWebpackConfig: serverWebpackConfig,
+      incomingWebpackBuildContext: serverBuildContext,
+      sentryBuildTimeOptions: {},
+    });
+
+    expect(getBuildPluginOptionsSpy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        useRunAfterProductionCompileHook: undefined,
+      }),
+    );
+
+    getBuildPluginOptionsSpy.mockRestore();
+  });
+
   it('preserves unrelated webpack config options', async () => {
     const finalWebpackConfig = await materializeFinalWebpackConfig({
       exportedNextConfig,
