support array resolve.root

Shevil27 · Dec 2, 2015 · d3d41d0 · d3d41d0
1 parent 5f8ff3e
commit d3d41d0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/resolvers/webpack/index.js b/resolvers/webpack/index.js
@@ -55,7 +55,10 @@ exports.resolveImport = function resolveImport(source, file, settings) {
 
   // root as first alternate path
   var rootPath = get(webpackConfig, ['resolve', 'root'])
-  if (rootPath) paths.push(rootPath)
+  if (rootPath) {
+    if (typeof rootPath === 'string') paths.push(rootPath)
+    else paths.push.apply(paths, rootPath)
+  }
 
   // otherwise, resolve "normally"
   return resolve.sync(source, {

diff --git a/resolvers/webpack/test/files/webpack.array-root.config.js b/resolvers/webpack/test/files/webpack.array-root.config.js
@@ -0,0 +1,7 @@
+var path = require('path')
+exports.resolve = {
+  root: [
+    path.join(__dirname, 'src'),
+    path.join(__dirname, 'bower_components'),
+  ],
+}
diff --git a/resolvers/webpack/test/root.js b/resolvers/webpack/test/root.js
@@ -16,4 +16,12 @@ describe("root", function () {
     expect(resolve('jsx/some-file', file)).to.exist
       .and.equal(path.join(__dirname, 'files', 'src', 'jsx', 'some-file.js'))
   })
+  it("supports definition as an array", function () {
+    expect(resolve('main-module', file, { config: "webpack.array-root.config.js" }))
+      .to.exist
+      .and.equal(path.join(__dirname, 'files', 'src', 'main-module.js'))
+    expect(resolve('typeahead', file, { config: "webpack.array-root.config.js" }))
+      .to.exist
+      .and.equal(path.join(__dirname, 'files', 'bower_components', 'typeahead.js'))
+  })
 })