fix: skip relative resolving for absolute paths

fix #445
vitejs · Jun 24, 2020 · e0a0258 · e0a0258
1 parent 298c78d
commit e0a0258
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/src/node/resolver.ts b/src/node/resolver.ts
@@ -292,28 +292,33 @@ export function createResolver(
     },
 
     resolveRelativeRequest(importer: string, importee: string) {
-      let resolved = path.posix.resolve(path.posix.dirname(importer), importee)
-
-      for (const alias in literalDirAlias) {
-        if (importer.startsWith(alias)) {
-          if (!resolved.startsWith(alias)) {
-            // resolved path is outside of alias directory, we need to use
-            // its full path instead
-            const importerFilePath = resolver.requestToFile(importer)
-            const importeeFilePath = path.resolve(
-              path.dirname(importerFilePath),
-              importee
-            )
-            resolved = resolver.fileToRequest(importeeFilePath)
+      const queryMatch = importee.match(queryRE)
+      let resolved = importee
+
+      if (importee.startsWith('.')) {
+        resolved = path.posix.resolve(path.posix.dirname(importer), importee)
+        for (const alias in literalDirAlias) {
+          if (importer.startsWith(alias)) {
+            if (!resolved.startsWith(alias)) {
+              // resolved path is outside of alias directory, we need to use
+              // its full path instead
+              const importerFilePath = resolver.requestToFile(importer)
+              const importeeFilePath = path.resolve(
+                path.dirname(importerFilePath),
+                importee
+              )
+              resolved = resolver.fileToRequest(importeeFilePath)
+            }
+            break
           }
-          break
         }
       }
 
-      const queryMatch = importee.match(queryRE)
       return {
-        // path resolve strips ending / which should be preserved
-        pathname: cleanUrl(resolved) + (importee.endsWith('/') ? '/' : ''),
+        pathname:
+          cleanUrl(resolved) +
+          // path resolve strips ending / which should be preserved
+          (importee.endsWith('/') && !resolved.endsWith('/') ? '/' : ''),
         query: queryMatch ? queryMatch[0] : ''
       }
     }

diff --git a/src/node/server/serverPluginModuleRewrite.ts b/src/node/server/serverPluginModuleRewrite.ts
@@ -278,6 +278,5 @@ export const resolveImport = (
       id += `${id.includes(`?`) ? `&` : `?`}t=${latestVersionsMap.get(cleanId)}`
     }
   }
-
   return id
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -278,6 +278,5 @@ export const resolveImport = ( @@
           id += `${id.includes(`?`) ? `&` : `?`}t=${latestVersionsMap.get(cleanId)}`
         }
       }
       return id
     }