Add quickfix for csso parse error

index.js

@@ -15,7 +15,7 @@ module.exports = function(content, map) {
 	var forceMinimize = query.minimize;
 	var importLoaders = parseInt(query.importLoaders, 10) || 0;
 	var minimize = typeof forceMinimize !== "undefined" ? !!forceMinimize : (this && this.minimize);
-	var tree = csso.parse(content, "stylesheet");
+	var tree = csso.parse(prepareContentForCsso(content), "stylesheet");
 	if(tree && minimize) {
 		tree = csso.compress(tree, query.disableStructuralMinification);
 		tree = csso.cleanInfo(tree);
@@ -161,4 +161,9 @@ function annotateUrls(tree) {
 		}
 	}
 }
-
+// Quickfix for https://github.com/webpack/css-loader/issues/36
+// Remove this test when the problem has been fixed at https://github.com/css/csso/issues/185
+// or when another css parser is used
+function prepareContentForCsso(content) {
+	return content.replace(/\*\/\w*@/g, "*/a{}@");
+}

test/urlTest.js

@@ -125,6 +125,15 @@ describe("url", function() {
 	test("media query", "@media (min-width: 500px) { body { background: url(image.png); } }", [
 		[1, "@media (min-width: 500px) { body { background: url({./image.png}); } }", ""]
 	]);
+	// Quickfix for https://github.com/webpack/css-loader/issues/36
+	// Remove this test when the problem has been fixed at https://github.com/css/csso/issues/185
+	// or when another css parser is used
+	test("csso parse error", "/**/@import url(test.css);", [
+		[2, ".test{a: b}", ""],
+		[1, "/**/a{}", ""]
+	], "", {
+		"./test.css": [[2, ".test{a: b}", ""]]
+	});
 	testMinimize("minimized simple", ".class { a: b c d; }", [
 		[1, ".class{a:b c d}", ""]
 	]);