Skip to content

Commit

Permalink
Merge pull request fex-team#5 from liaoxuezhi/dev
Browse files Browse the repository at this point in the history 
[BUILD TOOL]优化dist.js，添加适当的注释，增加可读性
  • Loading branch information
@gmuteam
gmuteam committed Apr 22, 2013
2 parents 5b0f11b + 2178fbe commit de9bd5b
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 33 deletions.
88 changes: 55 additions & 33 deletions build/dist.js
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
(function () {
"use strict";

var Q = require('q'),
var
//Q 是一个实现了promise/A+规范的js库
Q = require('q'),

//用来根据规则查找文件的工具
glob = require('glob'),
path = require('path'),

//用来判断某字符串是否满足某规则
minimatch = require('minimatch'),
file = require("./util/file"),
helper = require("./util/helper"),
config = require("./config.json").dist;

//合并zepto文件
function concatZepto() {
var opt = config.zepto,
dest = opt.dest,
Expand All @@ -25,6 +32,7 @@
console.log('生成 %s 成功， 大小为: %s ', dest, file.caculateSize(dest));
}

//用uglify压缩zepto文件
function minifyZepto() {
var opt = config.zepto,
minDest = opt.dest.replace(/\.js$/, '.min.js');
Expand All @@ -38,33 +46,44 @@
var opt = config.gmu,
dir = path.resolve(opt.path),
files = opt.src,

//判断文件名是否满足exclude中设置的规则
matchExclude = function (item) {
var i = 0,
len = exclude.length;

for( ; i<len; i++) {
for (; i < len; i++) {

if(minimatch(item, exclude[i])) {
if (minimatch(item, exclude[i])) {
return true;
}
}

return false;
};

exclude = opt.exclude.concat(exclude? exclude.split(/\s+/): []);
exclude = (opt.exclude || [])
.concat(exclude ? exclude.split(/\s+/) : []);

//确保files是个数组
if (!Array.isArray(files)) {
files = [files];
}

return Q.all(files.map(function (file) {
return Q.nfcall(glob, file, { cwd: dir});
})).then(function (files) {
}))
.then(function (files) {

return files.reduce(function (prefix, now) {
return prefix.concat(now);
}).filter(function (item, i, me) {
return files

//摊平数组
.reduce(function (prefix, now) {
return prefix.concat(now);
})

//去重
.filter(function (item, i, me) {
return me.lastIndexOf(item) === i && !matchExclude(item);
});
});
Expand All @@ -81,14 +100,12 @@
content,
cssPath,
exists,

//dependencies
deps,
depends,//dependencies
item,
matches;

//如果文件不存在，则直接跳过, 同时从数组中过滤掉
//如果已经处理过也跳过
//或者已经处理过也跳过
if (!(exists = file.exists((prefix + path))) ||
hash.hasOwnProperty(path)) {

Expand All @@ -100,7 +117,7 @@
//读取文件内容中对js的依赖 格式为：@import core/zepto.js
matches = content.match(/@import\s(.*?)\n/i);
if (matches) {
deps = matches[1]
depends = matches[1]

//多个依赖用道号隔开
.split(/\s*,\s*/g)
Expand Down Expand Up @@ -147,7 +164,7 @@

item = {
path: path,
dependencies: deps,
dependencies: depends,
css: css
};

Expand All @@ -173,15 +190,15 @@
var js = '',
css = '',
pkg = require('../package.json'),

//存取css文件中的图片信息 key为url()括号中的值，value为原始图片路径
images = {},
opt = config.gmu,
prefix = path.resolve(opt.path) + path.sep,
cssPrefix = path.resolve(opt.cssPath) + path.sep,
hash = {},
rendered = {

//不再输出core/zepto.js, 这个文件会单独打包
'core/zepto.js': true
'core/zepto.js': true//不再输出core/zepto.js, 这个文件会单独打包
},
jsRender = function (item) {

Expand All @@ -199,10 +216,11 @@

js += file.read(prefix + item.path) + '\n';

//标明已经输出过
rendered[item.path] = true;
},

readCss = function( obj ){
readCss = function (obj) {
var ret = '',
i = 0,
matches,
Expand All @@ -215,9 +233,11 @@
//收集images
matches = ret.match(/url\(((['"]?)(?!data)([^'"\n]+?)\2)\)/ig);

if( matches ) {
if (matches) {

for( len = matches.length; i<len; i++ ) {
for (len = matches.length; i < len; i++) {

//苦恼，为何matches结果里面不带分组结果呢？
url = matches[i].match(/url\(((['"]?)(?!data)([^'"\n]+?)\2)\)/i)[3];
images[url] = path.resolve(cssPrefix + path.dirname(obj.structor || obj[theme]) + path.sep + url);
}
Expand All @@ -237,7 +257,7 @@

css = item.css;

if(css.dependencies){
if (css.dependencies) {
css.dependencies.forEach(readCss);
}

Expand All @@ -247,7 +267,7 @@
minDest,
destDir,
image,
newname,
newName,
banner;

//生成hash表
Expand All @@ -262,7 +282,7 @@
banner = opt.banner.replace(/@version/g, pkg.version);

dest = opt.dest;
file.write(dest, banner+'\n'+js);
file.write(dest, banner + '\n' + js);

console.log('生成 %s 成功， 大小为: %s ', dest, file.caculateSize(dest));

Expand All @@ -272,22 +292,24 @@

//复制图片
destDir = path.dirname(dest) + path.sep;
for(image in images) {
newname = path.basename(image);

while( file.exists( destDir + 'images/' + newname)){
newname = newname.replace(/(?:-(\d+))?\.(png|jpg|jpeg|gif)$/i, function(m0, m1, m2){
m1 = m1>>>0;
return '-'+(m1 + 1)+'.'+m2;
for (image in images) {
newName = path.basename(image);

//如果文件名已经占用，则换个名字
while (file.exists(destDir + 'images/' + newName)) {
newName = newName.replace(/(?:-(\d+))?\.(png|jpg|jpeg|gif)$/i, function (m0, m1, m2) {
m1 = m1 >>> 0;
return '-' + (m1 + 1) + '.' + m2;
});
}

file.write(destDir + 'images/' + newname, file.read(images[image]));
css = helper.str_replace('\\((\'|")?'+image.replace(/\./g, '\\.')+'\\1\\)', '(./images/'+newname+')', css);
file.write(destDir + 'images/' + newName, file.read(images[image]));
css = helper
.str_replace('\\((\'|")?' + image.replace(/\./g, '\\.') + '\\1\\)', '(./images/' + newName + ')', css);
}

dest = dest.replace(/\.js$/, '.css');
file.write(dest, banner+'\n'+css);
file.write(dest, banner + '\n' + css);
console.log('生成 %s 成功， 大小为: %s ', dest, file.caculateSize(dest));
}

Expand Down
2 changes: 2 additions & 0 deletions build/doc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

//提供直接调用
var run = exports.run = function() {

//todo 改成node全权负责生成
return shell('which php')
.then(function(value){
var phpFile = path.resolve('build/doc/index.php');
Expand Down

0 comments on commit de9bd5b

Please sign in to comment.