mirror of
https://github.com/meteor/meteor.git
synced 2026-05-02 03:01:46 -04:00
Merge branch 'dev-bundle-bump' into devel
This commit is contained in:
@@ -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>
|
||||
|
||||
|
||||
|
||||
|
||||
==============
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
set -e
|
||||
|
||||
BUNDLE_VERSION=0.1.5
|
||||
BUNDLE_VERSION=0.1.6
|
||||
UNAME=$(uname)
|
||||
ARCH=$(uname -m)
|
||||
|
||||
@@ -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
|
||||
|
||||
2
meteor
2
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.
|
||||
|
||||
@@ -3,6 +3,7 @@ Package.describe({
|
||||
});
|
||||
|
||||
var stylus = require('stylus');
|
||||
var nib = require('nib');
|
||||
var fs = require('fs');
|
||||
|
||||
Package.register_extension(
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user