Merge remote-tracking branch 'origin/master' into media-queries

Author: geelen

.gitignore

@@ -1,2 +1,3 @@
-node_modules
+node_modules/*
+!node_modules/cool-styles
 lib

node_modules/cool-styles/foo.css

@@ -1,6 +1,6 @@
 {
   "name": "css-modules-loader-core",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "A loader-agnostic CSS Modules implementation, based on PostCSS",
   "main": "lib/index.js",
   "directories": {

package.json

@@ -36,6 +36,14 @@ export default class FileSystemLoader {
         rootRelativePath = path.resolve( relativeDir, newPath ),
         fileRelativePath = path.resolve( path.join( this.root, relativeDir ), newPath )
 
+      // if the path is not relative or absolute, try to resolve it in node_modules
+      if (newPath[0] !== '.' && newPath[0] !== '/') {
+        try {
+          fileRelativePath = require.resolve(newPath);
+        }
+        catch (e) {}
+      }
+
       const tokens = this.tokensByFile[fileRelativePath]
       if (tokens) { return resolve(tokens) }
 

src/file-system-loader.js

@@ -0,0 +1,5 @@
+._compose_node_module_cool_styles_foo__example {
+  color: #F00;
+}
+._compose_node_module_source__foo {
+}

test/test-cases/compose-node-module/expected.css

@@ -0,0 +1,3 @@
+{
+  "foo": "_compose_node_module_source__foo _compose_node_module_cool_styles_foo__example"
+}

test/test-cases/compose-node-module/expected.json

@@ -0,0 +1,3 @@
+.foo {
+  composes: example from "cool-styles/foo.css";
+}