Fix import structure

Author: Luca Forstner

packages/core/src/index.ts

@@ -56,6 +56,7 @@ export { hasTracingEnabled } from './utils/hasTracingEnabled';
 export { isSentryRequestUrl } from './utils/isSentryRequestUrl';
 export { DEFAULT_ENVIRONMENT } from './constants';
 export { ModuleMetadata } from './integrations/metadata';
+export { RequestData } from './integrations/requestdata';
 import * as Integrations from './integrations';
 
 export { Integrations };

packages/core/src/integrations/requestdata.ts

@@ -1,11 +1,6 @@
-// TODO (v8 or v9): Whenever this becomes a default integration for `@sentry/browser`, move this to `@sentry/core`. For
-// now, we leave it in `@sentry/integrations` so that it doesn't contribute bytes to our CDN bundles.
-
 import type { Event, EventProcessor, Hub, Integration, PolymorphicRequest, Transaction } from '@sentry/types';
-import { extractPathForTransaction } from '@sentry/utils';
-
-import type { AddRequestDataToEventOptions, TransactionNamingScheme } from '../../../node/src/requestdata';
-import { addRequestDataToEvent } from '../../../node/src/requestdata';
+import type { AddRequestDataToEventOptions, TransactionNamingScheme } from '@sentry/utils';
+import { addRequestDataToEvent, extractPathForTransaction } from '@sentry/utils';
 
 export type RequestDataIntegrationOptions = {
   /**
@@ -59,7 +54,7 @@ export class RequestData implements Integration {
   /**
    * @inheritDoc
    */
-  public name: string = RequestData.id;
+  public name: string;
 
   /**
    * Function for adding request data to event. Defaults to `addRequestDataToEvent` from `@sentry/node` for now, but
@@ -74,6 +69,7 @@ export class RequestData implements Integration {
    * @inheritDoc
    */
   public constructor(options: RequestDataIntegrationOptions = {}) {
+    this.name = RequestData.id;
     this._addRequestData = addRequestDataToEvent;
     this._options = {
       ...DEFAULT_OPTIONS,

packages/node/src/handlers.ts

@@ -15,6 +15,7 @@ import {
   addRequestDataToTransaction,
   dropUndefinedKeys,
   extractPathForTransaction,
+  extractRequestData,
   isString,
   isThenable,
   logger,
@@ -24,7 +25,6 @@ import {
 import type * as http from 'http';
 
 import type { NodeClient } from './client';
-import { extractRequestData } from './requestdata';
 // TODO (v8 / XXX) Remove this import
 import type { ParseRequestOptions } from './requestDataDeprecated';
 import { isAutoSessionTrackingEnabled } from './sdk';

packages/node/src/index.ts

@@ -18,9 +18,8 @@ export type {
   Transaction,
   User,
 } from '@sentry/types';
-export type { AddRequestDataToEventOptions } from '@sentry/utils';
+export type { AddRequestDataToEventOptions, TransactionNamingScheme } from '@sentry/utils';
 
-export type { TransactionNamingScheme } from './requestdata';
 export type { NodeOptions } from './types';
 
 export {
@@ -72,7 +71,7 @@ export { autoDiscoverNodePerformanceMonitoringIntegrations } from './tracing';
 export { NodeClient } from './client';
 export { makeNodeTransport } from './transports';
 export { defaultIntegrations, init, defaultStackParser, getSentryRelease } from './sdk';
-export { addRequestDataToEvent, DEFAULT_USER_INCLUDES, extractRequestData } from './requestdata';
+export { addRequestDataToEvent, DEFAULT_USER_INCLUDES, extractRequestData } from '@sentry/utils';
 export { deepReadDirSync } from './utils';
 export { getModuleFromFilename } from './module';
 export { enableAnrDetection } from './anr';

packages/node/src/integrations/index.ts

@@ -5,6 +5,6 @@ export { OnUnhandledRejection } from './onunhandledrejection';
 export { Modules } from './modules';
 export { ContextLines } from './contextlines';
 export { Context } from './context';
-export { RequestData } from './requestdata';
+export { RequestData } from '@sentry/core';
 export { LocalVariables } from './localvariables';
 export { Undici } from './undici';

packages/node/src/requestDataDeprecated.ts

@@ -7,9 +7,8 @@
 /* eslint-disable deprecation/deprecation */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type { Event, ExtractedNodeRequestData, PolymorphicRequest } from '@sentry/types';
-
-import type { AddRequestDataToEventOptions } from './requestdata';
-import { addRequestDataToEvent, extractRequestData as _extractRequestData } from './requestdata';
+import type { AddRequestDataToEventOptions } from '@sentry/utils';
+import { addRequestDataToEvent, extractRequestData as _extractRequestData } from '@sentry/utils';
 
 /**
  * @deprecated `Handlers.ExpressRequest` is deprecated and will be removed in v8. Use `PolymorphicRequest` instead.

packages/utils/src/requestdata.ts

@@ -18,7 +18,7 @@ const DEFAULT_INCLUDES = {
   user: true,
 };
 const DEFAULT_REQUEST_INCLUDES = ['cookies', 'data', 'headers', 'method', 'query_string', 'url'];
-const DEFAULT_USER_INCLUDES = ['id', 'username', 'email'];
+export const DEFAULT_USER_INCLUDES = ['id', 'username', 'email'];
 
 type InjectedNodeDeps = {
   cookie: {