Skip to content
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
6 changes: 4 additions & 2 deletions file-system-loader.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict';

var DepGraph = require('dependency-graph').DepGraph;
var nodeResolve = require('resolve');

Object.defineProperty(exports, '__esModule', {
value: true
Expand Down Expand Up @@ -64,12 +65,13 @@ var FileSystemLoader = (function () {
return new Promise(function (resolve, reject) {
var relativeDir = _path2['default'].dirname(relativeTo),
rootRelativePath = _path2['default'].resolve(relativeDir, newPath),
fileRelativePath = _path2['default'].resolve(_path2['default'].join(_this.root, relativeDir), newPath);
rootRelativeDir = _path2['default'].join(_this.root, relativeDir),
fileRelativePath = _path2['default'].resolve(rootRelativeDir, 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);
fileRelativePath = nodeResolve.sync(newPath, { basedir: rootRelativeDir });
} catch (e) {}
}

Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"dependency-graph": "^0.4.1",
"object-assign": "^3.0.0",
"promise-polyfill": "^2.1.0",
"resolve": "^1.1.7",
"string-hash": "^1.1.0",
"through": "^2.3.7"
},
Expand Down
6 changes: 6 additions & 0 deletions tests/cases/compose-local-node-module/expected.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
._node_modules_cool_local_styles_styles__foo {
color: #F00;
}
._styles__foo {
background: black;
}
2 changes: 2 additions & 0 deletions tests/cases/compose-local-node-module/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
var styles = require('./styles.css');
module.exports = styles;

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

4 changes: 4 additions & 0 deletions tests/cases/compose-local-node-module/styles.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.foo {
composes: foo from "cool-local-styles/styles.css";
background: black;
}
2 changes: 1 addition & 1 deletion tests/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var path = require('path');
var casesDir = path.join(__dirname, 'cases');
var cssOutFilename = 'out.css';

var globalCases = ['compose-node-module', 'import-node-module'];
var globalCases = ['compose-node-module', 'compose-local-node-module', 'import-node-module'];

function runTestCase (dir) {
tape('case: ' + dir, function (t) {
Expand Down