From 763d5c9c7b0f595e4bbe4c528ac76a6e1a7db7b8 Mon Sep 17 00:00:00 2001 From: Ivan Repin Date: Fri, 17 Aug 2018 15:16:02 +0200 Subject: [PATCH] fix build order for extra files --- Tools/Gulp/gulpfile.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Tools/Gulp/gulpfile.js b/Tools/Gulp/gulpfile.js index ba27123498c..292a6ad441a 100644 --- a/Tools/Gulp/gulpfile.js +++ b/Tools/Gulp/gulpfile.js @@ -230,14 +230,13 @@ gulp.task("buildWorker", gulp.series(gulp.parallel("workers", "shaders"), functi gulp.task("build", gulp.series("shaders", function build() { var filesToProcess = determineFilesToProcess("files"); var directFilesToProcess = determineFilesToProcess("directFiles"); - let merged = [gulp.src(filesToProcess). - pipe(expect.real({ errorOnFailure: true }, filesToProcess)), + let mergedStreams = merge2(gulp.src(filesToProcess) + .pipe(expect.real({ errorOnFailure: true }, filesToProcess)), shadersStream, - includeShadersStream]; + includeShadersStream); if (directFilesToProcess.length) { - merged.push(gulp.src(directFilesToProcess)); + mergedStreams.add(gulp.src(directFilesToProcess)); } - let mergedStreams = merge2(merged); return merge2( mergedStreams .pipe(concat(config.build.noModuleFilename))