Merge master

Author: srijken

dist/exceptionless.d.ts

@@ -209,20 +209,20 @@ export declare class Configuration implements IConfigurationSettings {
     settings: Object;
     storage: IStorageProvider;
     queue: IEventQueue;
+    private _apiKey;
+    private _serverUrl;
+    private _heartbeatServerUrl;
+    private _updateSettingsWhenIdleInterval;
+    private _dataExclusions;
+    private _userAgentBotPatterns;
     private _plugins;
     private _handlers;
     constructor(configSettings?: IConfigurationSettings);
-    private _apiKey;
     apiKey: string;
     isValid: boolean;
-    private _serverUrl;
     serverUrl: string;
-    private _heartbeatServerUrl;
     heartbeatServerUrl: string;
-    private _updateSettingsWhenIdleInterval;
     updateSettingsWhenIdleInterval: number;
-    private _dataExclusions;
-    private _userAgentBotPatterns;
     dataExclusions: string[];
     addDataExclusions(...exclusions: string[]): void;
     userAgentBotPatterns: string[];
@@ -427,12 +427,12 @@ export declare class SubmissionMethodPlugin implements IEventPlugin {
 export declare class DuplicateCheckerPlugin implements IEventPlugin {
     priority: number;
     name: string;
+    private _mergedEvents;
     private _processedHashcodes;
     private _getCurrentTime;
+    private _interval;
     constructor(getCurrentTime?: () => number, interval?: number);
     run(context: EventPluginContext, next?: () => void): void;
-    private onInterval();
-    private enqueueMergedEvents();
 }
 export declare class EventExclusionPlugin implements IEventPlugin {
     priority: number;

dist/exceptionless.js

@@ -1,3 +1,4 @@
+var fs = require("fs");
 var pkg = require('./package.json');
 var gulp = require('gulp');
 var replace = require('gulp-replace');
@@ -28,10 +29,10 @@ gulp.task('exceptionless.umd', ['typescript', 'typescript.integrations'], functi
     .pipe(umd({
       exports: 'exports',
       globalName: 'exceptionless',
-      namespace: 'exceptionless'
+      namespace: 'exceptionless',
+      deps: ['TraceKit'],
+      template: fs.readFileSync('./umd.template.jst', 'utf8')
     }))
-    .pipe(replace("define(factory);", "define('exceptionless', factory);"))
-    .pipe(replace('}(this, function(require, exports, module) {', '}(this, function(require, exports, module) {\nif (!require) {\n\trequire = function(name) {\n\t\treturn (typeof window !== "undefined" ? window : global)[name];\n\t}\n}\nif (!exports) {\n\tvar exports = {};\n}'))
     .pipe(sourcemaps.write('.'))
     .pipe(gulp.dest('dist/temp'));
 });
@@ -91,8 +92,8 @@ gulp.task('watch', ['build'], function () {
 gulp.task('lint', function () {
   var tslint = require('gulp-tslint');
   return gulp.src(['src/**/*.ts', '!src/typings/**/*.ts'])
-    .pipe(tslint())
-    .pipe(tslint.report('verbose'));
+    .pipe(tslint({ formatter: 'verbose' }))
+    .pipe(tslint.report());
 });
 
 gulp.task('build', ['clean', 'lint', 'exceptionless', 'exceptionless.node']);

dist/exceptionless.js.map

@@ -28,26 +28,26 @@
   },
   "devDependencies": {
     "chai": "3.5.0",
-    "del": "2.2.0",
-    "es5-shim": "4.5.8",
-    "es6-shim": "0.35.0",
+    "del": "2.2.1",
+    "es5-shim": "4.5.9",
+    "es6-shim": "0.35.1",
     "gulp": "3.9.1",
     "gulp-concat": "2.6.0",
     "gulp-exec": "2.1.2",
     "gulp-mocha": "2.2.0",
     "gulp-replace": "0.5.4",
     "gulp-sourcemaps": "1.6.0",
-    "gulp-tslint": "5.0.0",
-    "gulp-uglify": "1.5.3",
+    "gulp-tslint": "6.0.1",
+    "gulp-uglify": "1.5.4",
     "gulp-wrap-umd": "0.2.1",
-    "rimraf": "2.5.2",
-    "source-map-support": "0.4.0",
-    "mock-fs": "3.9.0",
+    "rimraf": "2.5.3",
+    "source-map-support": "0.4.2",
+    "mock-fs": "3.11.0",
     "tracekit": "0.4.3",
-    "tslint": "3.8.1",
+    "tslint": "3.13.0",
     "tsproject": "1.2.1",
     "typescript": "1.8.10",
-    "typescript-formatter": "2.1.0"
+    "typescript-formatter": "2.2.1"
   },
   "dependencies": {
     "stack-trace": "0.0.9"