refactor: move append logic

vitejs · May 23, 2020 · c2c9c43 · c2c9c43
1 parent 0a1d2ac
commit c2c9c43
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/node/resolver.ts b/src/node/resolver.ts
@@ -1,7 +1,7 @@
 import fs from 'fs'
 import path from 'path'
 import slash from 'slash'
-import { cleanUrl, resolveFrom } from './utils'
+import { cleanUrl, resolveFrom, queryRE } from './utils'
 import {
   idToFileMap,
   moduleRE,
@@ -157,8 +157,11 @@ export function resolveBareModule(root: string, id: string, importer: string) {
         )
       }
     }
+    return id
+  } else {
+    // append import query for non-js deep imports
+    return id + (queryRE.test(id) ? '&import' : '?import')
   }
-  return id
 }
 
 const viteOptimizedMap = new Map()

diff --git a/src/node/server/serverPluginModuleRewrite.ts b/src/node/server/serverPluginModuleRewrite.ts
@@ -230,12 +230,7 @@ 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
-    let resolvedModulePath = resolveBareModule(root, id, importer)
-    const ext = path.extname(resolvedModulePath)
-    if (ext && !jsSrcRE.test(ext)) {
-      resolvedModulePath += `?import`
-    }
-    return `/@modules/${resolvedModulePath}`
+    return `/@modules/${resolveBareModule(root, id, importer)}`
   } else {
     let { pathname, query } = resolveRelativeRequest(importer, id)
     // append an extension to extension-less imports