Skip to content

Commit 6ce0741

Browse files
committed
build(js): fix select.js build order
Resolves issue where templates were occasionally prepended to select.js causing problems when attempting to use the file (eg. when running unit tests). Switches from es-merge to streamqueue for combining select.js source streams.
1 parent aee241f commit 6ce0741

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

gulpfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var fs = require('fs');
22
var del = require('del');
33
var gulp = require('gulp');
4-
var es = require('event-stream');
4+
var streamqueue = require('streamqueue');
55
var karma = require('karma').server;
66
var $ = require('gulp-load-plugins')();
77
var runSequence = require('run-sequence');
@@ -56,7 +56,7 @@ gulp.task('scripts', ['clean'], function() {
5656
.pipe($.jshint.reporter('fail'));
5757
};
5858

59-
return es.merge(buildLib(), buildTemplates())
59+
return streamqueue({objectMode: true }, buildLib(), buildTemplates())
6060
.pipe($.plumber({
6161
errorHandler: handleError
6262
}))

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
"gulp": "^3.9.1",
2020
"gulp-angular-templatecache": "^1.8.0",
2121
"gulp-bump": "^1.0.0",
22-
"gulp-conventional-changelog": "^0.7.0",
2322
"gulp-concat": "^2.6.0",
23+
"gulp-conventional-changelog": "^0.7.0",
2424
"gulp-filenames": "^2.0.0",
25+
"gulp-footer": "^1.0.5",
2526
"gulp-git": "^1.4.0",
2627
"gulp-header": "^1.7.1",
27-
"gulp-footer": "^1.0.5",
2828
"gulp-jshint": "^2.0.0",
2929
"gulp-load-plugins": "^1.1.0",
3030
"gulp-minify-css": "^1.2.4",
@@ -40,12 +40,13 @@
4040
"jshint-stylish": "~0.3.0",
4141
"karma": "^0.12.16",
4242
"karma-chrome-launcher": "^0.1.3",
43+
"karma-coverage": "~0.2",
4344
"karma-firefox-launcher": "~0.1",
4445
"karma-jasmine": "~0.2",
4546
"karma-ng-html2js-preprocessor": "^0.1.0",
4647
"karma-phantomjs-launcher": "~0.1.4",
47-
"karma-coverage": "~0.2",
4848
"run-sequence": "^1.1.5",
49+
"streamqueue": "^1.1.1",
4950
"title-case": "^1.1.2"
5051
},
5152
"scripts": {

0 commit comments

Comments
 (0)