Read DSNs from env.ts on client-side.

onurtemizkan · onurtemizkan · commit abe25e3f0b89 · 2023-11-18T06:06:35.000Z
diff --git a/packages/e2e-tests/test-applications/remix-cloudflare-pages/app/entry.client.tsx b/packages/e2e-tests/test-applications/remix-cloudflare-pages/app/entry.client.tsx
@@ -8,9 +8,10 @@ import { RemixBrowser, useLocation, useMatches } from '@remix-run/react';
 import { startTransition, StrictMode, useEffect } from 'react';
 import { hydrateRoot } from 'react-dom/client';
 import * as Sentry from '@sentry/remix';
+import { env } from '../env';
 
 Sentry.init({
-  dsn: window.ENV.SENTRY_DSN,
+  dsn: env.SENTRY_DSN,
   integrations: [
     new Sentry.BrowserTracing({
       routingInstrumentation: Sentry.remixRouterInstrumentation(useEffect, useLocation, useMatches),
diff --git a/packages/e2e-tests/test-applications/remix-cloudflare-pages/app/root.tsx b/packages/e2e-tests/test-applications/remix-cloudflare-pages/app/root.tsx
@@ -1,32 +1,16 @@
-import { json, LinksFunction } from '@remix-run/cloudflare';
+import { LinksFunction } from '@remix-run/cloudflare';
 import { cssBundleHref } from '@remix-run/css-bundle';
 import { Links, LiveReload, Meta, Outlet, Scripts, ScrollRestoration, useLoaderData } from '@remix-run/react';
 import { withSentry } from '@sentry/remix';
-import { env } from '../env';
 
 export const links: LinksFunction = () => [...(cssBundleHref ? [{ rel: 'stylesheet', href: cssBundleHref }] : [])];
 
-export const loader = () => {
-  return json({
-    ENV: {
-      SENTRY_DSN: env.SENTRY_DSN,
-    },
-  });
-};
-
 function App() {
-  const { ENV } = useLoaderData();
-
   return (
     <html lang="en">
       <head>
         <meta charSet="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <script
-          dangerouslySetInnerHTML={{
-            __html: `window.ENV = ${JSON.stringify(ENV)}`,
-          }}
-        />
         <Meta />
         <Links />
       </head>
diff --git a/packages/e2e-tests/test-applications/remix-cloudflare-workers/app/entry.client.tsx b/packages/e2e-tests/test-applications/remix-cloudflare-workers/app/entry.client.tsx
@@ -8,9 +8,10 @@ import { RemixBrowser, useLocation, useMatches } from '@remix-run/react';
 import { startTransition, StrictMode, useEffect } from 'react';
 import { hydrateRoot } from 'react-dom/client';
 import * as Sentry from '@sentry/remix';
+import { env } from '../env';
 
 Sentry.init({
-  dsn: window.ENV.SENTRY_DSN,
+  dsn: env.SENTRY_DSN,
   integrations: [
     new Sentry.BrowserTracing({
       routingInstrumentation: Sentry.remixRouterInstrumentation(useEffect, useLocation, useMatches),
diff --git a/packages/e2e-tests/test-applications/remix-cloudflare-workers/app/entry.server.tsx b/packages/e2e-tests/test-applications/remix-cloudflare-workers/app/entry.server.tsx
@@ -15,7 +15,6 @@ Sentry.workerInit({
   dsn: env.SENTRY_DSN,
   // Performance Monitoring
   tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
-  debug: true,
 });
 
 export function handleError(error: unknown, { request }: DataFunctionArgs): void {
diff --git a/packages/e2e-tests/test-applications/remix-cloudflare-workers/app/root.tsx b/packages/e2e-tests/test-applications/remix-cloudflare-workers/app/root.tsx
@@ -1,32 +1,16 @@
-import { json, LinksFunction } from '@remix-run/cloudflare';
+import { LinksFunction } from '@remix-run/cloudflare';
 import { cssBundleHref } from '@remix-run/css-bundle';
 import { Links, LiveReload, Meta, Outlet, Scripts, ScrollRestoration, useLoaderData } from '@remix-run/react';
 import { withSentry } from '@sentry/remix';
-import { env } from '../env';
 
 export const links: LinksFunction = () => [...(cssBundleHref ? [{ rel: 'stylesheet', href: cssBundleHref }] : [])];
 
-export const loader = () => {
-  return json({
-    ENV: {
-      SENTRY_DSN: env.SENTRY_DSN,
-    },
-  });
-};
-
 function App() {
-  const { ENV } = useLoaderData();
-
   return (
     <html lang="en">
       <head>
         <meta charSet="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <script
-          dangerouslySetInnerHTML={{
-            __html: `window.ENV = ${JSON.stringify(ENV)}`,
-          }}
-        />
         <Meta />
         <Links />
       </head>
