Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add glob support for pkg.output #5

Merged
merged 3 commits into from
Jun 26, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
node_modules
coverage
.idea
tmp
13 changes: 12 additions & 1 deletion lib/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ var join = path.join;
var dirname = path.dirname;
var extname = path.extname;
var relative = path.relative;
var glob = require('glob');
var requires = require('requires');
var imports = require('css-imports');
var Class = require('arale').Class;
Expand Down Expand Up @@ -272,7 +273,17 @@ function getEntry(pkg, options) {

// base on pkg.output
if (Array.isArray(pkg.output) && pkg.output.length) {
entry = entry.concat(pkg.output);
pkg.output.forEach(function(outputGlob) {
// glob support
var items = glob.sync(outputGlob, {cwd:pkg.dest});

// handle ./index.js
items = items.map(function(item) {
return item.replace(/^\.\//, '');
});

entry = entry.concat(items);
});
}
}

Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"dependencies": {
"arale": "~0.2.0",
"css-imports": "~0.2.0",
"debug": "^0.7.4",
"debug": "~0.7.4",
"glob": "~4.0.2",
"requires": "~1.0.0",
"semver": "~2.3.0"
},
Expand All @@ -26,4 +27,4 @@
"scripts": {
"test": "make test"
}
}
}
1 change: 1 addition & 0 deletions test/fixtures/spm/output-glob-duplicate/a.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log('a');
7 changes: 7 additions & 0 deletions test/fixtures/spm/output-glob-duplicate/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "a",
"version": "1.0.0",
"spm": {
"output": ["a.js", "./*.js"]
}
}
1 change: 1 addition & 0 deletions test/fixtures/spm/output/c1.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log('c1');
1 change: 1 addition & 0 deletions test/fixtures/spm/output/glob/c.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
require('../c1.js');
2 changes: 1 addition & 1 deletion test/fixtures/spm/output/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"name": "a",
"version": "1.0.0",
"spm": {
"output": ["a.js", "b.js"]
"output": ["a.js", "b.js", "./glob/*.js"]
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

再加一个可能重复的例子吧

}
}
10 changes: 8 additions & 2 deletions test/spm.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,14 @@ describe('Father.SpmPackage', function() {

it('output', function() {
var pkg = getPackage('output');
pkg.output.should.eql(['a.js', 'b.js']);
Object.keys(pkg.files).should.eql(['index.js','a.js', 'a1.js', 'b.js', 'b1.js']);
pkg.output.should.eql(['a.js', 'b.js', './glob/*.js']);
Object.keys(pkg.files).should.eql(['index.js','a.js', 'a1.js', 'b.js', 'b1.js', 'glob/c.js', 'c1.js']);
});

it('output glob duplicate', function() {
var pkg = getPackage('output-glob-duplicate');
pkg.output.should.eql(['a.js', './*.js']);
Object.keys(pkg.files).should.eql(['a.js']);
});

it('resolve deps', function() {
Expand Down