Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
AsaAyers committed Oct 28, 2012
2 parents 51da163 + f88e8fb commit 5e759bb6f5aca097c8387905f2cc05c29c263479
Showing with 19 additions and 10 deletions.
  1. +8 −8 package.json
  2. +1 −1 tasks/init
  3. +3 −0 tasks/requirejs.js
  4. +1 −1 tasks/server.js
  5. +6 −0 tasks/styles.js
View
@@ -1,7 +1,7 @@
{
"name": "bbb",
"description": "Backbone Boilerplate Build Tool",
- "version": "0.1.13",
+ "version": "0.1.15",
"homepage": "https://github.com/backbone-boilerplate/grunt-bbb",
"author": {
"name": "Tim Branyen (@tbranyen)",
@@ -16,21 +16,21 @@
"url": "https://github.com/backbone-boilerplate/grunt-bbb/issues"
},
"dependencies": {
- "grunt": "0.3.15",
+ "grunt": "0.3.17",
"grunt-contrib": "0.1.7",
- "grunt-jasmine-task": "0.2.2",
+ "grunt-jasmine-task": "0.2.3",
- "requirejs": "2.0.6",
- "handlebars": "1.0.6-2",
+ "requirejs": "2.1.1",
+ "handlebars": "1.0.7",
"express": "2.5.9",
"http-proxy": "0.8.3",
- "stylus": "0.29.0",
- "nib": "0.8.2",
+ "stylus": "0.30.1",
+ "nib": "0.8.2",
"cssom": "0.2.5"
},
"devDependencies": {
- "grunt": "~0.3.14"
+ "grunt": "~0.3.17"
},
"keywords": ["gruntplugin"],
"engines": {
Submodule init updated 1 files
+1 −1 bbb/root
View
@@ -21,6 +21,7 @@ module.exports = function(grunt) {
grunt.registerTask("requirejs", "Build a RequireJS project.", function(prop) {
var options = grunt.config("requirejs") || {};
+ var done = this.async();
// Merge passed options into defaults
options = _.extend({}, {
@@ -38,6 +39,8 @@ module.exports = function(grunt) {
grunt.helper("r.js", options, function(response) {
// Print out response
log.writeln(response);
+
+ done();
});
});
View
@@ -78,7 +78,7 @@ module.exports = function(grunt) {
fs.readFile(file, function(err, contents) {
grunt.helper("stylus", contents.toString(), {
- paths: ["assets/css/"]
+ paths: ["assets/css/", require("nib").path]
}, function(css) {
res.header("Content-type", "text/css");
res.send(css);
View
@@ -34,6 +34,12 @@ module.exports = function(grunt) {
return log.write("No css imports defined.");
}
+ if (!options.paths) {
+ options.paths = [];
+ }
+
+ options.paths.push(require("nib").path);
+
// Iterate over the CSS rules, reducing to only @imports, then apply the
// correct prefixed path to each file. Finally, process each file and
// concat into the output file.

0 comments on commit 5e759bb

Please sign in to comment.