fix: Make utils package also esm (#1999)

Convert @sentry/utils package to expose esm builds

Author: HazAT

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 5.0.6
+
+- [utils]: Change how we use `utils` and expose `esm` build
+- [utils]: Remove `store` and `fs` classes -> moved to @sentry/electron where this is used
+
 ## 5.0.5
 
 - [esm]: `module` in `package.json` now provides a `es5` build instead of `es2015`

packages/browser/rollup.config.js

@@ -21,28 +21,30 @@ const terserInstance = terser({
   },
 });
 
+const paths = {
+  '@sentry/utils': ['../utils/src'],
+  '@sentry/core': ['../core/src'],
+  '@sentry/hub': ['../hub/src'],
+  '@sentry/types': ['../types/src'],
+  '@sentry/minimal': ['../minimal/src'],
+};
+
 const plugins = [
   typescript({
     tsconfig: 'tsconfig.build.json',
     tsconfigOverride: {
       compilerOptions: {
         declaration: false,
         module: 'ES2015',
-        paths: {
-          '@sentry/utils/*': ['../utils/src/*'],
-          '@sentry/core': ['../core/src'],
-          '@sentry/hub': ['../hub/src'],
-          '@sentry/types': ['../types/src'],
-          '@sentry/minimal': ['../minimal/src'],
-        },
+        paths,
       },
     },
     include: ['*.ts+(|x)', '**/*.ts+(|x)', '../**/*.ts+(|x)'],
   }),
   resolve({
-    browser: true,
-    module: false,
-    modulesOnly: true,
+    module: true,
+    browser: false,
+    modulesOnly: false,
   }),
   commonjs(),
 ];
@@ -97,13 +99,7 @@ export default [
           compilerOptions: {
             declaration: false,
             module: 'ES2015',
-            paths: {
-              '@sentry/utils/*': ['../utils/src/*'],
-              '@sentry/core': ['../core/src'],
-              '@sentry/hub': ['../hub/src'],
-              '@sentry/types': ['../types/src'],
-              '@sentry/minimal': ['../minimal/src'],
-            },
+            paths,
             target: 'es6',
           },
         },
@@ -125,13 +121,7 @@ export default [
           compilerOptions: {
             declaration: false,
             module: 'ES2015',
-            paths: {
-              '@sentry/utils/*': ['../utils/src/*'],
-              '@sentry/core': ['../core/src'],
-              '@sentry/hub': ['../hub/src'],
-              '@sentry/types': ['../types/src'],
-              '@sentry/minimal': ['../minimal/src'],
-            },
+            paths,
             target: 'es6',
           },
         },

packages/browser/src/backend.ts

@@ -1,9 +1,15 @@
 import { BaseBackend } from '@sentry/core';
 import { Event, EventHint, Options, Severity, Transport } from '@sentry/types';
-import { isDOMError, isDOMException, isError, isErrorEvent, isPlainObject } from '@sentry/utils/is';
-import { addExceptionTypeValue } from '@sentry/utils/misc';
-import { supportsFetch } from '@sentry/utils/supports';
-import { SyncPromise } from '@sentry/utils/syncpromise';
+import {
+  addExceptionTypeValue,
+  isDOMError,
+  isDOMException,
+  isError,
+  isErrorEvent,
+  isPlainObject,
+  supportsFetch,
+  SyncPromise,
+} from '@sentry/utils';
 
 import { eventFromPlainObject, eventFromStacktrace, prepareFramesForEvent } from './parsers';
 import { computeStackTrace } from './tracekit';

packages/browser/src/client.ts

@@ -1,8 +1,6 @@
 import { API, BaseClient, Scope } from '@sentry/core';
 import { DsnLike, Event, EventHint } from '@sentry/types';
-import { logger } from '@sentry/utils/logger';
-import { getGlobalObject } from '@sentry/utils/misc';
-import { SyncPromise } from '@sentry/utils/syncpromise';
+import { getGlobalObject, logger, SyncPromise } from '@sentry/utils';
 
 import { BrowserBackend, BrowserOptions } from './backend';
 import { SDK_NAME, SDK_VERSION } from './version';

packages/browser/src/index.ts

@@ -33,7 +33,7 @@ export { defaultIntegrations, forceLoad, init, lastEventId, onLoad, showReportDi
 export { SDK_NAME, SDK_VERSION } from './version';
 
 import { Integrations as CoreIntegrations } from '@sentry/core';
-import { getGlobalObject } from '@sentry/utils/misc';
+import { getGlobalObject } from '@sentry/utils';
 
 import * as BrowserIntegrations from './integrations';
 import * as Transports from './transports';

packages/browser/src/integrations/breadcrumbs.ts

@@ -1,11 +1,17 @@
 import { API, getCurrentHub } from '@sentry/core';
 import { Breadcrumb, BreadcrumbHint, Integration, Severity } from '@sentry/types';
-import { isString } from '@sentry/utils/is';
-import { logger } from '@sentry/utils/logger';
-import { getEventDescription, getGlobalObject, parseUrl } from '@sentry/utils/misc';
-import { fill, normalize } from '@sentry/utils/object';
-import { safeJoin } from '@sentry/utils/string';
-import { supportsHistory, supportsNativeFetch } from '@sentry/utils/supports';
+import {
+  fill,
+  getEventDescription,
+  getGlobalObject,
+  isString,
+  logger,
+  normalize,
+  parseUrl,
+  safeJoin,
+  supportsHistory,
+  supportsNativeFetch,
+} from '@sentry/utils';
 
 import { BrowserClient } from '../client';
 

packages/browser/src/integrations/globalhandlers.ts

@@ -1,9 +1,6 @@
 import { getCurrentHub } from '@sentry/core';
 import { Event, Integration } from '@sentry/types';
-import { logger } from '@sentry/utils/logger';
-import { addExceptionTypeValue } from '@sentry/utils/misc';
-import { normalize } from '@sentry/utils/object';
-import { truncate } from '@sentry/utils/string';
+import { addExceptionTypeValue, logger, normalize, truncate } from '@sentry/utils';
 
 import { eventFromStacktrace } from '../parsers';
 import {

packages/browser/src/integrations/helpers.ts

@@ -1,7 +1,6 @@
 import { captureException, getCurrentHub, withScope } from '@sentry/core';
 import { Event as SentryEvent, Mechanism, WrappedFunction } from '@sentry/types';
-import { addExceptionTypeValue, htmlTreeAsString } from '@sentry/utils/misc';
-import { normalize } from '@sentry/utils/object';
+import { addExceptionTypeValue, htmlTreeAsString, normalize } from '@sentry/utils';
 
 const debounceDuration: number = 1000;
 let keypressTimeout: number | undefined;
@@ -38,6 +37,7 @@ export function wrap(
   fn: WrappedFunction,
   options: {
     mechanism?: Mechanism;
+    capture?: boolean;
   } = {},
   before?: WrappedFunction,
 ): any {

packages/browser/src/integrations/trycatch.ts

@@ -1,6 +1,5 @@
 import { Integration, WrappedFunction } from '@sentry/types';
-import { getGlobalObject } from '@sentry/utils/misc';
-import { fill } from '@sentry/utils/object';
+import { fill, getGlobalObject } from '@sentry/utils';
 
 import { breadcrumbEventHandler, keypressEventHandler, wrap } from './helpers';
 

packages/browser/src/integrations/useragent.ts

@@ -1,6 +1,6 @@
 import { addGlobalEventProcessor, getCurrentHub } from '@sentry/core';
 import { Event, Integration } from '@sentry/types';
-import { getGlobalObject } from '@sentry/utils/misc';
+import { getGlobalObject } from '@sentry/utils';
 
 const global = getGlobalObject<Window>();