Skip to content

Commit

Permalink
Merge branch 'dev-bundle-bump' into devel
Browse files Browse the repository at this point in the history
  • Loading branch information
n1mmy committed Jul 10, 2012
2 parents 680220e + e3d970f commit c046ddb
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 5 deletions.
7 changes: 7 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,13 @@ node-archy: https://github.com/substack/node-archy
Copyright 2012 James Halliday (mail@substack.net)


----------
nib: https://github.com/visionmedia/nib
----------

Copyright (c) 2011 TJ Holowaychuk <tj@vision-media.ca>




==============
Expand Down
7 changes: 4 additions & 3 deletions admin/generate-dev-bundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

BUNDLE_VERSION=0.1.5
BUNDLE_VERSION=0.1.6
UNAME=$(uname)
ARCH=$(uname -m)

Expand Down Expand Up @@ -125,12 +125,13 @@ which npm

cd "$DIR/lib/node_modules"
npm install connect@1.8.7 # not 2.x yet. sockjs doesn't work w/ new connect
npm install gzippo@0.1.4
npm install gzippo@0.1.7
npm install optimist@0.3.1
npm install coffee-script@1.3.1
npm install less@1.3.0
npm install sass@0.5.0
npm install stylus@0.25.0
npm install stylus@0.28.1
npm install nib@0.7.0
npm install mime@1.2.5
npm install semver@1.0.13
npm install handlebars@1.0.5beta
Expand Down
2 changes: 1 addition & 1 deletion meteor
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

BUNDLE_VERSION=0.1.5
BUNDLE_VERSION=0.1.6

# OS Check. Put here because here is where we download the precompiled
# bundles that are arch specific.
Expand Down
6 changes: 5 additions & 1 deletion packages/stylus/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Package.describe({
});

var stylus = require('stylus');
var nib = require('nib');
var fs = require('fs');

Package.register_extension(
Expand All @@ -11,7 +12,10 @@ Package.register_extension(

var contents = fs.readFileSync(source_path);

stylus.render(contents.toString('utf8'), { filename: source_path }, function(err, css) {
stylus(contents.toString('utf8'))
.use(nib())
.set('filename', source_path)
.render(function(err, css) {
if (err) {
bundle.error('Stylus compiler error: ' + err.message);
return;
Expand Down

0 comments on commit c046ddb

Please sign in to comment.