Update p/ to use ES6 and latest gulp

Author: radare

README.md

@@ -15,38 +15,48 @@ This repository contains the different WebUIs for radare2:
 
 First, you should install [radare2](https://github.com/radare/radare2), then `r2pm` will handle this for you:
 
-    $ r2pm -i www-enyo
-    $ r2pm -i www-m
-    $ r2pm -i www-p
-    $ r2pm -i www-t
+```console
+$ r2pm -i www-enyo
+$ r2pm -i www-m
+$ r2pm -i www-p
+$ r2pm -i www-t
+```
 
 This process will install the proper UI by downloading the latest version available.
 
 ## Troubleshooting
 
 The Web UIs (/m specifically) are using some tools that require an updated version of `node`, so if you encounter the following error, you should consider an update.
 
-    ~/radare2-webui/www/m/node_modules/gulp-google-webfonts/index.js:209
-        request.name = path.posix.join(options.fontsDir, request.name);
-    TypeError: Cannot call method 'join' of undefined
+```console
+~/radare2-webui/www/m/node_modules/gulp-google-webfonts/index.js:209
+request.name = path.posix.join(options.fontsDir, request.name);
+TypeError: Cannot call method 'join' of undefined
+```
 
 Updating node is easy, I recommand you to follow this [article](https://davidwalsh.name/upgrade-nodejs):
 
-    sudo npm cache clean -f
-    sudo npm install -g n
-    sudo n stable
+```shell
+sudo npm cache clean -f
+sudo npm install -g n
+sudo n stable
+```
 
 # Use it
 
 You can run one of the UI by typing the following command with: `enyo`, `m`, `p` and `t`.
 
-    $ r2 -q -e http.ui=<UI> -c=H /bin/ls
+```shell
+$ r2 -q -e http.ui=<UI> -c=H /bin/ls
+```
 
 # Uninstall
 
 To uninstall an UI, you can use this command.
 
-    $ r2pm -u <package>
+```shell
+$ r2pm -u <package>
+```
 
 # Soon...
 

www/p/Makefile

@@ -2,14 +2,14 @@ VERSION=0.1.1
 DISTZIP=radare2-webui-p-$(VERSION).zip
 
 build: node_modules
-	$(shell npm bin)/gulp
+	npx gulp
 
 node_modules:
 	npm install
 
 dist release:
 	npm install
-	$(shell npm bin)/gulp release
+	npx gulp release
 	rm -f $(DISTZIP)
 	cd ../../dist && zip -r $(DISTZIP) p
 
@@ -19,8 +19,7 @@ run:
 	r2 -q -e scr.html=0 -e http.sandbox=false -e http.ui=p -e http.root=$(PWD)/../../dev -c=H /bin/ls
 
 watch:
-	$(shell npm bin)/gulp watch
-
+	npx gulp watch
 
 indent:
 	# TODO: use semistandard

www/p/gulpfile.js

@@ -1,9 +1,10 @@
-const { src, watch, series, dest } = require('gulp');
+import { src, series, dest } from 'gulp';
+import gulp from 'gulp';
+import uglify from 'gulp-uglify';
+import concat from 'gulp-concat';
+import cleanCSS from 'gulp-clean-css';
 
-var uglify = require('gulp-uglify'),
-	cleanCSS = require('gulp-clean-css'),
-	concat = require('gulp-concat'),
-	bower = require('bower');
+import bower from 'bower';
 
 var paths = {
 	r2: '../lib/',
@@ -51,10 +52,10 @@ const _js = series(
 
 
 const _watch =  function() {
-	watch('./*.html', ['html']);
-	watch(['./lib/js/*.js'], ['js:main']);
-	watch(['./lib/js/**/*.js'], ['js:app']);
-	watch(['./lib/css/**/*.css'], ['js:css']);
+	gulp.watch('./*.html', ['html']);
+	gulp.watch(['./lib/js/*.js'], ['js:main']);
+	gulp.watch(['./lib/js/**/*.js'], ['js:app']);
+	gulp.watch(['./lib/css/**/*.css'], ['js:css']);
 	done();
 };
 
@@ -84,7 +85,7 @@ const _copyVendors = function() {
 			'vendors/jquery/dist/jquery.min.js',
 			'vendors/jquery.scrollTo/jquery.scrollTo.min.js',
 			'vendors/jquery.layout/dist/jquery.layout-latest.min.js',
-			'vendors/jquery-ui/ui/minified/jquery-ui.min.js',
+			'vendors/jquery-ui/jquery-ui.min.js',
 			'vendors/jquery-ui-contextmenu/jquery.ui-contextmenu.min.js',
 			'vendors/onoff/dist/jquery.onoff.min.js',
 			'vendors/lodash/lodash.min.js',
@@ -128,9 +129,9 @@ const _release = series(
 	_releaseVendor
 );
 
-exports.default = series( _bowerInstall, _copyVendors, _js, _css, _common, _default);
-exports.release = series( exports.default, _release)
-exports.watch = series( exports.default, _watch)
-
+export const defaultTask = series(_bowerInstall, _copyVendors, _js, _css, _common, _default);
+export default defaultTask;
+export const release = series(defaultTask, _release);
+export const watch = series(defaultTask, _watch);