[pull] main from nodejs:main

next.config.mjs

@@ -65,28 +65,41 @@ const nextConfig = {
     ],
     // Removes the warning regarding the WebPack Build Worker
     webpackBuildWorker: false,
-    // Otherwise Build fails due to unrecognizable character
+    // Sentry Profiling Module should be treated as an external symbol
     serverComponentsExternalPackages: ['@sentry/profiling-node'],
   },
 };
 
-// Next.js Config with i18n Configuration
-const withIntlConfig = withNextIntl()(nextConfig);
+/** @type {import('@sentry/cli').SentryCliOptions} */
+const sentrySettings = {
+  // We don't want Sentry to emit logs
+  silent: true,
+  // Define the Sentry Organisation
+  org: 'nodejs-org',
+  // Define the Sentry Project on our Sentry Organisation
+  project: 'nodejs-org',
+};
+
+/** @type {import('@sentry/nextjs/types/config/types').UserSentryOptions} */
+const sentryConfig = {
+  // Upload Next.js or third-party code in addition to our code
+  widenClientFileUpload: true,
+  // Transpile the Sentry code too since we target older browsers in our .browserslistrc
+  transpileClientSDK: true,
+  // Attempt to circumvent ad blockers
+  tunnelRoute: ENABLE_STATIC_EXPORT ? undefined : '/monitoring',
+  // Prevent source map comments in built files
+  hideSourceMaps: false,
+  // Tree shake Sentry stuff from the bundle
+  disableLogger: true,
+};
 
-// Next.js Config with Sentry configuration
+// Next.js Config with Sentry Configuration
 export default withSentryConfig(
-  withIntlConfig,
-  { silent: true, org: 'nodejs-org', project: 'nodejs-org' },
-  {
-    // upload Next.js or third-party code in addition to our code
-    widenClientFileUpload: true,
-    // transpile the Sentry code too since we target older browsers in our .browserslistrc
-    transpileClientSDK: true,
-    // attempt to circumvent ad blockers
-    tunnelRoute: ENABLE_STATIC_EXPORT ? undefined : '/monitoring',
-    // prevent source map comments in built files
-    hideSourceMaps: false,
-    // tree shake sentry stuff from the bundle
-    disableLogger: true,
-  }
+  // Next.js Config with i18n Configuration
+  withNextIntl()(nextConfig),
+  // Default Sentry Settings
+  sentrySettings,
+  // Default Sentry Extension Configuration
+  sentryConfig
 );

sentry.client.config.ts

@@ -1,20 +1,22 @@
 import { init, Replay } from '@sentry/nextjs';
 
-import { SENTRY_DSN } from '@/next.constants.mjs';
+import { SENTRY_DSN, VERCEL_ENV } from '@/next.constants.mjs';
 
 init({
-  // tell Sentry where to send events
+  // Only run Sentry on Vercel Environment
+  enabled: !!VERCEL_ENV,
+  // Tell Sentry where to send events
   dsn: SENTRY_DSN,
-  // percentage of events to send to Sentry (all of them) (for performance metrics)
+  // Percentage of events to send to Sentry (all of them) (for performance metrics)
   tracesSampleRate: 1,
-  // percentage of errors to sample (all of them)
+  // Percentage of errors to sample (all of them)
   replaysOnErrorSampleRate: 1.0,
-  // percentage of sessionsto sample (10%)
+  // Percentage of sessionsto sample (10%)
   replaysSessionSampleRate: 0.1,
-  // support replaying client sessions to capture unhappy paths
+  // Support replaying client sessions to capture unhappy paths
   integrations: [new Replay()],
-  // we only want to capture errors from _next folder on production
-  // we don't want to capture errors from preview branches here
+  // We only want to capture errors from _next folder on production
+  // We don't want to capture errors from preview branches here
   allowUrls: ['https://nodejs.org/_next'],
   // Filter-out Events/Errors that are invalid for us
   beforeSend: (event, hint) => {

sentry.edge.config.ts

@@ -1,5 +1,12 @@
 import { init } from '@sentry/nextjs';
 
-import { SENTRY_DSN } from '@/next.constants.mjs';
+import { SENTRY_DSN, VERCEL_ENV } from '@/next.constants.mjs';
 
-init({ dsn: SENTRY_DSN, tracesSampleRate: 1 });
+init({
+  // Only run Sentry on Vercel Environment
+  enabled: !!VERCEL_ENV,
+  // Tell Sentry where to send events
+  dsn: SENTRY_DSN,
+  // Percentage of events to send to Sentry (all of them) (for performance metrics)
+  tracesSampleRate: 1,
+});

sentry.server.config.ts

@@ -1,15 +1,17 @@
 import { init } from '@sentry/nextjs';
 import { ProfilingIntegration } from '@sentry/profiling-node';
 
-import { SENTRY_DSN } from '@/next.constants.mjs';
+import { SENTRY_DSN, VERCEL_ENV } from '@/next.constants.mjs';
 
 init({
-  // tell Sentry where to send events
+  // Only run Sentry on Vercel Environment
+  enabled: !!VERCEL_ENV,
+  // Tell Sentry where to send events
   dsn: SENTRY_DSN,
-  // percentage of events to send to Sentry (all of them) (for performance metrics)
+  // Percentage of events to send to Sentry (all of them) (for performance metrics)
   tracesSampleRate: 1,
-  // percentage of events to send to Sentry (all of them) (for profiling metrics)
+  // Percentage of events to send to Sentry (all of them) (for profiling metrics)
   profilesSampleRate: 1.0,
-  // add profiling integration to capture performance metrics
+  // Add profiling integration to capture performance metrics
   integrations: [new ProfilingIntegration()],
 });