From a04364363bd217609ea2f56b7ea6491592b1486f Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Wed, 22 Jan 2025 11:26:41 +0100 Subject: [PATCH 01/10] feat(sveltekit): Only inject fetch proxy script for SvelteKit < 2.16.0 --- packages/sveltekit/src/server/handle.ts | 20 +++++++++++++++++-- packages/sveltekit/test/server/handle.test.ts | 19 +++++++++++++++++- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/packages/sveltekit/src/server/handle.ts b/packages/sveltekit/src/server/handle.ts index d0e5e2e689f1..8e9c4cd3204d 100644 --- a/packages/sveltekit/src/server/handle.ts +++ b/packages/sveltekit/src/server/handle.ts @@ -14,7 +14,7 @@ import { winterCGRequestToRequestData, withIsolationScope, } from '@sentry/core'; -import type { Handle, ResolveOptions } from '@sveltejs/kit'; +import { VERSION, type Handle, type ResolveOptions } from '@sveltejs/kit'; import { DEBUG_BUILD } from '../common/debug-build'; import { flushIfServerless, getTracePropagationData, sendErrorToSentry } from './utils'; @@ -95,7 +95,7 @@ export function addSentryCodeToPage(options: { injectFetchProxyScript: boolean } export function sentryHandle(handlerOptions?: SentryHandleOptions): Handle { const options: Required = { handleUnknownRoutes: false, - injectFetchProxyScript: true, + injectFetchProxyScript: isFetchProxyRequired(VERSION), ...handlerOptions, }; @@ -177,3 +177,19 @@ async function instrumentHandle( await flushIfServerless(); } } + +/** + * We only need to inject the fetch proxy script for SvelteKit versions < 2.16.0. + * Exported only for testing. + */ +export function isFetchProxyRequired(version: string): boolean { + try { + const [major, minor] = version.trim().replace(/-.*/, '').split('.').map(Number); + if (major != null && minor != null && (major > 2 || (major === 2 && minor >= 16))) { + return false; + } + } catch { + // ignore + } + return true; +} diff --git a/packages/sveltekit/test/server/handle.test.ts b/packages/sveltekit/test/server/handle.test.ts index f6556f8ddcea..150f59ae9bc8 100644 --- a/packages/sveltekit/test/server/handle.test.ts +++ b/packages/sveltekit/test/server/handle.test.ts @@ -14,7 +14,7 @@ import type { Handle } from '@sveltejs/kit'; import { redirect } from '@sveltejs/kit'; import { vi } from 'vitest'; -import { FETCH_PROXY_SCRIPT, addSentryCodeToPage, sentryHandle } from '../../src/server/handle'; +import { FETCH_PROXY_SCRIPT, addSentryCodeToPage, isFetchProxyRequired, sentryHandle } from '../../src/server/handle'; import { getDefaultNodeClientOptions } from '../utils'; const mockCaptureException = vi.spyOn(SentryNode, 'captureException').mockImplementation(() => 'xx'); @@ -462,3 +462,20 @@ describe('addSentryCodeToPage', () => { expect(transformed).not.toContain(``); }); }); + +describe('isFetchProxyRequired', () => { + it.each(['2.16.0', '2.16.1', '2.17.0', '3.0.0', '3.0.0-alpha.0'])( + 'returns false if the version is greater than or equal to 2.16.0 (%s)', + version => { + expect(isFetchProxyRequired(version)).toBe(false); + }, + ); + + it.each(['2.15.0', '2.15.1', '1.30.0', '1.0.0'])('returns true if the version is lower than 2.16.0 (%s)', version => { + expect(isFetchProxyRequired(version)).toBe(true); + }); + + it.each(['invalid', 'a.b.c'])('returns true for an invalid version (%s)', version => { + expect(isFetchProxyRequired(version)).toBe(true); + }); +}); From fcaaff352d450b350b407af6decd64b8b4ad81fb Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Wed, 22 Jan 2025 12:14:14 +0100 Subject: [PATCH 02/10] format --- packages/sveltekit/src/server/handle.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sveltekit/src/server/handle.ts b/packages/sveltekit/src/server/handle.ts index 8e9c4cd3204d..8bb7a2389839 100644 --- a/packages/sveltekit/src/server/handle.ts +++ b/packages/sveltekit/src/server/handle.ts @@ -14,7 +14,7 @@ import { winterCGRequestToRequestData, withIsolationScope, } from '@sentry/core'; -import { VERSION, type Handle, type ResolveOptions } from '@sveltejs/kit'; +import { type Handle, type ResolveOptions, VERSION } from '@sveltejs/kit'; import { DEBUG_BUILD } from '../common/debug-build'; import { flushIfServerless, getTracePropagationData, sendErrorToSentry } from './utils'; From f65ac016b28a7dcbb4a95b2c126fe2e80123a3e2 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Wed, 22 Jan 2025 13:32:28 +0100 Subject: [PATCH 03/10] change exports - does this fix tests? --- packages/sveltekit/package.json | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json index 077988a47bd1..e67a0263d442 100644 --- a/packages/sveltekit/package.json +++ b/packages/sveltekit/package.json @@ -9,13 +9,7 @@ "engines": { "node": ">=18" }, - "files": [ - "/build" - ], - "main": "build/cjs/index.server.js", - "module": "build/esm/index.server.js", - "browser": "build/esm/index.client.js", - "types": "build/types/index.types.d.ts", + "files": ["/build"], "exports": { "./package.json": "./package.json", ".": { @@ -24,7 +18,10 @@ "import": "./build/esm/index.client.js", "require": "./build/cjs/index.client.js" }, - "node": "./build/cjs/index.server.js" + "node": { + "import:": "./build/esm/index.server.js", + "require:": "./build/cjs/index.server.js" + } } }, "publishConfig": { From 85ad7bc29348c89210dda8aabde3a6731ecb105b Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Wed, 22 Jan 2025 14:24:33 +0100 Subject: [PATCH 04/10] test --- packages/sveltekit/src/server/handle.ts | 4 ++-- packages/sveltekit/src/vite/sentryVitePlugins.ts | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/sveltekit/src/server/handle.ts b/packages/sveltekit/src/server/handle.ts index 8bb7a2389839..2a65904a763c 100644 --- a/packages/sveltekit/src/server/handle.ts +++ b/packages/sveltekit/src/server/handle.ts @@ -14,7 +14,7 @@ import { winterCGRequestToRequestData, withIsolationScope, } from '@sentry/core'; -import { type Handle, type ResolveOptions, VERSION } from '@sveltejs/kit'; +import { type Handle, type ResolveOptions } from '@sveltejs/kit'; import { DEBUG_BUILD } from '../common/debug-build'; import { flushIfServerless, getTracePropagationData, sendErrorToSentry } from './utils'; @@ -95,7 +95,7 @@ export function addSentryCodeToPage(options: { injectFetchProxyScript: boolean } export function sentryHandle(handlerOptions?: SentryHandleOptions): Handle { const options: Required = { handleUnknownRoutes: false, - injectFetchProxyScript: isFetchProxyRequired(VERSION), + injectFetchProxyScript: isFetchProxyRequired('2.16.0'), ...handlerOptions, }; diff --git a/packages/sveltekit/src/vite/sentryVitePlugins.ts b/packages/sveltekit/src/vite/sentryVitePlugins.ts index 60258f653400..329dded3c617 100644 --- a/packages/sveltekit/src/vite/sentryVitePlugins.ts +++ b/packages/sveltekit/src/vite/sentryVitePlugins.ts @@ -26,6 +26,11 @@ export async function sentrySvelteKit(options: SentrySvelteKitPluginOptions = {} adapter: options.adapter || (await detectAdapter(options.debug)), }; + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore - just testing for now + const kit = await import('@sveltejs/kit'); + console.log('XX kit version', kit.VERSION); + const sentryPlugins: Plugin[] = []; if (mergedOptions.autoInstrument) { From e9dd1fef38c4a5766f504aab47b1decfe2df8da0 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Wed, 22 Jan 2025 14:33:21 +0100 Subject: [PATCH 05/10] revert exports --- packages/sveltekit/package.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json index e67a0263d442..4b16c3012119 100644 --- a/packages/sveltekit/package.json +++ b/packages/sveltekit/package.json @@ -7,9 +7,13 @@ "author": "Sentry", "license": "MIT", "engines": { - "node": ">=18" + "node": ">=16" }, "files": ["/build"], + "main": "build/cjs/index.server.js", + "module": "build/esm/index.server.js", + "browser": "build/esm/index.client.js", + "types": "build/types/index.types.d.ts", "exports": { "./package.json": "./package.json", ".": { @@ -18,10 +22,7 @@ "import": "./build/esm/index.client.js", "require": "./build/cjs/index.client.js" }, - "node": { - "import:": "./build/esm/index.server.js", - "require:": "./build/cjs/index.server.js" - } + "node": "./build/cjs/index.server.js" } }, "publishConfig": { From 725eb2b607f1c82bf7e4493b12cd18cccaf8ef3e Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Wed, 22 Jan 2025 18:03:27 +0100 Subject: [PATCH 06/10] try cached dynamic import in handler --- packages/sveltekit/src/server/handle.ts | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/packages/sveltekit/src/server/handle.ts b/packages/sveltekit/src/server/handle.ts index 2a65904a763c..59e694f42ab3 100644 --- a/packages/sveltekit/src/server/handle.ts +++ b/packages/sveltekit/src/server/handle.ts @@ -93,10 +93,10 @@ export function addSentryCodeToPage(options: { injectFetchProxyScript: boolean } * ``` */ export function sentryHandle(handlerOptions?: SentryHandleOptions): Handle { - const options: Required = { - handleUnknownRoutes: false, - injectFetchProxyScript: isFetchProxyRequired('2.16.0'), - ...handlerOptions, + const { handleUnknownRoutes, ...rest } = handlerOptions ?? {}; + const options = { + handleUnknownRoutes: handleUnknownRoutes ?? false, + ...rest, }; const sentryRequestHandler: Handle = input => { @@ -131,12 +131,24 @@ export function sentryHandle(handlerOptions?: SentryHandleOptions): Handle { async function instrumentHandle( { event, resolve }: Parameters[0], - options: Required, + options: SentryHandleOptions, ): Promise { if (!event.route?.id && !options.handleUnknownRoutes) { return resolve(event); } + // caching the result of the version check in `options.injectFetchProxyScript` + // to avoid doing the dynamic import on every request + if (options.injectFetchProxyScript == null) { + try { + // @ts-expect-error - the dynamic import is fine here + const { VERSION } = await import('@sveltejs/kit'); + options.injectFetchProxyScript = isFetchProxyRequired(VERSION); + } catch { + options.injectFetchProxyScript = true; + } + } + const routeName = `${event.request.method} ${event.route?.id || event.url.pathname}`; if (getIsolationScope() !== getDefaultIsolationScope()) { @@ -161,7 +173,7 @@ async function instrumentHandle( normalizedRequest: winterCGRequestToRequestData(event.request.clone()), }); const res = await resolve(event, { - transformPageChunk: addSentryCodeToPage({ injectFetchProxyScript: options.injectFetchProxyScript }), + transformPageChunk: addSentryCodeToPage({ injectFetchProxyScript: options.injectFetchProxyScript ?? true }), }); if (span) { setHttpStatus(span, res.status); From 95917b268a2ae7defd13fec305a9e0a9949f3f0a Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Thu, 23 Jan 2025 09:23:00 +0100 Subject: [PATCH 07/10] cleanup and e2e test --- .../test-applications/sveltekit-2/package.json | 2 +- .../test-applications/sveltekit-2/tests/sdk.test.ts | 10 ++++++++++ packages/sveltekit/package.json | 2 +- packages/sveltekit/src/server/handle.ts | 2 +- packages/sveltekit/src/vite/sentryVitePlugins.ts | 5 ----- 5 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2/package.json b/dev-packages/e2e-tests/test-applications/sveltekit-2/package.json index f02253198aaa..91bc78290199 100644 --- a/dev-packages/e2e-tests/test-applications/sveltekit-2/package.json +++ b/dev-packages/e2e-tests/test-applications/sveltekit-2/package.json @@ -23,7 +23,7 @@ "@sentry/core": "latest || *", "@sveltejs/adapter-auto": "^3.0.0", "@sveltejs/adapter-node": "^2.0.0", - "@sveltejs/kit": "^2.5.0", + "@sveltejs/kit": "^2.16.0", "@sveltejs/vite-plugin-svelte": "^3.0.0", "svelte": "^4.2.8", "svelte-check": "^3.6.0", diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts new file mode 100644 index 000000000000..6c0a7871351f --- /dev/null +++ b/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts @@ -0,0 +1,10 @@ +import { expect, test } from '@playwright/test'; +import { waitForInitialPageload } from './utils'; + +test.describe('SDK-internal behavior', () => { + test("Doesn't inject fetch proxy script for SvelteKit>=2.16.0", async ({ page }) => { + await waitForInitialPageload(page, { route: '/client-error' }); + const proxyHandle = await page.waitForFunction(() => globalThis._sentryFetchProxy); + expect(proxyHandle).toBeUndefined(); + }); +}); diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json index 4b16c3012119..94cb6fd32c39 100644 --- a/packages/sveltekit/package.json +++ b/packages/sveltekit/package.json @@ -7,7 +7,7 @@ "author": "Sentry", "license": "MIT", "engines": { - "node": ">=16" + "node": ">=18" }, "files": ["/build"], "main": "build/cjs/index.server.js", diff --git a/packages/sveltekit/src/server/handle.ts b/packages/sveltekit/src/server/handle.ts index 59e694f42ab3..9bb9de9ce394 100644 --- a/packages/sveltekit/src/server/handle.ts +++ b/packages/sveltekit/src/server/handle.ts @@ -14,7 +14,7 @@ import { winterCGRequestToRequestData, withIsolationScope, } from '@sentry/core'; -import { type Handle, type ResolveOptions } from '@sveltejs/kit'; +import type { Handle, ResolveOptions } from '@sveltejs/kit'; import { DEBUG_BUILD } from '../common/debug-build'; import { flushIfServerless, getTracePropagationData, sendErrorToSentry } from './utils'; diff --git a/packages/sveltekit/src/vite/sentryVitePlugins.ts b/packages/sveltekit/src/vite/sentryVitePlugins.ts index 329dded3c617..60258f653400 100644 --- a/packages/sveltekit/src/vite/sentryVitePlugins.ts +++ b/packages/sveltekit/src/vite/sentryVitePlugins.ts @@ -26,11 +26,6 @@ export async function sentrySvelteKit(options: SentrySvelteKitPluginOptions = {} adapter: options.adapter || (await detectAdapter(options.debug)), }; - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore - just testing for now - const kit = await import('@sveltejs/kit'); - console.log('XX kit version', kit.VERSION); - const sentryPlugins: Plugin[] = []; if (mergedOptions.autoInstrument) { From 52cd25f732304a3d1ebfc7871b67097710ba6227 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Thu, 23 Jan 2025 09:23:49 +0100 Subject: [PATCH 08/10] fix test --- .../e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts index 6c0a7871351f..eaff838a1759 100644 --- a/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts +++ b/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts @@ -4,6 +4,7 @@ import { waitForInitialPageload } from './utils'; test.describe('SDK-internal behavior', () => { test("Doesn't inject fetch proxy script for SvelteKit>=2.16.0", async ({ page }) => { await waitForInitialPageload(page, { route: '/client-error' }); + // @ts-expect-error - this is the variable the fetch proxy script sets if it would be injected const proxyHandle = await page.waitForFunction(() => globalThis._sentryFetchProxy); expect(proxyHandle).toBeUndefined(); }); From 0b53e27664988a88fd3a5f1161601158249e3244 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Tue, 28 Jan 2025 16:04:48 +0100 Subject: [PATCH 09/10] add e2e tests to check for fetch proxy on versions 2.5.0 and ^2.16.0 --- .../sveltekit-2-twp/package.json | 2 +- .../sveltekit-2-twp/tests/sdk.test.ts | 16 ++++++++++++++++ .../sveltekit-2/tests/sdk.test.ts | 13 +++++++++---- 3 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 dev-packages/e2e-tests/test-applications/sveltekit-2-twp/tests/sdk.test.ts diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/package.json b/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/package.json index f961077f9977..02669d8b6356 100644 --- a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/package.json +++ b/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/package.json @@ -22,7 +22,7 @@ "@sentry-internal/test-utils": "link:../../../test-utils", "@sentry/core": "latest || *", "@sveltejs/adapter-auto": "^3.0.0", - "@sveltejs/kit": "^2.0.0", + "@sveltejs/kit": "2.5.0", "@sveltejs/vite-plugin-svelte": "^3.0.0", "svelte": "^5.0.0-next.115", "svelte-check": "^3.6.0", diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/tests/sdk.test.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/tests/sdk.test.ts new file mode 100644 index 000000000000..c1131913d057 --- /dev/null +++ b/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/tests/sdk.test.ts @@ -0,0 +1,16 @@ +import { expect, test } from '@playwright/test'; + +test.describe('SDK-internal behavior', () => { + test('Injects fetch proxy script for SvelteKit<2.16.0', async ({ page }) => { + await page.goto('/'); + + const sentryCarrier = await page.evaluate('typeof window.__SENTRY__'); + const proxyHandle = await page.evaluate('typeof window._sentryFetchProxy'); + + // sanity check + expect(sentryCarrier).toBe('object'); + + // fetch proxy script ran + expect(proxyHandle).toBe('function'); + }); +}); diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts index eaff838a1759..f35a81e91238 100644 --- a/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts +++ b/dev-packages/e2e-tests/test-applications/sveltekit-2/tests/sdk.test.ts @@ -3,9 +3,14 @@ import { waitForInitialPageload } from './utils'; test.describe('SDK-internal behavior', () => { test("Doesn't inject fetch proxy script for SvelteKit>=2.16.0", async ({ page }) => { - await waitForInitialPageload(page, { route: '/client-error' }); - // @ts-expect-error - this is the variable the fetch proxy script sets if it would be injected - const proxyHandle = await page.waitForFunction(() => globalThis._sentryFetchProxy); - expect(proxyHandle).toBeUndefined(); + await waitForInitialPageload(page, { route: '/' }); + const sentryCarrier = await page.evaluate('typeof window.__SENTRY__'); + const proxyHandle = await page.evaluate('typeof window._sentryFetchProxy'); + + // sanity check + expect(sentryCarrier).toBe('object'); + + // fetch proxy script didn't run + expect(proxyHandle).toBe('undefined'); }); }); From 4896a82eb2cdec2abc18e32a3f02c4339d41019b Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Fri, 31 Jan 2025 09:57:57 +0100 Subject: [PATCH 10/10] rename e2e test app --- .../.gitignore | 0 .../{sveltekit-2-twp => sveltekit-2.5.0-twp}/.npmrc | 0 .../README.md | 0 .../package.json | 2 +- .../playwright.config.mjs | 0 .../src/app.d.ts | 0 .../src/app.html | 0 .../src/hooks.client.ts | 0 .../src/hooks.server.ts | 0 .../src/routes/+layout.svelte | 0 .../src/routes/+page.svelte | 0 .../src/routes/errors/+page.server.ts | 0 .../src/routes/errors/+page.svelte | 0 .../start-event-proxy.mjs | 2 +- .../static/favicon.png | Bin .../svelte.config.js | 0 .../tests/errors.test.ts | 4 ++-- .../tests/sdk.test.ts | 0 .../tests/tracing.test.ts | 0 .../tsconfig.json | 0 .../vite.config.ts | 0 21 files changed, 4 insertions(+), 4 deletions(-) rename dev-packages/e2e-tests/test-applications/{sveltekit-2-twp => sveltekit-2.5.0-twp}/.gitignore (100%) rename dev-packages/e2e-tests/test-applications/{sveltekit-2-twp => sveltekit-2.5.0-twp}/.npmrc (100%) rename dev-packages/e2e-tests/test-applications/{sveltekit-2-twp => sveltekit-2.5.0-twp}/README.md (100%) rename dev-packages/e2e-tests/test-applications/{sveltekit-2-twp => sveltekit-2.5.0-twp}/package.json (96%) rename dev-packages/e2e-tests/test-applications/{sveltekit-2-twp => sveltekit-2.5.0-twp}/playwright.config.mjs (100%) rename dev-packages/e2e-tests/test-applications/{sveltekit-2-twp => sveltekit-2.5.0-twp}/src/app.d.ts (100%) rename dev-packages/e2e-tests/test-applications/{sveltekit-2-twp => sveltekit-2.5.0-twp}/src/app.html (100%) rename dev-packages/e2e-tests/test-applications/{sveltekit-2-twp => sveltekit-2.5.0-twp}/src/hooks.client.ts (100%) rename dev-packages/e2e-tests/test-applications/{sveltekit-2-twp => sveltekit-2.5.0-twp}/src/hooks.server.ts (100%) rename dev-packages/e2e-tests/test-applications/{sveltekit-2-twp => sveltekit-2.5.0-twp}/src/routes/+layout.svelte (100%) rename dev-packages/e2e-tests/test-applications/{sveltekit-2-twp => sveltekit-2.5.0-twp}/src/routes/+page.svelte (100%) rename dev-packages/e2e-tests/test-applications/{sveltekit-2-twp => sveltekit-2.5.0-twp}/src/routes/errors/+page.server.ts (100%) rename dev-packages/e2e-tests/test-applications/{sveltekit-2-twp => sveltekit-2.5.0-twp}/src/routes/errors/+page.svelte (100%) rename dev-packages/e2e-tests/test-applications/{sveltekit-2-twp => sveltekit-2.5.0-twp}/start-event-proxy.mjs (72%) rename dev-packages/e2e-tests/test-applications/{sveltekit-2-twp => sveltekit-2.5.0-twp}/static/favicon.png (100%) rename dev-packages/e2e-tests/test-applications/{sveltekit-2-twp => sveltekit-2.5.0-twp}/svelte.config.js (100%) rename dev-packages/e2e-tests/test-applications/{sveltekit-2-twp => sveltekit-2.5.0-twp}/tests/errors.test.ts (92%) rename dev-packages/e2e-tests/test-applications/{sveltekit-2-twp => sveltekit-2.5.0-twp}/tests/sdk.test.ts (100%) rename dev-packages/e2e-tests/test-applications/{sveltekit-2-twp => sveltekit-2.5.0-twp}/tests/tracing.test.ts (100%) rename dev-packages/e2e-tests/test-applications/{sveltekit-2-twp => sveltekit-2.5.0-twp}/tsconfig.json (100%) rename dev-packages/e2e-tests/test-applications/{sveltekit-2-twp => sveltekit-2.5.0-twp}/vite.config.ts (100%) diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/.gitignore b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/.gitignore similarity index 100% rename from dev-packages/e2e-tests/test-applications/sveltekit-2-twp/.gitignore rename to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/.gitignore diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/.npmrc b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/.npmrc similarity index 100% rename from dev-packages/e2e-tests/test-applications/sveltekit-2-twp/.npmrc rename to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/.npmrc diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/README.md b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/README.md similarity index 100% rename from dev-packages/e2e-tests/test-applications/sveltekit-2-twp/README.md rename to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/README.md diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/package.json b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/package.json similarity index 96% rename from dev-packages/e2e-tests/test-applications/sveltekit-2-twp/package.json rename to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/package.json index 02669d8b6356..344eba5705fd 100644 --- a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/package.json +++ b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/package.json @@ -1,5 +1,5 @@ { - "name": "sveltekit-2-svelte-5", + "name": "sveltekit-2.5.0-twp", "version": "0.0.1", "private": true, "scripts": { diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/playwright.config.mjs b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/playwright.config.mjs similarity index 100% rename from dev-packages/e2e-tests/test-applications/sveltekit-2-twp/playwright.config.mjs rename to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/playwright.config.mjs diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/src/app.d.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/src/app.d.ts similarity index 100% rename from dev-packages/e2e-tests/test-applications/sveltekit-2-twp/src/app.d.ts rename to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/src/app.d.ts diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/src/app.html b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/src/app.html similarity index 100% rename from dev-packages/e2e-tests/test-applications/sveltekit-2-twp/src/app.html rename to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/src/app.html diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/src/hooks.client.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/src/hooks.client.ts similarity index 100% rename from dev-packages/e2e-tests/test-applications/sveltekit-2-twp/src/hooks.client.ts rename to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/src/hooks.client.ts diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/src/hooks.server.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/src/hooks.server.ts similarity index 100% rename from dev-packages/e2e-tests/test-applications/sveltekit-2-twp/src/hooks.server.ts rename to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/src/hooks.server.ts diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/src/routes/+layout.svelte b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/src/routes/+layout.svelte similarity index 100% rename from dev-packages/e2e-tests/test-applications/sveltekit-2-twp/src/routes/+layout.svelte rename to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/src/routes/+layout.svelte diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/src/routes/+page.svelte b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/src/routes/+page.svelte similarity index 100% rename from dev-packages/e2e-tests/test-applications/sveltekit-2-twp/src/routes/+page.svelte rename to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/src/routes/+page.svelte diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/src/routes/errors/+page.server.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/src/routes/errors/+page.server.ts similarity index 100% rename from dev-packages/e2e-tests/test-applications/sveltekit-2-twp/src/routes/errors/+page.server.ts rename to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/src/routes/errors/+page.server.ts diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/src/routes/errors/+page.svelte b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/src/routes/errors/+page.svelte similarity index 100% rename from dev-packages/e2e-tests/test-applications/sveltekit-2-twp/src/routes/errors/+page.svelte rename to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/src/routes/errors/+page.svelte diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/start-event-proxy.mjs b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/start-event-proxy.mjs similarity index 72% rename from dev-packages/e2e-tests/test-applications/sveltekit-2-twp/start-event-proxy.mjs rename to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/start-event-proxy.mjs index 01e1095d6956..1ba4492f150a 100644 --- a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/start-event-proxy.mjs +++ b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/start-event-proxy.mjs @@ -2,5 +2,5 @@ import { startEventProxyServer } from '@sentry-internal/test-utils'; startEventProxyServer({ port: 3031, - proxyServerName: 'sveltekit-2-twp', + proxyServerName: 'sveltekit-2.5.0-twp', }); diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/static/favicon.png b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/static/favicon.png similarity index 100% rename from dev-packages/e2e-tests/test-applications/sveltekit-2-twp/static/favicon.png rename to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/static/favicon.png diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/svelte.config.js b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/svelte.config.js similarity index 100% rename from dev-packages/e2e-tests/test-applications/sveltekit-2-twp/svelte.config.js rename to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/svelte.config.js diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/tests/errors.test.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/tests/errors.test.ts similarity index 92% rename from dev-packages/e2e-tests/test-applications/sveltekit-2-twp/tests/errors.test.ts rename to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/tests/errors.test.ts index 0e16a2588982..984af2ec23a6 100644 --- a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/tests/errors.test.ts +++ b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/tests/errors.test.ts @@ -2,11 +2,11 @@ import { expect, test } from '@playwright/test'; import { waitForError } from '@sentry-internal/test-utils'; test('errors on frontend and backend are connected by the same trace', async ({ page }) => { - const clientErrorPromise = waitForError('sveltekit-2-twp', evt => { + const clientErrorPromise = waitForError('sveltekit-2.5.0-twp', evt => { return evt.exception?.values?.[0].value === 'Client Error'; }); - const serverErrorPromise = waitForError('sveltekit-2-twp', evt => { + const serverErrorPromise = waitForError('sveltekit-2.5.0-twp', evt => { return evt.exception?.values?.[0].value === 'No search query provided'; }); diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/tests/sdk.test.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/tests/sdk.test.ts similarity index 100% rename from dev-packages/e2e-tests/test-applications/sveltekit-2-twp/tests/sdk.test.ts rename to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/tests/sdk.test.ts diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/tests/tracing.test.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/tests/tracing.test.ts similarity index 100% rename from dev-packages/e2e-tests/test-applications/sveltekit-2-twp/tests/tracing.test.ts rename to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/tests/tracing.test.ts diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/tsconfig.json b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/tsconfig.json similarity index 100% rename from dev-packages/e2e-tests/test-applications/sveltekit-2-twp/tsconfig.json rename to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/tsconfig.json diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-twp/vite.config.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/vite.config.ts similarity index 100% rename from dev-packages/e2e-tests/test-applications/sveltekit-2-twp/vite.config.ts rename to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/vite.config.ts