Skip to content

Commit f1e6d73

Browse files
SG60Lms24
authored andcommitted
fix(sveltekit): fix prerender failure when using cloudflare workers
1 parent 159426a commit f1e6d73

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

packages/sveltekit/src/index.types.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ export * from './server';
77
export * from './worker';
88

99
// Use the ./server version of some functions that are also exported from ./worker
10-
export { wrapServerLoadWithSentry, wrapServerRouteWithSentry, sentryHandle } from './server';
10+
export { sentryHandle } from './server';
11+
// Use the ./worker version of some functions that are also exported from ./server
12+
export { initCloudflareSentryHandle } from './worker';
1113

1214
import type { Client, Integration, Options, StackParser } from '@sentry/core';
1315
import type { HandleClientError, HandleServerError } from '@sveltejs/kit';

packages/sveltekit/src/server/handle.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ export function sentryHandle(handlerOptions?: SentryHandleOptions): Handle {
6868
return sentryRequestHandler;
6969
}
7070

71+
<<<<<<< HEAD
7172
async function instrumentHandle(
7273
{ event, resolve }: Parameters<Handle>[0],
7374
options: SentryHandleOptions,
@@ -147,4 +148,9 @@ export function isFetchProxyRequired(version: string): boolean {
147148
// ignore
148149
}
149150
return true;
151+
=======
152+
/** Documented in `worker/handle.ts` */
153+
export function initCloudflareSentryHandle(_options: any): Handle {
154+
return ({ event, resolve }) => resolve(event);
155+
>>>>>>> 0f35b2f6a (fix(sveltekit): fix prerender failure when using cloudflare workers)
150156
}

packages/sveltekit/src/server/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export * from '@sentry/node';
125125
export { init } from './sdk';
126126
export { handleErrorWithSentry } from '../server-common/handleError';
127127
export { wrapLoadWithSentry, wrapServerLoadWithSentry } from '../server-common/load';
128-
export { sentryHandle } from './handle';
128+
export { sentryHandle, initCloudflareSentryHandle } from './handle';
129129
export { wrapServerRouteWithSentry } from '../server-common/serverRoute';
130130

131131
/**

packages/sveltekit/src/worker/handle.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ export function sentryHandle(handlerOptions?: SentryHandleOptions): Handle {
3030

3131
/** Initializes Sentry SvelteKit Cloudflare SDK
3232
* This should be before the sentryHandle() call.
33+
*
34+
* In Node.js, this is a stub that does nothing.
3335
* */
3436
export function initCloudflareSentryHandle(options: CloudflareOptions): Handle {
3537
const opts: CloudflareOptions = {

0 commit comments

Comments
 (0)