Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resolve paths to node_modules #15

Merged
merged 1 commit into from
Aug 4, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules
node_modules/*
!node_modules/cool-styles
lib
3 changes: 3 additions & 0 deletions node_modules/cool-styles/foo.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions src/file-system-loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) }

Expand Down
5 changes: 5 additions & 0 deletions test/test-cases/compose-node-module/expected.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
._compose_node_module_cool_styles_foo__example {
color: #F00;
}
._compose_node_module_source__foo {
}
3 changes: 3 additions & 0 deletions test/test-cases/compose-node-module/expected.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"foo": "_compose_node_module_source__foo _compose_node_module_cool_styles_foo__example"
}
3 changes: 3 additions & 0 deletions test/test-cases/compose-node-module/source.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.foo {
composes: example from "cool-styles/foo.css";
}