Comparing version 0.9.1 to 0.9.2
@@ -9,3 +9,3 @@ var homunculus=require('homunculus'); | ||
exports.default=function(node, ignores, index, fnHash, globalFn, varHash, globanVar) { | ||
exports.default=function(node, ignores, index, fnHash, globalFn, varHash, globalVar) { | ||
var name = node.first().token().content(); | ||
@@ -17,10 +17,3 @@ var fn = fnHash[name] || globalFn[name]; | ||
while(ignores[++index]){} | ||
var res = fn.compile(node.leaf(1), ignores, index, varHash, globanVar).trim().replace(/;$/, '').replace(/\n/g, ''); | ||
var next = node.next(); | ||
//fnc之后没有;号,除非跟着}结束,否则加上 | ||
if(!next | ||
|| next.name() != Node.TOKEN | ||
|| next.token().content() != '}') { | ||
res += ';'; | ||
} | ||
var res = fn.compile(node.leaf(1), ignores, index, varHash, globalVar).trim().replace(/;$/, '').replace(/\n/g, ''); | ||
return res; | ||
@@ -27,0 +20,0 @@ } |
@@ -13,5 +13,5 @@ var homunculus=require('homunculus'); | ||
return { | ||
value: temp.exec(), | ||
unit: temp.unit | ||
}; | ||
value: temp.exec(), | ||
unit: temp.unit | ||
}; | ||
case Node.PRMREXPR: | ||
@@ -18,0 +18,0 @@ var temp = new Prmr(node, varHash, globalHash); |
@@ -21,2 +21,3 @@ var homunculus=require('homunculus'); | ||
index = ignore(node, ignores, index); | ||
index = ignore(node.next(), ignores, index); | ||
} | ||
@@ -23,0 +24,0 @@ else { |
{ | ||
"name": "more-css", | ||
"version": "0.9.1", | ||
"version": "0.9.2", | ||
"description": "a css pre-compiler & agressive compressor", | ||
@@ -24,8 +24,3 @@ "maintainers": [ | ||
"author": "army8735", | ||
"license": [ | ||
{ | ||
"type": "MIT", | ||
"url": "https://github.com/addyosmani/es6-module-loader/blob/master/LICENSE-MIT" | ||
} | ||
], | ||
"license": "MIT", | ||
"config": { | ||
@@ -39,4 +34,4 @@ "blanket": { | ||
"dependencies": { | ||
"clean-css": "^3.0.4", | ||
"homunculus": "^0.7.7" | ||
"clean-css": "~3.0.10", | ||
"homunculus": "~0.8.0" | ||
}, | ||
@@ -54,3 +49,3 @@ "devDependencies": { | ||
"through2": "^0.6.1", | ||
"jsdc": "^0.5.4" | ||
"jsdc": "^0.5.6" | ||
}, | ||
@@ -57,0 +52,0 @@ "main": "./index", |
@@ -9,3 +9,3 @@ module homunculus from 'homunculus'; | ||
export default function(node, ignores, index, fnHash, globalFn, varHash, globanVar) { | ||
export default function(node, ignores, index, fnHash, globalFn, varHash, globalVar) { | ||
var name = node.first().token().content(); | ||
@@ -17,10 +17,3 @@ var fn = fnHash[name] || globalFn[name]; | ||
while(ignores[++index]){} | ||
var res = fn.compile(node.leaf(1), ignores, index, varHash, globanVar).trim().replace(/;$/, '').replace(/\n/g, ''); | ||
var next = node.next(); | ||
//fnc之后没有;号,除非跟着}结束,否则加上 | ||
if(!next | ||
|| next.name() != Node.TOKEN | ||
|| next.token().content() != '}') { | ||
res += ';'; | ||
} | ||
var res = fn.compile(node.leaf(1), ignores, index, varHash, globalVar).trim().replace(/;$/, '').replace(/\n/g, ''); | ||
return res; | ||
@@ -27,0 +20,0 @@ } |
@@ -13,5 +13,5 @@ module homunculus from 'homunculus'; | ||
return { | ||
value: temp.exec(), | ||
unit: temp.unit | ||
}; | ||
value: temp.exec(), | ||
unit: temp.unit | ||
}; | ||
case Node.PRMREXPR: | ||
@@ -18,0 +18,0 @@ var temp = new Prmr(node, varHash, globalHash); |
@@ -21,2 +21,3 @@ module homunculus from 'homunculus'; | ||
index = ignore(node, ignores, index); | ||
index = ignore(node.next(), ignores, index); | ||
} | ||
@@ -23,0 +24,0 @@ else { |
@@ -9,3 +9,3 @@ define(function(require, exports, module){var homunculus=require('homunculus'); | ||
exports.default=function(node, ignores, index, fnHash, globalFn, varHash, globanVar) { | ||
exports.default=function(node, ignores, index, fnHash, globalFn, varHash, globalVar) { | ||
var name = node.first().token().content(); | ||
@@ -17,10 +17,3 @@ var fn = fnHash[name] || globalFn[name]; | ||
while(ignores[++index]){} | ||
var res = fn.compile(node.leaf(1), ignores, index, varHash, globanVar).trim().replace(/;$/, '').replace(/\n/g, ''); | ||
var next = node.next(); | ||
//fnc之后没有;号,除非跟着}结束,否则加上 | ||
if(!next | ||
|| next.name() != Node.TOKEN | ||
|| next.token().content() != '}') { | ||
res += ';'; | ||
} | ||
var res = fn.compile(node.leaf(1), ignores, index, varHash, globalVar).trim().replace(/;$/, '').replace(/\n/g, ''); | ||
return res; | ||
@@ -27,0 +20,0 @@ } |
@@ -13,5 +13,5 @@ define(function(require, exports, module){var homunculus=require('homunculus'); | ||
return { | ||
value: temp.exec(), | ||
unit: temp.unit | ||
}; | ||
value: temp.exec(), | ||
unit: temp.unit | ||
}; | ||
case Node.PRMREXPR: | ||
@@ -18,0 +18,0 @@ var temp = new Prmr(node, varHash, globalHash); |
@@ -21,2 +21,3 @@ define(function(require, exports, module){var homunculus=require('homunculus'); | ||
index = ignore(node, ignores, index); | ||
index = ignore(node.next(), ignores, index); | ||
} | ||
@@ -23,0 +24,0 @@ else { |
1167638
33934
+ Addedclean-css@3.0.10(transitive)
+ Addedcommander@2.5.1(transitive)
+ Addedhomunculus@0.8.13(transitive)
+ Addedsource-map@0.1.43(transitive)
- Removedclean-css@3.4.28(transitive)
- Removedcommander@2.8.1(transitive)
- Removedgraceful-readlink@1.0.1(transitive)
- Removedhomunculus@0.7.9(transitive)
- Removedsource-map@0.4.4(transitive)
Updatedclean-css@~3.0.10
Updatedhomunculus@~0.8.0