bump bundler plugin and add update sourcemap handling

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.0.2",
     "@sentry-internal/browser-utils": "10.4.0",
     "@sentry/core": "10.4.0",
     "@sentry/node": "10.4.0",
     "@sentry/opentelemetry": "10.4.0",
     "@sentry/react": "10.4.0",
     "@sentry/vercel-edge": "10.4.0",
-    "@sentry/webpack-plugin": "^4.0.2",
+    "@sentry/webpack-plugin": "^4.1.0",
+    "@sentry/bundler-plugin-core": "^4.1.0",
     "chalk": "3.0.0",
     "glob": "^11.0.3",
     "resolve": "1.22.8",

packages/nextjs/src/config/handleRunAfterProductionCompile.ts

@@ -43,7 +43,7 @@ export async function handleRunAfterProductionCompile(
     },
   );
 
-  const buildArtifactsPromise = glob(
+  const buildArtifacts = await glob(
     ['/**/*.js', '/**/*.mjs', '/**/*.cjs', '/**/*.js.map', '/**/*.mjs.map', '/**/*.cjs.map'].map(
       q => `${q}?(\\?*)?(#*)`, // We want to allow query and hashes strings at the end of files
     ),
@@ -56,7 +56,7 @@ export async function handleRunAfterProductionCompile(
 
   await sentryBuildPluginManager.telemetry.emitBundlerPluginExecutionSignal();
   await sentryBuildPluginManager.createRelease();
-  // 🔜 await sentryBuildPluginManager.injectDebugIds();
-  await sentryBuildPluginManager.uploadSourcemaps(await buildArtifactsPromise);
+  await sentryBuildPluginManager.injectDebugIds(buildArtifacts);
+  await sentryBuildPluginManager.uploadSourcemaps(buildArtifacts);
   await sentryBuildPluginManager.deleteArtifacts();
 }

packages/nextjs/src/config/webpackPluginOptions.ts

@@ -71,10 +71,9 @@ export function getWebpackPluginOptions(
     url: sentryBuildOptions.sentryUrl,
     sourcemaps: {
       // if the user has enabled the runAfterProductionCompileHook, we handle sourcemap uploads a later step
-      disable: sentryBuildOptions.sourcemaps?.disable,
-      // TODO: disable: sentryBuildOptions.useRunAfterProductionCompileHook
-      //   ? 'disable-upload'
-      //   : sentryBuildOptions.sourcemaps?.disable,
+      disable: sentryBuildOptions.useRunAfterProductionCompileHook
+        ? 'disable-upload'
+        : sentryBuildOptions.sourcemaps?.disable,
       rewriteSources(source) {
         if (source.startsWith('webpack://_N_E/')) {
           return source.replace('webpack://_N_E/', '');

yarn.lock

@@ -6950,6 +6950,11 @@
   resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-4.0.2.tgz#7c8eb80a38b5e6b4c4cea4c391d07581020c91e4"
   integrity sha512-Nr/VamvpQs6w642EI5t+qaCUGnVEro0qqk+S8XO1gc8qSdpc8kkZJFnUk7ozAr+ljYWGfVgWXrxI9lLiriLsRA==
 
+"@sentry/[email protected]":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-4.1.0.tgz#6e7168f5fa59f53ac4b68e3f79c5fd54adc13f2e"
+  integrity sha512-UkcnqC7Bp9ODyoBN7BKcRotd1jz/I2vyruE/qjNfRC7UnP+jIRItUWYaXxQPON1fTw+N+egKdByk0M1y2OPv/Q==
+
 "@sentry/[email protected]":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@sentry/bundler-plugin-core/-/bundler-plugin-core-4.0.0.tgz#564463cf53f869496ab5d4986e97f86618a67677"
@@ -6964,7 +6969,7 @@
     magic-string "0.30.8"
     unplugin "1.0.1"
 
-"@sentry/[email protected]", "@sentry/bundler-plugin-core@^4.0.2":
+"@sentry/[email protected]":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@sentry/bundler-plugin-core/-/bundler-plugin-core-4.0.2.tgz#2e106ac564d2e4e83e8dbc84f1e84f4eed1d6dde"
   integrity sha512-LeARs8qHhEw19tk+KZd9DDV+Rh/UeapIH0+C09fTmff9p8Y82Cj89pEQ2a1rdUiF/oYIjQX45vnZscB7ra42yw==
@@ -6978,6 +6983,20 @@
     magic-string "0.30.8"
     unplugin "1.0.1"
 
+"@sentry/[email protected]", "@sentry/bundler-plugin-core@^4.1.0":
+  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==
+  dependencies:
+    "@babel/core" "^7.18.5"
+    "@sentry/babel-plugin-component-annotate" "4.1.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.51.1"
   resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.51.1.tgz#3a1db065651893f72dad3a502b2d7c2f5e6a7dd8"
@@ -7018,7 +7037,7 @@
   resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.51.1.tgz#d361e37146c9269d40c37459271a6c2cfa1fa8a6"
   integrity sha512-v2hreYUPPTNK1/N7+DeX7XBN/zb7p539k+2Osf0HFyVBaoUC3Y3+KBwSf4ASsnmgTAK7HCGR+X0NH1vP+icw4w==
 
-"@sentry/cli@^2.49.0", "@sentry/cli@^2.51.1":
+"@sentry/cli@^2.49.0", "@sentry/cli@^2.51.0", "@sentry/cli@^2.51.1":
   version "2.51.1"
   resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.51.1.tgz#c6bdc6025e8f600e44fc76f8274c369aeb5d4df4"
   integrity sha512-FU+54kNcKJABU0+ekvtnoXHM9zVrDe1zXVFbQT7mS0On0m1P0zFRGdzbnWe2XzpzuEAJXtK6aog/W+esRU9AIA==
@@ -7063,6 +7082,15 @@
     unplugin "1.0.1"
     uuid "^9.0.0"
 
+"@sentry/webpack-plugin@^4.1.0":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-4.1.0.tgz#e95e2dcd10e71dc8c3a16ba5cad9153f5e78c3bc"
+  integrity sha512-YqfDfyGAuT/9YW1kgAPfD7kGUKQCh1E5co+qMdToxi/Mz4xsWJY02rFS5GrJixYktYJfSMze8NiRr89yJMxYHw==
+  dependencies:
+    "@sentry/bundler-plugin-core" "4.1.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"