Merge pull request #14 from necolas/upgrade-parser

Upgrade the CSS parser

Author: conradz

index.js

@@ -1,6 +1,6 @@
 var resolve = require('resolve'),
     path = require('path'),
-    parse = require('css-parse'),
+    parse = require('css').parse,
     fs = require('fs');
 
 var ABS_URL = /^url\(|:\/\//,
@@ -107,7 +107,7 @@ function processPackage(shimPath) {
     return function (package) {
         package.main = shimPath || package.style || 'index.css';
         return package;
-    }
+    };
 }
 
 function hasOwn(obj, prop) {

package.json

@@ -24,12 +24,12 @@
     "url": "https://github.com/conradz/rework-npm/issues"
   },
   "devDependencies": {
-    "rework": "~0.20.1",
+    "rework": "^1.0.0",
     "tap": "~0.4.4",
     "node-sass": "^0.8.1"
   },
   "dependencies": {
     "resolve": "~0.6.1",
-    "css-parse": "~1.7.0"
+    "css": "^2.0.0"
   }
 }

test.js

@@ -48,7 +48,7 @@ test('Import package in @media', function(t) {
         '@media (min-width: 640px) {',
         '  @import "test";',
         '}'
-    ].join('\n')
+    ].join('\n');
 
     var output = rework(source).use(reworkNPM('test')).toString();
     t.equal(output, [
@@ -110,9 +110,10 @@ test('Include source maps', function(t) {
     t.equal(output,
         '.test {\n  content: "Test package";\n}\n' +
         '/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozL' +
-        'CJmaWxlIjoiZ2VuZXJhdGVkLmNzcyIsInNvdXJjZXMiOlsibm9kZV9tb2R1bGVzL3Rl' +
-        'c3QvaW5kZXguY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBO0VBQ0ksdUJ' +
-        'BQXVCIn0= */');
+        'CJmaWxlIjpudWxsLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy90ZXN0L2luZGV4LmNz' +
+        'cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTtFQUNJIiwic291cmNlc0NvbnR' +
+        'lbnQiOlsiLnRlc3Qge1xuICAgIGNvbnRlbnQ6IFwiVGVzdCBwYWNrYWdlXCI7XG59XG' +
+        '4iXX0= */');
     t.end();
 });