lint, deprecations, etc

Author: Lms24

packages/sveltekit/src/client/sdk.ts

@@ -1,5 +1,5 @@
 import { applySdkMetadata, hasTracingEnabled } from '@sentry/core';
-import { BrowserOptions } from '@sentry/svelte';
+import type { BrowserOptions, browserTracingIntegration } from '@sentry/svelte';
 import { getDefaultIntegrations as getDefaultSvelteIntegrations } from '@sentry/svelte';
 import { WINDOW, getCurrentScope, init as initSvelteSdk } from '@sentry/svelte';
 import type { Integration } from '@sentry/types';
@@ -67,6 +67,7 @@ function fixBrowserTracingIntegration(options: BrowserOptions): void {
 function isNewBrowserTracingIntegration(
   integration: Integration,
 ): integration is Integration & { options?: Parameters<typeof browserTracingIntegration>[0] } {
+  // eslint-disable-next-line deprecation/deprecation
   return !!integration.afterAllSetup && !!(integration as BrowserTracing).options;
 }
 
@@ -80,15 +81,19 @@ function maybeUpdateBrowserTracingIntegration(integrations: Integration[]): Inte
   // If `browserTracingIntegration()` was added, we need to force-convert it to our custom one
   if (isNewBrowserTracingIntegration(browserTracing)) {
     const { options } = browserTracing;
+    // eslint-disable-next-line deprecation/deprecation
     integrations[integrations.indexOf(browserTracing)] = new BrowserTracing(options);
   }
 
   // If BrowserTracing was added, but it is not our forked version,
   // replace it with our forked version with the same options
+  // eslint-disable-next-line deprecation/deprecation
   if (!(browserTracing instanceof BrowserTracing)) {
+    // eslint-disable-next-line deprecation/deprecation
     const options: ConstructorParameters<typeof BrowserTracing>[0] = (browserTracing as BrowserTracing).options;
     // This option is overwritten by the custom integration
     delete options.routingInstrumentation;
+    // eslint-disable-next-line deprecation/deprecation
     integrations[integrations.indexOf(browserTracing)] = new BrowserTracing(options);
   }
 

packages/sveltekit/test/client/router.test.ts

@@ -49,6 +49,7 @@ describe('sveltekitRoutingInstrumentation', () => {
   });
 
   it("starts a pageload transaction when it's called with default params", () => {
+    // eslint-disable-next-line deprecation/deprecation
     svelteKitRoutingInstrumentation(mockedStartTransaction);
 
     expect(mockedStartTransaction).toHaveBeenCalledTimes(1);
@@ -66,7 +67,6 @@ describe('sveltekitRoutingInstrumentation', () => {
     });
 
     // We emit an update to the `page` store to simulate the SvelteKit router lifecycle
-    // @ts-expect-error This is fine because we testUtils/stores.ts defines `page` as a writable store
     page.set({ route: { id: 'testRoute' } });
 
     // This should update the transaction name with the parameterized route:
@@ -76,15 +76,16 @@ describe('sveltekitRoutingInstrumentation', () => {
   });
 
   it("doesn't start a pageload transaction if `startTransactionOnPageLoad` is false", () => {
+    // eslint-disable-next-line deprecation/deprecation
     svelteKitRoutingInstrumentation(mockedStartTransaction, false);
     expect(mockedStartTransaction).toHaveBeenCalledTimes(0);
   });
 
   it("doesn't start a navigation transaction when `startTransactionOnLocationChange` is false", () => {
+    // eslint-disable-next-line deprecation/deprecation
     svelteKitRoutingInstrumentation(mockedStartTransaction, false, false);
 
     // We emit an update to the `navigating` store to simulate the SvelteKit navigation lifecycle
-    // @ts-expect-error This is fine because we testUtils/stores.ts defines `navigating` as a writable store
     navigating.set({
       from: { route: { id: '/users' }, url: { pathname: '/users' } },
       to: { route: { id: '/users/[id]' }, url: { pathname: '/users/7762' } },
@@ -95,10 +96,10 @@ describe('sveltekitRoutingInstrumentation', () => {
   });
 
   it('starts a navigation transaction when `startTransactionOnLocationChange` is true', () => {
+    // eslint-disable-next-line deprecation/deprecation
     svelteKitRoutingInstrumentation(mockedStartTransaction, false, true);
 
     // We emit an update to the `navigating` store to simulate the SvelteKit navigation lifecycle
-    // @ts-expect-error This is fine because we testUtils/stores.ts defines `navigating` as a writable store
     navigating.set({
       from: { route: { id: '/users' }, url: { pathname: '/users' } },
       to: { route: { id: '/users/[id]' }, url: { pathname: '/users/7762' } },
@@ -127,18 +128,17 @@ describe('sveltekitRoutingInstrumentation', () => {
     expect(returnedTransaction?.setTag).toHaveBeenCalledWith('from', '/users');
 
     // We emit `null` here to simulate the end of the navigation lifecycle
-    // @ts-expect-error this is fine
     navigating.set(null);
 
     expect(routingSpanFinishSpy).toHaveBeenCalledTimes(1);
   });
 
   describe('handling same origin and destination navigations', () => {
     it("doesn't start a navigation transaction if the raw navigation origin and destination are equal", () => {
+      // eslint-disable-next-line deprecation/deprecation
       svelteKitRoutingInstrumentation(mockedStartTransaction, false, true);
 
       // We emit an update to the `navigating` store to simulate the SvelteKit navigation lifecycle
-      // @ts-expect-error This is fine because we testUtils/stores.ts defines `navigating` as a writable store
       navigating.set({
         from: { route: { id: '/users/[id]' }, url: { pathname: '/users/7762' } },
         to: { route: { id: '/users/[id]' }, url: { pathname: '/users/7762' } },
@@ -148,9 +148,9 @@ describe('sveltekitRoutingInstrumentation', () => {
     });
 
     it('starts a navigation transaction if the raw navigation origin and destination are not equal', () => {
+      // eslint-disable-next-line deprecation/deprecation
       svelteKitRoutingInstrumentation(mockedStartTransaction, false, true);
 
-      // @ts-expect-error This is fine
       navigating.set({
         from: { route: { id: '/users/[id]' }, url: { pathname: '/users/7762' } },
         to: { route: { id: '/users/[id]' }, url: { pathname: '/users/223412' } },
@@ -179,11 +179,11 @@ describe('sveltekitRoutingInstrumentation', () => {
     });
 
     it('falls back to `window.location.pathname` to determine the raw origin', () => {
+      // eslint-disable-next-line deprecation/deprecation
       svelteKitRoutingInstrumentation(mockedStartTransaction, false, true);
 
       // window.location.pathame is "/" in tests
 
-      // @ts-expect-error This is fine
       navigating.set({
         to: { route: {}, url: { pathname: '/' } },
       });

packages/sveltekit/test/client/sdk.test.ts

@@ -82,7 +82,6 @@ describe('Sentry client SDK', () => {
         // This is the closest we can get to unit-testing the `__SENTRY_TRACING__` tree-shaking guard
         // IRL, the code to add the integration would most likely be removed by the bundler.
 
-        // @ts-expect-error this is fine in the test
         globalThis.__SENTRY_TRACING__ = false;
 
         init({
@@ -93,7 +92,6 @@ describe('Sentry client SDK', () => {
         const browserTracing = getClient<BrowserClient>()?.getIntegrationByName('BrowserTracing');
         expect(browserTracing).toBeUndefined();
 
-        // @ts-expect-error this is fine in the test
         delete globalThis.__SENTRY_TRACING__;
       });
 
@@ -113,6 +111,7 @@ describe('Sentry client SDK', () => {
         expect(options.finalTimeout).toEqual(10);
 
         // But we force the routing instrumentation to be ours
+        // eslint-disable-next-line deprecation/deprecation
         expect(options.routingInstrumentation).toEqual(svelteKitRoutingInstrumentation);
       });
 
@@ -132,6 +131,7 @@ describe('Sentry client SDK', () => {
         expect(options.finalTimeout).toEqual(10);
 
         // But we force the routing instrumentation to be ours
+        // eslint-disable-next-line deprecation/deprecation
         expect(options.routingInstrumentation).toEqual(svelteKitRoutingInstrumentation);
       });
     });