refactor: remix vite plugin imports

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 { sentryRemixVitePlugin } from '@sentry/remix';
+import Sentry from '@sentry/remix';
 import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
 
@@ -9,7 +9,7 @@ installGlobals();
 export default defineConfig({
   plugins: [
     remix(),
-    sentryRemixVitePlugin(),
+    Sentry.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 { sentryRemixVitePlugin } from '@sentry/remix';
+import Sentry from '@sentry/remix';
 import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
 
@@ -9,7 +9,7 @@ installGlobals();
 export default defineConfig({
   plugins: [
     remix(),
-    sentryRemixVitePlugin(),
+    Sentry.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 { sentryRemixVitePlugin } from '@sentry/remix';
+import Sentry from '@sentry/remix';
 import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
 
@@ -9,7 +9,7 @@ export default defineConfig({
       ignoredRouteFiles: ['**/.*'],
       serverModuleFormat: 'cjs',
     }),
-    sentryRemixVitePlugin(),
+    Sentry.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 { sentryRemixVitePlugin } from '@sentry/remix';
+import Sentry 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,
       },
     }),
-    sentryRemixVitePlugin(),
+    Sentry.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/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 { sentryRemixVitePlugin } from '@sentry/remix';
+ * import Sentry from '@sentry/remix';
  *
  * export default defineConfig({
  *   plugins: [
  *     remix(),
- *     sentryRemixVitePlugin({
+ *     Sentry.sentryRemixVitePlugin({
  *       appDirPath: './app',
  *     }),
  *   ],

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

@@ -3,6 +3,7 @@ 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 Sentry from '../../src';
 import { sentryRemixVitePlugin } from '../../src/config/vite';
 
 describe('sentryRemixVitePlugin', () => {
@@ -35,21 +36,21 @@ describe('sentryRemixVitePlugin', () => {
 
   describe('plugin configuration', () => {
     it('should return a valid Vite plugin with correct name', () => {
-      const plugin = sentryRemixVitePlugin();
+      const plugin = Sentry.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 = sentryRemixVitePlugin({ appDirPath: '/custom/path' });
+      const plugin = Sentry.sentryRemixVitePlugin({ appDirPath: '/custom/path' });
 
       expect(plugin).toBeDefined();
     });
 
     it('should work with no options', () => {
-      const plugin = sentryRemixVitePlugin();
+      const plugin = Sentry.sentryRemixVitePlugin();
 
       expect(plugin).toBeDefined();
     });
@@ -62,9 +63,7 @@ describe('sentryRemixVitePlugin', () => {
       fs.writeFileSync(path.join(routesDir, 'about.tsx'), '// about');
       fs.writeFileSync(path.join(routesDir, 'users.$id.tsx'), '// users');
 
-      const plugin = sentryRemixVitePlugin() as Plugin & {
-        configResolved: (config: ResolvedConfig) => void;
-      };
+      const plugin = Sentry.sentryRemixVitePlugin();
 
       const mockConfig: Partial<ResolvedConfig> = {
         root: tempDir,
@@ -83,9 +82,7 @@ describe('sentryRemixVitePlugin', () => {
       fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// index');
       fs.writeFileSync(path.join(routesDir, 'users.$id.tsx'), '// users');
 
-      const plugin = sentryRemixVitePlugin() as Plugin & {
-        configResolved: (config: ResolvedConfig) => void;
-      };
+      const plugin = Sentry.sentryRemixVitePlugin();
 
       const mockConfig: Partial<ResolvedConfig> = {
         root: tempDir,
@@ -101,9 +98,7 @@ describe('sentryRemixVitePlugin', () => {
     });
 
     it('should handle errors gracefully and set empty manifest', () => {
-      const plugin = sentryRemixVitePlugin({ appDirPath: '/nonexistent/path' }) as Plugin & {
-        configResolved: (config: ResolvedConfig) => void;
-      };
+      const plugin = Sentry.sentryRemixVitePlugin({ appDirPath: '/nonexistent/path' });
 
       const mockConfig: Partial<ResolvedConfig> = {
         root: tempDir,
@@ -124,9 +119,7 @@ describe('sentryRemixVitePlugin', () => {
       fs.mkdirSync(customRoutesDir, { recursive: true });
       fs.writeFileSync(path.join(customRoutesDir, 'index.tsx'), '// index');
 
-      const plugin = sentryRemixVitePlugin({ appDirPath: customAppDir }) as Plugin & {
-        configResolved: (config: ResolvedConfig) => void;
-      };
+      const plugin = Sentry.sentryRemixVitePlugin({ appDirPath: customAppDir });
 
       const mockConfig: Partial<ResolvedConfig> = {
         root: tempDir,
@@ -144,13 +137,7 @@ describe('sentryRemixVitePlugin', () => {
     it('should inject manifest into HTML with <head> tag', () => {
       fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// index');
 
-      const plugin = sentryRemixVitePlugin() as Plugin & {
-        configResolved: (config: ResolvedConfig) => void;
-        transformIndexHtml: {
-          order: string;
-          handler: (html: string) => string;
-        };
-      };
+      const plugin = Sentry.sentryRemixVitePlugin();
 
       const mockConfig: Partial<ResolvedConfig> = {
         root: tempDir,