From 12612b4888b41a5ab9c910cc2f3cf05f0d17e6da Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Mon, 16 Dec 2024 11:08:04 +0100 Subject: [PATCH 1/8] feat(deno): Stop inlining types --- packages/deno/rollup.types.config.mjs | 2 +- .../deno/test/__snapshots__/mod.test.ts.snap | 4 +-- packages/deno/test/build.ts | 2 -- packages/deno/test/mod.test.ts | 15 ++++++----- packages/deno/test/normalize.ts | 25 +++++++++---------- packages/deno/test/transport.ts | 17 ++++++------- 6 files changed, 29 insertions(+), 36 deletions(-) diff --git a/packages/deno/rollup.types.config.mjs b/packages/deno/rollup.types.config.mjs index ccfb62251351..4bd81990f8bd 100644 --- a/packages/deno/rollup.types.config.mjs +++ b/packages/deno/rollup.types.config.mjs @@ -6,7 +6,7 @@ export default defineConfig({ input: './build-types/index.d.ts', output: [{ file: 'build/index.d.ts', format: 'es' }], plugins: [ - dts({ respectExternal: true }), + dts({ respectExternal: false }), // The bundled types contain a declaration for the __DEBUG_BUILD__ global // This can result in errors about duplicate global declarations so we strip it out! { diff --git a/packages/deno/test/__snapshots__/mod.test.ts.snap b/packages/deno/test/__snapshots__/mod.test.ts.snap index f9f3006c34c4..05adc04b65bf 100644 --- a/packages/deno/test/__snapshots__/mod.test.ts.snap +++ b/packages/deno/test/__snapshots__/mod.test.ts.snap @@ -56,7 +56,7 @@ snapshot[`captureException 1`] = ` "});", "", "Deno.test('captureMessage', async t => {", - " let ev: sentryTypes.Event | undefined;", + " let ev: sentryCore.Event | undefined;", ], pre_context: [ " ev = event;", @@ -86,7 +86,7 @@ snapshot[`captureException 1`] = ` ], pre_context: [ "Deno.test('captureException', async t => {", - " let ev: sentryTypes.Event | undefined;", + " let ev: sentryCore.Event | undefined;", " const client = getTestClient(event => {", " ev = event;", " });", diff --git a/packages/deno/test/build.ts b/packages/deno/test/build.ts index 2ea3d4191454..0f4ecbe4d350 100644 --- a/packages/deno/test/build.ts +++ b/packages/deno/test/build.ts @@ -1,4 +1,2 @@ // We use this as the entry point to bundle Sentry dependencies that are used by the tests. -export * as sentryTypes from '@sentry/core'; -export * as sentryUtils from '@sentry/core'; export * as sentryCore from '@sentry/core'; diff --git a/packages/deno/test/mod.test.ts b/packages/deno/test/mod.test.ts index 656d9301b7ca..b8b917e7c185 100644 --- a/packages/deno/test/mod.test.ts +++ b/packages/deno/test/mod.test.ts @@ -1,21 +1,20 @@ import { assertEquals } from 'https://deno.land/std@0.202.0/assert/assert_equals.ts'; import { assertSnapshot } from 'https://deno.land/std@0.202.0/testing/snapshot.ts'; -import type { sentryTypes } from '../build-test/index.js'; -import { sentryUtils } from '../build-test/index.js'; +import { sentryCore } from '../build-test/index.js'; import { DenoClient, getCurrentScope, getDefaultIntegrations } from '../build/index.mjs'; import { getNormalizedEvent } from './normalize.ts'; import { makeTestTransport } from './transport.ts'; function getTestClient( - callback: (event?: sentryTypes.Event) => void, - integrations: sentryTypes.Integration[] = [], + callback: (event?: sentryCore.Event) => void, + integrations: sentryCore.Integration[] = [], ): DenoClient { const client = new DenoClient({ dsn: 'https://233a45e5efe34c47a3536797ce15dafa@nothing.here/5650507', debug: true, integrations: [...getDefaultIntegrations({}), ...integrations], - stackParser: sentryUtils.createStackParser(sentryUtils.nodeStackLineParser()), + stackParser: sentryCore.createStackParser(sentryCore.nodeStackLineParser()), transport: makeTestTransport(envelope => { callback(getNormalizedEvent(envelope)); }), @@ -34,7 +33,7 @@ function delay(time: number): Promise { } Deno.test('captureException', async t => { - let ev: sentryTypes.Event | undefined; + let ev: sentryCore.Event | undefined; const client = getTestClient(event => { ev = event; }); @@ -50,7 +49,7 @@ Deno.test('captureException', async t => { }); Deno.test('captureMessage', async t => { - let ev: sentryTypes.Event | undefined; + let ev: sentryCore.Event | undefined; const client = getTestClient(event => { ev = event; }); @@ -62,7 +61,7 @@ Deno.test('captureMessage', async t => { }); Deno.test('captureMessage twice', async t => { - let ev: sentryTypes.Event | undefined; + let ev: sentryCore.Event | undefined; const client = getTestClient(event => { ev = event; }); diff --git a/packages/deno/test/normalize.ts b/packages/deno/test/normalize.ts index 2946ea8de153..50211674429f 100644 --- a/packages/deno/test/normalize.ts +++ b/packages/deno/test/normalize.ts @@ -1,21 +1,20 @@ /* eslint-disable complexity */ -import type { sentryTypes } from '../build-test/index.js'; -import { sentryUtils } from '../build-test/index.js'; +import { sentryCore } from '../build-test/index.js'; -type EventOrSession = sentryTypes.Event | sentryTypes.Session; +type EventOrSession = sentryCore.Event | sentryCore.Session; -export function getNormalizedEvent(envelope: sentryTypes.Envelope): sentryTypes.Event | undefined { - let event: sentryTypes.Event | undefined; +export function getNormalizedEvent(envelope: sentryCore.Envelope): sentryCore.Event | undefined { + let event: sentryCore.Event | undefined; - sentryUtils.forEachEnvelopeItem(envelope, item => { + sentryCore.forEachEnvelopeItem(envelope, item => { const [headers, body] = item; if (headers.type === 'event') { - event = body as sentryTypes.Event; + event = body as sentryCore.Event; } }); - return normalize(event) as sentryTypes.Event | undefined; + return normalize(event) as sentryCore.Event | undefined; } export function normalize(event: EventOrSession | undefined): EventOrSession | undefined { @@ -24,14 +23,14 @@ export function normalize(event: EventOrSession | undefined): EventOrSession | u } if (eventIsSession(event)) { - return normalizeSession(event as sentryTypes.Session); + return normalizeSession(event as sentryCore.Session); } else { - return normalizeEvent(event as sentryTypes.Event); + return normalizeEvent(event as sentryCore.Event); } } export function eventIsSession(data: EventOrSession): boolean { - return !!(data as sentryTypes.Session)?.sid; + return !!(data as sentryCore.Session)?.sid; } /** @@ -40,7 +39,7 @@ export function eventIsSession(data: EventOrSession): boolean { * All properties that are timestamps, versions, ids or variables that may vary * by platform are replaced with placeholder strings */ -function normalizeSession(session: sentryTypes.Session): sentryTypes.Session { +function normalizeSession(session: sentryCore.Session): sentryCore.Session { if (session.sid) { session.sid = '{{id}}'; } @@ -66,7 +65,7 @@ function normalizeSession(session: sentryTypes.Session): sentryTypes.Session { * All properties that are timestamps, versions, ids or variables that may vary * by platform are replaced with placeholder strings */ -function normalizeEvent(event: sentryTypes.Event): sentryTypes.Event { +function normalizeEvent(event: sentryCore.Event): sentryCore.Event { if (event.sdk?.version) { event.sdk.version = '{{version}}'; } diff --git a/packages/deno/test/transport.ts b/packages/deno/test/transport.ts index d18bd610c7dc..7d18e8036955 100644 --- a/packages/deno/test/transport.ts +++ b/packages/deno/test/transport.ts @@ -1,19 +1,16 @@ -import type { sentryTypes } from '../build-test/index.js'; -import { sentryCore, sentryUtils } from '../build-test/index.js'; +import { sentryCore } from '../build-test/index.js'; -export interface TestTransportOptions extends sentryTypes.BaseTransportOptions { - callback: (envelope: sentryTypes.Envelope) => void; +export interface TestTransportOptions extends sentryCore.BaseTransportOptions { + callback: (envelope: sentryCore.Envelope) => void; } /** * Creates a Transport that uses the Fetch API to send events to Sentry. */ -export function makeTestTransport(callback: (envelope: sentryTypes.Envelope) => void) { - return (options: sentryTypes.BaseTransportOptions): sentryTypes.Transport => { - async function doCallback( - request: sentryTypes.TransportRequest, - ): Promise { - await callback(sentryUtils.parseEnvelope(request.body)); +export function makeTestTransport(callback: (envelope: sentryCore.Envelope) => void) { + return (options: sentryCore.BaseTransportOptions): sentryCore.Transport => { + async function doCallback(request: sentryCore.TransportRequest): Promise { + await callback(sentryCore.parseEnvelope(request.body)); return Promise.resolve({ statusCode: 200, From 501d45121befb52059e468b89f5d00dbd0e6b38e Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Mon, 16 Dec 2024 11:40:29 +0100 Subject: [PATCH 2/8] fix clean --- packages/deno/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/deno/package.json b/packages/deno/package.json index b9f7dbdc8ea8..08841fe91242 100644 --- a/packages/deno/package.json +++ b/packages/deno/package.json @@ -41,7 +41,7 @@ "build:types:bundle": "rollup -c rollup.types.config.mjs", "build:tarball": "node ./scripts/prepack.js && npm pack ./build", "circularDepCheck": "madge --circular src/index.ts", - "clean": "rimraf build build-types build-test coverage sentry-deno-*.tgz", + "clean": "rimraf build build-types build-test coverage node_modules/.deno sentry-deno-*.tgz", "prefix": "yarn deno-types", "fix": "eslint . --format stylish --fix", "prelint": "yarn deno-types", From 5d9b8b4f335533e45d8cc40dadb8eeb5d22d3d65 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Mon, 16 Dec 2024 11:59:22 +0100 Subject: [PATCH 3/8] fix test --- packages/deno/test/__snapshots__/mod.test.ts.snap | 8 ++++---- packages/deno/test/mod.test.ts | 15 +++++++-------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/packages/deno/test/__snapshots__/mod.test.ts.snap b/packages/deno/test/__snapshots__/mod.test.ts.snap index 05adc04b65bf..2142108a79f4 100644 --- a/packages/deno/test/__snapshots__/mod.test.ts.snap +++ b/packages/deno/test/__snapshots__/mod.test.ts.snap @@ -48,7 +48,7 @@ snapshot[`captureException 1`] = ` filename: "app:///test/mod.test.ts", function: "?", in_app: true, - lineno: 46, + lineno: 44, post_context: [ "", " await delay(200);", @@ -56,7 +56,7 @@ snapshot[`captureException 1`] = ` "});", "", "Deno.test('captureMessage', async t => {", - " let ev: sentryCore.Event | undefined;", + " let ev: Event | undefined;", ], pre_context: [ " ev = event;", @@ -74,7 +74,7 @@ snapshot[`captureException 1`] = ` filename: "app:///test/mod.test.ts", function: "something", in_app: true, - lineno: 43, + lineno: 41, post_context: [ " }", "", @@ -86,7 +86,7 @@ snapshot[`captureException 1`] = ` ], pre_context: [ "Deno.test('captureException', async t => {", - " let ev: sentryCore.Event | undefined;", + " let ev: Event | undefined;", " const client = getTestClient(event => {", " ev = event;", " });", diff --git a/packages/deno/test/mod.test.ts b/packages/deno/test/mod.test.ts index b8b917e7c185..6e8f057b8301 100644 --- a/packages/deno/test/mod.test.ts +++ b/packages/deno/test/mod.test.ts @@ -2,18 +2,17 @@ import { assertEquals } from 'https://deno.land/std@0.202.0/assert/assert_equals import { assertSnapshot } from 'https://deno.land/std@0.202.0/testing/snapshot.ts'; import { sentryCore } from '../build-test/index.js'; +import type { Event} from '../build/index.d.ts'; import { DenoClient, getCurrentScope, getDefaultIntegrations } from '../build/index.mjs'; + import { getNormalizedEvent } from './normalize.ts'; import { makeTestTransport } from './transport.ts'; -function getTestClient( - callback: (event?: sentryCore.Event) => void, - integrations: sentryCore.Integration[] = [], -): DenoClient { +function getTestClient(callback: (event?: Event) => void): DenoClient { const client = new DenoClient({ dsn: 'https://233a45e5efe34c47a3536797ce15dafa@nothing.here/5650507', debug: true, - integrations: [...getDefaultIntegrations({}), ...integrations], + integrations: getDefaultIntegrations({}), stackParser: sentryCore.createStackParser(sentryCore.nodeStackLineParser()), transport: makeTestTransport(envelope => { callback(getNormalizedEvent(envelope)); @@ -33,7 +32,7 @@ function delay(time: number): Promise { } Deno.test('captureException', async t => { - let ev: sentryCore.Event | undefined; + let ev: Event | undefined; const client = getTestClient(event => { ev = event; }); @@ -49,7 +48,7 @@ Deno.test('captureException', async t => { }); Deno.test('captureMessage', async t => { - let ev: sentryCore.Event | undefined; + let ev: Event | undefined; const client = getTestClient(event => { ev = event; }); @@ -61,7 +60,7 @@ Deno.test('captureMessage', async t => { }); Deno.test('captureMessage twice', async t => { - let ev: sentryCore.Event | undefined; + let ev: Event | undefined; const client = getTestClient(event => { ev = event; }); From 8936608a3b4ac419f40fce0807795e1a73802f2b Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Mon, 16 Dec 2024 12:04:54 +0100 Subject: [PATCH 4/8] fix linting --- packages/deno/test/mod.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/deno/test/mod.test.ts b/packages/deno/test/mod.test.ts index 6e8f057b8301..f63865d3da96 100644 --- a/packages/deno/test/mod.test.ts +++ b/packages/deno/test/mod.test.ts @@ -2,7 +2,7 @@ import { assertEquals } from 'https://deno.land/std@0.202.0/assert/assert_equals import { assertSnapshot } from 'https://deno.land/std@0.202.0/testing/snapshot.ts'; import { sentryCore } from '../build-test/index.js'; -import type { Event} from '../build/index.d.ts'; +import type { Event } from '../build/index.d.ts'; import { DenoClient, getCurrentScope, getDefaultIntegrations } from '../build/index.mjs'; import { getNormalizedEvent } from './normalize.ts'; From 20342ef35694dd727be675f4f9b53afb74ed9e1a Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Mon, 16 Dec 2024 13:43:41 +0100 Subject: [PATCH 5/8] fix tests?? --- packages/deno/test/mod.test.ts | 2 +- packages/deno/test/transport.ts | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/packages/deno/test/mod.test.ts b/packages/deno/test/mod.test.ts index f63865d3da96..d3fb5f82151d 100644 --- a/packages/deno/test/mod.test.ts +++ b/packages/deno/test/mod.test.ts @@ -1,8 +1,8 @@ import { assertEquals } from 'https://deno.land/std@0.202.0/assert/assert_equals.ts'; import { assertSnapshot } from 'https://deno.land/std@0.202.0/testing/snapshot.ts'; +import type { Event } from '@sentry/core'; import { sentryCore } from '../build-test/index.js'; -import type { Event } from '../build/index.d.ts'; import { DenoClient, getCurrentScope, getDefaultIntegrations } from '../build/index.mjs'; import { getNormalizedEvent } from './normalize.ts'; diff --git a/packages/deno/test/transport.ts b/packages/deno/test/transport.ts index 7d18e8036955..e9031f9c8dca 100644 --- a/packages/deno/test/transport.ts +++ b/packages/deno/test/transport.ts @@ -1,15 +1,22 @@ +import type { + BaseTransportOptions, + Envelope, + Transport, + TransportMakeRequestResponse, + TransportRequest, +} from '@sentry/core'; import { sentryCore } from '../build-test/index.js'; -export interface TestTransportOptions extends sentryCore.BaseTransportOptions { - callback: (envelope: sentryCore.Envelope) => void; +export interface TestTransportOptions extends BaseTransportOptions { + callback: (envelope: Envelope) => void; } /** * Creates a Transport that uses the Fetch API to send events to Sentry. */ -export function makeTestTransport(callback: (envelope: sentryCore.Envelope) => void) { - return (options: sentryCore.BaseTransportOptions): sentryCore.Transport => { - async function doCallback(request: sentryCore.TransportRequest): Promise { +export function makeTestTransport(callback: (envelope: Envelope) => void) { + return (options: BaseTransportOptions): Transport => { + async function doCallback(request: TransportRequest): Promise { await callback(sentryCore.parseEnvelope(request.body)); return Promise.resolve({ From d8b2dd27da484a89efe00cb1d346f1662a186542 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Mon, 16 Dec 2024 13:58:58 +0100 Subject: [PATCH 6/8] fix one more? --- packages/deno/test/normalize.ts | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/packages/deno/test/normalize.ts b/packages/deno/test/normalize.ts index 50211674429f..51b9938cadb5 100644 --- a/packages/deno/test/normalize.ts +++ b/packages/deno/test/normalize.ts @@ -1,20 +1,21 @@ /* eslint-disable complexity */ +import type { Event, Session, Envelope } from '@sentry/core'; import { sentryCore } from '../build-test/index.js'; -type EventOrSession = sentryCore.Event | sentryCore.Session; +type EventOrSession = Event | Session; -export function getNormalizedEvent(envelope: sentryCore.Envelope): sentryCore.Event | undefined { - let event: sentryCore.Event | undefined; +export function getNormalizedEvent(envelope: Envelope): Event | undefined { + let event: Event | undefined; sentryCore.forEachEnvelopeItem(envelope, item => { const [headers, body] = item; if (headers.type === 'event') { - event = body as sentryCore.Event; + event = body as Event; } }); - return normalize(event) as sentryCore.Event | undefined; + return normalize(event) as Event | undefined; } export function normalize(event: EventOrSession | undefined): EventOrSession | undefined { @@ -23,14 +24,14 @@ export function normalize(event: EventOrSession | undefined): EventOrSession | u } if (eventIsSession(event)) { - return normalizeSession(event as sentryCore.Session); + return normalizeSession(event as Session); } else { - return normalizeEvent(event as sentryCore.Event); + return normalizeEvent(event as Event); } } export function eventIsSession(data: EventOrSession): boolean { - return !!(data as sentryCore.Session)?.sid; + return !!(data as Session)?.sid; } /** @@ -39,7 +40,7 @@ export function eventIsSession(data: EventOrSession): boolean { * All properties that are timestamps, versions, ids or variables that may vary * by platform are replaced with placeholder strings */ -function normalizeSession(session: sentryCore.Session): sentryCore.Session { +function normalizeSession(session: Session): Session { if (session.sid) { session.sid = '{{id}}'; } @@ -65,7 +66,7 @@ function normalizeSession(session: sentryCore.Session): sentryCore.Session { * All properties that are timestamps, versions, ids or variables that may vary * by platform are replaced with placeholder strings */ -function normalizeEvent(event: sentryCore.Event): sentryCore.Event { +function normalizeEvent(event: Event): Event { if (event.sdk?.version) { event.sdk.version = '{{version}}'; } From df3507831a78d78feab40a695e55c373bf57017f Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Mon, 16 Dec 2024 14:20:42 +0100 Subject: [PATCH 7/8] fix formatting --- packages/deno/test/normalize.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/deno/test/normalize.ts b/packages/deno/test/normalize.ts index 51b9938cadb5..b5c1e5278ea8 100644 --- a/packages/deno/test/normalize.ts +++ b/packages/deno/test/normalize.ts @@ -1,5 +1,5 @@ /* eslint-disable complexity */ -import type { Event, Session, Envelope } from '@sentry/core'; +import type { Envelope, Event, Session } from '@sentry/core'; import { sentryCore } from '../build-test/index.js'; type EventOrSession = Event | Session; From ffcf3aec04520a15c73ca52278031616e8709298 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Mon, 16 Dec 2024 14:41:06 +0100 Subject: [PATCH 8/8] remove deno test build stuff --- packages/deno/package.json | 3 +- packages/deno/rollup.test.config.mjs | 45 -------------------------- packages/deno/test/build.ts | 2 -- packages/deno/test/mod.test.ts | 4 +-- packages/deno/test/normalize.ts | 4 +-- packages/deno/test/transport.ts | 6 ++-- packages/deno/tsconfig.test.types.json | 10 ------ 7 files changed, 8 insertions(+), 66 deletions(-) delete mode 100644 packages/deno/rollup.test.config.mjs delete mode 100644 packages/deno/test/build.ts delete mode 100644 packages/deno/tsconfig.test.types.json diff --git a/packages/deno/package.json b/packages/deno/package.json index 08841fe91242..7cecc1e7c228 100644 --- a/packages/deno/package.json +++ b/packages/deno/package.json @@ -47,9 +47,8 @@ "prelint": "yarn deno-types", "lint": "eslint . --format stylish", "install:deno": "node ./scripts/install-deno.mjs", - "pretest": "run-s deno-types test:build", + "pretest": "run-s deno-types", "test": "run-s install:deno test:types test:unit", - "test:build": "tsc -p tsconfig.test.types.json && rollup -c rollup.test.config.mjs", "test:types": "deno check ./build/index.mjs", "test:unit": "deno test --allow-read --allow-run", "test:unit:update": "deno test --allow-read --allow-write --allow-run -- --update", diff --git a/packages/deno/rollup.test.config.mjs b/packages/deno/rollup.test.config.mjs deleted file mode 100644 index 2902fcfe39b0..000000000000 --- a/packages/deno/rollup.test.config.mjs +++ /dev/null @@ -1,45 +0,0 @@ -import nodeResolve from '@rollup/plugin-node-resolve'; -import sucrase from '@rollup/plugin-sucrase'; -import { defineConfig } from 'rollup'; -// @ts-check -import dts from 'rollup-plugin-dts'; - -export default [ - defineConfig({ - input: ['test/build.ts'], - output: { - file: 'build-test/index.js', - sourcemap: true, - preserveModules: - process.env.SENTRY_BUILD_PRESERVE_MODULES === undefined - ? false - : Boolean(process.env.SENTRY_BUILD_PRESERVE_MODULES), - strict: false, - freeze: false, - interop: 'auto', - format: 'esm', - banner: '/// ', - }, - plugins: [ - nodeResolve({ - extensions: ['.mjs', '.js', '.json', '.node', '.ts', '.tsx'], - }), - sucrase({ transforms: ['typescript'] }), - ], - }), - defineConfig({ - input: './build-test/build.d.ts', - output: [{ file: 'build-test/index.d.ts', format: 'es' }], - plugins: [ - dts({ respectExternal: true }), - // The bundled types contain a declaration for the __DEBUG_BUILD__ global - // This can result in errors about duplicate global declarations so we strip it out! - { - name: 'strip-global', - renderChunk(code) { - return { code: code.replace(/declare global \{\s*const __DEBUG_BUILD__: boolean;\s*\}/g, '') }; - }, - }, - ], - }), -]; diff --git a/packages/deno/test/build.ts b/packages/deno/test/build.ts deleted file mode 100644 index 0f4ecbe4d350..000000000000 --- a/packages/deno/test/build.ts +++ /dev/null @@ -1,2 +0,0 @@ -// We use this as the entry point to bundle Sentry dependencies that are used by the tests. -export * as sentryCore from '@sentry/core'; diff --git a/packages/deno/test/mod.test.ts b/packages/deno/test/mod.test.ts index d3fb5f82151d..e37de1c440ec 100644 --- a/packages/deno/test/mod.test.ts +++ b/packages/deno/test/mod.test.ts @@ -2,7 +2,7 @@ import { assertEquals } from 'https://deno.land/std@0.202.0/assert/assert_equals import { assertSnapshot } from 'https://deno.land/std@0.202.0/testing/snapshot.ts'; import type { Event } from '@sentry/core'; -import { sentryCore } from '../build-test/index.js'; +import { createStackParser, nodeStackLineParser } from '@sentry/core'; import { DenoClient, getCurrentScope, getDefaultIntegrations } from '../build/index.mjs'; import { getNormalizedEvent } from './normalize.ts'; @@ -13,7 +13,7 @@ function getTestClient(callback: (event?: Event) => void): DenoClient { dsn: 'https://233a45e5efe34c47a3536797ce15dafa@nothing.here/5650507', debug: true, integrations: getDefaultIntegrations({}), - stackParser: sentryCore.createStackParser(sentryCore.nodeStackLineParser()), + stackParser: createStackParser(nodeStackLineParser()), transport: makeTestTransport(envelope => { callback(getNormalizedEvent(envelope)); }), diff --git a/packages/deno/test/normalize.ts b/packages/deno/test/normalize.ts index b5c1e5278ea8..3edc273b75cd 100644 --- a/packages/deno/test/normalize.ts +++ b/packages/deno/test/normalize.ts @@ -1,13 +1,13 @@ /* eslint-disable complexity */ import type { Envelope, Event, Session } from '@sentry/core'; -import { sentryCore } from '../build-test/index.js'; +import { forEachEnvelopeItem } from '@sentry/core'; type EventOrSession = Event | Session; export function getNormalizedEvent(envelope: Envelope): Event | undefined { let event: Event | undefined; - sentryCore.forEachEnvelopeItem(envelope, item => { + forEachEnvelopeItem(envelope, item => { const [headers, body] = item; if (headers.type === 'event') { diff --git a/packages/deno/test/transport.ts b/packages/deno/test/transport.ts index e9031f9c8dca..f8e39168148f 100644 --- a/packages/deno/test/transport.ts +++ b/packages/deno/test/transport.ts @@ -5,7 +5,7 @@ import type { TransportMakeRequestResponse, TransportRequest, } from '@sentry/core'; -import { sentryCore } from '../build-test/index.js'; +import { createTransport, parseEnvelope } from '@sentry/core'; export interface TestTransportOptions extends BaseTransportOptions { callback: (envelope: Envelope) => void; @@ -17,13 +17,13 @@ export interface TestTransportOptions extends BaseTransportOptions { export function makeTestTransport(callback: (envelope: Envelope) => void) { return (options: BaseTransportOptions): Transport => { async function doCallback(request: TransportRequest): Promise { - await callback(sentryCore.parseEnvelope(request.body)); + await callback(parseEnvelope(request.body)); return Promise.resolve({ statusCode: 200, }); } - return sentryCore.createTransport(options, doCallback); + return createTransport(options, doCallback); }; } diff --git a/packages/deno/tsconfig.test.types.json b/packages/deno/tsconfig.test.types.json deleted file mode 100644 index 1cac4cb38a90..000000000000 --- a/packages/deno/tsconfig.test.types.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "./tsconfig.json", - "include": ["./lib.deno.d.ts", "test/build.ts"], - "compilerOptions": { - "declaration": true, - "declarationMap": false, - "emitDeclarationOnly": true, - "outDir": "build-test" - } -}