Updating gulp

Now using an npm plugin to convert files to inline strings.

Tools/Gulp/gulp-srcToVariable.js

@@ -1,77 +0,0 @@
-var through = require('through2');
-var gutil = require('gulp-util');
-var PluginError = gutil.PluginError;
-var path = require('path');
-var File = gutil.File;
-
-// Consts
-const PLUGIN_NAME = 'gulp-srcToVariable';
-
-var srcToVariable = function srcToVariable(varName, asMap, namingCallback) {
-    
-    var content;
-    var firstFile;
-    
-    namingCallback = namingCallback || function(filename) { return filename; };
-    
-    function bufferContents(file, enc, cb) {
-    // ignore empty files
-    if (file.isNull()) {
-      cb();
-      return;
-    }
-
-    // no stream support, only files.
-    if (file.isStream()) {
-      this.emit('error', new PluginError('gulp-concat',  'Streaming not supported'));
-      cb();
-      return;
-    }
-
-    // set first file if not already set
-    if (!firstFile) {
-      firstFile = file;
-    }
-
-    // construct concat instance
-    if (!content) {
-      content = asMap ? {} : "";
-    }
-    // add file to concat instance
-    if(asMap) {
-        var name = namingCallback(file.relative);
-        
-        content[name] = file.contents.toString();
-    } else {
-        content += file.contents.toString();
-    }
-    cb();
-  }
-
-  function endStream(cb) {
-    if (!firstFile || !content) {
-      cb();
-      return;
-    }
-
-    
-    var joinedPath = path.join(firstFile.base, varName);
-
-    var joinedFile = new File({
-      cwd: firstFile.cwd,
-      base: firstFile.base,
-      path: joinedPath,
-      contents: new Buffer(varName + '=' + JSON.stringify(content) + ';')
-    });
-    
-    this.push(joinedFile);
-    
-    
-    cb();
-  }
-
-  return through.obj(bufferContents, endStream);
-    
-}
-
-module.exports = srcToVariable;

Tools/Gulp/gulpfile.js

@@ -2,7 +2,7 @@ var gulp = require("gulp");
 var uglify = require("gulp-uglify");
 var typescript = require("gulp-typescript");
 var sourcemaps = require("gulp-sourcemaps");
-var srcToVariable = require("./gulp-srcToVariable");
+var srcToVariable = require("gulp-content-to-variable");
 var addModuleExports = require("./gulp-addModuleExports");
 var merge2 = require("merge2");
 var concat = require("gulp-concat");
@@ -22,20 +22,24 @@ var extendsSearchRegex = /var\s__extends[\s\S]+?\};/g;
 //function to convert the shaders' filenames to variable names.
 function shadersName(filename) {
     return filename.replace('.fragment', 'Pixel')
-      .replace('.vertex', 'Vertex')
-      .replace('.fx', 'Shader');
+        .replace('.vertex', 'Vertex')
+        .replace('.fx', 'Shader');
 }
 
-gulp.task("shaders", function(cb) {
-    shadersStream = config.shadersDirectories.map(function(shadersDef) {
-        return gulp.src(shadersDef.files).pipe(srcToVariable(shadersDef.variable, true, shadersName));
+gulp.task("shaders", function (cb) {
+    shadersStream = config.shadersDirectories.map(function (shadersDef) {
+        return gulp.src(shadersDef.files).pipe(srcToVariable({
+            variableName: shadersDef.variable, asMap: true, namingCallback: shadersName
+        }));
     });
     cb();
 });
 
-gulp.task("workers", function(cb) {
-    workersStream = config.workers.map(function(workerDef) {
-        return gulp.src(workerDef.files).pipe(uglify()).pipe(srcToVariable(workerDef.variable));
+gulp.task("workers", function (cb) {
+    workersStream = config.workers.map(function (workerDef) {
+        return gulp.src(workerDef.files).pipe(uglify()).pipe(srcToVariable({
+            variableName: workerDef.variable
+        }));
     });
     cb();
 });
@@ -43,14 +47,14 @@ gulp.task("workers", function(cb) {
 /*
 Compiles all typescript files and creating a declaration file.
 */
-gulp.task('typescript-compile', function() {  
-  var tsResult = gulp.src(config.core.typescript)
-                .pipe(typescript({ 
-                    noExternalResolve: true, 
-                    target: 'ES5', 
-                    declarationFiles: true,
-                    typescript: require('typescript')
-                }));
+gulp.task('typescript-compile', function () {
+    var tsResult = gulp.src(config.core.typescript)
+        .pipe(typescript({
+            noExternalResolve: true,
+            target: 'ES5',
+            declarationFiles: true,
+            typescript: require('typescript')
+        }));
     return merge2([
         tsResult.dts
             .pipe(concat(config.build.declarationFilename))
@@ -60,24 +64,24 @@ gulp.task('typescript-compile', function() {
     ]);
 });
 
-gulp.task('typescript-sourcemaps', function() {
+gulp.task('typescript-sourcemaps', function () {
     var tsResult = gulp.src(config.core.typescript)
-                .pipe(sourcemaps.init()) // sourcemaps init. currently redundant directory def, waiting for this - https://github.com/floridoo/gulp-sourcemaps/issues/111
-                .pipe(typescript({ 
-                    noExternalResolve: true, 
-                    target: 'ES5', 
-                    declarationFiles: true,
-                    typescript: require('typescript')
-                }));
+        .pipe(sourcemaps.init()) // sourcemaps init. currently redundant directory def, waiting for this - https://github.com/floridoo/gulp-sourcemaps/issues/111
+        .pipe(typescript({
+            noExternalResolve: true,
+            target: 'ES5',
+            declarationFiles: true,
+            typescript: require('typescript')
+        }));
     return tsResult.js
-            .pipe(sourcemaps.write("./")) // sourcemaps are written.
-            .pipe(gulp.dest(config.build.srcOutputDirectory));
+        .pipe(sourcemaps.write("./")) // sourcemaps are written.
+        .pipe(gulp.dest(config.build.srcOutputDirectory));
 });
 
 gulp.task("buildCore", ["shaders"], function () {
     return merge2(
-            gulp.src(config.core.files),
-            shadersStream
+        gulp.src(config.core.files),
+        shadersStream
         )
         .pipe(concat(config.build.minCoreFilename))
         .pipe(cleants())
@@ -89,9 +93,9 @@ gulp.task("buildCore", ["shaders"], function () {
 
 gulp.task("buildNoWorker", ["shaders"], function () {
     return merge2(
-            gulp.src(config.core.files),
-            gulp.src(config.extras.files),
-            shadersStream
+        gulp.src(config.core.files),
+        gulp.src(config.extras.files),
+        shadersStream
         )
         .pipe(concat(config.build.minNoWorkerFilename))
         .pipe(cleants())
@@ -103,10 +107,10 @@ gulp.task("buildNoWorker", ["shaders"], function () {
 
 gulp.task("build", ["workers", "shaders"], function () {
     return merge2(
-            gulp.src(config.core.files),
-            gulp.src(config.extras.files),
-            shadersStream,
-            workersStream
+        gulp.src(config.core.files),
+        gulp.src(config.extras.files),
+        shadersStream,
+        workersStream
         )
         .pipe(concat(config.build.filename))
         .pipe(cleants())
@@ -118,27 +122,27 @@ gulp.task("build", ["workers", "shaders"], function () {
         .pipe(gulp.dest(config.build.outputDirectory));
 });
 
-gulp.task("typescript", function(cb) {
+gulp.task("typescript", function (cb) {
     runSequence("typescript-compile", "default");
 });
 
 /**
  * The default task, call the tasks: build
  */
-gulp.task('default', function() {
+gulp.task('default', function () {
     return runSequence("buildNoWorker", "build", "buildCore");
 });
 
 /**
  * Watch task, will call the default task if a js file is updated.
  */
-gulp.task('watch', function() {
-  gulp.watch(config.core.typescript, ['build']);
+gulp.task('watch', function () {
+    gulp.watch(config.core.typescript, ['build']);
 });
 
 /**
  * Watch typescript task, will call the default typescript task if a typescript file is updated.
  */
-gulp.task('watch-typescript', function() {
-  gulp.watch(config.core.typescript, ["typescript-compile", "build"]);
+gulp.task('watch-typescript', function () {
+    gulp.watch(config.core.typescript, ["typescript-compile", "build"]);
 });

Tools/Gulp/package.json

@@ -20,6 +20,7 @@
     "gulp-clean-ts-extends": "~0.1.1",
     "gulp-changed": "~1.2.1",
     "run-sequence": "~1.1.0",
-    "gulp-replace": "~0.5.3"
+    "gulp-replace": "~0.5.3",
+    "gulp-content-to-variable": "^0.1.0"
   }
 }