From 86d96d8a25cf857116913e40130af86e7f4f92e8 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Mon, 29 Jan 2024 14:27:51 +0100 Subject: [PATCH 1/2] feat(sveltekit): Add more missing `@sentry/node` re-exports --- .../node-exports-test-app/scripts/consistentExports.ts | 7 +++++-- packages/sveltekit/src/server/index.ts | 9 +++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts index a488ef463412..9c8f88d8cd27 100644 --- a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts +++ b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts @@ -70,8 +70,11 @@ const DEPENDENTS: Dependent[] = [ { package: '@sentry/sveltekit', exports: Object.keys(SentrySvelteKit), - // TODO: Fix exports in sveltekit - skip: true, + ignoreExports: [ + // Deprecated, no need to add this now to sveltekit + 'enableAnrDetection', + 'getModuleFromFilename', + ], }, ]; diff --git a/packages/sveltekit/src/server/index.ts b/packages/sveltekit/src/server/index.ts index eb021c6c76cd..69bcae9f1d4a 100644 --- a/packages/sveltekit/src/server/index.ts +++ b/packages/sveltekit/src/server/index.ts @@ -30,6 +30,7 @@ export { getGlobalScope, getIsolationScope, Hub, + NodeClient, // eslint-disable-next-line deprecation/deprecation makeMain, setCurrentClient, @@ -78,6 +79,14 @@ export { continueTrace, cron, parameterize, + createGetModuleFromFilename, + functionToStringIntegration, + hapiErrorPlugin, + inboundFiltersIntegration, + linkedErrorsIntegration, + requestDataIntegration, + metrics, + runWithAsyncContext, } from '@sentry/node'; // We can still leave this for the carrier init and type exports From fdcd92f861b34873b15085457dc1510085c5bef7 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Mon, 29 Jan 2024 17:08:03 +0100 Subject: [PATCH 2/2] also add deprecated exports --- .../node-exports-test-app/scripts/consistentExports.ts | 7 ------- packages/sveltekit/src/server/index.ts | 4 ++++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts index 9c8f88d8cd27..a4a5142b3e98 100644 --- a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts +++ b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts @@ -22,8 +22,6 @@ const NODE_EXPORTS_IGNORE = [ 'DebugSession', 'AnrIntegrationOptions', 'LocalVariablesIntegrationOptions', - // deprecated - 'spanStatusfromHttpCode', ]; type Dependent = { @@ -70,11 +68,6 @@ const DEPENDENTS: Dependent[] = [ { package: '@sentry/sveltekit', exports: Object.keys(SentrySvelteKit), - ignoreExports: [ - // Deprecated, no need to add this now to sveltekit - 'enableAnrDetection', - 'getModuleFromFilename', - ], }, ]; diff --git a/packages/sveltekit/src/server/index.ts b/packages/sveltekit/src/server/index.ts index 69bcae9f1d4a..32fcec426df4 100644 --- a/packages/sveltekit/src/server/index.ts +++ b/packages/sveltekit/src/server/index.ts @@ -79,6 +79,8 @@ export { continueTrace, cron, parameterize, + // eslint-disable-next-line deprecation/deprecation + getModuleFromFilename, createGetModuleFromFilename, functionToStringIntegration, hapiErrorPlugin, @@ -87,6 +89,8 @@ export { requestDataIntegration, metrics, runWithAsyncContext, + // eslint-disable-next-line deprecation/deprecation + enableAnrDetection, } from '@sentry/node'; // We can still leave this for the carrier init and type exports