Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,16 @@ import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
import { hydrateRoot } from 'react-dom/client';

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

Sentry.init({
environment: 'qa', // dynamic sampling bias to keep transactions
dsn: window.ENV.SENTRY_DSN,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,6 @@ function isBotRequest(userAgent: string | null) {
return isbotModule.isbot(userAgent);
}

// isbot < 3.8.0
if ('default' in isbotModule && typeof isbotModule.default === 'function') {
return isbotModule.default(userAgent);
}

return false;
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"private": true,
"sideEffects": false,
"scripts": {
"build": "remix vite:build",
"build": "remix vite:build && pnpm typecheck",
"dev": "node ./server.mjs",
"lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
"start": "cross-env NODE_ENV=production node ./server.mjs",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,16 @@ import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
import { hydrateRoot } from 'react-dom/client';

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

Sentry.init({
environment: 'qa', // dynamic sampling bias to keep transactions
dsn: window.ENV.SENTRY_DSN,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,6 @@ function isBotRequest(userAgent: string | null) {
return isbotModule.isbot(userAgent);
}

// isbot < 3.8.0
if ('default' in isbotModule && typeof isbotModule.default === 'function') {
return isbotModule.default(userAgent);
}

return false;
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
"sideEffects": false,
"type": "module",
"scripts": {
"build": "remix vite:build",
"build": "remix vite:build && pnpm typecheck",
"dev": "node ./server.mjs",
"lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
"start": "cross-env NODE_ENV=production node ./server.mjs",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { waitForError } from '@sentry-internal/test-utils';

test('Sends a loader error to Sentry', async ({ page }) => {
const loaderErrorPromise = waitForError('create-remix-app-express', errorEvent => {
return errorEvent.exception.values[0].value === 'Loader Error';
return errorEvent?.exception?.values?.[0]?.value === 'Loader Error';
});

await page.goto('/loader-error');
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ test('Sends parameterized transaction name to Sentry', async ({ page }) => {

test('Sends form data with action span', async ({ page }) => {
const formdataActionTransaction = waitForTransaction('create-remix-app-express', transactionEvent => {
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'action');
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'action') || false;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

q: What does adding || false do here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

waitForTransaction expects a function returning a boolean, after adding optional chaining, it became boolean | undefined. So, making it false in such cases

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah... of course 😅 thanks

});

await page.goto('/action-formdata');
Expand All@@ -34,31 +34,31 @@ test('Sends form data with action span', async ({ page }) => {

await page.locator('button[type=submit]').click();

const actionSpan = (await formdataActionTransaction).spans.find(
const actionSpan = (await formdataActionTransaction)?.spans?.find(
span => span.data && span.data['code.function'] === 'action',
);

expect(actionSpan).toBeDefined();
expect(actionSpan.op).toBe('action.remix');
expect(actionSpan.data).toMatchObject({
expect(actionSpan?.op).toBe('action.remix');
expect(actionSpan?.data).toMatchObject({
'formData.text': 'test',
'formData.file': 'file.txt',
});
});

test('Sends a loader span to Sentry', async ({ page }) => {
const loaderTransactionPromise = waitForTransaction('create-remix-app-express', transactionEvent => {
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'loader');
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'loader') || false;
Comment thread
andreiborza marked this conversation as resolved.
});

await page.goto('/');

const loaderSpan = (await loaderTransactionPromise).spans.find(
const loaderSpan = (await loaderTransactionPromise)?.spans?.find(
span => span.data && span.data['code.function'] === 'loader',
);

expect(loaderSpan).toBeDefined();
expect(loaderSpan.op).toBe('loader.remix');
expect(loaderSpan?.op).toBe('loader.remix');
});

test('Propagates trace when ErrorBoundary is triggered', async ({ page }) => {
Expand All@@ -83,9 +83,8 @@ test('Propagates trace when ErrorBoundary is triggered', async ({ page }) => {

const httpServerTraceId = httpServerTransaction.contexts?.trace?.trace_id;
const httpServerSpanId = httpServerTransaction.contexts?.trace?.span_id;
const loaderSpanId = httpServerTransaction.spans.find(
span => span.data && span.data['code.function'] === 'loader',
)?.span_id;
const loaderSpanId = httpServerTransaction?.spans?.find(span => span.data && span.data['code.function'] === 'loader')
?.span_id;

const pageLoadTraceId = pageloadTransaction.contexts?.trace?.trace_id;
const pageLoadSpanId = pageloadTransaction.contexts?.trace?.span_id;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
"include": ["env.d.ts", "**/*.ts", "**/*.tsx"],
"include": ["env.d.ts", "./app/**/*.ts", "./app/**/*.tsx"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2022"],
"isolatedModules": true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,16 @@
* For more information, see https://remix.run/file-conventions/entry.client
*/

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

import { RemixBrowser, useLocation, useMatches } from '@remix-run/react';
import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"private": true,
"sideEffects": false,
"scripts": {
"build": "remix build",
"build": "remix build && pnpm typecheck",
"dev": "remix dev",
"start": "NODE_OPTIONS='--require=./instrument.server.cjs' remix-serve build/index.js",
"typecheck": "tsc",
Expand All@@ -12,24 +12,28 @@
},
"dependencies": {
"@sentry/remix": "latest || *",
"@remix-run/css-bundle": "2.16.5",
"@remix-run/node": "2.16.5",
"@remix-run/react": "2.16.5",
"@remix-run/serve": "2.16.5",
"@remix-run/css-bundle": "2.16.7",
"@remix-run/node": "2.16.7",
"@remix-run/react": "2.16.7",
"@remix-run/serve": "2.16.7",
"isbot": "^3.6.8",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@playwright/test": "~1.50.0",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@remix-run/dev": "2.16.5",
"@remix-run/eslint-config": "2.16.5",
"@remix-run/dev": "2.16.7",
"@remix-run/eslint-config": "2.16.7",
"@sentry/core": "latest || *",
"@types/react": "^18.0.35",
"@types/react-dom": "^18.0.11",
"@types/react": "^18.2.64",
"@types/react-dom": "^18.2.34",
"@types/prop-types": "15.7.7",
"eslint": "^8.38.0",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
},
"resolutions": {
"@types/react": "18.2.22"
},
"volta": {
"extends": "../../package.json"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
{
"include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
"include": ["remix.env.d.ts", "./app/**/*.ts", "./app/**/*.tsx"],
"exclude": ["node_modules", "build"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2019"],
"isolatedModules": true,
Expand All@@ -10,6 +11,7 @@
"target": "ES2019",
"strict": true,
"allowJs": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"baseUrl": ".",
"paths": {
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
import {createPagesFunctionHandler} from '@remix-run/cloudflare-pages';
import {sentryPagesPlugin} from '@sentry/cloudflare';
import {createPagesFunctionHandler} from '@remix-run/cloudflare-pages';
import {sentryPagesPlugin} from '@sentry/cloudflare';

// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore - the server build file is generated by `remix vite:build`
// eslint-disable-next-line import/no-unresolved
import * as build from '../build/server';

export const onRequest = [
context => sentryPagesPlugin({ dsn: context.env.E2E_TEST_DSN, tracesSampleRate: 1.0 })(context),
createPagesFunctionHandler({ build }),
(context: EventPluginContext<any, any, any, any>) =>
sentryPagesPlugin({
dsn: context.env.E2E_TEST_DSN,
tracesSampleRate: 1.0,
})(context),
createPagesFunctionHandler({build}),
];

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,16 @@ import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
import { hydrateRoot } from 'react-dom/client';

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

Sentry.init({
environment: 'qa', // dynamic sampling bias to keep transactions
dsn: window.ENV.SENTRY_DSN,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,6 @@ function isBotRequest(userAgent: string | null) {
return isbotModule.isbot(userAgent);
}

// isbot < 3.8.0
if ('default' in isbotModule && typeof isbotModule.default === 'function') {
return isbotModule.default(userAgent);
}

return false;
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"private": true,
"sideEffects": false,
"scripts": {
"build": "remix vite:build",
"build": "remix vite:build && pnpm typecheck",
"dev": "node ./server.mjs",
"lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
"start": "cross-env NODE_ENV=production node ./server.mjs",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,16 @@ import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
import { hydrateRoot } from 'react-dom/client';

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

Sentry.init({
environment: 'qa', // dynamic sampling bias to keep transactions
dsn: window.ENV.SENTRY_DSN,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,6 @@ function isBotRequest(userAgent: string | null) {
return isbotModule.isbot(userAgent);
}

// isbot < 3.8.0
if ('default' in isbotModule && typeof isbotModule.default === 'function') {
return isbotModule.default(userAgent);
}

return false;
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
"sideEffects": false,
"type": "module",
"scripts": {
"build": "remix vite:build",
"build": "remix vite:build && pnpm typecheck",
"dev": "node ./server.mjs",
"lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
"start": "cross-env NODE_ENV=production node ./server.mjs",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { waitForError } from '@sentry-internal/test-utils';

test('Sends a loader error to Sentry', async ({ page }) => {
const loaderErrorPromise = waitForError('create-remix-app-express', errorEvent => {
return errorEvent.exception.values[0].value === 'Loader Error';
return errorEvent?.exception?.values?.[0]?.value === 'Loader Error';
});

await page.goto('/loader-error');
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ test('Sends parameterized transaction name to Sentry', async ({ page }) => {

test('Sends form data with action span', async ({ page }) => {
const formdataActionTransaction = waitForTransaction('create-remix-app-express', transactionEvent => {
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'action');
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'action') || false;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

q: What does adding || false do here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

waitForTransaction expects a function returning a boolean, after adding optional chaining, it became boolean | undefined. So, making it false in such cases

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah... of course 😅 thanks

});

await page.goto('/action-formdata');
Expand All@@ -34,31 +34,31 @@ test('Sends form data with action span', async ({ page }) => {

await page.locator('button[type=submit]').click();

const actionSpan = (await formdataActionTransaction).spans.find(
const actionSpan = (await formdataActionTransaction)?.spans?.find(
span => span.data && span.data['code.function'] === 'action',
);

expect(actionSpan).toBeDefined();
expect(actionSpan.op).toBe('action.remix');
expect(actionSpan.data).toMatchObject({
expect(actionSpan?.op).toBe('action.remix');
expect(actionSpan?.data).toMatchObject({
'formData.text': 'test',
'formData.file': 'file.txt',
});
});

test('Sends a loader span to Sentry', async ({ page }) => {
const loaderTransactionPromise = waitForTransaction('create-remix-app-express', transactionEvent => {
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'loader');
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'loader') || false;
Comment thread
andreiborza marked this conversation as resolved.
});

await page.goto('/');

const loaderSpan = (await loaderTransactionPromise).spans.find(
const loaderSpan = (await loaderTransactionPromise)?.spans?.find(
span => span.data && span.data['code.function'] === 'loader',
);

expect(loaderSpan).toBeDefined();
expect(loaderSpan.op).toBe('loader.remix');
expect(loaderSpan?.op).toBe('loader.remix');
});

test('Propagates trace when ErrorBoundary is triggered', async ({ page }) => {
Expand All@@ -83,9 +83,8 @@ test('Propagates trace when ErrorBoundary is triggered', async ({ page }) => {

const httpServerTraceId = httpServerTransaction.contexts?.trace?.trace_id;
const httpServerSpanId = httpServerTransaction.contexts?.trace?.span_id;
const loaderSpanId = httpServerTransaction.spans.find(
span => span.data && span.data['code.function'] === 'loader',
)?.span_id;
const loaderSpanId = httpServerTransaction?.spans?.find(span => span.data && span.data['code.function'] === 'loader')
?.span_id;

const pageLoadTraceId = pageloadTransaction.contexts?.trace?.trace_id;
const pageLoadSpanId = pageloadTransaction.contexts?.trace?.span_id;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
"include": ["env.d.ts", "**/*.ts", "**/*.tsx"],
"include": ["env.d.ts", "./app/**/*.ts", "./app/**/*.tsx"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2022"],
"isolatedModules": true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,16 @@
* For more information, see https://remix.run/file-conventions/entry.client
*/

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

import { RemixBrowser, useLocation, useMatches } from '@remix-run/react';
import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"private": true,
"sideEffects": false,
"scripts": {
"build": "remix build",
"build": "remix build && pnpm typecheck",
"dev": "remix dev",
"start": "NODE_OPTIONS='--require=./instrument.server.cjs' remix-serve build/index.js",
"typecheck": "tsc",
Expand All@@ -12,24 +12,28 @@
},
"dependencies": {
"@sentry/remix": "latest || *",
"@remix-run/css-bundle": "2.16.5",
"@remix-run/node": "2.16.5",
"@remix-run/react": "2.16.5",
"@remix-run/serve": "2.16.5",
"@remix-run/css-bundle": "2.16.7",
"@remix-run/node": "2.16.7",
"@remix-run/react": "2.16.7",
"@remix-run/serve": "2.16.7",
"isbot": "^3.6.8",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@playwright/test": "~1.50.0",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@remix-run/dev": "2.16.5",
"@remix-run/eslint-config": "2.16.5",
"@remix-run/dev": "2.16.7",
"@remix-run/eslint-config": "2.16.7",
"@sentry/core": "latest || *",
"@types/react": "^18.0.35",
"@types/react-dom": "^18.0.11",
"@types/react": "^18.2.64",
"@types/react-dom": "^18.2.34",
"@types/prop-types": "15.7.7",
"eslint": "^8.38.0",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
},
"resolutions": {
"@types/react": "18.2.22"
},
"volta": {
"extends": "../../package.json"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
{
"include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
"include": ["remix.env.d.ts", "./app/**/*.ts", "./app/**/*.tsx"],
"exclude": ["node_modules", "build"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2019"],
"isolatedModules": true,
Expand All@@ -10,6 +11,7 @@
"target": "ES2019",
"strict": true,
"allowJs": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"baseUrl": ".",
"paths": {
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
import {createPagesFunctionHandler} from '@remix-run/cloudflare-pages';
import {sentryPagesPlugin} from '@sentry/cloudflare';
import {createPagesFunctionHandler} from '@remix-run/cloudflare-pages';
import {sentryPagesPlugin} from '@sentry/cloudflare';

// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore - the server build file is generated by `remix vite:build`
// eslint-disable-next-line import/no-unresolved
import * as build from '../build/server';

export const onRequest = [
context => sentryPagesPlugin({ dsn: context.env.E2E_TEST_DSN, tracesSampleRate: 1.0 })(context),
createPagesFunctionHandler({ build }),
(context: EventPluginContext<any, any, any, any>) =>
sentryPagesPlugin({
dsn: context.env.E2E_TEST_DSN,
tracesSampleRate: 1.0,
})(context),
createPagesFunctionHandler({build}),
];

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,16 @@ import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
import { hydrateRoot } from 'react-dom/client';

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

Sentry.init({
environment: 'qa', // dynamic sampling bias to keep transactions
dsn: window.ENV.SENTRY_DSN,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,6 @@ function isBotRequest(userAgent: string | null) {
return isbotModule.isbot(userAgent);
}

// isbot < 3.8.0
if ('default' in isbotModule && typeof isbotModule.default === 'function') {
return isbotModule.default(userAgent);
}

return false;
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"private": true,
"sideEffects": false,
"scripts": {
"build": "remix vite:build",
"build": "remix vite:build && pnpm typecheck",
"dev": "node ./server.mjs",
"lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
"start": "cross-env NODE_ENV=production node ./server.mjs",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,16 @@ import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
import { hydrateRoot } from 'react-dom/client';

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

Sentry.init({
environment: 'qa', // dynamic sampling bias to keep transactions
dsn: window.ENV.SENTRY_DSN,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,6 @@ function isBotRequest(userAgent: string | null) {
return isbotModule.isbot(userAgent);
}

// isbot < 3.8.0
if ('default' in isbotModule && typeof isbotModule.default === 'function') {
return isbotModule.default(userAgent);
}

return false;
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
"sideEffects": false,
"type": "module",
"scripts": {
"build": "remix vite:build",
"build": "remix vite:build && pnpm typecheck",
"dev": "node ./server.mjs",
"lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
"start": "cross-env NODE_ENV=production node ./server.mjs",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { waitForError } from '@sentry-internal/test-utils';

test('Sends a loader error to Sentry', async ({ page }) => {
const loaderErrorPromise = waitForError('create-remix-app-express', errorEvent => {
return errorEvent.exception.values[0].value === 'Loader Error';
return errorEvent?.exception?.values?.[0]?.value === 'Loader Error';
});

await page.goto('/loader-error');
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ test('Sends parameterized transaction name to Sentry', async ({ page }) => {

test('Sends form data with action span', async ({ page }) => {
const formdataActionTransaction = waitForTransaction('create-remix-app-express', transactionEvent => {
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'action');
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'action') || false;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

q: What does adding || false do here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

waitForTransaction expects a function returning a boolean, after adding optional chaining, it became boolean | undefined. So, making it false in such cases

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah... of course 😅 thanks

});

await page.goto('/action-formdata');
Expand All@@ -34,31 +34,31 @@ test('Sends form data with action span', async ({ page }) => {

await page.locator('button[type=submit]').click();

const actionSpan = (await formdataActionTransaction).spans.find(
const actionSpan = (await formdataActionTransaction)?.spans?.find(
span => span.data && span.data['code.function'] === 'action',
);

expect(actionSpan).toBeDefined();
expect(actionSpan.op).toBe('action.remix');
expect(actionSpan.data).toMatchObject({
expect(actionSpan?.op).toBe('action.remix');
expect(actionSpan?.data).toMatchObject({
'formData.text': 'test',
'formData.file': 'file.txt',
});
});

test('Sends a loader span to Sentry', async ({ page }) => {
const loaderTransactionPromise = waitForTransaction('create-remix-app-express', transactionEvent => {
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'loader');
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'loader') || false;
Comment thread
andreiborza marked this conversation as resolved.
});

await page.goto('/');

const loaderSpan = (await loaderTransactionPromise).spans.find(
const loaderSpan = (await loaderTransactionPromise)?.spans?.find(
span => span.data && span.data['code.function'] === 'loader',
);

expect(loaderSpan).toBeDefined();
expect(loaderSpan.op).toBe('loader.remix');
expect(loaderSpan?.op).toBe('loader.remix');
});

test('Propagates trace when ErrorBoundary is triggered', async ({ page }) => {
Expand All@@ -83,9 +83,8 @@ test('Propagates trace when ErrorBoundary is triggered', async ({ page }) => {

const httpServerTraceId = httpServerTransaction.contexts?.trace?.trace_id;
const httpServerSpanId = httpServerTransaction.contexts?.trace?.span_id;
const loaderSpanId = httpServerTransaction.spans.find(
span => span.data && span.data['code.function'] === 'loader',
)?.span_id;
const loaderSpanId = httpServerTransaction?.spans?.find(span => span.data && span.data['code.function'] === 'loader')
?.span_id;

const pageLoadTraceId = pageloadTransaction.contexts?.trace?.trace_id;
const pageLoadSpanId = pageloadTransaction.contexts?.trace?.span_id;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
"include": ["env.d.ts", "**/*.ts", "**/*.tsx"],
"include": ["env.d.ts", "./app/**/*.ts", "./app/**/*.tsx"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2022"],
"isolatedModules": true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,16 @@
* For more information, see https://remix.run/file-conventions/entry.client
*/

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

import { RemixBrowser, useLocation, useMatches } from '@remix-run/react';
import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"private": true,
"sideEffects": false,
"scripts": {
"build": "remix build",
"build": "remix build && pnpm typecheck",
"dev": "remix dev",
"start": "NODE_OPTIONS='--require=./instrument.server.cjs' remix-serve build/index.js",
"typecheck": "tsc",
Expand All@@ -12,24 +12,28 @@
},
"dependencies": {
"@sentry/remix": "latest || *",
"@remix-run/css-bundle": "2.16.5",
"@remix-run/node": "2.16.5",
"@remix-run/react": "2.16.5",
"@remix-run/serve": "2.16.5",
"@remix-run/css-bundle": "2.16.7",
"@remix-run/node": "2.16.7",
"@remix-run/react": "2.16.7",
"@remix-run/serve": "2.16.7",
"isbot": "^3.6.8",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@playwright/test": "~1.50.0",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@remix-run/dev": "2.16.5",
"@remix-run/eslint-config": "2.16.5",
"@remix-run/dev": "2.16.7",
"@remix-run/eslint-config": "2.16.7",
"@sentry/core": "latest || *",
"@types/react": "^18.0.35",
"@types/react-dom": "^18.0.11",
"@types/react": "^18.2.64",
"@types/react-dom": "^18.2.34",
"@types/prop-types": "15.7.7",
"eslint": "^8.38.0",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
},
"resolutions": {
"@types/react": "18.2.22"
},
"volta": {
"extends": "../../package.json"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
{
"include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
"include": ["remix.env.d.ts", "./app/**/*.ts", "./app/**/*.tsx"],
"exclude": ["node_modules", "build"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2019"],
"isolatedModules": true,
Expand All@@ -10,6 +11,7 @@
"target": "ES2019",
"strict": true,
"allowJs": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"baseUrl": ".",
"paths": {
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
import {createPagesFunctionHandler} from '@remix-run/cloudflare-pages';
import {sentryPagesPlugin} from '@sentry/cloudflare';
import {createPagesFunctionHandler} from '@remix-run/cloudflare-pages';
import {sentryPagesPlugin} from '@sentry/cloudflare';

// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore - the server build file is generated by `remix vite:build`
// eslint-disable-next-line import/no-unresolved
import * as build from '../build/server';

export const onRequest = [
context => sentryPagesPlugin({ dsn: context.env.E2E_TEST_DSN, tracesSampleRate: 1.0 })(context),
createPagesFunctionHandler({ build }),
(context: EventPluginContext<any, any, any, any>) =>
sentryPagesPlugin({
dsn: context.env.E2E_TEST_DSN,
tracesSampleRate: 1.0,
})(context),
createPagesFunctionHandler({build}),
];

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,16 @@ import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
import { hydrateRoot } from 'react-dom/client';

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

Sentry.init({
environment: 'qa', // dynamic sampling bias to keep transactions
dsn: window.ENV.SENTRY_DSN,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,6 @@ function isBotRequest(userAgent: string | null) {
return isbotModule.isbot(userAgent);
}

// isbot < 3.8.0
if ('default' in isbotModule && typeof isbotModule.default === 'function') {
return isbotModule.default(userAgent);
}

return false;
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"private": true,
"sideEffects": false,
"scripts": {
"build": "remix vite:build",
"build": "remix vite:build && pnpm typecheck",
"dev": "node ./server.mjs",
"lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
"start": "cross-env NODE_ENV=production node ./server.mjs",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,16 @@ import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
import { hydrateRoot } from 'react-dom/client';

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

Sentry.init({
environment: 'qa', // dynamic sampling bias to keep transactions
dsn: window.ENV.SENTRY_DSN,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,6 @@ function isBotRequest(userAgent: string | null) {
return isbotModule.isbot(userAgent);
}

// isbot < 3.8.0
if ('default' in isbotModule && typeof isbotModule.default === 'function') {
return isbotModule.default(userAgent);
}

return false;
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
"sideEffects": false,
"type": "module",
"scripts": {
"build": "remix vite:build",
"build": "remix vite:build && pnpm typecheck",
"dev": "node ./server.mjs",
"lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
"start": "cross-env NODE_ENV=production node ./server.mjs",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { waitForError } from '@sentry-internal/test-utils';

test('Sends a loader error to Sentry', async ({ page }) => {
const loaderErrorPromise = waitForError('create-remix-app-express', errorEvent => {
return errorEvent.exception.values[0].value === 'Loader Error';
return errorEvent?.exception?.values?.[0]?.value === 'Loader Error';
});

await page.goto('/loader-error');
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ test('Sends parameterized transaction name to Sentry', async ({ page }) => {

test('Sends form data with action span', async ({ page }) => {
const formdataActionTransaction = waitForTransaction('create-remix-app-express', transactionEvent => {
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'action');
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'action') || false;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

q: What does adding || false do here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

waitForTransaction expects a function returning a boolean, after adding optional chaining, it became boolean | undefined. So, making it false in such cases

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah... of course 😅 thanks

});

await page.goto('/action-formdata');
Expand All@@ -34,31 +34,31 @@ test('Sends form data with action span', async ({ page }) => {

await page.locator('button[type=submit]').click();

const actionSpan = (await formdataActionTransaction).spans.find(
const actionSpan = (await formdataActionTransaction)?.spans?.find(
span => span.data && span.data['code.function'] === 'action',
);

expect(actionSpan).toBeDefined();
expect(actionSpan.op).toBe('action.remix');
expect(actionSpan.data).toMatchObject({
expect(actionSpan?.op).toBe('action.remix');
expect(actionSpan?.data).toMatchObject({
'formData.text': 'test',
'formData.file': 'file.txt',
});
});

test('Sends a loader span to Sentry', async ({ page }) => {
const loaderTransactionPromise = waitForTransaction('create-remix-app-express', transactionEvent => {
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'loader');
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'loader') || false;
Comment thread
andreiborza marked this conversation as resolved.
});

await page.goto('/');

const loaderSpan = (await loaderTransactionPromise).spans.find(
const loaderSpan = (await loaderTransactionPromise)?.spans?.find(
span => span.data && span.data['code.function'] === 'loader',
);

expect(loaderSpan).toBeDefined();
expect(loaderSpan.op).toBe('loader.remix');
expect(loaderSpan?.op).toBe('loader.remix');
});

test('Propagates trace when ErrorBoundary is triggered', async ({ page }) => {
Expand All@@ -83,9 +83,8 @@ test('Propagates trace when ErrorBoundary is triggered', async ({ page }) => {

const httpServerTraceId = httpServerTransaction.contexts?.trace?.trace_id;
const httpServerSpanId = httpServerTransaction.contexts?.trace?.span_id;
const loaderSpanId = httpServerTransaction.spans.find(
span => span.data && span.data['code.function'] === 'loader',
)?.span_id;
const loaderSpanId = httpServerTransaction?.spans?.find(span => span.data && span.data['code.function'] === 'loader')
?.span_id;

const pageLoadTraceId = pageloadTransaction.contexts?.trace?.trace_id;
const pageLoadSpanId = pageloadTransaction.contexts?.trace?.span_id;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
"include": ["env.d.ts", "**/*.ts", "**/*.tsx"],
"include": ["env.d.ts", "./app/**/*.ts", "./app/**/*.tsx"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2022"],
"isolatedModules": true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,16 @@
* For more information, see https://remix.run/file-conventions/entry.client
*/

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

import { RemixBrowser, useLocation, useMatches } from '@remix-run/react';
import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"private": true,
"sideEffects": false,
"scripts": {
"build": "remix build",
"build": "remix build && pnpm typecheck",
"dev": "remix dev",
"start": "NODE_OPTIONS='--require=./instrument.server.cjs' remix-serve build/index.js",
"typecheck": "tsc",
Expand All@@ -12,24 +12,28 @@
},
"dependencies": {
"@sentry/remix": "latest || *",
"@remix-run/css-bundle": "2.16.5",
"@remix-run/node": "2.16.5",
"@remix-run/react": "2.16.5",
"@remix-run/serve": "2.16.5",
"@remix-run/css-bundle": "2.16.7",
"@remix-run/node": "2.16.7",
"@remix-run/react": "2.16.7",
"@remix-run/serve": "2.16.7",
"isbot": "^3.6.8",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@playwright/test": "~1.50.0",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@remix-run/dev": "2.16.5",
"@remix-run/eslint-config": "2.16.5",
"@remix-run/dev": "2.16.7",
"@remix-run/eslint-config": "2.16.7",
"@sentry/core": "latest || *",
"@types/react": "^18.0.35",
"@types/react-dom": "^18.0.11",
"@types/react": "^18.2.64",
"@types/react-dom": "^18.2.34",
"@types/prop-types": "15.7.7",
"eslint": "^8.38.0",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
},
"resolutions": {
"@types/react": "18.2.22"
},
"volta": {
"extends": "../../package.json"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
{
"include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
"include": ["remix.env.d.ts", "./app/**/*.ts", "./app/**/*.tsx"],
"exclude": ["node_modules", "build"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2019"],
"isolatedModules": true,
Expand All@@ -10,6 +11,7 @@
"target": "ES2019",
"strict": true,
"allowJs": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"baseUrl": ".",
"paths": {
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
import {createPagesFunctionHandler} from '@remix-run/cloudflare-pages';
import {sentryPagesPlugin} from '@sentry/cloudflare';
import {createPagesFunctionHandler} from '@remix-run/cloudflare-pages';
import {sentryPagesPlugin} from '@sentry/cloudflare';

// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore - the server build file is generated by `remix vite:build`
// eslint-disable-next-line import/no-unresolved
import * as build from '../build/server';

export const onRequest = [
context => sentryPagesPlugin({ dsn: context.env.E2E_TEST_DSN, tracesSampleRate: 1.0 })(context),
createPagesFunctionHandler({ build }),
(context: EventPluginContext<any, any, any, any>) =>
sentryPagesPlugin({
dsn: context.env.E2E_TEST_DSN,
tracesSampleRate: 1.0,
})(context),
createPagesFunctionHandler({build}),
];

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,16 @@ import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
import { hydrateRoot } from 'react-dom/client';

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

Sentry.init({
environment: 'qa', // dynamic sampling bias to keep transactions
dsn: window.ENV.SENTRY_DSN,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,6 @@ function isBotRequest(userAgent: string | null) {
return isbotModule.isbot(userAgent);
}

// isbot < 3.8.0
if ('default' in isbotModule && typeof isbotModule.default === 'function') {
return isbotModule.default(userAgent);
}

return false;
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"private": true,
"sideEffects": false,
"scripts": {
"build": "remix vite:build",
"build": "remix vite:build && pnpm typecheck",
"dev": "node ./server.mjs",
"lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
"start": "cross-env NODE_ENV=production node ./server.mjs",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,16 @@ import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
import { hydrateRoot } from 'react-dom/client';

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

Sentry.init({
environment: 'qa', // dynamic sampling bias to keep transactions
dsn: window.ENV.SENTRY_DSN,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,6 @@ function isBotRequest(userAgent: string | null) {
return isbotModule.isbot(userAgent);
}

// isbot < 3.8.0
if ('default' in isbotModule && typeof isbotModule.default === 'function') {
return isbotModule.default(userAgent);
}

return false;
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
"sideEffects": false,
"type": "module",
"scripts": {
"build": "remix vite:build",
"build": "remix vite:build && pnpm typecheck",
"dev": "node ./server.mjs",
"lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
"start": "cross-env NODE_ENV=production node ./server.mjs",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { waitForError } from '@sentry-internal/test-utils';

test('Sends a loader error to Sentry', async ({ page }) => {
const loaderErrorPromise = waitForError('create-remix-app-express', errorEvent => {
return errorEvent.exception.values[0].value === 'Loader Error';
return errorEvent?.exception?.values?.[0]?.value === 'Loader Error';
});

await page.goto('/loader-error');
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ test('Sends parameterized transaction name to Sentry', async ({ page }) => {

test('Sends form data with action span', async ({ page }) => {
const formdataActionTransaction = waitForTransaction('create-remix-app-express', transactionEvent => {
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'action');
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'action') || false;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

q: What does adding || false do here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

waitForTransaction expects a function returning a boolean, after adding optional chaining, it became boolean | undefined. So, making it false in such cases

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah... of course 😅 thanks

});

await page.goto('/action-formdata');
Expand All@@ -34,31 +34,31 @@ test('Sends form data with action span', async ({ page }) => {

await page.locator('button[type=submit]').click();

const actionSpan = (await formdataActionTransaction).spans.find(
const actionSpan = (await formdataActionTransaction)?.spans?.find(
span => span.data && span.data['code.function'] === 'action',
);

expect(actionSpan).toBeDefined();
expect(actionSpan.op).toBe('action.remix');
expect(actionSpan.data).toMatchObject({
expect(actionSpan?.op).toBe('action.remix');
expect(actionSpan?.data).toMatchObject({
'formData.text': 'test',
'formData.file': 'file.txt',
});
});

test('Sends a loader span to Sentry', async ({ page }) => {
const loaderTransactionPromise = waitForTransaction('create-remix-app-express', transactionEvent => {
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'loader');
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'loader') || false;
Comment thread
andreiborza marked this conversation as resolved.
});

await page.goto('/');

const loaderSpan = (await loaderTransactionPromise).spans.find(
const loaderSpan = (await loaderTransactionPromise)?.spans?.find(
span => span.data && span.data['code.function'] === 'loader',
);

expect(loaderSpan).toBeDefined();
expect(loaderSpan.op).toBe('loader.remix');
expect(loaderSpan?.op).toBe('loader.remix');
});

test('Propagates trace when ErrorBoundary is triggered', async ({ page }) => {
Expand All@@ -83,9 +83,8 @@ test('Propagates trace when ErrorBoundary is triggered', async ({ page }) => {

const httpServerTraceId = httpServerTransaction.contexts?.trace?.trace_id;
const httpServerSpanId = httpServerTransaction.contexts?.trace?.span_id;
const loaderSpanId = httpServerTransaction.spans.find(
span => span.data && span.data['code.function'] === 'loader',
)?.span_id;
const loaderSpanId = httpServerTransaction?.spans?.find(span => span.data && span.data['code.function'] === 'loader')
?.span_id;

const pageLoadTraceId = pageloadTransaction.contexts?.trace?.trace_id;
const pageLoadSpanId = pageloadTransaction.contexts?.trace?.span_id;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
"include": ["env.d.ts", "**/*.ts", "**/*.tsx"],
"include": ["env.d.ts", "./app/**/*.ts", "./app/**/*.tsx"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2022"],
"isolatedModules": true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,16 @@
* For more information, see https://remix.run/file-conventions/entry.client
*/

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

import { RemixBrowser, useLocation, useMatches } from '@remix-run/react';
import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"private": true,
"sideEffects": false,
"scripts": {
"build": "remix build",
"build": "remix build && pnpm typecheck",
"dev": "remix dev",
"start": "NODE_OPTIONS='--require=./instrument.server.cjs' remix-serve build/index.js",
"typecheck": "tsc",
Expand All@@ -12,24 +12,28 @@
},
"dependencies": {
"@sentry/remix": "latest || *",
"@remix-run/css-bundle": "2.16.5",
"@remix-run/node": "2.16.5",
"@remix-run/react": "2.16.5",
"@remix-run/serve": "2.16.5",
"@remix-run/css-bundle": "2.16.7",
"@remix-run/node": "2.16.7",
"@remix-run/react": "2.16.7",
"@remix-run/serve": "2.16.7",
"isbot": "^3.6.8",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@playwright/test": "~1.50.0",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@remix-run/dev": "2.16.5",
"@remix-run/eslint-config": "2.16.5",
"@remix-run/dev": "2.16.7",
"@remix-run/eslint-config": "2.16.7",
"@sentry/core": "latest || *",
"@types/react": "^18.0.35",
"@types/react-dom": "^18.0.11",
"@types/react": "^18.2.64",
"@types/react-dom": "^18.2.34",
"@types/prop-types": "15.7.7",
"eslint": "^8.38.0",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
},
"resolutions": {
"@types/react": "18.2.22"
},
"volta": {
"extends": "../../package.json"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
{
"include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
"include": ["remix.env.d.ts", "./app/**/*.ts", "./app/**/*.tsx"],
"exclude": ["node_modules", "build"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2019"],
"isolatedModules": true,
Expand All@@ -10,6 +11,7 @@
"target": "ES2019",
"strict": true,
"allowJs": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"baseUrl": ".",
"paths": {
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
import {createPagesFunctionHandler} from '@remix-run/cloudflare-pages';
import {sentryPagesPlugin} from '@sentry/cloudflare';
import {createPagesFunctionHandler} from '@remix-run/cloudflare-pages';
import {sentryPagesPlugin} from '@sentry/cloudflare';

// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore - the server build file is generated by `remix vite:build`
// eslint-disable-next-line import/no-unresolved
import * as build from '../build/server';

export const onRequest = [
context => sentryPagesPlugin({ dsn: context.env.E2E_TEST_DSN, tracesSampleRate: 1.0 })(context),
createPagesFunctionHandler({ build }),
(context: EventPluginContext<any, any, any, any>) =>
sentryPagesPlugin({
dsn: context.env.E2E_TEST_DSN,
tracesSampleRate: 1.0,
})(context),
createPagesFunctionHandler({build}),
];

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,16 @@ import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
import { hydrateRoot } from 'react-dom/client';

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

Sentry.init({
environment: 'qa', // dynamic sampling bias to keep transactions
dsn: window.ENV.SENTRY_DSN,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,6 @@ function isBotRequest(userAgent: string | null) {
return isbotModule.isbot(userAgent);
}

// isbot < 3.8.0
if ('default' in isbotModule && typeof isbotModule.default === 'function') {
return isbotModule.default(userAgent);
}

return false;
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"private": true,
"sideEffects": false,
"scripts": {
"build": "remix vite:build",
"build": "remix vite:build && pnpm typecheck",
"dev": "node ./server.mjs",
"lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
"start": "cross-env NODE_ENV=production node ./server.mjs",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,16 @@ import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
import { hydrateRoot } from 'react-dom/client';

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

Sentry.init({
environment: 'qa', // dynamic sampling bias to keep transactions
dsn: window.ENV.SENTRY_DSN,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,6 @@ function isBotRequest(userAgent: string | null) {
return isbotModule.isbot(userAgent);
}

// isbot < 3.8.0
if ('default' in isbotModule && typeof isbotModule.default === 'function') {
return isbotModule.default(userAgent);
}

return false;
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
"sideEffects": false,
"type": "module",
"scripts": {
"build": "remix vite:build",
"build": "remix vite:build && pnpm typecheck",
"dev": "node ./server.mjs",
"lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
"start": "cross-env NODE_ENV=production node ./server.mjs",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { waitForError } from '@sentry-internal/test-utils';

test('Sends a loader error to Sentry', async ({ page }) => {
const loaderErrorPromise = waitForError('create-remix-app-express', errorEvent => {
return errorEvent.exception.values[0].value === 'Loader Error';
return errorEvent?.exception?.values?.[0]?.value === 'Loader Error';
});

await page.goto('/loader-error');
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ test('Sends parameterized transaction name to Sentry', async ({ page }) => {

test('Sends form data with action span', async ({ page }) => {
const formdataActionTransaction = waitForTransaction('create-remix-app-express', transactionEvent => {
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'action');
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'action') || false;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

q: What does adding || false do here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

waitForTransaction expects a function returning a boolean, after adding optional chaining, it became boolean | undefined. So, making it false in such cases

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah... of course 😅 thanks

});

await page.goto('/action-formdata');
Expand All@@ -34,31 +34,31 @@ test('Sends form data with action span', async ({ page }) => {

await page.locator('button[type=submit]').click();

const actionSpan = (await formdataActionTransaction).spans.find(
const actionSpan = (await formdataActionTransaction)?.spans?.find(
span => span.data && span.data['code.function'] === 'action',
);

expect(actionSpan).toBeDefined();
expect(actionSpan.op).toBe('action.remix');
expect(actionSpan.data).toMatchObject({
expect(actionSpan?.op).toBe('action.remix');
expect(actionSpan?.data).toMatchObject({
'formData.text': 'test',
'formData.file': 'file.txt',
});
});

test('Sends a loader span to Sentry', async ({ page }) => {
const loaderTransactionPromise = waitForTransaction('create-remix-app-express', transactionEvent => {
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'loader');
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'loader') || false;
Comment thread
andreiborza marked this conversation as resolved.
});

await page.goto('/');

const loaderSpan = (await loaderTransactionPromise).spans.find(
const loaderSpan = (await loaderTransactionPromise)?.spans?.find(
span => span.data && span.data['code.function'] === 'loader',
);

expect(loaderSpan).toBeDefined();
expect(loaderSpan.op).toBe('loader.remix');
expect(loaderSpan?.op).toBe('loader.remix');
});

test('Propagates trace when ErrorBoundary is triggered', async ({ page }) => {
Expand All@@ -83,9 +83,8 @@ test('Propagates trace when ErrorBoundary is triggered', async ({ page }) => {

const httpServerTraceId = httpServerTransaction.contexts?.trace?.trace_id;
const httpServerSpanId = httpServerTransaction.contexts?.trace?.span_id;
const loaderSpanId = httpServerTransaction.spans.find(
span => span.data && span.data['code.function'] === 'loader',
)?.span_id;
const loaderSpanId = httpServerTransaction?.spans?.find(span => span.data && span.data['code.function'] === 'loader')
?.span_id;

const pageLoadTraceId = pageloadTransaction.contexts?.trace?.trace_id;
const pageLoadSpanId = pageloadTransaction.contexts?.trace?.span_id;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
"include": ["env.d.ts", "**/*.ts", "**/*.tsx"],
"include": ["env.d.ts", "./app/**/*.ts", "./app/**/*.tsx"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2022"],
"isolatedModules": true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,16 @@
* For more information, see https://remix.run/file-conventions/entry.client
*/

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

import { RemixBrowser, useLocation, useMatches } from '@remix-run/react';
import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"private": true,
"sideEffects": false,
"scripts": {
"build": "remix build",
"build": "remix build && pnpm typecheck",
"dev": "remix dev",
"start": "NODE_OPTIONS='--require=./instrument.server.cjs' remix-serve build/index.js",
"typecheck": "tsc",
Expand All@@ -12,24 +12,28 @@
},
"dependencies": {
"@sentry/remix": "latest || *",
"@remix-run/css-bundle": "2.16.5",
"@remix-run/node": "2.16.5",
"@remix-run/react": "2.16.5",
"@remix-run/serve": "2.16.5",
"@remix-run/css-bundle": "2.16.7",
"@remix-run/node": "2.16.7",
"@remix-run/react": "2.16.7",
"@remix-run/serve": "2.16.7",
"isbot": "^3.6.8",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@playwright/test": "~1.50.0",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@remix-run/dev": "2.16.5",
"@remix-run/eslint-config": "2.16.5",
"@remix-run/dev": "2.16.7",
"@remix-run/eslint-config": "2.16.7",
"@sentry/core": "latest || *",
"@types/react": "^18.0.35",
"@types/react-dom": "^18.0.11",
"@types/react": "^18.2.64",
"@types/react-dom": "^18.2.34",
"@types/prop-types": "15.7.7",
"eslint": "^8.38.0",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
},
"resolutions": {
"@types/react": "18.2.22"
},
"volta": {
"extends": "../../package.json"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
{
"include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
"include": ["remix.env.d.ts", "./app/**/*.ts", "./app/**/*.tsx"],
"exclude": ["node_modules", "build"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2019"],
"isolatedModules": true,
Expand All@@ -10,6 +11,7 @@
"target": "ES2019",
"strict": true,
"allowJs": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"baseUrl": ".",
"paths": {
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
import {createPagesFunctionHandler} from '@remix-run/cloudflare-pages';
import {sentryPagesPlugin} from '@sentry/cloudflare';
import {createPagesFunctionHandler} from '@remix-run/cloudflare-pages';
import {sentryPagesPlugin} from '@sentry/cloudflare';

// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore - the server build file is generated by `remix vite:build`
// eslint-disable-next-line import/no-unresolved
import * as build from '../build/server';

export const onRequest = [
context => sentryPagesPlugin({ dsn: context.env.E2E_TEST_DSN, tracesSampleRate: 1.0 })(context),
createPagesFunctionHandler({ build }),
(context: EventPluginContext<any, any, any, any>) =>
sentryPagesPlugin({
dsn: context.env.E2E_TEST_DSN,
tracesSampleRate: 1.0,
})(context),
createPagesFunctionHandler({build}),
];

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,16 @@ import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
import { hydrateRoot } from 'react-dom/client';

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

Sentry.init({
environment: 'qa', // dynamic sampling bias to keep transactions
dsn: window.ENV.SENTRY_DSN,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,6 @@ function isBotRequest(userAgent: string | null) {
return isbotModule.isbot(userAgent);
}

// isbot < 3.8.0
if ('default' in isbotModule && typeof isbotModule.default === 'function') {
return isbotModule.default(userAgent);
}

return false;
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"private": true,
"sideEffects": false,
"scripts": {
"build": "remix vite:build",
"build": "remix vite:build && pnpm typecheck",
"dev": "node ./server.mjs",
"lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
"start": "cross-env NODE_ENV=production node ./server.mjs",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,16 @@ import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
import { hydrateRoot } from 'react-dom/client';

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

Sentry.init({
environment: 'qa', // dynamic sampling bias to keep transactions
dsn: window.ENV.SENTRY_DSN,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,6 @@ function isBotRequest(userAgent: string | null) {
return isbotModule.isbot(userAgent);
}

// isbot < 3.8.0
if ('default' in isbotModule && typeof isbotModule.default === 'function') {
return isbotModule.default(userAgent);
}

return false;
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
"sideEffects": false,
"type": "module",
"scripts": {
"build": "remix vite:build",
"build": "remix vite:build && pnpm typecheck",
"dev": "node ./server.mjs",
"lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
"start": "cross-env NODE_ENV=production node ./server.mjs",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { waitForError } from '@sentry-internal/test-utils';

test('Sends a loader error to Sentry', async ({ page }) => {
const loaderErrorPromise = waitForError('create-remix-app-express', errorEvent => {
return errorEvent.exception.values[0].value === 'Loader Error';
return errorEvent?.exception?.values?.[0]?.value === 'Loader Error';
});

await page.goto('/loader-error');
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ test('Sends parameterized transaction name to Sentry', async ({ page }) => {

test('Sends form data with action span', async ({ page }) => {
const formdataActionTransaction = waitForTransaction('create-remix-app-express', transactionEvent => {
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'action');
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'action') || false;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

q: What does adding || false do here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

waitForTransaction expects a function returning a boolean, after adding optional chaining, it became boolean | undefined. So, making it false in such cases

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah... of course 😅 thanks

});

await page.goto('/action-formdata');
Expand All@@ -34,31 +34,31 @@ test('Sends form data with action span', async ({ page }) => {

await page.locator('button[type=submit]').click();

const actionSpan = (await formdataActionTransaction).spans.find(
const actionSpan = (await formdataActionTransaction)?.spans?.find(
span => span.data && span.data['code.function'] === 'action',
);

expect(actionSpan).toBeDefined();
expect(actionSpan.op).toBe('action.remix');
expect(actionSpan.data).toMatchObject({
expect(actionSpan?.op).toBe('action.remix');
expect(actionSpan?.data).toMatchObject({
'formData.text': 'test',
'formData.file': 'file.txt',
});
});

test('Sends a loader span to Sentry', async ({ page }) => {
const loaderTransactionPromise = waitForTransaction('create-remix-app-express', transactionEvent => {
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'loader');
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'loader') || false;
Comment thread
andreiborza marked this conversation as resolved.
});

await page.goto('/');

const loaderSpan = (await loaderTransactionPromise).spans.find(
const loaderSpan = (await loaderTransactionPromise)?.spans?.find(
span => span.data && span.data['code.function'] === 'loader',
);

expect(loaderSpan).toBeDefined();
expect(loaderSpan.op).toBe('loader.remix');
expect(loaderSpan?.op).toBe('loader.remix');
});

test('Propagates trace when ErrorBoundary is triggered', async ({ page }) => {
Expand All@@ -83,9 +83,8 @@ test('Propagates trace when ErrorBoundary is triggered', async ({ page }) => {

const httpServerTraceId = httpServerTransaction.contexts?.trace?.trace_id;
const httpServerSpanId = httpServerTransaction.contexts?.trace?.span_id;
const loaderSpanId = httpServerTransaction.spans.find(
span => span.data && span.data['code.function'] === 'loader',
)?.span_id;
const loaderSpanId = httpServerTransaction?.spans?.find(span => span.data && span.data['code.function'] === 'loader')
?.span_id;

const pageLoadTraceId = pageloadTransaction.contexts?.trace?.trace_id;
const pageLoadSpanId = pageloadTransaction.contexts?.trace?.span_id;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
"include": ["env.d.ts", "**/*.ts", "**/*.tsx"],
"include": ["env.d.ts", "./app/**/*.ts", "./app/**/*.tsx"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2022"],
"isolatedModules": true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,16 @@
* For more information, see https://remix.run/file-conventions/entry.client
*/

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

import { RemixBrowser, useLocation, useMatches } from '@remix-run/react';
import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"private": true,
"sideEffects": false,
"scripts": {
"build": "remix build",
"build": "remix build && pnpm typecheck",
"dev": "remix dev",
"start": "NODE_OPTIONS='--require=./instrument.server.cjs' remix-serve build/index.js",
"typecheck": "tsc",
Expand All@@ -12,24 +12,28 @@
},
"dependencies": {
"@sentry/remix": "latest || *",
"@remix-run/css-bundle": "2.16.5",
"@remix-run/node": "2.16.5",
"@remix-run/react": "2.16.5",
"@remix-run/serve": "2.16.5",
"@remix-run/css-bundle": "2.16.7",
"@remix-run/node": "2.16.7",
"@remix-run/react": "2.16.7",
"@remix-run/serve": "2.16.7",
"isbot": "^3.6.8",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@playwright/test": "~1.50.0",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@remix-run/dev": "2.16.5",
"@remix-run/eslint-config": "2.16.5",
"@remix-run/dev": "2.16.7",
"@remix-run/eslint-config": "2.16.7",
"@sentry/core": "latest || *",
"@types/react": "^18.0.35",
"@types/react-dom": "^18.0.11",
"@types/react": "^18.2.64",
"@types/react-dom": "^18.2.34",
"@types/prop-types": "15.7.7",
"eslint": "^8.38.0",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
},
"resolutions": {
"@types/react": "18.2.22"
},
"volta": {
"extends": "../../package.json"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
{
"include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
"include": ["remix.env.d.ts", "./app/**/*.ts", "./app/**/*.tsx"],
"exclude": ["node_modules", "build"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2019"],
"isolatedModules": true,
Expand All@@ -10,6 +11,7 @@
"target": "ES2019",
"strict": true,
"allowJs": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"baseUrl": ".",
"paths": {
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
import {createPagesFunctionHandler} from '@remix-run/cloudflare-pages';
import {sentryPagesPlugin} from '@sentry/cloudflare';
import {createPagesFunctionHandler} from '@remix-run/cloudflare-pages';
import {sentryPagesPlugin} from '@sentry/cloudflare';

// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore - the server build file is generated by `remix vite:build`
// eslint-disable-next-line import/no-unresolved
import * as build from '../build/server';

export const onRequest = [
context => sentryPagesPlugin({ dsn: context.env.E2E_TEST_DSN, tracesSampleRate: 1.0 })(context),
createPagesFunctionHandler({ build }),
(context: EventPluginContext<any, any, any, any>) =>
sentryPagesPlugin({
dsn: context.env.E2E_TEST_DSN,
tracesSampleRate: 1.0,
})(context),
createPagesFunctionHandler({build}),
];

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,16 @@ import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
import { hydrateRoot } from 'react-dom/client';

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

Sentry.init({
environment: 'qa', // dynamic sampling bias to keep transactions
dsn: window.ENV.SENTRY_DSN,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,6 @@ function isBotRequest(userAgent: string | null) {
return isbotModule.isbot(userAgent);
}

// isbot < 3.8.0
if ('default' in isbotModule && typeof isbotModule.default === 'function') {
return isbotModule.default(userAgent);
}

return false;
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"private": true,
"sideEffects": false,
"scripts": {
"build": "remix vite:build",
"build": "remix vite:build && pnpm typecheck",
"dev": "node ./server.mjs",
"lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
"start": "cross-env NODE_ENV=production node ./server.mjs",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,16 @@ import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
import { hydrateRoot } from 'react-dom/client';

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

Sentry.init({
environment: 'qa', // dynamic sampling bias to keep transactions
dsn: window.ENV.SENTRY_DSN,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,11 +40,6 @@ function isBotRequest(userAgent: string | null) {
return isbotModule.isbot(userAgent);
}

// isbot < 3.8.0
if ('default' in isbotModule && typeof isbotModule.default === 'function') {
return isbotModule.default(userAgent);
}

return false;
}

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
"sideEffects": false,
"type": "module",
"scripts": {
"build": "remix vite:build",
"build": "remix vite:build && pnpm typecheck",
"dev": "node ./server.mjs",
"lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
"start": "cross-env NODE_ENV=production node ./server.mjs",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { waitForError } from '@sentry-internal/test-utils';

test('Sends a loader error to Sentry', async ({ page }) => {
const loaderErrorPromise = waitForError('create-remix-app-express', errorEvent => {
return errorEvent.exception.values[0].value === 'Loader Error';
return errorEvent?.exception?.values?.[0]?.value === 'Loader Error';
});

await page.goto('/loader-error');
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ test('Sends parameterized transaction name to Sentry', async ({ page }) => {

test('Sends form data with action span', async ({ page }) => {
const formdataActionTransaction = waitForTransaction('create-remix-app-express', transactionEvent => {
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'action');
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'action') || false;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

q: What does adding || false do here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

waitForTransaction expects a function returning a boolean, after adding optional chaining, it became boolean | undefined. So, making it false in such cases

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah... of course 😅 thanks

});

await page.goto('/action-formdata');
Expand All@@ -34,31 +34,31 @@ test('Sends form data with action span', async ({ page }) => {

await page.locator('button[type=submit]').click();

const actionSpan = (await formdataActionTransaction).spans.find(
const actionSpan = (await formdataActionTransaction)?.spans?.find(
span => span.data && span.data['code.function'] === 'action',
);

expect(actionSpan).toBeDefined();
expect(actionSpan.op).toBe('action.remix');
expect(actionSpan.data).toMatchObject({
expect(actionSpan?.op).toBe('action.remix');
expect(actionSpan?.data).toMatchObject({
'formData.text': 'test',
'formData.file': 'file.txt',
});
});

test('Sends a loader span to Sentry', async ({ page }) => {
const loaderTransactionPromise = waitForTransaction('create-remix-app-express', transactionEvent => {
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'loader');
return transactionEvent?.spans?.some(span => span.data && span.data['code.function'] === 'loader') || false;
Comment thread
andreiborza marked this conversation as resolved.
});

await page.goto('/');

const loaderSpan = (await loaderTransactionPromise).spans.find(
const loaderSpan = (await loaderTransactionPromise)?.spans?.find(
span => span.data && span.data['code.function'] === 'loader',
);

expect(loaderSpan).toBeDefined();
expect(loaderSpan.op).toBe('loader.remix');
expect(loaderSpan?.op).toBe('loader.remix');
});

test('Propagates trace when ErrorBoundary is triggered', async ({ page }) => {
Expand All@@ -83,9 +83,8 @@ test('Propagates trace when ErrorBoundary is triggered', async ({ page }) => {

const httpServerTraceId = httpServerTransaction.contexts?.trace?.trace_id;
const httpServerSpanId = httpServerTransaction.contexts?.trace?.span_id;
const loaderSpanId = httpServerTransaction.spans.find(
span => span.data && span.data['code.function'] === 'loader',
)?.span_id;
const loaderSpanId = httpServerTransaction?.spans?.find(span => span.data && span.data['code.function'] === 'loader')
?.span_id;

const pageLoadTraceId = pageloadTransaction.contexts?.trace?.trace_id;
const pageLoadSpanId = pageloadTransaction.contexts?.trace?.span_id;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
"include": ["env.d.ts", "**/*.ts", "**/*.tsx"],
"include": ["env.d.ts", "./app/**/*.ts", "./app/**/*.tsx"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2022"],
"isolatedModules": true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,16 @@
* For more information, see https://remix.run/file-conventions/entry.client
*/

// Extend the Window interface to include ENV
declare global {
interface Window {
ENV: {
SENTRY_DSN: string;
[key: string]: unknown;
};
}
}

import { RemixBrowser, useLocation, useMatches } from '@remix-run/react';
import * as Sentry from '@sentry/remix';
import { StrictMode, startTransition, useEffect } from 'react';
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ export function ErrorBoundary() {
}

function App() {
const { ENV } = useLoaderData();
const { ENV } = useLoaderData() as { ENV: { SENTRY_DSN: string } };

return (
<html lang="en">
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ export const loader: LoaderFunction = async ({ params: { id } }) => {
};

export default function LoaderError() {
const data = useLoaderData();
const data = useLoaderData() as { test?: string };

return (
<div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"private": true,
"sideEffects": false,
"scripts": {
"build": "remix build",
"build": "remix build && pnpm typecheck",
"dev": "remix dev",
"start": "NODE_OPTIONS='--require=./instrument.server.cjs' remix-serve build/index.js",
"typecheck": "tsc",
Expand All@@ -12,24 +12,28 @@
},
"dependencies": {
"@sentry/remix": "latest || *",
"@remix-run/css-bundle": "2.16.5",
"@remix-run/node": "2.16.5",
"@remix-run/react": "2.16.5",
"@remix-run/serve": "2.16.5",
"@remix-run/css-bundle": "2.16.7",
"@remix-run/node": "2.16.7",
"@remix-run/react": "2.16.7",
"@remix-run/serve": "2.16.7",
"isbot": "^3.6.8",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@playwright/test": "~1.50.0",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@remix-run/dev": "2.16.5",
"@remix-run/eslint-config": "2.16.5",
"@remix-run/dev": "2.16.7",
"@remix-run/eslint-config": "2.16.7",
"@sentry/core": "latest || *",
"@types/react": "^18.0.35",
"@types/react-dom": "^18.0.11",
"@types/react": "^18.2.64",
"@types/react-dom": "^18.2.34",
"@types/prop-types": "15.7.7",
"eslint": "^8.38.0",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
},
"resolutions": {
"@types/react": "18.2.22"
},
"volta": {
"extends": "../../package.json"
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
{
"include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
"include": ["remix.env.d.ts", "./app/**/*.ts", "./app/**/*.tsx"],
"exclude": ["node_modules", "build"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2019"],
"isolatedModules": true,
Expand All@@ -10,6 +11,7 @@
"target": "ES2019",
"strict": true,
"allowJs": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"baseUrl": ".",
"paths": {
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
import {createPagesFunctionHandler} from '@remix-run/cloudflare-pages';
import {sentryPagesPlugin} from '@sentry/cloudflare';
import {createPagesFunctionHandler} from '@remix-run/cloudflare-pages';
import {sentryPagesPlugin} from '@sentry/cloudflare';

// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore - the server build file is generated by `remix vite:build`
// eslint-disable-next-line import/no-unresolved
import * as build from '../build/server';

export const onRequest = [
context => sentryPagesPlugin({ dsn: context.env.E2E_TEST_DSN, tracesSampleRate: 1.0 })(context),
createPagesFunctionHandler({ build }),
(context: EventPluginContext<any, any, any, any>) =>
sentryPagesPlugin({
dsn: context.env.E2E_TEST_DSN,
tracesSampleRate: 1.0,
})(context),
createPagesFunctionHandler({build}),
];

This file was deleted.

Loading