.gitignore

@@ -4,6 +4,7 @@ node_modules/
 # build and test
 build/
 packages/*/dist/
+/packages/*/esm
 coverage/
 scratch/
 *.pyc
@@ -27,3 +28,6 @@ lerna-debug.log
 
 docs
 lint-results.json
+
+# legacy
+!/packages/raven-js/dist

.travis.yml

@@ -17,7 +17,7 @@ cache:
   directories:
     - node_modules
 
-matrix:
+jobs:
   include:
     - name: '@sentry/packages - build + lint + test + codecov + danger [node v8]'
       node_js: '8'
@@ -38,6 +38,7 @@ matrix:
         firefox: latest
       script: scripts/browser-integration.sh
     - name: '@sentry/browser - saucelabs tests'
+      if: fork = false
       node_js: '8'
       addons:
         sauce_connect: true

.vscode/extensions.json

@@ -1,5 +1,5 @@
 {
   // See http://go.microsoft.com/fwlink/?LinkId=827846
   // for the documentation about the extensions.json format
-  "recommendations": ["esbenp.prettier-vscode", "eg2.tslint", "stkb.rewrap"]
+  "recommendations": ["esbenp.prettier-vscode", "ms-vscode.vscode-typescript-tslint-plugin"]
 }

CHANGELOG.md

@@ -2,6 +2,23 @@
 
 ## Unreleased
 
+## 4.5.0
+
+- [core] feat: Deprecate `captureEvent`, prefer `sendEvent` for transports. `sendEvent` now takes a string (body)
+  instead of `Event` object.
+- [core] feat: Use correct buffer for requests in transports
+- [core] feat: (beta) provide esm build
+- [core] ref: Change way how transports are initialized
+- [core] ref: Rename `RequestBuffer` to `PromiseBuffer`, also introduce limit
+- [core] ref: Make sure that captureMessage input is a primitive
+- [core] fix: Check if value is error object in extraErrorData integration
+- [browser] fix: Prevent empty exception values
+- [browser] fix: Permission denied to access property name
+- [node] feat: Add file cache for providing pre/post context in frames
+- [node] feat: New option `frameContextLines`, if set to `0` we do not provide source code pre/post context, default is
+  `7` lines pre/post
+- [utils] fix: Use custom serializer inside `serialize` method to prevent circular references
+
 ## 4.4.2
 
 - [node] Port memory-leak tests from raven-node
@@ -68,9 +85,9 @@
 
 ## 4.2.1
 
-- [core]: Invert logger logic the explicitly enable it.
-- [hub]: Require `domain` in `getCurrentHub` in try/catch - Fixed #1670
-- [hub]: Removed exposed getter on the Scope.
+- [core] Invert logger logic the explicitly enable it.
+- [hub] Require `domain` in `getCurrentHub` in try/catch - Fixed #1670
+- [hub] Removed exposed getter on the Scope.
 
 ## 4.2.0
 

README.md

@@ -72,6 +72,17 @@ init({
 captureMessage('Hello, world!');
 ```
 
+If you want sentry to be customized for the browsers you want to support use the `esm` build:
+```javascript
+import { init, captureMessage } from '@sentry/browser/esm';
+```
+
+and add it to your babel/... build, if you want to support older browsers
+
+> TIP: You can use [`<script type="module" str="newbrowser.js">` + 
+  `<script nomodule src="oldbrowser.js">`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script#Module_Fallback)
+  to provide builds for newer and older browsers
+
 ## Other Packages
 
 Besides the high-level SDKs, this repository contains shared packages, helpers and configuration used for SDK

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "3.4.0",
-  "version": "4.4.2",
+  "version": "4.5.0",
   "packages": "packages/*",
   "ignore": "raven-*",
   "npmClient": "yarn",

package.json

@@ -2,6 +2,8 @@
   "private": true,
   "scripts": {
     "build": "lerna run --stream --concurrency 1 --sort build",
+    "build:es5": "lerna run --stream --concurrency 1 --sort build:es5",
+    "build:esm": "lerna run --stream --concurrency 1 --sort build:esm",
     "build:watch": "lerna run build:watch --stream --no-sort --concurrency 9999",
     "clean": "lerna run --stream clean",
     "fix": "lerna run --stream --concurrency 1 fix",
@@ -39,14 +41,14 @@
     "npm-run-all": "^4.1.2",
     "prettier": "^1.14.0",
     "prettier-check": "^2.0.0",
-    "replace-in-file": "^3.4.0",
+    "replace-in-file": "^3.4.2",
     "rimraf": "^2.6.2",
     "sinon": "^7.1.1",
     "ts-jest": "^23.10.5",
     "tslint": "^5.11.0",
-    "tslint-language-service": "^0.9.9",
     "typedoc": "^0.13.0",
     "typedoc-plugin-monorepo": "^0.1.0",
-    "typescript": "^3.0.1"
+    "typescript": "^3.2.0",
+    "typescript-tslint-plugin": "^0.2.1"
   }
 }

packages/browser/.npmignore

@@ -1,3 +1,4 @@
 *
 !/dist/**/*
 !/build/**/*
+!/esm/**/*

packages/browser/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@sentry/browser",
-  "version": "4.4.2",
+  "version": "4.5.0",
   "description": "Offical Sentry SDK for browsers",
-  "repository": "git://github.com/getsentry/raven-js.git",
-  "homepage": "https://github.com/getsentry/raven-js/tree/master/packages/browser",
+  "repository": "git://github.com/getsentry/sentry-javascript.git",
+  "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
   "author": "Sentry",
   "license": "BSD-3-Clause",
   "engines": {
@@ -15,9 +15,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "4.4.2",
-    "@sentry/types": "4.4.2",
-    "@sentry/utils": "4.4.2",
+    "@sentry/core": "4.5.0",
+    "@sentry/types": "4.5.0",
+    "@sentry/utils": "4.5.0",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
@@ -48,11 +48,15 @@
     "rollup-plugin-uglify": "^3.0.0",
     "sinon": "^5.0.3",
     "tslint": "^5.11.0",
-    "typescript": "^3.0.1",
+    "typescript": "^3.2.0",
     "webpack": "^4.26.0"
   },
   "scripts": {
-    "build": "rollup --config",
+    "build": "run-p build:esm build:es5",
+    "build:es5": "rollup --config",
+    "build:esm": "run-s build:esm:transpile build:esm:rewrite",
+    "build:esm:transpile": "tsc -p tsconfig.esm.json",
+    "build:esm:rewrite": "node ../../scripts/esm-rewrite.js",
     "build:watch": "rollup --config --watch",
     "clean": "rimraf dist coverage .rpt2_cache build",
     "lint": "run-s lint:prettier lint:tslint",
@@ -71,5 +75,6 @@
     "size:check": "cat build/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print $1,\"kB\";}'",
     "version": "node ../../scripts/versionbump.js src/version.ts"
   },
-  "gitHead": "a91da22f8bd3bddb38fab7f868326e376da82d4d"
+  "gitHead": "a91da22f8bd3bddb38fab7f868326e376da82d4d",
+  "sideEffects": false
 }

packages/browser/src/backend.ts

@@ -1,9 +1,8 @@
 import { BaseBackend, Options, SentryError } from '@sentry/core';
-import { SentryEvent, SentryEventHint, SentryResponse, Severity, Status } from '@sentry/types';
+import { SentryEvent, SentryEventHint, Severity, Transport } from '@sentry/types';
 import { isDOMError, isDOMException, isError, isErrorEvent, isPlainObject } from '@sentry/utils/is';
-import { logger } from '@sentry/utils/logger';
 import { supportsBeacon, supportsFetch } from '@sentry/utils/supports';
-import { eventFromPlainObject, eventFromStacktrace, prepareFramesForEvent } from './parsers';
+import { addExceptionTypeValue, eventFromPlainObject, eventFromStacktrace, prepareFramesForEvent } from './parsers';
 import { computeStackTrace } from './tracekit';
 import { BeaconTransport, FetchTransport, XHRTransport } from './transports';
 
@@ -46,6 +45,27 @@ export class BrowserBackend extends BaseBackend<BrowserOptions> {
     return true;
   }
 
+  /**
+   * @inheritdoc
+   */
+  protected setupTransport(): Transport {
+    if (!this.options.dsn) {
+      // We return the noop transport here in case there is no Dsn.
+      return super.setupTransport();
+    }
+
+    const transportOptions = this.options.transportOptions ? this.options.transportOptions : { dsn: this.options.dsn };
+
+    if (this.options.transport) {
+      return new this.options.transport(transportOptions);
+    } else if (supportsBeacon()) {
+      return new BeaconTransport(transportOptions);
+    } else if (supportsFetch()) {
+      return new FetchTransport(transportOptions);
+    }
+    return new XHRTransport(transportOptions);
+  }
+
   /**
    * @inheritDoc
    */
@@ -67,6 +87,7 @@ export class BrowserBackend extends BaseBackend<BrowserOptions> {
       const message = ex.message ? `${name}: ${ex.message}` : name;
 
       event = await this.eventFromMessage(message, undefined, hint);
+      addExceptionTypeValue(event, message);
     } else if (isError(exception as Error)) {
       // we have a real Error object, do nothing
       event = eventFromStacktrace(computeStackTrace(exception as Error));
@@ -76,6 +97,7 @@ export class BrowserBackend extends BaseBackend<BrowserOptions> {
       // which is much better than creating new group when any key/value change
       const ex = exception as {};
       event = eventFromPlainObject(ex, hint.syntheticException);
+      addExceptionTypeValue(event, 'Custom Object');
     } else {
       // If none of previous checks were valid, then it means that
       // it's not a DOMError/DOMException
@@ -85,6 +107,7 @@ export class BrowserBackend extends BaseBackend<BrowserOptions> {
       // So bail out and capture it as a simple message:
       const ex = exception as string;
       event = await this.eventFromMessage(ex, undefined, hint);
+      addExceptionTypeValue(event, `${ex}`);
     }
 
     event = {
@@ -126,33 +149,4 @@ export class BrowserBackend extends BaseBackend<BrowserOptions> {
 
     return event;
   }
-
-  /**
-   * @inheritDoc
-   */
-  public async sendEvent(event: SentryEvent): Promise<SentryResponse> {
-    if (!this.options.dsn) {
-      logger.warn(`Event has been skipped because no Dsn is configured.`);
-      // We do nothing in case there is no DSN
-      return { status: Status.Skipped, reason: `Event has been skipped because no Dsn is configured.` };
-    }
-
-    if (!this.transport) {
-      const transportOptions = this.options.transportOptions
-        ? this.options.transportOptions
-        : { dsn: this.options.dsn };
-
-      if (this.options.transport) {
-        this.transport = new this.options.transport({ dsn: this.options.dsn });
-      } else if (supportsBeacon()) {
-        this.transport = new BeaconTransport(transportOptions);
-      } else if (supportsFetch()) {
-        this.transport = new FetchTransport(transportOptions);
-      } else {
-        this.transport = new XHRTransport(transportOptions);
-      }
-    }
-
-    return this.transport.captureEvent(event);
-  }
 }

packages/browser/src/integrations/trycatch.ts

@@ -24,7 +24,7 @@ export class TryCatch implements Integration {
       const originalCallback = args[0];
       args[0] = wrap(originalCallback, {
         mechanism: {
-          data: { function: original.name || '<anonymous>' },
+          data: { function: getFunctionName(original) },
           handled: true,
           type: 'instrument',
         },
@@ -41,7 +41,7 @@ export class TryCatch implements Integration {
           mechanism: {
             data: {
               function: 'requestAnimationFrame',
-              handler: (original && original.name) || '<anonymous>',
+              handler: getFunctionName(original),
             },
             handled: true,
             type: 'instrument',
@@ -74,7 +74,7 @@ export class TryCatch implements Integration {
             mechanism: {
               data: {
                 function: 'handleEvent',
-                handler: (fn && ((fn as any) as SentryWrappedFunction).name) || '<anonymous>',
+                handler: getFunctionName(fn),
                 target,
               },
               handled: true,
@@ -129,7 +129,7 @@ export class TryCatch implements Integration {
               mechanism: {
                 data: {
                   function: 'addEventListener',
-                  handler: (fn && ((fn as any) as SentryWrappedFunction).name) || '<anonymous>',
+                  handler: getFunctionName(fn),
                   target,
                 },
                 handled: true,
@@ -209,3 +209,16 @@ export class TryCatch implements Integration {
     ].forEach(this.wrapEventTarget.bind(this));
   }
 }
+
+/**
+ * Safely extract function name from itself
+ */
+function getFunctionName(fn: any): string {
+  try {
+    return (fn && fn.name) || '<anonymous>';
+  } catch (e) {
+    // Just accessing custom props in some Selenium environments
+    // can cause a "Permission denied" exception (see raven-js#495).
+    return '<anonymous>';
+  }
+}

packages/browser/src/parsers.ts

@@ -92,3 +92,16 @@ export function prepareFramesForEvent(stack: TraceKitStackFrame[]): StackFrame[]
     .slice(0, STACKTRACE_LIMIT)
     .reverse();
 }
+
+/**
+ * Adds exception values, type and value to an synthetic Exception.
+ * @param event The event to modify.
+ * @param message Message to be added.
+ */
+export function addExceptionTypeValue(event: SentryEvent, message: string): void {
+  event.exception = event.exception || {};
+  event.exception.values = event.exception.values || [];
+  event.exception.values[0] = event.exception.values[0] || {};
+  event.exception.values[0].value = event.exception.values[0].value || message;
+  event.exception.values[0].type = event.exception.values[0].type || 'Error';
+}

packages/browser/src/transports/base.ts

@@ -1,5 +1,5 @@
-import { API, SentryError } from '@sentry/core';
-import { SentryEvent, SentryResponse, Transport, TransportOptions } from '@sentry/types';
+import { API, PromiseBuffer, SentryError } from '@sentry/core';
+import { SentryResponse, Transport, TransportOptions } from '@sentry/types';
 
 /** Base Transport class implementation */
 export abstract class BaseTransport implements Transport {
@@ -8,14 +8,24 @@ export abstract class BaseTransport implements Transport {
    */
   public url: string;
 
+  /** A simple buffer holding all requests. */
+  protected readonly buffer: PromiseBuffer<SentryResponse> = new PromiseBuffer(30);
+
   public constructor(public options: TransportOptions) {
     this.url = new API(this.options.dsn).getStoreEndpointWithUrlEncodedAuth();
   }
 
   /**
    * @inheritDoc
    */
-  public async captureEvent(_: SentryEvent): Promise<SentryResponse> {
-    throw new SentryError('Transport Class has to implement `captureEvent` method');
+  public async sendEvent(_: string): Promise<SentryResponse> {
+    throw new SentryError('Transport Class has to implement `sendEvent` method');
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public async close(timeout?: number): Promise<boolean> {
+    return this.buffer.drain(timeout);
   }
 }