Skip to content

Commit 8e3b0d9

Browse files
chargomechargome
authored
Merge branch 'develop' into cg/fix-yarn-pnp
2 parents 2f542f6 + e1c49dc commit 8e3b0d9

File tree

182 files changed

+431
-330
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+431
-330
lines changed

‎.size-limit.js‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -88,20 +88,6 @@ module.exports = [
8888
gzip: true,
8989
limit: '95 KB',
9090
},
91-
{
92-
name: '@sentry/browser (incl. Tracing, Replay, Feedback, metrics)',
93-
path: 'packages/browser/build/npm/esm/index.js',
94-
import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'feedbackIntegration', 'metrics'),
95-
gzip: true,
96-
limit: '100 KB',
97-
},
98-
{
99-
name: '@sentry/browser (incl. metrics)',
100-
path: 'packages/browser/build/npm/esm/index.js',
101-
import: createImport('init', 'metrics'),
102-
gzip: true,
103-
limit: '30 KB',
104-
},
10591
{
10692
name: '@sentry/browser (incl. Feedback)',
10793
path: 'packages/browser/build/npm/esm/index.js',

‎.vscode/settings.json‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
{
2-
"editor.formatOnType": true,
3-
"editor.formatOnPaste": false,
4-
"editor.formatOnSave": true,
5-
"editor.rulers": [120],
62
"editor.tabSize": 2,
7-
"files.autoSave": "onWindowChange",
83
"files.trimTrailingWhitespace": true,
94
"files.insertFinalNewline": true,
105
"search.exclude": {
@@ -15,11 +10,6 @@
1510
"**/yarn-error.log": true
1611
},
1712
"typescript.tsdk": "./node_modules/typescript/lib",
18-
"[json]": {
19-
"editor.formatOnType": false,
20-
"editor.formatOnPaste": false,
21-
"editor.formatOnSave": false
22-
},
2313
"[markdown]": {
2414
"editor.defaultFormatter": "esbenp.prettier-vscode"
2515
},
@@ -35,12 +25,8 @@
3525
}
3626
],
3727
"deno.enablePaths": ["packages/deno/test"],
38-
"editor.codeActionsOnSave": {
39-
"source.organizeImports.biome": "explicit"
40-
},
4128
"editor.defaultFormatter": "biomejs.biome",
4229
"[typescript]": {
4330
"editor.defaultFormatter": "biomejs.biome"
44-
},
45-
"cSpell.words": ["arrayify", "OTEL"]
31+
}
4632
}

‎dev-packages/browser-integration-tests/suites/feedback/attachTo/init.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ Sentry.init({
1414
integrations: [feedback],
1515
});
1616

17-
feedback.attachTo('#custom-feedback-buttom');
17+
feedback.attachTo('#custom-feedback-button');

‎dev-packages/browser-integration-tests/suites/feedback/attachTo/template.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<meta charset="utf-8" />
55
</head>
66
<body>
7-
<button type="button" id="custom-feedback-buttom">Show feedback!</button>
7+
<button type="button" id="custom-feedback-button">Show feedback!</button>
88
</body>
99
</html>

‎dev-packages/browser-integration-tests/suites/feedback/attachTo/test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ sentryTest('should capture feedback with custom button', async ({ getLocalTestUr
2626
const url = await getLocalTestUrl({ testDir: __dirname });
2727

2828
await page.goto(url);
29-
await page.locator('#custom-feedback-buttom').click();
29+
await page.locator('#custom-feedback-button').click();
3030
await page.waitForSelector(':visible:text-is("Report a Bug")');
3131

3232
expect(await page.locator(':visible:text-is("Report a Bug")').count()).toEqual(1);

‎dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/non-string-arg/test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ sentryTest(
88
'should catch onerror calls with non-string first argument gracefully',
99
async ({ getLocalTestPath, page, browserName }) => {
1010
if (browserName === 'webkit') {
11-
// This test fails on Webkit as erros thrown from `runScriptInSandbox` are Script Errors and skipped by Sentry
11+
// This test fails on Webkit as errors thrown from `runScriptInSandbox` are Script Errors and skipped by Sentry
1212
sentryTest.skip();
1313
}
1414

‎dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/rethrown/test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ sentryTest(
88
'should NOT catch an exception already caught [but rethrown] via Sentry.captureException',
99
async ({ getLocalTestPath, page, browserName }) => {
1010
if (browserName === 'webkit') {
11-
// This test fails on Webkit as erros thrown from `runScriptInSandbox` are Script Errors and skipped by Sentry
11+
// This test fails on Webkit as errors thrown from `runScriptInSandbox` are Script Errors and skipped by Sentry
1212
sentryTest.skip();
1313
}
1414

‎dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/syntax-errors/test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { getFirstSentryEnvelopeRequest, runScriptInSandbox } from '../../../../.
66

77
sentryTest('should catch syntax errors', async ({ getLocalTestPath, page, browserName }) => {
88
if (browserName === 'webkit') {
9-
// This test fails on Webkit as erros thrown from `runScriptInSandbox` are Script Errors and skipped by Sentry
9+
// This test fails on Webkit as errors thrown from `runScriptInSandbox` are Script Errors and skipped by Sentry
1010
sentryTest.skip();
1111
}
1212

‎dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-errors/test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { getFirstSentryEnvelopeRequest, runScriptInSandbox } from '../../../../.
66

77
sentryTest('should catch thrown errors', async ({ getLocalTestPath, page, browserName }) => {
88
if (browserName === 'webkit') {
9-
// This test fails on Webkit as erros thrown from `runScriptInSandbox` are Script Errors and skipped by Sentry
9+
// This test fails on Webkit as errors thrown from `runScriptInSandbox` are Script Errors and skipped by Sentry
1010
sentryTest.skip();
1111
}
1212

‎dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-objects/test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { getFirstSentryEnvelopeRequest, runScriptInSandbox } from '../../../../.
66

77
sentryTest('should catch thrown objects', async ({ getLocalTestPath, page, browserName }) => {
88
if (browserName === 'webkit') {
9-
// This test fails on Webkit as erros thrown from `runScriptInSandbox` are Script Errors and skipped by Sentry
9+
// This test fails on Webkit as errors thrown from `runScriptInSandbox` are Script Errors and skipped by Sentry
1010
sentryTest.skip();
1111
}
1212

0 commit comments

Comments
 (0)