fix: fix cross import between optimized modules and avoid duplication

fix #210
vitejs · May 20, 2020 · eedc985 · eedc985
1 parent 0f41b06
commit eedc985
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/src/node/depOptimizer.ts b/src/node/depOptimizer.ts
@@ -231,6 +231,7 @@ export async function optimizeDeps(
       ...config.rollupOutputOptions,
       format: 'es',
       exports: 'named',
+      entryFileNames: '[name]',
       chunkFileNames: 'common/[name]-[hash].js'
     })
 

diff --git a/src/node/resolver.ts b/src/node/resolver.ts
@@ -154,7 +154,6 @@ export function resolveOptimizedModule(
     return cached
   }
 
-  if (!id.endsWith('.js')) id += '.js'
   const cacheDir = resolveOptimizedCacheDir(root)
   if (!cacheDir) return
   const file = path.join(cacheDir, id)

diff --git a/src/node/utils/fsUtils.ts b/src/node/utils/fsUtils.ts
@@ -29,7 +29,7 @@ export async function cachedRead(
   const cached = moduleReadCache.get(file)
   if (ctx) {
     ctx.set('Cache-Control', 'no-cache')
-    ctx.type = path.basename(file)
+    ctx.type = path.extname(file) || 'js'
   }
   if (cached && cached.lastModified === lastModified) {
     if (ctx) {