From cbc4d5d5a1192dcf707b8229a9a9ae9a7671624c Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Wed, 29 Mar 2023 11:27:59 +0200
Subject: [PATCH 1/2] fix(sveltekit): Explicitly export Node SDK exports

---
 packages/sveltekit/src/index.client.ts |  6 ----
 packages/sveltekit/src/index.server.ts |  8 -----
 packages/sveltekit/src/server/index.ts | 49 ++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/packages/sveltekit/src/index.client.ts b/packages/sveltekit/src/index.client.ts
index 98d53afc24d2..4f1cce44fa36 100644
--- a/packages/sveltekit/src/index.client.ts
+++ b/packages/sveltekit/src/index.client.ts
@@ -1,7 +1 @@
 export * from './client';
-
-/**
- * This const serves no purpose besides being an identifier for this file that the SDK multiplexer loader can use to
- * determine that this is in fact a file that wants to be multiplexed.
- */
-export const _SENTRY_SDK_MULTIPLEXER = true;
diff --git a/packages/sveltekit/src/index.server.ts b/packages/sveltekit/src/index.server.ts
index acedc021218b..82b6fe6cbff4 100644
--- a/packages/sveltekit/src/index.server.ts
+++ b/packages/sveltekit/src/index.server.ts
@@ -1,10 +1,2 @@
 export * from './server';
 export * from './config';
-
-// This file is the main entrypoint on the server and/or when the package is `require`d
-
-/**
- * This const serves no purpose besides being an identifier for this file that the SDK multiplexer loader can use to
- * determine that this is in fact a file that wants to be multiplexed.
- */
-export const _SENTRY_SDK_MULTIPLEXER = true;
diff --git a/packages/sveltekit/src/server/index.ts b/packages/sveltekit/src/server/index.ts
index 9109f29499d4..b2d3f20c72f9 100644
--- a/packages/sveltekit/src/server/index.ts
+++ b/packages/sveltekit/src/server/index.ts
@@ -1,5 +1,54 @@
+// Node SDK exports
+// Unfortunately, we cannot `exprt * from '@sentry/node'` because our CJS output mistakenly
+// puts these exports into a `default` rather than on the top-level namespace.
+// Hence, we export everything from the Node SDK explicitly:
+export {
+  addGlobalEventProcessor,
+  addBreadcrumb,
+  captureException,
+  captureEvent,
+  captureMessage,
+  configureScope,
+  createTransport,
+  extractTraceparentData,
+  getActiveTransaction,
+  getHubFromCarrier,
+  getCurrentHub,
+  Hub,
+  makeMain,
+  Scope,
+  startTransaction,
+  SDK_VERSION,
+  setContext,
+  setExtra,
+  setExtras,
+  setTag,
+  setTags,
+  setUser,
+  spanStatusfromHttpCode,
+  trace,
+  withScope,
+  autoDiscoverNodePerformanceMonitoringIntegrations,
+  makeNodeTransport,
+  defaultIntegrations,
+  defaultStackParser,
+  lastEventId,
+  flush,
+  close,
+  getSentryRelease,
+  addRequestDataToEvent,
+  DEFAULT_USER_INCLUDES,
+  extractRequestData,
+  deepReadDirSync,
+  Integrations,
+  Handlers,
+} from '@sentry/node';
+
+// We can still leave this for the carrier init and type exports
 export * from '@sentry/node';
 
+// -------------------------
+// SvelteKit SDK exports:
 export { init } from './sdk';
 export { handleErrorWithSentry } from './handleError';
 export { wrapLoadWithSentry } from './load';

From dcf256a5a44b588f16dce9bc2efb2fcb4399e33b Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Wed, 29 Mar 2023 16:26:15 +0200
Subject: [PATCH 2/2] fix comment

---
 packages/sveltekit/src/server/index.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/sveltekit/src/server/index.ts b/packages/sveltekit/src/server/index.ts
index b2d3f20c72f9..9a8648a5cafd 100644
--- a/packages/sveltekit/src/server/index.ts
+++ b/packages/sveltekit/src/server/index.ts
@@ -1,6 +1,7 @@
 // Node SDK exports
-// Unfortunately, we cannot `exprt * from '@sentry/node'` because our CJS output mistakenly
-// puts these exports into a `default` rather than on the top-level namespace.
+// Unfortunately, we cannot `exprt * from '@sentry/node'` because in prod builds,
+// Vite puts these exports into a `default` property (Sentry.default) rather than
+// on the top - level namespace.
 // Hence, we export everything from the Node SDK explicitly:
 export {
   addGlobalEventProcessor,