Skip to content

Commit fdac333

Browse files
committed
Removed es6 builds and fixed some issues with editors not picking up the default tsconfig
1 parent 29f4a8f commit fdac333

File tree

8 files changed

+38
-36
lines changed

8 files changed

+38
-36
lines changed

dist/exceptionless.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/exceptionless.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/integrations/angular.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,3 @@ angular.module('exceptionless', [])
9494
$ExceptionlessClient.config.queue.process();
9595
});
9696
}]);
97-
//# sourceMappingURL=angular.js.map

gulpfile.js

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ gulp.task('clean', function () {
1313
del.sync(['dist'], { force: true });
1414
});
1515

16-
gulp.task('typescript.es5', function() {
17-
return tsProject.src('src/tsconfig.es5.json').pipe(gulp.dest('dist/temp'));
16+
gulp.task('typescript', function() {
17+
return tsProject.src('src/tsconfig.json').pipe(gulp.dest('dist/temp'));
1818
});
1919

20-
gulp.task('typescript.es5.integrations', function() {
20+
gulp.task('typescript.integrations', ['typescript'], function() {
2121
return tsProject.src('src/integrations/tsconfig.json').pipe(gulp.dest('dist/temp'));
2222
});
2323

24-
gulp.task('typescript.node.es5', function() {
25-
return tsProject.src('src/tsconfig.node.es5.json').pipe(gulp.dest('dist/temp'));
24+
gulp.task('typescript.node', function() {
25+
return tsProject.src('src/tsconfig.node.json').pipe(gulp.dest('dist/temp'));
2626
});
2727

28-
gulp.task('exceptionless.es5.umd', ['typescript.es5', 'typescript.es5.integrations'], function() {
28+
gulp.task('exceptionless.umd', ['typescript', 'typescript.integrations'], function() {
2929
return gulp.src('dist/temp/src/exceptionless.js')
3030
.pipe(sourcemaps.init({ loadMaps: true }))
3131
.pipe(umd({
@@ -38,7 +38,7 @@ gulp.task('exceptionless.es5.umd', ['typescript.es5', 'typescript.es5.integratio
3838
.pipe(gulp.dest('dist/temp'));
3939
});
4040

41-
gulp.task('exceptionless.es5', ['exceptionless.es5.umd'], function() {
41+
gulp.task('exceptionless', ['exceptionless.umd'], function() {
4242
gulp.src('dist/temp/src/exceptionless.d.ts')
4343
.pipe(gulp.dest('dist'));
4444

@@ -70,39 +70,19 @@ gulp.task('exceptionless.es5', ['exceptionless.es5.umd'], function() {
7070
.pipe(gulp.dest('dist'))
7171
});
7272

73-
gulp.task('exceptionless.node.es5', ['typescript.node.es5'], function() {
73+
gulp.task('exceptionless.node', ['typescript.node'], function() {
7474
gulp.src('dist/temp/src/exceptionless.node.js')
7575
.pipe(sourcemaps.init({ loadMaps: true }))
7676
.pipe(replace('exceptionless-js/1.0.0.0', 'exceptionless-js/' + package.version))
7777
.pipe(sourcemaps.write('.'))
7878
.pipe(gulp.dest('dist'));
7979
});
8080

81-
gulp.task('typescript.es6', function() {
82-
return tsProject.src('src/tsconfig.es6.json').pipe(gulp.dest('dist/temp'));
83-
});
84-
85-
gulp.task('exceptionless.es6', ['typescript.es6'], function() {
86-
gulp.src('dist/temp/src/exceptionless.es6.d.ts').pipe(gulp.dest('dist'));
87-
88-
var files = [
89-
'node_modules/tracekit/tracekit.js',
90-
'dist/temp/src/exceptionless.es6.js'
91-
];
92-
93-
gulp.src(files)
94-
.pipe(sourcemaps.init({ loadMaps: true }))
95-
.pipe(concat('exceptionless.es6.js'))
96-
.pipe(replace('exceptionless-js/1.0.0.0', 'exceptionless-js/' + package.version))
97-
.pipe(sourcemaps.write('.'))
98-
.pipe(gulp.dest('dist'));
99-
});
100-
10181
gulp.task('watch', ['build'], function() {
10282
gulp.watch('*.ts', ['build']);
10383
});
10484

105-
gulp.task('build', ['clean', 'exceptionless.es5', 'exceptionless.node.es5']);
85+
gulp.task('build', ['clean', 'exceptionless', 'exceptionless.node']);
10686

10787
gulp.task('typescript.test', function() {
10888
return tsProject.src('src/tsconfig.test.json').pipe(gulp.dest('dist/temp'));

src/exceptionless.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,5 @@ if (typeof $ !== 'undefined' && $(document)) {
103103
}
104104

105105
(<any>Error).stackTraceLimit = Infinity;
106+
106107
declare var $;

src/integrations/angular.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// Update once ts issue is fixed: https://github.com/Microsoft/TypeScript/issues/2192
2+
//import * as exceptionless from '../../dist/exceptionless'
3+
declare var exceptionless;
4+
15
angular.module('exceptionless', [])
26
.constant('$ExceptionlessClient', exceptionless.ExceptionlessClient.default)
37
.factory('exceptionlessHttpInterceptor', ['$q', '$ExceptionlessClient', function ($q, $ExceptionlessClient) {
@@ -102,5 +106,3 @@ angular.module('exceptionless', [])
102106
$ExceptionlessClient.config.queue.process();
103107
});
104108
}]);
105-
106-
declare var exceptionless;

src/tsconfig.es6.json renamed to src/tsconfig.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
{
22
"compilerOptions": {
33
"declaration": true,
4+
"module": "commonjs",
45
"removeComments": true,
56
"sourceMap": true,
6-
"target": "es6"
7+
"target": "es5"
78
},
89
"bundles": {
9-
"exceptionless.es6": {
10+
"exceptionless": {
1011
"files": [
1112
"typings/tracekit/tracekit.d.ts",
1213

src/tsconfig.node.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"compilerOptions": {
3+
"declaration": true,
4+
"module": "commonjs",
5+
"removeComments": true,
6+
"sourceMap": true,
7+
"target": "es5"
8+
},
9+
"bundles": {
10+
"exceptionless.node": {
11+
"files": [
12+
"typings/node/node.d.ts",
13+
"typings/stack-trace/stack-trace.d.ts",
14+
15+
"exceptionless.node.ts"
16+
]
17+
}
18+
}
19+
}

0 commit comments

Comments
 (0)