simplify logic

Author: lobsterkatie

packages/nextjs/src/index.client.ts

@@ -57,17 +57,13 @@ export function init(options: NextjsOptions): void {
   });
 }
 
-function createClientIntegrations(userIntegrations?: UserIntegrations): UserIntegrations {
+function createClientIntegrations(userIntegrations: UserIntegrations = []): UserIntegrations {
   const defaultBrowserTracingIntegration = new BrowserTracing({
     tracingOrigins: [...defaultRequestInstrumentationOptions.tracingOrigins, /^(api\/)/],
     routingInstrumentation: nextRouterInstrumentation,
   });
 
-  if (userIntegrations) {
-    return addOrUpdateIntegration(defaultBrowserTracingIntegration, userIntegrations, {
-      BrowserTracing: { keyPath: 'options.routingInstrumentation', value: nextRouterInstrumentation },
-    });
-  } else {
-    return [defaultBrowserTracingIntegration];
-  }
+  return addOrUpdateIntegration(defaultBrowserTracingIntegration, userIntegrations, {
+    'options.routingInstrumentation': nextRouterInstrumentation,
+  });
 }

packages/nextjs/src/index.server.ts

@@ -93,6 +93,8 @@ function sdkAlreadyInitialized(): boolean {
 }
 
 function addServerIntegrations(options: NextjsOptions): void {
+  let integrations = options.integrations || [];
+
   // This value is injected at build time, based on the output directory specified in the build config. Though a default
   // is set there, we set it here as well, just in case something has gone wrong with the injection.
   const distDirName = (global as GlobalWithDistDir).__rewriteFramesDistDir__ || '.next';
@@ -107,19 +109,16 @@ function addServerIntegrations(options: NextjsOptions): void {
       return frame;
     },
   });
-
-  if (options.integrations) {
-    options.integrations = addOrUpdateIntegration(defaultRewriteFramesIntegration, options.integrations);
-  } else {
-    options.integrations = [defaultRewriteFramesIntegration];
-  }
+  integrations = addOrUpdateIntegration(defaultRewriteFramesIntegration, integrations);
 
   if (hasTracingEnabled(options)) {
     const defaultHttpTracingIntegration = new Integrations.Http({ tracing: true });
-    options.integrations = addOrUpdateIntegration(defaultHttpTracingIntegration, options.integrations, {
-      Http: { keyPath: '_tracing', value: true },
+    integrations = addOrUpdateIntegration(defaultHttpTracingIntegration, integrations, {
+      _tracing: true,
     });
   }
+
+  options.integrations = integrations;
 }
 
 export type { SentryWebpackPluginOptions } from './config/types';

packages/nextjs/src/utils/userIntegrations.ts

@@ -4,12 +4,7 @@ export type UserIntegrationsFunction = (integrations: Integration[]) => Integrat
 export type UserIntegrations = Integration[] | UserIntegrationsFunction;
 
 type ForcedIntegrationOptions = {
-  [integrationName: string]:
-    | {
-        keyPath: string;
-        value: unknown;
-      }
-    | undefined;
+  [keyPath: string]: unknown;
 };
 
 /**
@@ -30,7 +25,8 @@ function setNestedKey(obj: Record<string, any>, keyPath: string, value: unknown)
     obj[keyPath] = value;
   } else {
     // `match[1]` is the initial segment of the path, and `match[2]` is the remainder of the path
-    setNestedKey(obj[match[1]], match[2], value);
+    const innerObj = obj[match[1]];
+    setNestedKey(innerObj, match[2], value);
   }
 }
 
@@ -52,34 +48,26 @@ export function addOrUpdateIntegration(
   userIntegrations: UserIntegrations,
   forcedOptions: ForcedIntegrationOptions = {},
 ): UserIntegrations {
-  if (Array.isArray(userIntegrations)) {
-    return addOrUpdateIntegrationInArray(defaultIntegrationInstance, userIntegrations, forcedOptions);
-  } else {
-    return addOrUpdateIntegrationInFunction(defaultIntegrationInstance, userIntegrations, forcedOptions);
-  }
+  return Array.isArray(userIntegrations)
+    ? addOrUpdateIntegrationInArray(defaultIntegrationInstance, userIntegrations, forcedOptions)
+    : addOrUpdateIntegrationInFunction(defaultIntegrationInstance, userIntegrations, forcedOptions);
 }
 
 function addOrUpdateIntegrationInArray(
   defaultIntegrationInstance: Integration,
   userIntegrations: Integration[],
   forcedOptions: ForcedIntegrationOptions,
 ): Integration[] {
-  let includesName = false;
-  // eslint-disable-next-line @typescript-eslint/prefer-for-of
-  for (let x = 0; x < userIntegrations.length; x++) {
-    if (userIntegrations[x].name === defaultIntegrationInstance.name) {
-      includesName = true;
-    }
+  const userInstance = userIntegrations.find(integration => integration.name === defaultIntegrationInstance.name);
 
-    const optionToSet = forcedOptions[userIntegrations[x].name];
-    if (optionToSet) {
-      setNestedKey(userIntegrations[x], optionToSet.keyPath, optionToSet.value);
+  if (userInstance) {
+    for (const [keyPath, value] of Object.entries(forcedOptions)) {
+      setNestedKey(userInstance, keyPath, value);
     }
-  }
 
-  if (includesName) {
     return userIntegrations;
   }
+
   return [...userIntegrations, defaultIntegrationInstance];
 }