stylus - npm Package Compare versions

Comparing version 0.30.1 to 0.31.0

lib/lexer.js

@@ -459,3 +459,3 @@
     var captures;
-    if (captures = /^@media[ \t]*([^\/{\n]+)/.exec(this.str)) {
+    if (captures = /^@media[ \t]*(.+?)(?=\/\/|[\n{])/.exec(this.str)) {
       this.skip(captures);
@@ -462,0 +462,0 @@ return new Token('media', captures[1].trim());

lib/nodes/unit.js

@@ -95,2 +95,3 @@
   if (this.shouldCoerce(op)) {
+    right = right.first;
     // percentages
@@ -100,3 +101,3 @@ if (('-' == op || '+' == op) && '%' == right.type) {
     } else {
-      right = this.coerce(right.first);
+      right = this.coerce(right);
     }
@@ -103,0 +104,0 @@

lib/stylus.js

@@ -27,3 +27,3 @@
 
-exports.version = '0.30.1';
+exports.version = '0.31.0';
 
@@ -30,0 +30,0 @@ /**

lib/units.js

@@ -17,5 +17,5 @@
   , 'Hz', 'kHz' // frequencies
-  , 'dpi', 'dpcm', 'dppx' // resolutions
+  , 'dpi', 'dpcm', 'dppx', 'x' // resolutions
   , '%' // percentage type
   , 'fr' // grid-layout (http://www.w3.org/TR/css3-grid-layout/)
 ];

lib/visitor/compiler.js

@@ -457,2 +457,16 @@ /*!
 
+  function interpolateParent(selector, buf) {
+    var str = selector.val.trim();
+    if (buf.length) {
+      for (var i = 0, len = buf.length; i < len; ++i) {
+        if (~buf[i].indexOf('&')) {
+          str = buf[i].replace(/&/g, str).trim();
+        } else {
+          str += ' ' + buf[i].trim();
+        }
+      }
+    }
+    return str;
+  }
+
   function compile(arr, i) {
@@ -466,3 +480,3 @@ if (i) {
         } else {
-          selectors.push(selector.val);
+          selectors.push(interpolateParent(selector, buf));
         }
@@ -472,12 +486,3 @@ });
       arr[0].forEach(function(selector){
-        var str = selector.val.trim();
-        if (buf.length) {
-          for (var i = 0, len = buf.length; i < len; ++i) {
-            if (~buf[i].indexOf('&')) {
-              str = buf[i].replace(/&/g, str).trim();
-            } else {
-              str += ' ' + buf[i].trim();
-            }
-          }
-        }
+        var str = interpolateParent(selector, buf);
         selectors.push(self.indent + str.trimRight());
@@ -484,0 +489,0 @@ });

lib/visitor/evaluator.js

@@ -652,3 +652,3 @@
   // Literal
-  if (~path.indexOf('.css')) {
+  if (~path.indexOf('.css') && !~path.indexOf('.css.')) {
     literal = true;
@@ -659,3 +659,3 @@ if (!includeCSS) return imported;
   // support optional .styl
-  if (!literal && !~path.indexOf('.styl')) path += '.styl';
+  if (!literal && !/\.styl$/i.test(path)) path += '.styl';
 
@@ -1012,2 +1012,3 @@ // Lookup
         case 'function':
+        case 'media':
           return block;
@@ -1014,0 +1015,0 @@ }

lib/visitor/normalizer.js

@@ -218,4 +218,6 @@
       groups.forEach(function(group){
-        self.extend(group, selectors);
-        group.push(node);
+        if (!group.nodes.some(function(n){ return n.val == selector })) {
+          self.extend(group, selectors);
+          group.push(node);
+        }
       });
@@ -222,0 +224,0 @@ });

package.json

 {   "name": "stylus"
   , "description": "Robust, expressive, and feature-rich CSS superset"
-  , "version": "0.30.1"
+  , "version": "0.31.0"
   , "author": "TJ Holowaychuk <[e-mail]>"
@@ -5,0 +5,0 @@ , "keywords": ["css", "parser", "style", "stylesheets", "jade", "language"]

Readme.md

@@ -120,2 +120,3 @@ # Stylus
    - [DocPad](https://github.com/bevry/docpad)
+   - [Punch](https://github.com/laktek/punch-stylus-compiler)
 
@@ -122,0 +123,0 @@ ### Screencasts

No alert changes

Improved metrics

Number of lines in readme file

159

increased by0.63%

Number of low supply chain risk alerts

12

decreased by-7.69%

Worsened metrics

Total package byte prevSize

230933

decreased by-0.35%

Number of package files

64

decreased by-5.88%

Lines of code

8798

decreased by-0.29%

No dependency changes