Skip to content
Open
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 number Diff line number Diff line change
@@ -0,0 +1,12 @@
import * as Sentry from '@sentry/remix';
import { useEffect, useState } from 'react';

export default function RouteProvider() {
const [route, setRoute] = useState<string>();

useEffect(() => {
setRoute(Sentry.resolveCurrentRoute() ?? 'unresolved');
}, []);

return <div id="resolved-route">{route}</div>;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { expect, test } from '@playwright/test';

// The route provider is backed by the manifest the Vite plugin injects into the client bundle, so this
// fails if that manifest never reaches the browser.
test('resolves the parameterized route through the route provider', async ({ page }) => {
await page.goto('/route-provider/123');

await expect(page.locator('#resolved-route')).toHaveText('/route-provider/:id');
});
13 changes: 13 additions & 0 deletions packages/remix/src/client/routeProvider.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import type { RouteProvider } from '@sentry/react';
import { createUrlRouteProvider } from '@sentry/react';
import { maybeParameterizeRemixRoute } from './remixRouteParameterization';

/**
* A route provider backed by the route manifest the Vite plugin injects at build time.
*
* The manifest is on the global object before `Sentry.init` runs, so this needs no router and no
* tracing integration: registering it is what lets anything else in the SDK name a route.
*/
export function createRemixRouteProvider(): RouteProvider {
return createUrlRouteProvider(url => maybeParameterizeRemixRoute(url.pathname));
}
4 changes: 4 additions & 0 deletions packages/remix/src/client/sdk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { Client } from '@sentry/core';
import { applySdkMetadata } from '@sentry/core';
import { init as reactInit } from '@sentry/react';
import type { RemixOptions } from '../utils/remixOptions';
import { createRemixRouteProvider } from './routeProvider';

/**
* Initializes the Remix SDK.
Expand All @@ -10,6 +11,9 @@ import type { RemixOptions } from '../utils/remixOptions';
*/
export function init(options: RemixOptions): Client | undefined {
const opts = {
// The manifest is injected at build time, so route parameterization works from `init` on, even with
// tracing disabled.
routeProvider: createRemixRouteProvider(),
...options,
environment: options.environment || process.env.NODE_ENV,
};
Expand Down
50 changes: 50 additions & 0 deletions packages/remix/test/client/routeProvider.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import { GLOBAL_OBJ } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { createRemixRouteProvider } from '../../src/client/routeProvider';

const globalWithInjectedManifest = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
_sentryRemixRouteManifest: string | undefined;
};

const MANIFEST = JSON.stringify({
staticRoutes: [{ path: '/about' }],
dynamicRoutes: [{ path: '/users/:id', regex: '^/users/([^/]+)$', paramNames: ['id'] }],
});

let originalDocument: unknown;

describe('createRemixRouteProvider', () => {
beforeEach(() => {
globalWithInjectedManifest._sentryRemixRouteManifest = MANIFEST;
originalDocument = (GLOBAL_OBJ as { document?: unknown }).document;
// `resolveCurrentRoute` reads `document.location.href`.
(GLOBAL_OBJ as { document?: unknown }).document = { location: { href: 'https://example.com/users/42' } };
});

afterEach(() => {
globalWithInjectedManifest._sentryRemixRouteManifest = undefined;
(GLOBAL_OBJ as { document?: unknown }).document = originalDocument;
});

it('parameterizes a URL from the build-time manifest', () => {
expect(createRemixRouteProvider().resolveRoute(new URL('https://example.com/users/42'))).toBe('/users/:id');
});

it('resolves a static route', () => {
expect(createRemixRouteProvider().resolveRoute(new URL('https://example.com/about'))).toBe('/about');
});

it('resolves the current route from the document location', () => {
expect(createRemixRouteProvider().resolveCurrentRoute()).toBe('/users/:id');
});

it('returns undefined for a URL the manifest does not know', () => {
expect(createRemixRouteProvider().resolveRoute(new URL('https://example.com/nope/deep'))).toBeUndefined();
});

it('returns undefined when the manifest was never injected', () => {
globalWithInjectedManifest._sentryRemixRouteManifest = undefined;

expect(createRemixRouteProvider().resolveRoute(new URL('https://example.com/users/42'))).toBeUndefined();
});
});
Comment thread
logaretm marked this conversation as resolved.
11 changes: 11 additions & 0 deletions packages/remix/test/index.client.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,17 @@ describe('Client init()', () => {
);
});

it('passes the Remix route provider unless the user passed one', () => {
init({});
expect(reactInit).toHaveBeenLastCalledWith(
expect.objectContaining({ routeProvider: expect.objectContaining({ resolveRoute: expect.any(Function) }) }),
);

const routeProvider = { resolveRoute: () => '/custom', resolveCurrentRoute: () => '/custom' };
init({ routeProvider });
expect(reactInit).toHaveBeenLastCalledWith(expect.objectContaining({ routeProvider }));
});

it('returns client from init', () => {
expect(init({})).not.toBeUndefined();
});
Expand Down
Loading