Author: smaisonneuve Date: 2015-06-09 09:52:53 +0000 (Tue, 09 Jun 2015) New Revision: 1631 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1631 Log: [Build] - Adding babel to gulp build Modified: oipf/lib/gulpfile.js oipf/lib/js/utils/Displayer.js oipf/lib/package.json Modified: oipf/lib/gulpfile.js =================================================================== --- oipf/lib/gulpfile.js 2015-06-09 09:45:50 UTC (rev 1630) +++ oipf/lib/gulpfile.js 2015-06-09 09:52:53 UTC (rev 1631) @@ -1,13 +1,64 @@ var gulp = require("gulp"); var concat = require("gulp-concat"); var sourcemaps = require("gulp-sourcemaps"); +var babel = require("gulp-babel"); +var del = require("del"); -gulp.task("javascript", function() { +var notifier = require("node-notifier"); +var util = require("gulp-util"); + +var conf = { + buildFile: "oipf-lib.js", + buildDir: "build" +}; + +function errorHandler(err) { + notifier.notify({message: "Error: " + err.message}); + util.log(util.colors.red("Error"), err.message); + this.emit("end"); +} + +gulp.task("clean", function(cb) { + del([conf.buildDir], cb); +}); + +gulp.task("javascript", ["clean"], function() { return gulp.src("js/**/*.js") .pipe(sourcemaps.init()) - .pipe(concat("all.js")) + .pipe(babel({ + blacklist: [ + "es3.memberExpressionLiterals", + "es3.propertyLiterals", + "es5.properties.mutators", + "es6.arrowFunctions", + "es6.blockScoping", + "es6.classes", + "es6.constants", + "es6.destructuring", + "es6.forOf", + //"es6.modules", + "es6.objectSuper", + "es6.parameters.default", + "es6.parameters.rest", + "es6.properties.computed", + "es6.properties.shorthand", + "es6.regex.sticky", + "es6.regex.unicode", + "es6.spread", + "es6.tailCall" + ], + optional: [ + "asyncToGenerator", + "minification.inlineExpressions", + "minification.memberExpressionLiterals", + "minification.propertyLiterals", + "utility.inlineEnvironmentVariables" + ] + })) + .on("error", errorHandler) + .pipe(concat(conf.buildFile)) .pipe(sourcemaps.write()) - .pipe(gulp.dest("dist")); + .pipe(gulp.dest(conf.buildDir)); }); -gulp.task("default", ["javascript"]); \ No newline at end of file +gulp.task("default", ["javascript"]); Modified: oipf/lib/js/utils/Displayer.js =================================================================== --- oipf/lib/js/utils/Displayer.js 2015-06-09 09:45:50 UTC (rev 1630) +++ oipf/lib/js/utils/Displayer.js 2015-06-09 09:52:53 UTC (rev 1631) @@ -1,26 +1,26 @@ -/* +/* * To change this license header, choose License Headers in Project Properties. * To change this template file, choose Tools | Templates * and open the template in the editor. */ var Displayer = Class.extend({ - + init : function() { - }, - + }, + appendChildFromTab : function(id, tab) { - - for(var keys=Object.keys(tab) in tab){ + + for(var keys in tab){ var p = document.createElement("P"); var t = document.createTextNode(keys+": "+tab[keys]); p.appendChild(t); - document.getElementById(id).appendChild(p); + document.getElementById(id).appendChild(p); } - + }, - + currentProgramInfo : function() { - + for (var i = 0; i< search.result.length; i++) { var obj = search.result[i]; console.log(obj); @@ -49,5 +49,5 @@ } document.getElementById("prog").style.visibility = "visible"; } - + }); Modified: oipf/lib/package.json =================================================================== --- oipf/lib/package.json 2015-06-09 09:45:50 UTC (rev 1630) +++ oipf/lib/package.json 2015-06-09 09:52:53 UTC (rev 1631) @@ -4,9 +4,13 @@ "description": "Stub for oipf", "main": "oipf-lib.js", "devDependencies": { + "del": "^1.2.0", "gulp": "^3.9.0", + "gulp-babel": "^5.1.0", "gulp-concat": "^2.5.2", - "gulp-sourcemaps": "^1.5.2" + "gulp-sourcemaps": "^1.5.2", + "gulp-util": "^3.0.5", + "node-notifier": "^4.2.1" }, "author": "ygrego", "license": "LGPL"