review suggestions

Author: s1gr1d

dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/nuxt.config.ts

@@ -18,6 +18,6 @@ export default defineNuxtConfig({
     },
   },
   sentry: {
-    autoInjectServerSentry: 'top-level-import',
+    autoInjectServerSentry: 'experimental_dynamic-import',
   },
 });

dev-packages/e2e-tests/test-applications/nuxt-3-top-level-import/nuxt.config.ts

@@ -18,6 +18,6 @@ export default defineNuxtConfig({
     },
   },
   sentry: {
-    autoInjectServerSentry: 'experimental_dynamic-import',
+    autoInjectServerSentry: 'top-level-import',
   },
 });

packages/nuxt/src/module.ts

@@ -59,11 +59,11 @@ export default defineNuxtModule<ModuleOptions>({
 
     if (serverConfigFile) {
       if (moduleOptions.autoInjectServerSentry !== 'experimental_dynamic-import') {
-        // Inject the server-side Sentry config file with a side effect import
         addPluginTemplate({
           mode: 'server',
           filename: 'sentry-server-config.mjs',
           getContents: () =>
+            // This won't actually import the server config in the build output (so no double init call). The import here is only needed for correctly resolving the Sentry release injection.
             `import "${buildDirResolver.resolve(`/${serverConfigFile}`)}";
             import { defineNuxtPlugin } from "#imports";
             export default defineNuxtPlugin(() => {});`,

packages/nuxt/src/vite/addServerConfig.ts

@@ -12,7 +12,7 @@ import {
   SENTRY_WRAPPED_FUNCTIONS,
   constructFunctionReExport,
   constructWrappedFunctionExportQuery,
-  getFilenameFromPath,
+  getFilenameFromNodeStartCommand,
   removeSentryQueryFromPath,
 } from './utils';
 
@@ -84,7 +84,8 @@ export function addServerConfigToBuild(
  */
 export function addSentryTopImport(moduleOptions: SentryNuxtModuleOptions, nitro: Nitro): void {
   nitro.hooks.hook('close', async () => {
-    const fileNameFromCommand = nitro.options.commands.preview && getFilenameFromPath(nitro.options.commands.preview);
+    const fileNameFromCommand =
+      nitro.options.commands.preview && getFilenameFromNodeStartCommand(nitro.options.commands.preview);
 
     // other presets ('node-server' or 'vercel') have an index.mjs
     const presetsWithServerFile = ['netlify'];

packages/nuxt/src/vite/utils.ts

@@ -27,11 +27,11 @@ export function findDefaultSdkInitFile(type: 'server' | 'client'): string | unde
 }
 
 /**
- *  Extracts the filename from a path.
+ *  Extracts the filename from a node command with a path.
  */
-export function getFilenameFromPath(path: string): string | null {
+export function getFilenameFromNodeStartCommand(nodeCommand: string): string | null {
   const regex = /[^/\\]+$/;
-  const match = path.match(regex);
+  const match = nodeCommand.match(regex);
   return match ? match[0] : null;
 }
 
@@ -98,7 +98,7 @@ export function extractFunctionReexportQueryParameters(query: string): { wrap: s
  */
 export function constructWrappedFunctionExportQuery(
   exportedBindings: Record<string, string[]> | null,
-  experimental_entrypointWrappedFunctions: string[],
+  entrypointWrappedFunctions: string[],
   debug?: boolean,
 ): string {
   const functionsToExport: { wrap: string[]; reexport: string[] } = {
@@ -110,7 +110,7 @@ export function constructWrappedFunctionExportQuery(
   // The key `.` refers to exports within the current file, while other keys show from where exports were imported first.
   Object.values(exportedBindings || {}).forEach(functions =>
     functions.forEach(fn => {
-      if (experimental_entrypointWrappedFunctions.includes(fn)) {
+      if (entrypointWrappedFunctions.includes(fn)) {
         functionsToExport.wrap.push(fn);
       } else {
         functionsToExport.reexport.push(fn);

packages/nuxt/test/vite/utils.test.ts

@@ -9,7 +9,7 @@ import {
   constructWrappedFunctionExportQuery,
   extractFunctionReexportQueryParameters,
   findDefaultSdkInitFile,
-  getFilenameFromPath,
+  getFilenameFromNodeStartCommand,
   removeSentryQueryFromPath,
 } from '../../src/vite/utils';
 
@@ -74,37 +74,37 @@ describe('findDefaultSdkInitFile', () => {
 describe('getFilenameFromPath', () => {
   it('should return the filename from a simple path', () => {
     const path = 'node ./server/index.mjs';
-    const filename = getFilenameFromPath(path);
+    const filename = getFilenameFromNodeStartCommand(path);
     expect(filename).toBe('index.mjs');
   });
 
   it('should return the filename from a nested path', () => {
     const path = 'node ./.output/whatever/path/server.js';
-    const filename = getFilenameFromPath(path);
+    const filename = getFilenameFromNodeStartCommand(path);
     expect(filename).toBe('server.js');
   });
 
   it('should return the filename from a Windows-style path', () => {
     const path = '.\\Projects\\my-app\\src\\main.js';
-    const filename = getFilenameFromPath(path);
+    const filename = getFilenameFromNodeStartCommand(path);
     expect(filename).toBe('main.js');
   });
 
   it('should return null for an empty path', () => {
     const path = '';
-    const filename = getFilenameFromPath(path);
+    const filename = getFilenameFromNodeStartCommand(path);
     expect(filename).toBeNull();
   });
 
   it('should return the filename when there are no directory separators', () => {
     const path = 'index.mjs';
-    const filename = getFilenameFromPath(path);
+    const filename = getFilenameFromNodeStartCommand(path);
     expect(filename).toBe('index.mjs');
   });
 
   it('should return null for paths with trailing slashes', () => {
     const path = 'node ./server/';
-    const filename = getFilenameFromPath(path);
+    const filename = getFilenameFromNodeStartCommand(path);
     expect(filename).toBeNull();
   });
 });