Merge pull request #5344 from sebavan/FixGulpMac

Fix gulp mac

Tools/Gulp/config.json

@@ -1474,8 +1474,7 @@
         }
     },
     "typescript": [
-        "../../src/**/*.ts",
-        "!../../src/**/*.d.ts"
+        "../../src/**/*.ts"
     ],
     "workers": [
         {

Tools/Gulp/gulpfile.js

@@ -32,6 +32,7 @@ const through = require('through2');
 var karmaServer = require('karma').Server;
 var gulpTslint = require("gulp-tslint");
 var tslint = require("tslint");
+const filter = require('gulp-filter');
 
 //viewer declaration
 var processDeclaration = require('./processViewerDeclaration');
@@ -272,7 +273,9 @@ gulp.task("build", gulp.series("shaders", function build() {
 * TsLint all typescript files from the src directory.
 */
 gulp.task("typescript-tsLint", function() {
+    const dtsFilter = filter(['**', '!**/*.d.ts'], {restore: false});
     return gulp.src(config.typescript)
+        .pipe(dtsFilter)
         .pipe(gulpTslint({
             formatter: "stylish",
             configuration: "../../tslint.json",
@@ -344,7 +347,9 @@ gulp.task("tsLint", gulp.series("typescript-tsLint", "typescript-libraries-tsLin
 * Compiles all typescript files and creating a js and a declaration file.
 */
 gulp.task("typescript-compile", function() {
+    const dtsFilter = filter(['**', '!**/*.d.ts'], {restore: false});
     var tsResult = gulp.src(config.typescript)
+        .pipe(dtsFilter)
         .pipe(sourcemaps.init())
         .pipe(tsProject({
             summarizeFailureOutput: true
@@ -879,7 +884,9 @@ gulp.task("netlify-cleanup", function() {
 
 // this is needed for the modules for the declaration files.
 gulp.task("modules-compile", function() {
+    const dtsFilter = filter(['**', '!**/*.d.ts'], {restore: false});
     var tsResult = gulp.src(config.typescript)
+        .pipe(dtsFilter)
         .pipe(sourcemaps.init())
         .pipe(tsProject());
 

Tools/Gulp/package.json

@@ -19,6 +19,7 @@
         "gulp-content-to-variable": "^0.1.0",
         "gulp-debug": "^4.0.0",
         "gulp-expect-file": "^1.0.0",
+        "gulp-filter": "^5.1.0",
         "gulp-optimize-js": "^1.1.0",
         "gulp-rename": "^1.4.0",
         "gulp-replace": "~1.0.0",