feat: improvements for import.meta.hot

NathanWalker · NathanWalker · commit 9df273fcf0ae · 2025-12-16T19:11:18.000-08:00
diff --git a/packages/vite/hmr/helpers/ast-normalizer.ts b/packages/vite/hmr/helpers/ast-normalizer.ts
@@ -103,6 +103,15 @@ export function astNormalizeModuleImportsAndHelpers(code: string): string {
 						// Keep other prebundles as-is; they may be fetchable directly from the dev server
 					}
 				} else if (isViteVirtual(src) || src === '@vite/client' || src === '/@vite/client') {
+					// Removing the Vite client import should also remove its declared locals from our
+					// `declared` set; otherwise later bridge rewrites may unnecessarily suffix names
+					// (e.g. `__vite__createHotContext_1`) while call sites still reference the original.
+					try {
+						for (const s of path.node.specifiers || []) {
+							const local = (s as any)?.local?.name;
+							if (typeof local === 'string' && local) declared.delete(local);
+						}
+					} catch {}
 					path.remove();
 					return;
 				}
diff --git a/packages/vite/hmr/server/constants.ts b/packages/vite/hmr/server/constants.ts
@@ -19,7 +19,10 @@ export const VUE_FILE_IMPORT = /(?:^|\n)(\s*import\s+[^'";]*?\s+from\s+["'])([^"
 
 // Vite/HMR noise cleanup
 export const VITE_CLIENT_IMPORT = /(?:^|\n)\s*import\s+['"](?:\/@vite\/client|@vite\/client)['"];?/g;
-export const IMPORT_META_HOT_ASSIGNMENT = /(?:^|\n)\s*import\.meta\.hot\s*=\s*[^;\n]+;?/g;
+// Strip Vite's injected `import.meta.hot = __vite__createHotContext(...)` assignment.
+// Important: it may appear mid-line after other tokens/spaces in sanitized HTTP output,
+// so we cannot rely on it starting at BOL.
+export const IMPORT_META_HOT_ASSIGNMENT = /\bimport\.meta\.hot\s*=\s*[^;\n]+;?/g;
 export const IMPORT_META_HOT_CALLS = /(?:^|\n)\s*import\.meta\.hot\.[A-Za-z_$][\w$]*\([^)]*\);?\s*/g;
 
 // Remove only Vue style virtual imports; keep script/template variants
