Added skipComments option, closes #19

Author: unlight

.eslintrc.js

@@ -15,10 +15,6 @@ module.exports = {
             2,
             "unix"
         ],
-        "quotes": [
-            2,
-            "double"
-        ],
         "semi": [
             2,
             "always"

gulp-cssimport.js

@@ -18,6 +18,7 @@ var trim = require("lodash.trim");
 var format = require("util").format;
 
 var defaults = {
+	skipComments: true,
 	extensions: null,
 	includePaths: [],
 	filter: null,
@@ -55,6 +56,21 @@ module.exports = function cssImport(options) {
 		var promises = [];
 		var contents = vinyl.contents.toString();
 		while ((match = importRe.exec(contents)) !== null) {
+			if (options.skipComments) {
+				var matchIndex = match.index;
+				// Check comment symbols 1.
+				var startCommentPosition = contents.lastIndexOf('/*', matchIndex);
+				var endCommentPosition = contents.lastIndexOf('*/', matchIndex);
+				if (!(endCommentPosition > startCommentPosition) && startCommentPosition !== -1) {
+					continue;
+				}
+				// Check comment symbols 2.
+				var startCommentPosition2 = contents.lastIndexOf('//', matchIndex);
+				var endCommentPosition2 = contents.lastIndexOf('\n', matchIndex);
+				if (startCommentPosition2 > endCommentPosition2 && startCommentPosition2 !== -1) {
+					continue;
+				}
+			}
 			var match2 = /@import\s+(?:url\()?(.+(?=['"\)]))(?:\))?.*/ig.exec(match[0]);
 			var importPath = trim(match2[1], "'\"");
 			if (!isMatch(importPath, options)) {
@@ -76,7 +92,7 @@ module.exports = function cssImport(options) {
 					var pathDirectory = path.dirname(vinyl.path);
 					var importFile = resolveImportFile(pathDirectory, importPath, options.includePaths);
 					if (!importFile) {
-						var err = new Error(`Cannot find file '${importPath}' from '${pathDirectory}' (includePaths: ${options.includePaths})`);
+						var err = new Error("Cannot find file '" + importPath + "' from '" + pathDirectory + "' (includePaths: " + options.includePaths + ")");
 						callback(new gutil.PluginError(PLUGIN_NAME, err));
 					}
 					promises.push(readFile(importFile, "utf8").then(function(contents) {

gulpfile.js

@@ -8,22 +8,8 @@ gulp.task("watch-eslint", ["eslint"], function() {
 
 gulp.task("eslint", function() {
 	var eslint = g.eslint;
-	var conf = {
-		rules: {
-			"no-use-before-define": [0, "nofunc"],
-			"curly": 1,
-			"no-comma-dangle": 1,
-			"no-debugger": 1,
-			"eol-last": 0,
-			"new-cap": 1,
-			"no-underscore-dangle": 0
-		},
-		env: {
-			node: true
-		}
-	};
 	gulp.src(["./gulp-cssimport.js"])
-		.pipe(eslint(conf))
+		.pipe(eslint())
 		// .pipe(eslint.failOnError())
 		.pipe(eslint.formatEach("stylish", process.stdout));
 });

readme.md

@@ -27,6 +27,11 @@ OPTIONS
 Array, default: `[]`  
 Additional paths to resolve imports.
 
+#### skipComments
+Boolean, default: `true`  
+gulp-cssimport plugin uses regular expressions which is fast but not solid as AST.
+If you have any unexpected result, missing imported content, etc. Try to disable this option.
+
 #### filter
 RegExp, default: `null` (no filter).  
 Process only files which match to regexp.
@@ -119,6 +124,9 @@ TODO
 
 CHANGELOG
 ---------
+5.0 [6 Oct 2016]
+- added option 'skipComments'
+
 4.0 [6 Oct 2016]
 - added option 'includePaths'
 

test/sass-commented-import/design/style.css

@@ -2,6 +2,6 @@
 // @import url("./x1.css"); /**/
 @import url("./b.css");
 /*
-@import url("./x2.css"); /*
+// // @import url("./x2.css"); /*
 /**/
 @import url("./c.css");

test/sass-commented-import/result.css

@@ -2,6 +2,6 @@
 // @import url("./x1.css"); /**/
 /* b.css */
 /*
-@import url("./x2.css"); /*
+// // @import url("./x2.css"); /*
 /**/
 /* c.css */