Browse Source

Clean Clean Clean

sebastien 6 years ago
parent
commit
be4769407e
3 changed files with 23 additions and 31 deletions
  1. 9 0
      Tools/Gulp/gulpfile.js
  2. 0 16
      Tools/Gulp/tasks/gulpTasks-tsLint.js
  3. 14 15
      Tools/Gulp/tasks/gulpTasks-watch.js

+ 9 - 0
Tools/Gulp/gulpfile.js

@@ -14,6 +14,15 @@ require("./tasks/gulpTasks-typedoc");
 require("./tasks/gulpTasks-intellisense");
 require("./tasks/gulpTasks-intellisense");
 require("./tasks/gulpTasks-tests");
 require("./tasks/gulpTasks-tests");
 
 
+// Import Build Config
+var config = require("./config.json");
+
+/**
+ * Full TsLint.
+ * Back Compat Only, now included in typescript-libraries-tsLint.
+ */
+gulp.task("tsLint", gulp.series("typescript-libraries-tsLint"));
+
 /**
 /**
  * Build the releasable files.
  * Build the releasable files.
  * Back Compat Only, now name core as it is a lib
  * Back Compat Only, now name core as it is a lib

+ 0 - 16
Tools/Gulp/tasks/gulpTasks-tsLint.js

@@ -23,17 +23,6 @@ var config = require("../config.json");
 /*
 /*
  * TsLint all typescript files from the src directory.
  * TsLint all typescript files from the src directory.
  */
  */
-gulp.task("typescript-tsLint", function() {
-    const dtsFilter = filter(['**', '!**/*.d.ts', '!**/*.fragment.ts', '!**/*.vertex.ts', '!**/ShadersInclude/**'], { restore: false });
-    return gulp.src(config.typescript)
-        .pipe(dtsFilter)
-        .pipe(gulpTslint(tsLintConfig))
-        .pipe(gulpTslint.report());
-});
-
-/*
- * TsLint all typescript files from the src directory.
- */
 var tsLintExternalLibrary = function(library, settings, watch) {
 var tsLintExternalLibrary = function(library, settings, watch) {
     const fxFilter = filter(['**', '!**/*.fragment.ts', '!**/*.vertex.ts', '!**/ShadersInclude/**'], { restore: false });
     const fxFilter = filter(['**', '!**/*.fragment.ts', '!**/*.vertex.ts', '!**/ShadersInclude/**'], { restore: false });
     return gulp.src((settings.build.srcDirectory) + "/**/*.ts")
     return gulp.src((settings.build.srcDirectory) + "/**/*.ts")
@@ -67,8 +56,3 @@ gulp.task("typescript-libraries-tsLint",
         return module + "-tsLint";
         return module + "-tsLint";
     })
     })
 ));
 ));
-
-/**
- * Full TsLint.
- */
-gulp.task("tsLint", gulp.series("typescript-tsLint", "typescript-libraries-tsLint"));

+ 14 - 15
Tools/Gulp/tasks/gulpTasks-watch.js

@@ -8,23 +8,23 @@ var uncommentShaders = require('../helpers/gulp-removeShaderComments');
 // Read the full config.
 // Read the full config.
 var config = require("../config.json");
 var config = require("../config.json");
 
 
-/**
- * Watch ts files from typescript .
- * Hack into the cli :-)
- */
-gulp.task("srcTscWatch", function() {
-    // Reuse The TSC CLI from gulp to enable -w.
-    process.argv[2] = "-w";
-    process.argv[3] = "-p";
-    process.argv[4] = "../../src/tsconfig.json";
-    require("../../../node_modules/typescript/lib/tsc.js");
-    return Promise.resolve();
-});
+// Keep for reference for a bit might cccome back pretty soon.
+// /**
+//  * Watch ts files from typescript .
+//  * Hack into the cli :-)
+//  */
+// gulp.task("srcTscWatch", function() {
+//     // Reuse The TSC CLI from gulp to enable -w.
+//     process.argv[2] = "-w";
+//     process.argv[3] = "-p";
+//     process.argv[4] = "../../src/tsconfig.json";
+//     require("../../../node_modules/typescript/lib/tsc.js");
+//     return Promise.resolve();
+// });
 
 
 /**
 /**
  * Watch ts files and fire repective tasks.
  * Watch ts files and fire repective tasks.
  */
  */
-//gulp.task("watch", gulp.series("srcTscWatch", function startWatch() {
 gulp.task("watch", function startWatch() {
 gulp.task("watch", function startWatch() {
     var tasks = [];
     var tasks = [];
 
 
@@ -66,5 +66,4 @@ gulp.task("watch", function startWatch() {
     });
     });
 
 
     return Promise.resolve();
     return Promise.resolve();
-});
-//}));
+});