diff --git a/packages/sveltekit/test/client/browserTracingIntegration.test.ts b/packages/sveltekit/test/client/browserTracingIntegration.test.ts index a76f0e187c35..a8fbaa815af2 100644 --- a/packages/sveltekit/test/client/browserTracingIntegration.test.ts +++ b/packages/sveltekit/test/client/browserTracingIntegration.test.ts @@ -1,7 +1,12 @@ +/** + * @vitest-environment jsdom + */ + /* eslint-disable @typescript-eslint/unbound-method */ +import { beforeEach, describe, expect, it, vi } from 'vitest'; + import type { Span } from '@sentry/types'; import { writable } from 'svelte/store'; -import { vi } from 'vitest'; import { navigating, page } from '$app/stores'; diff --git a/packages/sveltekit/test/client/fetch.test.ts b/packages/sveltekit/test/client/fetch.test.ts index a97478cc86e8..1dbadaf78cda 100644 --- a/packages/sveltekit/test/client/fetch.test.ts +++ b/packages/sveltekit/test/client/fetch.test.ts @@ -1,3 +1,9 @@ +/** + * @vitest-environment jsdom + */ + +import { beforeEach, describe, expect, it } from 'vitest'; + import { init } from '../../src/client/index'; describe('instruments fetch', () => { diff --git a/packages/sveltekit/test/client/handleError.test.ts b/packages/sveltekit/test/client/handleError.test.ts index b4eba9ff56e9..077872db90ab 100644 --- a/packages/sveltekit/test/client/handleError.test.ts +++ b/packages/sveltekit/test/client/handleError.test.ts @@ -1,6 +1,7 @@ +import { beforeEach, describe, expect, it, vi } from 'vitest'; + import * as SentrySvelte from '@sentry/svelte'; import type { HandleClientError, NavigationEvent } from '@sveltejs/kit'; -import { vi } from 'vitest'; import { handleErrorWithSentry } from '../../src/client/handleError'; diff --git a/packages/sveltekit/test/client/load.test.ts b/packages/sveltekit/test/client/load.test.ts index 087eada60b47..81454bc62d60 100644 --- a/packages/sveltekit/test/client/load.test.ts +++ b/packages/sveltekit/test/client/load.test.ts @@ -1,7 +1,8 @@ +import { beforeEach, describe, expect, it, vi } from 'vitest'; + import * as SentrySvelte from '@sentry/svelte'; import type { Load } from '@sveltejs/kit'; import { redirect } from '@sveltejs/kit'; -import { vi } from 'vitest'; import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core'; import { wrapLoadWithSentry } from '../../src/client/load'; diff --git a/packages/sveltekit/test/client/sdk.test.ts b/packages/sveltekit/test/client/sdk.test.ts index 340a3852d04b..46cab7400d12 100644 --- a/packages/sveltekit/test/client/sdk.test.ts +++ b/packages/sveltekit/test/client/sdk.test.ts @@ -1,7 +1,8 @@ +import { afterEach, describe, expect, it, vi } from 'vitest'; + import type { BrowserClient } from '@sentry/svelte'; import * as SentrySvelte from '@sentry/svelte'; import { SDK_VERSION, getClient, getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/svelte'; -import { vi } from 'vitest'; import { init } from '../../src/client'; diff --git a/packages/sveltekit/test/common/utils.test.ts b/packages/sveltekit/test/common/utils.test.ts index 0b0352042164..32181a746e07 100644 --- a/packages/sveltekit/test/common/utils.test.ts +++ b/packages/sveltekit/test/common/utils.test.ts @@ -1,3 +1,5 @@ +import { describe, expect, it } from 'vitest'; + import { isHttpError, isRedirect } from '../../src/common/utils'; describe('isRedirect', () => { diff --git a/packages/sveltekit/test/index.test.ts b/packages/sveltekit/test/index.test.ts index 6bc0e7072028..c70524327d31 100644 --- a/packages/sveltekit/test/index.test.ts +++ b/packages/sveltekit/test/index.test.ts @@ -1,3 +1,5 @@ +import { describe, expect, it } from 'vitest'; + import * as SentryClient from '../src/client'; import * as SentryServer from '../src/server'; diff --git a/packages/sveltekit/test/server/handle.test.ts b/packages/sveltekit/test/server/handle.test.ts index e34f507af047..ad49e9a16ef8 100644 --- a/packages/sveltekit/test/server/handle.test.ts +++ b/packages/sveltekit/test/server/handle.test.ts @@ -1,3 +1,5 @@ +import { beforeEach, describe, expect, it } from 'vitest'; + import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, getRootSpan, diff --git a/packages/sveltekit/test/server/handleError.test.ts b/packages/sveltekit/test/server/handleError.test.ts index 611fac1f9a4d..b9a91a0b0e1d 100644 --- a/packages/sveltekit/test/server/handleError.test.ts +++ b/packages/sveltekit/test/server/handleError.test.ts @@ -1,6 +1,7 @@ +import { beforeEach, describe, expect, it, vi } from 'vitest'; + import * as SentryNode from '@sentry/node'; import type { HandleServerError, RequestEvent } from '@sveltejs/kit'; -import { vi } from 'vitest'; import { handleErrorWithSentry } from '../../src/server/handleError'; diff --git a/packages/sveltekit/test/server/load.test.ts b/packages/sveltekit/test/server/load.test.ts index 28e7fc342308..c2ee2b2943a3 100644 --- a/packages/sveltekit/test/server/load.test.ts +++ b/packages/sveltekit/test/server/load.test.ts @@ -1,3 +1,5 @@ +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; + import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, @@ -8,7 +10,6 @@ import * as SentryNode from '@sentry/node'; import type { Event } from '@sentry/types'; import type { Load, ServerLoad } from '@sveltejs/kit'; import { error, redirect } from '@sveltejs/kit'; -import { vi } from 'vitest'; import { wrapLoadWithSentry, wrapServerLoadWithSentry } from '../../src/server/load'; import { getDefaultNodeClientOptions } from '../utils'; diff --git a/packages/sveltekit/test/server/sdk.test.ts b/packages/sveltekit/test/server/sdk.test.ts index 131e4185a3c7..aa7dbc560e1a 100644 --- a/packages/sveltekit/test/server/sdk.test.ts +++ b/packages/sveltekit/test/server/sdk.test.ts @@ -1,8 +1,9 @@ +import { afterEach, describe, expect, it, vi } from 'vitest'; + import * as SentryNode from '@sentry/node'; import type { NodeClient } from '@sentry/node'; import { SDK_VERSION, getClient } from '@sentry/node'; -import { vi } from 'vitest'; import { init } from '../../src/server/sdk'; const nodeInit = vi.spyOn(SentryNode, 'init'); diff --git a/packages/sveltekit/test/server/utils.test.ts b/packages/sveltekit/test/server/utils.test.ts index f3cac3eb47a0..5e8b9b2b99a3 100644 --- a/packages/sveltekit/test/server/utils.test.ts +++ b/packages/sveltekit/test/server/utils.test.ts @@ -1,3 +1,5 @@ +import { describe, expect, it } from 'vitest'; + import { getTracePropagationData } from '../../src/server/utils'; const MOCK_REQUEST_EVENT: any = { diff --git a/packages/sveltekit/test/vite/autoInstrument.test.ts b/packages/sveltekit/test/vite/autoInstrument.test.ts index f10c828b48c3..37f6be4f9700 100644 --- a/packages/sveltekit/test/vite/autoInstrument.test.ts +++ b/packages/sveltekit/test/vite/autoInstrument.test.ts @@ -1,4 +1,4 @@ -import { vi } from 'vitest'; +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; import { canWrapLoad, makeAutoInstrumentationPlugin } from '../../src/vite/autoInstrument'; @@ -12,7 +12,6 @@ let fileContent: string | undefined; vi.mock('fs', async () => { const actual = await vi.importActual('fs'); return { - // @ts-expect-error this exists, I promise! ...actual, promises: { // @ts-expect-error this also exists, I promise! diff --git a/packages/sveltekit/test/vite/detectAdapter.test.ts b/packages/sveltekit/test/vite/detectAdapter.test.ts index 7f4e05a1a44b..a934a9ee06e6 100644 --- a/packages/sveltekit/test/vite/detectAdapter.test.ts +++ b/packages/sveltekit/test/vite/detectAdapter.test.ts @@ -1,10 +1,10 @@ -import { vi } from 'vitest'; +import { beforeEach, describe, expect, it, vi } from 'vitest'; import { detectAdapter } from '../../src/vite/detectAdapter'; let existsFile = true; const pkgJson = { - dependencies: {}, + dependencies: {} as Record, }; describe('detectAdapter', () => { beforeEach(() => { diff --git a/packages/sveltekit/test/vite/injectGlobalValues.test.ts b/packages/sveltekit/test/vite/injectGlobalValues.test.ts index 7250cfb07d80..999ee497a2cc 100644 --- a/packages/sveltekit/test/vite/injectGlobalValues.test.ts +++ b/packages/sveltekit/test/vite/injectGlobalValues.test.ts @@ -1,3 +1,5 @@ +import { describe, expect, it } from 'vitest'; + import { getGlobalValueInjectionCode } from '../../src/vite/injectGlobalValues'; describe('getGlobalValueInjectionCode', () => { diff --git a/packages/sveltekit/test/vite/sentrySvelteKitPlugins.test.ts b/packages/sveltekit/test/vite/sentrySvelteKitPlugins.test.ts index f2916cb33020..796b4aa4957b 100644 --- a/packages/sveltekit/test/vite/sentrySvelteKitPlugins.test.ts +++ b/packages/sveltekit/test/vite/sentrySvelteKitPlugins.test.ts @@ -1,4 +1,4 @@ -import { vi } from 'vitest'; +import { describe, expect, it, vi } from 'vitest'; import type { Plugin } from 'vite'; import * as autoInstrument from '../../src/vite/autoInstrument'; @@ -8,7 +8,6 @@ import * as sourceMaps from '../../src/vite/sourceMaps'; vi.mock('fs', async () => { const actual = await vi.importActual('fs'); return { - // @ts-expect-error this exists, I promise! ...actual, promises: { // @ts-expect-error this also exists, I promise! diff --git a/packages/sveltekit/test/vite/sourceMaps.test.ts b/packages/sveltekit/test/vite/sourceMaps.test.ts index 77cc80807cda..c25ec48a53cb 100644 --- a/packages/sveltekit/test/vite/sourceMaps.test.ts +++ b/packages/sveltekit/test/vite/sourceMaps.test.ts @@ -1,4 +1,4 @@ -import { vi } from 'vitest'; +import { beforeEach, describe, expect, it, vi } from 'vitest'; import type { Plugin } from 'vite'; import { makeCustomSentryVitePlugins } from '../../src/vite/sourceMaps'; diff --git a/packages/sveltekit/test/vite/svelteConfig.test.ts b/packages/sveltekit/test/vite/svelteConfig.test.ts index 5f079deb7c1a..35e32ce8ac4d 100644 --- a/packages/sveltekit/test/vite/svelteConfig.test.ts +++ b/packages/sveltekit/test/vite/svelteConfig.test.ts @@ -1,9 +1,9 @@ -import { vi } from 'vitest'; +import { beforeEach, describe, expect, it, vi } from 'vitest'; import type { SupportedSvelteKitAdapters } from '../../src/vite/detectAdapter'; import { getAdapterOutputDir, getHooksFileName, loadSvelteConfig } from '../../src/vite/svelteConfig'; -let existsFile; +let existsFile: any; describe('loadSvelteConfig', () => { vi.mock('fs', () => { @@ -25,7 +25,7 @@ describe('loadSvelteConfig', () => { // url apparently doesn't exist in the test environment, therefore we mock it: vi.mock('url', () => { return { - pathToFileURL: path => { + pathToFileURL: (path: string) => { return { href: path, }; @@ -58,7 +58,7 @@ describe('loadSvelteConfig', () => { describe('getAdapterOutputDir', () => { const mockedAdapter = { name: 'mocked-adapter', - adapt(builder) { + adapt(builder: any) { builder.writeClient('customBuildDir'); }, }; diff --git a/packages/sveltekit/tsconfig.test.json b/packages/sveltekit/tsconfig.test.json index 3fbe012384ee..c41efeacd92f 100644 --- a/packages/sveltekit/tsconfig.test.json +++ b/packages/sveltekit/tsconfig.test.json @@ -5,6 +5,6 @@ "compilerOptions": { // should include all types from `./tsconfig.json` plus types for all test frameworks used - "types": ["node", "vitest/globals"] + "types": ["node"] } } diff --git a/packages/sveltekit/vite.config.ts b/packages/sveltekit/vite.config.ts index a6d9835700ec..d6cbc4cce230 100644 --- a/packages/sveltekit/vite.config.ts +++ b/packages/sveltekit/vite.config.ts @@ -11,7 +11,6 @@ export default { // test exists, no idea why TS doesn't recognize it // eslint-disable-next-line @typescript-eslint/no-explicit-any ...(baseConfig as UserConfig & { test: any }).test, - environment: 'jsdom', setupFiles: ['./test/vitest.setup.ts'], alias: [ {