1.js压缩兼容es6内容

王通
1 parent ad6f760d
Showing 6 changed files with 307 additions and 271 deletions
src/main/resources/fatso/handle_real_ctl.js
src/main/resources/fatso/minifier.js
src/main/resources/fatso/package.json
src/main/resources/fatso/start.js
src/main/resources/message_en_US.properties
src/main/resources/static/pages/base/stationroute/js/routes-operation.js
-/**
- * 处理线调文件
- */
-var fs = require('fs')
-    , cheerio = require('cheerio')
-    , minifier = require('./minifier')
-    , crypto = require("crypto")
-    , CleanCSS = require('clean-css')
-    , UglifyJS = require("uglify-js");
-;
-
-var platform = process.platform;
-var iswin = platform=='win32';
-var sp = platform=='win32'?'\\':'/';
-//不参与的目录
-var pName = 'bsth_control'
-    , path = process.cwd()
-    //根目录
-    , root = path.substr(0, path.indexOf(sp + 'src'+sp+'main'))
-    , workspace = root.substr(0, root.lastIndexOf(sp + pName))
-    //临时目录
-    , dest = (workspace + sp + pName + '@fatso_copy')//.replace(/\//g, '\\')
-    , _static = sp + 'src'+sp+'main'+sp+'resources'+sp+'static';
-
-
-var mainFile = dest + _static + sp + 'real_control_v2'+sp+'main.html';
-var aloneMapWrapFile = dest + _static + sp + 'real_control_v2'+sp+'alone_page'+sp+'map'+sp+'alone_wrap.html';
-var aloneHomeWrapFile = dest + _static + sp + 'real_control_v2'+sp+'alone_page'+sp+'home'+sp+'home_wrap.html';
-var mapFile = dest + _static + sp + 'real_control_v2'+sp+'mapmonitor'+sp+'real.html';
-var realCtl = {
-    /**
-     * 处理线调首页
-     */
-    handleMain: function (cb) {
-        //处理main.html
-        var data = fs.readFileSync(mainFile, 'utf-8'),
-            $ = cheerio.load(data);
-        handleCss($, function () {
-            handleJs($, mainFile, cb);
-        });
-
-
-    },
-    /**
-     * 处理地图模块
-     * @param cb
-     */
-    handleMap: function (cb) {
-        //读取文件
-        var data = fs.readFileSync(mapFile, 'utf-8')
-            , $ = cheerio.load(data);
-
-        handleCss($, function () {
-            handleJs($, mapFile, cb);
-        });
-    },
-    /**
-     * 处理单屏地图页面
-     * @param cb
-     */
-    handleAlonePage: function (cb) {
-        var data = fs.readFileSync(aloneMapWrapFile, 'utf-8');
-        var $ = cheerio.load(data);
-        handleCss($, function () {
-            handleJs($, aloneMapWrapFile, cb);
-        });
-    },
-    /**
-     * 处理单屏主页
-     * @param cb
-     */
-    handleAloneHomePage: function (cb) {
-        var data = fs.readFileSync(aloneHomeWrapFile, 'utf-8');
-        var $ = cheerio.load(data);
-        handleCss($, function () {
-            handleJs($, aloneHomeWrapFile, cb);
-        });
-    }
-
-};
-
-/**
- * 处理css
- * @type {any}
- */
-var handleCss = function ($, cb) {
-    var cssArray = $('link[rel=stylesheet][merge]');
-    //按 merge 值分组
-    var cssMap = {}, mergeName;
-    for (var i = 0, c; c = cssArray[i++];) {
-        mergeName = $(c).attr('merge');
-        if (!cssMap[mergeName])
-            cssMap[mergeName] = [];
-        cssMap[mergeName].push(dest + _static + $(c).attr('href'));
-        //remove
-        $(c).remove();
-    }
-    //按 merge 合并压缩css
-    var ks = get_keys(cssMap), index = 0;
-    (function () {
-        if (index >= ks.length) {
-            cb && cb();
-            return;
-        }
-        var k = ks[index];
-        index++;
-        var f = arguments.callee;
-        //合并css
-        new CleanCSS().minify(cssMap[k], function (error, out) {
-            var data = out.styles;
-            var fName = (k + '_' + md5(data)) + '.css';
-            //写入 assets css 目录下
-            var descFile = dest + _static + sp + 'real_control_v2'+sp+'assets'+sp+'css' + sp + fName;
-            fs.open(descFile, 'a', function (err, fd) {
-
-                fs.write(fd, data, function () {
-                    var tag = '<link rel="stylesheet" href="/real_control_v2/assets/css/' + fName + '"/>';
-                    if ($('head').length > 0)
-                        $('head').append(tag);
-                    else {
-                        if($('link').length > 0)
-                            $('link').last().before(tag);
-                        else
-                            $('div').first().before(tag);
-                    }
-                    console.log(k + ' css', '结束，下一个');
-                    f();
-                });
-            });
-        });
-    })();
-};
-
-/**
- * 处理js
- */
-var handleJs = function ($, file, cb) {
-    var scriptArray = $('script[merge]');
-    //按 merge 值分组
-    var jsMap = {}, mergeName;
-    for (var i = 0, s; s = scriptArray[i++];) {
-        mergeName = $(s).attr('merge');
-        if (!jsMap[mergeName])
-            jsMap[mergeName] = [];
-        jsMap[mergeName].push(dest + _static + $(s).attr('src'));
-        //remove
-        $(s).remove();
-    }
-
-    //按 merge 合并压缩js
-    var ks = get_keys(jsMap), index = 0;
-    (function () {
-        if (index >= ks.length) {
-            write(file, $.html());
-            console.log(file + ' 结束'.green);
-            cb && cb();
-            return;
-        }
-        var k = ks[index];
-        index++;
-        var f = arguments.callee;
-        //合并压缩js
-        var result = UglifyJS.minify(jsMap[k]);
-        var data = result.code;
-        var fName = (k + '_' + md5(data)) + '.js';
-        //写入 assets js 目录下
-        var descFile = dest + _static + sp + 'real_control_v2'+sp+'assets'+sp+'js' + sp + fName;
-        fs.open(descFile, 'a', function (err, fd) {
-
-            fs.write(fd, data, function () {
-                var tag = '<script src="/real_control_v2/assets/js/' + fName + '"></script>';
-                if ($('body').length > 0)
-                    $('body').append(tag);
-                else {
-                    //没有body 就写在尾部
-                    $('*').last().after(tag);
-                }
-                console.log(k + ' js', '结束，下一个');
-                f();
-            });
-        });
-    })();
-};
-
-var get_keys = function (json) {
-    var array = [];
-    for (var key in json) {
-        array.push(key);
-    }
-    return array;
-};
-
-function md5(text) {
-    return crypto.createHash("md5").update(text).digest("hex");
-}
-
-function write(file, text) {
-    fs.writeFile(file, text, function (err) {
-        if (err) {
-            console.log(err.toString().red);
-            process.exit();
-        }
-        console.log(file.green);
-    });
-}
-
+/**
+ * 处理线调文件
+ */
+var fs = require('fs')
+    , cheerio = require('cheerio')
+    , minifier = require('./minifier')
+    , crypto = require("crypto")
+    , CleanCSS = require('clean-css');
+;
+
+var platform = process.platform;
+var iswin = platform=='win32';
+var sp = platform=='win32'?'\\':'/';
+//不参与的目录
+var pName = 'bsth_control'
+    , path = process.cwd()
+    //根目录
+    , root = path.substr(0, path.indexOf(sp + 'src'+sp+'main'))
+    , workspace = root.substr(0, root.lastIndexOf(sp + pName))
+    //临时目录
+    , dest = (workspace + sp + pName + '@fatso_copy')//.replace(/\//g, '\\')
+    , _static = sp + 'src'+sp+'main'+sp+'resources'+sp+'static';
+
+
+var mainFile = dest + _static + sp + 'real_control_v2'+sp+'main.html';
+var aloneMapWrapFile = dest + _static + sp + 'real_control_v2'+sp+'alone_page'+sp+'map'+sp+'alone_wrap.html';
+var aloneHomeWrapFile = dest + _static + sp + 'real_control_v2'+sp+'alone_page'+sp+'home'+sp+'home_wrap.html';
+var mapFile = dest + _static + sp + 'real_control_v2'+sp+'mapmonitor'+sp+'real.html';
+var realCtl = {
+    /**
+     * 处理线调首页
+     */
+    handleMain: function (cb) {
+        //处理main.html
+        var data = fs.readFileSync(mainFile, 'utf-8'),
+            $ = cheerio.load(data);
+        handleCss($, function () {
+            handleJs($, mainFile, cb);
+        });
+
+
+    },
+    /**
+     * 处理地图模块
+     * @param cb
+     */
+    handleMap: function (cb) {
+        //读取文件
+        var data = fs.readFileSync(mapFile, 'utf-8')
+            , $ = cheerio.load(data);
+
+        handleCss($, function () {
+            handleJs($, mapFile, cb);
+        });
+    },
+    /**
+     * 处理单屏地图页面
+     * @param cb
+     */
+    handleAlonePage: function (cb) {
+        var data = fs.readFileSync(aloneMapWrapFile, 'utf-8');
+        var $ = cheerio.load(data);
+        handleCss($, function () {
+            handleJs($, aloneMapWrapFile, cb);
+        });
+    },
+    /**
+     * 处理单屏主页
+     * @param cb
+     */
+    handleAloneHomePage: function (cb) {
+        var data = fs.readFileSync(aloneHomeWrapFile, 'utf-8');
+        var $ = cheerio.load(data);
+        handleCss($, function () {
+            handleJs($, aloneHomeWrapFile, cb);
+        });
+    }
+
+};
+
+/**
+ * 处理css
+ * @type {any}
+ */
+var handleCss = function ($, cb) {
+    var cssArray = $('link[rel=stylesheet][merge]');
+    //按 merge 值分组
+    var cssMap = {}, mergeName;
+    for (var i = 0, c; c = cssArray[i++];) {
+        mergeName = $(c).attr('merge');
+        if (!cssMap[mergeName])
+            cssMap[mergeName] = [];
+        cssMap[mergeName].push(dest + _static + $(c).attr('href'));
+        //remove
+        $(c).remove();
+    }
+    //按 merge 合并压缩css
+    var ks = get_keys(cssMap), index = 0;
+    (function () {
+        if (index >= ks.length) {
+            cb && cb();
+            return;
+        }
+        var k = ks[index];
+        index++;
+        var f = arguments.callee;
+        //合并css
+        new CleanCSS().minify(cssMap[k], function (error, out) {
+            var data = out.styles;
+            var fName = (k + '_' + md5(data)) + '.css';
+            //写入 assets css 目录下
+            var descFile = dest + _static + sp + 'real_control_v2'+sp+'assets'+sp+'css' + sp + fName;
+            fs.open(descFile, 'a', function (err, fd) {
+
+                fs.write(fd, data, function () {
+                    var tag = '<link rel="stylesheet" href="/real_control_v2/assets/css/' + fName + '"/>';
+                    if ($('head').length > 0)
+                        $('head').append(tag);
+                    else {
+                        if($('link').length > 0)
+                            $('link').last().before(tag);
+                        else
+                            $('div').first().before(tag);
+                    }
+                    console.log(k + ' css', '结束，下一个');
+                    f();
+                });
+            });
+        });
+    })();
+};
+
+/**
+ * 处理js
+ */
+var handleJs = function ($, file, cb) {
+    var scriptArray = $('script[merge]');
+    //按 merge 值分组
+    var jsMap = {}, mergeName;
+    for (var i = 0, s; s = scriptArray[i++];) {
+        mergeName = $(s).attr('merge');
+        if (!jsMap[mergeName])
+            jsMap[mergeName] = [];
+        jsMap[mergeName].push(dest + _static + $(s).attr('src'));
+        //remove
+        $(s).remove();
+    }
+
+    //按 merge 合并压缩js
+    var ks = get_keys(jsMap), index = 0;
+    (function () {
+        if (index >= ks.length) {
+            write(file, $.html());
+            console.log(file + ' 结束'); // 移除.green调用
+            cb && cb();
+            return;
+        }
+        var k = ks[index];
+        index++;
+        var f = arguments.callee;
+        //合并压缩js
+        try {
+            // 先合并文件内容
+            let code = '';
+            for(let j = 0; j < jsMap[k].length; j++) {
+                code += fs.readFileSync(jsMap[k][j], 'utf8') + '\n';
+            }
+            // 使用Terser压缩
+            var data = minifier.mini(code);
+            if (code !== '' && data === '') {
+                console.error('压缩出错')
+                process.exit();
+            }
+            var fName = (k + '_' + md5(data)) + '.js';
+            //写入 assets js 目录下
+            var descFile = dest + _static + sp + 'real_control_v2'+sp+'assets'+sp+'js' + sp + fName;
+            fs.open(descFile, 'a', function (err, fd) {
+                fs.write(fd, data, function () {
+                    var tag = '<script src="/real_control_v2/assets/js/' + fName + '"></script>';
+                    if ($('body').length > 0)
+                        $('body').append(tag);
+                    else {
+                        //没有body 就写在尾部
+                        $('*').last().after(tag);
+                    }
+                    console.log(k + ' js', '结束，下一个');
+                    f();
+                });
+            });
+        } catch (e) {
+            console.error('合并压缩错误:', e);
+            process.exit();
+        }
+    })();
+};
+
+var get_keys = function (json) {
+    var array = [];
+    for (var key in json) {
+        array.push(key);
+    }
+    return array;
+};
+
+function md5(text) {
+    return crypto.createHash("md5").update(text).digest("hex");
+}
+
+function write(file, text) {
+    fs.writeFile(file, text, function (err) {
+        if (err) {
+            console.log(err.toString()); // 移除.red调用
+            process.exit();
+        }
+        console.log(file); // 移除.green调用
+    });
+}
+
 module.exports = realCtl;
 \ No newline at end of file
-/**
- * @author PanZhao 
- * @date 2016年3月17日 下午12:44:06 
- */
-var fs = require('fs');
-var UglifyJS = require("uglify-js");
-
-var platform = process.platform;
-var iswin = platform=='win32';
-var separator = platform=='win32'?'\\':'/';
-var minifier = {
-	
-	mergeAndMini: function(fileArray,scriptString, root, file){
-		var len = fileArray.length;
-		for(var i = 0; i < len; i ++){
-			fileArray[i] = root  + fileArray[i].split('/').join(separator);
-		}
-		
-		var result, indoorRs;
-		
-		try {
-			if(fileArray && len > 0)
-				result = UglifyJS.minify(fileArray);
-			
-			if(scriptString)
-				indoorRs = UglifyJS.minify(scriptString, {fromString: true});
-		} catch (e) {
-			console.log(e);
-			console.log(file.red);
-			process.exit();
-		}
-		
-		return {outside: result?result.code:'', inside: indoorRs?indoorRs.code:''};
-	},
-	mini: function(file){
-		return UglifyJS.minify(file).code;
-	}
-}
-
+var fs = require('fs');
+var Terser = require('terser');
+
+var platform = process.platform;
+var iswin = platform=='win32';
+var separator = platform=='win32'?'\\':'/';
+var minifier = {
+
+	mergeAndMini: function(fileArray, scriptString, root, file) {
+		var len = fileArray.length;
+		for(var i = 0; i < len; i ++){
+			fileArray[i] = root + fileArray[i].split('/').join(separator);
+		}
+
+		var result, indoorRs;
+
+		try {
+			if(fileArray && len > 0) {
+				// Terser可以直接接受文件路径数组
+				result = Terser.minify_sync(fs.readFileSync(fileArray[0], 'utf8'));
+				// 如果有多个文件，需要先合并内容
+				if(len > 1) {
+					let code = '';
+					for(let j = 0; j < len; j++) {
+						code += fs.readFileSync(fileArray[j], 'utf8') + '\n';
+					}
+					result = Terser.minify_sync(code);
+				}
+			}
+
+			if(scriptString) {
+				// Terser不需要fromString选项，直接传递代码字符串
+				indoorRs = Terser.minify_sync(scriptString);
+			}
+		} catch (e) {
+			console.log(e);
+			console.log(file); // 移除.red调用，除非有chalk等库
+			process.exit();
+		}
+
+		return {outside: result && !result.error ? result.code : '', inside: indoorRs && !indoorRs.error ? indoorRs.code : ''};
+	},
+
+	mini: function(file) {
+		try {
+			// 检查file是文件路径还是代码字符串
+			if(typeof file === 'string' && fs.existsSync(file)) {
+				const code = fs.readFileSync(file, 'utf8');
+				const result = Terser.minify_sync(code);
+				return result && !result.error ? result.code : '';
+			} else {
+				// 假设是代码字符串
+				const result = Terser.minify_sync(file);
+				return result && !result.error ? result.code : '';
+			}
+		} catch (e) {
+			console.log(e);
+			return '';
+		}
+	}
+};
+
 module.exports = minifier;
 \ No newline at end of file
-{
-  "name": "fatso",
-  "version": "1.0.0",
-  "description": "子页面js检查、合并、压缩等处理",
-  "main": "start.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "panzhaov5",
-  "license": "ISC",
-  "dependencies": {
-    "cheerio": "^0.20.0",
-    "clean-css": "^4.0.12",
-    "colors": "^1.3.3",
-    "eventproxy": "^0.3.4",
-    "uglify-js": "^2.6.2"
-  }
-}
+{
+  "name": "fatso",
+  "version": "1.0.0",
+  "description": "子页面js检查、合并、压缩等处理",
+  "main": "start.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "panzhaov5",
+  "license": "ISC",
+  "dependencies": {
+    "cheerio": "^0.20.0",
+    "clean-css": "^4.0.12",
+    "colors": "^1.3.3",
+    "eventproxy": "^0.3.4",
+    "terser": "^5.44.0",
+    "uglify-js": "^2.6.2"
+  }
+}
@@ -16,7 +16,7 @@ var platform = process.platform;
 var iswin = platform == 'win32';
 var sp = platform == 'win32' ? '\\' : '/';
 //不参与的目录
-var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission' + sp + 'authorize_all','permission' + sp + 'user', 'summary', 'history_sch', 'report' + sp + 'oil', 'base' + sp + 'geo_data_edit', 'base' + sp + 'carpark', 'forms', 'mforms', 'report', 'punctual', 'base' + sp + 'timesmodel', 'base' + sp + 'stationroute', 'kl', 'dsm']
+var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission' + sp + 'authorize_all','permission' + sp + 'user', 'summary', 'history_sch', 'report' + sp + 'oil', 'base' + sp + 'geo_data_edit', 'base' + sp + 'carpark', 'forms', 'mforms', 'report', 'punctual', 'base' + sp + 'timesmodel', 'kl', 'dsm']
     , ep = new EventProxy()
     , pName = 'bsth_control'
     , path = process.cwd()
@@ -134,9 +134,9 @@ ep.tail(&#39;handle-fragment&#39;, function (file) {
     handleJavascript(file, function (mini, $) {
         var jsMini;
         if (mini.inside)
-            jsMini = '(function(){' + mini.inside + '\n' + mini.outside + '})();';
+            jsMini = '(function(){'+ mini.inside + '\n' + mini.outside + '})();';
         else
-            jsMini = '(function(){' + mini.outside + '})();';
+            jsMini = '(function(){'+ mini.outside + '})();';
         write(file, $.html() + '<script>' + jsMini + '</script>');
     });
@@ -2629,7 +2629,7 @@ txt-2628=Acquisition success
 txt-2629=
 txt-2630=Consumption
 txt-2631=Execute road sign
-txt-2632=Ooperation or not?
+txt-2632=Operational or not?
 txt-2633=Time type
 txt-2634=Template type
 txt-2635=Bad  shift reason
@@ -3034,7 +3034,7 @@ txt-3033=Start date
 txt-3034=End date
 txt-3035=Report management
 txt-3036=Maintenance report
-txt-3037=Change people and cars
+txt-3037=Change driver and vehicle
 txt-3038=Switch the street signs
 txt-3039=Calculate complete
 txt-3040=Equipment parameter
@@ -4131,7 +4131,7 @@ txt-4130=Mode
 txt-4131=Action
 txt-4132=Online
 txt-4133=Search
-txt-4134=fter
+txt-4134=After
 txt-4135=Out of sale
 txt-4136=Radius
 txt-4137=Unit
@@ -1429,7 +1429,7 @@ var RoutesOperation = (function () {
             if($($("#versions").find("option:selected")[0]).attr("status") > 0){
                 htm += '<button class="info_win_btn" id="editStation" onclick="RoutesOperation.editSection(' + sectionRoute.id +','+dir+ ')">' + i18n('txt-4028') + '</button>' +
                     '<button  class="info_win_btn" id="addBetweenStationRoad" onclick="RoutesOperation.destroySection('+ sectionRoute.id + ','+sectionRoute.line.id+','+sectionRoute.directions+')">' + i18n('txt-4211') + '</button>' +
-                    '<button class="info_win_btn" id="addSectionAfter" onclick="RoutesOperation.addSectionAfter('+sectionRoute.id+')">' + i18n('txt-4361') + '(' + i18n('txt-4134') + ')</button>' +
+                    '<button class="info_win_btn" id="addSectionAfter" onclick="RoutesOperation.addSectionAfter('+sectionRoute.id+')">' + i18n('txt-4361') + '</button>' +
                     '</div>';
             }
@@ -1715,7 +1715,7 @@ var RoutesOperation = (function () {
             if($($("#versions").find("option:selected")[0]).attr("status") > 0){
                 htm += '<button class="info_win_btn" id="editStation" onclick="RoutesOperation.editSection_inout(' + sectionRoute.id +','+dir+ ')">' + i18n('txt-4028') + '</button>' +
                     '<button  class="info_win_btn" id="addBetweenStationRoad" onclick="RoutesOperation.destroySection_inout('+ sectionRoute.id + ','+sectionRoute.line.id+','+sectionRoute.directions+')">' + i18n('txt-4211') + '</button>' +
-                    '<button class="info_win_btn" id="addSectionAfter" onclick="RoutesOperation.addSectionAfter_inout('+sectionRoute.id+')">' + i18n('txt-4361') + '(' + i18n('txt-4134') + ')</button>' +
+                    '<button class="info_win_btn" id="addSectionAfter" onclick="RoutesOperation.addSectionAfter_inout('+sectionRoute.id+')">' + i18n('txt-4361') + '</button>' +
                     '</div>';
             }