From 8c7c8214632ff1e9aceb5c1730ee903a55e77619 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Wed, 12 Oct 2022 13:12:25 +0200
Subject: [PATCH 1/8] add withSentryConfig function

---
 packages/svelte/src/config.ts        | 76 ++++++++++++++++++++++++++++
 packages/svelte/src/index.ts         |  4 ++
 packages/svelte/src/preprocessors.ts | 20 ++++++--
 packages/svelte/src/types.ts         | 37 ++------------
 4 files changed, 101 insertions(+), 36 deletions(-)
 create mode 100644 packages/svelte/src/config.ts

diff --git a/packages/svelte/src/config.ts b/packages/svelte/src/config.ts
new file mode 100644
index 000000000000..50634cc7d30a
--- /dev/null
+++ b/packages/svelte/src/config.ts
@@ -0,0 +1,76 @@
+import { CompileOptions } from 'svelte/types/compiler';
+import { PreprocessorGroup } from 'svelte/types/compiler/preprocess';
+
+import { componentTrackingPreprocessor, defaultComponentTrackingOptions } from './preprocessors';
+import { ComponentTrackingInitOptions, SentryPreprocessorGroup } from './types';
+
+export type SvelteConfig = {
+  [key: string]: unknown;
+  preprocess?: PreprocessorGroup[] | PreprocessorGroup;
+  compilerOptions?: CompileOptions;
+};
+
+export type SentrySvelteConfigOptions = {
+  componentTracking?: ComponentTrackingInitOptions;
+};
+
+const DEFAULT_SENTRY_OPTIONS: SentrySvelteConfigOptions = {
+  componentTracking: defaultComponentTrackingOptions,
+};
+
+/**
+ * Add Sentry options to the Svelte config to be exported from the user's `svelte.config.js` file.
+ *
+ * @param originalConfig The existing config to be exported prior to adding Sentry
+ * @param sentryOptions The configuration of the Sentry-added options
+ *
+ * @return The wrapped and modified config to be exported
+ */
+export function withSentryConfig(
+  originalConfig: SvelteConfig,
+  sentryOptions?: SentrySvelteConfigOptions,
+): SvelteConfig {
+  const mergedOptions = {
+    ...DEFAULT_SENTRY_OPTIONS,
+    ...sentryOptions,
+  };
+
+  const originalPreprocessors = getOriginalPreprocessorArray(originalConfig);
+  const sentryPreprocessors: SentryPreprocessorGroup[] = [];
+
+  const shouldTrackComponents = mergedOptions.componentTracking && mergedOptions.componentTracking.trackComponents;
+  if (shouldTrackComponents) {
+    // TODO(v8): Remove eslint rule
+    // eslint-disable-next-line deprecation/deprecation
+    sentryPreprocessors.push(componentTrackingPreprocessor(mergedOptions.componentTracking));
+  }
+
+  const dedupedSentryPreprocessors = sentryPreprocessors.filter(
+    sentryPreproc =>
+      originalPreprocessors.find(p => (p as SentryPreprocessorGroup).id === sentryPreproc.id) === undefined,
+  );
+
+  const mergedPreprocessors = [...dedupedSentryPreprocessors, ...originalPreprocessors];
+
+  return {
+    ...originalConfig,
+    preprocess: mergedPreprocessors,
+  };
+}
+
+/**
+ * Standardizes the different ways the user-provided preprocessor option can be specified.
+ * Users can specify an array of preprocessors, one single one or nothing at all.
+ *
+ * @param originalConfig the user-provided svelte config oject
+ * @return an array of preprocessors or an empty array if no preprocessors were specified
+ */
+function getOriginalPreprocessorArray(originalConfig: SvelteConfig): PreprocessorGroup[] {
+  if (originalConfig.preprocess) {
+    if (Array.isArray(originalConfig.preprocess)) {
+      return originalConfig.preprocess;
+    }
+    return [originalConfig.preprocess];
+  }
+  return [];
+}
diff --git a/packages/svelte/src/index.ts b/packages/svelte/src/index.ts
index 40f648a46286..bc82551784d6 100644
--- a/packages/svelte/src/index.ts
+++ b/packages/svelte/src/index.ts
@@ -7,5 +7,9 @@ export * from '@sentry/browser';
 
 export { init } from './sdk';
 
+// TODO(v8): Remove this export
 export { componentTrackingPreprocessor } from './preprocessors';
+
 export { trackComponent } from './performance';
+
+export { withSentryConfig } from './config';
diff --git a/packages/svelte/src/preprocessors.ts b/packages/svelte/src/preprocessors.ts
index 9102636c045f..219b679c7d35 100644
--- a/packages/svelte/src/preprocessors.ts
+++ b/packages/svelte/src/preprocessors.ts
@@ -1,6 +1,7 @@
 import MagicString from 'magic-string';
+import { PreprocessorGroup } from 'svelte/types/compiler/preprocess';
 
-import { ComponentTrackingInitOptions, PreprocessorGroup, TrackComponentOptions } from './types';
+import { ComponentTrackingInitOptions, SentryPreprocessorGroup, TrackComponentOptions } from './types';
 
 export const defaultComponentTrackingOptions: Required<ComponentTrackingInitOptions> = {
   trackComponents: true,
@@ -8,18 +9,22 @@ export const defaultComponentTrackingOptions: Required<ComponentTrackingInitOpti
   trackUpdates: true,
 };
 
+export const FIRST_PASS_COMPONENT_TRACKING_PREPROC_ID = 'FIRST_PASS_COMPONENT_TRACKING_PREPROCESSOR';
+
 /**
  * Svelte Preprocessor to inject Sentry performance monitoring related code
  * into Svelte components.
+ *
+ * @deprecated Use `withSentryConfig` which is the new way of making compile-time modifications
+ *             to Svelte apps going forward.
  */
 export function componentTrackingPreprocessor(options?: ComponentTrackingInitOptions): PreprocessorGroup {
   const mergedOptions = { ...defaultComponentTrackingOptions, ...options };
 
   const visitedFiles = new Set<string>();
 
-  return {
-    // This script hook is called whenever a Svelte component's <script>
-    // content is preprocessed.
+  const preprocessor: PreprocessorGroup = {
+    // This script hook is called whenever a Svelte component's <script> content is preprocessed.
     // `content` contains the script code as a string
     script: ({ content, filename, attributes }) => {
       // TODO: Not sure when a filename could be undefined. Using this 'unknown' fallback for the time being
@@ -48,6 +53,13 @@ export function componentTrackingPreprocessor(options?: ComponentTrackingInitOpt
       return { code: updatedCode, map: updatedSourceMap };
     },
   };
+
+  const sentryPreprocessor: SentryPreprocessorGroup = {
+    ...preprocessor,
+    id: FIRST_PASS_COMPONENT_TRACKING_PREPROC_ID,
+  };
+
+  return sentryPreprocessor;
 }
 
 function shouldInjectFunction(
diff --git a/packages/svelte/src/types.ts b/packages/svelte/src/types.ts
index d32051ec6a44..73dceaa4b043 100644
--- a/packages/svelte/src/types.ts
+++ b/packages/svelte/src/types.ts
@@ -1,40 +1,13 @@
-// The following types were copied from 'svelte/compiler'-internal
-// type definitions
-// see: https://github.com/sveltejs/svelte/blob/master/src/compiler/preprocess/types.ts
-interface Processed {
-  code: string;
-  map?: string | Record<string, unknown>;
-  dependencies?: string[];
-  toString?: () => string;
-}
-
-type MarkupPreprocessor = (options: {
-  content: string;
-  filename?: string;
-}) => Processed | void | Promise<Processed | void>;
-
-type Preprocessor = (options: {
-  /**
-   * The script/style tag content
-   */
-  content: string;
-  attributes: Record<string, string | boolean>;
-  /**
-   * The whole Svelte file content
-   */
-  markup: string;
-  filename?: string;
-}) => Processed | void | Promise<Processed | void>;
+import { PreprocessorGroup } from 'svelte/types/compiler/preprocess';
 
-export interface PreprocessorGroup {
-  markup?: MarkupPreprocessor;
-  style?: Preprocessor;
-  script?: Preprocessor;
+// Adds an id property to the preprocessor object we can use to check for duplication
+// in the preprocessors array
+export interface SentryPreprocessorGroup extends PreprocessorGroup {
+  id?: string;
 }
 
 // Alternatively, we could use a direct from svelte/compiler/preprocess
 // TODO: figure out what's better and roll with that
-// import { PreprocessorGroup } from 'svelte/types/compiler/preprocess';
 
 export type SpanOptions = {
   /**

From 59c0e845b624d9a4cb3c81dcf31301ec898500d2 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Wed, 12 Oct 2022 14:40:27 +0200
Subject: [PATCH 2/8] add tests

---
 packages/svelte/test/config.test.ts | 91 +++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 packages/svelte/test/config.test.ts

diff --git a/packages/svelte/test/config.test.ts b/packages/svelte/test/config.test.ts
new file mode 100644
index 000000000000..89e5712110a7
--- /dev/null
+++ b/packages/svelte/test/config.test.ts
@@ -0,0 +1,91 @@
+import { withSentryConfig, SvelteConfig, SentrySvelteConfigOptions } from '../src/config';
+import { componentTrackingPreprocessor, FIRST_PASS_COMPONENT_TRACKING_PREPROC_ID } from '../src/preprocessors';
+import { SentryPreprocessorGroup } from '../src/types';
+
+describe('withSentryConfig', () => {
+  it.each([
+    [
+      'no preprocessors specified',
+      {
+        compilerOptions: {
+          enableSourcemap: true,
+        },
+      },
+    ],
+    [
+      'a single preprocessor specified',
+      {
+        compilerOptions: {
+          enableSourcemap: true,
+        },
+        preprocess: {},
+      },
+    ],
+    [
+      'an array of preprocessors specified',
+      {
+        compilerOptions: {
+          enableSourcemap: true,
+        },
+        preprocess: [{}, {}, {}],
+      },
+    ],
+  ])('adds our preprocessors by default to the provided svelte config with %s', (_, originalConfig: SvelteConfig) => {
+    const wrappedConfig = withSentryConfig(originalConfig);
+
+    const originalPreprocs = originalConfig.preprocess;
+    const originalNumberOfPreprocs = originalPreprocs
+      ? Array.isArray(originalPreprocs)
+        ? originalPreprocs.length
+        : 1
+      : 0;
+
+    expect(Array.isArray(wrappedConfig.preprocess)).toBe(true);
+    expect(wrappedConfig).toEqual({ ...originalConfig, preprocess: expect.any(Array) });
+    expect(wrappedConfig.preprocess).toHaveLength(originalNumberOfPreprocs + 1);
+    expect((wrappedConfig.preprocess as SentryPreprocessorGroup[])[0].id).toEqual(
+      FIRST_PASS_COMPONENT_TRACKING_PREPROC_ID,
+    );
+  });
+
+  it("doesn't add Sentry preprocessors that were already added by the users", () => {
+    const originalConfig = {
+      compilerOptions: {
+        enableSourcemap: true,
+      },
+      preprocess: componentTrackingPreprocessor(),
+    };
+
+    const wrappedConfig = withSentryConfig(originalConfig);
+
+    expect(wrappedConfig).toEqual({ ...originalConfig, preprocess: expect.any(Array) });
+    expect(wrappedConfig.preprocess).toHaveLength(1);
+  });
+
+  it('handles multiple wraps correctly by only adding our preprocessors once', () => {
+    const originalConfig = {
+      compilerOptions: {
+        enableSourcemap: true,
+      },
+    };
+
+    const wrappedConfig = withSentryConfig(withSentryConfig(withSentryConfig(originalConfig)));
+
+    expect(wrappedConfig).toEqual({ ...originalConfig, preprocess: expect.any(Array) });
+    expect(wrappedConfig.preprocess).toHaveLength(1);
+  });
+
+  it("doesn't add component tracking preprocessors if the feature is deactivated", () => {
+    const originalConfig = {
+      compilerOptions: {
+        enableSourcemap: true,
+      },
+      preprocess: [{}],
+    };
+
+    const sentryOptions: SentrySvelteConfigOptions = { componentTracking: { trackComponents: false } };
+    const wrappedConfig = withSentryConfig(originalConfig, sentryOptions);
+
+    expect(wrappedConfig).toEqual(originalConfig);
+  });
+});

From be89c725ac984ea1ba0b96917848909f6a7da11a Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Wed, 12 Oct 2022 14:46:15 +0200
Subject: [PATCH 3/8] cleanup

---
 packages/svelte/src/config.ts              | 34 ++++++++++------------
 packages/svelte/src/index.ts               |  1 +
 packages/svelte/src/types.ts               | 18 ++++++++++--
 packages/svelte/test/config.test.ts        |  5 ++--
 packages/svelte/test/preprocessors.test.ts |  1 +
 5 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/packages/svelte/src/config.ts b/packages/svelte/src/config.ts
index 50634cc7d30a..f6244db8c5a7 100644
--- a/packages/svelte/src/config.ts
+++ b/packages/svelte/src/config.ts
@@ -1,18 +1,7 @@
-import { CompileOptions } from 'svelte/types/compiler';
 import { PreprocessorGroup } from 'svelte/types/compiler/preprocess';
 
 import { componentTrackingPreprocessor, defaultComponentTrackingOptions } from './preprocessors';
-import { ComponentTrackingInitOptions, SentryPreprocessorGroup } from './types';
-
-export type SvelteConfig = {
-  [key: string]: unknown;
-  preprocess?: PreprocessorGroup[] | PreprocessorGroup;
-  compilerOptions?: CompileOptions;
-};
-
-export type SentrySvelteConfigOptions = {
-  componentTracking?: ComponentTrackingInitOptions;
-};
+import { SentryPreprocessorGroup, SentrySvelteConfigOptions, SvelteConfig } from './types';
 
 const DEFAULT_SENTRY_OPTIONS: SentrySvelteConfigOptions = {
   componentTracking: defaultComponentTrackingOptions,
@@ -36,19 +25,16 @@ export function withSentryConfig(
   };
 
   const originalPreprocessors = getOriginalPreprocessorArray(originalConfig);
-  const sentryPreprocessors: SentryPreprocessorGroup[] = [];
+  const allSentryPreprocessors: SentryPreprocessorGroup[] = [];
 
   const shouldTrackComponents = mergedOptions.componentTracking && mergedOptions.componentTracking.trackComponents;
   if (shouldTrackComponents) {
     // TODO(v8): Remove eslint rule
     // eslint-disable-next-line deprecation/deprecation
-    sentryPreprocessors.push(componentTrackingPreprocessor(mergedOptions.componentTracking));
+    allSentryPreprocessors.push(componentTrackingPreprocessor(mergedOptions.componentTracking));
   }
 
-  const dedupedSentryPreprocessors = sentryPreprocessors.filter(
-    sentryPreproc =>
-      originalPreprocessors.find(p => (p as SentryPreprocessorGroup).id === sentryPreproc.id) === undefined,
-  );
+  const dedupedSentryPreprocessors = dedupePreprocessors(allSentryPreprocessors, originalPreprocessors);
 
   const mergedPreprocessors = [...dedupedSentryPreprocessors, ...originalPreprocessors];
 
@@ -60,7 +46,7 @@ export function withSentryConfig(
 
 /**
  * Standardizes the different ways the user-provided preprocessor option can be specified.
- * Users can specify an array of preprocessors, one single one or nothing at all.
+ * Users can specify an array of preprocessors, a single one or no preprocessor.
  *
  * @param originalConfig the user-provided svelte config oject
  * @return an array of preprocessors or an empty array if no preprocessors were specified
@@ -74,3 +60,13 @@ function getOriginalPreprocessorArray(originalConfig: SvelteConfig): Preprocesso
   }
   return [];
 }
+
+function dedupePreprocessors(
+  sentryPreprocessors: SentryPreprocessorGroup[],
+  originalPreprocessors: PreprocessorGroup[],
+): PreprocessorGroup[] {
+  return sentryPreprocessors.filter(
+    sentryPreproc =>
+      originalPreprocessors.find(p => (p as SentryPreprocessorGroup).id === sentryPreproc.id) === undefined,
+  );
+}
diff --git a/packages/svelte/src/index.ts b/packages/svelte/src/index.ts
index bc82551784d6..ac5aa49a5298 100644
--- a/packages/svelte/src/index.ts
+++ b/packages/svelte/src/index.ts
@@ -8,6 +8,7 @@ export * from '@sentry/browser';
 export { init } from './sdk';
 
 // TODO(v8): Remove this export
+// eslint-disable-next-line deprecation/deprecation
 export { componentTrackingPreprocessor } from './preprocessors';
 
 export { trackComponent } from './performance';
diff --git a/packages/svelte/src/types.ts b/packages/svelte/src/types.ts
index 73dceaa4b043..40628d6b974b 100644
--- a/packages/svelte/src/types.ts
+++ b/packages/svelte/src/types.ts
@@ -1,3 +1,4 @@
+import { CompileOptions } from 'svelte/types/compiler';
 import { PreprocessorGroup } from 'svelte/types/compiler/preprocess';
 
 // Adds an id property to the preprocessor object we can use to check for duplication
@@ -6,8 +7,21 @@ export interface SentryPreprocessorGroup extends PreprocessorGroup {
   id?: string;
 }
 
-// Alternatively, we could use a direct from svelte/compiler/preprocess
-// TODO: figure out what's better and roll with that
+/**
+ * The object exported from `svelte.config.js`
+ */
+export type SvelteConfig = {
+  [key: string]: unknown;
+  preprocess?: PreprocessorGroup[] | PreprocessorGroup;
+  compilerOptions?: CompileOptions;
+};
+
+/**
+ * Options users can provide to `withSentryConfig` to customize what Sentry adds too the Svelte config
+ */
+export type SentrySvelteConfigOptions = {
+  componentTracking?: ComponentTrackingInitOptions;
+};
 
 export type SpanOptions = {
   /**
diff --git a/packages/svelte/test/config.test.ts b/packages/svelte/test/config.test.ts
index 89e5712110a7..b37e7883f4a0 100644
--- a/packages/svelte/test/config.test.ts
+++ b/packages/svelte/test/config.test.ts
@@ -1,6 +1,6 @@
-import { withSentryConfig, SvelteConfig, SentrySvelteConfigOptions } from '../src/config';
+import { withSentryConfig } from '../src/config';
 import { componentTrackingPreprocessor, FIRST_PASS_COMPONENT_TRACKING_PREPROC_ID } from '../src/preprocessors';
-import { SentryPreprocessorGroup } from '../src/types';
+import { SentryPreprocessorGroup, SentrySvelteConfigOptions, SvelteConfig } from '../src/types';
 
 describe('withSentryConfig', () => {
   it.each([
@@ -53,6 +53,7 @@ describe('withSentryConfig', () => {
       compilerOptions: {
         enableSourcemap: true,
       },
+      // eslint-disable-next-line deprecation/deprecation
       preprocess: componentTrackingPreprocessor(),
     };
 
diff --git a/packages/svelte/test/preprocessors.test.ts b/packages/svelte/test/preprocessors.test.ts
index afa100c63cac..79a1f1c9e416 100644
--- a/packages/svelte/test/preprocessors.test.ts
+++ b/packages/svelte/test/preprocessors.test.ts
@@ -1,3 +1,4 @@
+/* eslint-disable deprecation/deprecation */
 import { componentTrackingPreprocessor, defaultComponentTrackingOptions } from '../src/preprocessors';
 
 function expectComponentCodeToBeModified(

From f1f3c45d90207fa0848c6b016a77282dc6576b7e Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Wed, 12 Oct 2022 17:53:24 +0200
Subject: [PATCH 4/8] s/id/sentry_id

---
 packages/svelte/src/config.ts        | 3 ++-
 packages/svelte/src/preprocessors.ts | 2 +-
 packages/svelte/src/types.ts         | 2 +-
 packages/svelte/test/config.test.ts  | 3 +--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/svelte/src/config.ts b/packages/svelte/src/config.ts
index f6244db8c5a7..c71ee46fefa1 100644
--- a/packages/svelte/src/config.ts
+++ b/packages/svelte/src/config.ts
@@ -67,6 +67,7 @@ function dedupePreprocessors(
 ): PreprocessorGroup[] {
   return sentryPreprocessors.filter(
     sentryPreproc =>
-      originalPreprocessors.find(p => (p as SentryPreprocessorGroup).id === sentryPreproc.id) === undefined,
+      originalPreprocessors.find(p => (p as SentryPreprocessorGroup).sentry_id === sentryPreproc.sentry_id) ===
+      undefined,
   );
 }
diff --git a/packages/svelte/src/preprocessors.ts b/packages/svelte/src/preprocessors.ts
index 219b679c7d35..11947a49dfb0 100644
--- a/packages/svelte/src/preprocessors.ts
+++ b/packages/svelte/src/preprocessors.ts
@@ -56,7 +56,7 @@ export function componentTrackingPreprocessor(options?: ComponentTrackingInitOpt
 
   const sentryPreprocessor: SentryPreprocessorGroup = {
     ...preprocessor,
-    id: FIRST_PASS_COMPONENT_TRACKING_PREPROC_ID,
+    sentry_id: FIRST_PASS_COMPONENT_TRACKING_PREPROC_ID,
   };
 
   return sentryPreprocessor;
diff --git a/packages/svelte/src/types.ts b/packages/svelte/src/types.ts
index 40628d6b974b..de8293915064 100644
--- a/packages/svelte/src/types.ts
+++ b/packages/svelte/src/types.ts
@@ -4,7 +4,7 @@ import { PreprocessorGroup } from 'svelte/types/compiler/preprocess';
 // Adds an id property to the preprocessor object we can use to check for duplication
 // in the preprocessors array
 export interface SentryPreprocessorGroup extends PreprocessorGroup {
-  id?: string;
+  sentry_id?: string;
 }
 
 /**
diff --git a/packages/svelte/test/config.test.ts b/packages/svelte/test/config.test.ts
index b37e7883f4a0..fa08104b4338 100644
--- a/packages/svelte/test/config.test.ts
+++ b/packages/svelte/test/config.test.ts
@@ -32,7 +32,6 @@ describe('withSentryConfig', () => {
     ],
   ])('adds our preprocessors by default to the provided svelte config with %s', (_, originalConfig: SvelteConfig) => {
     const wrappedConfig = withSentryConfig(originalConfig);
-
     const originalPreprocs = originalConfig.preprocess;
     const originalNumberOfPreprocs = originalPreprocs
       ? Array.isArray(originalPreprocs)
@@ -43,7 +42,7 @@ describe('withSentryConfig', () => {
     expect(Array.isArray(wrappedConfig.preprocess)).toBe(true);
     expect(wrappedConfig).toEqual({ ...originalConfig, preprocess: expect.any(Array) });
     expect(wrappedConfig.preprocess).toHaveLength(originalNumberOfPreprocs + 1);
-    expect((wrappedConfig.preprocess as SentryPreprocessorGroup[])[0].id).toEqual(
+    expect((wrappedConfig.preprocess as SentryPreprocessorGroup[])[0].sentry_id).toEqual(
       FIRST_PASS_COMPONENT_TRACKING_PREPROC_ID,
     );
   });

From cd4a2533bb15cdad84dbce7041a187f80696cd56 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Wed, 12 Oct 2022 18:27:44 +0200
Subject: [PATCH 5/8] array -> map

---
 packages/svelte/src/config.ts | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/svelte/src/config.ts b/packages/svelte/src/config.ts
index c71ee46fefa1..d0f85afcefb0 100644
--- a/packages/svelte/src/config.ts
+++ b/packages/svelte/src/config.ts
@@ -25,18 +25,29 @@ export function withSentryConfig(
   };
 
   const originalPreprocessors = getOriginalPreprocessorArray(originalConfig);
-  const allSentryPreprocessors: SentryPreprocessorGroup[] = [];
+
+  // Map is insertion-order-preserving. It's important to add preprocessors
+  // to this map in the right order we want to see them being executed.
+  // see: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map
+  const sentryPreprocessors = new Map<string, SentryPreprocessorGroup>();
 
   const shouldTrackComponents = mergedOptions.componentTracking && mergedOptions.componentTracking.trackComponents;
   if (shouldTrackComponents) {
     // TODO(v8): Remove eslint rule
     // eslint-disable-next-line deprecation/deprecation
-    allSentryPreprocessors.push(componentTrackingPreprocessor(mergedOptions.componentTracking));
+    const firstPassPreproc: SentryPreprocessorGroup = componentTrackingPreprocessor(mergedOptions.componentTracking);
+    sentryPreprocessors.set(firstPassPreproc.sentry_id || '', firstPassPreproc);
   }
 
-  const dedupedSentryPreprocessors = dedupePreprocessors(allSentryPreprocessors, originalPreprocessors);
+  // We prioritize user-added preprocessors, so we don't insert sentry processors if they
+  // have already been added by users.
+  originalPreprocessors.forEach((p: SentryPreprocessorGroup) => {
+    if (p.sentry_id) {
+      sentryPreprocessors.delete(p.sentry_id);
+    }
+  });
 
-  const mergedPreprocessors = [...dedupedSentryPreprocessors, ...originalPreprocessors];
+  const mergedPreprocessors = [...sentryPreprocessors.values(), ...originalPreprocessors];
 
   return {
     ...originalConfig,
@@ -60,14 +71,3 @@ function getOriginalPreprocessorArray(originalConfig: SvelteConfig): Preprocesso
   }
   return [];
 }
-
-function dedupePreprocessors(
-  sentryPreprocessors: SentryPreprocessorGroup[],
-  originalPreprocessors: PreprocessorGroup[],
-): PreprocessorGroup[] {
-  return sentryPreprocessors.filter(
-    sentryPreproc =>
-      originalPreprocessors.find(p => (p as SentryPreprocessorGroup).sentry_id === sentryPreproc.sentry_id) ===
-      undefined,
-  );
-}

From d9689c38db407319ffb26eff0599fbe9e66e3848 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Wed, 12 Oct 2022 18:30:05 +0200
Subject: [PATCH 6/8] s/sentry_id/sentryId

---
 packages/svelte/src/config.ts        | 6 +++---
 packages/svelte/src/preprocessors.ts | 2 +-
 packages/svelte/src/types.ts         | 2 +-
 packages/svelte/test/config.test.ts  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/svelte/src/config.ts b/packages/svelte/src/config.ts
index d0f85afcefb0..03c6c0dc1f01 100644
--- a/packages/svelte/src/config.ts
+++ b/packages/svelte/src/config.ts
@@ -36,14 +36,14 @@ export function withSentryConfig(
     // TODO(v8): Remove eslint rule
     // eslint-disable-next-line deprecation/deprecation
     const firstPassPreproc: SentryPreprocessorGroup = componentTrackingPreprocessor(mergedOptions.componentTracking);
-    sentryPreprocessors.set(firstPassPreproc.sentry_id || '', firstPassPreproc);
+    sentryPreprocessors.set(firstPassPreproc.sentryId || '', firstPassPreproc);
   }
 
   // We prioritize user-added preprocessors, so we don't insert sentry processors if they
   // have already been added by users.
   originalPreprocessors.forEach((p: SentryPreprocessorGroup) => {
-    if (p.sentry_id) {
-      sentryPreprocessors.delete(p.sentry_id);
+    if (p.sentryId) {
+      sentryPreprocessors.delete(p.sentryId);
     }
   });
 
diff --git a/packages/svelte/src/preprocessors.ts b/packages/svelte/src/preprocessors.ts
index 11947a49dfb0..f97948eef868 100644
--- a/packages/svelte/src/preprocessors.ts
+++ b/packages/svelte/src/preprocessors.ts
@@ -56,7 +56,7 @@ export function componentTrackingPreprocessor(options?: ComponentTrackingInitOpt
 
   const sentryPreprocessor: SentryPreprocessorGroup = {
     ...preprocessor,
-    sentry_id: FIRST_PASS_COMPONENT_TRACKING_PREPROC_ID,
+    sentryId: FIRST_PASS_COMPONENT_TRACKING_PREPROC_ID,
   };
 
   return sentryPreprocessor;
diff --git a/packages/svelte/src/types.ts b/packages/svelte/src/types.ts
index de8293915064..e601b239667d 100644
--- a/packages/svelte/src/types.ts
+++ b/packages/svelte/src/types.ts
@@ -4,7 +4,7 @@ import { PreprocessorGroup } from 'svelte/types/compiler/preprocess';
 // Adds an id property to the preprocessor object we can use to check for duplication
 // in the preprocessors array
 export interface SentryPreprocessorGroup extends PreprocessorGroup {
-  sentry_id?: string;
+  sentryId?: string;
 }
 
 /**
diff --git a/packages/svelte/test/config.test.ts b/packages/svelte/test/config.test.ts
index fa08104b4338..7957570fa354 100644
--- a/packages/svelte/test/config.test.ts
+++ b/packages/svelte/test/config.test.ts
@@ -42,7 +42,7 @@ describe('withSentryConfig', () => {
     expect(Array.isArray(wrappedConfig.preprocess)).toBe(true);
     expect(wrappedConfig).toEqual({ ...originalConfig, preprocess: expect.any(Array) });
     expect(wrappedConfig.preprocess).toHaveLength(originalNumberOfPreprocs + 1);
-    expect((wrappedConfig.preprocess as SentryPreprocessorGroup[])[0].sentry_id).toEqual(
+    expect((wrappedConfig.preprocess as SentryPreprocessorGroup[])[0].sentryId).toEqual(
       FIRST_PASS_COMPONENT_TRACKING_PREPROC_ID,
     );
   });

From 1a7aa33e598166cab1a57ee770135633598a943d Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Wed, 12 Oct 2022 18:30:49 +0200
Subject: [PATCH 7/8] make dedupe test more explicit

---
 packages/svelte/test/config.test.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/svelte/test/config.test.ts b/packages/svelte/test/config.test.ts
index 7957570fa354..ecc063e6717a 100644
--- a/packages/svelte/test/config.test.ts
+++ b/packages/svelte/test/config.test.ts
@@ -48,18 +48,18 @@ describe('withSentryConfig', () => {
   });
 
   it("doesn't add Sentry preprocessors that were already added by the users", () => {
+    const sentryPreproc = componentTrackingPreprocessor();
     const originalConfig = {
       compilerOptions: {
         enableSourcemap: true,
       },
       // eslint-disable-next-line deprecation/deprecation
-      preprocess: componentTrackingPreprocessor(),
+      preprocess: sentryPreproc,
     };
 
     const wrappedConfig = withSentryConfig(originalConfig);
 
-    expect(wrappedConfig).toEqual({ ...originalConfig, preprocess: expect.any(Array) });
-    expect(wrappedConfig.preprocess).toHaveLength(1);
+    expect(wrappedConfig).toEqual({ ...originalConfig, preprocess: [sentryPreproc] });
   });
 
   it('handles multiple wraps correctly by only adding our preprocessors once', () => {

From 490c4137b2b1df4c19cd014a466377ce72fb51b5 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Wed, 12 Oct 2022 19:48:03 +0200
Subject: [PATCH 8/8] move eslint disable after test modification

---
 packages/svelte/test/config.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/svelte/test/config.test.ts b/packages/svelte/test/config.test.ts
index ecc063e6717a..db8a699b5ab7 100644
--- a/packages/svelte/test/config.test.ts
+++ b/packages/svelte/test/config.test.ts
@@ -48,12 +48,12 @@ describe('withSentryConfig', () => {
   });
 
   it("doesn't add Sentry preprocessors that were already added by the users", () => {
+    // eslint-disable-next-line deprecation/deprecation
     const sentryPreproc = componentTrackingPreprocessor();
     const originalConfig = {
       compilerOptions: {
         enableSourcemap: true,
       },
-      // eslint-disable-next-line deprecation/deprecation
       preprocess: sentryPreproc,
     };