copied fixes from PR in DefenitivelyTyped

typescript/raven-tests.ts

@@ -1,28 +1,24 @@
-import Raven = require('..');
-
-Raven.config('https://public@sentry.io/1').install();
-
-var options = {
- logger: 'my-logger',
- ignoreUrls: [
- /graph\.facebook\.com/i,
- 'graph.facebook.com'
- ],
- ignoreErrors: [
- /fb_xd_fragment/,
- 'fb_xd_fragment'
- ],
- includePaths: [
- /https?:\/\/(www\.)?getsentry\.com/,
- 'https://www.sentry.io'
- ],
- whitelistUrls: [
- /https?:\/\/google\.com/,
- 'https://www.google.com'
- ]
-};
-
-Raven.config('https://public@sentry.io/1', options).install();
+import RavenJS from 'raven-js';
+
+RavenJS.config('https://public@getsentry.com/1').install();
+
+
+RavenJS.config(
+ 'https://public@getsentry.com/1', 
+ {
+ logger: 'my-logger',
+ ignoreUrls: [
+ /graph\.facebook\.com/i
+ ],
+ ignoreErrors: [
+ 'fb_xd_fragment'
+ ],
+ includePaths: [
+ /https?:\/\/(www\.)?getsentry\.com/,
+ /https?:\/\/d3nslu0hdya83q\.cloudfront\.net/
+ ]
+ }
+).install();
 
 var throwsError = () => {
  throw new Error('broken');
@@ -31,40 +27,35 @@ var throwsError = () => {
 try {
  throwsError();
 } catch(e) {
- Raven.captureException(e);
- Raven.captureException(e, {tags: { key: "value" }});
+ RavenJS.captureException(e);
+ RavenJS.captureException(e, {tags: { key: "value" }});
 }
 
-Raven.context(throwsError);
-Raven.context({tags: { key: "value" }}, throwsError);
+RavenJS.context(throwsError);
+RavenJS.context({tags: { key: "value" }}, throwsError);
+RavenJS.context({extra: {planet: {name: 'Earth'}}}, throwsError);
 
-setTimeout(Raven.wrap(throwsError), 1000);
-Raven.wrap({logger: "my.module"}, throwsError)();
+setTimeout(RavenJS.wrap(throwsError), 1000);
+RavenJS.wrap({logger: "my.module"}, throwsError)();
+RavenJS.wrap({tags: {git_commit: 'c0deb10c4'}}, throwsError)();
 
-Raven.setUserContext({
+RavenJS.setUserContext({
  email: 'matt@example.com',
  id: '123'
 });
 
-Raven.setExtraContext({foo: 'bar'});
-Raven.setTagsContext({env: 'prod'});
-Raven.clearContext();
-var obj:Object = Raven.getContext();
-var err:Error = Raven.lastException();
+RavenJS.captureMessage('Broken!');
+RavenJS.captureMessage('Broken!', {tags: { key: "value" }});
 
-Raven.captureMessage('Broken!');
-Raven.captureMessage('Broken!', {tags: { key: "value" }});
-+Raven.captureMessage('Broken!', { stacktrace: true });
-Raven.captureBreadcrumb({});
-
-Raven.setRelease('abc123');
-Raven.setEnvironment('production');
+RavenJS.showReportDialog({
+ eventId: 0815,
+ dsn:'1337asdf',
+ user: {
+ name: 'DefenitelyTyped',
+ email: 'df@ts.ms'
+ }
+});
 
-Raven.setDataCallback(function (data: any) {});
-Raven.setDataCallback(function (data: any, original: any) {});
-Raven.setShouldSendCallback(function (data: any) {});
-Raven.setShouldSendCallback(function (data: any, original: any) {});
+RavenJS.setTagsContext({ key: "value" });
 
-Raven.showReportDialog({
- eventId: 'abcdef123456'
-});
+RavenJS.setExtraContext({ foo: "bar" });

typescript/raven.d.ts

@@ -1,11 +1,7 @@
-// Type definitions for Raven.js
+// Type definitions for Raven.js
 // Project: https://github.com/getsentry/raven-js
-// Original Definitions by: Santi Albo <https://github.com/santialbo>, Benjamin Pannell 
-// <http://github.com/spartan563>; DefinitelyTyped
-// Updated by: Ben Vinegar <https://github.com/benvinegar>, Ilya Pirogov 
-// <https://github.com/ilya-pirogov>, Eli White <https://github.com/TheSavior>, David Cramer
-// <https://github.com/dcramer>, Connor Peet <https://github.com/connor4312>, comaz 
-// <https://github.com/combmag>, Luca Vazzano <https://github.com/LucaVazz>
+// Definitions by: Santi Albo <https://github.com/santialbo/>, Benjamin Pannell <http://github.com/spartan563>, Gary Blackwood <http://github.com/Garee>, Rich Rout <http://github.com/richrout>, Ben Vinegar <https://github.com/benvinegar>, Ilya Pirogov <https://github.com/ilya-pirogov>, Eli White <https://github.com/TheSavior>, David Cramer <https://github.com/dcramer>, Connor Peet <https://github.com/connor4312>, comaz <https://github.com/combmag>, Luca Vazzano <https://github.com/LucaVazz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
 declare let Raven: RavenStatic;
@@ -200,7 +196,7 @@ interface RavenStatic {
 
 
 // --- Helper Interfaces for Options --------------
-interface RavenBreadcrumOptions {
+export interface RavenBreadcrumOptions {
  /** Whether to collect XHR calls, defaults to true */
  xhr?: boolean;
 
@@ -214,7 +210,7 @@ interface RavenBreadcrumOptions {
  location?: boolean;
 }
 
-interface CommonRavenOptions {
+export interface CommonRavenOptions {
  /** The environment of the application you are monitoring with Sentry */
  environment?: string;
 
@@ -234,7 +230,7 @@ interface CommonRavenOptions {
  stacktrace?: boolean;
 }
 
-interface RavenOptions extends CommonRavenOptions {
+export interface RavenOptions extends CommonRavenOptions {
  /** The name of the server or device that the client is running on */
  server_name?: string;
 
@@ -253,7 +249,7 @@ interface RavenOptions extends CommonRavenOptions {
  platform?: string;
 }
 
-interface RavenGlobalOptions extends CommonRavenOptions {
+export interface RavenGlobalOptions extends CommonRavenOptions {
  /** The name of the server or device that the client is running on */
  serverName?: string;
 
@@ -294,12 +290,12 @@ interface RavenGlobalOptions extends CommonRavenOptions {
  dataCallback?: (data: any) => any;
 }
 
-interface RavenWrapOptions extends RavenOptions {
+export interface RavenWrapOptions extends RavenOptions {
  /** Whether to run the wrap recursively. Default: false. */
  deep?: boolean;
 }
 
-interface RavenTransportOptions {
+export interface RavenTransportOptions {
  url: string;
  data: any;
  auth: {
@@ -311,7 +307,7 @@ interface RavenTransportOptions {
  onFailure: () => void;
 }
 
-interface RavenReportDialogOptions {
+export interface RavenReportDialogOptions {
  eventId?: number,
  dsn?: string,
  user?: {
@@ -322,19 +318,19 @@ interface RavenReportDialogOptions {
 
 
 // --- Helper Interfaces for complex Data Structures --------------
-interface RavenPlugin {
+export interface RavenPlugin {
  (raven: RavenStatic, ...args: any[]): RavenStatic;
 }
 
-interface RavenUserContext {
+export interface RavenUserContext {
  id?: string;
  username?: string;
  email?: string;
  ip_address?: string;
  extra?: { [prop: string]: any };
 }
 
-interface RavenBreadcrumb {
+export interface RavenBreadcrumb {
  message: string;
  data: { [id: string]: string };
  category: string;