cleanup

Lms24 · Lms24 · commit fee1d2b9152d · 2025-02-19T17:51:56.000+01:00
diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-cloudflare-pages/package.json b/dev-packages/e2e-tests/test-applications/sveltekit-cloudflare-pages/package.json
@@ -1,31 +1,31 @@
 {
-	"name": "sveltekit-cloudflare-pages",
-	"private": true,
-	"version": "0.0.1",
-	"type": "module",
-	"scripts": {
-		"dev": "vite dev",
-		"build": "vite build",
-		"preview": "wrangler pages dev ./.svelte-kit/cloudflare --port 4173",
-		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
-		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
-		"test:e2e": "playwright test",
-		"test": "npm run test:e2e",
+  "name": "sveltekit-cloudflare-pages",
+  "private": true,
+  "version": "0.0.1",
+  "type": "module",
+  "scripts": {
+    "dev": "vite dev",
+    "build": "vite build",
+    "preview": "wrangler pages dev ./.svelte-kit/cloudflare --port 4173",
+    "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
+    "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
+    "test:e2e": "playwright test",
+    "test": "npm run test:e2e",
     "test:build": "pnpm install && pnpm build",
     "test:assert": "npm run test:e2e"
-	},
+  },
   "dependencies": {
     "@sentry/sveltekit": "latest || *"
   },
-	"devDependencies": {
-		"@playwright/test": "^1.45.3",
-		"@sveltejs/adapter-cloudflare": "^4.8.0",
-		"@sveltejs/kit": "^2.9.0",
-		"@sveltejs/vite-plugin-svelte": "^5.0.0",
-		"svelte": "^5.0.0",
-		"svelte-check": "^4.0.0",
-		"typescript": "^5.0.0",
-		"vite": "^6.0.0",
-		"wrangler": "^3"
-	}
+  "devDependencies": {
+    "@playwright/test": "^1.45.3",
+    "@sveltejs/adapter-cloudflare": "^4.8.0",
+    "@sveltejs/kit": "^2.16.0",
+    "@sveltejs/vite-plugin-svelte": "^5.0.0",
+    "svelte": "^5.0.0",
+    "svelte-check": "^4.0.0",
+    "typescript": "^5.0.0",
+    "vite": "^6.0.0",
+    "wrangler": "^3"
+  }
 }
diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-cloudflare-pages/src/hooks.server.ts b/dev-packages/e2e-tests/test-applications/sveltekit-cloudflare-pages/src/hooks.server.ts
@@ -7,6 +7,7 @@ export const handleError = handleErrorWithSentry();
 export const handle = sequence(
   initCloudflareSentryHandle({
     dsn: E2E_TEST_DSN,
+    tracesSampleRate: 1.0,
   }),
   sentryHandle(),
 );
diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-cloudflare-pages/src/lib/index.ts b/dev-packages/e2e-tests/test-applications/sveltekit-cloudflare-pages/src/lib/index.ts
diff --git a/packages/sveltekit/src/common/utils.ts b/packages/sveltekit/src/common/utils.ts
@@ -1,5 +1,7 @@
 import type { HttpError, Redirect } from '@sveltejs/kit';
 
+export const WRAPPED_MODULE_SUFFIX = '?sentry-auto-wrap';
+
 export type SentryWrappedFlag = {
   /**
    * If this flag is set, we know that the load event was already wrapped once
diff --git a/packages/sveltekit/src/server-common/rewriteFramesIntegration.ts b/packages/sveltekit/src/server-common/rewriteFramesIntegration.ts
@@ -7,8 +7,8 @@ import {
   join,
   rewriteFramesIntegration as originalRewriteFramesIntegration,
 } from '@sentry/core';
-import { WRAPPED_MODULE_SUFFIX } from '../vite/constants';
 import type { GlobalWithSentryValues } from '../vite/injectGlobalValues';
+import { WRAPPED_MODULE_SUFFIX } from '../common/utils';
 
 type StackFrameIteratee = (frame: StackFrame) => StackFrame;
 interface RewriteFramesOptions {
diff --git a/packages/sveltekit/src/server/sdk.ts b/packages/sveltekit/src/server/sdk.ts
@@ -6,7 +6,7 @@ import { init as initNodeSdk } from '@sentry/node';
 import { rewriteFramesIntegration } from '../server-common/rewriteFramesIntegration';
 
 /**
- *
+ * Initialize the Server-side Sentry SDK
  * @param options
  */
 export function init(options: NodeOptions): NodeClient | undefined {
diff --git a/packages/sveltekit/src/vite/autoInstrument.ts b/packages/sveltekit/src/vite/autoInstrument.ts
@@ -3,8 +3,7 @@ import * as path from 'path';
 import type { ExportNamedDeclaration } from '@babel/types';
 import { parseModule } from 'magicast';
 import type { Plugin } from 'vite';
-
-import { WRAPPED_MODULE_SUFFIX } from './constants';
+import { WRAPPED_MODULE_SUFFIX } from '../common/utils';
 
 export type AutoInstrumentSelection = {
   /**
diff --git a/packages/sveltekit/src/vite/constants.ts b/packages/sveltekit/src/vite/constants.ts
diff --git a/packages/sveltekit/src/vite/sourceMaps.ts b/packages/sveltekit/src/vite/sourceMaps.ts
@@ -9,11 +9,11 @@ import { sentryVitePlugin } from '@sentry/vite-plugin';
 import type { Plugin, UserConfig } from 'vite';
 
 import MagicString from 'magic-string';
-import { WRAPPED_MODULE_SUFFIX } from './constants';
 import type { GlobalSentryValues } from './injectGlobalValues';
 import { VIRTUAL_GLOBAL_VALUES_FILE, getGlobalValueInjectionCode } from './injectGlobalValues';
 import { getAdapterOutputDir, getHooksFileName, loadSvelteConfig } from './svelteConfig';
 import type { CustomSentryVitePluginOptions } from './types';
+import { WRAPPED_MODULE_SUFFIX } from '../common/utils';
 
 // sorcery has no types, so these are some basic type definitions:
 type Chain = {
diff --git a/packages/sveltekit/src/worker/handle.ts b/packages/sveltekit/src/worker/handle.ts
diff --git a/packages/sveltekit/src/worker/index.ts b/packages/sveltekit/src/worker/index.ts
@@ -11,7 +11,7 @@
 export { handleErrorWithSentry } from '../server-common/handleError';
 export { wrapLoadWithSentry, wrapServerLoadWithSentry } from '../server-common/load';
 export { sentryHandle } from '../server-common/handle';
-export { initCloudflareSentryHandle } from './handle';
+export { initCloudflareSentryHandle } from './cloudflare';
 export { wrapServerRouteWithSentry } from '../server-common/serverRoute';
 
 // Re-export some functions from Cloudflare SDK
