Merge pull request #68 from hgl/hash

Add failing test for same file contents

Author: MoOx

index.js

@@ -9,7 +9,6 @@ var clone = require("clone")
 var resolve = require("resolve")
 var postcss = require("postcss")
 var helpers = require("postcss-message-helpers")
-var hash = require("string-hash")
 var glob = require("glob")
 
 var Promize = global.Promise || require("es6-promise").Promise
@@ -353,29 +352,27 @@ function readImportedContent(
     return resolvedPromise
   }
 
-  // skip files wich only contain @import rules
-  var newFileContent = fileContent.replace(/@import (.*);/, "")
-  if (newFileContent.trim() !== "") {
-    var fileContentHash = hash(fileContent)
-
-    // skip files already imported at the same scope and same hash
-    if (
-      state.hashFiles[fileContentHash] &&
-      state.hashFiles[fileContentHash][media]
-    ) {
-      detach(atRule)
-      return resolvedPromise
-    }
+  // skip previous imported files not containing @import rules
+  if (
+    state.hashFiles[fileContent] &&
+    state.hashFiles[fileContent][media]
+  ) {
+    detach(atRule)
+    return resolvedPromise
+  }
 
+  var newStyles = postcss.parse(fileContent, options)
+  var hasImport = newStyles.some(function(child) {
+    return child.type === "atrule" && child.name.toLowerCase() === "import"
+  })
+  if (!hasImport) {
     // save hash files to skip them next time
-    if (!state.hashFiles[fileContentHash]) {
-      state.hashFiles[fileContentHash] = {}
+    if (!state.hashFiles[fileContent]) {
+      state.hashFiles[fileContent] = {}
     }
-    state.hashFiles[fileContentHash][media] = true
+    state.hashFiles[fileContent][media] = true
   }
 
-  var newStyles = postcss.parse(fileContent, options)
-
   // recursion: import @import from imported file
   var parsedResult = parseStyles(
     result,

package.json

@@ -28,8 +28,7 @@
     "object-assign": "^3.0.0",
     "postcss": "^4.1.4",
     "postcss-message-helpers": "^2.0.0",
-    "resolve": "^1.0.0",
-    "string-hash": "^1.1.0"
+    "resolve": "^1.0.0"
   },
   "devDependencies": {
     "css-whitespace": "^1.1.0",

test/fixtures/imports/bar/baz.css

@@ -0,0 +1 @@
+bar {}

test/fixtures/imports/bar/index.css

@@ -0,0 +1 @@
+@import "baz.css"

test/fixtures/imports/foo/baz.css

@@ -0,0 +1 @@
+foo {}

test/fixtures/imports/foo/index.css

@@ -0,0 +1 @@
+@import "baz.css"

test/fixtures/same.css

@@ -0,0 +1,2 @@
+@import "foo/index.css";
+@import "bar/index.css";

test/fixtures/same.expected.css

@@ -0,0 +1,2 @@
+foo {}
+bar {}

test/index.js

@@ -32,12 +32,14 @@ function trimResultCss(result) {
 }
 
 test("@import", function(t) {
-  t.plan(15)
+  t.plan(16)
 
   compareFixtures(t, "simple", "should import stylsheets")
 
   compareFixtures(t, "no-duplicate", "should not import a stylsheet twice")
 
+  compareFixtures(t, "same", "should import stylsheets with same content")
+
   compareFixtures(t, "ignore", "should ignore & adjust external import")
 
   compareFixtures(t, "glob", "should handle a glob pattern", {