gulp fail ag

.production/gulpfile.js

@@ -6,9 +6,10 @@ const rename = require('gulp-rename')
 const replace = require('gulp-replace')
 const debug = require('gulp-debug')
 const fs = require('graceful-fs')
+const cleanhtml = require('gulp-cleanhtml')
 
 // compress js (and ES6 > ES5)
-gulp.task('es62es5', () => {
+gulp.task('xjs', () => {
     return gulp.src('../src/main/webapp/assets/js/**/*.js?(x)')
     	.pipe(gulp.dest('./js/es6'))
     	.pipe(babel())
@@ -20,40 +21,44 @@ gulp.task('es62es5', () => {
 })
 
 // compress css
-gulp.task('css', () => {
+gulp.task('xcss', () => {
     return gulp.src('../src/main/webapp/assets/css/**/*.css')
     	.pipe(cssclean())
+    	.pipe(debug({ title: 'compress file : ' }))
     	//.pipe(rename({ extname: '.min.css' }))
     	.pipe(gulp.dest('./build/css'))
 })
 
 // replace compressed js/css in jsp
 // compress and replace inline js
-gulp.task('repljsp', () => {
+gulp.task('xjsp', () => {
-	return gulp.src('../src/main/webapp/**/*-list.jsp')
+	return gulp.src('../src/main/webapp/**/*.jsp')
-		// .pipe(replace(/<script type="text\/babel">([\s]+[\d\D]*)<\/script>/igm, (m, p, o, s) => {
+		.pipe(debug({ title: 'compress file : ' }))
-		// 	// console.log('ES6 >>>>>>>>>> ' + p)
+		.pipe(replace(/<script type="text\/babel">([\s]+[\d\D]*)<\/script>/igm, (m, p, o, s) => {
+			// console.log('ES6 >>>>>>>>>> ' + p)
 
-		// 	let es6_temp = './build/js/temp-es6.js'
+			let tmp = '__temp.js'
-		// 	let es5_temp = './build/js/temp-es5.js'
+			fs.unlinkSync(tmp)
-		// 	fs.writeFileSync(es6_temp, p)
 
-		// 	gulp.src(es6_temp)
+			fs.writeFileSync(tmp, p)
-		// 		// .pipe(babel())
+			gulp.src(tmp)
-		// 		.pipe(debug({ title: 'compress temp file : ' }))
+				.pipe(babel())
-		// 		// .pipe(uglify({ mangle: true }))
+				.pipe(uglify({ mangle: true }))
-		// 		.pipe(gulp.dest(es5_temp))
+				.pipe(gulp.dest('./build'))
 
-		// 	// let es52str = fs.readFileSync(es5_temp)
+			let es5 = fs.readFileSync('./build/' + tmp)
-		// 	// console.log('ES5 >>>>>>>>>> ' + es52str)
+			// console.log('ES5 >>>>>>>>>> ' + es5)
+			// fs.unlinkSync(tmp)
 
-		// 	return '<script></script>'
+			return '<script>' + es5 + '</script>'
-		// }))
+		}))
-		.pipe(replace(/ type="text\/babel"/ig, ''))
+		.pipe(replace(/ type="text\/babel"/ig, ''))  // remove type="text/babel"
+		.pipe(replace(/\.jsx"><\/script>/ig, '.js"></script>'))  // replace suffix .jsx > .js
+		.pipe(replace('<script src="${baseUrl}/assets/lib/react/babel.js"></script>', ''))  // remove babel lib
+		// .pipe(cleanhtml())
 		.pipe(gulp.dest('./build/jsp'))
 })
 
 
-gulp.task('default', ['es62es5'])
+gulp.task('default', ['xjs'])
-
+gulp.task('all', ['xjs', 'xcss', 'xjsp'])
-gulp.task('all', ['es62es5', 'css', 'repljsp'])

.production/package.json

@@ -21,6 +21,7 @@
         "gulp": "^3.9.1",
         "gulp-babel": "^8.0.0",
         "gulp-clean-css": "^3.10.0",
+        "gulp-cleanhtml": "^1.0.3",
         "gulp-debug": "^4.0.0",
         "gulp-read": "^1.0.1",
         "gulp-rename": "^1.4.0",

src/main/webapp/admin/admin-entry.jsp

@@ -38,7 +38,7 @@
 <%@ include file="/_include/Foot.jsp"%>
 <script type="text/babel">
 $(document).ready(function(){
-	let nexturl = decodeURIComponent($urlp('nexturl') || '../admin/systems')
+	let nexturl = $decode($urlp('nexturl') || '../admin/systems')
 	$('.J_verify-btn').click(function(){
 		let passwd = $val('#admin-passwd')
 		if (!!!passwd) return false

src/main/webapp/admin/bizuser/dept-list.jsp

@@ -73,9 +73,8 @@
 RbForm.postAfter = function(){
 	location.reload()
 }
-
 $(document).ready(function(){
-	RbListPage.init(${DataListConfig}, ['${entityLabel}', 'Department', '${entityIcon}'], ${entityPrivileges})
+	RbListPage.init($.parseJSON('${DataListConfig}'), ['${entityLabel}', 'Department', '${entityIcon}'], $.parseJSON('${entityPrivileges}'))
 	loadDeptTree()
 })
 clickDept = function(depts) {

src/main/webapp/admin/bizuser/user-list.jsp

@@ -81,9 +81,8 @@ RbForm.postAfter = function(){
 	if (formPostType == 1) RbListPage._RbList.reload()
 	else loadDeptTree()
 }
-
 $(document).ready(function(){
-	RbListPage.init(${DataListConfig}, ['${entityLabel}', 'User', '${entityIcon}'], ${entityPrivileges})
+	RbListPage.init($.parseJSON('${DataListConfig}'), ['${entityLabel}', 'User', '${entityIcon}'], $.parseJSON('${entityPrivileges}'))
 	loadDeptTree()
 
 	$('.J_new').click(function(){ formPostType = 1 })

src/main/webapp/general-entity/record-list.jsp

@@ -79,7 +79,7 @@
 <script src="${baseUrl}/assets/js/assign-share.jsx" type="text/babel"></script>
 <script type="text/babel">
 $(document).ready(function(){
-	RbListPage.init(${DataListConfig}, [ '${entityName}', '${entityLabel}', '${entityIcon}' ], ${entityPrivileges})
+	RbListPage.init($.parseJSON('${DataListConfig}'), [ '${entityName}', '${entityLabel}', '${entityIcon}' ], $.parseJSON('${entityPrivileges}'))
 	rb.AdvFilter.init('.adv-search', '${entityName}')
 });
 </script>

src/main/webapp/general-entity/record-view.jsp

@@ -82,10 +82,10 @@
 <script src="${baseUrl}/assets/js/assign-share.jsx" type="text/babel"></script>
 <script type="text/babel">
 $(document).ready(function(){
-	RbViewPage.init('${id}', [ '${entityName}', '${entityLabel}', '${entityIcon}' ], ${entityPrivileges})
+	RbViewPage.init('${id}', [ '${entityName}', '${entityLabel}', '${entityIcon}' ], $.parseJSON('${entityPrivileges}'))
 	RbViewPage.initRecordMeta()
-	RbViewPage.initVTabs(${ViewTabs})
+	RbViewPage.initVTabs($.parseJSON('${ViewTabs}'))
-	RbViewPage.initVAdds(${ViewAdds})
+	RbViewPage.initVAdds($.parseJSON('${ViewAdds}'))
 });
 </script>
 </body>