Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(replay): Fix potential broken CSS in styled-components #9234

Merged
merged 4 commits into from
Oct 13, 2023
Merged

fix(replay): Fix potential broken CSS in styled-components #9234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e851da
fix(replay): Fix potential broken CSS in styled-components
billyvg Oct 12, 2023
b744494
errorHandler should only annotate error, we want it to re-throw so do…
billyvg Oct 12, 2023
0f8dd6a
prettier
billyvg Oct 12, 2023
a66168f
try-catch writing error
mydea Oct 13, 2023
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
8 changes: 8 additions & 0 deletions packages/browser-integration-tests/suites/replay/exceptions/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
</head>
<body>
</body>
</html>
35 changes: 35 additions & 0 deletions packages/browser-integration-tests/suites/replay/exceptions/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import { expect } from '@playwright/test';

import { sentryTest } from '../../../utils/fixtures';
import { shouldSkipReplayTest } from '../../../utils/replayHelpers';

sentryTest('exceptions within rrweb and re-thrown and annotated', async ({ getLocalTestPath, page, browserName }) => {
if (shouldSkipReplayTest() || browserName !== 'chromium') {
sentryTest.skip();
}

const url = await getLocalTestPath({ testDir: __dirname });

await page.goto(url);

expect(
await page.evaluate(() => {
try {
const s = new CSSStyleSheet();
s.insertRule('body::-ms-expand{display: none}');
s.insertRule('body {background-color: #fff;}');
return s.cssRules.length;
} catch {
return false;
}
}),
).toBe(false);

expect(
await page.evaluate(() => {
const s = new CSSStyleSheet();
s.insertRule('body {background-color: #fff;}');
return s.cssRules.length;
}),
).toBe(1);
});
10 changes: 4 additions & 6 deletions packages/replay/src/integration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,13 @@ export class Replay implements Integration {
// collect fonts, but be aware that `sentry.io` needs to be an allowed
// origin for playback
collectFonts: true,
errorHandler: (err: Error) => {
errorHandler: (err: Error & { __rrweb__?: boolean }) => {
try {
// @ts-expect-error Set this so that replay SDK can ignore errors originating from rrweb
err.__rrweb__ = true;
} catch {
// avoid any potential hazards here
} catch (error) {
// ignore errors here
// this can happen if the error is frozen or does not allow mutation for other reasons
}
// return true to suppress throwing the error inside of rrweb
return true;
},
};

Expand Down