Support webpack resolve.root and resolve.modulesDirectories

index.js

@@ -12,6 +12,7 @@ var resolveDependencyPath = require('resolve-dependency-path');
 var appModulePath = require('app-module-path');
 var webpackResolve = require('enhanced-resolve');
 var isRelative = require('is-relative-path');
+var objectAssign = require('object-assign');
 
 var defaultLookups = {
   '.js': jsLookup,
@@ -184,7 +185,27 @@ function resolveWebpackPath(partial, filename, directory, webpackConfig) {
 
   try {
     var loadedConfig = require(webpackConfig);
-    var resolver = webpackResolve.create.sync(loadedConfig.resolve || {});
+    var resolveConfig = objectAssign({}, loadedConfig.resolve);
+
+    resolveConfig.modules = [];
+
+    if (resolveConfig.root) {
+      resolveConfig.modules = resolveConfig.modules.concat(resolveConfig.root);
+    }
+
+    if (resolveConfig.modulesDirectories) {
+      resolveConfig.modules = resolveConfig.modules.concat(resolveConfig.modulesDirectories);
+    }
+
+    var foundNodeModulesInPaths = resolveConfig.modules.some(function(dir) {
+      return dir.match('node_modules');
+    });
+
+    if (!foundNodeModulesInPaths) {
+      resolveConfig.modules.push('node_modules');
+    }
+
+    var resolver = webpackResolve.create.sync(resolveConfig);
 
     // We don't care about what the loader resolves the partial to
     // we only wnat the path of the resolved file

test/root1/mod1.js

@@ -0,0 +1 @@
+module.exports = {};

test/root2/mod2.js

@@ -0,0 +1 @@
+module.exports = {};

test/test.js

@@ -480,6 +480,39 @@ describe('filing-cabinet', function() {
       assert.equal(resolved, `${directory}/node_modules/resolve/index.js`);
     });
 
+    it('resolves a path using resolve.root', function() {
+      const resolved = cabinet({
+        partial: 'mod1',
+        filename: `${directory}/index.js`,
+        directory,
+        webpackConfig: `${directory}/webpack-root.config.js`
+      });
+
+      assert.equal(resolved, `${directory}/test/root1/mod1.js`);
+    });
+
+    it('resolves NPM module when using resolve.root', function() {
+      const resolved = cabinet({
+        partial: 'resolve',
+        filename: `${directory}/index.js`,
+        directory,
+        webpackConfig: `${directory}/webpack-root.config.js`
+      });
+
+      assert.equal(resolved, `${directory}/node_modules/resolve/index.js`);
+    });
+
+    it('resolves a path using resolve.modulesDirectories', function() {
+      const resolved = cabinet({
+        partial: 'mod2',
+        filename: `${directory}/index.js`,
+        directory,
+        webpackConfig: `${directory}/webpack-root.config.js`
+      });
+
+      assert.equal(resolved, `${directory}/test/root2/mod2.js`);
+    });
+
     it('resolves files with a .jsx extension', function() {
       testResolution('./test/foo.jsx', `${directory}/test/foo.jsx`);
     });

webpack-root.config.js

@@ -0,0 +1,11 @@
+var path = require('path');
+
+module.exports = {
+  entry: "./index.js",
+  resolve: {
+    modulesDirectories: ['test/root1'],
+    root: [
+        path.resolve(__dirname, './test/root2')
+    ]
+  }
+};