Commit ef1b0bb56f1a8c4aac33031093759af337163889
1 parent
1700f00e
....
Showing
2 changed files
with
3 additions
and
2 deletions
src/main/resources/fatso/minifier.js
| @@ -7,7 +7,7 @@ var UglifyJS = require("uglify-js"); | @@ -7,7 +7,7 @@ var UglifyJS = require("uglify-js"); | ||
| 7 | 7 | ||
| 8 | var minifier = { | 8 | var minifier = { |
| 9 | 9 | ||
| 10 | - mergeAndMini: function(fileArray,scriptString, root, isIndex){ | 10 | + mergeAndMini: function(fileArray,scriptString, root, file){ |
| 11 | var len = fileArray.length; | 11 | var len = fileArray.length; |
| 12 | for(var i = 0; i < len; i ++){ | 12 | for(var i = 0; i < len; i ++){ |
| 13 | fileArray[i] = root + fileArray[i].split('/').join('\\'); | 13 | fileArray[i] = root + fileArray[i].split('/').join('\\'); |
| @@ -23,6 +23,7 @@ var minifier = { | @@ -23,6 +23,7 @@ var minifier = { | ||
| 23 | indoorRs = UglifyJS.minify(scriptString, {fromString: true}); | 23 | indoorRs = UglifyJS.minify(scriptString, {fromString: true}); |
| 24 | } catch (e) { | 24 | } catch (e) { |
| 25 | console.log(e); | 25 | console.log(e); |
| 26 | + console.log(file.red); | ||
| 26 | process.exit(); | 27 | process.exit(); |
| 27 | } | 28 | } |
| 28 | 29 |
src/main/resources/fatso/start.js
| @@ -157,7 +157,7 @@ function handleJavascript(item, cb){ | @@ -157,7 +157,7 @@ function handleJavascript(item, cb){ | ||
| 157 | ,scrStr = htmlResult.scriptString; | 157 | ,scrStr = htmlResult.scriptString; |
| 158 | 158 | ||
| 159 | //合并压缩 | 159 | //合并压缩 |
| 160 | - var mini = minifier.mergeAndMini(jsArray, scrStr, dest + _static); | 160 | + var mini = minifier.mergeAndMini(jsArray, scrStr, dest + _static, item); |
| 161 | 161 | ||
| 162 | cb && cb(mini, $); | 162 | cb && cb(mini, $); |
| 163 | } | 163 | } |