added support for more atrules

added support for `@keyframes` and `animation`

Author: sokra

lib/parseSource.js

@@ -5,7 +5,7 @@
   "description": "css loader module for webpack",
   "dependencies": {
     "clean-css": "^3.1.9",
-    "fastparse": "^1.0.0",
+    "fastparse": "^1.1.1",
     "loader-utils": "~0.2.2",
     "source-list-map": "^0.1.4"
   },
@@ -18,7 +18,7 @@
   "scripts": {
     "test": "mocha",
     "travis": "npm run cover -- --report lcovonly",
-    "cover": "istanbul cover -x *.runtime.js node_modules/mocha/bin/_mocha",
+    "cover": "istanbul cover node_modules/mocha/bin/_mocha",
     "publish-patch": "mocha && npm version patch && git push && git push --tags && npm publish"
   },
   "repository": {

package.json

@@ -4,7 +4,7 @@ require("should");
 var cssLoader = require("../index.js");
 var vm = require("vm");
 
-function assetEvaluated(output, result, modules) {
+function assetEvaluated(output, result, modules, noLocals) {
 	try {
 		var fn = vm.runInThisContext("(function(module, exports, require) {" + output + "})", "testcase.js");
 		var m = { exports: {}, id: 1 };
@@ -23,6 +23,7 @@ function assetEvaluated(output, result, modules) {
 	}
 	delete m.exports.toString;
 	delete m.exports.i;
+	if(noLocals) delete m.exports.locals;
 	m.exports.should.be.eql(result);
 
 }
@@ -47,6 +48,26 @@ exports.test = function test(name, input, result, query, modules) {
 	});
 };
 
+exports.testWithoutLocals = function testWithoutLocals(name, input, result, query, modules) {
+	it(name, function() {
+		var output = cssLoader.call({
+			options: {
+				context: ""
+			},
+			loaders: [{request: "loader"}],
+			loaderIndex: 0,
+			context: "",
+			resource: "test.css",
+			request: "css-loader!test.css",
+			query: query,
+			emitError: function(message) {
+				throw new Error(message);
+			}
+		}, input);
+		assetEvaluated(output, result, modules, true);
+	});
+};
+
 exports.testMinimize = function testMinimize(name, input, result, query, modules) {
 	it(name, function() {
 		var output = cssLoader.call({

test/helpers.js

@@ -0,0 +1,17 @@
+/*globals describe */
+
+var test = require("./helpers").testWithoutLocals;
+
+var path = require("path");
+var fs = require("fs");
+var testCasesPath = path.join(__dirname, "moduleTestCases");
+var testCases = fs.readdirSync(testCasesPath);
+
+describe("module", function() {
+	testCases.forEach(function(name) {
+		var source = fs.readFileSync(path.join(testCasesPath, name, "source.css"), "utf-8");
+		var expected = fs.readFileSync(path.join(testCasesPath, name, "expected.css"), "utf-8");
+
+		test(name, source, [[1, expected, ""]], "?module&localIdentName=_[local]_");
+	});
+});

test/moduleTest.js

@@ -0,0 +1,48 @@
+._a_ {
+	color: green;
+}
+
+@keyframes _bounce_ {
+	0% {
+		transform: translateY(-100%);
+		opacity: 0;
+	}
+	5% {
+		transform: translateY(-100%);
+		opacity: 0;
+	}
+}
+
+@-webkit-keyframes _bounce2_ {
+	0% {
+		transform: translateY(-100%);
+		opacity: 0;
+	}
+	5% {
+		transform: translateY(-100%);
+		opacity: 0;
+	}
+}
+
+._bounce_ {
+	animation-name: _bounce_;
+	animation: _bounce2_ 1s ease;
+}
+
+._bounce2_ {
+	color: green;
+	animation: _bounce_ 1s ease;
+	animation-name: _bounce2_;
+}
+
+._bounce3_ {
+	animation: _bounce_ 1s ease, _bounce2_
+}
+
+._bounce4_ {
+	animation: _bounce_ 1s ease, _bounce2_;
+}
+
+._b_ {
+	color: green;
+}

test/moduleTestCases/keyframes-and-animation/expected.css

@@ -0,0 +1,48 @@
+.a {
+	color: green;
+}
+
+@keyframes bounce {
+	0% {
+		transform: translateY(-100%);
+		opacity: 0;
+	}
+	5% {
+		transform: translateY(-100%);
+		opacity: 0;
+	}
+}
+
+@-webkit-keyframes bounce2 {
+	0% {
+		transform: translateY(-100%);
+		opacity: 0;
+	}
+	5% {
+		transform: translateY(-100%);
+		opacity: 0;
+	}
+}
+
+.bounce {
+	animation-name: bounce;
+	animation: bounce2 1s ease;
+}
+
+.bounce2 {
+	color: green;
+	animation: bounce 1s ease;
+	animation-name: bounce2;
+}
+
+.bounce3 {
+	animation: bounce 1s ease, bounce2
+}
+
+.bounce4 {
+	animation: bounce 1s ease, bounce2;
+}
+
+.b {
+	color: green;
+}

test/moduleTestCases/keyframes-and-animation/source.css

@@ -0,0 +1,8 @@
+._a_ ._b_, ._c_ ._d_, #_id_ {
+	color: green;
+	font-size: 1.5pt;
+}
+a[href="#b.c"]._x_._y_ {
+	color: green;
+	font-size: 1.5pt;
+}

test/moduleTestCases/simple/expected.css

@@ -0,0 +1,8 @@
+.a .b, .c .d, #id {
+	color: green;
+	font-size: 1.5pt;
+}
+a[href="#b.c"].x.y {
+	color: green;
+	font-size: 1.5pt;
+}