import from #imports/server

Author: s1gr1d

packages/nuxt/src/module.ts

@@ -21,7 +21,7 @@ import {
   DEV_SERVER_CONFIG_PATH,
 } from './vite/addServerConfig';
 import { addDatabaseInstrumentation } from './vite/databaseConfig';
-import { addMiddlewareInstrumentation } from './vite/middlewareConfig';
+import { addMiddlewareImports, addMiddlewareInstrumentation } from './vite/middlewareConfig';
 import { setupOrchestrion } from './vite/orchestrion';
 import { setupSourceMaps } from './vite/sourceMaps';
 import { addStorageInstrumentation } from './vite/storageConfig';
@@ -120,6 +120,8 @@ export default defineNuxtModule<ModuleOptions>({
         addPlugin({ src: moduleDirResolver.resolve('./runtime/plugins/route-detector-legacy.server'), mode: 'server' });
       }
 
+      // Preps the middleware instrumentation module.
+      addMiddlewareImports();
       addStorageInstrumentation(nuxt, !isNitroV3);
       addDatabaseInstrumentation(nuxt.options.nitro, !isNitroV3, moduleOptions);
 
@@ -190,7 +192,7 @@ export default defineNuxtModule<ModuleOptions>({
       }
 
       if (serverConfigFile) {
-        addMiddlewareInstrumentation(nitro);
+        addMiddlewareInstrumentation(nitro, isNitroV3);
 
         consoleSandbox(() => {
           const serverDir = nitro.options.output.serverDir;

packages/nuxt/src/vite/middlewareConfig.ts

@@ -1,14 +1,27 @@
-import { createResolver } from '@nuxt/kit';
+import { addServerImports, createResolver } from '@nuxt/kit';
 import type { Nitro } from 'nitropack/types';
 import * as path from 'path';
 import type { InputPluginOption } from 'rollup';
 
+/**
+ * Adds a server import for the middleware instrumentation.
+ */
+export function addMiddlewareImports(): void {
+  addServerImports([
+    {
+      name: 'wrapMiddlewareHandlerWithSentry',
+      from: createResolver(import.meta.url).resolve('./runtime/hooks/wrapMiddlewareHandler'),
+    },
+  ]);
+}
+
 /**
  * Adds middleware instrumentation to the Nitro build.
  *
  * @param nitro Nitro instance
+ * @param isNitroV3 Whether the app builds with Nitro v3 (Nuxt 5)
  */
-export function addMiddlewareInstrumentation(nitro: Nitro): void {
+export function addMiddlewareInstrumentation(nitro: Nitro, isNitroV3: boolean): void {
   nitro.hooks.hook('rollup:before', (nitro, rollupConfig) => {
     if (!rollupConfig.plugins) {
       rollupConfig.plugins = [];
@@ -18,21 +31,20 @@ export function addMiddlewareInstrumentation(nitro: Nitro): void {
       rollupConfig.plugins = [rollupConfig.plugins];
     }
 
-    rollupConfig.plugins.push(middlewareInstrumentationPlugin(nitro));
+    rollupConfig.plugins.push(middlewareInstrumentationPlugin(nitro, isNitroV3));
   });
 }
 
 /**
  * Creates a rollup plugin for the middleware instrumentation by transforming the middleware code.
  *
  * @param nitro Nitro instance
+ * @param isNitroV3 Whether the app builds with Nitro v3 (Nuxt 5)
  * @returns The rollup plugin for the middleware instrumentation.
  */
-function middlewareInstrumentationPlugin(nitro: Nitro): InputPluginOption {
+function middlewareInstrumentationPlugin(nitro: Nitro, isNitroV3: boolean): InputPluginOption {
   const middlewareFiles = new Set<string>();
-  // Imported by absolute path rather than through `#imports`: with `imports.autoImport: false`,
-  // Nuxt 5 generates an empty server `#imports` module, dropping `addServerImports` registrations.
-  const wrapperModule = createResolver(import.meta.url).resolve('./runtime/hooks/wrapMiddlewareHandler');
+  const wrapperModule = isNitroV3 ? '#imports/server' : '#imports';
 
   return {
     name: 'sentry-nuxt-middleware-instrumentation',
@@ -63,7 +75,7 @@ function middlewareInstrumentationPlugin(nitro: Nitro): InputPluginOption {
  *
  * @param originalCode The original user code of the middleware.
  * @param fileName The name of the middleware file, used for the span name and logging.
- * @param wrapperModule Absolute path of the module exporting `wrapMiddlewareHandlerWithSentry`.
+ * @param wrapperModule Import specifier resolving to `wrapMiddlewareHandlerWithSentry`.
  *
  * @returns The wrapped user code of the middleware.
  */
@@ -72,7 +84,7 @@ function wrapMiddlewareCode(originalCode: string, fileName: string, wrapperModul
   const cleanFileName = fileName.replace(/\.(ts|js|mjs|mts|cts)$/, '');
 
   return `
-import { wrapMiddlewareHandlerWithSentry } from ${JSON.stringify(wrapperModule)};
+import { wrapMiddlewareHandlerWithSentry } from '${wrapperModule}';
 
 function defineInstrumentedEventHandler(handlerOrObject) {
   return defineEventHandler(wrapMiddlewareHandlerWithSentry(handlerOrObject, '${cleanFileName}'));