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

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

@@ -8,6 +8,7 @@ import { detectCurrentFramework } from '../frameworkDetect';
 
 export const handleReactUpdate = (message: {
 	data: {
+		dataModuleUrl?: string;
 		hasCSSChanges?: boolean;
 		hasComponentChanges?: boolean;
 		manifest?: Record<string, string>;
@@ -32,9 +33,25 @@ 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);
 
@@ -53,6 +70,21 @@ export const handleReactUpdate = (message: {
 	window.location.reload();
 };
 
+const sendTiming = (clientStart: number, serverDuration?: number) => {
+	if (window.__HMR_WS__) {
+		const clientMs = Math.round(performance.now() - clientStart);
+		const total = (serverDuration ?? 0) + clientMs;
+		window.__HMR_WS__.send(
+			JSON.stringify({ duration: total, type: 'hmr-timing' })
+		);
+	}
+	if (window.__ERROR_BOUNDARY__) {
+		window.__ERROR_BOUNDARY__.reset();
+	} else {
+		hideErrorOverlay();
+	}
+};
+
 const applyRefreshImport = (
 	moduleUrl: string,
 	refreshRuntime: { performReactRefresh: () => unknown },
@@ -61,37 +93,34 @@ const applyRefreshImport = (
 	const clientStart = performance.now();
 	import(`${moduleUrl}?t=${Date.now()}`)
 		.then(() => {
-			const didRefresh = 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.
-			if (!didRefresh && window.__REACT_PAGE_MODULE__) {
-				return import(
-					`${window.__REACT_PAGE_MODULE__}?t=${Date.now()}`
-				).then(() => {
-					refreshRuntime.performReactRefresh();
-
-					return undefined;
-				});
-			}
+			refreshRuntime.performReactRefresh();
+			sendTiming(clientStart, serverDuration);
 
 			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(() => {
-			if (window.__HMR_WS__) {
-				const clientMs = Math.round(performance.now() - clientStart);
-				const total = (serverDuration ?? 0) + clientMs;
-				window.__HMR_WS__.send(
-					JSON.stringify({ duration: total, type: 'hmr-timing' })
-				);
-			}
-
-			if (window.__ERROR_BOUNDARY__) {
-				window.__ERROR_BOUNDARY__.reset();
-			} else {
-				hideErrorOverlay();
-			}
+			refreshRuntime.performReactRefresh();
+			sendTiming(clientStart, serverDuration);
 
 			return undefined;
 		})

package/dist/index.js

@@ -203450,38 +203450,15 @@ var moduleServerPromise, getModuleServer = () => moduleServerPromise, parseError
       invalidateModule2(file4);
     }
     const isComponentFile = primaryFile.endsWith(".tsx") || primaryFile.endsWith(".jsx");
-    let broadcastFile = primaryFile;
-    if (!isComponentFile) {
-      const pageFile = reactFiles.find((f) => f.replace(/\\/g, "/").includes("/pages/") && (f.endsWith(".tsx") || f.endsWith(".jsx")));
-      if (pageFile) {
-        broadcastFile = pageFile;
-      } else {
-        const visited = new Set;
-        const queue = [resolve21(primaryFile)];
-        while (queue.length > 0) {
-          const current = queue.shift();
-          if (visited.has(current))
-            continue;
-          visited.add(current);
-          if (current.replace(/\\/g, "/").includes("/pages/") && (current.endsWith(".tsx") || current.endsWith(".jsx"))) {
-            broadcastFile = current;
-            break;
-          }
-          const deps = state.dependencyGraph.dependents.get(current);
-          if (deps) {
-            for (const dep of deps)
-              queue.push(dep);
-          }
-        }
-      }
-    }
-    const pageModuleUrl = await getReactModuleUrl(broadcastFile);
+    const pageModuleUrl = await getReactModuleUrl(primaryFile);
+    const dataModuleUrl = isComponentFile ? undefined : pageModuleUrl;
     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,
@@ -205245,5 +205222,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=447483A2A4076C5F64756E2164756E21
+//# debugId=3F65A57A3B2221F364756E2164756E21
 //# sourceMappingURL=index.js.map