fix merge

Author: chargome

packages/react-router/src/server/sdk.ts

@@ -8,18 +8,25 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OVERWRITE } from './instrumentation/util';
 import { reactRouterServerIntegration } from './integration/reactRouterServer';
 import { lowQualityTransactionsFilterIntegration } from './lowQualityTransactionsFilterIntegration';
 
-function getDefaultIntegrations(options: NodeOptions): Integration[] {
-  return [...getNodeDefaultIntegrations(options), lowQualityTransactionsFilterIntegration(options)];
+/**
+ * Returns the default integrations for the React Router SDK.
+ * @param options The options for the SDK.
+ */
+export function getDefaultReactRouterServerIntegrations(options: NodeOptions): Integration[] {
+  return [
+    ...getNodeDefaultIntegrations(options),
+    lowQualityTransactionsFilterIntegration(options),
+    reactRouterServerIntegration(),
+  ];
 }
 
 /**
  * Initializes the server side of the React Router SDK
  */
 export function init(options: NodeOptions): NodeClient | undefined {
   const opts: NodeOptions = {
-    defaultIntegrations: [...getDefaultReactRouterServerIntegrations(options)],
     ...options,
-    defaultIntegrations: getDefaultIntegrations(options),
+    defaultIntegrations: getDefaultReactRouterServerIntegrations(options),
   };
 
   DEBUG_BUILD && logger.log('Initializing SDK...');
@@ -58,11 +65,3 @@ export function init(options: NodeOptions): NodeClient | undefined {
 
   return client;
 }
-
-/**
- * Returns the default integrations for the React Router SDK.
- * @param options The options for the SDK.
- */
-export function getDefaultReactRouterServerIntegrations(options: NodeOptions): Integration[] {
-  return [...getDefaultIntegrations(options), reactRouterServerIntegration()];
-}