From 6081f174c2d49cc02d36715cce95bdfd2b621163 Mon Sep 17 00:00:00 2001 From: Trevor Burnham Date: Sat, 9 Jun 2012 19:34:48 -0400 Subject: [PATCH 1/6] Updating Stylus to version 0.27.1 (includes API changes) --- admin/generate-dev-bundle.sh | 2 +- packages/stylus/package.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/admin/generate-dev-bundle.sh b/admin/generate-dev-bundle.sh index d358104ae1..b626f40cfc 100755 --- a/admin/generate-dev-bundle.sh +++ b/admin/generate-dev-bundle.sh @@ -130,7 +130,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.27.1 npm install mime@1.2.5 npm install semver@1.0.13 npm install handlebars@1.0.5beta diff --git a/packages/stylus/package.js b/packages/stylus/package.js index 0cad50aefa..b688bae4d8 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -11,7 +11,9 @@ Package.register_extension( var contents = fs.readFileSync(source_path); - stylus.render(contents.toString('utf8'), { filename: source_path }, function(err, css) { + stylus(contents.toString('utf8')) + .set('filename', source_path) + .render(function(err, css) { if (err) { bundle.error('Stylus compiler error: ' + err.message); return; From b2667bd5a972f84bc9cdb61ab0ab07caabedce7d Mon Sep 17 00:00:00 2001 From: Trevor Burnham Date: Sat, 9 Jun 2012 19:36:10 -0400 Subject: [PATCH 2/6] Adding support for Nib to the Stylus package --- admin/generate-dev-bundle.sh | 1 + packages/stylus/package.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/admin/generate-dev-bundle.sh b/admin/generate-dev-bundle.sh index b626f40cfc..4c2bfec84f 100755 --- a/admin/generate-dev-bundle.sh +++ b/admin/generate-dev-bundle.sh @@ -131,6 +131,7 @@ npm install coffee-script@1.3.1 npm install less@1.3.0 npm install sass@0.5.0 npm install stylus@0.27.1 +npm install nib@0.5.0 npm install mime@1.2.5 npm install semver@1.0.13 npm install handlebars@1.0.5beta diff --git a/packages/stylus/package.js b/packages/stylus/package.js index b688bae4d8..ee995f7c9c 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -3,6 +3,7 @@ Package.describe({ }); var stylus = require('stylus'); +var nib = require('nib'); var fs = require('fs'); Package.register_extension( @@ -12,6 +13,7 @@ Package.register_extension( var contents = fs.readFileSync(source_path); stylus(contents.toString('utf8')) + .use(nib()) .set('filename', source_path) .render(function(err, css) { if (err) { From 0a5192352aab6ced928f18c670423c1552240430 Mon Sep 17 00:00:00 2001 From: Nick Martin Date: Wed, 20 Jun 2012 14:23:30 -0700 Subject: [PATCH 3/6] Add nib to license file. --- LICENSE.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/LICENSE.txt b/LICENSE.txt index 3f6c558177..e6f90a6950 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -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 + + ============== From b0f3de7cb10ec1ad003cd5f2f8a2315f46f5622d Mon Sep 17 00:00:00 2001 From: Nick Martin Date: Mon, 9 Jul 2012 17:11:17 -0700 Subject: [PATCH 4/6] Bump stylus and nib versions again, they are already out of date. --- admin/generate-dev-bundle.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/generate-dev-bundle.sh b/admin/generate-dev-bundle.sh index 4c2bfec84f..354edd08c8 100755 --- a/admin/generate-dev-bundle.sh +++ b/admin/generate-dev-bundle.sh @@ -130,8 +130,8 @@ 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.27.1 -npm install nib@0.5.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 From cf232430383da2afe1d9b25f1e406256b1e02d50 Mon Sep 17 00:00:00 2001 From: Nick Martin Date: Mon, 9 Jul 2012 17:13:59 -0700 Subject: [PATCH 5/6] Bump gzippo. --- admin/generate-dev-bundle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/generate-dev-bundle.sh b/admin/generate-dev-bundle.sh index 354edd08c8..7a7c5a0fa3 100755 --- a/admin/generate-dev-bundle.sh +++ b/admin/generate-dev-bundle.sh @@ -125,7 +125,7 @@ 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 From e3d970fd8241a6298da199e98c18e51e4b42ffb1 Mon Sep 17 00:00:00 2001 From: Nick Martin Date: Mon, 9 Jul 2012 17:15:32 -0700 Subject: [PATCH 6/6] Bump dev bundle version number. --- admin/generate-dev-bundle.sh | 2 +- meteor | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/generate-dev-bundle.sh b/admin/generate-dev-bundle.sh index 7a7c5a0fa3..78663532f2 100755 --- a/admin/generate-dev-bundle.sh +++ b/admin/generate-dev-bundle.sh @@ -2,7 +2,7 @@ set -e -BUNDLE_VERSION=0.1.5 +BUNDLE_VERSION=0.1.6 UNAME=$(uname) ARCH=$(uname -m) diff --git a/meteor b/meteor index 12f6861ffd..6d12ecc158 100755 --- a/meteor +++ b/meteor @@ -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.