Merge branch 'develop' into timfish/fix/improve-uuid-perf

Author: timfish

dev-packages/e2e-tests/test-applications/ember-classic/package.json

@@ -75,7 +75,8 @@
     "node": ">=18"
   },
   "resolutions": {
-    "@babel/traverse": "~7.25.9"
+    "@babel/traverse": "~7.25.9",
+    "clean-css": "^5.3.0"
   },
   "ember": {
     "edition": "octane"

dev-packages/e2e-tests/test-applications/nextjs-16/package.json

@@ -18,7 +18,7 @@
     "test:build-canary": "pnpm install && pnpm add next@canary && pnpm build",
     "test:build-canary-webpack": "pnpm install && pnpm add next@canary && pnpm build-webpack",
     "test:assert": "pnpm test:prod && pnpm test:dev",
-    "test:assert-webpack": "pnpm test:prod"
+    "test:assert-webpack": "pnpm test:prod && pnpm test:dev-webpack"
   },
   "dependencies": {
     "@sentry/nextjs": "latest || *",

package.json

@@ -124,7 +124,7 @@
     "jsdom": "^21.1.2",
     "lerna": "7.1.1",
     "madge": "7.0.0",
-    "nodemon": "^2.0.16",
+    "nodemon": "^3.1.10",
     "npm-run-all2": "^6.2.0",
     "prettier": "^3.6.2",
     "prettier-plugin-astro": "^0.14.1",

packages/nextjs/src/config/util.ts

@@ -109,66 +109,75 @@ export function supportsNativeDebugIds(version: string): boolean {
 }
 
 /**
- * Checks if the current Next.js version uses Turbopack as the default bundler.
- * Starting from Next.js 15.6.0-canary.38, turbopack became the default for `next build`.
+ * Checks if the given Next.js version requires the `experimental.instrumentationHook` option.
+ * Next.js 15.0.0 and higher (including certain RC and canary versions) no longer require this option
+ * and will print a warning if it is set.
  *
- * @param version - Next.js version string to check.
- * @returns true if the version uses Turbopack by default
+ * @param version - version string to check.
+ * @returns true if the version requires the instrumentationHook option to be set
  */
-export function isTurbopackDefaultForVersion(version: string): boolean {
+export function requiresInstrumentationHook(version: string): boolean {
   if (!version) {
-    return false;
+    return true; // Default to requiring it if version cannot be determined
   }
 
-  const { major, minor, prerelease } = parseSemver(version);
+  const { major, minor, patch, prerelease } = parseSemver(version);
 
-  if (major === undefined || minor === undefined) {
-    return false;
+  if (major === undefined || minor === undefined || patch === undefined) {
+    return true; // Default to requiring it if parsing fails
   }
 
-  // Next.js 16+ uses turbopack by default
+  // Next.js 16+ never requires the hook
   if (major >= 16) {
+    return false;
+  }
+
+  // Next.js 14 and below always require the hook
+  if (major < 15) {
     return true;
   }
 
-  // For Next.js 15, only canary versions 15.6.0-canary.40+ use turbopack by default
-  // Stable 15.x releases still use webpack by default
-  if (major === 15 && minor >= 6 && prerelease && prerelease.startsWith('canary.')) {
-    if (minor >= 7) {
-      return true;
-    }
+  // At this point, we know it's Next.js 15.x.y
+  // Stable releases (15.0.0+) don't require the hook
+  if (!prerelease) {
+    return false;
+  }
+
+  // Next.js 15.x.y with x > 0 or y > 0 don't require the hook
+  if (minor > 0 || patch > 0) {
+    return false;
+  }
+
+  // Check specific prerelease versions that don't require the hook
+  if (prerelease.startsWith('rc.')) {
+    const rcNumber = parseInt(prerelease.split('.')[1] || '0', 10);
+    return rcNumber === 0; // Only rc.0 requires the hook
+  }
+
+  if (prerelease.startsWith('canary.')) {
     const canaryNumber = parseInt(prerelease.split('.')[1] || '0', 10);
-    if (canaryNumber >= 40) {
-      return true;
-    }
+    return canaryNumber < 124; // canary.124+ doesn't require the hook
   }
 
-  return false;
+  // All other 15.0.0 prerelease versions (alpha, beta, etc.) require the hook
+  return true;
 }
 
 /**
  * Determines which bundler is actually being used based on environment variables,
- * CLI flags, and Next.js version.
+ * and CLI flags.
  *
- * @param nextJsVersion - The Next.js version string
- * @returns 'turbopack', 'webpack', or undefined if it cannot be determined
+ * @returns 'turbopack' or 'webpack'
  */
-export function detectActiveBundler(nextJsVersion: string | undefined): 'turbopack' | 'webpack' | undefined {
-  if (process.env.TURBOPACK || process.argv.includes('--turbo')) {
-    return 'turbopack';
-  }
+export function detectActiveBundler(): 'turbopack' | 'webpack' {
+  const turbopackEnv = process.env.TURBOPACK;
 
-  // Explicit opt-in to webpack via --webpack flag
-  if (process.argv.includes('--webpack')) {
-    return 'webpack';
-  }
+  // Check if TURBOPACK env var is set to a truthy value (excluding falsy strings like 'false', '0', '')
+  const isTurbopackEnabled = turbopackEnv && turbopackEnv !== 'false' && turbopackEnv !== '0';
 
-  // Fallback to version-based default behavior
-  if (nextJsVersion) {
-    const turbopackIsDefault = isTurbopackDefaultForVersion(nextJsVersion);
-    return turbopackIsDefault ? 'turbopack' : 'webpack';
+  if (isTurbopackEnabled || process.argv.includes('--turbo')) {
+    return 'turbopack';
+  } else {
+    return 'webpack';
   }
-
-  // Unlikely but at this point, we just assume webpack for older behavior
-  return 'webpack';
 }

packages/nextjs/src/config/withSentryConfig.ts

@@ -16,7 +16,12 @@ import type {
   SentryBuildOptions,
   TurbopackOptions,
 } from './types';
-import { detectActiveBundler, getNextjsVersion, supportsProductionCompileHook } from './util';
+import {
+  detectActiveBundler,
+  getNextjsVersion,
+  requiresInstrumentationHook,
+  supportsProductionCompileHook,
+} from './util';
 import { constructWebpackConfigFunction } from './webpack';
 
 let showedExportModeTunnelWarning = false;
@@ -178,47 +183,18 @@ function getFinalConfigObject(
 
   // From Next.js version (15.0.0-canary.124) onwards, Next.js does no longer require the `experimental.instrumentationHook` option and will
   // print a warning when it is set, so we need to conditionally provide it for lower versions.
-  if (nextJsVersion) {
-    const { major, minor, patch, prerelease } = parseSemver(nextJsVersion);
-    const isFullySupportedRelease =
-      major !== undefined &&
-      minor !== undefined &&
-      patch !== undefined &&
-      major >= 15 &&
-      ((minor === 0 && patch === 0 && prerelease === undefined) || minor > 0 || patch > 0);
-    const isSupportedV15Rc =
-      major !== undefined &&
-      minor !== undefined &&
-      patch !== undefined &&
-      prerelease !== undefined &&
-      major === 15 &&
-      minor === 0 &&
-      patch === 0 &&
-      prerelease.startsWith('rc.') &&
-      parseInt(prerelease.split('.')[1] || '', 10) > 0;
-    const isSupportedCanary =
-      minor !== undefined &&
-      patch !== undefined &&
-      prerelease !== undefined &&
-      major === 15 &&
-      minor === 0 &&
-      patch === 0 &&
-      prerelease.startsWith('canary.') &&
-      parseInt(prerelease.split('.')[1] || '', 10) >= 124;
-
-    if (!isFullySupportedRelease && !isSupportedV15Rc && !isSupportedCanary) {
-      if (incomingUserNextConfigObject.experimental?.instrumentationHook === false) {
-        // eslint-disable-next-line no-console
-        console.warn(
-          '[@sentry/nextjs] You turned off the `experimental.instrumentationHook` option. Note that Sentry will not be initialized if you did not set it up inside `instrumentation.(js|ts)`.',
-        );
-      }
-      incomingUserNextConfigObject.experimental = {
-        instrumentationHook: true,
-        ...incomingUserNextConfigObject.experimental,
-      };
+  if (nextJsVersion && requiresInstrumentationHook(nextJsVersion)) {
+    if (incomingUserNextConfigObject.experimental?.instrumentationHook === false) {
+      // eslint-disable-next-line no-console
+      console.warn(
+        '[@sentry/nextjs] You turned off the `experimental.instrumentationHook` option. Note that Sentry will not be initialized if you did not set it up inside `instrumentation.(js|ts)`.',
+      );
     }
-  } else {
+    incomingUserNextConfigObject.experimental = {
+      instrumentationHook: true,
+      ...incomingUserNextConfigObject.experimental,
+    };
+  } else if (!nextJsVersion) {
     // If we cannot detect a Next.js version for whatever reason, the sensible default is to set the `experimental.instrumentationHook`, even though it may create a warning.
     if (
       incomingUserNextConfigObject.experimental &&
@@ -261,7 +237,7 @@ function getFinalConfigObject(
     nextMajor = major;
   }
 
-  const activeBundler = detectActiveBundler(nextJsVersion);
+  const activeBundler = detectActiveBundler();
   const isTurbopack = activeBundler === 'turbopack';
   const isWebpack = activeBundler === 'webpack';
   const isTurbopackSupported = supportsProductionCompileHook(nextJsVersion ?? '');