Add support for importing index.js from aliased directories path (dir…

…ectory/index.js), fix rollup#37
soanvig · Jan 20, 2018 · dbd7ca4 · dbd7ca4
1 parent fc9a33e
commit dbd7ca4
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 145 deletions.
diff --git a/src/index.js b/src/index.js
@@ -72,6 +72,7 @@ export default function alias(options = {}) {
 
         // Resolve file names
         const filePath = posix.resolve(directory, updatedId);
+
         const match = resolve.map(ext => (endsWith(ext, filePath) ? filePath : `${filePath}${ext}`))
                             .find(exists);
 
@@ -81,6 +82,9 @@ export default function alias(options = {}) {
         // with extension
         } else if (endsWith('.js', filePath)) {
           updatedId = filePath;
+        // See if filePath + /index.js exists, then use it
+        } else if (fs.existsSync(posix.join(filePath, 'index.js'))) {
+          updatedId = posix.join(filePath, 'index.js');
         } else {
           updatedId = filePath + '.js';
         }

diff --git a/test/files/folder/index.js b/test/files/folder/index.js
@@ -0,0 +1 @@
+export default 123;
diff --git a/test/files/index.js b/test/files/index.js
@@ -3,5 +3,6 @@ import fancyNumber from 'fancyNumber';
 import anotherFancyNumber from './anotherFancyNumber';
 import anotherNumber from './numberFolder/anotherNumber';
 import moreNumbers from 'numberFolder/anotherNumber';
+import index from './numberFolder';
 
-export default fancyNumber + anotherFancyNumber + nonAliased + anotherNumber + moreNumbers;
+export default fancyNumber + anotherFancyNumber + nonAliased + anotherNumber + moreNumbers + index;
diff --git a/test/index.js b/test/index.js
@@ -164,6 +164,16 @@ test('Platform path.resolve(\'file-with.ext\') aliasing', t => {
   t.is(resolved, path.resolve('./files/folder/hipster.jsx'));
 });
 
+test('index.js resolve', t => {
+  const result = alias({
+    test: path.resolve('./files/folder'),
+  });
+
+  const resolved = result.resolveId('test', posix.resolve(DIRNAME, './files/index.js'));
+
+  t.is(resolved, path.resolve('./files/folder/index.js'));
+});
+
 // Tests in Rollup
 test(t =>
   rollup({
@@ -179,7 +189,8 @@ test(t =>
     t.is(stats.modules[1].id.endsWith(path.normalize('/files/aliasMe.js')), true);
     t.is(stats.modules[2].id.endsWith(path.normalize('/files/localAliasMe.js')), true);
     t.is(stats.modules[3].id.endsWith(path.normalize('/files/folder/anotherNumber.js')), true);
-    t.is(stats.modules[4].id.endsWith(path.normalize('/files/index.js')), true);
-    t.is(stats.modules.length, 5);
+    t.is(stats.modules[4].id.endsWith(path.normalize('/files/folder/index.js')), true);
+    t.is(stats.modules[5].id.endsWith(path.normalize('/files/index.js')), true);
+    t.is(stats.modules.length, 6);
   })
 );