@sentry/nuxt 8.35.0-alpha.0 → 8.35.0

package/build/module/module.mjs

@@ -5,16 +5,60 @@ import * as fs from 'fs';
 import { sentryRollupPlugin } from '@sentry/rollup-plugin';
 import { sentryVitePlugin } from '@sentry/vite-plugin';
 
+function findDefaultSdkInitFile(type) {
+  const possibleFileExtensions = ["ts", "js", "mjs", "cjs", "mts", "cts"];
+  const cwd = process.cwd();
+  const filePaths = [];
+  if (type === "server") {
+    for (const ext of possibleFileExtensions) {
+      filePaths.push(path.join(cwd, `sentry.${type}.config.${ext}`));
+      filePaths.push(path.join(cwd, "public", `instrument.${type}.${ext}`));
+    }
+  } else {
+    for (const ext of possibleFileExtensions) {
+      filePaths.push(path.join(cwd, `sentry.${type}.config.${ext}`));
+    }
+  }
+  return filePaths.find((filename) => fs.existsSync(filename));
+}
+const SENTRY_WRAPPED_ENTRY = "?sentry-query-wrapped-entry";
+const SENTRY_FUNCTIONS_REEXPORT = "?sentry-query-functions-reexport=";
+const QUERY_END_INDICATOR = "SENTRY-QUERY-END";
+function removeSentryQueryFromPath(url) {
+  const regex = new RegExp(`\\${SENTRY_WRAPPED_ENTRY}.*?\\${QUERY_END_INDICATOR}`);
+  return url.replace(regex, "");
+}
+function extractFunctionReexportQueryParameters(query) {
+  const regex = new RegExp(`\\${SENTRY_FUNCTIONS_REEXPORT}(.*?)\\${QUERY_END_INDICATOR}`);
+  const match = query.match(regex);
+  return match && match[1] ? match[1].split(",").filter((param) => param !== "").map((str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")) : [];
+}
+function constructFunctionReExport(pathWithQuery, entryId) {
+  const functionNames = extractFunctionReexportQueryParameters(pathWithQuery);
+  return functionNames.reduce(
+    (functionsCode, currFunctionName) => functionsCode.concat(
+      `async function reExport(...args) {
+  const res = await import(${JSON.stringify(entryId)});
+  return res.${currFunctionName}.call(this, ...args);
+}
+export { reExport as ${currFunctionName} };
+`
+    ),
+    ""
+  );
+}
+
+const SERVER_CONFIG_FILENAME = "sentry.server.config";
 function addServerConfigToBuild(moduleOptions, nuxt, nitro, serverConfigFile) {
   nuxt.hook("vite:extendConfig", async (viteInlineConfig, _env) => {
     if (typeof viteInlineConfig?.build?.rollupOptions?.input === "object" && "server" in viteInlineConfig.build.rollupOptions.input) {
-      viteInlineConfig.build.rollupOptions.input["sentry.server.config"] = createResolver(nuxt.options.srcDir).resolve(`/${serverConfigFile}`);
+      viteInlineConfig.build.rollupOptions.input[SERVER_CONFIG_FILENAME] = createResolver(nuxt.options.srcDir).resolve(`/${serverConfigFile}`);
     }
     nitro.hooks.hook("close", async () => {
       const buildDirResolver = createResolver(nitro.options.buildDir);
       const serverDirResolver = createResolver(nitro.options.output.serverDir);
-      const source = buildDirResolver.resolve("dist/server/sentry.server.config.mjs");
-      const destination = serverDirResolver.resolve("sentry.server.config.mjs");
+      const source = buildDirResolver.resolve(`dist/server/${SERVER_CONFIG_FILENAME}.mjs`);
+      const destination = serverDirResolver.resolve(`${SERVER_CONFIG_FILENAME}.mjs`);
       try {
         await fs.promises.access(source, fs.constants.F_OK);
         await fs.promises.copyFile(source, destination);
@@ -38,49 +82,74 @@ function addServerConfigToBuild(moduleOptions, nuxt, nitro, serverConfigFile) {
     });
   });
 }
-function addSentryTopImport(moduleOptions, nitro) {
-  nitro.hooks.hook("close", () => {
-    const presetsWithServerFile = ["netlify"];
-    const entryFileName = typeof nitro.options.rollupConfig?.output.entryFileNames === "string" ? nitro.options.rollupConfig?.output.entryFileNames : presetsWithServerFile.includes(nitro.options.preset) ? "server.mjs" : "index.mjs";
-    const serverDirResolver = createResolver(nitro.options.output.serverDir);
-    const entryFilePath = serverDirResolver.resolve(entryFileName);
-    try {
-      fs.readFile(entryFilePath, "utf8", (err, data) => {
-        const updatedContent = `import './sentry.server.config.mjs';
-${data}`;
-        fs.writeFile(entryFilePath, updatedContent, "utf8", () => {
-          if (moduleOptions.debug) {
-            consoleSandbox(() => {
-              console.log(
-                `[Sentry] Successfully added the Sentry import to the server entry file "\`${entryFilePath}\`"`
-              );
-            });
-          }
-        });
-      });
-    } catch (err) {
-      if (moduleOptions.debug) {
-        consoleSandbox(() => {
-          console.warn(
-            `[Sentry] An error occurred when trying to add the Sentry import to the server entry file "\`${entryFilePath}\`":`,
-            err
-          );
-        });
+function addDynamicImportEntryFileWrapper(nitro, serverConfigFile) {
+  if (!nitro.options.rollupConfig) {
+    nitro.options.rollupConfig = { output: {} };
+  }
+  if (nitro.options.rollupConfig?.plugins === null || nitro.options.rollupConfig?.plugins === void 0) {
+    nitro.options.rollupConfig.plugins = [];
+  } else if (!Array.isArray(nitro.options.rollupConfig.plugins)) {
+    nitro.options.rollupConfig.plugins = [nitro.options.rollupConfig.plugins];
+  }
+  nitro.options.rollupConfig.plugins.push(
+    // @ts-expect-error - This is the correct type, but it shows an error because of two different definitions
+    wrapEntryWithDynamicImport(createResolver(nitro.options.srcDir).resolve(`/${serverConfigFile}`))
+  );
+}
+function wrapEntryWithDynamicImport(resolvedSentryConfigPath) {
+  return {
+    name: "sentry-wrap-entry-with-dynamic-import",
+    async resolveId(source, importer, options) {
+      if (source.includes(`/${SERVER_CONFIG_FILENAME}`)) {
+        return { id: source, moduleSideEffects: true };
+      }
+      if (source === "import-in-the-middle/hook.mjs") {
+        return { id: source, moduleSideEffects: true, external: true };
+      }
+      if (options.isEntry && !source.includes(`.mjs${SENTRY_WRAPPED_ENTRY}`)) {
+        const resolution = await this.resolve(source, importer, options);
+        if (!resolution || resolution?.external)
+          return resolution;
+        const moduleInfo = await this.load(resolution);
+        moduleInfo.moduleSideEffects = true;
+        const exportedFunctions = moduleInfo.exportedBindings?.["."];
+        return resolution.id.includes(`.mjs${SENTRY_WRAPPED_ENTRY}`) ? resolution.id : resolution.id.concat(SENTRY_WRAPPED_ENTRY).concat(exportedFunctions?.length ? SENTRY_FUNCTIONS_REEXPORT.concat(exportedFunctions.join(",")) : "").concat(QUERY_END_INDICATOR);
       }
+      return null;
+    },
+    load(id) {
+      if (id.includes(`.mjs${SENTRY_WRAPPED_ENTRY}`)) {
+        const entryId = removeSentryQueryFromPath(id);
+        const reExportedFunctions = id.includes(SENTRY_FUNCTIONS_REEXPORT) ? constructFunctionReExport(id, entryId) : "";
+        return (
+          // Regular `import` of the Sentry config
+          `import ${JSON.stringify(resolvedSentryConfigPath)};
+import(${JSON.stringify(entryId)});
+import 'import-in-the-middle/hook.mjs';
+${reExportedFunctions}
+`
+        );
+      }
+      return null;
     }
-  });
+  };
 }
 
 function setupSourceMaps(moduleOptions, nuxt) {
   const sourceMapsUploadOptions = moduleOptions.sourceMapsUploadOptions || {};
   const sourceMapsEnabled = sourceMapsUploadOptions.enabled ?? true;
-  nuxt.hook("vite:extendConfig", async (viteInlineConfig, _env) => {
-    if (sourceMapsEnabled && viteInlineConfig.mode !== "development") {
-      viteInlineConfig.plugins = viteInlineConfig.plugins || [];
-      viteInlineConfig.plugins.push(sentryVitePlugin(getPluginOptions(moduleOptions)));
-      viteInlineConfig.build = viteInlineConfig.build || {};
-      viteInlineConfig.build.sourcemap = true;
-      logDebugInfo(moduleOptions, viteInlineConfig.build?.sourcemap);
+  nuxt.hook("modules:done", () => {
+    if (sourceMapsEnabled && !nuxt.options.dev) {
+      changeNuxtSourceMapSettings(nuxt, moduleOptions);
+    }
+  });
+  nuxt.hook("vite:extendConfig", async (viteConfig, _env) => {
+    if (sourceMapsEnabled && viteConfig.mode !== "development") {
+      const previousUserSourceMapSetting = changeViteSourceMapSettings(viteConfig, moduleOptions);
+      viteConfig.plugins = viteConfig.plugins || [];
+      viteConfig.plugins.push(
+        sentryVitePlugin(getPluginOptions(moduleOptions, previousUserSourceMapSetting === "unset"))
+      );
     }
   });
   nuxt.hook("nitro:config", (nitroConfig) => {
@@ -93,19 +162,25 @@ function setupSourceMaps(moduleOptions, nuxt) {
       } else if (!Array.isArray(nitroConfig.rollupConfig.plugins)) {
         nitroConfig.rollupConfig.plugins = [nitroConfig.rollupConfig.plugins];
       }
-      nitroConfig.rollupConfig.plugins.push(sentryRollupPlugin(getPluginOptions(moduleOptions)));
-      nitroConfig.rollupConfig.output = nitroConfig?.rollupConfig?.output || {};
-      nitroConfig.rollupConfig.output.sourcemap = true;
-      nitroConfig.rollupConfig.output.sourcemapExcludeSources = false;
-      logDebugInfo(moduleOptions, nitroConfig.rollupConfig.output?.sourcemap);
+      const previousUserSourceMapSetting = changeRollupSourceMapSettings(nitroConfig, moduleOptions);
+      nitroConfig.rollupConfig.plugins.push(
+        sentryRollupPlugin(getPluginOptions(moduleOptions, previousUserSourceMapSetting === "unset"))
+      );
     }
   });
 }
 function normalizePath(path) {
   return path.replace(/^(\.\.\/)+/, "./");
 }
-function getPluginOptions(moduleOptions) {
+function getPluginOptions(moduleOptions, deleteFilesAfterUpload) {
   const sourceMapsUploadOptions = moduleOptions.sourceMapsUploadOptions || {};
+  if (typeof sourceMapsUploadOptions.sourcemaps?.filesToDeleteAfterUpload === "undefined" && deleteFilesAfterUpload) {
+    consoleSandbox(() => {
+      console.log(
+        '[Sentry] Setting `sentry.sourceMapsUploadOptions.sourcemaps.filesToDeleteAfterUpload: [".*/**/*.map"]` to delete generated source maps after they were uploaded to Sentry.'
+      );
+    });
+  }
   return {
     org: sourceMapsUploadOptions.org ?? process.env.SENTRY_ORG,
     project: sourceMapsUploadOptions.project ?? process.env.SENTRY_PROJECT,
@@ -120,43 +195,129 @@ function getPluginOptions(moduleOptions) {
     ...moduleOptions?.unstable_sentryBundlerPluginOptions,
     sourcemaps: {
       // The server/client files are in different places depending on the nitro preset (e.g. '.output/server' or '.netlify/functions-internal/server')
-      // We cannot determine automatically how the build folder looks like (depends on the preset), so we have to accept that sourcemaps are uploaded multiple times (with the vitePlugin for Nuxt and the rollupPlugin for Nitro).
+      // We cannot determine automatically how the build folder looks like (depends on the preset), so we have to accept that source maps are uploaded multiple times (with the vitePlugin for Nuxt and the rollupPlugin for Nitro).
       // If we could know where the server/client assets are located, we could do something like this (based on the Nitro preset): isNitro ? ['./.output/server/**/*'] : ['./.output/public/**/*'],
       assets: sourceMapsUploadOptions.sourcemaps?.assets ?? void 0,
       ignore: sourceMapsUploadOptions.sourcemaps?.ignore ?? void 0,
-      filesToDeleteAfterUpload: sourceMapsUploadOptions.sourcemaps?.filesToDeleteAfterUpload ?? void 0,
+      filesToDeleteAfterUpload: sourceMapsUploadOptions.sourcemaps?.filesToDeleteAfterUpload ? sourceMapsUploadOptions.sourcemaps?.filesToDeleteAfterUpload : deleteFilesAfterUpload ? [".*/**/*.map"] : void 0,
       rewriteSources: (source) => normalizePath(source),
       ...moduleOptions?.unstable_sentryBundlerPluginOptions?.sourcemaps
     }
   };
 }
-function logDebugInfo(moduleOptions, sourceMapsPreviouslyEnabled) {
-  if (moduleOptions.debug && !sourceMapsPreviouslyEnabled) {
-    console.log("[Sentry]: Enabled source maps generation in the Vite build options.");
-    const sourceMapsUploadOptions = moduleOptions.sourceMapsUploadOptions || {};
-    if (!sourceMapsUploadOptions.sourcemaps?.filesToDeleteAfterUpload) {
-      console.warn(
-        "[Sentry] We recommend setting the `sourceMapsUploadOptions.sourcemaps.filesToDeleteAfterUpload` option to clean up source maps after uploading. Otherwise, source maps might be deployed to production, depending on your configuration"
-      );
+function changeNuxtSourceMapSettings(nuxt, sentryModuleOptions) {
+  nuxt.options = nuxt.options || {};
+  nuxt.options.sourcemap = nuxt.options.sourcemap ?? { server: void 0, client: void 0 };
+  let previousUserSourceMapSetting = {
+    client: void 0,
+    server: void 0
+  };
+  const nuxtSourceMap = nuxt.options.sourcemap;
+  if (typeof nuxtSourceMap === "string" || typeof nuxtSourceMap === "boolean" || typeof nuxtSourceMap === "undefined") {
+    switch (nuxtSourceMap) {
+      case false:
+        warnExplicitlyDisabledSourceMap("sourcemap");
+        previousUserSourceMapSetting = { client: "disabled", server: "disabled" };
+        break;
+      case "hidden":
+      case true:
+        logKeepSourceMapSetting(sentryModuleOptions, "sourcemap", nuxtSourceMap.toString());
+        previousUserSourceMapSetting = { client: "enabled", server: "enabled" };
+        break;
+      case void 0:
+        nuxt.options.sourcemap = { server: "hidden", client: "hidden" };
+        logSentryEnablesSourceMap("sourcemap.client", "hidden");
+        logSentryEnablesSourceMap("sourcemap.server", "hidden");
+        previousUserSourceMapSetting = { client: "unset", server: "unset" };
+        break;
+    }
+  } else {
+    if (nuxtSourceMap.client === false) {
+      warnExplicitlyDisabledSourceMap("sourcemap.client");
+      previousUserSourceMapSetting.client = "disabled";
+    } else if (["hidden", true].includes(nuxtSourceMap.client)) {
+      logKeepSourceMapSetting(sentryModuleOptions, "sourcemap.client", nuxtSourceMap.client.toString());
+      previousUserSourceMapSetting.client = "enabled";
+    } else {
+      nuxt.options.sourcemap.client = "hidden";
+      logSentryEnablesSourceMap("sourcemap.client", "hidden");
+      previousUserSourceMapSetting.client = "unset";
+    }
+    if (nuxtSourceMap.server === false) {
+      warnExplicitlyDisabledSourceMap("sourcemap.server");
+      previousUserSourceMapSetting.server = "disabled";
+    } else if (["hidden", true].includes(nuxtSourceMap.server)) {
+      logKeepSourceMapSetting(sentryModuleOptions, "sourcemap.server", nuxtSourceMap.server.toString());
+      previousUserSourceMapSetting.server = "enabled";
+    } else {
+      nuxt.options.sourcemap.server = "hidden";
+      logSentryEnablesSourceMap("sourcemap.server", "hidden");
+      previousUserSourceMapSetting.server = "unset";
     }
   }
+  return previousUserSourceMapSetting;
 }
-
-function findDefaultSdkInitFile(type) {
-  const possibleFileExtensions = ["ts", "js", "mjs", "cjs", "mts", "cts"];
-  const cwd = process.cwd();
-  const filePaths = [];
-  if (type === "server") {
-    for (const ext of possibleFileExtensions) {
-      filePaths.push(path.join(cwd, `sentry.${type}.config.${ext}`));
-      filePaths.push(path.join(cwd, "public", `instrument.${type}.${ext}`));
-    }
+function changeViteSourceMapSettings(viteConfig, sentryModuleOptions) {
+  viteConfig.build = viteConfig.build || {};
+  const viteSourceMap = viteConfig.build.sourcemap;
+  let previousUserSourceMapSetting;
+  if (viteSourceMap === false) {
+    warnExplicitlyDisabledSourceMap("vite.build.sourcemap");
+    previousUserSourceMapSetting = "disabled";
+  } else if (viteSourceMap && ["hidden", "inline", true].includes(viteSourceMap)) {
+    logKeepSourceMapSetting(sentryModuleOptions, "vite.build.sourcemap", viteSourceMap.toString());
+    previousUserSourceMapSetting = "enabled";
   } else {
-    for (const ext of possibleFileExtensions) {
-      filePaths.push(path.join(cwd, `sentry.${type}.config.${ext}`));
-    }
+    viteConfig.build.sourcemap = "hidden";
+    logSentryEnablesSourceMap("vite.build.sourcemap", "hidden");
+    previousUserSourceMapSetting = "unset";
   }
-  return filePaths.find((filename) => fs.existsSync(filename));
+  return previousUserSourceMapSetting;
+}
+function changeRollupSourceMapSettings(nitroConfig, sentryModuleOptions) {
+  nitroConfig.rollupConfig = nitroConfig.rollupConfig || {};
+  nitroConfig.rollupConfig.output = nitroConfig.rollupConfig.output || { sourcemap: void 0 };
+  let previousUserSourceMapSetting;
+  const nitroSourceMap = nitroConfig.rollupConfig.output.sourcemap;
+  if (nitroSourceMap === false) {
+    warnExplicitlyDisabledSourceMap("nitro.rollupConfig.output.sourcemap");
+    previousUserSourceMapSetting = "disabled";
+  } else if (nitroSourceMap && ["hidden", "inline", true].includes(nitroSourceMap)) {
+    logKeepSourceMapSetting(sentryModuleOptions, "nitro.rollupConfig.output.sourcemap", nitroSourceMap.toString());
+    previousUserSourceMapSetting = "enabled";
+  } else {
+    nitroConfig.rollupConfig.output.sourcemap = "hidden";
+    logSentryEnablesSourceMap("nitro.rollupConfig.output.sourcemap", "hidden");
+    previousUserSourceMapSetting = "unset";
+  }
+  nitroConfig.rollupConfig.output.sourcemapExcludeSources = false;
+  consoleSandbox(() => {
+    console.log(
+      "[Sentry] Disabled source map setting in the Nuxt config: `nitro.rollupConfig.output.sourcemapExcludeSources`. Source maps will include the actual code to be able to un-minify code snippets in Sentry."
+    );
+  });
+  return previousUserSourceMapSetting;
+}
+function logKeepSourceMapSetting(sentryNuxtModuleOptions, settingKey, settingValue) {
+  if (sentryNuxtModuleOptions.debug) {
+    consoleSandbox(() => {
+      console.log(
+        `[Sentry] We discovered \`${settingKey}\` is set to \`${settingValue}\`. Sentry will keep this source map setting. This will un-minify the code snippet on the Sentry Issue page.`
+      );
+    });
+  }
+}
+function warnExplicitlyDisabledSourceMap(settingKey) {
+  consoleSandbox(() => {
+    console.warn(
+      `[Sentry] Parts of source map generation are currently disabled in your Nuxt configuration (\`${settingKey}: false\`). This setting is either a default setting or was explicitly set in your configuration. Sentry won't override this setting. Without source maps, code snippets on the Sentry Issues page will remain minified. To show unminified code, enable source maps in \`${settingKey}\`.`
+    );
+  });
+}
+function logSentryEnablesSourceMap(settingKey, settingValue) {
+  consoleSandbox(() => {
+    console.log(`[Sentry] Enabled source map generation in the build options with \`${settingKey}: ${settingValue}\`.`);
+  });
 }
 
 const module = defineNuxtModule({
@@ -168,7 +329,12 @@ const module = defineNuxtModule({
     }
   },
   defaults: {},
-  setup(moduleOptions, nuxt) {
+  setup(moduleOptionsParam, nuxt) {
+    const moduleOptions = {
+      ...moduleOptionsParam,
+      dynamicImportForServerEntry: moduleOptionsParam.dynamicImportForServerEntry !== false
+      // default: true
+    };
     const moduleDirResolver = createResolver(import.meta.url);
     const buildDirResolver = createResolver(nuxt.options.buildDir);
     const clientConfigFile = findDefaultSdkInitFile("client");
@@ -192,13 +358,15 @@ const module = defineNuxtModule({
     }
     const serverConfigFile = findDefaultSdkInitFile("server");
     if (serverConfigFile) {
-      addPluginTemplate({
-        mode: "server",
-        filename: "sentry-server-config.mjs",
-        getContents: () => `import "${buildDirResolver.resolve(`/${serverConfigFile}`)}"
+      if (moduleOptions.dynamicImportForServerEntry === false) {
+        addPluginTemplate({
+          mode: "server",
+          filename: "sentry-server-config.mjs",
+          getContents: () => `import "${buildDirResolver.resolve(`/${serverConfigFile}`)}"
 import { defineNuxtPlugin } from "#imports"
 export default defineNuxtPlugin(() => {})`
-      });
+        });
+      }
       addServerPlugin(moduleDirResolver.resolve("./runtime/plugins/sentry.server"));
     }
     if (clientConfigFile || serverConfigFile) {
@@ -206,10 +374,15 @@ export default defineNuxtPlugin(() => {})`
     }
     nuxt.hooks.hook("nitro:init", (nitro) => {
       if (serverConfigFile && serverConfigFile.includes(".server.config")) {
-        addServerConfigToBuild(moduleOptions, nuxt, nitro, serverConfigFile);
-        if (moduleOptions.experimental_basicServerTracing) {
-          addSentryTopImport(moduleOptions, nitro);
-        } else {
+        if (nitro.options.dev) {
+          consoleSandbox(() => {
+            console.log(
+              "[Sentry] Your application is running in development mode. Note: @sentry/nuxt is in beta and may not work as expected on the server-side (Nitro). Errors are reported, but tracing does not work."
+            );
+          });
+        }
+        if (moduleOptions.dynamicImportForServerEntry === false) {
+          addServerConfigToBuild(moduleOptions, nuxt, nitro, serverConfigFile);
           if (moduleOptions.debug) {
             const serverDirResolver = createResolver(nitro.options.output.serverDir);
             const serverConfigPath = serverDirResolver.resolve("sentry.server.config.mjs");
@@ -220,6 +393,15 @@ export default defineNuxtPlugin(() => {})`
               );
             });
           }
+        } else {
+          addDynamicImportEntryFileWrapper(nitro, serverConfigFile);
+          if (moduleOptions.debug) {
+            consoleSandbox(() => {
+              console.log(
+                "[Sentry] Wrapping the server entry file with a dynamic `import()`, so Sentry can be preloaded before the server initializes."
+              );
+            });
+          }
         }
       }
     });

package/build/types/common/types.d.ts

@@ -90,16 +90,19 @@ export type SentryNuxtModuleOptions = {
      */
     debug?: boolean;
     /**
-     * Enabling basic server tracing can be used for environments where modifying the node option `--import` is not possible.
-     * However, enabling this option only supports limited tracing instrumentation. Only http traces will be collected (but no database-specific traces etc.).
+     * Wraps the server entry file with a dynamic `import()`. This will make it possible to preload Sentry and register
+     * necessary hooks before other code runs. (Node docs: https://nodejs.org/api/module.html#enabling)
      *
-     * If this option is `true`, the Sentry SDK will import the Sentry server config at the top of the server entry file to load the SDK on the server.
+     * If this option is `false`, the Sentry SDK won't wrap the server entry file with `import()`. Not wrapping the
+     * server entry file will disable Sentry on the server-side. When you set this option to `false`, make sure
+     * to add the Sentry server config with the node `--import` CLI flag to enable Sentry on the server-side.
      *
-     * **DO NOT** enable this option if you've already added the node option `--import` in your node start script. This would initialize Sentry twice on the server-side and leads to unexpected issues.
+     * **DO NOT** add the node CLI flag `--import` in your node start script, when `dynamicImportForServerEntry` is set to `true` (default).
+     * This would initialize Sentry twice on the server-side and this leads to unexpected issues.
      *
-     * @default false
+     * @default true
      */
-    experimental_basicServerTracing?: boolean;
+    dynamicImportForServerEntry?: boolean;
     /**
      * Options to be passed directly to the Sentry Rollup Plugin (`@sentry/rollup-plugin`) and Sentry Vite Plugin (`@sentry/vite-plugin`) that ship with the Sentry Nuxt SDK.
      * You can use this option to override any options the SDK passes to the Vite (for Nuxt) and Rollup (for Nitro) plugin.

package/build/types/common/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/common/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,KAAK,EAAE,IAAI,IAAI,OAAO,EAAE,MAAM,aAAa,CAAC;AAGnD,MAAM,MAAM,uBAAuB,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,EAAE,KAAK,CAAC,CAAC;AAC1F,MAAM,MAAM,uBAAuB,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,EAAE,KAAK,CAAC,CAAC;AAE3F,KAAK,iBAAiB,GAAG;IACvB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,UAAU,CAAC,EAAE;QACX;;;;;;;;;WASG;QACH,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAEhC;;;;;;;WAOG;QACH,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAEhC;;;;;;;WAOG;QACH,wBAAwB,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;KACnD,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG;IACpC;;;;;OAKG;IACH,uBAAuB,CAAC,EAAE,iBAAiB,CAAC;IAE5C;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;;;;;;;OASG;IACH,+BAA+B,CAAC,EAAE,OAAO,CAAC;IAE1C;;;;;OAKG;IACH,mCAAmC,CAAC,EAAE,yBAAyB,GAAG,uBAAuB,CAAC;CAC3F,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/common/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,KAAK,EAAE,IAAI,IAAI,OAAO,EAAE,MAAM,aAAa,CAAC;AAGnD,MAAM,MAAM,uBAAuB,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,EAAE,KAAK,CAAC,CAAC;AAC1F,MAAM,MAAM,uBAAuB,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,EAAE,KAAK,CAAC,CAAC;AAE3F,KAAK,iBAAiB,GAAG;IACvB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,UAAU,CAAC,EAAE;QACX;;;;;;;;;WASG;QACH,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAEhC;;;;;;;WAOG;QACH,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAEhC;;;;;;;WAOG;QACH,wBAAwB,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;KACnD,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG;IACpC;;;;;OAKG;IACH,uBAAuB,CAAC,EAAE,iBAAiB,CAAC;IAE5C;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;;;;;;;;;;OAYG;IACH,2BAA2B,CAAC,EAAE,OAAO,CAAC;IAEtC;;;;;OAKG;IACH,mCAAmC,CAAC,EAAE,yBAAyB,GAAG,uBAAuB,CAAC;CAC3F,CAAC"}

package/build/types/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/module.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAK9D,MAAM,MAAM,aAAa,GAAG,uBAAuB,CAAC;;AAEpD,wBAkFG"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/module.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAK9D,MAAM,MAAM,aAAa,GAAG,uBAAuB,CAAC;;AAEpD,wBA2GG"}

package/build/types/server/sdk.d.ts

@@ -13,4 +13,8 @@ export declare function init(options: SentryNuxtServerOptions): Client | undefin
  * Only exported for Testing purposes.
  */
 export declare function mergeRegisterEsmLoaderHooks(options: SentryNuxtServerOptions): SentryNuxtServerOptions['registerEsmLoaderHooks'];
+/**
+ * Flushes pending Sentry events with a 2-second timeout and in a way that cannot create unhandled promise rejections.
+ */
+export declare function flushSafelyWithTimeout(): Promise<void>;
 //# sourceMappingURL=sdk.d.ts.map

package/build/types/server/sdk.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sdk.d.ts","sourceRoot":"","sources":["../../../src/server/sdk.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAkB,MAAM,eAAe,CAAC;AAG5D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE/D;;;;GAIG;AACH,wBAAgB,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,MAAM,GAAG,SAAS,CAkCzE;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,uBAAuB,GAC/B,uBAAuB,CAAC,wBAAwB,CAAC,CASnD"}
+{"version":3,"file":"sdk.d.ts","sourceRoot":"","sources":["../../../src/server/sdk.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAA+B,MAAM,eAAe,CAAC;AAGzE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE/D;;;;GAIG;AACH,wBAAgB,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,MAAM,GAAG,SAAS,CAmCzE;AAiBD;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,uBAAuB,GAC/B,uBAAuB,CAAC,wBAAwB,CAAC,CASnD;AAED;;GAEG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC,CAQ5D"}

package/build/types/vite/addServerConfig.d.ts

@@ -9,9 +9,11 @@ import type { SentryNuxtModuleOptions } from '../common/types';
  */
 export declare function addServerConfigToBuild(moduleOptions: SentryNuxtModuleOptions, nuxt: Nuxt, nitro: Nitro, serverConfigFile: string): void;
 /**
- *  Adds the Sentry server config import at the top of the server entry file to load the SDK on the server.
- *  This is necessary for environments where modifying the node option `--import` is not possible.
- *  However, only limited tracing instrumentation is supported when doing this.
+ * This function modifies the Rollup configuration to include a plugin that wraps the entry file with a dynamic import (`import()`)
+ * and adds the Sentry server config with the static `import` declaration.
+ *
+ * With this, the Sentry server config can be loaded before all other modules of the application (which is needed for import-in-the-middle).
+ * See: https://nodejs.org/api/module.html#enabling
  */
-export declare function addSentryTopImport(moduleOptions: SentryNuxtModuleOptions, nitro: Nitro): void;
+export declare function addDynamicImportEntryFileWrapper(nitro: Nitro, serverConfigFile: string): void;
 //# sourceMappingURL=addServerConfig.d.ts.map

package/build/types/vite/addServerConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addServerConfig.d.ts","sourceRoot":"","sources":["../../../src/vite/addServerConfig.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE/D;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,aAAa,EAAE,uBAAuB,EACtC,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,gBAAgB,EAAE,MAAM,GACvB,IAAI,CA8CN;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,uBAAuB,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,CAyC7F"}
+{"version":3,"file":"addServerConfig.d.ts","sourceRoot":"","sources":["../../../src/vite/addServerConfig.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAEvC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAW/D;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,aAAa,EAAE,uBAAuB,EACtC,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,gBAAgB,EAAE,MAAM,GACvB,IAAI,CA8CN;AAED;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAgB7F"}

package/build/types/vite/sourceMaps.d.ts

@@ -1,7 +1,12 @@
 import type { Nuxt } from '@nuxt/schema';
 import { type SentryRollupPluginOptions } from '@sentry/rollup-plugin';
 import { type SentryVitePluginOptions } from '@sentry/vite-plugin';
+import type { OutputOptions } from 'rollup';
 import type { SentryNuxtModuleOptions } from '../common/types';
+/**
+ * Whether the user enabled (true, 'hidden', 'inline') or disabled (false) source maps
+ */
+export type UserSourceMapSetting = 'enabled' | 'disabled' | 'unset' | undefined;
 /**
  *  Setup source maps for Sentry inside the Nuxt module during build time (in Vite for Nuxt and Rollup for Nitro).
  */
@@ -11,5 +16,25 @@ export declare function setupSourceMaps(moduleOptions: SentryNuxtModuleOptions,
  *
  *  Only exported for Testing purposes.
  */
-export declare function getPluginOptions(moduleOptions: SentryNuxtModuleOptions): SentryVitePluginOptions | SentryRollupPluginOptions;
+export declare function getPluginOptions(moduleOptions: SentryNuxtModuleOptions, deleteFilesAfterUpload: boolean): SentryVitePluginOptions | SentryRollupPluginOptions;
+/** only exported for testing */
+export declare function changeNuxtSourceMapSettings(nuxt: Nuxt, sentryModuleOptions: SentryNuxtModuleOptions): {
+    client: UserSourceMapSetting;
+    server: UserSourceMapSetting;
+};
+/** only exported for testing */
+export declare function changeViteSourceMapSettings(viteConfig: {
+    build?: {
+        sourcemap?: boolean | 'inline' | 'hidden';
+    };
+}, sentryModuleOptions: SentryNuxtModuleOptions): UserSourceMapSetting;
+/** only exported for testing */
+export declare function changeRollupSourceMapSettings(nitroConfig: {
+    rollupConfig?: {
+        output?: {
+            sourcemap?: OutputOptions['sourcemap'];
+            sourcemapExcludeSources?: OutputOptions['sourcemapExcludeSources'];
+        };
+    };
+}, sentryModuleOptions: SentryNuxtModuleOptions): UserSourceMapSetting;
 //# sourceMappingURL=sourceMaps.d.ts.map

package/build/types/vite/sourceMaps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sourceMaps.d.ts","sourceRoot":"","sources":["../../../src/vite/sourceMaps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,KAAK,yBAAyB,EAAsB,MAAM,uBAAuB,CAAC;AAC3F,OAAO,EAAE,KAAK,uBAAuB,EAAoB,MAAM,qBAAqB,CAAC;AAErF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE/D;;GAEG;AACH,wBAAgB,eAAe,CAAC,aAAa,EAAE,uBAAuB,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI,CA0CxF;AASD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,aAAa,EAAE,uBAAuB,GACrC,uBAAuB,GAAG,yBAAyB,CA2BrD"}
+{"version":3,"file":"sourceMaps.d.ts","sourceRoot":"","sources":["../../../src/vite/sourceMaps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,KAAK,yBAAyB,EAAsB,MAAM,uBAAuB,CAAC;AAE3F,OAAO,EAAE,KAAK,uBAAuB,EAAoB,MAAM,qBAAqB,CAAC;AAErF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE/D;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,SAAS,GAAG,UAAU,GAAG,OAAO,GAAG,SAAS,CAAC;AAEhF;;GAEG;AACH,wBAAgB,eAAe,CAAC,aAAa,EAAE,uBAAuB,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI,CA2CxF;AASD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,aAAa,EAAE,uBAAuB,EACtC,sBAAsB,EAAE,OAAO,GAC9B,uBAAuB,GAAG,yBAAyB,CAwCrD;AAgBD,gCAAgC;AAChC,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,mBAAmB,EAAE,uBAAuB,GAC3C;IAAE,MAAM,EAAE,oBAAoB,CAAC;IAAC,MAAM,EAAE,oBAAoB,CAAA;CAAE,CAyDhE;AAED,gCAAgC;AAChC,wBAAgB,2BAA2B,CACzC,UAAU,EAAE;IAAE,KAAK,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAA;KAAE,CAAA;CAAE,EACrE,mBAAmB,EAAE,uBAAuB,GAC3C,oBAAoB,CAmBtB;AAED,gCAAgC;AAChC,wBAAgB,6BAA6B,CAC3C,WAAW,EAAE;IACX,YAAY,CAAC,EAAE;QACb,MAAM,CAAC,EAAE;YACP,SAAS,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;YACvC,uBAAuB,CAAC,EAAE,aAAa,CAAC,yBAAyB,CAAC,CAAC;SACpE,CAAC;KACH,CAAC;CACH,EACD,mBAAmB,EAAE,uBAAuB,GAC3C,oBAAoB,CA6BtB"}

package/build/types/vite/utils.d.ts

@@ -3,4 +3,26 @@
  *  The sentry.server.config file is prioritized over the instrument.server file.
  */
 export declare function findDefaultSdkInitFile(type: 'server' | 'client'): string | undefined;
+export declare const SENTRY_WRAPPED_ENTRY = "?sentry-query-wrapped-entry";
+export declare const SENTRY_FUNCTIONS_REEXPORT = "?sentry-query-functions-reexport=";
+export declare const QUERY_END_INDICATOR = "SENTRY-QUERY-END";
+/**
+ * Strips the Sentry query part from a path.
+ * Example: example/path?sentry-query-wrapped-entry?sentry-query-functions-reexport=foo,SENTRY-QUERY-END -> /example/path
+ *
+ * Only exported for testing.
+ */
+export declare function removeSentryQueryFromPath(url: string): string;
+/**
+ * Extracts and sanitizes function re-export query parameters from a query string.
+ * If it is a default export, it is not considered for re-exporting. This function is mostly relevant for re-exporting
+ * serverless `handler` functions.
+ *
+ * Only exported for testing.
+ */
+export declare function extractFunctionReexportQueryParameters(query: string): string[];
+/**
+ * Constructs a code snippet with function reexports (can be used in Rollup plugins)
+ */
+export declare function constructFunctionReExport(pathWithQuery: string, entryId: string): string;
 //# sourceMappingURL=utils.d.ts.map

package/build/types/vite/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/vite/utils.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,SAAS,CAkBpF"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/vite/utils.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,SAAS,CAkBpF;AAED,eAAO,MAAM,oBAAoB,gCAAgC,CAAC;AAClE,eAAO,MAAM,yBAAyB,sCAAsC,CAAC;AAC7E,eAAO,MAAM,mBAAmB,qBAAqB,CAAC;AAEtD;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAI7D;AAED;;;;;;GAMG;AACH,wBAAgB,sCAAsC,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAa9E;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAcxF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nuxt",
-  "version": "8.35.0-alpha.0",
+  "version": "8.35.0",
   "description": "Official Sentry SDK for Nuxt (EXPERIMENTAL)",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nuxt",
@@ -43,15 +43,15 @@
   },
   "dependencies": {
     "@nuxt/kit": "^3.13.2",
-    "@sentry/browser": "8.35.0-alpha.0",
-    "@sentry/core": "8.35.0-alpha.0",
-    "@sentry/node": "8.35.0-alpha.0",
-    "@sentry/opentelemetry": "8.35.0-alpha.0",
+    "@sentry/browser": "8.35.0",
+    "@sentry/core": "8.35.0",
+    "@sentry/node": "8.35.0",
+    "@sentry/opentelemetry": "8.35.0",
     "@sentry/rollup-plugin": "2.22.3",
-    "@sentry/types": "8.35.0-alpha.0",
-    "@sentry/utils": "8.35.0-alpha.0",
+    "@sentry/types": "8.35.0",
+    "@sentry/utils": "8.35.0",
     "@sentry/vite-plugin": "2.22.3",
-    "@sentry/vue": "8.35.0-alpha.0"
+    "@sentry/vue": "8.35.0"
   },
   "devDependencies": {
     "@nuxt/module-builder": "^0.8.4",