Fix cloudflare/hydrogen behaviour

Author: onurtemizkan

dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/tests/server-transactions.test.ts

@@ -47,7 +47,7 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page
   const pageLoadParentSpanId = pageloadTransaction.contexts?.trace?.parent_span_id;
 
   expect(httpServerTransaction.transaction).toBe('GET http://localhost:3030/');
-  expect(pageloadTransaction.transaction).toBe('/');
+  expect(pageloadTransaction.transaction).toBe('routes/_index');
 
   expect(httpServerTraceId).toBeDefined();
   expect(httpServerSpanId).toBeDefined();

packages/remix/src/config/vite.ts

@@ -120,7 +120,9 @@ export function sentryRemixVitePlugin(options: SentryRemixVitePluginOptions = {}
         /entry[.-]server\.[jt]sx?$/.test(id) ||
         // Also handle Remix's default entry.server location
         id.includes('/entry.server.') ||
-        id.includes('/entry-server.');
+        id.includes('/entry-server.') ||
+        // Also handle Hydrogen/Cloudflare Workers server files
+        /(^|\/)server\.[jt]sx?$/.test(id);
 
       if (isClientEntry) {
         // XSS Prevention: Double-stringify strategy (same as transformIndexHtml above)
@@ -139,10 +141,11 @@ ${code}`;
 
       if (isServerEntry) {
         // Inject into server entry for server-side transaction naming
+        // Use globalThis for Cloudflare Workers/Hydrogen compatibility
         const injectedCode = `
 // Sentry Remix Route Manifest - Auto-injected
-if (typeof global !== 'undefined') {
-  global.${MANIFEST_GLOBAL_KEY} = global.${MANIFEST_GLOBAL_KEY} || ${JSON.stringify(routeManifestJson)};
+if (typeof globalThis !== 'undefined') {
+  globalThis.${MANIFEST_GLOBAL_KEY} = globalThis.${MANIFEST_GLOBAL_KEY} || ${JSON.stringify(routeManifestJson)};
 }
 ${code}`;
 

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

@@ -370,9 +370,9 @@ describe('sentryRemixVitePlugin', () => {
       const result = plugin.transform(code, id);
 
       expect(result).not.toBeNull();
-      expect(result?.code).toContain('global._sentryRemixRouteManifest');
+      expect(result?.code).toContain('globalThis._sentryRemixRouteManifest');
       expect(result?.code).toContain(code);
-      expect(result?.code).toContain("typeof global !== 'undefined'");
+      expect(result?.code).toContain("typeof globalThis !== 'undefined'");
     });
 
     it('should handle files with "entry.client" in path', () => {
@@ -526,7 +526,7 @@ describe('sentryRemixVitePlugin', () => {
       const result = plugin.transform(code, id);
 
       expect(result).not.toBeNull();
-      expect(result?.code).toContain('global._sentryRemixRouteManifest');
+      expect(result?.code).toContain('globalThis._sentryRemixRouteManifest');
     });
 
     it('should handle files with "entry.server" in path', () => {
@@ -550,7 +550,36 @@ describe('sentryRemixVitePlugin', () => {
       const result = plugin.transform(code, id);
 
       expect(result).not.toBeNull();
-      expect(result?.code).toContain('global._sentryRemixRouteManifest');
+      expect(result?.code).toContain('globalThis._sentryRemixRouteManifest');
+    });
+
+    it('should inject manifest into Hydrogen/Cloudflare server.ts files', () => {
+      fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// index');
+
+      const plugin = sentryRemixVitePlugin() as Plugin & {
+        configResolved: (config: ResolvedConfig) => void;
+        transform: (code: string, id: string) => { code: string; map: null } | null;
+      };
+
+      const mockConfig: Partial<ResolvedConfig> = {
+        root: tempDir,
+        command: 'build',
+        mode: 'production',
+      };
+
+      plugin.configResolved(mockConfig as ResolvedConfig);
+
+      const code = 'console.log("Hydrogen server");';
+
+      // Test various server.ts paths
+      const paths = ['/app/server.ts', 'server.ts', '/Users/project/server.ts'];
+
+      paths.forEach(id => {
+        const result = plugin.transform(code, id);
+        expect(result).not.toBeNull();
+        expect(result?.code).toContain('globalThis._sentryRemixRouteManifest');
+        expect(result?.code).toContain('console.log("Hydrogen server");');
+      });
     });
   });
 });