fixed missing tests and import handling for #183

Author: sokra

lib/loader.js

@@ -64,9 +64,7 @@ module.exports = function(content, map) {
 				"[" + JSON.stringify(importItem.export) + "] + \"";
 		}
 
-		if(query.import !== false) {
-			cssAsString = cssAsString.replace(result.importItemRegExpG, importItemMatcher.bind(this));
-		}
+		cssAsString = cssAsString.replace(result.importItemRegExpG, importItemMatcher.bind(this));
 		if(query.url !== false) {
 			cssAsString = cssAsString.replace(result.urlItemRegExpG, function(item) {
 				var match = result.urlItemRegExp.exec(item);

lib/processCss.js

@@ -36,25 +36,27 @@ var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
 			return str;
 		}
 
-		css.walkAtRules("import", function(rule) {
-			var values = Tokenizer.parseValues(rule.params);
-			var url = values.nodes[0].nodes[0];
-			if(url.type === "url") {
-				url = url.url;
-			} else if(url.type === "string") {
-				url = url.value;
-			} else throw rule.error("Unexpected format" + rule.params);
-			values.nodes[0].nodes.shift();
-			var mediaQuery = Tokenizer.stringifyValues(values);
-			if(loaderUtils.isUrlRequest(url, options.root) && options.mode === "global") {
-				url = loaderUtils.urlToRequest(url, options.root);
-			}
-			importItems.push({
-				url: url,
-				mediaQuery: mediaQuery
+		if(options.import) {
+			css.walkAtRules("import", function(rule) {
+				var values = Tokenizer.parseValues(rule.params);
+				var url = values.nodes[0].nodes[0];
+				if(url.type === "url") {
+					url = url.url;
+				} else if(url.type === "string") {
+					url = url.value;
+				} else throw rule.error("Unexpected format" + rule.params);
+				values.nodes[0].nodes.shift();
+				var mediaQuery = Tokenizer.stringifyValues(values);
+				if(loaderUtils.isUrlRequest(url, options.root) && options.mode === "global") {
+					url = loaderUtils.urlToRequest(url, options.root);
+				}
+				importItems.push({
+					url: url,
+					mediaQuery: mediaQuery
+				});
+				rule.remove();
 			});
-			rule.remove();
-		});
+		}
 
 		css.walkRules(function(rule) {
 			if(rule.selector === ":export") {

test/importTest.js

@@ -36,4 +36,7 @@ describe("import", function() {
 		[1, "@import url(//example.com/style.css);", ""],
 		[1, "", ""]
 	]);
+	test("import disabled", "@import url(test.css);\n.class { a: b c d; }", [
+		[1, "@import url(test.css);\n.class { a: b c d; }", ""]
+	], "?-import");
 });