fix: normalize away base in imported URLs (#5065)

* fix: normalize away `base` in imported URLs This fixes hot-reloading issues reported in #5063. * Update importAnalysis.ts Co-authored-by: Evan You <[email protected]>
vitejs · Sep 24, 2021 · 9164da0 · 9164da0
1 parent 8b77a4f
commit 9164da0
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts
@@ -312,6 +312,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
             str().prepend(importsString)
             str().overwrite(expStart, endIndex, exp)
             imports.forEach((url) => {
+              url = url.replace(base, '/')
               importedUrls.add(url)
               if (isEager) staticImportedUrls.add(url)
             })
@@ -411,10 +412,11 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
 
           // record for HMR import chain analysis
           // make sure to normalize away base
-          importedUrls.add(url)
+          const urlWithoutBase = url.replace(base, '/')
+          importedUrls.add(urlWithoutBase)
           if (!isDynamicImport) {
             // for pre-transforming
-            staticImportedUrls.add(url)
+            staticImportedUrls.add(urlWithoutBase)
           }
         } else if (!importer.startsWith(clientDir) && !ssr) {
           // check @vite-ignore which suppresses dynamic import warning