From b413bc14fb70a2234cbbd7721f81881cddaf8470 Mon Sep 17 00:00:00 2001 From: Mark Date: Thu, 13 Dec 2018 18:39:42 +0000 Subject: [PATCH] fix(resolver): resolvedPath/index.[ext] resolution (#4548) --- packages/core/src/resolver.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/core/src/resolver.js b/packages/core/src/resolver.js index d364e7e812..8410cf4935 100644 --- a/packages/core/src/resolver.js +++ b/packages/core/src/resolver.js @@ -69,16 +69,20 @@ export default class Resolver { resolvedPath = path } - // Check if resolvedPath exits - if (fs.existsSync(resolvedPath)) { + // Check if resolvedPath exits and is not a directory + if (fs.existsSync(resolvedPath) && !fs.lstatSync(resolvedPath).isDirectory()) { return resolvedPath } - // Check if any resolvedPath.[ext] exists + // Check if any resolvedPath.[ext] or resolvedPath/index.[ext] exists for (const ext of this.options.extensions) { if (fs.existsSync(resolvedPath + '.' + ext)) { return resolvedPath + '.' + ext } + + if (fs.existsSync(resolvedPath + '/index.' + ext)) { + return resolvedPath + '/index.' + ext + } } // Give up