Align codemods and fallback templates

Author: onurtemizkan

src/react-router/codemods/root.ts

@@ -42,8 +42,9 @@ function hasCaptureExceptionCall(node: t.Node): boolean {
 }
 
 function addCaptureExceptionCall(functionNode: t.Node): void {
-  const captureExceptionCall = recast.parse(`Sentry.captureException(error);`)
-    .program.body[0];
+  const captureExceptionCall = recast.parse(
+    `if (error && error instanceof Error) {\n  Sentry.captureException(error);\n}`,
+  ).program.body[0];
 
   const functionBody = safeGetFunctionBody(functionNode);
   if (functionBody) {

src/react-router/templates.ts

@@ -436,6 +436,9 @@ export default defineConfig(config => {
         authToken: process.env.SENTRY_AUTH_TOKEN,
       }, config),`)}
     ],
+    ${plus(`optimizeDeps: {
+      exclude: ['@sentry/react-router'],
+    },`)}
   };
 });`),
   );

test/react-router/codemods/root.test.ts

@@ -98,6 +98,7 @@ describe('instrumentRoot', () => {
       'import * as Sentry from "@sentry/react-router";',
     );
     expect(modifiedContent).toContain('Sentry.captureException(error);');
+    expect(modifiedContent).toContain('error instanceof Error');
   });
 
   it('should add Sentry.captureException to existing variable declaration ErrorBoundary', async () => {
@@ -117,6 +118,7 @@ describe('instrumentRoot', () => {
     );
     // Now properly handles variable declaration ErrorBoundary
     expect(modifiedContent).toContain('Sentry.captureException(error);');
+    expect(modifiedContent).toContain('error instanceof Error');
   });
 
   it('should not modify file when ErrorBoundary already has Sentry.captureException', async () => {
@@ -215,6 +217,7 @@ describe('instrumentRoot', () => {
       'import * as Sentry from "@sentry/react-router";',
     );
     expect(modifiedContent).toContain('Sentry.captureException(error);');
+    expect(modifiedContent).toContain('error instanceof Error');
   });
 
   it('should handle function declaration with separate export', async () => {
@@ -236,6 +239,7 @@ describe('instrumentRoot', () => {
       'import * as Sentry from "@sentry/react-router";',
     );
     expect(modifiedContent).toContain('Sentry.captureException(error);');
+    expect(modifiedContent).toContain('error instanceof Error');
 
     // Should preserve function declaration syntax
     expect(modifiedContent).toMatch(/function ErrorBoundary\(/);