Merge branch 'fix-sass-import' of github.com:daychongyang/vite into f…

…ix-sass-import
vitejs · May 29, 2020 · 09abb62 · 09abb62
2 parents 35fc460 + 4afa68c
commit 09abb62
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/node/resolver.ts b/src/node/resolver.ts
@@ -401,6 +401,8 @@ export function resolveNodeModuleFile(
   }
 }
 
+const normalize = path.posix.normalize
+
 /**
  * given a relative path in pkg dir,
  * return a relative path in pkg dir,
@@ -410,13 +412,13 @@ function mapWithBrowserField(
   relativePathInPkgDir: string,
   map: Record<string, string>
 ) {
-  const normalized = path.normalize(relativePathInPkgDir)
+  const normalized = normalize(relativePathInPkgDir)
   const foundEntry = Object.entries(map).find(([from]) => {
-    return path.normalize(from) === normalized
+    return normalize(from) === normalized
   })
   if (!foundEntry) {
     return normalized
   }
   const [, to] = foundEntry
-  return path.normalize(to)
+  return normalize(to)
 }
diff --git a/src/node/server/serverPluginModuleRewrite.ts b/src/node/server/serverPluginModuleRewrite.ts
@@ -254,7 +254,6 @@ export const resolveImport = (
     // 3. resolve extensions.
     const ext = resolver.resolveExt(pathname)
     if (ext) {
-      // in aliased cases the inferred ext can contain multiple slashes
       pathname = path.posix.normalize(pathname + ext)
     }