diff --git a/playground/TestModuleResolve.vue b/playground/TestModuleResolve.vue
index c8529ab5e39a9f..3293035c3fcd55 100644
--- a/playground/TestModuleResolve.vue
+++ b/playground/TestModuleResolve.vue
@@ -10,6 +10,9 @@
   <div class="index-resolve" :class="indexResolve">
     directory index resolve: {{ indexResolve }}
   </div>
+  <div class="dot-resolve" :class="dotResolve">
+    filename with dot resolve: {{ dotResolve }}
+  </div>
 </template>
 
 <script>
@@ -17,6 +20,7 @@ import { createRouter } from 'vue-router'
 import { createStore } from 'vuex'
 import { add } from 'lodash-es'
 import { foo } from './util'
+import { bar } from './util/bar.util'
 
 export default {
   setup() {
@@ -24,7 +28,8 @@ export default {
       router: typeof createRouter === 'function' ? 'ok' : 'error',
       store: typeof createStore === 'function' ? 'ok' : 'error',
       optResolve: typeof add === 'function' ? 'ok' : 'error',
-      indexResolve: foo() ? 'ok' : 'error'
+      indexResolve: foo() ? 'ok' : 'error',
+      dotResolve: bar() ? 'ok' : 'error'
     }
   }
 }
diff --git a/playground/util/bar.util.js b/playground/util/bar.util.js
new file mode 100644
index 00000000000000..730c78fadcee40
--- /dev/null
+++ b/playground/util/bar.util.js
@@ -0,0 +1,3 @@
+export function bar() {
+  return true
+}
diff --git a/src/node/resolver.ts b/src/node/resolver.ts
index 8ebc4f5f8034a6..8248534efe0af2 100644
--- a/src/node/resolver.ts
+++ b/src/node/resolver.ts
@@ -10,6 +10,8 @@ import {
 import { resolveOptimizedCacheDir } from './depOptimizer'
 import chalk from 'chalk'
 
+const debug = require('debug')('vite:resolve')
+
 export interface Resolver {
   requestToFile?(publicPath: string, root: string): string | undefined
   fileToRequest?(filePath: string, root: string): string | undefined
@@ -22,19 +24,21 @@ export interface InternalResolver {
   alias(id: string): string | undefined
 }
 
+export const supportedExts = ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json']
+
 const defaultRequestToFile = (publicPath: string, root: string): string => {
   if (moduleRE.test(publicPath)) {
     const id = publicPath.replace(moduleRE, '')
+    const cachedNodeModule = idToFileMap.get(id)
+    if (cachedNodeModule) {
+      return cachedNodeModule
+    }
     // try to resolve from optimized modules
     const optimizedModule = resolveOptimizedModule(root, id)
     if (optimizedModule) {
       return optimizedModule
     }
     // try to resolve from normal node_modules
-    const cachedNodeModule = idToFileMap.get(id)
-    if (cachedNodeModule) {
-      return cachedNodeModule
-    }
     const nodeModule = resolveNodeModuleFile(root, id)
     if (nodeModule) {
       idToFileMap.set(id, nodeModule)
@@ -52,27 +56,26 @@ const defaultFileToRequest = (filePath: string, root: string): string => {
   return `/${slash(path.relative(root, filePath))}`
 }
 
-export const supportedExts = ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json']
-
-const debug = require('debug')('vite:resolve')
+const isFile = (file: string): boolean => {
+  try {
+    return fs.statSync(file).isFile()
+  } catch (e) {
+    return false
+  }
+}
 
 export const resolveExt = (id: string) => {
   const cleanId = cleanUrl(id)
-  if (!path.extname(cleanId)) {
+  if (!isFile(cleanId)) {
     let inferredExt = ''
     for (const ext of supportedExts) {
-      try {
-        // foo -> foo.js
-        fs.statSync(cleanId + ext)
+      if (isFile(cleanId + ext)) {
         inferredExt = ext
         break
-      } catch (e) {
-        try {
-          // foo -> foo/index.js
-          fs.statSync(path.join(cleanId, '/index' + ext))
-          inferredExt = '/index' + ext
-          break
-        } catch (e) {}
+      }
+      if (isFile(path.join(cleanId, '/index' + ext))) {
+        inferredExt = '/index' + ext
+        break
       }
     }
     const queryMatch = id.match(/\?.*$/)
@@ -130,7 +133,19 @@ export function createResolver(
 export const jsSrcRE = /\.(?:(?:j|t)sx?|vue)$|\.mjs$/
 const deepImportRE = /^([^@][^/]*)\/|^(@[^/]+\/[^/]+)\//
 
-export function resolveBareModule(root: string, id: string, importer: string) {
+/**
+ * Redirects a bare module request to a full path under /@modules/
+ * It resolves a bare node module id to its full entry path so that relative
+ * imports from the entry can be correctly resolved.
+ * e.g.:
+ * - `import 'foo'` -> `import '/@modules/foo/dist/index.js'`
+ * - `import 'foo/bar/baz'` -> `import '/@modules/foo/bar/baz'`
+ */
+export function resolveBareModuleRequest(
+  root: string,
+  id: string,
+  importer: string
+) {
   const optimized = resolveOptimizedModule(root, id)
   if (optimized) {
     return id
diff --git a/src/node/server/serverPluginModuleRewrite.ts b/src/node/server/serverPluginModuleRewrite.ts
index 1920502d4e9b91..db7241d4844f02 100644
--- a/src/node/server/serverPluginModuleRewrite.ts
+++ b/src/node/server/serverPluginModuleRewrite.ts
@@ -7,7 +7,11 @@ import {
   parse as parseImports,
   ImportSpecifier
 } from 'es-module-lexer'
-import { InternalResolver, resolveBareModule, jsSrcRE } from '../resolver'
+import {
+  InternalResolver,
+  resolveBareModuleRequest,
+  jsSrcRE
+} from '../resolver'
 import {
   debugHmr,
   importerMap,
@@ -25,6 +29,8 @@ import {
   resolveRelativeRequest
 } from '../utils'
 import chalk from 'chalk'
+import slash from 'slash'
+import { moduleRE } from './serverPluginModuleResolve'
 
 const debug = require('debug')('vite:rewrite')
 
@@ -230,27 +236,29 @@ export const resolveImport = (
   if (bareImportRE.test(id)) {
     // directly resolve bare module names to its entry path so that relative
     // imports from it (including source map urls) can work correctly
-    return `/@modules/${resolveBareModule(root, id, importer)}`
+    return `/@modules/${resolveBareModuleRequest(root, id, importer)}`
   } else {
+    // 1. relative to absolute
+    //    ./foo -> /some/path/foo
     let { pathname, query } = resolveRelativeRequest(importer, id)
-    // append an extension to extension-less imports
-    if (!path.extname(pathname)) {
-      const file = resolver.requestToFile(pathname)
-      const indexMatch = file.match(/\/index\.\w+$/)
-      if (indexMatch) {
-        pathname = pathname.replace(/\/(index)?$/, '') + indexMatch[0]
-      } else {
-        pathname += path.extname(file)
-      }
+
+    // 2. if this is a relative import between files under /@modules/, preserve
+    // them as-is
+    if (moduleRE.test(pathname)) {
+      return pathname
     }
 
-    // mark non-src imports
+    // 3. resolve extensions.
+    const file = resolver.requestToFile(pathname)
+    pathname = '/' + slash(path.relative(root, file))
+
+    // 4. mark non-src imports
     const ext = path.extname(pathname)
     if (ext && !jsSrcRE.test(pathname)) {
       query += `${query ? `&` : `?`}import`
     }
 
-    // force re-fetch dirty imports by appending timestamp
+    // 5. force re-fetch dirty imports by appending timestamp
     if (timestamp) {
       const dirtyFiles = hmrDirtyFilesMap.get(timestamp)
       // only force re-fetch if this is a marked dirty file (in the import
diff --git a/test/test.js b/test/test.js
index e957a57f1fcbad..bbd35783d5e3b8 100644
--- a/test/test.js
+++ b/test/test.js
@@ -112,6 +112,7 @@ describe('vite', () => {
       expect(await getText('.module-resolve-store')).toMatch('ok')
       expect(await getText('.module-resolve-optimize')).toMatch('ok')
       expect(await getText('.index-resolve')).toMatch('ok')
+      expect(await getText('.dot-resolve')).toMatch('ok')
     })
 
     if (!isBuild) {