@sentry/nuxt 10.44.0 → 10.46.0

package/build/esm/vite/utils.js

@@ -2,6 +2,24 @@ import { consoleSandbox } from '@sentry/core';
 import * as fs from 'fs';
 import * as path from 'path';
 
+/**
+ * Gets the major version of the installed nitro package.
+ * Returns 2 as the default if nitro is not found or the version cannot be determined.
+ */
+async function getNitroMajorVersion() {
+  try {
+    const { getPackageInfo } = await import('local-pkg');
+    const info = await getPackageInfo('nitro');
+    if (info?.version) {
+      const major = parseInt(info.version.split('.')[0] ?? '2', 10);
+      return isNaN(major) ? 2 : major;
+    }
+  } catch {
+    // If local-pkg is unavailable or nitro is not found, default to v2
+  }
+  return 2;
+}
+
 /**
  *  Find the default SDK init file for the given type (client or server).
  *  The sentry.server.config file is prioritized over the instrument.server file.
@@ -189,8 +207,8 @@ function constructFunctionReExport(pathWithQuery, entryId) {
  *
  * @see https://nuxt.com/docs/guide/concepts/esm#aliasing-libraries
  */
-function addOTelCommonJSImportAlias(nuxt) {
-  if (!nuxt.options.dev) {
+function addOTelCommonJSImportAlias(nuxt, isNitroV3 = false) {
+  if (!nuxt.options.dev || isNitroV3) {
     return;
   }
 
@@ -203,5 +221,5 @@ function addOTelCommonJSImportAlias(nuxt) {
   }
 }
 
-export { QUERY_END_INDICATOR, SENTRY_REEXPORTED_FUNCTIONS, SENTRY_WRAPPED_ENTRY, SENTRY_WRAPPED_FUNCTIONS, addOTelCommonJSImportAlias, constructFunctionReExport, constructWrappedFunctionExportQuery, extractFunctionReexportQueryParameters, findDefaultSdkInitFile, getFilenameFromNodeStartCommand, removeSentryQueryFromPath };
+export { QUERY_END_INDICATOR, SENTRY_REEXPORTED_FUNCTIONS, SENTRY_WRAPPED_ENTRY, SENTRY_WRAPPED_FUNCTIONS, addOTelCommonJSImportAlias, constructFunctionReExport, constructWrappedFunctionExportQuery, extractFunctionReexportQueryParameters, findDefaultSdkInitFile, getFilenameFromNodeStartCommand, getNitroMajorVersion, removeSentryQueryFromPath };
 //# sourceMappingURL=utils.js.map

package/build/esm/vite/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sources":["../../../src/vite/utils.ts"],"sourcesContent":["import type { Nuxt } from '@nuxt/schema';\nimport { consoleSandbox } from '@sentry/core';\nimport * as fs from 'fs';\nimport * as path from 'path';\n\n/**\n *  Find the default SDK init file for the given type (client or server).\n *  The sentry.server.config file is prioritized over the instrument.server file.\n */\nexport function findDefaultSdkInitFile(type: 'server' | 'client', nuxt?: Nuxt): string | undefined {\n  const possibleFileExtensions = ['ts', 'js', 'mjs', 'cjs', 'mts', 'cts'];\n  const relativePaths: string[] = [];\n\n  if (type === 'server') {\n    for (const ext of possibleFileExtensions) {\n      relativePaths.push(`sentry.${type}.config.${ext}`);\n      relativePaths.push(path.join('public', `instrument.${type}.${ext}`));\n    }\n  } else {\n    for (const ext of possibleFileExtensions) {\n      relativePaths.push(`sentry.${type}.config.${ext}`);\n    }\n  }\n\n  // Get layers from highest priority to lowest\n  const layers = [...(nuxt?.options._layers ?? [])].reverse();\n\n  for (const layer of layers) {\n    for (const relativePath of relativePaths) {\n      const fullPath = path.resolve(layer.cwd, relativePath);\n      if (fs.existsSync(fullPath)) {\n        return fullPath;\n      }\n    }\n  }\n\n  // As a fallback, also check CWD (left for pure compatibility)\n  const cwd = process.cwd();\n  for (const relativePath of relativePaths) {\n    const fullPath = path.resolve(cwd, relativePath);\n    if (fs.existsSync(fullPath)) {\n      return fullPath;\n    }\n  }\n\n  return undefined;\n}\n\n/**\n *  Extracts the filename from a node command with a path.\n */\nexport function getFilenameFromNodeStartCommand(nodeCommand: string): string | null {\n  const regex = /[^/\\\\]+\\.[^/\\\\]+$/;\n  const match = nodeCommand.match(regex);\n  return match ? match[0] : null;\n}\n\nexport const SENTRY_WRAPPED_ENTRY = '?sentry-query-wrapped-entry';\nexport const SENTRY_WRAPPED_FUNCTIONS = '?sentry-query-wrapped-functions=';\nexport const SENTRY_REEXPORTED_FUNCTIONS = '?sentry-query-reexported-functions=';\nexport const QUERY_END_INDICATOR = 'SENTRY-QUERY-END';\n\n/**\n * Strips the Sentry query part from a path.\n * Example: example/path?sentry-query-wrapped-entry?sentry-query-functions-reexport=foo,SENTRY-QUERY-END -> /example/path\n *\n * Only exported for testing.\n */\nexport function removeSentryQueryFromPath(url: string): string {\n  // oxlint-disable-next-line sdk/no-regexp-constructor\n  const regex = new RegExp(`\\\\${SENTRY_WRAPPED_ENTRY}.*?\\\\${QUERY_END_INDICATOR}`);\n  return url.replace(regex, '');\n}\n\n/**\n * Extracts and sanitizes function re-export and function wrap query parameters from a query string.\n * If it is a default export, it is not considered for re-exporting.\n *\n * Only exported for testing.\n */\nexport function extractFunctionReexportQueryParameters(query: string): { wrap: string[]; reexport: string[] } {\n  // Regex matches the comma-separated params between the functions query\n  // oxlint-disable-next-line sdk/no-regexp-constructor\n  const wrapRegex = new RegExp(\n    `\\\\${SENTRY_WRAPPED_FUNCTIONS}(.*?)(\\\\${QUERY_END_INDICATOR}|\\\\${SENTRY_REEXPORTED_FUNCTIONS})`,\n  );\n  // oxlint-disable-next-line sdk/no-regexp-constructor\n  const reexportRegex = new RegExp(`\\\\${SENTRY_REEXPORTED_FUNCTIONS}(.*?)(\\\\${QUERY_END_INDICATOR})`);\n\n  const wrapMatch = query.match(wrapRegex);\n  const reexportMatch = query.match(reexportRegex);\n\n  const wrap =\n    wrapMatch?.[1]\n      ?.split(',')\n      .filter(param => param !== '')\n      // Sanitize, as code could be injected with another rollup plugin\n      .map((str: string) => str.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&')) || [];\n\n  const reexport =\n    reexportMatch?.[1]\n      ?.split(',')\n      .filter(param => param !== '' && param !== 'default')\n      // Sanitize, as code could be injected with another rollup plugin\n      .map((str: string) => str.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&')) || [];\n\n  return { wrap, reexport };\n}\n\n/**\n *  Constructs a comma-separated string with all functions that need to be re-exported later from the server entry.\n *  It uses Rollup's `exportedBindings` to determine the functions to re-export. Functions which should be wrapped\n *  (e.g. serverless handlers) are wrapped by Sentry.\n */\nexport function constructWrappedFunctionExportQuery(\n  exportedBindings: Record<string, string[]> | null,\n  entrypointWrappedFunctions: string[],\n  debug?: boolean,\n): string {\n  const functionsToExport: { wrap: string[]; reexport: string[] } = {\n    wrap: [],\n    reexport: [],\n  };\n\n  // `exportedBindings` can look like this:  `{ '.': [ 'handler' ] }` or `{ '.': [], './firebase-gen-1.mjs': [ 'server' ] }`\n  // The key `.` refers to exports within the current file, while other keys show from where exports were imported first.\n  Object.values(exportedBindings || {}).forEach(functions =>\n    functions.forEach(fn => {\n      if (entrypointWrappedFunctions.includes(fn)) {\n        functionsToExport.wrap.push(fn);\n      } else {\n        functionsToExport.reexport.push(fn);\n      }\n    }),\n  );\n\n  if (debug && functionsToExport.wrap.length === 0) {\n    consoleSandbox(() =>\n      // eslint-disable-next-line no-console\n      console.warn(\n        \"[Sentry] No functions found to wrap. In case the server needs to export async functions other than `handler` or  `server`, consider adding the name(s) to Sentry's build options `sentry.experimental_entrypointWrappedFunctions` in `nuxt.config.ts`.\",\n      ),\n    );\n  }\n\n  const wrapQuery = functionsToExport.wrap.length\n    ? `${SENTRY_WRAPPED_FUNCTIONS}${functionsToExport.wrap.join(',')}`\n    : '';\n  const reexportQuery = functionsToExport.reexport.length\n    ? `${SENTRY_REEXPORTED_FUNCTIONS}${functionsToExport.reexport.join(',')}`\n    : '';\n\n  return [wrapQuery, reexportQuery].join('');\n}\n\n/**\n * Constructs a code snippet with function reexports (can be used in Rollup plugins as a return value for `load()`)\n */\nexport function constructFunctionReExport(pathWithQuery: string, entryId: string): string {\n  const { wrap: wrapFunctions, reexport: reexportFunctions } = extractFunctionReexportQueryParameters(pathWithQuery);\n\n  return wrapFunctions\n    .reduce(\n      (functionsCode, currFunctionName) =>\n        functionsCode.concat(\n          `async function ${currFunctionName}_sentryWrapped(...args) {\\n` +\n            `  const res = await import(${JSON.stringify(entryId)});\\n` +\n            `  return res.${currFunctionName}.call(this, ...args);\\n` +\n            '}\\n' +\n            `export { ${currFunctionName}_sentryWrapped as ${currFunctionName} };\\n`,\n        ),\n      '',\n    )\n    .concat(\n      reexportFunctions.reduce(\n        (functionsCode, currFunctionName) =>\n          functionsCode.concat(`export { ${currFunctionName} } from ${JSON.stringify(entryId)};`),\n        '',\n      ),\n    );\n}\n\n/**\n * Sets up alias to work around OpenTelemetry's incomplete ESM imports.\n * https://github.com/getsentry/sentry-javascript/issues/15204\n *\n * OpenTelemetry's @opentelemetry/resources package has incomplete imports missing\n * the .js file extensions (like execAsync for machine-id detection). This causes module resolution\n * errors in certain Nuxt configurations, particularly when local Nuxt modules in Nuxt 4 are present.\n *\n * @see https://nuxt.com/docs/guide/concepts/esm#aliasing-libraries\n */\nexport function addOTelCommonJSImportAlias(nuxt: Nuxt): void {\n  if (!nuxt.options.dev) {\n    return;\n  }\n\n  if (!nuxt.options.alias) {\n    nuxt.options.alias = {};\n  }\n\n  if (!nuxt.options.alias['@opentelemetry/resources']) {\n    nuxt.options.alias['@opentelemetry/resources'] = '@opentelemetry/resources/build/src/index.js';\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sources":["../../../src/vite/utils.ts"],"sourcesContent":["import type { Nuxt } from '@nuxt/schema';\nimport { consoleSandbox } from '@sentry/core';\nimport * as fs from 'fs';\nimport * as path from 'path';\n\n/**\n * Gets the major version of the installed nitro package.\n * Returns 2 as the default if nitro is not found or the version cannot be determined.\n */\nexport async function getNitroMajorVersion(): Promise<number> {\n  try {\n    const { getPackageInfo } = await import('local-pkg');\n    const info = await getPackageInfo('nitro');\n    if (info?.version) {\n      const major = parseInt(info.version.split('.')[0] ?? '2', 10);\n      return isNaN(major) ? 2 : major;\n    }\n  } catch {\n    // If local-pkg is unavailable or nitro is not found, default to v2\n  }\n  return 2;\n}\n\n/**\n *  Find the default SDK init file for the given type (client or server).\n *  The sentry.server.config file is prioritized over the instrument.server file.\n */\nexport function findDefaultSdkInitFile(type: 'server' | 'client', nuxt?: Nuxt): string | undefined {\n  const possibleFileExtensions = ['ts', 'js', 'mjs', 'cjs', 'mts', 'cts'];\n  const relativePaths: string[] = [];\n\n  if (type === 'server') {\n    for (const ext of possibleFileExtensions) {\n      relativePaths.push(`sentry.${type}.config.${ext}`);\n      relativePaths.push(path.join('public', `instrument.${type}.${ext}`));\n    }\n  } else {\n    for (const ext of possibleFileExtensions) {\n      relativePaths.push(`sentry.${type}.config.${ext}`);\n    }\n  }\n\n  // Get layers from highest priority to lowest\n  const layers = [...(nuxt?.options._layers ?? [])].reverse();\n\n  for (const layer of layers) {\n    for (const relativePath of relativePaths) {\n      const fullPath = path.resolve(layer.cwd, relativePath);\n      if (fs.existsSync(fullPath)) {\n        return fullPath;\n      }\n    }\n  }\n\n  // As a fallback, also check CWD (left for pure compatibility)\n  const cwd = process.cwd();\n  for (const relativePath of relativePaths) {\n    const fullPath = path.resolve(cwd, relativePath);\n    if (fs.existsSync(fullPath)) {\n      return fullPath;\n    }\n  }\n\n  return undefined;\n}\n\n/**\n *  Extracts the filename from a node command with a path.\n */\nexport function getFilenameFromNodeStartCommand(nodeCommand: string): string | null {\n  const regex = /[^/\\\\]+\\.[^/\\\\]+$/;\n  const match = nodeCommand.match(regex);\n  return match ? match[0] : null;\n}\n\nexport const SENTRY_WRAPPED_ENTRY = '?sentry-query-wrapped-entry';\nexport const SENTRY_WRAPPED_FUNCTIONS = '?sentry-query-wrapped-functions=';\nexport const SENTRY_REEXPORTED_FUNCTIONS = '?sentry-query-reexported-functions=';\nexport const QUERY_END_INDICATOR = 'SENTRY-QUERY-END';\n\n/**\n * Strips the Sentry query part from a path.\n * Example: example/path?sentry-query-wrapped-entry?sentry-query-functions-reexport=foo,SENTRY-QUERY-END -> /example/path\n *\n * Only exported for testing.\n */\nexport function removeSentryQueryFromPath(url: string): string {\n  // oxlint-disable-next-line sdk/no-regexp-constructor\n  const regex = new RegExp(`\\\\${SENTRY_WRAPPED_ENTRY}.*?\\\\${QUERY_END_INDICATOR}`);\n  return url.replace(regex, '');\n}\n\n/**\n * Extracts and sanitizes function re-export and function wrap query parameters from a query string.\n * If it is a default export, it is not considered for re-exporting.\n *\n * Only exported for testing.\n */\nexport function extractFunctionReexportQueryParameters(query: string): { wrap: string[]; reexport: string[] } {\n  // Regex matches the comma-separated params between the functions query\n  // oxlint-disable-next-line sdk/no-regexp-constructor\n  const wrapRegex = new RegExp(\n    `\\\\${SENTRY_WRAPPED_FUNCTIONS}(.*?)(\\\\${QUERY_END_INDICATOR}|\\\\${SENTRY_REEXPORTED_FUNCTIONS})`,\n  );\n  // oxlint-disable-next-line sdk/no-regexp-constructor\n  const reexportRegex = new RegExp(`\\\\${SENTRY_REEXPORTED_FUNCTIONS}(.*?)(\\\\${QUERY_END_INDICATOR})`);\n\n  const wrapMatch = query.match(wrapRegex);\n  const reexportMatch = query.match(reexportRegex);\n\n  const wrap =\n    wrapMatch?.[1]\n      ?.split(',')\n      .filter(param => param !== '')\n      // Sanitize, as code could be injected with another rollup plugin\n      .map((str: string) => str.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&')) || [];\n\n  const reexport =\n    reexportMatch?.[1]\n      ?.split(',')\n      .filter(param => param !== '' && param !== 'default')\n      // Sanitize, as code could be injected with another rollup plugin\n      .map((str: string) => str.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&')) || [];\n\n  return { wrap, reexport };\n}\n\n/**\n *  Constructs a comma-separated string with all functions that need to be re-exported later from the server entry.\n *  It uses Rollup's `exportedBindings` to determine the functions to re-export. Functions which should be wrapped\n *  (e.g. serverless handlers) are wrapped by Sentry.\n */\nexport function constructWrappedFunctionExportQuery(\n  exportedBindings: Record<string, string[]> | null,\n  entrypointWrappedFunctions: string[],\n  debug?: boolean,\n): string {\n  const functionsToExport: { wrap: string[]; reexport: string[] } = {\n    wrap: [],\n    reexport: [],\n  };\n\n  // `exportedBindings` can look like this:  `{ '.': [ 'handler' ] }` or `{ '.': [], './firebase-gen-1.mjs': [ 'server' ] }`\n  // The key `.` refers to exports within the current file, while other keys show from where exports were imported first.\n  Object.values(exportedBindings || {}).forEach(functions =>\n    functions.forEach(fn => {\n      if (entrypointWrappedFunctions.includes(fn)) {\n        functionsToExport.wrap.push(fn);\n      } else {\n        functionsToExport.reexport.push(fn);\n      }\n    }),\n  );\n\n  if (debug && functionsToExport.wrap.length === 0) {\n    consoleSandbox(() =>\n      // eslint-disable-next-line no-console\n      console.warn(\n        \"[Sentry] No functions found to wrap. In case the server needs to export async functions other than `handler` or  `server`, consider adding the name(s) to Sentry's build options `sentry.experimental_entrypointWrappedFunctions` in `nuxt.config.ts`.\",\n      ),\n    );\n  }\n\n  const wrapQuery = functionsToExport.wrap.length\n    ? `${SENTRY_WRAPPED_FUNCTIONS}${functionsToExport.wrap.join(',')}`\n    : '';\n  const reexportQuery = functionsToExport.reexport.length\n    ? `${SENTRY_REEXPORTED_FUNCTIONS}${functionsToExport.reexport.join(',')}`\n    : '';\n\n  return [wrapQuery, reexportQuery].join('');\n}\n\n/**\n * Constructs a code snippet with function reexports (can be used in Rollup plugins as a return value for `load()`)\n */\nexport function constructFunctionReExport(pathWithQuery: string, entryId: string): string {\n  const { wrap: wrapFunctions, reexport: reexportFunctions } = extractFunctionReexportQueryParameters(pathWithQuery);\n\n  return wrapFunctions\n    .reduce(\n      (functionsCode, currFunctionName) =>\n        functionsCode.concat(\n          `async function ${currFunctionName}_sentryWrapped(...args) {\\n` +\n            `  const res = await import(${JSON.stringify(entryId)});\\n` +\n            `  return res.${currFunctionName}.call(this, ...args);\\n` +\n            '}\\n' +\n            `export { ${currFunctionName}_sentryWrapped as ${currFunctionName} };\\n`,\n        ),\n      '',\n    )\n    .concat(\n      reexportFunctions.reduce(\n        (functionsCode, currFunctionName) =>\n          functionsCode.concat(`export { ${currFunctionName} } from ${JSON.stringify(entryId)};`),\n        '',\n      ),\n    );\n}\n\n/**\n * Sets up alias to work around OpenTelemetry's incomplete ESM imports.\n * https://github.com/getsentry/sentry-javascript/issues/15204\n *\n * OpenTelemetry's @opentelemetry/resources package has incomplete imports missing\n * the .js file extensions (like execAsync for machine-id detection). This causes module resolution\n * errors in certain Nuxt configurations, particularly when local Nuxt modules in Nuxt 4 are present.\n *\n * @see https://nuxt.com/docs/guide/concepts/esm#aliasing-libraries\n */\nexport function addOTelCommonJSImportAlias(nuxt: Nuxt, isNitroV3 = false): void {\n  if (!nuxt.options.dev || isNitroV3) {\n    return;\n  }\n\n  if (!nuxt.options.alias) {\n    nuxt.options.alias = {};\n  }\n\n  if (!nuxt.options.alias['@opentelemetry/resources']) {\n    nuxt.options.alias['@opentelemetry/resources'] = '@opentelemetry/resources/build/src/index.js';\n  }\n}\n"],"names":[],"mappings":"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"}

package/build/module/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.7.0"
   },
-  "version": "10.44.0",
+  "version": "10.46.0",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "2.0.0"

package/build/module/module.mjs

@@ -6,6 +6,18 @@ import * as fs from 'fs';
 import { sentryRollupPlugin } from '@sentry/rollup-plugin';
 import { sentryVitePlugin } from '@sentry/vite-plugin';
 
+async function getNitroMajorVersion() {
+  try {
+    const { getPackageInfo } = await import('local-pkg');
+    const info = await getPackageInfo("nitro");
+    if (info?.version) {
+      const major = parseInt(info.version.split(".")[0] ?? "2", 10);
+      return isNaN(major) ? 2 : major;
+    }
+  } catch {
+  }
+  return 2;
+}
 function findDefaultSdkInitFile(type, nuxt) {
   const possibleFileExtensions = ["ts", "js", "mjs", "cjs", "mts", "cts"];
   const relativePaths = [];
@@ -108,8 +120,8 @@ export { ${currFunctionName}_sentryWrapped as ${currFunctionName} };
     )
   );
 }
-function addOTelCommonJSImportAlias(nuxt) {
-  if (!nuxt.options.dev) {
+function addOTelCommonJSImportAlias(nuxt, isNitroV3 = false) {
+  if (!nuxt.options.dev || isNitroV3) {
     return;
   }
   if (!nuxt.options.alias) {
@@ -262,7 +274,7 @@ function addServerTemplate(template) {
   return template;
 }
 
-function addDatabaseInstrumentation(nitro, moduleOptions) {
+function addDatabaseInstrumentation(nitro, isLegacyNitro, moduleOptions) {
   if (!nitro.experimental?.database) {
     moduleOptions?.debug && consoleSandbox(() => {
       console.log(
@@ -278,7 +290,11 @@ function addDatabaseInstrumentation(nitro, moduleOptions) {
       return `export const databaseConfig = ${JSON.stringify(databaseConfig)};`;
     }
   });
-  addServerPlugin(createResolver(import.meta.url).resolve("./runtime/plugins/database.server"));
+  if (isLegacyNitro) {
+    addServerPlugin(createResolver(import.meta.url).resolve("./runtime/plugins/database-legacy.server"));
+  } else {
+    addServerPlugin(createResolver(import.meta.url).resolve("./runtime/plugins/database.server"));
+  }
 }
 
 function addMiddlewareImports() {
@@ -610,7 +626,7 @@ function logSentryEnablesSourceMap(settingKey, settingValue) {
   console.log(`[Sentry] Enabled source map generation in the build options with \`${settingKey}: ${settingValue}\`.`);
 }
 
-function addStorageInstrumentation(nuxt) {
+function addStorageInstrumentation(nuxt, isLegacyNitro) {
   const moduleDirResolver = createResolver(import.meta.url);
   const userStorageMounts = Object.keys(nuxt.options.nitro.storage || {});
   addServerTemplate({
@@ -619,7 +635,11 @@ function addStorageInstrumentation(nuxt) {
       return `export const userStorageMounts = ${JSON.stringify(userStorageMounts)};`;
     }
   });
-  addServerPlugin(moduleDirResolver.resolve("./runtime/plugins/storage.server"));
+  if (isLegacyNitro) {
+    addServerPlugin(moduleDirResolver.resolve("./runtime/plugins/storage-legacy.server"));
+  } else {
+    addServerPlugin(moduleDirResolver.resolve("./runtime/plugins/storage.server"));
+  }
 }
 
 const module = defineNuxtModule({
@@ -631,7 +651,7 @@ const module = defineNuxtModule({
     }
   },
   defaults: {},
-  setup(moduleOptionsParam, nuxt) {
+  async setup(moduleOptionsParam, nuxt) {
     if (moduleOptionsParam?.enabled === false) {
       return;
     }
@@ -671,17 +691,26 @@ const module = defineNuxtModule({
       });
     }
     const serverConfigFile = findDefaultSdkInitFile("server", nuxt);
+    const isNitroV3 = await getNitroMajorVersion() >= 3;
     if (serverConfigFile) {
+      if (isNitroV3) {
+        addServerPlugin(moduleDirResolver.resolve("./runtime/plugins/handler.server"));
+      } else {
+        addServerPlugin(moduleDirResolver.resolve("./runtime/plugins/handler-legacy.server"));
+      }
       addServerPlugin(moduleDirResolver.resolve("./runtime/plugins/sentry.server"));
       addPlugin({
         src: moduleDirResolver.resolve("./runtime/plugins/route-detector.server"),
         mode: "server"
       });
+      addMiddlewareImports();
+      addStorageInstrumentation(nuxt, !isNitroV3);
+      addDatabaseInstrumentation(nuxt.options.nitro, !isNitroV3, moduleOptions);
     }
     if (clientConfigFile || serverConfigFile) {
       setupSourceMaps(moduleOptions, nuxt, addVitePlugin);
     }
-    addOTelCommonJSImportAlias(nuxt);
+    addOTelCommonJSImportAlias(nuxt, isNitroV3);
     const pagesDataTemplate = addTemplate({
       filename: "sentry--nuxt-pages-data.mjs",
       // Initial empty array (later filled in pages:extend hook)
@@ -696,11 +725,6 @@ const module = defineNuxtModule({
         return `export default ${JSON.stringify(pagesSubset, null, 2)};`;
       };
     });
-    if (serverConfigFile) {
-      addMiddlewareImports();
-      addStorageInstrumentation(nuxt);
-      addDatabaseInstrumentation(nuxt.options.nitro, moduleOptions);
-    }
     nuxt.hook("prepare:types", (options) => {
       const tsConfig = options.tsConfig;
       if (!tsConfig.include) {
@@ -719,7 +743,7 @@ const module = defineNuxtModule({
       if (nuxt.options?._prepare) {
         return;
       }
-      if (serverConfigFile) {
+      if (serverConfigFile && !isNitroV3) {
         addMiddlewareInstrumentation(nitro);
       }
       if (serverConfigFile?.includes(".server.config")) {

package/build/module/runtime/plugins/database-legacy.server.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Nitro plugin that instruments database calls for Nuxt v3/v4 (Nitro v2)
+ */
+declare const _default: () => void;
+export default _default;

package/build/module/runtime/plugins/database-legacy.server.js

@@ -0,0 +1,6 @@
+import { useDatabase } from "nitropack/runtime";
+import { databaseConfig } from "#sentry/database-config.mjs";
+import { createDatabasePlugin } from "../utils/instrumentDatabase.js";
+export default () => {
+  createDatabasePlugin(useDatabase, databaseConfig);
+};

package/build/module/runtime/plugins/database.server.d.ts

@@ -1,5 +1,5 @@
 /**
- * Creates a Nitro plugin that instruments the database calls.
+ * Nitro plugin that instruments database calls for Nuxt v5+ (Nitro v3+)
  */
 declare const _default: () => void;
 export default _default;

package/build/module/runtime/plugins/database.server.js

@@ -1,150 +1,6 @@
-import {
-  addBreadcrumb,
-  captureException,
-  debug,
-  flushIfServerless,
-  SEMANTIC_ATTRIBUTE_SENTRY_OP,
-  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
-  SPAN_STATUS_ERROR,
-  startSpan
-} from "@sentry/core";
-import { useDatabase } from "nitropack/runtime";
+import { useDatabase } from "nitro/database";
 import { databaseConfig } from "#sentry/database-config.mjs";
-import { getDatabaseSpanData } from "../utils/database-span-data.js";
-const patchedStatement = /* @__PURE__ */ new WeakSet();
-const SENTRY_ORIGIN = "auto.db.nuxt";
+import { createDatabasePlugin } from "../utils/instrumentDatabase.js";
 export default () => {
-  try {
-    const _databaseConfig = databaseConfig;
-    const databaseInstances = Object.keys(databaseConfig);
-    debug.log("[Nitro Database Plugin]: Instrumenting databases...");
-    for (const instance of databaseInstances) {
-      debug.log("[Nitro Database Plugin]: Instrumenting database instance:", instance);
-      const db = useDatabase(instance);
-      instrumentDatabase(db, _databaseConfig[instance]);
-    }
-    debug.log("[Nitro Database Plugin]: Databases instrumented.");
-  } catch (error) {
-    if (error instanceof Error && /Cannot access 'instances'/.test(error.message)) {
-      debug.log("[Nitro Database Plugin]: Database instrumentation skipped during build time.");
-      return;
-    }
-    debug.error("[Nitro Database Plugin]: Failed to instrument database:", error);
-  }
+  createDatabasePlugin(useDatabase, databaseConfig);
 };
-function instrumentDatabase(db, config) {
-  if (db.__sentry_instrumented__) {
-    debug.log("[Nitro Database Plugin]: Database already instrumented. Skipping...");
-    return;
-  }
-  const metadata = {
-    "db.system.name": config?.connector ?? db.dialect,
-    ...getDatabaseSpanData(config)
-  };
-  db.prepare = new Proxy(db.prepare, {
-    apply(target, thisArg, args) {
-      const [query] = args;
-      return instrumentPreparedStatement(target.apply(thisArg, args), query, metadata);
-    }
-  });
-  db.sql = new Proxy(db.sql, {
-    apply(target, thisArg, args) {
-      const query = args[0]?.[0] ?? "";
-      const opts = createStartSpanOptions(query, metadata);
-      return startSpan(
-        opts,
-        handleSpanStart(() => target.apply(thisArg, args))
-      );
-    }
-  });
-  db.exec = new Proxy(db.exec, {
-    apply(target, thisArg, args) {
-      return startSpan(
-        createStartSpanOptions(args[0], metadata),
-        handleSpanStart(() => target.apply(thisArg, args), { query: args[0] })
-      );
-    }
-  });
-  db.__sentry_instrumented__ = true;
-}
-function instrumentPreparedStatement(statement, query, data) {
-  statement.bind = new Proxy(statement.bind, {
-    apply(target, thisArg, args) {
-      return instrumentPreparedStatementQueries(target.apply(thisArg, args), query, data);
-    }
-  });
-  return instrumentPreparedStatementQueries(statement, query, data);
-}
-function instrumentPreparedStatementQueries(statement, query, data) {
-  if (patchedStatement.has(statement)) {
-    return statement;
-  }
-  statement.get = new Proxy(statement.get, {
-    apply(target, thisArg, args) {
-      return startSpan(
-        createStartSpanOptions(query, data),
-        handleSpanStart(() => target.apply(thisArg, args), { query })
-      );
-    }
-  });
-  statement.run = new Proxy(statement.run, {
-    apply(target, thisArg, args) {
-      return startSpan(
-        createStartSpanOptions(query, data),
-        handleSpanStart(() => target.apply(thisArg, args), { query })
-      );
-    }
-  });
-  statement.all = new Proxy(statement.all, {
-    apply(target, thisArg, args) {
-      return startSpan(
-        createStartSpanOptions(query, data),
-        handleSpanStart(() => target.apply(thisArg, args), { query })
-      );
-    }
-  });
-  patchedStatement.add(statement);
-  return statement;
-}
-function handleSpanStart(fn, breadcrumbOpts) {
-  return async (span) => {
-    try {
-      const result = await fn();
-      if (breadcrumbOpts) {
-        createBreadcrumb(breadcrumbOpts.query);
-      }
-      return result;
-    } catch (error) {
-      span.setStatus({ code: SPAN_STATUS_ERROR, message: "internal_error" });
-      captureException(error, {
-        mechanism: {
-          handled: false,
-          type: SENTRY_ORIGIN
-        }
-      });
-      throw error;
-    } finally {
-      await flushIfServerless();
-    }
-  };
-}
-function createBreadcrumb(query) {
-  addBreadcrumb({
-    category: "query",
-    message: query,
-    data: {
-      "db.query.text": query
-    }
-  });
-}
-function createStartSpanOptions(query, data) {
-  return {
-    name: query,
-    attributes: {
-      "db.query.text": query,
-      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: SENTRY_ORIGIN,
-      [SEMANTIC_ATTRIBUTE_SENTRY_OP]: "db.query",
-      ...data
-    }
-  };
-}

package/build/module/runtime/plugins/handler-legacy.server.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (nitroApp: import("nitropack").NitroApp) => void;
+export default _default;

package/build/module/runtime/plugins/handler-legacy.server.js

@@ -0,0 +1,4 @@
+import { patchEventHandler } from "../utils/patchEventHandler.js";
+export default (nitroApp) => {
+  nitroApp.h3App.handler = patchEventHandler(nitroApp.h3App.handler);
+};

package/build/module/runtime/plugins/handler.server.d.ts

@@ -0,0 +1,6 @@
+import type { NitroApp } from 'nitro/types';
+/**
+ * This plugin patches the h3 event handler for Nuxt v5+ (Nitro v3+).
+ */
+declare const _default: (nitroApp: NitroApp) => void;
+export default _default;

package/build/module/runtime/plugins/handler.server.js

@@ -0,0 +1,6 @@
+import { patchEventHandler } from "../utils/patchEventHandler.js";
+export default (nitroApp) => {
+  if (nitroApp?.h3?.handler) {
+    nitroApp.h3.handler = patchEventHandler(nitroApp.h3.handler);
+  }
+};

package/build/module/runtime/plugins/sentry.server.js

@@ -1,21 +1,16 @@
-import {
-  debug,
-  flushIfServerless,
-  getDefaultIsolationScope,
-  getIsolationScope,
-  withIsolationScope
-} from "@sentry/core";
+import { debug } from "@sentry/core";
 import { sentryCaptureErrorHook } from "../hooks/captureErrorHook.js";
 import { updateRouteBeforeResponse } from "../hooks/updateRouteBeforeResponse.js";
 import { addSentryTracingMetaTags } from "../utils.js";
 export default (nitroApp) => {
-  nitroApp.h3App.handler = patchEventHandler(nitroApp.h3App.handler);
   nitroApp.hooks.hook("beforeResponse", updateRouteBeforeResponse);
   nitroApp.hooks.hook("error", sentryCaptureErrorHook);
   nitroApp.hooks.hook("render:html", (html, { event }) => {
-    const headers = event.node.res?.getHeaders() || {};
-    const isPreRenderedPage = Object.keys(headers).includes("x-nitro-prerender");
-    const isSWRCachedPage = event?.context?.cache?.options.swr;
+    const nodeResHeadersH3v1 = event.node?.res?.getHeaders() || {};
+    const isPreRenderedPage = Object.keys(nodeResHeadersH3v1).includes("x-nitro-prerender") || // fix   × typescript-eslint(no-unsafe-member-access): Unsafe member access .res on an `any` value.
+    // oxlint-disable-next-line typescript/no-explicit-any,typescript-oxlint/no-unsafe-member-access
+    !!event.res?.headers?.has?.("x-nitro-prerender");
+    const isSWRCachedPage = event?.context?.cache?.options?.swr;
     if (!isPreRenderedPage && !isSWRCachedPage) {
       addSentryTracingMetaTags(html.head);
     } else {
@@ -26,21 +21,3 @@ export default (nitroApp) => {
     }
   });
 };
-function patchEventHandler(handler) {
-  return new Proxy(handler, {
-    async apply(handlerTarget, handlerThisArg, handlerArgs) {
-      const isolationScope = getIsolationScope();
-      const newIsolationScope = isolationScope === getDefaultIsolationScope() ? isolationScope.clone() : isolationScope;
-      debug.log(
-        `Patched h3 event handler. ${isolationScope === newIsolationScope ? "Using existing" : "Created new"} isolation scope.`
-      );
-      return withIsolationScope(newIsolationScope, async () => {
-        try {
-          return await handlerTarget.apply(handlerThisArg, handlerArgs);
-        } finally {
-          await flushIfServerless();
-        }
-      });
-    }
-  });
-}

package/build/module/runtime/plugins/storage-legacy.server.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Nitro plugin that instruments storage driver calls for Nuxt v3/v4 (Nitro v2)
+ */
+declare const _default: (_nitroApp: import("nitropack").NitroApp) => Promise<void>;
+export default _default;

package/build/module/runtime/plugins/storage-legacy.server.js

@@ -0,0 +1,6 @@
+import { useStorage } from "nitropack/runtime";
+import { userStorageMounts } from "#sentry/storage-config.mjs";
+import { createStoragePlugin } from "../utils/instrumentStorage.js";
+export default async (_nitroApp) => {
+  await createStoragePlugin(useStorage, userStorageMounts);
+};

package/build/module/runtime/plugins/storage.server.d.ts

@@ -1,5 +1,7 @@
 /**
- * Creates a Nitro plugin that instruments the storage driver.
+ * Nitro plugin that instruments storage driver calls for Nuxt v5+ (Nitro v3+)
  */
-declare const _default: (_nitroApp: import("nitropack").NitroApp) => Promise<void>;
+declare const _default: (_nitroApp: import("nitro/types").NitroApp & {
+    hooks: NonNullable<import("nitro/types").NitroApp["hooks"]>;
+}) => Promise<void>;
 export default _default;