review suggestions

Author: s1gr1d

dev-packages/rollup-utils/npmHelpers.mjs

@@ -132,9 +132,15 @@ export function makeBaseNPMConfig(options = {}) {
 }
 
 export function makeNPMConfigVariants(baseConfig, options = {}) {
-  const { emitEsm = true } = options;
+  const { emitEsm = true, emitCjs = true } = options;
 
-  const variantSpecificConfigs = [{ output: { format: 'cjs', dir: path.join(baseConfig.output.dir, 'cjs') } }];
+  const variantSpecificConfigs = [];
+
+  if (emitCjs) {
+    variantSpecificConfigs.push({
+      output: { format: 'cjs', dir: path.join(baseConfig.output.dir, 'cjs') },
+    });
+  }
 
   if (emitEsm) {
     variantSpecificConfigs.push({

packages/nitro-utils/package.json

@@ -7,25 +7,21 @@
   "author": "Sentry",
   "license": "MIT",
   "private": true,
+  "type": "module",
   "engines": {
     "node": ">=14.18"
   },
   "files": [
     "/build"
   ],
-  "main": "build/cjs/index.js",
-  "module": "build/esm/index.js",
+  "main": "build/esm/index.js",
   "types": "build/types/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
       "import": {
         "types": "./build/types/index.d.ts",
         "default": "./build/esm/index.js"
-      },
-      "require": {
-        "types": "./build/types/index.d.ts",
-        "default": "./build/cjs/index.js"
       }
     }
   },
@@ -40,10 +36,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "8.36.0",
     "@sentry/types": "8.36.0",
     "@sentry/utils": "8.36.0"
   },
+  "devDependencies": {
+    "rollup": "^4.24.4"
+  },
   "scripts": {
     "build": "run-p build:transpile build:types",
     "build:dev": "yarn build",

packages/nitro-utils/rollup.npm.config.mjs

@@ -14,4 +14,5 @@ export default makeNPMConfigVariants(
       },
     },
   }),
+  { emitCjs: false },
 );

packages/nitro-utils/src/index.ts

@@ -1 +1,4 @@
-export { wrapServerEntryWithDynamicImport } from './rollupPlugins/wrapServerEntryWithDynamicImport';
+export {
+  wrapServerEntryWithDynamicImport,
+  type WrapServerEntryPluginOptions,
+} from './rollupPlugins/wrapServerEntryWithDynamicImport';

packages/nitro-utils/src/rollupPlugins/wrapServerEntryWithDynamicImport.ts

@@ -6,6 +6,15 @@ export const SENTRY_WRAPPED_FUNCTIONS = '?sentry-query-wrapped-functions=';
 export const SENTRY_REEXPORTED_FUNCTIONS = '?sentry-query-reexported-functions=';
 export const QUERY_END_INDICATOR = 'SENTRY-QUERY-END';
 
+export type WrapServerEntryPluginOptions = {
+  serverEntrypointFileName: string;
+  serverConfigFileName: string;
+  resolvedServerConfigPath: string;
+  entrypointWrappedFunctions: string[];
+  additionalImports?: string[];
+  debug?: boolean;
+};
+
 /**
  * A Rollup plugin which wraps the server entry with a dynamic `import()`. This makes it possible to initialize Sentry first
  * by using a regular `import` and load the server after that.
@@ -18,15 +27,15 @@ export const QUERY_END_INDICATOR = 'SENTRY-QUERY-END';
  * @param config.additionalImports Adds additional imports to the entry file. Can be e.g. 'import-in-the-middle/hook.mjs'
  * @param config.debug Whether debug logs are enabled in the build time environment
  */
-export function wrapServerEntryWithDynamicImport(config: {
-  serverConfigFileName: string;
-  resolvedServerConfigPath: string;
-  entrypointWrappedFunctions: string[];
-  additionalImports?: string[];
-  debug?: boolean;
-}): InputPluginOption {
-  const { serverConfigFileName, resolvedServerConfigPath, entrypointWrappedFunctions, additionalImports, debug } =
-    config;
+export function wrapServerEntryWithDynamicImport(config: WrapServerEntryPluginOptions): InputPluginOption {
+  const {
+    serverEntrypointFileName,
+    serverConfigFileName,
+    resolvedServerConfigPath,
+    entrypointWrappedFunctions,
+    additionalImports,
+    debug,
+  } = config;
 
   return {
     name: 'sentry-wrap-server-entry-with-dynamic-import',
@@ -43,7 +52,12 @@ export function wrapServerEntryWithDynamicImport(config: {
         return { id: source, moduleSideEffects: true, external: true };
       }
 
-      if (options.isEntry && source.includes('.mjs') && !source.includes(`.mjs${SENTRY_WRAPPED_ENTRY}`)) {
+      if (
+        options.isEntry &&
+        source.includes(serverEntrypointFileName) &&
+        source.includes('.mjs') &&
+        !source.includes(`.mjs${SENTRY_WRAPPED_ENTRY}`)
+      ) {
         const resolution = await this.resolve(source, importer, options);
 
         // If it cannot be resolved or is external, just return it so that Rollup can display an error

packages/nuxt/build.config.ts

@@ -0,0 +1,7 @@
+import { defineBuildConfig } from 'unbuild';
+
+// Build Config for the Nuxt Module Builder: https://github.com/nuxt/module-builder
+export default defineBuildConfig({
+  // The devDependency "@sentry-internal/nitro-utils" triggers "Inlined implicit external", but it's not external
+  failOnWarn: false,
+});

packages/nuxt/src/common/types.ts

@@ -130,6 +130,15 @@ export type SentryNuxtModuleOptions = {
    */
   entrypointWrappedFunctions?: string[];
 
+  /**
+   * By default—unless you configure `dynamicImportForServerEntry: false`—the SDK will try to wrap your Nitro server entrypoint
+   * with a dynamic `import()` to ensure all dependencies can be properly instrumented.
+   *
+   * The server entrypoint filename is automatically set by the Sentry SDK depending on the Nitro present.
+   * In case the server entrypoint has a different filename, you can overwrite it here.
+   */
+  serverEntrypointFileName?: string;
+
   /**
    * 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.

packages/nuxt/src/vite/addServerConfig.ts

@@ -93,6 +93,7 @@ export function addDynamicImportEntryFileWrapper(
 
   nitro.options.rollupConfig.plugins.push(
     wrapServerEntryWithDynamicImport({
+      serverEntrypointFileName: moduleOptions.serverEntrypointFileName || nitro.options.preset,
       serverConfigFileName: SERVER_CONFIG_FILENAME,
       resolvedServerConfigPath: createResolver(nitro.options.srcDir).resolve(`/${serverConfigFile}`),
       entrypointWrappedFunctions: moduleOptions.entrypointWrappedFunctions,

packages/nuxt/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.json",
 
-  "include": ["src/**/*"],
+  "include": ["src/**/*", "build.config.ts"],
 
   "compilerOptions": {
     // package-specific options