Merge branch 'develop'

Author: sp00m

.eslintrc.json

@@ -57,7 +57,7 @@
     "max-lines": ["error", 400],
     "max-nested-callbacks": "error",
     "max-params": "error",
-    "max-statements": ["error", 15],
+    "max-statements": ["error", 20],
     "max-statements-per-line": "error",
     "multiline-ternary": ["error", "always-multiline"],
     "new-parens": "error",

lib/ImportTree.js

@@ -3,9 +3,8 @@ const globby = require("globby")
 const path = require("path")
 const gutil = require("gulp-util")
 
-const MULTILINE_COMMENTS = /\/\*[\s\S]*?\*\//g
-const SINGLELINE_COMMENTS = /[ \t]*\/\/[^\r\n]*/g
-const IMPORT_STATEMENTS = /^[ \t]*@import[ \t]+(["'])([^\r\n]+?)\1/gm
+const findImportedPaths = require("./findImportedPaths")
+
 const STYLESHEET_EXTENSION = /\.s?css$/
 const FILENAME = /([^/\\]+)$/
 const FILENAME_WITHOUT_LEADING_UNDERSCORE = /[/\\][^_/\\][^/\\]*$/
@@ -113,18 +112,13 @@ module.exports = class ImportTree {
 
   readFile(file) {
     if (file.endsWith(".scss")) {
-      const content = fs.readFileSync(file, "utf8")
-        .replace(MULTILINE_COMMENTS, "")
-        .replace(SINGLELINE_COMMENTS, "")
-      IMPORT_STATEMENTS.lastIndex = 0
-      let match = null
-      while (null !== (match = IMPORT_STATEMENTS.exec(content))) {
+      findImportedPaths(file).forEach((importedPath) => {
         try {
-          resolveImport.call(this, file, match[2])
+          resolveImport.call(this, file, importedPath)
         } catch (e) {
           this.warn(e.message)
         }
-      }
+      })
     }
   }
 

lib/findImportedPaths.js

@@ -0,0 +1,31 @@
+const fs = require("fs")
+
+const MULTILINE_COMMENTS = /\/\*[^]*?\*\//g
+const SINGLELINE_COMMENTS = /\/\/.*/g
+const IMPORT_STATEMENTS = (() => {
+  const stringLiteral = "(?:'[^'\\r\\n]*'|\"[^\"\\r\\n]*\")"
+  const importStatement = `@import\\s*(${stringLiteral}(?:\\s*,\\s*${stringLiteral})*)`
+  return new RegExp(importStatement, "g")
+})()
+const COMMA = /\s*,\s*/
+
+const removeComments = (content) => content
+  .replace(MULTILINE_COMMENTS, "")
+  .replace(SINGLELINE_COMMENTS, "")
+
+const findImportValues = (content) => {
+  const cleanedContent = removeComments(content)
+  IMPORT_STATEMENTS.lastIndex = 0
+  let match = null
+  const importValues = []
+  while (null !== (match = IMPORT_STATEMENTS.exec(cleanedContent))) {
+    importValues.push(match[1])
+  }
+  return importValues
+}
+
+const findImportedPaths = (content) => findImportValues(content)
+  .reduce((stringLiterals, importValue) => stringLiterals.concat(importValue.split(COMMA)), [])
+  .map((stringLiteral) => stringLiteral.slice(1, stringLiteral.length - 1))
+
+module.exports = (file) => findImportedPaths(fs.readFileSync(file, "utf8"))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gulp-watch-sass",
-  "version": "1.3.2",
+  "version": "1.4.0",
   "description": "Watches SASS files, adding @import-ing files to the stream",
   "keywords": [
     "gulpplugin",
@@ -23,20 +23,20 @@
   "dependencies": {
     "globby": "~7.1.1",
     "gulp-fn": "~0.0.0",
-    "gulp-watch": "~4.3.11",
+    "gulp-watch": "~5.0.0",
     "vinyl-file": "~3.0.0"
   },
   "devDependencies": {
     "coveralls": "~3.0.0",
-    "eslint": "~4.12.1",
+    "eslint": "~4.16.0",
     "husky": "~0.14.3",
     "istanbul": "~0.4.5",
     "mkdirp": "~0.5.1",
-    "mocha": "~4.0.1",
+    "mocha": "~5.0.0",
     "rimraf": "~2.6.2",
-    "should": "~13.1.3",
-    "sinon": "~4.1.3",
-    "snyk": "~1.54.1"
+    "should": "~13.2.1",
+    "sinon": "~4.2.1",
+    "snyk": "~1.69.3"
   },
   "scripts": {
     "commitmsg": "node ./.hooks/commit-msg",

test/files.js

@@ -34,6 +34,30 @@ describe("gulp-watch-sass", () => {
     console.warn.called.should.be.false()
   }
 
+  it("should handle both single and double quotes", () => {
+    create("a.scss", "@import 'b.scss';\n@import \"c.scss\";")
+    create("b.scss", "div { margin: 0; }")
+    create("c.scss", "div { margin: 0; }")
+    testChanges([
+      { change: "b.scss", expect: "a.scss" }
+    ])
+    testChanges([
+      { change: "c.scss", expect: "a.scss" }
+    ])
+  })
+
+  it("should handle multiple imports on a single line", () => {
+    create("a.scss", "@import 'b.scss'; @import 'c.scss';")
+    create("b.scss", "div { margin: 0; }")
+    create("c.scss", "div { margin: 0; }")
+    testChanges([
+      { change: "b.scss", expect: "a.scss" }
+    ])
+    testChanges([
+      { change: "c.scss", expect: "a.scss" }
+    ])
+  })
+
   it("should handle SASS files with .scss extension", () => {
     create("a.scss", "@import 'b.scss';")
     create("b.scss", "div { margin: 0; }")
@@ -131,4 +155,28 @@ describe("gulp-watch-sass", () => {
     ], ["dir2"])
   })
 
+  it("should handle comma-separated imports", () => {
+    create("a.scss", "@import 'b.scss',\n'c.scss';")
+    create("b.scss", "div { margin: 0; }")
+    create("c.scss", "div { margin: 0; }")
+    testChanges([
+      { change: "b.scss", expect: "a.scss" }
+    ])
+    testChanges([
+      { change: "c.scss", expect: "a.scss" }
+    ])
+  })
+
+  it("should handle comma-separated imports on a single line", () => {
+    create("a.scss", "@import 'b.scss', 'c.scss';")
+    create("b.scss", "div { margin: 0; }")
+    create("c.scss", "div { margin: 0; }")
+    testChanges([
+      { change: "b.scss", expect: "a.scss" }
+    ])
+    testChanges([
+      { change: "c.scss", expect: "a.scss" }
+    ])
+  })
+
 })