Move @sentry/hub code to @sentry/core

Author: timfish

packages/browser/test/unit/sdk.test.ts

@@ -21,8 +21,8 @@ function getDefaultBrowserOptions(options: Partial<BrowserOptions> = {}): Browse
   };
 }
 
-jest.mock('@sentry/hub', () => {
-  const original = jest.requireActual('@sentry/hub');
+jest.mock('@sentry/core', () => {
+  const original = jest.requireActual('@sentry/core');
   return {
     ...original,
     getCurrentHub(): {

packages/core/package.json

@@ -16,7 +16,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/hub": "7.13.0",
     "@sentry/types": "7.13.0",
     "@sentry/utils": "7.13.0",
     "tslib": "^1.9.3"

packages/core/src/baseclient.ts

@@ -1,5 +1,4 @@
 /* eslint-disable max-lines */
-import { Scope, updateSession } from '@sentry/hub';
 import {
   Client,
   ClientOptions,
@@ -40,6 +39,8 @@ import {
 import { getEnvelopeEndpointWithUrlEncodedAuth } from './api';
 import { createEventEnvelope, createSessionEnvelope } from './envelope';
 import { IntegrationIndex, setupIntegrations } from './integration';
+import { Scope } from './scope';
+import { updateSession } from './session';
 
 const ALREADY_SEEN_ERROR = "Not capturing exception because it's already been captured.";
 

packages/hub/src/exports.ts renamed to packages/core/src/exports.ts

@@ -1,4 +1,5 @@
 export type { ClientClass } from './sdk';
+export type { Carrier, Layer } from './hub';
 
 export {
   addBreadcrumb,
@@ -14,13 +15,11 @@ export {
   setTags,
   setUser,
   withScope,
-  addGlobalEventProcessor,
-  getCurrentHub,
-  getHubFromCarrier,
-  Hub,
-  makeMain,
-  Scope,
-} from '@sentry/hub';
+} from './exports';
+export { getCurrentHub, getHubFromCarrier, Hub, makeMain, getMainCarrier, setHubOnCarrier } from './hub';
+export { makeSession, closeSession, updateSession } from './session';
+export { SessionFlusher } from './sessionflusher';
+export { addGlobalEventProcessor, Scope } from './scope';
 export { getEnvelopeEndpointWithUrlEncodedAuth, getReportDialogEndpoint } from './api';
 export { BaseClient } from './baseclient';
 export { initAndBind } from './sdk';

packages/hub/src/hub.ts renamed to packages/core/src/hub.ts

@@ -1,7 +1,9 @@
-import { addGlobalEventProcessor, getCurrentHub } from '@sentry/hub';
 import { Integration, Options } from '@sentry/types';
 import { arrayify, logger } from '@sentry/utils';
 
+import { getCurrentHub } from './hub';
+import { addGlobalEventProcessor } from './scope';
+
 declare module '@sentry/types' {
   interface Integration {
     isDefaultInstance?: boolean;

packages/core/src/index.ts

@@ -1,7 +1,8 @@
-import { getCurrentHub } from '@sentry/hub';
 import { Client, ClientOptions } from '@sentry/types';
 import { logger } from '@sentry/utils';
 
+import { getCurrentHub } from './hub';
+
 /** A class object that can instantiate Client objects. */
 export type ClientClass<F extends Client, O extends ClientOptions> = new (options: O) => F;