updated build

Author: niemyjski

gulpfile.js

@@ -1,7 +1,6 @@
 var gulp = require('gulp');
 var concat = require('gulp-concat');
 var karma = require('gulp-karma');
-var merge2 = require('merge2');
 var rename = require('gulp-rename');
 var rimraf = require('rimraf');
 var sourcemaps = require('gulp-sourcemaps');
@@ -13,34 +12,30 @@ gulp.task('clean', function (cb) {
   rimraf('./dist', cb);
 });
 
-gulp.task('scripts', function() {
-  function fixFilePath(files){
-    for (var index = 0; index < files.length; index++) {
-      files[index] = 'src/' + files[index];
-    }
-
-    return files;
-  }
+gulp.task('typescript', function() {
+  tsProject.src('./src').pipe(gulp.dest('./dist'));
+});
 
+gulp.task('scripts', ['typescript'], function() {
   var files = [
     'node_modules/es6-promise/dist/es6-promise.js',
     'node_modules/stackframe/dist/stackframe.js',
     'node_modules/error-stack-parser/dist/error-stack-parser.js',
     'node_modules/stack-generator/dist/stack-generator.js',
     'node_modules/stacktrace-gps/dist/stacktrace-gps.js',
-    'node_modules/stacktrace-js/dist/stacktrace.js'
+    'node_modules/stacktrace-js/dist/stacktrace.js',
+    'dist/exceptionless.js'
   ];
 
   // TODO: Look into using https://www.npmjs.com/package/gulp-wrap-umd
-  var tsResult = tsProject.src('./src');
-  return merge2(gulp.src(files), tsResult)
+  return gulp.src(files)
     .pipe(sourcemaps.init())
     .pipe(concat('exceptionless.js'))
     .pipe(gulp.dest('dist'))
     .pipe(rename('exceptionless.min.js'))
     .pipe(uglify())
     .pipe(sourcemaps.write('.'))
-    .pipe(gulp.dest('dist'));
+    .pipe(gulp.dest('./dist'));
 });
 
 gulp.task('watch', ['scripts'], function() {

package.json

@@ -37,7 +37,6 @@
     "karma-cli": "0.0.4",
     "karma-jasmine": "~0.3.5",
     "karma-typescript-preprocessor": "0.0.16",
-    "merge2": "^0.3.5",
     "rimraf": "^2.3.2",
     "stack-generator": "^1.0.3",
     "stackframe": "^0.2.2",

src/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "declaration": true,
     "module": "amd",
     "out": "../../dist/exceptionless.js",
     "removeComments": true,