ref: restore no longer needed changes to remix vite configs

Author: logaretm

dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/vite.config.ts

@@ -1,6 +1,6 @@
 import { installGlobals } from '@remix-run/node';
 import { vitePlugin as remix } from '@remix-run/dev';
-import Sentry from '@sentry/remix';
+import { sentryRemixVitePlugin } from '@sentry/remix';
 import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
 
@@ -9,7 +9,7 @@ installGlobals();
 export default defineConfig({
   plugins: [
     remix(),
-    Sentry.sentryRemixVitePlugin(),
+    sentryRemixVitePlugin(),
     tsconfigPaths({
       // The dev server config errors are not relevant to this test app
       // https://github.com/aleclarson/vite-tsconfig-paths?tab=readme-ov-file#options

dev-packages/e2e-tests/test-applications/create-remix-app-express/vite.config.ts

@@ -1,6 +1,6 @@
 import { installGlobals } from '@remix-run/node';
 import { vitePlugin as remix } from '@remix-run/dev';
-import Sentry from '@sentry/remix';
+import { sentryRemixVitePlugin } from '@sentry/remix';
 import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
 
@@ -9,7 +9,7 @@ installGlobals();
 export default defineConfig({
   plugins: [
     remix(),
-    Sentry.sentryRemixVitePlugin(),
+    sentryRemixVitePlugin(),
     tsconfigPaths({
       // The dev server config errors are not relevant to this test app
       // https://github.com/aleclarson/vite-tsconfig-paths?tab=readme-ov-file#options

dev-packages/e2e-tests/test-applications/create-remix-app-v2/vite.config.ts

@@ -1,5 +1,5 @@
 import { vitePlugin as remix } from '@remix-run/dev';
-import Sentry from '@sentry/remix';
+import { sentryRemixVitePlugin } from '@sentry/remix';
 import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
 
@@ -9,7 +9,7 @@ export default defineConfig({
       ignoredRouteFiles: ['**/.*'],
       serverModuleFormat: 'cjs',
     }),
-    Sentry.sentryRemixVitePlugin(),
+    sentryRemixVitePlugin(),
     tsconfigPaths(),
   ],
 });

dev-packages/e2e-tests/test-applications/remix-hydrogen/vite.config.ts

@@ -1,5 +1,5 @@
 import { vitePlugin as remix } from '@remix-run/dev';
-import Sentry from '@sentry/remix';
+import { sentryRemixVitePlugin } from '@sentry/remix';
 import { hydrogen } from '@shopify/hydrogen/vite';
 import { oxygen } from '@shopify/mini-oxygen/vite';
 import { defineConfig } from 'vite';
@@ -17,7 +17,7 @@ export default defineConfig({
         v3_throwAbortReason: true,
       },
     }),
-    Sentry.sentryRemixVitePlugin(),
+    sentryRemixVitePlugin(),
     tsconfigPaths({
       // The dev server config errors are not relevant to this test app
       // https://github.com/aleclarson/vite-tsconfig-paths?tab=readme-ov-file#options

packages/remix/rollup.npm.config.mjs

@@ -15,9 +15,6 @@ export default [
         output: {
           // make it so Rollup calms down about the fact that we're combining default and named exports
           exports: 'named',
-          // Always include __esModule marker for proper CJS/ESM interop
-          // This ensures both `import * as Sentry` and `import Sentry` work correctly
-          esModule: true,
         },
       },
     }),

packages/remix/src/config/vite.ts

@@ -38,12 +38,12 @@ const MANIFEST_GLOBAL_KEY = '_sentryRemixRouteManifest' as const;
  * // vite.config.ts
  * import { defineConfig } from 'vite';
  * import { vitePlugin as remix } from '@remix-run/dev';
- * import Sentry from '@sentry/remix';
+ * import { sentryRemixVitePlugin } from '@sentry/remix';
  *
  * export default defineConfig({
  *   plugins: [
  *     remix(),
- *     Sentry.sentryRemixVitePlugin({
+ *     sentryRemixVitePlugin({
  *       appDirPath: './app',
  *     }),
  *   ],

packages/remix/test/config/vite.test.ts

@@ -3,7 +3,6 @@ import * as os from 'os';
 import * as path from 'path';
 import type { Plugin, ResolvedConfig } from 'vite';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import * as Sentry from '../..';
 import { sentryRemixVitePlugin } from '../../src/config/vite';
 
 describe('sentryRemixVitePlugin', () => {
@@ -36,21 +35,21 @@ describe('sentryRemixVitePlugin', () => {
 
   describe('plugin configuration', () => {
     it('should return a valid Vite plugin with correct name', () => {
-      const plugin = Sentry.sentryRemixVitePlugin();
+      const plugin = sentryRemixVitePlugin();
 
       expect(plugin).toBeDefined();
       expect(plugin.name).toBe('sentry-remix-route-manifest');
       expect(plugin.enforce).toBe('post');
     });
 
     it('should accept custom appDirPath option', () => {
-      const plugin = Sentry.sentryRemixVitePlugin({ appDirPath: '/custom/path' });
+      const plugin = sentryRemixVitePlugin({ appDirPath: '/custom/path' });
 
       expect(plugin).toBeDefined();
     });
 
     it('should work with no options', () => {
-      const plugin = Sentry.sentryRemixVitePlugin();
+      const plugin = sentryRemixVitePlugin();
 
       expect(plugin).toBeDefined();
     });
@@ -63,7 +62,7 @@ describe('sentryRemixVitePlugin', () => {
       fs.writeFileSync(path.join(routesDir, 'about.tsx'), '// about');
       fs.writeFileSync(path.join(routesDir, 'users.$id.tsx'), '// users');
 
-      const plugin = Sentry.sentryRemixVitePlugin();
+      const plugin = sentryRemixVitePlugin();
 
       const mockConfig: Partial<ResolvedConfig> = {
         root: tempDir,
@@ -82,7 +81,7 @@ describe('sentryRemixVitePlugin', () => {
       fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// index');
       fs.writeFileSync(path.join(routesDir, 'users.$id.tsx'), '// users');
 
-      const plugin = Sentry.sentryRemixVitePlugin();
+      const plugin = sentryRemixVitePlugin();
 
       const mockConfig: Partial<ResolvedConfig> = {
         root: tempDir,
@@ -98,7 +97,7 @@ describe('sentryRemixVitePlugin', () => {
     });
 
     it('should handle errors gracefully and set empty manifest', () => {
-      const plugin = Sentry.sentryRemixVitePlugin({ appDirPath: '/nonexistent/path' });
+      const plugin = sentryRemixVitePlugin({ appDirPath: '/nonexistent/path' });
 
       const mockConfig: Partial<ResolvedConfig> = {
         root: tempDir,
@@ -119,7 +118,7 @@ describe('sentryRemixVitePlugin', () => {
       fs.mkdirSync(customRoutesDir, { recursive: true });
       fs.writeFileSync(path.join(customRoutesDir, 'index.tsx'), '// index');
 
-      const plugin = Sentry.sentryRemixVitePlugin({ appDirPath: customAppDir });
+      const plugin = sentryRemixVitePlugin({ appDirPath: customAppDir });
 
       const mockConfig: Partial<ResolvedConfig> = {
         root: tempDir,
@@ -137,7 +136,7 @@ describe('sentryRemixVitePlugin', () => {
     it('should inject manifest into HTML with <head> tag', () => {
       fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// index');
 
-      const plugin = Sentry.sentryRemixVitePlugin();
+      const plugin = sentryRemixVitePlugin();
 
       const mockConfig: Partial<ResolvedConfig> = {
         root: tempDir,

packages/remix/test/integration/instrument.server.mjs

@@ -1,4 +1,4 @@
-import Sentry from '@sentry/remix';
+import * as Sentry from '@sentry/remix';
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',

packages/remix/test/integration/vite.config.ts

@@ -1,6 +1,6 @@
 import { vitePlugin as remix } from '@remix-run/dev';
 import { defineConfig, Plugin } from 'vite';
-import Sentry from '@sentry/remix';
+import { sentryRemixVitePlugin } from '@sentry/remix';
 import path from 'path';
 
 // Custom plugin to resolve @sentry/remix to ESM builds for Vite
@@ -37,6 +37,6 @@ export default defineConfig({
         v3_lazyRouteDiscovery: true,
       },
     }),
-    Sentry.sentryRemixVitePlugin(),
+    sentryRemixVitePlugin(),
   ],
 });