Skip to content

allow wiredep options to be passed through to wiredep call: #24

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.

Sign up for GitHub

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

Open
bryanchriswhite wants to merge 1 commit into
base: master
Choose a base branch
from
Open

allow wiredep options to be passed through to wiredep call: #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 21 additions & 0 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,27 @@ module.exports = function(grunt) {
'tmp/bowerWithOverrides.html': ['test/fixtures/bower_overrides/bower.json']
}
},
bowerWithWiredepOptions: {
options: {
wiredepOptions: {
devDependencies: true
}
},
files: {
'tmp/bowerWithWiredepOptions.html': ['test/fixtures/bower_dev_and_min/bower.json']
}
},
bowerWithWiredepOptionsMin: {
options: {
min: true,
wiredepOptions: {
devDependencies: true
}
},
files: {
'tmp/bowerWithWiredepOptionsMin.html': ['test/fixtures/bower_dev_and_min/bower.json']
}
},
custom: {
options: {
template: 'test/fixtures/custom.tpl',
Expand Down
10 changes: 5 additions & 5 deletions tasks/injector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ module.exports = function(grunt) {

// Special handling of bower.json:
if (path.basename(filepath) === 'bower.json') {
files.push.apply(files, getFilesFromBower(filepath).map(function (fpath) {
files.push.apply(files, getFilesFromBower(filepath, options.wiredepOptions).map(function (fpath) {
return {path: fpath, ignore: path.dirname(filepath), key: (options.bowerPrefix || '') + ext(fpath)};
}));
} else {
Expand Down Expand Up @@ -187,14 +187,14 @@ function getTag (tag, ext) {
return tag.replace(new RegExp( escapeForRegExp('{{ext}}'), 'g'), ext);
}

function getFilesFromBower (bowerFile) {
function getFilesFromBower (bowerFile, _wiredepOptions) {

// Load bower dependencies via `wiredep` programmatic access
var dependencies = require('wiredep')({
var wiredepOptions = _.extend({
'bowerJson': JSON.parse(fs.readFileSync(bowerFile, 'utf8')),
'directory': getBowerComponentsDir(bowerFile)
}
);
}, _wiredepOptions),
dependencies = require('wiredep')(wiredepOptions);

// Pluck out just the JS and CSS Dependencies
var filteredDependencies = _.pick(dependencies,'css','js');
Expand Down
23 changes: 23 additions & 0 deletions test/expected/bowerWithWiredepOptions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<!DOCTYPE html>
<html>
<head>
<title>grunt-injector</title>
<!-- injector:html -->
<!-- endinjector -->
<!-- injector:css -->
<link rel="stylesheet" href="/bower_components/fake/fake.css">
<link rel="stylesheet" href="/bower_components/fake-dev/fake-dev.css">
<!-- endinjector -->
<!-- injector:bower:css -->
<!-- endinjector -->
</head>
<body>

<!-- injector:bower:js -->
<!-- endinjector -->
<!-- injector:js -->
<script src="/bower_components/fake/fake.js"></script>
<script src="/bower_components/fake-dev/fake-dev.js"></script>
<!-- endinjector -->
</body>
</html>
23 changes: 23 additions & 0 deletions test/expected/bowerWithWiredepOptionsMin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<!DOCTYPE html>
<html>
<head>
<title>grunt-injector</title>
<!-- injector:html -->
<!-- endinjector -->
<!-- injector:css -->
<link rel="stylesheet" href="/bower_components/fake/fake.css">
<link rel="stylesheet" href="/bower_components/fake-dev/fake-dev.css">
<!-- endinjector -->
<!-- injector:bower:css -->
<!-- endinjector -->
</head>
<body>

<!-- injector:bower:js -->
<!-- endinjector -->
<!-- injector:js -->
<script src="/bower_components/fake/fake.min.js"></script>
<script src="/bower_components/fake-dev/fake-dev.min.js"></script>
<!-- endinjector -->
</body>
</html>
9 changes: 9 additions & 0 deletions test/fixtures/bower_dev_and_min/bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name": "test",
"dependencies": {
"fake": "x"
},
"devDependencies": {
"fake-dev": "x"
}
}
7 changes: 7 additions & 0 deletions test/fixtures/bower_dev_and_min/bower_components/fake-dev/bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "fake-dev",
"main": [
"fake-dev.js",
"fake-dev.css"
]
}
Empty file added test/fixtures/bower_dev_and_min/bower_components/fake-dev/fake-dev.css
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions test/fixtures/bower_dev_and_min/bower_components/fake-dev/fake-dev.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// Fake
1 change: 1 addition & 0 deletions test/fixtures/bower_dev_and_min/bower_components/fake-dev/fake-dev.min.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
//Fake min
7 changes: 7 additions & 0 deletions test/fixtures/bower_dev_and_min/bower_components/fake/bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "fake",
"main": [
"fake.js",
"fake.css"
]
}
Empty file added test/fixtures/bower_dev_and_min/bower_components/fake/fake.css
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions test/fixtures/bower_dev_and_min/bower_components/fake/fake.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// Fake
1 change: 1 addition & 0 deletions test/fixtures/bower_dev_and_min/bower_components/fake/fake.min.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
//Fake min
18 changes: 18 additions & 0 deletions test/injector_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,24 @@ exports.injector = {

test.done();
},
bowerWithWiredepOptions: function(test){
test.expect(1);

var actual = grunt.file.read('tmp/bowerWithWiredepOptions.html');
var expected = grunt.file.read('test/expected/bowerWithWiredepOptions.html');
test.equal(actual, expected,'should inject dependencies installed with bower, and it should take `wiredepOptions` options into account.');

test.done();
},
bowerWithWiredepOptionsMin: function(test){
test.expect(1);

var actual = grunt.file.read('tmp/bowerWithWiredepOptionsMin.html');
var expected = grunt.file.read('test/expected/bowerWithWiredepOptionsMin.html');
test.equal(actual, expected,'should inject minified dependencies installed with bower if they exist and `min` option is true, and it should take `wiredepOptions` options into account.');

test.done();
},
custom: function(test) {
test.expect(1);

Expand Down