@absolutejs/absolute 0.19.0-beta.65 → 0.19.0-beta.67

package/dist/dev/client/handlers/react.ts

@@ -8,7 +8,6 @@ import { detectCurrentFramework } from '../frameworkDetect';
 
 export const handleReactUpdate = (message: {
 	data: {
-		dataModuleUrl?: string;
 		hasCSSChanges?: boolean;
 		hasComponentChanges?: boolean;
 		manifest?: Record<string, string>;
@@ -33,25 +32,8 @@ export const handleReactUpdate = (message: {
 
 	const refreshRuntime = window.$RefreshRuntime$;
 	const serverDuration = message.data.serverDuration;
-	const dataModuleUrl = message.data.dataModuleUrl;
 	const pageModuleUrl = message.data.pageModuleUrl;
 
-	// Non-component file: import the data file first (cache bust),
-	// then re-import the page so the component re-renders with new data.
-	if (dataModuleUrl && refreshRuntime) {
-		const pageUrl = window.__REACT_PAGE_MODULE__;
-		if (pageUrl) {
-			applyDataThenPage(
-				dataModuleUrl,
-				pageUrl,
-				refreshRuntime,
-				serverDuration
-			);
-
-			return;
-		}
-	}
-
 	if (pageModuleUrl && refreshRuntime) {
 		applyRefreshImport(pageModuleUrl, refreshRuntime, serverDuration);
 
@@ -93,33 +75,26 @@ const applyRefreshImport = (
 	const clientStart = performance.now();
 	import(`${moduleUrl}?t=${Date.now()}`)
 		.then(() => {
-			refreshRuntime.performReactRefresh();
-			sendTiming(clientStart, serverDuration);
+			const result = refreshRuntime.performReactRefresh();
+
+			// If Fast Refresh was a no-op (data/utility file with no
+			// component exports), re-import the page entry so the
+			// component tree re-renders with the updated data.
+			// Chain invalidation ensures all intermediate modules have
+			// fresh ?v= params, so the browser re-fetches the whole chain.
+			if (!result && window.__REACT_PAGE_MODULE__) {
+				return import(
+					`${window.__REACT_PAGE_MODULE__}?t=${Date.now()}`
+				).then(() => {
+					refreshRuntime.performReactRefresh();
+
+					return undefined;
+				});
+			}
 
 			return undefined;
 		})
-		.catch((err) => {
-			console.warn(
-				'[HMR] React Fast Refresh failed, falling back to reload:',
-				err
-			);
-			window.location.reload();
-		});
-};
-
-const applyDataThenPage = (
-	dataUrl: string,
-	pageUrl: string,
-	refreshRuntime: { performReactRefresh: () => unknown },
-	serverDuration?: number
-) => {
-	const clientStart = performance.now();
-	// Import the changed data file first to bust the browser cache,
-	// then re-import the page so the component re-renders with new data.
-	import(`${dataUrl}?t=${Date.now()}`)
-		.then(() => import(`${pageUrl}?t=${Date.now()}`))
 		.then(() => {
-			refreshRuntime.performReactRefresh();
 			sendTiming(clientStart, serverDuration);
 
 			return undefined;

package/dist/index.js

@@ -202323,15 +202323,74 @@ var init_pageHandler = __esm(() => {
 });
 
 // src/dev/transformCache.ts
-var globalStore, cache, getTransformed = (filePath) => cache.get(filePath)?.content, setTransformed = (filePath, content, mtime) => {
-  cache.set(filePath, { content, mtime });
-}, invalidate = (filePath) => {
-  cache.delete(filePath);
+var exports_transformCache = {};
+__export(exports_transformCache, {
+  setTransformed: () => setTransformed,
+  invalidateAll: () => invalidateAll,
+  invalidate: () => invalidate,
+  getTransformed: () => getTransformed,
+  getInvalidationVersion: () => getInvalidationVersion,
+  findNearestComponent: () => findNearestComponent
+});
+var globalStore, cache, importers, getTransformed = (filePath) => cache.get(filePath)?.content, setTransformed = (filePath, content, mtime, imports) => {
+  const resolvedImports = imports ?? [];
+  cache.set(filePath, { content, imports: resolvedImports, mtime });
+  for (const imp of resolvedImports) {
+    if (!importers.has(imp)) {
+      importers.set(imp, new Set);
+    }
+    importers.get(imp).add(filePath);
+  }
+}, invalidationVersions, getInvalidationVersion = (filePath) => invalidationVersions.get(filePath) ?? 0, invalidate = (filePath) => {
+  const queue = [filePath];
+  const visited = new Set;
+  while (queue.length > 0) {
+    const current = queue.pop();
+    if (visited.has(current))
+      continue;
+    visited.add(current);
+    cache.delete(current);
+    if (current !== filePath) {
+      invalidationVersions.set(current, (invalidationVersions.get(current) ?? 0) + 1);
+    }
+    const parents = importers.get(current);
+    if (parents) {
+      for (const parent of parents) {
+        queue.push(parent);
+      }
+    }
+  }
+}, invalidateAll = () => {
+  cache.clear();
+  importers.clear();
+}, findNearestComponent = (filePath) => {
+  const visited = new Set;
+  const queue = [filePath];
+  while (queue.length > 0) {
+    const current = queue.shift();
+    if (visited.has(current))
+      continue;
+    visited.add(current);
+    const parents = importers.get(current);
+    if (!parents)
+      continue;
+    for (const parent of parents) {
+      if (parent.endsWith(".tsx") || parent.endsWith(".jsx")) {
+        return parent;
+      }
+      queue.push(parent);
+    }
+  }
+  return;
 };
 var init_transformCache = __esm(() => {
   globalStore = globalThis;
   cache = globalStore.__transformCache ?? new Map;
   globalStore.__transformCache = cache;
+  importers = globalStore.__transformImporters ?? new Map;
+  globalStore.__transformImporters = importers;
+  invalidationVersions = globalStore.__transformInvalidationVersions ?? new Map;
+  globalStore.__transformInvalidationVersions = invalidationVersions;
 });
 
 // src/dev/moduleServer.ts
@@ -202384,7 +202443,9 @@ ${stubs}
       return base;
     }
   }
-  return `${base}?v=${mtime}`;
+  const iv = getInvalidationVersion(absPath);
+  const version = iv > 0 ? `${mtime}.${iv}` : `${mtime}`;
+  return `${base}?v=${version}`;
 }, rewriteImports2 = (code, filePath, projectRoot, rewriter) => {
   let result = code;
   if (rewriter) {
@@ -202827,7 +202888,7 @@ export default {};
           return jsResponse(cached2);
         const stat3 = statSync(filePath);
         const content2 = await transformSvelteFile(filePath, projectRoot, rewriter);
-        setTransformed(filePath, content2, stat3.mtimeMs);
+        setTransformed(filePath, content2, stat3.mtimeMs, extractImportedFiles(content2, projectRoot));
         return jsResponse(content2);
       }
       if (ext === ".vue") {
@@ -202836,7 +202897,7 @@ export default {};
           return jsResponse(cached2);
         const stat3 = statSync(filePath);
         const content2 = await transformVueFile(filePath, projectRoot, rewriter, frameworkDirs?.vue);
-        setTransformed(filePath, content2, stat3.mtimeMs);
+        setTransformed(filePath, content2, stat3.mtimeMs, extractImportedFiles(content2, projectRoot));
         return jsResponse(content2);
       }
       if (!TRANSPILABLE.has(ext))
@@ -202846,7 +202907,7 @@ export default {};
         return jsResponse(cached);
       const stat2 = statSync(filePath);
       const content = REACT_EXTENSIONS.has(ext) ? transformReactFile(filePath, projectRoot, rewriter) : transformPlainFile(filePath, projectRoot, rewriter);
-      setTransformed(filePath, content, stat2.mtimeMs);
+      setTransformed(filePath, content, stat2.mtimeMs, extractImportedFiles(content, projectRoot));
       return jsResponse(content);
     } catch (err) {
       const errMsg = err instanceof Error ? err.message : String(err);
@@ -202856,6 +202917,15 @@ export default {};
       });
     }
   };
+}, SRC_IMPORT_RE, extractImportedFiles = (content, projectRoot) => {
+  const files = [];
+  let match;
+  SRC_IMPORT_RE.lastIndex = 0;
+  while ((match = SRC_IMPORT_RE.exec(content)) !== null) {
+    if (match[1])
+      files.push(resolve18(projectRoot, match[1]));
+  }
+  return files;
 }, invalidateModule = (filePath) => {
   invalidate(filePath);
   mtimeCache.delete(filePath);
@@ -202923,6 +202993,7 @@ var init_moduleServer = __esm(() => {
     trimUnusedImports: true
   });
   svelteExternalCss = new Map;
+  SRC_IMPORT_RE = /\/@src\/([^"'?\s]+)/g;
   SRC_URL_PREFIX = SRC_PREFIX;
 });
 
@@ -203450,15 +203521,20 @@ var moduleServerPromise, getModuleServer = () => moduleServerPromise, parseError
       invalidateModule2(file4);
     }
     const isComponentFile = primaryFile.endsWith(".tsx") || primaryFile.endsWith(".jsx");
-    const pageModuleUrl = await getReactModuleUrl(primaryFile);
-    const dataModuleUrl = isComponentFile ? undefined : pageModuleUrl;
+    let broadcastTarget = primaryFile;
+    if (!isComponentFile) {
+      const { findNearestComponent: findNearestComponent2 } = await Promise.resolve().then(() => (init_transformCache(), exports_transformCache));
+      const nearest = findNearestComponent2(resolve21(primaryFile));
+      if (nearest)
+        broadcastTarget = nearest;
+    }
+    const pageModuleUrl = await getReactModuleUrl(broadcastTarget);
     if (pageModuleUrl) {
       const serverDuration = Date.now() - startTime;
       state.lastHmrPath = relative9(process.cwd(), primaryFile).replace(/\\/g, "/");
       state.lastHmrFramework = "react";
       broadcastToClients(state, {
         data: {
-          dataModuleUrl,
           framework: "react",
           hasComponentChanges: true,
           hasCSSChanges: false,
@@ -205222,5 +205298,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=3F65A57A3B2221F364756E2164756E21
+//# debugId=38B222B3DCDB342564756E2164756E21
 //# sourceMappingURL=index.js.map