Skip to content

Commit

Permalink
Merge branch 'master' of github.com:keelii/wo
Browse files Browse the repository at this point in the history
  • Loading branch information
keelii committed Apr 13, 2016
2 parents 0d4cdb5 + 380bee8 commit 7360186
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 4 deletions.
32 changes: 31 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,36 @@
## Change Log

### upcoming (2016/04/07 14:24 +00:00)
### v0.0.27 (2016/04/12 13:33 +00:00)
- [83a311b](https://github.com/keelii/wo/commit/83a311bd2b89d37217388791ed0c77621b594d54) npm publish 0.0.27 (@keelii)
- [da7468d](https://github.com/keelii/wo/commit/da7468dc5d640ad4a3f383f90195527b34af5fd6) use => (@keelii)
- [7bdd4a9](https://github.com/keelii/wo/commit/7bdd4a9ea84400074a29841eb0fb10e89ef2723b) add test cases (@keelii)
- [c94b3f5](https://github.com/keelii/wo/commit/c94b3f5a6ef835ea0613b307215ccfa7f24f5424) force trigger gen error test case (@keelii)
- [821fe96](https://github.com/keelii/wo/commit/821fe9630c44ad1bbc2b198abd13f600de0c2ded) force trigger gen error test case (@keelii)
- [3a0ffe3](https://github.com/keelii/wo/commit/3a0ffe340eea7423427dc7fee5d4a4b83fc1e423) Merge branch 'master' of github.com:keelii/wo (@keelii)
- [1d82f5c](https://github.com/keelii/wo/commit/1d82f5c4ae6bd6a88e44cafacf2b0a26bc80012a) fix gen test case (@keelii)
- [5d16a15](https://github.com/keelii/wo/commit/5d16a15929ca60af8daaae3cb30babfc2d35a977) add test cases to gen.js (@keelii)
- [0d94bee](https://github.com/keelii/wo/commit/0d94bee4182f19e1b4396c17065e6a7d758c1f11) add test cases to gen (@keelii)
- [84c1af2](https://github.com/keelii/wo/commit/84c1af22b0118f566a183f15da8c88455d90ee6c) add start watch test case. (@keelii)
- [08e205c](https://github.com/keelii/wo/commit/08e205c7b1838f6a9609a19f8bc449be0d05fc9b) remove unused code. (@keelii)
- [1647190](https://github.com/keelii/wo/commit/16471902529356efae0dae45f5eac048f148519b) fix unix // prefix (@keelii)
- [aad35ee](https://github.com/keelii/wo/commit/aad35ee3d555f3326b30b0367e73b445bddb90e0) remove unused. (@keelii)
- [97f57e1](https://github.com/keelii/wo/commit/97f57e17854ce7e95de8a2e33afe68795b3b9ba9) Merge branch 'master' of github.com:keelii/wo (@keelii)
- [7e18b04](https://github.com/keelii/wo/commit/7e18b043a8b5cb510a1db645e2f658658f389b79) remove unused. (@keelii)
- [4744262](https://github.com/keelii/wo/commit/4744262dbbd5583422b203c20a5bdacdd28eae18) fix unix // (@keelii)
- [33c56e2](https://github.com/keelii/wo/commit/33c56e2c2b12666ac400b9d45ceb877b474a7df4) move coverage. (@keelii)
- [0102a61](https://github.com/keelii/wo/commit/0102a61472f9d9bec90c28452e72be6d1e3bab79) fix rebasePath url (@keelii)
- [072a561](https://github.com/keelii/wo/commit/072a5610a35793a0799139ba58ab1f99faf0ce0f) fix unix-line // escape (@keelii)
- [dc6b0c7](https://github.com/keelii/wo/commit/dc6b0c7de3cd04d9f9272bf92fa8ab7631a00579) fix unix-line // escape (@keelii)
- [65c2502](https://github.com/keelii/wo/commit/65c25020179cb7d5228c850922aa459f88a23a37) remove request (@keelii)

### v0.0.26 (2016/04/10 06:38 +00:00)
- [cfadfd5](https://github.com/keelii/wo/commit/cfadfd548df673bcfc947728612cb053ab9ab157) 升级版本 (@keelii)
- [23ab3ac](https://github.com/keelii/wo/commit/23ab3ac4e0747a0821615f1081495cbd4ed63b3a) 整理添加了测试用例 (@keelii)
- [49b49fc](https://github.com/keelii/wo/commit/49b49fc531226a059cce02658fc47ea61fa7a43e) 重写测试用例,以后维护用例更方便了 (@keelii)
- [d850704](https://github.com/keelii/wo/commit/d85070434a437997bf315f16f6c85941a37ba5e9) add inject tag (@keelii)
- [08aeb86](https://github.com/keelii/wo/commit/08aeb8680ae93635f2bbaa42098f492e08fe6f35) 添加多个打包多个 compoent 的方式: (@keelii)

### v0.0.25 (2016/04/07 14:23 +00:00)
- [5896ca6](https://github.com/keelii/wo/commit/5896ca6671f5b19b8e876530a398f20c897bafb8) Targets log only in dir match (@keelii)
- [2aebf29](https://github.com/keelii/wo/commit/2aebf29d5d5d25f634753111fc71ccbae26e03a9) add document link (@keelii)
- [82d380b](https://github.com/keelii/wo/commit/82d380b9cb2246ea20278fb0277d57e7663c781c) update readme (@keelii)
Expand Down
4 changes: 2 additions & 2 deletions cli/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ function getSources (config, input) {
if (utils.isMultiTarget(input)) {
targets = input.split(',')
.filter(inp => utils.hasDir(inp, config._COMPONENT_ROOT))
.map(inp => path.join(config._COMPONENT_ROOT, inp, '/*'));
.map(inp => path.join(config._COMPONENT_ROOT, inp, '/**'));

files = getGlobFiles(targets, config);

logTarget(targets.map(t => utils.relativeDir(t)).join(','));
}
// wo build component_name
if (utils.hasDir(input, config._COMPONENT_ROOT)) {
targets = path.join(config._COMPONENT_ROOT, input, '/*');
targets = path.join(config._COMPONENT_ROOT, input, '/**');
files = getGlobFiles(targets, config);

logTarget(utils.relativeDir(targets));
Expand Down
2 changes: 2 additions & 0 deletions cli/start.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ function watchRefs(config) {
}

module.exports = function(config, input, callback) {
callback = callback || function() {};

async.series([
cb => build(config, input, cb),
cb => server(config, cb),
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wooo",
"version": "0.0.26",
"version": "0.0.28",
"author": "keelii <[email protected]>",
"description": "FE Build tool with easy cli.",
"license": "MIT",
Expand Down

0 comments on commit 7360186

Please sign in to comment.