Merge pull request postcss#33 from postcss/hash-proxy

 Files which only contain same @import rules were skip

Author: MoOx

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 5.1.1 - 2015-04-10
+
+- fixed: regression of 5.1.0: files which only contain same @import rules were skip ([#31](https://github.com/postcss/postcss-import/issues/31))
+
 # 5.1.0 - 2015-03-27
 
 - Added: files with the same content will only be imported once. Previously, only the full path was used to determine if a file has already been imported in a given scope.

index.js

@@ -191,19 +191,23 @@ function readImportedContent(atRule, parsedAtImport, options, resolvedFilename,
     return
   }
 
-  var fileContentHash = hash(fileContent)
-
-  // skip files already imported at the same scope and same hash
-  if (hashFiles[fileContentHash] && hashFiles[fileContentHash][media]) {
-    detach(atRule)
-    return
-  }
+  // 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 (hashFiles[fileContentHash] && hashFiles[fileContentHash][media]) {
+      detach(atRule)
+      return
+    }
 
-  // save hash files to skip them next time
-  if (!hashFiles[fileContentHash]) {
-    hashFiles[fileContentHash] = {}
+    // save hash files to skip them next time
+    if (!hashFiles[fileContentHash]) {
+      hashFiles[fileContentHash] = {}
+    }
+    hashFiles[fileContentHash][media] = true
   }
-  hashFiles[fileContentHash][media] = true
 
   var newStyles = postcss.parse(fileContent, options)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-import",
-  "version": "5.1.0",
+  "version": "5.1.1",
   "description": "PostCSS plugin to import CSS files",
   "keywords": [
     "css",

test/fixtures/imports/proxy-file.css

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

test/fixtures/imports/proxy-file/index.css

@@ -0,0 +1 @@
+@import "../proxy-file.css";

test/fixtures/imports/proxy-file/proxy-file.css

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

test/fixtures/imports/proxy-file/sub-directory/index.css

@@ -0,0 +1 @@
+@import "../proxy-file.css";

test/fixtures/no-duplicate.css

@@ -5,4 +5,7 @@
 @import "foo.css" screen;
 @import "foo-duplicate2" screen;
 
+@import "proxy-file/index.css";
+@import "proxy-file/sub-directory/index.css";
+
 content{}

test/fixtures/no-duplicate.expected.css

@@ -4,4 +4,7 @@ foo{}
 foo{}
 }
 
-content{}
+proxy {}
+import {}
+
+content{}