ref(tracing): Re-organize exports for node/browser (#7345)

Author: AbhiPrasad

packages/tracing/.eslintrc.js

@@ -2,7 +2,7 @@ module.exports = {
   extends: ['../../.eslintrc.js'],
   overrides: [
     {
-      files: ['src/integrations/node/**'],
+      files: ['src/node/**'],
       rules: {
         '@sentry-internal/sdk/no-optional-chaining': 'off',
       },

packages/tracing/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentry/tracing",
   "version": "7.41.0",
-  "description": "Extensions for Sentry AM",
+  "description": "Sentry Performance Monitoring Package",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tracing",
   "author": "Sentry",
@@ -12,6 +12,36 @@
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
   "types": "build/npm/types/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./build/npm/esm/index.js",
+      "require": "./build/npm/cjs/index.js",
+      "types": "./build/npm/types/index.d.ts"
+    },
+    "./node": {
+      "import": "./build/npm/esm/node/index.js",
+      "require": "./build/npm/cjs/node/index.js",
+      "types": "./build/npm/types/node/index.d.ts"
+    },
+    "./browser": {
+      "import": "./build/npm/esm/browser/index.js",
+      "require": "./build/npm/cjs/browser/index.js",
+      "types": "./build/npm/types/browser/index.d.ts"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      "*": [
+        "./build/npm/types/index.d.ts"
+      ],
+      "node": [
+        "./build/npm/types/node/index.d.ts"
+      ],
+      "browser": [
+        "./build/npm/types/browser/index.d.ts"
+      ]
+    }
+  },
   "publishConfig": {
     "access": "public"
   },

packages/tracing/rollup.npm.config.js

@@ -2,6 +2,7 @@ import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'
 
 export default makeNPMConfigVariants(
   makeBaseNPMConfig({
+    entrypoints: ['src/browser/index.ts', 'src/node/index.ts', 'src/index.ts'],
     // packages with bundles have a different build directory structure
     hasBundles: true,
   }),

packages/tracing/src/browser/index.ts

@@ -1,3 +1,5 @@
+export * from '../exports';
+
 export type { RequestInstrumentationOptions } from './request';
 
 export { BrowserTracing, BROWSER_TRACING_INTEGRATION_ID } from './browsertracing';

packages/tracing/src/exports/index.ts

@@ -0,0 +1,15 @@
+export {
+  extractTraceparentData,
+  getActiveTransaction,
+  hasTracingEnabled,
+  IdleTransaction,
+  Span,
+  // eslint-disable-next-line deprecation/deprecation
+  SpanStatus,
+  spanStatusfromHttpCode,
+  startIdleTransaction,
+  stripUrlQueryAndFragment,
+  TRACEPARENT_REGEXP,
+  Transaction,
+} from '@sentry/core';
+export type { SpanStatusType } from '@sentry/core';

packages/tracing/src/extensions.ts

@@ -15,25 +15,25 @@ function _autoloadDatabaseIntegrations(): void {
 
   const packageToIntegrationMapping: Record<string, () => Integration> = {
     mongodb() {
-      const integration = dynamicRequire(module, './integrations/node/mongo') as {
+      const integration = dynamicRequire(module, './node/integrations/mongo') as {
         Mongo: IntegrationClass<Integration>;
       };
       return new integration.Mongo();
     },
     mongoose() {
-      const integration = dynamicRequire(module, './integrations/node/mongo') as {
+      const integration = dynamicRequire(module, './node/integrations/mongo') as {
         Mongo: IntegrationClass<Integration>;
       };
       return new integration.Mongo({ mongoose: true });
     },
     mysql() {
-      const integration = dynamicRequire(module, './integrations/node/mysql') as {
+      const integration = dynamicRequire(module, './node/integrations/mysql') as {
         Mysql: IntegrationClass<Integration>;
       };
       return new integration.Mysql();
     },
     pg() {
-      const integration = dynamicRequire(module, './integrations/node/postgres') as {
+      const integration = dynamicRequire(module, './node/integrations/postgres') as {
         Postgres: IntegrationClass<Integration>;
       };
       return new integration.Postgres();

packages/tracing/src/index.ts

@@ -1,23 +1,7 @@
-export {
-  extractTraceparentData,
-  getActiveTransaction,
-  hasTracingEnabled,
-  IdleTransaction,
-  Span,
-  // eslint-disable-next-line deprecation/deprecation
-  SpanStatus,
-  spanStatusfromHttpCode,
-  startIdleTransaction,
-  stripUrlQueryAndFragment,
-  TRACEPARENT_REGEXP,
-  Transaction,
-} from '@sentry/core';
-export type { SpanStatusType } from '@sentry/core';
+export * from './exports';
 
 import { addExtensionMethods } from './extensions';
-import * as Integrations from './integrations';
-
-export type { RequestInstrumentationOptions } from './browser';
+import * as Integrations from './node/integrations';
 
 export { Integrations };
 
@@ -37,9 +21,14 @@ export { Integrations };
 // const instance = new BrowserTracing();
 //
 // For an example of of the new usage of BrowserTracing, see @sentry/nextjs index.client.ts
-export { BrowserTracing, BROWSER_TRACING_INTEGRATION_ID } from './browser';
+export {
+  BrowserTracing,
+  BROWSER_TRACING_INTEGRATION_ID,
+  instrumentOutgoingRequests,
+  defaultRequestInstrumentationOptions,
+} from './browser';
 
-export { instrumentOutgoingRequests, defaultRequestInstrumentationOptions } from './browser';
+export type { RequestInstrumentationOptions } from './browser';
 
 // Treeshakable guard to remove all code related to tracing
 declare const __SENTRY_TRACING__: boolean;

packages/tracing/src/integrations/index.ts

@@ -0,0 +1,3 @@
+export * from '../exports';
+
+export * from './integrations';