GUI: Added ESLint to gulp tasks. ONOS-6521
Commented out gulp tasks making this change uneffective
Fixed an error in the build script
Change-Id: I4f4f9762aa1a66304aa74b3ab208095b9c1d4515
diff --git a/tools/gui/gulp-tasks/bundles/bundle-js/index.js b/tools/gui/gulp-tasks/bundles/bundle-js/index.js
index 212034a..2292775 100644
--- a/tools/gui/gulp-tasks/bundles/bundle-js/index.js
+++ b/tools/gui/gulp-tasks/bundles/bundle-js/index.js
@@ -4,6 +4,7 @@
import uglyfy from 'gulp-uglify';
import sourceMaps from 'gulp-sourcemaps';
import BundleResources from '../helpers/bundleResources';
+import { reload } from '../../dev-server';
const GUI_BASE = '../../web/gui/src/main/webapp/';
@@ -34,6 +35,18 @@
];
function bundle(files, exportName) {
+
+ // TODO: Use util.noop once npm issues have been resolved
+ if (process.argv.indexOf('--development') > -1) {
+ return gulp.src(BundleResources(GUI_BASE, files))
+ .pipe(sourceMaps.init())
+ .on('error', (e, file, line) => console.error(e))
+ .pipe(concat(exportName))
+ .pipe(sourceMaps.write('source-map'))
+ .pipe(gulp.dest(GUI_BASE + '/dist/'))
+ .on('end', () => { reload(); })
+ }
+
return gulp.src(BundleResources(GUI_BASE, files))
.pipe(sourceMaps.init())
.pipe(strip())
@@ -45,8 +58,13 @@
}
const tasks = function () {
- gulp.task('bundle-vendor', () => bundle(vendor, 'vendor.js'));
+ // gulp.task('bundle-vendor', () => bundle(vendor, 'vendor.js'));
gulp.task('bundle-js', () => bundle(bundleFiles, 'onos.js'));
+ gulp.task('watch-js', () => {
+ gulp.watch([GUI_BASE + '**/*.js', `!${GUI_BASE}/dist/**/*`], ['bundle-js']);
+ }).on('change', (event) => {
+ console.log('File ' + event.path + ' was ' + event.type + ', running tasks...');
+ });
};
export default tasks();
\ No newline at end of file